Merge pull request #622 from evershopcommerce/dev

Dev

packages/azure_file_storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evershop/azure_file_storage",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "An extension for EverShop to use Azure File Storage",
   "repository": {
     "type": "git",

packages/evershop/src/components/common/form/fields/Editor.scss

@@ -27,3 +27,7 @@ body .codex-editor {
 #rows .draggable-source--is-dragging>* {
   visibility: hidden;
 }
+
+.ce-rawtool__textarea {
+  z-index: 0;
+}

packages/evershop/src/modules/base/pages/global/response[errorHandler].js

@@ -41,6 +41,26 @@ module.exports = async (request, response, delegate, next) => {
           isApi: route.isApi,
           isAdmin: route.isAdmin
         };
+        let widgetInstances;
+        // Check if we are in the test mode
+        if (process.env.NODE_ENV === 'test') {
+          widgetInstances = [];
+        } else {
+          widgetInstances = await loadWidgetInstances(request);
+        }
+        widgetInstances = widgetInstances.map((widget) => {
+          const newWidget = {
+            sortOrder: widget.sortOrder,
+            areaId: widget.areaId,
+            type: widget.type
+          };
+          newWidget.id = `e${widget.uuid.replace(/-/g, '')}`;
+          if (route.isAdmin) {
+            newWidget.areaId = 'widget_setting_form';
+          }
+          return newWidget;
+        });
+        response.locals.widgets = widgetInstances;
         if (
           (isDevelopmentMode() &&
             request.query &&
@@ -51,30 +71,11 @@ module.exports = async (request, response, delegate, next) => {
             success: true,
             eContext: {
               graphqlResponse: get(response, 'locals.graphqlResponse', {}),
-              propsMap: get(response, 'locals.propsMap', {})
+              propsMap: get(response, 'locals.propsMap', {}),
+              widgets: widgetInstances
             }
           });
         } else {
-          let widgetInstances;
-          // Check if we are in the test mode
-          if (process.env.NODE_ENV === 'test') {
-            widgetInstances = [];
-          } else {
-            widgetInstances = await loadWidgetInstances(request);
-          }
-          widgetInstances = widgetInstances.map((widget) => {
-            const newWidget = {
-              sortOrder: widget.sortOrder,
-              areaId: widget.areaId,
-              type: widget.type
-            };
-            newWidget.id = `e${widget.uuid.replace(/-/g, '')}`;
-            if (route.isAdmin) {
-              newWidget.areaId = 'widget_setting_form';
-            }
-            return newWidget;
-          });
-          response.locals.widgets = widgetInstances;
           render(request, response);
         }
       }

packages/evershop/src/modules/catalog/pages/admin/productEdit+productNew/Attributes.jsx

@@ -254,7 +254,7 @@ export const layout = {
 };
 
 export const query = `
-  query Query {
+  query Query ($filters: [FilterInput!]) {
     product(id: getContextValue("productId", null)) {
       groupId
       variantGroupId
@@ -264,7 +264,7 @@ export const query = `
         optionText
       }
     },
-    groups: attributeGroups {
+    groups: attributeGroups(filters: $filters) {
       items {
         groupId: attributeGroupId
         groupName
@@ -285,3 +285,8 @@ export const query = `
     }
   }
 `;
+
+export const variables = `
+{
+  filters: [{ key: "limit", operation: 'eq', value: 1000 }]
+}`;

packages/evershop/src/modules/checkout/api/createCart/createNewCart.js

@@ -70,7 +70,7 @@ module.exports = async (request, response, delegate, next) => {
         groupedItems.map((item) => item.sku)
       )
       .and('status', '=', 1)
-      .load(pool);
+      .execute(pool);
     // Check if all products are available
     if (products.length !== groupedItems.length) {
       response.status(INVALID_PAYLOAD);

packages/evershop/src/modules/checkout/tests/unit/lineTotal.test.js

@@ -15,7 +15,8 @@ describe('Test line total calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('line_total')).toEqual(100);
     const item2 = await cart.addItem(2, 2);
@@ -26,7 +27,8 @@ describe('Test line total calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('line_total_incl_tax')).toEqual(110);
     const item2 = await cart.addItem(2, 2);

packages/evershop/src/modules/checkout/tests/unit/productPrice.test.js

@@ -15,7 +15,8 @@ describe('Test product price calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('product_price')).toEqual(100);
     expect(item.getData('final_price')).toEqual(100);
@@ -28,7 +29,8 @@ describe('Test product price calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('product_price_incl_tax')).toEqual(110);
     expect(item.getData('final_price_incl_tax')).toEqual(110);

packages/evershop/src/modules/checkout/tests/unit/taxAmount.test.js

@@ -15,7 +15,8 @@ describe('Test tax amount calculation', () => {
     const cart = new Cart({
       status: 1
     });
-
+    const priceConfig = config.get('pricing');
+    priceConfig.tax.price_including_tax = false;
     const item = await cart.addItem(1, 1);
     expect(item.getData('tax_amount')).toEqual(10);
     const item2 = await cart.addItem(2, 2);

packages/s3_file_storage/bootstrap.js

@@ -1,12 +1,32 @@
 const { addProcessor } = require('@evershop/evershop/src/lib/util/registry');
+const { merge } = require('@evershop/evershop/src/lib/util/merge');
 const { awsFileUploader } = require('./services/awsFileUploader');
 const { awsFileDeleter } = require('./services/awsFileDeleter');
 const { awsFileBrowser } = require('./services/awsFileBrowser');
 const { awsFolderCreator } = require('./services/awsFolderCreator');
 
 module.exports = () => {
+  addProcessor('configuratonSchema', (schema) => {
+    merge(
+      schema,
+      {
+        properties: {
+          system: {
+            type: 'object',
+            properties: {
+              file_storage: {
+                enum: ['s3']
+              }
+            }
+          }
+        }
+      },
+      100
+    );
+    return schema;
+  });
   addProcessor('fileUploader', function (value) {
-    const {config} = this;
+    const { config } = this;
     if (config === 's3') {
       return awsFileUploader;
     } else {
@@ -15,7 +35,7 @@ module.exports = () => {
   });
 
   addProcessor('fileDeleter', function (value) {
-    const {config} = this;
+    const { config } = this;
     if (config === 's3') {
       return awsFileDeleter;
     } else {
@@ -24,7 +44,7 @@ module.exports = () => {
   });
 
   addProcessor('folderCreator', function (value) {
-    const {config} = this;
+    const { config } = this;
     if (config === 's3') {
       return awsFolderCreator;
     } else {
@@ -33,7 +53,7 @@ module.exports = () => {
   });
 
   addProcessor('fileBrowser', function (value) {
-    const {config} = this;
+    const { config } = this;
     if (config === 's3') {
       return awsFileBrowser;
     } else {

packages/s3_file_storage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evershop/s3_file_storage",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "An extension for EverShop to use AWS S3 File Storage",
   "repository": {
     "type": "git",