@darkpos/pricing 1.0.95 → 1.0.97

package/__TEST__/item.test.js

@@ -597,7 +597,6 @@ describe('Item actions', () => {
         },
       ],
       _id: '675354e939a47228afd1f199',
-      properties: { basePrice: 13.5 },
 
       itemId: '62cdbfd01ee1b400193281ee',
     };
@@ -651,7 +650,6 @@ describe('Item actions', () => {
         },
       ],
       _id: '675354e939a47228afd1f199',
-      properties: { basePrice: 13.5 },
 
       itemId: '62cdbfd01ee1b400193281ee',
     };
@@ -704,7 +702,6 @@ describe('Item actions', () => {
       quantity: 3,
       modifiers: [quantityOverrideMod],
       _id: '67535f34b4c5ea63d2d79640',
-      properties: { basePrice: 13.5 },
       itemId: '62cdbfd01ee1b400193281ee',
       menuRuleId: '65660855dfffaf2da26fb870',
       __typename: 'OrderItem',
@@ -780,7 +777,6 @@ describe('Item actions', () => {
         },
       ],
       _id: '675354e939a47228afd1f199',
-      properties: { basePrice: 13.5 },
 
       itemId: '62cdbfd01ee1b400193281ee',
     };
@@ -810,7 +806,7 @@ describe('Item actions', () => {
       name: "Men's 3pc Tuxedo",
       pieces: 3,
       total: 141.75,
-      price: 135,
+      price: 13.5,
       quantity: 1,
       modifiers: [
         {
@@ -837,7 +833,6 @@ describe('Item actions', () => {
         },
       ],
       _id: '675360d5bc57ccecf751a5b5',
-      properties: { basePrice: 13.5 },
       itemId: '62cdbfd01ee1b400193281ee',
     };
     const newItem = pricingService.item.calculate(item);
@@ -1161,9 +1156,6 @@ describe('Item actions', () => {
       modifiers: [groupMod],
       _id: '67e2cadd8dcf08ebcc5ef887',
       __typename: 'OrderItem',
-      properties: {
-        basePrice: 100,
-      },
     };
 
     const relatedItem1 = {
@@ -1259,9 +1251,6 @@ describe('Item actions', () => {
       modifiers: [groupMod, rawRelatedMod1],
       _id: '67e2cadd8dcf08ebcc5ef887',
       __typename: 'OrderItem',
-      properties: {
-        basePrice: 100,
-      },
     };
 
     const relatedItem1 = {

package/__TEST__/manualTest.test.js

@@ -36,9 +36,7 @@ describe('Manual actions', () => {
       modifiers: [groupMod],
       _id: '67e2cadd8dcf08ebcc5ef887',
       __typename: 'OrderItem',
-      properties: {
-        basePrice: 100,
-      },
+
       itemId: 'abcd123',
     };
 

package/__TEST__/modifier/getInvalidRequiredModifiers.test.js

@@ -265,7 +265,6 @@ test('getInvalidRequiredModifiers  having related items', () => {
         parentItemId: '62cdbfd01ee1b4001932821a',
         parentId: '67dc63610c106ab7d481d7dd',
         includeParent: true,
-        basePrice: 3,
         groupPath: ',67dc63610c106ab7d481d7de',
       },
     },

package/__TEST__/modifier.test.js

@@ -162,9 +162,7 @@ describe('Modifier actions', () => {
       itemId: '123',
       price: 100,
       modifiers: [],
-      properties: {
-        basePrice: 100,
-      },
+      properties: {},
     });
 
     const conditionsBag = [];
@@ -467,7 +465,6 @@ describe('Modifier actions', () => {
               url: null,
               color: 'rgba(254,86,33,1)',
               iconName: 'ActivitySquare',
-              basePrice: 213,
             },
             hasInventory: true,
             inventoryType: 'push',

package/__TEST__/order/order-payment-modifier.test.js

@@ -1435,4 +1435,67 @@ describe('Order actions', () => {
     expect(resultedOrderPrepay.modifiers[1]._computed.amount).toBe(-1);
     expect(resultedOrderPrepay.modifiers[2]._computed.amount).toBe(-1);
   });
+
+  test('Should ignore modifier when conditions are not met and apply it when they are', () => {
+    const cashDiscountModifier = {
+      _id: '670e7cd236bf42091cb35624',
+      attributes: [],
+      modifierId: '670d7f7e746d1ae0f847aba6',
+      _parentId: null,
+      locked: false,
+      name: 'CASH 2 USD DISCOUNT',
+      sku: '',
+      description: '',
+      group: 'Offers',
+      type: 'discount',
+      tags: ['default', 'all'],
+      conditions: {
+        valid: false,
+        rules: [
+          {
+            key: 'paymentTypes',
+            value: ['cash'],
+            operand: '$nin',
+          },
+        ],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 2,
+      },
+    };
+    const orderItem = {
+      price: 10,
+      quantity: 1,
+      modifiers: [cashDiscountModifier],
+      total: 10,
+      totalPaid: 0,
+    };
+
+    let cashFixedDiscountOrder = pricingService.order.calculate(
+      { items: [orderItem] },
+      { paymentType: 'cash' }
+    );
+
+    expect(cashFixedDiscountOrder).toHaveProperty('total', 10);
+    expect(cashFixedDiscountOrder).toHaveProperty('subTotal', 10);
+    expect(cashFixedDiscountOrder).toHaveProperty('subTotals', {});
+    expect(cashFixedDiscountOrder.items[0].modifiers).toHaveLength(1);
+
+    cashFixedDiscountOrder = pricingService.order.calculate(
+      { items: [orderItem] },
+      {
+        paymentType: 'check',
+        amountToPay: 1,
+        lockPaymentModifiers: true,
+      }
+    );
+    expect(cashFixedDiscountOrder).toHaveProperty('total', 8);
+    expect(cashFixedDiscountOrder).toHaveProperty('subTotal', 10);
+    expect(cashFixedDiscountOrder).toHaveProperty('subTotals', {
+      discount: -2,
+    });
+    expect(cashFixedDiscountOrder.items[0].modifiers).toHaveLength(2);
+  });
 });

package/__TEST__/order/order.test.js

@@ -3300,9 +3300,6 @@ describe('Order actions', () => {
       totalPaid: 0,
       notes: [],
       subTotals: {},
-      properties: {
-        basePrice: 0,
-      },
     };
 
     const item2 = {
@@ -3322,9 +3319,6 @@ describe('Order actions', () => {
       total: 12,
       totalPaid: 0,
       subTotals: {},
-      properties: {
-        basePrice: 12,
-      },
     };
 
     const order = {
@@ -3474,9 +3468,6 @@ describe('Order actions', () => {
       totalPaid: 0,
       notes: [],
       subTotals: {},
-      properties: {
-        basePrice: 0,
-      },
     };
 
     const item2 = {
@@ -3496,9 +3487,6 @@ describe('Order actions', () => {
       total: 12,
       totalPaid: 0,
       subTotals: {},
-      properties: {
-        basePrice: 12,
-      },
     };
 
     const order = {
@@ -3648,9 +3636,6 @@ describe('Order actions', () => {
       totalPaid: 0,
       notes: [],
       subTotals: {},
-      properties: {
-        basePrice: 0,
-      },
       _id: 1,
     };
 

package/lib/item/calculate.js

@@ -58,6 +58,9 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
         startRequestDate,
         endRequestDate,
         allItems,
+        paymentMethod,
+        paymentType,
+        isPrepay,
       })
     );
 
@@ -66,19 +69,15 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
         ((each.compute && each.compute.type) ||
           (modifierActions.isOverride(each) &&
             !modifierActions.isNotesOverride(each))) &&
-        modifierActions.isValid(each)
+        modifierActions.isValid(each) &&
+        !modifierActions.isPaymentModifier(each)
     );
 
     const paymentModifiersToCompute = validatedModifiers
       .filter(
         modifier =>
-          modifierActions.isPaymentModifier(modifier) &&
-          modifierActions.hasPaymentMethodType({
-            paymentModifier: modifier,
-            paymentMethod,
-            paymentType,
-            isPrepay,
-          })
+          modifierActions.isValid(modifier) &&
+          modifierActions.isPaymentModifier(modifier)
       )
       .filter(paymentModifier => {
         const childModifiers = modifierActions.getChildren({
@@ -161,10 +160,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
               typeof item.totalPaid === 'number' && item.totalPaid > 0
                 ? actions.getItemsBalance({ items: [item] })
                 : math.sub(computedPrice, item.totalPaid),
-            paymentMethod,
-            paymentType,
             paymentId,
-            isPrepay,
           });
         }
 

package/lib/item/getBasePrice.js

@@ -1,7 +1,5 @@
 module.exports = () =>
   function getBasePrice(item) {
     if (!item) return 0;
-    if (!item.properties || typeof item.properties.basePrice !== 'number')
-      return item.price;
-    return item.properties.basePrice;
+    return item.price || 0;
   };

package/lib/item/index.js

@@ -33,7 +33,6 @@ const isFullyPaid = require('./isFullyPaid');
 const getTotalPrice = require('./getTotalPrice');
 const getItems = require('./getItems');
 const getAmounts = require('./getAmounts');
-const hasPaymentMethodType = require('./hasPaymentMethodType');
 const removePaymentModifiersByPaymentId = require('./removePaymentModifiersByPaymentId');
 const hasPaymentModifierWithPaymentId = require('./hasPaymentModifierWithPaymentId');
 const getBalance = require('./getBalance');
@@ -111,7 +110,6 @@ const itemActions = (deps = {}) => {
     getTotalPrice: getTotalPrice(innerDeps),
     getItems: getItems(innerDeps),
     getAmounts: getAmounts(innerDeps),
-    hasPaymentMethodType: hasPaymentMethodType(innerDeps),
     removePaymentModifiersByPaymentId:
       removePaymentModifiersByPaymentId(innerDeps),
     hasPaymentModifierWithPaymentId: hasPaymentModifierWithPaymentId(innerDeps),

package/lib/modifier/areConditionsMet.js

@@ -1,7 +1,15 @@
 module.exports = ({ actions, utils }) => {
   const modifierConditionPass = (
     modifier,
-    { item, startRequestDate, endRequestDate, allItems }
+    {
+      item,
+      startRequestDate,
+      endRequestDate,
+      allItems,
+      paymentMethod,
+      paymentType,
+      isPrepay,
+    }
   ) =>
     modifier.conditions && Array.isArray(modifier.conditions.rules)
       ? modifier.conditions.rules.every(condition => {
@@ -89,11 +97,17 @@ module.exports = ({ actions, utils }) => {
                 condition.operand
               );
             case 'paymentMethods':
-              return false;
+              return actions.validatePaymentCondition({
+                condition,
+                paymentValue: paymentMethod,
+              });
             case 'paymentTypes':
-              return false;
+              return actions.validatePaymentCondition({
+                condition,
+                paymentValue: paymentType,
+              });
             case 'payment': {
-              return false;
+              return !!isPrepay;
             }
             default:
               return false;
@@ -107,6 +121,9 @@ module.exports = ({ actions, utils }) => {
       endRequestDate = null,
       startRequestDate = null,
       allItems = null,
+      paymentMethod,
+      paymentType,
+      isPrepay,
     } = opts;
     return (
       modifier &&
@@ -115,6 +132,9 @@ module.exports = ({ actions, utils }) => {
         startRequestDate,
         endRequestDate,
         allItems,
+        paymentMethod,
+        paymentType,
+        isPrepay,
       })
     );
   }

package/lib/modifier/calculatePaymentModifier.js

@@ -5,20 +5,9 @@ module.exports = ({ actions, utils }) => {
     paymentModifier: paymentModifierParam,
     amountToPay: amountToPayParam,
     itemBalance: itemBalanceParam,
-    paymentMethod,
-    paymentType,
     paymentId,
-    isPrepay,
   }) {
-    if (
-      !actions.hasPaymentMethodType({
-        paymentModifier: paymentModifierParam,
-        paymentMethod,
-        paymentType,
-        isPrepay,
-      })
-    )
-      return undefined;
+    if (!actions.isValid(paymentModifierParam)) return false;
 
     const paymentModifier = {
       ...paymentModifierParam,

package/lib/modifier/createDescription.js

@@ -1,4 +1,4 @@
-module.exports = ({ actions, localization, _ }) =>
+module.exports = ({ actions, localization, _, utils }) =>
   function createDescription({ modifier, price }) {
     const { _computed, compute, name } = modifier;
 
@@ -15,8 +15,11 @@ module.exports = ({ actions, localization, _ }) =>
     description = `${name}${localAmount ? ` (${localAmount})` : ''}`;
 
     if (actions.isPriceOverride(modifier)) {
+      const dividedPrice = localization.formatAmount(
+        price && compute.amount ? utils.math.div(price, compute.amount) : 0
+      );
       description = isMultiplier
-        ? `${name} (${compute.amount} Unit @ ${localBasePrice}/Unit)`
+        ? `${name} (${compute.amount} Unit @ ${dividedPrice}/Unit)`
         : `${name} (${localization.formatAmount(compute.amount)}/Unit)`;
     }
 

package/lib/modifier/index.js

@@ -126,7 +126,6 @@ const validateInArr = require('./validateInArr');
 const isPercentage = require('./isPercentage');
 const getChildren = require('./getChildren');
 const getComputedAmount = require('./getComputedAmount');
-const hasPaymentMethodType = require('./hasPaymentMethodType');
 const calculatePaymentModifier = require('./calculatePaymentModifier');
 const calculatePaymentDiscountModifier = require('./calculatePaymentDiscountModifier');
 const calculatePaymentFeeModifier = require('./calculatePaymentFeeModifier');
@@ -167,6 +166,7 @@ const getOverrideAmount = require('./getOverrideAmount');
 const getOverrideNote = require('./getOverrideNote');
 const isNotesOverride = require('./isNotesOverride');
 const isOverrideSubtotal = require('./isOverrideSubtotal');
+const validatePaymentCondition = require('./validatePaymentCondition');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -304,7 +304,6 @@ const modifierActions = (deps = {}) => {
     isPercentage: isPercentage(innerDeps),
     getChildren: getChildren(innerDeps),
     getComputedAmount: getComputedAmount(innerDeps),
-    hasPaymentMethodType: hasPaymentMethodType(innerDeps),
     calculatePaymentModifier: calculatePaymentModifier(innerDeps),
     calculatePaymentDiscountModifier:
       calculatePaymentDiscountModifier(innerDeps),
@@ -347,6 +346,7 @@ const modifierActions = (deps = {}) => {
     getOverrideNote: getOverrideNote(innerDeps),
     isNotesOverride: isNotesOverride(innerDeps),
     isOverrideSubtotal: isOverrideSubtotal(innerDeps),
+    validatePaymentCondition: validatePaymentCondition(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/validatePaymentCondition.js

@@ -0,0 +1,16 @@
+module.exports = () =>
+  function validatePaymentCondition({ condition, paymentValue }) {
+    const { value, operand } = condition;
+    if (!value || !operand || !paymentValue) return false;
+
+    const includes = value.includes(paymentValue);
+
+    switch (operand) {
+      case '$in':
+        return includes;
+      case '$nin':
+        return !includes;
+      default:
+        return false;
+    }
+  };

package/lib/order/addItemModifier.js

@@ -80,8 +80,6 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     order,
     modifier: _modifier,
     item: itemProp,
-    customer,
-    originalItem,
     onConditionsNotMet,
     onError,
   }) => {
@@ -115,13 +113,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
 
     item.properties = {
       ...(item.properties || {}),
-      basePrice: item.price,
     };
-    item.price = itemActions.getItemPrice({
-      item,
-      itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
-      customer,
-    });
 
     return item;
   };

package/lib/order/removeItemModifier.js

@@ -1,4 +1,4 @@
-module.exports = ({ actions, modifierActions, itemActions, _ }) => {
+module.exports = ({ actions, modifierActions, _ }) => {
   const removeModifier = ({ item, modifier }) => {
     const nextItem = { ...item, modifiers: [] };
 
@@ -29,7 +29,6 @@ module.exports = ({ actions, modifierActions, itemActions, _ }) => {
       return order;
 
     let item = actions.getSelectedItem({ order, itemIndex });
-    const customer = actions.getCustomer(order);
 
     const contains = modifierActions.contains(item.modifiers, modifier);
 
@@ -42,11 +41,6 @@ module.exports = ({ actions, modifierActions, itemActions, _ }) => {
       originalItem,
     });
 
-    item.price = itemActions.getItemPrice({
-      item,
-      itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
-      customer,
-    });
     order.items[itemIndex] = item;
 
     return order;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.95",
+  "version": "1.0.97",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "edb497d37801c9749d2c3722a67657abe77c9ab6"
+  "gitHead": "f0f3b0c934c2061d16a7237e6173d317dc15e811"
 }

package/lib/item/hasPaymentMethodType.js

@@ -1,23 +0,0 @@
-module.exports = ({ modifierActions }) =>
-  function hasPaymentMethodType({
-    item,
-    paymentMethod,
-    paymentType,
-    isPrepay,
-  }) {
-    if (
-      !item ||
-      !Array.isArray(item.modifiers) ||
-      (!paymentMethod && !paymentType)
-    )
-      return false;
-
-    return item.modifiers.some(modifier =>
-      modifierActions.hasPaymentMethodType({
-        paymentModifier: modifier,
-        paymentMethod,
-        paymentType,
-        isPrepay,
-      })
-    );
-  };

package/lib/modifier/hasPaymentMethodType.js

@@ -1,29 +0,0 @@
-module.exports = ({ actions }) =>
-  function hasPaymentMethodType({
-    paymentModifier,
-    paymentMethod,
-    paymentType,
-    isPrepay,
-  }) {
-    if (!actions.isPaymentModifier(paymentModifier)) return false;
-
-    if (actions.isPrepayModifier(paymentModifier) && !isPrepay) return false;
-
-    if (
-      actions.isPaymentTypeModifier(paymentModifier) &&
-      !paymentModifier.conditions.rules.some(rule =>
-        rule.value.includes(paymentType)
-      )
-    )
-      return false;
-
-    if (
-      actions.isPaymentMethodModifier(paymentModifier) &&
-      !paymentModifier.conditions.rules.some(rule =>
-        rule.value.includes(paymentMethod)
-      )
-    )
-      return false;
-
-    return true;
-  };