Avalara Tax Compliance

.meteor/packages

@@ -69,6 +69,7 @@ kadira:flow-router-ssr
 matb33:collection-hooks
 meteorhacks:ssr
 meteorhacks:subs-manager
+natestrauser:select2
 ongoworks:security
 raix:ui-dropped-event
 risul:moment-timezone
@@ -94,5 +95,4 @@ johanbrook:publication-collector
 # spiderable                                # adds phantomjs SEO rendering, use ongoworks:spiderable with Docker
 # meteorhacks:sikka                         # additional ddp, login security
 
-
 # Custom Packages

.meteor/versions

@@ -122,6 +122,7 @@ [email protected]
 [email protected]
 [email protected]
 mrt:[email protected]
+natestrauser:[email protected]
 [email protected]
 [email protected]_1
 [email protected]

client/collections/index.js

@@ -1 +1,2 @@
 export * from "./countries";
+export * from "./taxEntitycodes";

client/collections/taxEntitycodes.js

@@ -0,0 +1,6 @@
+import { Mongo } from "meteor/mongo";
+
+/**
+ * Client side collections
+ */
+export const TaxEntityCodes = new Mongo.Collection(null);

client/modules/accounts/templates/dashboard/dashboard.html

@@ -39,7 +39,6 @@ <h3 class="panel-title">
           {{/each}}
         </ul>
       </div>
-
     </div>
   {{/if}}
 </template>

client/modules/accounts/templates/dashboard/dashboard.js

@@ -1,8 +1,8 @@
 import _ from "lodash";
 import { Meteor } from "meteor/meteor";
+import { Template } from "meteor/templating";
 import { Reaction, i18next } from "/client/api";
 import { ServiceConfigHelper } from "../../helpers/util";
