Release 19

.meteor/packages

@@ -58,6 +58,7 @@ cfs:gridfs
 cfs:standard-packages
 cfs:storage-adapter
 cfs:ui
+dispatch:run-as-user
 jeremy:stripe
 jparker:gravatar
 juliancwirko:s-alert
@@ -95,3 +96,4 @@ johanbrook:publication-collector
 
 
 # Custom Packages
+gadicc:blaze-react-component

.meteor/versions

@@ -20,16 +20,16 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-blaze@2.2.1
-blaze-html-templates@1.0.5
+blaze@2.3.0
+blaze-html-templates@1.1.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-caching-html-compiler@1.0.7
+caching-html-compiler@1.1.0
 [email protected]
 cfs:[email protected]
 cfs:[email protected]
@@ -63,13 +63,15 @@ [email protected]
 [email protected]
 [email protected]
 dispatch:[email protected]
+dispatch:[email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
+gadicc:[email protected]
 [email protected]
 [email protected]
 [email protected]
@@ -111,14 +113,14 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-[email protected].7
+[email protected].8
 momentjs:[email protected]
 [email protected]
 [email protected]
 [email protected]
 mrt:[email protected]
 [email protected]
-[email protected].11_2
+[email protected].16_1
 [email protected]
 [email protected]
 [email protected]
@@ -147,13 +149,13 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-spacebars-compiler@1.0.13
+spacebars-compiler@1.1.0
 [email protected]
 [email protected]
-templating@1.2.15
-templating-compiler@1.2.15
-templating-runtime@1.2.15
-templating-tools@1.0.5
+templating@1.3.0
+templating-compiler@1.3.0
+templating-runtime@1.3.0
+templating-tools@1.1.0
 tmeasday:[email protected]
 tmeasday:[email protected]
 [email protected]

client/config/defaults.js

@@ -14,7 +14,9 @@ export const DEFAULT_WORKFLOW = "coreWorkflow";
 
 // Use this to override just the home Package
 // ie: {template: "products"}
-export const INDEX_OPTIONS = {};
+export const INDEX_OPTIONS = {
+  workflow: "coreProductGridWorkflow"
+};
 
 // default load qty for product grid
 export const ITEMS_INCREMENT = 24;
@@ -23,3 +25,6 @@ Session.setDefault("DEFAULT_LAYOUT", DEFAULT_LAYOUT);
 Session.setDefault("DEFAULT_WORKFLOW", DEFAULT_WORKFLOW);
 Session.setDefault("INDEX_OPTIONS", INDEX_OPTIONS);
 Session.setDefault("productScrollLimit", ITEMS_INCREMENT);
+
+// autoform default template
+AutoForm.setDefaultTemplate("bootstrap3");

client/modules/accounts/templates/addressBook/add/add.html

@@ -10,6 +10,9 @@ <h3 class="panel-title">
 </div>
 <div class="panel-body panel-content">
   {{#autoForm schema=Schemas.Address id="addressBookAddForm" doc=thisAddress type="normal"}}
+    <div class="row">
+      <span id="addressbookAdd-alerts-placement">{{> inlineAlerts placement="addressBookAdd"}}</span>
+    </div>
     <fieldset>
         {{> addressBookForm}}
         <div class="row text-right">

client/modules/accounts/templates/addressBook/add/add.js

@@ -53,15 +53,35 @@ Template.addressBookAdd.helpers({
   }
 });
 
-Template.addressBookAdd.events({
-  // "click #cancel-new, form submit": function(event, template) {
-  //   console.log(event, template, Template.instance())
-  //   return Session.set("addressBookView", "addressBookGrid");
-  // },
-  // "submit form": function() {
-  //   return Session.set("addressBookView", "addressBookGrid");
-  // }
-});
+
+export function setValidatedAddress(res) {
+  if (res.validatedAddress.city) {
+    const city = $("input[name='city']");
+    city.val(res.validatedAddress.city);
+  }
+  if (res.validatedAddress.postal) {
+    const postal = $("input[name='postal']");
+    postal.val(res.validatedAddress.postal);
+  }
+  if (res.validatedAddress.address1) {
+    const address1 = $("input[name='address1']");
+    address1.val(res.validatedAddress.address1);
+  }
+
+  if (res.validatedAddress.address2) {
+    const address2 = $("input[name='address2']");
+    address2.val(res.validatedAddress.address2);
+  }
+  if (res.validatedAddress.country) {
+    const country = $("select[name='country']");
+    country.val(res.validatedAddress.country);
+  }
+
+  if (res.validatedAddress.region) {
+    const region = $("select[name='region']");
+    region.val(res.validatedAddress.region);
+  }
+}
 
 /**
  * addressBookAddForm form handling
@@ -71,18 +91,40 @@ Template.addressBookAdd.events({
 AutoForm.hooks({
   addressBookAddForm: {
     onSubmit: function (insertDoc) {
+      const that = this;
       this.event.preventDefault();
       const addressBook = $(this.template.firstNode).closest(".address-book");
 
-      Meteor.call("accounts/addressBookAdd", insertDoc, (error, result) => {
-        if (error) {
-          Alerts.toast(i18next.t("addressBookAdd.failedToAddAddress", { err: error.message }), "error");
-          this.done(new Error("Failed to add address: ", error));
-          return false;
-        }
-        if (result) {
-          this.done();
-          addressBook.trigger($.Event("showMainView"));
+      Meteor.call("accounts/validateAddress", insertDoc, function (err, res) {
+        if (res.validated) {
+          Meteor.call("accounts/addressBookAdd", insertDoc, function (error, result) {
+            if (error) {
+              Alerts.toast(i18next.t("addressBookAdd.failedToAddAddress", { err: error.message }), "error");
+              that.done(new Error("Failed to add address: ", error));
+              return false;
+            }
+            if (result) {
+              that.done();
+              addressBook.trigger($.Event("showMainView"));
+              return true;
+            }
+          });
+        } else {
+          if (res.validatedAddress) {
+            setValidatedAddress(res);
+            Alerts.inline("Made changes to your address based upon validation. Please ensure this is correct", "warning", {
+              placement: "addressBookAdd",
+              i18nKey: "addressBookAdd.validatedAddress"
+            });
+          }
+          if (res.formErrors) {
+            for (const error of res.formErrors) {
+              Alerts.inline(error.details, "error", {
+                placement: "addressBookAdd"
+              });
+            }
+          }
+          that.done("Validation failed"); // renable Save and Continue button
         }
       });
     }

client/modules/accounts/templates/addressBook/edit/edit.html

@@ -6,6 +6,9 @@ <h3 class="panel-control-bar">
   </div>
   <div class="panel-body">
   {{#autoForm schema=Schemas.Address id="addressBookEditForm" doc=address type="normal"}}
+    <div class="row">
+      <span id="addressbookEdit-alerts-placement">{{> inlineAlerts placement="addressBookEdit"}}</span>
+    </div>
     <fieldset>
       {{>addressBookForm}}
       <div class="row text-right">

client/modules/accounts/templates/addressBook/edit/edit.js

@@ -1,5 +1,6 @@
 import { i18next } from "/client/api";
 import { Meteor } from "meteor/meteor";
+import { setValidatedAddress } from "../add/add";
 
 /*
  * update address book (cart) form handling
@@ -9,20 +10,41 @@ import { Meteor } from "meteor/meteor";
 AutoForm.hooks({
   addressBookEditForm: {
     onSubmit: function (insertDoc) {
+      const that = this;
       this.event.preventDefault();
-
       const addressBook = $(this.template.firstNode).closest(".address-book");
-      Meteor.call("accounts/addressBookUpdate", insertDoc, (error, result) => {
-        if (error) {
-          Alerts.toast(i18next.t("addressBookEdit.somethingWentWrong", { err: error.message }), "error");
-          this.done(new Error(error));
-          return false;
-        }
-        if (result) {
-          this.done();
 
-          // Show the grid
-          addressBook.trigger($.Event("showMainView"));
+      Meteor.call("accounts/validateAddress", insertDoc, function (err, res) {
+        if (res.validated) {
+          Meteor.call("accounts/addressBookUpdate", insertDoc, (error, result) => {
+            if (error) {
+              Alerts.toast(i18next.t("addressBookEdit.somethingWentWrong", { err: error.message }), "error");
+              this.done(new Error(error));
+              return false;
+            }
+            if (result) {
+              that.done();
+
+              // Show the grid
+              addressBook.trigger($.Event("showMainView"));
+            }
+          });
+        } else {
+          if (res.validatedAddress) {
+            setValidatedAddress(res);
+            Alerts.inline("Made changes to your address based upon validation. Please ensure this is correct", "warning", {
+              placement: "addressBookEdit",
+              i18nKey: "addressBookAdd.validatedAddress"
+            });
+          }
+          if (res.formErrors) {
+            for (const error of res.formErrors) {
+              Alerts.inline(error.details, "error", {
+                placement: "addressBookEdit"
+              });
+            }
+          }
+          that.done("Validation failed"); // renable Save and Continue button
         }
       });
     }

client/modules/accounts/templates/addressBook/grid/grid.js

@@ -62,11 +62,17 @@ Template.addressBookGrid.helpers({
 
 Template.addressBookGrid.events({
   "click [data-event-action=selectShippingAddress]": function () {
-    return Meteor.call("accounts/addressBookUpdate", this, null,
-      "isShippingDefault");
+  // update address(make it default) only if wasn't already
+    if (!this.isShippingDefault) {
+      return Meteor.call("accounts/addressBookUpdate", this, null,
+        "isShippingDefault");
+    }
   },
   "click [data-event-action=selectBillingAddress]": function () {
-    return Meteor.call("accounts/addressBookUpdate", this, null,
-      "isBillingDefault");
+    // update address(make it default) only if wasn't already
+    if (!this.isBillingDefault) {
+      return Meteor.call("accounts/addressBookUpdate", this, null,
+        "isBillingDefault");
+    }
   }
 });

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

@@ -1,5 +1,7 @@
 <template name="accountsDashboard">
   {{#if hasPermission 'accounts'}}
+
+    {{> memberForm}}
     <div class="container-fluid-sm">
 
       <div class="panel panel-default">

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

@@ -188,7 +188,7 @@ Template.accountsSettings.events({
    * @return {void}
    */
   "click [data-event-action=showSecret]": (event) => {
-    const button = $(event.currentTarget);
+    const button = Template.instance().$(event.currentTarget);
     const input = button.closest(".form-group").find("input[name=secret]");
 
     if (input.attr("type") === "password") {

client/modules/accounts/templates/dropdown/dropdown.js

@@ -61,8 +61,11 @@ Template.loginDropdown.events({
           });
         }
       });
-    } else if (this.route || this.name) {
+    } else if (this.name !== "account/profile") {
       event.preventDefault();
+      /** TMP **/
+      Reaction.showActionView(this);
+    } else if (this.route || this.name) {
       const route = this.name || this.route;
       Reaction.Router.go(route);
     }

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

