@darkpos/pricing 1.0.48 → 1.0.50

package/__TEST__/modifier.test.js

@@ -0,0 +1,27 @@
+const usePricing = require('../index');
+
+const pricingService = usePricing();
+
+describe('Modifier actions', () => {
+  test('CU-86dv8hzxg modifier.isGroup fn', () => {
+    expect(
+      pricingService.modifier.isGroup({
+        attributes: ['group'],
+      })
+    ).toBe(true);
+
+    expect(
+      pricingService.modifier.isGroup({
+        properties: {
+          group: {},
+        },
+      })
+    ).toBe(false);
+    expect(
+      pricingService.modifier.isGroup({
+        atrributes: [],
+        properties: {},
+      })
+    ).toBe(false);
+  });
+});

package/lib/item/getItemModifiersDescription.js

@@ -11,7 +11,7 @@ module.exports = ({ modifierActions, _, settings }) =>
           !modifierActions.isAmountOverride(each) &&
           !modifierActions.isDepartment(each) &&
           modifierActions.isDirect(each) &&
-          !modifierActions.isGroupOfModifiers(each)
+          !modifierActions.isGroup(each)
       )
       .map(modifier => {
         const { name, _id, compute = {} } = modifier;

package/lib/modifier/index.js

@@ -148,6 +148,7 @@ const isCalculatedPaymentModifier = require('./isCalculatedPaymentModifier');
 const isChild = require('./isChild');
 const isExtractCalculatedValue = require('./isExtractCalculatedValue');
 const getPriceWithoutModifier = require('./getPriceWithoutModifier');
+const isGroup = require('./isGroup');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -309,6 +310,7 @@ const modifierActions = (deps = {}) => {
     isChild: isChild(innerDeps),
     isExtractCalculatedValue: isExtractCalculatedValue(innerDeps),
     getPriceWithoutModifier: getPriceWithoutModifier(innerDeps),
+    isGroup: isGroup(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/isGroup.js

@@ -0,0 +1,10 @@
+module.exports = ({ actions }) =>
+  function isGroup(modifier) {
+    if (!modifier) return false;
+    return !!(
+      actions.hasAttribute(modifier, 'group') ||
+      (modifier.properties &&
+        modifier.properties.group &&
+        Object.keys(modifier.properties.group) > 0)
+    );
+  };

package/lib/order/updateItemQuantity.js

@@ -14,7 +14,7 @@ module.exports = ({ actions, settings, _ }) => {
       const updatedQuantity = reset
         ? quantity
         : parseInt(`${item.quantity}${quantity}`, 10);
-      const { updatedOrder } = actions.updateItem({
+      return actions.updateItem({
         order,
         itemIndex,
         item: {
@@ -22,16 +22,18 @@ module.exports = ({ actions, settings, _ }) => {
           quantity: updatedQuantity,
         },
       });
-      return updatedOrder;
     }
     if (isBefore) {
-      return actions.addItem({
+      const result = actions.addItem({
         order,
         item: { isPending: true },
         cache,
         overridenQuantity: quantity,
       });
+
+      if (result && result.updatedOrder) return result.updatedOrder;
     }
+
     return order;
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.48",
+  "version": "1.0.50",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -40,5 +40,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "4706909fded1e1083441ae48c8dc154cd569a48b"
+  "gitHead": "fc073d4d5ff5b5473b177e9462584caed71f3867"
 }