-import { Template } from "meteor/templating";
 
 /**
  * Accounts helpers
@@ -16,6 +16,7 @@ Template.accountsDashboard.onCreated(function () {
 Template.accountsDashboard.helpers({
   /**
    * isShopMember
+   * @param {Object} member member object
    * @return {Boolean} True if the memnber is an administrator
    */
   isShopMember() {
@@ -24,12 +25,12 @@ Template.accountsDashboard.helpers({
 
   /**
    * isShopGuest
+   * @param {Object} member member object
    * @return {Boolean} True if the member is a guest
    */
   isShopGuest() {
     return !_.includes(["dashboard", "admin", "owner"], this.role);
   },
-
   /**
    * members
    * @return {Boolean} True array of adminsitrative members

client/modules/accounts/templates/members/member.html

@@ -7,6 +7,10 @@
         {{displayName this}}
         <span>&nbsp;({{this.email}})</span>
       </div>
+      <div class="member-list-item-profile">
+        <span>Customer Id: {{userId}}</span>
+      </div>
+
       <div class="member-list-item-controls">
         <button class="btn btn-default" data-event-action="showMemberSettings" data-i18n="accountsUI.manage">Manage</button>
       </div>
@@ -27,7 +31,9 @@
 
   </div>
 
-
+  {{#if showAvalaraTaxSettings }}
+    {{> taxSettingsPanel member=this }}
+  {{/if}}
 
   {{#each groupsForUser}}
     {{#if permissionGroups}}

client/modules/accounts/templates/members/member.js

@@ -1,3 +1,4 @@
+import _ from "lodash";
 import { Reaction } from "/client/api";
 import { Packages, Shops } from "/lib/collections";
 import { Meteor } from "meteor/meteor";
@@ -36,6 +37,9 @@ Template.memberSettings.helpers({
       }
     }
   },
+  userId: function () {
+    return Meteor.userId();
+  },
   hasPermissionChecked: function (permission, userId) {
     if (userId && Roles.userIsInRole(userId, permission, this.shopId || Roles.userIsInRole(userId, permission,
         Roles.GLOBAL_GROUP))) {
@@ -110,6 +114,18 @@ Template.memberSettings.helpers({
 
   hasManyPermissions: function (permissions) {
     return Boolean(permissions.length);
+  },
+  /**
+   * showAvalaraTaxSettings
+   * @return {Boolean} True if avalara is enabled. Defaults to false if not found
+   */
+  showAvalaraTaxSettings() {
+    const avalara = Packages.findOne({
+      name: "taxes-avalara",
+      shopId: Reaction.getShopId()
+    });
+
+    return _.get(avalara, "settings.avalara.enabled", false);
   }
 });
 

imports/plugins/core/email/client/actions/logs.js

@@ -1,4 +1,4 @@
-import { Router, i18next } from "/client/api";
+import { i18next } from "/client/api";
 
 export default {
   /**

imports/plugins/core/email/client/components/emailSettings.js

@@ -31,7 +31,7 @@ class EmailSettings extends Component {
 
   handleSelect(e) {
     const { settings } = this.state;
-    settings["service"] = e;
+    settings.service = e;
     this.setState({ settings });
   }
 

imports/plugins/core/logging/register.js

@@ -0,0 +1,7 @@
+import { Reaction } from "/server/api";
+
+Reaction.registerPackage({
+  label: "Logging",
+  name: "reaction-logging",
+  autoEnable: true
+});

imports/plugins/core/logging/server/index.js

@@ -0,0 +1 @@
+import "./publications";

imports/plugins/core/logging/server/publications.js

@@ -0,0 +1,28 @@
+import { Meteor } from "meteor/meteor";
+import { check, Match } from "meteor/check";
+import { Roles } from "meteor/alanning:roles";
+import { Counts } from "meteor/tmeasday:publish-counts";
+import { Logs } from "/lib/collections";
+import { Reaction } from "/server/api";
+
+
+/**
+ * Publish logs
+ * Poor admins get swamped with a ton of data so let's just only subscribe to one
+ * logType at a time
+ */
+Meteor.publish("Logs", function (query, options) {
+  check(query, Match.OneOf(undefined, Object));
+  check(options, Match.OneOf(undefined, Object));
+
+  const shopId = Reaction.getShopId();
+  if (!query || !query.logType || !shopId) {
+    return this.ready();
+  }
+
+  const logType = query.logType;
+  if (Roles.userIsInRole(this.userId, ["admin", "owner"])) {
+    Counts.publish(this, "logs-count", Logs.find({ shopId, logType }));
+    return Logs.find({ shopId, logType }, { sort: { date: 1 } });
+  }
+});

imports/plugins/core/revisions/client/containers/publishContainer.js

@@ -31,7 +31,7 @@ class PublishContainer extends Component {
           Alerts.toast(message, "success");
 
           if (this.props.onPublishSuccess) {
-            this.props.onPublishSuccess(result)
+            this.props.onPublishSuccess(result);
           }
         } else {
           const message = i18next.t("revisions.noChangesPublished", {

imports/plugins/core/taxes/lib/collections/schemas/taxcodes.js

@@ -11,12 +11,21 @@ export const TaxCodes = new SimpleSchema({
     unique: true
   },
   shopId: {
+    type: String
+  },
+  taxCode: {
     type: String,
-    optional: true
+    label: "Tax Code"
+  },
+  taxCodeProvider: {
+    type: String,
+    label: "Tax Code Provider"
   },
   ssuta: {
     type: Boolean,
-    label: "Streamlined Sales Tax"
+    label: "Streamlined Sales Tax",
+    optional: true,
+    defaultValue: false
   },
   title: {
     type: String,

imports/plugins/included/default-theme/client/styles/products/variantForm.less

@@ -22,10 +22,10 @@
 
   }
   .checkbox,.radio {
-    margin-top: 0px;
-    margin-bottom: 0px;
-  }
-  .lowInventoryWarningThreshold {
-
+    margin-top: 0;
+    margin-bottom: 0;
   }
 }
+.select2-container {
+  width: 370px;
+}

imports/plugins/included/product-admin/client/components/productAdmin.js

@@ -22,6 +22,7 @@ const fieldNames = [
   "subtitle",
   "vendor",
   "description",
+  "origincountry",
   "facebookMsg",
   "twitterMsg",
   "pinterestMsg",
@@ -306,6 +307,17 @@ class ProductAdmin extends Component {
               ref="descriptionInput"
               value={this.product.description}
             />
+            <TextField
+              i18nKeyLabel="productDetailEdit.originCountry"
+              i18nKeyPlaceholder="productDetailEdit.originCountry"
+              label="Origin Country"
+              name="originCountry"
+              onBlur={this.handleFieldBlur}
+              onChange={this.handleFieldChange}
+              placeholder="Country of Origin"
+              ref="countryOfOriginInput"
+              value={this.product.originCountry}
+            />
           </CardBody>
         </Card>
         <Card

imports/plugins/included/product-variant/client/templates/products/productDetail/variants/variantForm/variantForm.html

@@ -72,6 +72,14 @@
                   {{/if}}
               </div>
 
+              <div class="form-group{{#if afFieldIsInvalid name='originCountry'}} has-error{{/if}}">
+                  <label class="control-label">{{afFieldLabelText name='originCountry'}}</label>
+                  {{>afFieldInput name='originCountry' placeholder=(i18n "productVariant.originCountry" "Origin Country")}}
+                  {{#if afFieldIsInvalid name='originCountry'}}
+                  <span class="help-block">{{afFieldMessage name='originCountry'}}</span>
+                  {{/if}}
+              </div>
+
               <div class="col-xs-3 col-sm-3 form-group{{#if afFieldIsInvalid name='weight'}} has-error{{/if}}">
                 <label class="control-label">{{afFieldLabelText name='weight'}}</label>
                 {{>afFieldInput name='weight' placeholder="0"}}
@@ -104,16 +112,65 @@
                 {{/if}}
               </div>
 
+              <div class="col-xs-4 col-sm-4 form-group{{#if afFieldIsInvalid name='length'}} has-error{{/if}}">
+                <label class="control-label">{{afFieldLabelText name='length'}}</label>
+                {{>afFieldInput name='length' placeholder="0"}}
+                {{#if afFieldIsInvalid name='length'}}
+                <span class="help-block">{{afFieldMessage name='length'}}</span>
+                {{/if}}
+              </div>
+
+              <div class="col-xs-4 col-sm-4 form-group{{#if afFieldIsInvalid name='width'}} has-error{{/if}}">
+                <label class="control-label">{{afFieldLabelText name='width'}}</label>
+                {{>afFieldInput name='width' placeholder="0"}}
+                {{#if afFieldIsInvalid name='width'}}
+                <span class="help-block">{{afFieldMessage name='width'}}</span>
+                {{/if}}
+              </div>
+
+              <div class="col-xs-4 col-sm-4 form-group{{#if afFieldIsInvalid name='height'}} has-error{{/if}}">
+                <label class="control-label">{{afFieldLabelText name='height'}}</label>
+                {{>afFieldInput name='height' placeholder="0"}}
+                {{#if afFieldIsInvalid name='height'}}
+                <span class="help-block">{{afFieldMessage name='height'}}</span>
+                {{/if}}
+              </div>
             </div>
           </div>
           <div class="row">
-            <div class="variant-options col-xs-12 col-sm-3 col-md-3">
+            <div class="variant-options col-xs-12">
               <div class="form-group {{#if afFieldIsInvalid name='taxable'}} has-error{{/if}}">
                   {{>afFieldInput name='taxable'}}
                   {{#if afFieldIsInvalid name='taxable'}}
                   <span class="help-block">{{afFieldMessage name='taxable'}}</span>
                   {{/if}}
               </div>
+              {{#unless isProviderEnabled}}
+              <div class="form-group{{#if afFieldIsInvalid name='taxCode'}} has-error{{/if}} taxCode" style="{{displayTaxCodes}}">
+                <label class="control-label">{{afFieldLabelText name='taxCode'}}</label>
+                {{>afFieldInput name='taxCode'}}
+              </div>
+              {{else}}
+              <div class="form-group{{#if afFieldIsInvalid name='taxCode'}} has-error{{/if}} taxCode" style="{{displayTaxCodes}}">
+                <select class="input select2-container" name="taxCode" id="taxCode" type="select2">
+                  <option selected="selected">{{displayCode}}</option>
+                  {{#each listTaxCodes}}
+                  <option value={{value}} id={{_id}}>{{label}}</option>
+                  {{/each}}
+                </select>
+                {{#if afFieldIsInvalid name='taxCode'}}
+                <span class="help-block">{{afFieldMessage name='taxCode'}}</span>
+                {{/if}}
+              </div>
+              {{/unless}}
+
+              <div class="form-group{{#if afFieldIsInvalid name='taxDescription'}} has-error{{/if}}">
+                <label class="control-label">{{afFieldLabelText name='taxDescription'}}</label>
+                {{>afFieldInput name='taxDescription' placeholder=(i18n "productVariant.taxDescription" "Tax Description")}}
+                {{#if afFieldIsInvalid name='taxDescription'}}
+                  <span class="help-block">{{afFieldMessage name='taxDescription'}}</span>
+                {{/if}}
+              </div>
               <div class="form-group{{#if afFieldIsInvalid name='inventoryManagement'}} has-error{{/if}}">
                   {{>afFieldInput name='inventoryManagement'}}
                   {{#if afFieldIsInvalid name='inventoryManagement'}}
@@ -126,7 +183,7 @@
                   <span class="help-block">{{afFieldMessage name='inventoryPolicy'}}</span>
                   {{/if}}
               </div>
-              <div class="lowInventoryWarningThreshold form-group{{#if afFieldIsInvalid name='lowInventoryWarningThreshold'}} has-error{{/if}}" style="{{displayLowInventoryWarning doc}}">
+              <div class=" col-md-3 lowInventoryWarningThreshold form-group{{#if afFieldIsInvalid name='lowInventoryWarningThreshold'}} has-error{{/if}}" style="{{displayLowInventoryWarning doc}}">
                   <label class="control-label">{{afFieldLabelText name='lowInventoryWarningThreshold'}}</label>
                   {{>afFieldInput name='lowInventoryWarningThreshold' placeholder="0"}}
                   {{#if afFieldIsInvalid name='lowInventoryWarningThreshold'}}