Stripe Connect and Multi-Shop Checkout

client/modules/core/helpers/apps.js

@@ -3,7 +3,7 @@ import { Template } from "meteor/templating";
 import { Meteor } from "meteor/meteor";
 import { Roles } from "meteor/alanning:roles";
 import { Reaction } from "/client/api";
-import { Packages } from "/lib/collections";
+import { Packages, Shops } from "/lib/collections";
 
 
 /**
@@ -49,6 +49,7 @@ export function Apps(optionHash) {
   let key;
   const reactionApps = [];
   let options = {};
+  let shopType;
 
   // allow for object or option.hash
   if (optionHash) {
@@ -64,6 +65,13 @@ export function Apps(optionHash) {
     options.shopId = Reaction.getShopId();
   }
 
+  // Get the shop to determine shopType
+  const shop = Shops.findOne({ _id: options.shopId });
+  if (shop) {
+    shopType = shop.shopType;
+  }
+
+
   // remove audience permissions for owner (still needed here for older/legacy calls)
   if (Reaction.hasOwnerAccess() && options.audience) {
     delete options.audience;
@@ -130,6 +138,20 @@ export function Apps(optionHash) {
         delete itemFilter.audience;
       }
 
+      // Check that shopType matches showForShopType if option is present
+      if (item.showForShopTypes &&
+          Array.isArray(item.showForShopTypes) &&
+          item.showForShopTypes.indexOf(shopType) === -1) {
+        return false;
+      }
+
+      // Check that shopType does not match hideForShopType if option is present
+      if (item.hideForShopTypes &&
+          Array.isArray(item.hideForShopTypes) &&
+          item.hideForShopTypes.indexOf(shopType) !== -1) {
+        return false;
+      }
+
       return _.isMatch(item, itemFilter);
     });
 

client/modules/core/main.js

@@ -30,13 +30,14 @@ export default {
 
   init() {
     Tracker.autorun(() => {
-      // marketplaceSettings come over on the PrimarySHopPackages subscription
+      // marketplaceSettings come over on the PrimaryShopPackages subscription
       if (this.Subscriptions.PrimaryShopPackages.ready()) {
         if (!this.marketplace._ready) {
           const marketplacePkgSettings = this.getMarketplaceSettings();
           if (marketplacePkgSettings && marketplacePkgSettings.public) {
-            marketplacePkgSettings._ready = true;
+            this.marketplace._ready = true;
             this.marketplace = marketplacePkgSettings.public;
+            this.marketplace.enabled = true;
           }
         }
       }
@@ -487,6 +488,11 @@ export default {
     return Packages.findOne(query);
   },
 
+  getPackageSettingsWithOptions(options) {
+    const query = options;
+    return Packages.findOne(query);
+  },
+
   allowGuestCheckout() {
     let allowGuest = false;
     const settings = this.getShopSettings();

client/modules/core/subscriptions.js

@@ -37,8 +37,14 @@ Subscriptions.PrimaryShop = Subscriptions.Manager.subscribe("PrimaryShop");
 // Additional shop subscriptions
 Subscriptions.MerchantShops = Subscriptions.Manager.subscribe("MerchantShops");
 
-// Init Packages sub so we have a "ready" state
+// This Packages subscription is used for the Active shop's packages
+// // Init sub here so we have a "ready" state
 Subscriptions.Packages = Subscriptions.Manager.subscribe("Packages");
+
+// This packages subscription is used for the Primary Shop's packages
+// The Packages publication defaults to returning the primaryShopId's packages,
+// so this subscription shouldn't ever need to be changed
+// TODO: Consider how to handle routes for several shops which are all active at once
 Subscriptions.PrimaryShopPackages = Subscriptions.Manager.subscribe("Packages");
 
 Subscriptions.Tags = Subscriptions.Manager.subscribe("Tags");
@@ -82,14 +88,9 @@ Tracker.autorun(() => {
 
 Tracker.autorun(() => {
   // Reload Packages sub if shopId changes
-  if (Reaction.getShopId()) {
+  // We have a persistent subscription to the primary shop's packages,
+  // so don't refresh sub if we're updating to primaryShopId sub
+  if (Reaction.getShopId() && Reaction.getShopId() !== Reaction.getPrimaryShopId()) {
     Subscriptions.Packages = Subscriptions.Manager.subscribe("Packages", Reaction.getShopId());
   }
 });
-
-Tracker.autorun(() => {
-  // Reload Packages sub if primaryShopId changes
-  if (Reaction.getPrimaryShopId()) {
-    Subscriptions.PrimaryShopPackages = Subscriptions.Manager.subscribe("Packages", Reaction.getPrimaryShopId());
-  }
-});

imports/plugins/core/checkout/client/methods/cart.js

@@ -7,6 +7,9 @@ import { Cart } from "/lib/collections";
 // Client Cart Methods
 // Stubs with matching server methods.
 Meteor.methods({
+  // Not used for stripe connect integration
+  // Under consideration for deprecation and migrating other payment Packages
+  // to payments-stripe style methods
   "cart/submitPayment": function (paymentMethod) {
     check(paymentMethod, Reaction.Schemas.PaymentMethod);
     const checkoutCart = Cart.findOne({

imports/plugins/core/dashboard/client/templates/shop/settings/settings.html

@@ -114,20 +114,22 @@
         <div class="panel-heading panel-heading-flex">
           <div class="panel-title">
             <a
-              href="#collapsable-{{name}}"
-              aria-controls="collapsable-{{name}}"
+              href="#collapsable-{{template}}"
+              aria-controls="collapsable-{{template}}"
               role="button"
               data-toggle="collapse"
               data-parent="#shopSettingsAccordian">
               <i class="{{icon}}"></i>
               <span data-i18n="{{i18nKeyLabel}}">{{label}}</span>
             </a>
           </div>
+          {{#if showAppSwitch}}
           <div class="panel-controls">
             <input class="checkbox-switch" type="checkbox" name="enabled" data-id={{packageId}} data-key="{{settingsKey}}" {{checked enabled}}>
           </div>
+          {{/if}}
         </div>
-        <div id="collapsable-{{name}}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="collapsable-{{name}}">
+        <div id="collapsable-{{template}}" class="panel-collapse collapse" role="tabpanel" aria-labelledby="collapsable-{{template}}">
           <div class="panel-body {{shown enabled}}">
             {{> Template.dynamic template=template data=.}}
           </div>

imports/plugins/core/dashboard/client/templates/shop/settings/settings.js

@@ -153,6 +153,15 @@ Template.shopSettings.helpers({
       _id: Reaction.getShopId()
     }).addressBook;
     return address[0];
+  },
+  showAppSwitch() {
+    if (Reaction.getMarketplaceSettings()) {
+      // if marketplace is enabled, only the primary shop can switch apps on and off.
+      return Reaction.getShopId() === Reaction.getPrimaryShopId();
+    }
+
+    // If marketplace is disabled, every shop can switch apps
+    return true;
   }
 });