Shipping panel normalization

client/config/defaults.js

@@ -23,3 +23,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");

imports/plugins/core/layout/client/index.js

@@ -12,7 +12,6 @@ import "./templates/layout/header/button.html";
 import "./templates/layout/header/header.html";
 import "./templates/layout/header/header.js";
 import "./templates/layout/header/tags.html";
-import "./templates/layout/loading/loading.html";
 import "./templates/layout/notFound/notFound.html";
 import "./templates/layout/notFound/notFound.js";
 import "./templates/layout/notice/unauthorized.html";

imports/plugins/core/shipping/client/templates/checkout/shipping.html

@@ -8,18 +8,27 @@ <h3 class="panel-title">
       </h3>
     </div>
     {{#if isReady}}
-      {{#each reactionApps provides='shippingMethod' enabled=true}}
-        {{> Template.dynamic template=template}}
-      {{else}}
-        <div class="panel-body">
-          <div class="alert alert-danger">
-            <span data-i18n="checkoutShipping.noShippingPackages">No shipping packages are configured. </span>
-            <a href="{{pathFor 'dashboard'}}">
-              <span data-i18n="checkoutShipping.configureNow">Configure now.</span>
-            </a>
-          </div>
-        </div>
-      {{/each}}
+      <div class="panel-body">
+        <ul class="checkout-shipping list-group">
+        {{#if shippingConfigured}}
+          {{#each shipmentQuotes}}
+            <li class="list-group-item {{isSelected ..}}" data-carrier="{{carrier}}" data-method="{{method}}">
+              <span class="text-left">{{method.carrier}} - {{method.label}}</span>
+              <span class="pull-right">{{formatPrice rate}}</span>
+            </li>
+            {{else}}
+              <div class="panel-body">
+                <div class="alert alert-danger">
+                  <span data-i18n="checkoutShipping.noShippingMethods">No shipping methods are configured.</span>
+                  <a href="{{pathFor 'dashboard'}}">
+                    <span data-i18n="checkoutShipping.configureNow">Configure now.</span>
+                  </a>
+                </div>
+              </div>
+            {{/each}}
+        {{/if}}
+        </ul>
+      </div>
     {{else}}
       <div class="spinner-container">
         <div class="spinner"></div>

imports/plugins/core/shipping/client/templates/checkout/shipping.js

@@ -1,35 +1,45 @@
 import _ from "lodash";
-import { Cart, Shipping } from "/lib/collections";
 import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
+import { Reaction } from "/client/api";
+import { Cart, Shipping } from "/lib/collections";
 
-//
-// These helpers can be used in general shipping packages
-// cartShippingMethods to get current shipment methods
-// until we handle multiple methods, we just use the first
-function cartShippingMethods(currentCart) {
+// cartShippingQuotes
+// returns multiple methods
+function cartShippingQuotes(currentCart) {
   const cart = currentCart || Cart.findOne();
+  const shipmentQuotes = [];
+
   if (cart) {
     if (cart.shipping) {
-      if (cart.shipping[0].shipmentQuotes) {
-        return cart.shipping[0].shipmentQuotes;
+      for (shipping of cart.shipping) {
+        if (shipping.shipmentQuotes) {
+          for (quote of shipping.shipmentQuotes) {
+            shipmentQuotes.push(quote);
+          }
+        }
       }
     }
   }
-  return undefined;
+  return shipmentQuotes;
 }
-// getShipmentMethod to get current shipment method
-// until we handle multiple methods, we just use the first
-function getShipmentMethod(currentCart) {
+// cartShipmentMethods to get current shipment method
+// this returns multiple methods, if more than one carrier
+// has been chosen
+function cartShipmentMethods(currentCart) {
   const cart = currentCart || Cart.findOne();
+  const shipmentMethods = [];
+
   if (cart) {
     if (cart.shipping) {
-      if (cart.shipping[0].shipmentMethod) {
-        return cart.shipping[0].shipmentMethod;
+      for (shipping of cart.shipping) {
+        if (shipping.shipmentMethod) {
+          shipmentMethods.push(shipping.shipmentMethod);
+        }
       }
     }
   }
-  return undefined;
+  return shipmentMethods;
 }
 
 Template.coreCheckoutShipping.onCreated(function () {
@@ -42,8 +52,11 @@ Template.coreCheckoutShipping.helpers({
   // retrieves current rates and updates shipping rates
   // in the users cart collection (historical, and prevents repeated rate lookup)
   shipmentQuotes: function () {
-    const cart = Cart.findOne();
-    return cartShippingMethods(cart);
+    const instance = Template.instance();
+    if (instance.subscriptionsReady()) {
+      const cart = Cart.findOne();
+      return cartShippingQuotes(cart);
+    }
   },
 
   // helper to make sure there are some shipping providers
@@ -59,10 +72,13 @@ Template.coreCheckoutShipping.helpers({
   // helper to display currently selected shipmentMethod
   isSelected: function () {
     const self = this;
-    const shipmentMethod = getShipmentMethod();
-    // if there is already a selected method, set active
-    if (_.isEqual(self.method, shipmentMethod)) {
-      return "active";
+    const shipmentMethods = cartShipmentMethods();
+
+    for (method of shipmentMethods) {
+      // if there is already a selected method, set active
+      if (_.isEqual(self.method, method)) {
+        return "active";
+      }
     }
     return null;
   },
@@ -71,8 +87,10 @@ Template.coreCheckoutShipping.helpers({
     const instance = Template.instance();
     const isReady = instance.subscriptionsReady();
 
-    if (isReady) {
-      return true;
+    if (Reaction.Subscriptions.Cart.ready()) {
+      if (isReady) {
+        return true;
+      }
     }
 
     return false;

imports/plugins/core/shipping/client/templates/index.js

@@ -1,9 +1,5 @@
 import "./checkout/shipping.html";
 import "./checkout/shipping.js";
 
-import "./flatRates/shipping.html";
-import "./flatRates/shipping.js";
-
-import "./shipping.html";
-import "./shipping.js";
-import "./shipping.less";
+import "./settings/shipping.html";
+import "./settings/shipping.js";

imports/plugins/core/shipping/client/templates/settings/shipping.html

@@ -0,0 +1,21 @@
+<template name="shippingSettings">
+    {{#each reactionApps provides='shippingSettings'}}
+
+    <div class="panel panel-default">
+      <div class="panel-heading panel-heading-flex">
+        <div class="panel-title">
+          <i class="fa fa-{{name}}"></i>
+          <span data-i18n="{{i18nKeyLabel}}">{{label}}</span>
+
+        </div>
+        <div class="panel-controls">
+          <input class="checkbox-switch shipping-settings" type="checkbox" name="enabled" data-id={{packageId}} data-key="{{settingsKey}}" {{checked enabled}}>
+        </div>
+      </div>
+      <div class="panel-body {{shown enabled}}">
+        {{> Template.dynamic template=template data=.}}
+      </div>
+    </div>
+    {{/each}}
+
+</template>

imports/plugins/core/shipping/client/templates/settings/shipping.js

@@ -0,0 +1,46 @@
+import { Template } from "meteor/templating";
+/*
+ * Template shippinges Helpers
+ */
+Template.shippingSettings.onCreated(function () {
+  this.autorun(() => {
+    this.subscribe("Shipping");
+  });
+});
+
+Template.shippingSettings.helpers({
+  checked(enabled) {
+    if (enabled === true) {
+      return "checked";
+    }
+    return "";
+  },
+  shown(enabled) {
+    if (enabled !== true) {
+      return "hidden";
+    }
+    return "";
+  }
+});
+
+Template.shippingSettings.events({
+  /**
+   * shippingSettings settings update enabled status for shipping service on change
+   * @param  {event} event    jQuery Event
+   * @return {void}
+   */
+  "change input.checkbox-switch.shipping-settings[name=enabled]": (event) => {
+    event.preventDefault();
+    const settingsKey = event.target.getAttribute("data-key");
+    const packageId = event.target.getAttribute("data-id");
+    const fields = [{
+      property: "enabled",
+      value: event.target.checked
+    }];
+    // save shipping registry updates
+    if (packageId) {
+      // TODO also disable providers
+      Meteor.call("registry/update", packageId, settingsKey, fields);
+    }
+  }
+});