@@ -19,7 +19,7 @@ const getPermissionMap = (permissions) => {
  */
 Template.member.events({
   "click [data-event-action=showMemberSettings]": function () {
-    Reaction.showActionView({
+    Reaction.setActionViewDetail({
       label: "Permissions",
       i18nKeyLabel: "admin.settings.permissionsSettingsLabel",
       data: this,
@@ -133,14 +133,14 @@ Template.memberSettings.events({
     } else {
       permissions.push(self.permission);
     }
-    if ($(event.currentTarget).is(":checked")) {
+    if (Template.instance().$(event.currentTarget).is(":checked")) {
       Meteor.call("accounts/addUserPermissions", member.userId, permissions, this.shopId);
     } else {
       Meteor.call("accounts/removeUserPermissions", member.userId, permissions, this.shopId);
     }
   },
   "click [data-event-action=resetMemberPermission]": function (event, template) {
-    const $icon = $(event.currentTarget);
+    const $icon = Template.instance().$(event.currentTarget);
     if (confirm($icon.data("confirm"))) {
       const results = [];
       for (const role of template.data.roles) {

client/modules/core/helpers/apps.js

@@ -125,8 +125,11 @@ export function Apps(optionHash) {
       reactionApps.push(registry);
     }
   });
-  // sort cycle to ensure order aka. is registry.priority working? .sort((a, b) => a.priority - b.priority).slice();
-  return reactionApps;
+
+  // Sort apps by priority (registry.priority)
+  const sortedApps = reactionApps.sort((a, b) => a.priority - b.priority).slice();
+
+  return sortedApps;
 }
 
 // Register global template helper