Merge pull request #242 from reactioncommerce/refactor-localization-s…

…ettings-form Refactor localization settings form
reactioncommerce · Mar 13, 2020 · c7f5c95 · c7f5c95
2 parents f1a2704 + 7bca8a3
commit c7f5c95
Show file tree

Hide file tree

Showing 10 changed files with 304 additions and 407 deletions.
diff --git a/imports/plugins/core/core/server/methods/shop/index.js b/imports/plugins/core/core/server/methods/shop/index.js
@@ -1,9 +1,6 @@
 import createTag from "./createTag";
 import updateBrandAssets from "./updateBrandAssets";
-import updateCurrencyConfiguration from "./updateCurrencyConfiguration";
-import updateDefaultParcelSize from "./updateDefaultParcelSize";
 import updateHeaderTags from "./updateHeaderTags";
-import updateLanguageConfiguration from "./updateLanguageConfiguration";
 
 /**
  * @file Meteor methods for Shop
@@ -15,8 +12,5 @@ import updateLanguageConfiguration from "./updateLanguageConfiguration";
 export default {
   "shop/createTag": createTag,
   "shop/updateBrandAssets": updateBrandAssets,
-  "shop/updateCurrencyConfiguration": updateCurrencyConfiguration,
-  "shop/updateDefaultParcelSize": updateDefaultParcelSize,
-  "shop/updateHeaderTags": updateHeaderTags,
-  "shop/updateLanguageConfiguration": updateLanguageConfiguration
+  "shop/updateHeaderTags": updateHeaderTags
 };
diff --git a/imports/plugins/core/core/server/methods/shop/updateCurrencyConfiguration.js b/imports/plugins/core/core/server/methods/shop/updateCurrencyConfiguration.js
diff --git a/imports/plugins/core/core/server/methods/shop/updateDefaultParcelSize.js b/imports/plugins/core/core/server/methods/shop/updateDefaultParcelSize.js
diff --git a/imports/plugins/core/core/server/methods/shop/updateLanguageConfiguration.js b/imports/plugins/core/core/server/methods/shop/updateLanguageConfiguration.js
diff --git a/imports/plugins/core/dashboard/client/graphql/fragments/shopCommon.js b/imports/plugins/core/dashboard/client/graphql/fragments/shopCommon.js
@@ -16,13 +16,34 @@ export default gql`
       phone
       isCommercial
     }
+    baseUOL
+    baseUOM
+    currency {
+      code
+    }
+    defaultParcelSize {
+      width
+      weight
+      height
+      length
+    }
     description
     emails {
       address
     }
     keywords
+    language
     name
     slug
+    timezone
+    unitsOfLength {
+      uol
+      label
+    }
+    unitsOfMeasure { 
+      uom
+      label
+    }
   }
 `;