@darkpos/pricing 1.0.117 → 1.0.120

package/__TEST__/modifier/getInvalidRequiredModifiers.test.js

@@ -281,3 +281,41 @@ test('getInvalidRequiredModifiers  having related items', () => {
     name: 'White',
   });
 });
+
+test('getInvalidRequiredModifiers  having override modifiers', () => {
+  const item = {
+    modifiers: [
+      {
+        _id: '675354ee39a47228afd1f1a4',
+        attributes: ['override'],
+        modifierId: '6751f7eeb60c71cefee138ee',
+        name: 'Override modamount fixed 10',
+        group: 'Upcharge',
+        type: 'fee',
+        tags: ['default', 'all'],
+        direct: true,
+        required: true,
+        properties: {
+          override: {
+            type: 'fixed',
+            field: 'amount',
+            fixedValue: undefined,
+            multiplier: false,
+          },
+        },
+      },
+    ],
+    _id: '67dc63610c106ab7d481d7dd',
+    itemId: '62cdbfd01ee1b4001932821a',
+  };
+
+  const response = pricingService.item.getInvalidRequiredModifiers({
+    item,
+  });
+
+  expect(response.length).toBe(1);
+  expect(response[0]).toMatchObject({
+    _id: '675354ee39a47228afd1f1a4',
+    name: 'Override modamount fixed 10',
+  });
+});

package/lib/item/getInvalidRequiredModifiers.js

@@ -6,8 +6,9 @@ module.exports = ({ modifierActions, actions }) =>
     item.modifiers.forEach(modifier => {
       if (
         modifierActions.isRequired(modifier) &&
-        modifierActions.isGroup(modifier) &&
-        !actions.hasModifier({ item, modifier, relatedItems })
+        ((modifierActions.isGroup(modifier) &&
+          !actions.hasModifier({ item, modifier, relatedItems })) ||
+          modifierActions.isEmptyOverride(modifier))
       ) {
         invalidModifiers.push(modifier);
       }

package/lib/item/getPipeModifiers.js

@@ -3,8 +3,9 @@ module.exports = ({ modifierActions }) =>
     if (!item || !Array.isArray(item.modifiers)) return [];
     return item.modifiers.filter(
       modifier =>
-        modifierActions.isGroup(modifier) &&
         modifierActions.isRequired(modifier) &&
-        modifierActions.enableAutoPopup(modifier)
+        ((modifierActions.isGroup(modifier) &&
+          modifierActions.enableAutoPopup(modifier)) ||
+          modifierActions.isOverride(modifier))
     );
   };

package/lib/item/index.js

@@ -70,6 +70,7 @@ const adjustNegativeTotal = require('./adjustNegativeTotal');
 const applyNotesOverridesToItem = require('./applyNotesOverridesToItem');
 const getModifiersToNotCompute = require('./getModifiersToNotCompute');
 const getSplitDepartment = require('./getSplitDepartment');
+const isPriceChanged = require('./isPriceChanged');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -153,6 +154,7 @@ const itemActions = (deps = {}) => {
     applyNotesOverridesToItem: applyNotesOverridesToItem(innerDeps),
     getModifiersToNotCompute: getModifiersToNotCompute(innerDeps),
     getSplitDepartment: getSplitDepartment(innerDeps),
+    isPriceChanged: isPriceChanged(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/isPriceChanged.js

@@ -0,0 +1,5 @@
+module.exports = () =>
+  function isPriceChanged(item) {
+    if (!item || !item.properties) return false;
+    return !!item.properties.priceChanged;
+  };

package/lib/modifier/calculatePaymentModifier.js

@@ -47,6 +47,9 @@ module.exports = ({ actions, utils }) => {
     }
 
     if (actions.isAdd(paymentModifier)) {
+      if (amountToPay > itemBalance) {
+        amountToPay = itemBalance;
+      }
       return actions.calculatePaymentFeeModifier({
         amountToPay,
         paymentModifier,

package/lib/modifier/index.js

@@ -178,6 +178,7 @@ const isKeepRelatedItems = require('./isKeepRelatedItems');
 const isSplitDepartment = require('./isSplitDepartment');
 const isModifierValid = require('./isModifierValid');
 const markModifierAsNotValid = require('./markModifierAsNotValid');
+const isEmptyOverride = require('./isEmptyOverride');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -369,6 +370,7 @@ const modifierActions = (deps = {}) => {
     isSplitDepartment: isSplitDepartment(innerDeps),
     isModifierValid: isModifierValid(innerDeps),
     markModifierAsNotValid: markModifierAsNotValid(innerDeps),
+    isEmptyOverride: isEmptyOverride(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/isEmptyOverride.js

@@ -0,0 +1,14 @@
+module.exports = ({ actions }) =>
+  function isEmptyOverride(modifier) {
+    if (!actions.isOverride(modifier) || actions.isNotesOverride(modifier))
+      return false;
+    const computeAmount = modifier.compute && modifier.compute.amount;
+    const { fixedValue } = modifier.properties.override;
+
+    console.log({ computeAmount, fixedValue });
+
+    const result =
+      typeof computeAmount !== 'number' && typeof fixedValue !== 'number';
+
+    return result;
+  };

package/lib/order/addItem.js

@@ -218,10 +218,6 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
     let [nextOrder, nextItemIndex] = params;
     const [, , nextItem] = params;
 
-    const overrideModifiers = modifiersToAdd.filter(modToAdd =>
-      modifierActions.isOverride(modToAdd)
-    );
-
     if (modifiersToAdd.length) {
       nextOrder = modifiersToAdd.reduce(
         (acc, modifier) =>
@@ -287,7 +283,6 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
       updatedOrder: nextOrder,
       itemIndex: nextItemIndex,
       item: nextItem,
-      overrideModifiers,
     };
   };
 };

package/lib/order/addItemModifier.js

@@ -39,6 +39,8 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       ...(item.properties || {}),
     };
 
+    if (itemActions.isPriceChanged(item)) return item;
+
     item.price = itemActions.getItemPrice({
       item,
       itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
@@ -65,7 +67,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     }
 
     const customer = actions.getCustomer(order);
-    const contains =
+    let contains =
       !_.isEmpty(item.modifiers) &&
       modifierActions.contains(
         item.modifiers.filter(mod => !modifierActions.isGroupOfModifiers(mod)),
@@ -97,13 +99,21 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
         return order;
       }
 
+      const isOverride = modifierActions.isOverride(modifier);
+
       order = actions.removeItemModifier({
         order,
         modifier,
         itemIndex,
         originalItem,
+        forceRemove: isOverride,
       });
-      return order;
+
+      if (!isOverride) {
+        return order;
+      }
+      contains = false;
+      item = actions.getSelectedItem({ order, itemIndex });
     }
 
     const modifiersToRemove = itemActions.getModifiersBySingleValueId({

package/lib/order/removeItemModifier.js

@@ -17,14 +17,16 @@ module.exports = ({ actions, modifierActions, itemActions, _ }) => {
     modifier,
     itemIndex,
     originalItem,
+    forceRemove,
   }) {
     const order = _.cloneDeep(orderProp);
 
     if (
-      !order ||
-      itemIndex < 0 ||
-      !modifier ||
-      modifierActions.isRequired(modifier)
+      !forceRemove &&
+      (!order ||
+        itemIndex < 0 ||
+        !modifier ||
+        modifierActions.isRequired(modifier))
     )
       return order;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.117",
+  "version": "1.0.120",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -55,5 +55,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "3519ea921f066379601e455e8d838bdad9378dd0"
+  "gitHead": "60acf14d0f3046fd5c04ca2ddc0fbc89832eb561"
 }