Merge branch 'develop' into feat-aldeed-demeteor-accounts-plugin

reactioncommerce · Oct 8, 2019 · 34d36ae · 34d36ae
2 parents 34fbbd1 + ba8a7f0
commit 34d36ae
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 28 deletions.
diff --git a/imports/node-app/core-services/account/startup.js b/imports/node-app/core-services/account/startup.js
@@ -32,7 +32,7 @@ export default async function startup(context) {
   });
 
   appEvents.on("afterShopCreate", async (payload) => {
-    const { shop } = payload;
+    const { shop, shopAdminUserId } = payload;
     let { createdBy: userId } = payload;
     const { _id: newShopId, shopType } = shop;
 
@@ -64,10 +64,10 @@ export default async function startup(context) {
     }
 
     // If a user created the shop, give the user owner access to it
-    if (userId) {
+    if (shopAdminUserId) {
       // Add users to roles
       await users.updateOne({
-        _id: userId
+        _id: shopAdminUserId
       }, {
         $addToSet: {
           [`roles.${newShopId}`]: {
@@ -77,7 +77,7 @@ export default async function startup(context) {
       });
 
       // Set the active shopId for this user
-      await Accounts.updateOne({ userId }, {
+      await Accounts.updateOne({ shopAdminUserId }, {
         $set: {
           "profile.preferences.reaction.activeShopId": newShopId,
           "shopId": newShopId
@@ -87,7 +87,7 @@ export default async function startup(context) {
         }
       });
 
-      const updatedAccount = await Accounts.findOne({ userId });
+      const updatedAccount = await Accounts.findOne({ shopAdminUserId });
       Promise.await(appEvents.emit("afterAccountUpdate", {
         account: updatedAccount,
         updatedBy: userId,

diff --git a/imports/plugins/core/core/server/methods/shop/createShop.js b/imports/plugins/core/core/server/methods/shop/createShop.js
@@ -145,7 +145,7 @@ export default function createShop(shopAdminUserId, partialShopData) {
   // we should have created new shop, or erred
   Logger.info("Created shop: ", newShopId);
 
-  Promise.await(appEvents.emit("afterShopCreate", { createdBy: userId, shop: newShop }));
+  Promise.await(appEvents.emit("afterShopCreate", { createdBy: userId, shop: newShop, shopAdminUserId: shopAdminUserId || userId }));
 
   // Add this shop to the merchant
   Shops.update({ _id: primaryShopId }, {

diff --git a/imports/plugins/included/product-admin/client/components/ProductTable.js b/imports/plugins/included/product-admin/client/components/ProductTable.js
@@ -98,7 +98,6 @@ function ProductTable({ history }) {
     onDrop,
     multiple: true,
     disablePreview: true,
-    accept: "text/csv",
     disableClick: true
   });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -117,7 +117,7 @@
     "react-dnd": "^7.0.1",
     "react-dnd-html5-backend": "^7.0.1",
     "react-dom": "16.8.6",
-    "react-dropzone": "^10.1.7",
+    "react-dropzone": "^10.1.10",
     "react-helmet": "^5.2.0",
     "react-image-magnify": "^2.7.4",
     "react-loadable": "^5.5.0",