add reaction-checkout package

- moves cart and checkout templates from core into
`reactioncommerce:reaction-checkout`
- adds dependency in reaction-shipping to reaction-checkout

Related Issues:
- #731
- #451
- #416

.meteor/packages

@@ -59,6 +59,7 @@ reactioncommerce:reaction-router
 reactioncommerce:reaction-shipping
 reactioncommerce:reaction-social
 reactioncommerce:reaction-product-variant
+reactioncommerce:reaction-checkout
 
 # reactioncommerce:reaction-product-simple
 

.meteor/versions

@@ -141,6 +141,7 @@ reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
+reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
@@ -150,7 +151,7 @@ reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
-reactioncommerce:reaction-shipping@0.6.3
+reactioncommerce:reaction-shipping@0.7.0
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]
 reactioncommerce:[email protected]

packages/.gitignore

@@ -21,6 +21,7 @@
 !reaction-email-templates
 !reaction-router
 !reaction-product-variant
+!reaction-checkout
 
 # For some reason the above inverse ignore rules don't play well with some
 # editors, so we also add inverse ignore rules for their subdirectories.
@@ -43,3 +44,4 @@
 !reaction-email-templates/*
 !reaction-router/*
 !reaction-product-variant/*
+!reaction-checkout/*

packages/reaction-checkout/README.md

@@ -0,0 +1,4 @@
+# reaction-cart
+Reaction Commerce Cart and Checkout
+
+`meteor add reactioncommerce:reaction-cart`

packages/reaction-core/client/templates/cart/checkout/completed/completed.js → packages/reaction-checkout/client/templates/cart/checkout/completed/completed.js

@@ -5,12 +5,15 @@
  */
 Template.cartCompleted.helpers({
   order: function () {
-    const ccoSub = Meteor.subscribe("CompletedCartOrder", Meteor.userId(), ReactionRouter.getQueryParam("_id"));
-    if (ccoSub.ready()) {
-      return ReactionCore.Collections.Orders.findOne({
-        userId: Meteor.userId(),
-        cartId: ReactionRouter.getQueryParam("_id")
-      });
+    const id =  ReactionRouter.getQueryParam("_id");
+    if (id) {
+      const ccoSub = Meteor.subscribe("CompletedCartOrder", Meteor.userId(), id);
+      if (ccoSub.ready()) {
+        return ReactionCore.Collections.Orders.findOne({
+          userId: Meteor.userId(),
+          cartId: ReactionRouter.getQueryParam("_id")
+        });
+      }
     }
   },
   orderStatus: function () {

packages/reaction-core/client/templates/cart/checkout/shipping/shipping.html → packages/reaction-checkout/client/templates/cart/checkout/shipping/shipping.html

@@ -13,7 +13,7 @@ <h3 class="panel-title">
       <div class="panel-body">
         <div class="alert alert-danger">
           <span data-i18n="checkoutShipping.noShippingPackages">No shipping packages are configured. </span>
-          <a href="/dashboard">
+          <a href="{{pathFor 'dashboard/shipping'}}">
             <span data-i18n="checkoutShipping.configureNow">Configure now.</span>
           </a>
         </div>

packages/reaction-core/client/templates/cart/checkout/shipping/shipping.js → packages/reaction-checkout/client/templates/cart/checkout/shipping/shipping.js

@@ -31,16 +31,19 @@ Template.coreCheckoutShipping.helpers({
   // retrieves current rates and updates shipping rates
   // in the users cart collection (historical, and prevents repeated rate lookup)
   shipmentQuotes: function () {
-    let cart = ReactionCore.Collections.Cart.findOne();
+    const cart = ReactionCore.Collections.Cart.findOne();
+
     return cartShippingMethods(cart);
   },
 
   // helper to make sure there are some shipping providers
   shippingConfigured: function () {
-    let exists = ReactionCore.Collections.Shipping.find({
-      "methods.enabled": true
-    }).count();
-    return exists;
+    const shipSub = Meteor.subscribe("Shipping");
+    if (shipSub.ready()) {
+      return ReactionCore.Collections.Shipping.find({
+        "methods.enabled": true
+      }).count();
+    }
   },
 
   // helper to display currently selected shipmentMethod

packages/reaction-checkout/package.js

@@ -0,0 +1,77 @@
+Package.describe({
+  summary: "Reaction Cart and Checkout",
+  name: "reactioncommerce:reaction-checkout",
+  version: "1.0.0",
+  documentation: "README.md"
+});
+
+Package.onUse(function (api) {
+  api.versionsFrom("[email protected]");
+
+  // meteor base packages
+  api.use("meteor-base");
+  api.use("mongo");
+  api.use("ecmascript");
+  api.use("es5-shim");
+  api.use("blaze-html-templates");
+  api.use("session");
+  api.use("jquery");
+  api.use("tracker");
+
+  // meteor add-on packages
+  api.use("underscore");
+  api.use("logging");
+  api.use("reload");
+  api.use("random");
+  api.use("ejson");
+  api.use("check");
+  api.use("http");
+  api.use("reactive-var");
+  api.use("reactive-dict");
+
+  // community packages
+  api.use("reactioncommerce:[email protected]");
+
+  // Cart Templates
+  api.addFiles("client/templates/cart/cartDrawer/cartDrawer.html", "client");
+  api.addFiles("client/templates/cart/cartDrawer/cartDrawer.js", "client");
+
+  api.addFiles("client/templates/cart/cartDrawer/cartItems/cartItems.html", "client");
+  api.addFiles("client/templates/cart/cartDrawer/cartItems/cartItems.js", "client");
+
+  api.addFiles("client/templates/cart/cartDrawer/cartSubTotals/cartSubTotals.html", "client");
+  api.addFiles("client/templates/cart/cartDrawer/cartSubTotals/cartSubTotals.js", "client");
+
+  api.addFiles("client/templates/cart/cartIcon/cartIcon.html", "client");
+  api.addFiles("client/templates/cart/cartIcon/cartIcon.js", "client");
+
+  api.addFiles("client/templates/cart/cartPanel/cartPanel.html", "client");
+  api.addFiles("client/templates/cart/cartPanel/cartPanel.js", "client");
+
+  api.addFiles("client/templates/cart/checkout/checkout.html", "client");
+  api.addFiles("client/templates/cart/checkout/checkout.js", "client");
+
+  api.addFiles("client/templates/cart/checkout/header/header.html", "client");
+
+  api.addFiles("client/templates/cart/checkout/login/login.html", "client");
+  api.addFiles("client/templates/cart/checkout/login/login.js", "client");
+
+  api.addFiles("client/templates/cart/checkout/progressBar/progressBar.html", "client");
+  api.addFiles("client/templates/cart/checkout/progressBar/progressBar.js", "client");
+
+  api.addFiles("client/templates/cart/checkout/review/review.html", "client");
+  api.addFiles("client/templates/cart/checkout/review/review.js", "client");
+
+  api.addFiles("client/templates/cart/checkout/payment/payment.html", "client");
+  api.addFiles("client/templates/cart/checkout/payment/methods/cards.html", "client");
+  api.addFiles("client/templates/cart/checkout/payment/methods/cards.js", "client");
+
+  api.addFiles("client/templates/cart/checkout/completed/completed.html", "client");
+  api.addFiles("client/templates/cart/checkout/completed/completed.js", "client");
+
+  api.addFiles("client/templates/cart/checkout/shipping/shipping.html", "client");
+  api.addFiles("client/templates/cart/checkout/shipping/shipping.js", "client");
+
+  api.addFiles("client/templates/cart/checkout/addressBook/addressBook.html", "client");
+  api.addFiles("client/templates/cart/checkout/addressBook/addressBook.js", "client");
+});

packages/reaction-core/package.js

@@ -212,48 +212,6 @@ Package.onUse(function (api) {
   api.addFiles("client/templates/layout/notFound/notFound.html", "client");
   api.addFiles("client/templates/layout/notice/unauthorized.html", "client");
 
-  api.addFiles("client/templates/cart/cartDrawer/cartDrawer.html", "client");
-  api.addFiles("client/templates/cart/cartDrawer/cartDrawer.js", "client");
-
-  api.addFiles("client/templates/cart/cartDrawer/cartItems/cartItems.html", "client");
-  api.addFiles("client/templates/cart/cartDrawer/cartItems/cartItems.js", "client");
-
-  api.addFiles("client/templates/cart/cartDrawer/cartSubTotals/cartSubTotals.html", "client");
-  api.addFiles("client/templates/cart/cartDrawer/cartSubTotals/cartSubTotals.js", "client");
-
-  api.addFiles("client/templates/cart/cartIcon/cartIcon.html", "client");
-  api.addFiles("client/templates/cart/cartIcon/cartIcon.js", "client");
-
-  api.addFiles("client/templates/cart/cartPanel/cartPanel.html", "client");
-  api.addFiles("client/templates/cart/cartPanel/cartPanel.js", "client");
-
-  api.addFiles("client/templates/cart/checkout/checkout.html", "client");
-  api.addFiles("client/templates/cart/checkout/checkout.js", "client");
-
-  api.addFiles("client/templates/cart/checkout/header/header.html", "client");
-
-  api.addFiles("client/templates/cart/checkout/login/login.html", "client");
-  api.addFiles("client/templates/cart/checkout/login/login.js", "client");
-
-  api.addFiles("client/templates/cart/checkout/progressBar/progressBar.html", "client");
-  api.addFiles("client/templates/cart/checkout/progressBar/progressBar.js", "client");
-
-  api.addFiles("client/templates/cart/checkout/review/review.html", "client");
-  api.addFiles("client/templates/cart/checkout/review/review.js", "client");
-
-  api.addFiles("client/templates/cart/checkout/payment/payment.html", "client");
-  api.addFiles("client/templates/cart/checkout/payment/methods/cards.html", "client");
-  api.addFiles("client/templates/cart/checkout/payment/methods/cards.js", "client");
-
-  api.addFiles("client/templates/cart/checkout/completed/completed.html", "client");
-  api.addFiles("client/templates/cart/checkout/completed/completed.js", "client");
-
-  api.addFiles("client/templates/cart/checkout/shipping/shipping.html", "client");
-  api.addFiles("client/templates/cart/checkout/shipping/shipping.js", "client");
-
-  api.addFiles("client/templates/cart/checkout/addressBook/addressBook.html", "client");
-  api.addFiles("client/templates/cart/checkout/addressBook/addressBook.js", "client");
-
   api.addFiles("client/templates/dashboard/import/import.html", "client");
   api.addFiles("client/templates/dashboard/import/import.js", "client");
 

packages/reaction-shipping/client/templates/cart/checkout/shipping/shipping.html

@@ -13,11 +13,11 @@
     {{else}}
         <div class="alert alert-danger">
           <span data-i18n="checkoutShipping.noShippingMethods">No shipping methods are configured. </span>
-          <a href="/dashboard/settings/shipping">
+          <a href="{{pathFor 'dashboard/shipping'}}">
             <span data-i18n="checkoutShipping.configureNow">Configure now.</span>
           </a>
         </div>
     {{/if}}
     </ul>
   </div>
-</template>
+</template>

packages/reaction-shipping/package.js

@@ -1,7 +1,7 @@
 Package.describe({
   summary: "Reaction Shipping - Flat Rate shipping for Reaction Commerce",
   name: "reactioncommerce:reaction-shipping",
-  version: "0.6.3",
+  version: "0.7.0",
   documentation: "README.md"
 });
 
@@ -26,9 +26,9 @@ Package.onUse(function (api) {
 
   api.use("templating");
   api.use("less");
+  api.use("reactioncommerce:[email protected]");
   api.use("reactioncommerce:[email protected]");
 
-
   api.addFiles([
     "common/collections.js" // any unique collections
   ], ["client", "server"]);