@darkpos/pricing 1.0.111 → 1.0.114

package/__TEST__/item.test.js

@@ -1831,4 +1831,135 @@ describe('Item actions', () => {
       _actual: 200,
     });
   });
+
+  test('Should calculate a price override modifier and a tax modifier properly', () => {
+    const overridePriceMod = {
+      _id: '675354ee39a47228afd1f1a4',
+      attributes: ['override'],
+      modifierId: '6751f7eeb60c71cefee138ee',
+      name: 'Override item price fixed 0',
+      tags: ['default', 'all'],
+      direct: true,
+      properties: {
+        override: {
+          type: 'fixed',
+          field: 'price',
+          fixedValue: 5,
+          multiplier: false,
+        },
+      },
+    };
+
+    const percentageFee10 = {
+      compute: {
+        amount: 10,
+        type: 'percentage',
+        action: 'add',
+      },
+      name: 'percentageFee10',
+      type: 'tax',
+      _id: '234',
+      modifierId: 222,
+    };
+
+    const itemWithModifierAmountFixed10 = {
+      name: "Men's 3pc Tuxedo",
+      pieces: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [overridePriceMod, percentageFee10],
+      _id: '675354e939a47228afd1f199',
+      itemId: '62cdbfd01ee1b400193281ee',
+    };
+    const newItem = pricingService.item.calculate(
+      itemWithModifierAmountFixed10
+    );
+    expect(newItem.price).toBe(5);
+    expect(newItem.total).toBe(5.5);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 0,
+      description: 'Override item price fixed 0 ($5.00/Unit)',
+    });
+
+    expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: 0.5,
+      description: 'percentageFee10 ($0.50)',
+    });
+
+    expect(newItem).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 0.5,
+      _direct: 0,
+      _xdirect: 0.5,
+      _simple: 5,
+      _actual: 5,
+      tax: 0.5,
+    });
+  });
+
+  test('Should calculate a tax modifier and a price override modifier properly', () => {
+    const overridePriceMod = {
+      _id: '675354ee39a47228afd1f1a4',
+      attributes: ['override'],
+      modifierId: '6751f7eeb60c71cefee138ee',
+      name: 'Override item price fixed 0',
+      tags: ['default', 'all'],
+      direct: true,
+      properties: {
+        override: {
+          type: 'fixed',
+          field: 'price',
+          fixedValue: 5,
+          multiplier: false,
+        },
+      },
+    };
+
+    const percentageFee10 = {
+      compute: {
+        amount: 10,
+        type: 'percentage',
+        action: 'add',
+      },
+      name: 'percentageFee10',
+      type: 'tax',
+      _id: '234',
+      modifierId: 222,
+    };
+
+    const itemWithModifierAmountFixed10 = {
+      name: "Men's 3pc Tuxedo",
+      pieces: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [percentageFee10, overridePriceMod],
+      _id: '675354e939a47228afd1f199',
+      itemId: '62cdbfd01ee1b400193281ee',
+    };
+    const newItem = pricingService.item.calculate(
+      itemWithModifierAmountFixed10
+    );
+    expect(newItem.price).toBe(5);
+    expect(newItem.total).toBe(6);
+
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 1,
+      description: 'percentageFee10 ($1.00)',
+    });
+
+    expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: 0,
+      description: 'Override item price fixed 0 ($5.00/Unit)',
+    });
+
+    expect(newItem).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 1,
+      _direct: 0,
+      _xdirect: 1,
+      _simple: 5,
+      _actual: 5,
+      tax: 1,
+    });
+  });
 });

package/__TEST__/order/conditionsNotMet.test.js

@@ -1626,12 +1626,48 @@ describe('Conditions not met for the item', () => {
   });
 
   test('Total number of items conditions is  met, using between', () => {
-    const item1 = { pieces: 1, itemId: '1', price: 100, modifiers: [] };
-    const item2 = { pieces: 1, itemId: '2', price: 100, modifiers: [] };
-    const item3 = { pieces: 1, itemId: '3', price: 100, modifiers: [] };
-    const item4 = { pieces: 1, itemId: '4', price: 100, modifiers: [] };
-    const item5 = { pieces: 1, itemId: '5', price: 100, modifiers: [] };
-    const item6 = { pieces: 1, itemId: '6', price: 100, modifiers: [] };
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item2 = {
+      pieces: 1,
+      itemId: '2',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item3 = {
+      pieces: 1,
+      itemId: '3',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item4 = {
+      pieces: 1,
+      itemId: '4',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item5 = {
+      pieces: 1,
+      itemId: '5',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item6 = {
+      pieces: 1,
+      itemId: '6',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
 
     const order = {
       id: 'ord-123',
@@ -1667,10 +1703,34 @@ describe('Conditions not met for the item', () => {
   });
 
   test('Total number of items conditions is  not met, using between', () => {
-    const item1 = { pieces: 1, itemId: '1', price: 100, modifiers: [] };
-    const item2 = { pieces: 1, itemId: '2', price: 100, modifiers: [] };
-    const item3 = { pieces: 1, itemId: '3', price: 100, modifiers: [] };
-    const item4 = { pieces: 1, itemId: '4', price: 100, modifiers: [] };
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item2 = {
+      pieces: 1,
+      itemId: '2',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item3 = {
+      pieces: 1,
+      itemId: '3',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item4 = {
+      pieces: 1,
+      itemId: '4',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
 
     const order = {
       id: 'ord-123',
@@ -1706,10 +1766,34 @@ describe('Conditions not met for the item', () => {
   });
 
   test('Total number of items conditions is met, using gt', () => {
-    const item1 = { pieces: 1, itemId: '1', price: 100, modifiers: [] };
-    const item2 = { pieces: 1, itemId: '2', price: 100, modifiers: [] };
-    const item3 = { pieces: 1, itemId: '3', price: 100, modifiers: [] };
-    const item4 = { pieces: 1, itemId: '4', price: 100, modifiers: [] };
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item2 = {
+      pieces: 1,
+      itemId: '2',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item3 = {
+      pieces: 1,
+      itemId: '3',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item4 = {
+      pieces: 1,
+      itemId: '4',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
 
     const order = {
       id: 'ord-123',
@@ -1742,10 +1826,34 @@ describe('Conditions not met for the item', () => {
   });
 
   test('Total number of items conditions is not met, using gt', () => {
-    const item1 = { pieces: 1, itemId: '1', price: 100, modifiers: [] };
-    const item2 = { pieces: 1, itemId: '2', price: 100, modifiers: [] };
-    const item3 = { pieces: 1, itemId: '3', price: 100, modifiers: [] };
-    const item4 = { pieces: 1, itemId: '4', price: 100, modifiers: [] };
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item2 = {
+      pieces: 1,
+      itemId: '2',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item3 = {
+      pieces: 1,
+      itemId: '3',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
+    const item4 = {
+      pieces: 1,
+      itemId: '4',
+      price: 100,
+      modifiers: [],
+      quantity: 1,
+    };
 
     const order = {
       id: 'ord-123',
@@ -1776,4 +1884,54 @@ describe('Conditions not met for the item', () => {
       false
     );
   });
+
+  test('Total number of items conditions is met with 2 items with each one having qty 3, using between', () => {
+    const item1 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 3,
+    };
+
+    const item2 = {
+      pieces: 1,
+      itemId: '1',
+      price: 100,
+      modifiers: [],
+      quantity: 3,
+    };
+
+    const order = {
+      id: 'ord-123',
+      items: [item1, item2],
+      modifiers: [],
+    };
+    const modifier = {
+      conditions: {
+        rules: [
+          {
+            key: 'totalNumberOfItems',
+            value: {
+              from: 5,
+              to: 10,
+            },
+            operand: '$between',
+          },
+        ],
+      },
+    };
+    const { addItemModifier } = pricingService.order;
+    const calculatedOrder = pricingService.order.calculate(
+      addItemModifier({
+        order,
+        modifier,
+        itemIndex: 0,
+      })
+    );
+    expect(calculatedOrder.items[0].modifiers.length).toEqual(1);
+    expect(calculatedOrder.items[0].modifiers[0].conditions.valid).toEqual(
+      true
+    );
+  });
 });

package/lib/item/calculate.js

@@ -175,6 +175,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
           };
           item.price = priceOverride;
           price = priceOverride;
+          computedPrice = priceOverride;
         }
 
         if (modifierActions.isQuantityOverride(modifier)) {

package/lib/item/validateModifiers.js

@@ -24,20 +24,25 @@ module.exports = ({ modifierActions }) =>
       })
     );
 
+    const isIdMatch = (mod, modifierId) => {
+      if (typeof mod === 'string') return mod === modifierId;
+      return mod._id === modifierId;
+    };
+
     firstValidatedModifiers.forEach(validModifier => {
       const parentAddModifier = firstValidatedModifiers.find(
         validMod =>
           validMod.addModifiers &&
-          validMod.addModifiers.some(
-            addMod => addMod._id === validModifier.modifierId
+          validMod.addModifiers.some(addMod =>
+            isIdMatch(addMod, validModifier.modifierId)
           )
       );
 
       const parentDelModifier = firstValidatedModifiers.find(
         validMod =>
           validMod.delModifiers &&
-          validMod.delModifiers.some(
-            delMod => delMod._id === validModifier.modifierId
+          validMod.delModifiers.some(delMod =>
+            isIdMatch(delMod, validModifier.modifierId)
           )
       );
 

package/lib/modifier/areConditionsMet.js

@@ -10,6 +10,14 @@ module.exports = ({ actions, utils }) => {
     return customer.stats[key];
   };
 
+  const getTotalItemsQuantity = ({ items }) => {
+    if (!items || !Array.isArray(items)) return 0;
+    return items.reduce(
+      (total, item) => utils.math.add(total, item.quantity || 0),
+      0
+    );
+  };
+
   const modifierConditionPass = (
     modifier,
     {
@@ -28,7 +36,7 @@ module.exports = ({ actions, utils }) => {
           switch (condition.key) {
             case 'totalNumberOfItems':
               return actions.validateNumberCondition({
-                value: Array.isArray(allItems) ? allItems.length : 0,
+                value: getTotalItemsQuantity({ items: allItems }),
                 condition,
               });
             case 'itemSet': {
@@ -57,10 +65,8 @@ module.exports = ({ actions, utils }) => {
                   }
                 });
 
-              let totalItemsLength = 0;
-
-              matchingItems.forEach(matchItem => {
-                totalItemsLength += matchItem.quantity || 0;
+              const totalItemsLength = getTotalItemsQuantity({
+                items: matchingItems,
               });
 
               const itemIndex = matchingItems.findIndex(

package/lib/modifier/isAvailableSubscription.js

@@ -14,9 +14,9 @@ module.exports = ({ utils, actions }) => {
     };
 
     if (
-      properties.numberOfUses &&
-      properties.numberOfUsesLimit &&
-      math.gte(properties.numberOfUses, properties.numberOfUsesLimit)
+      properties.uses &&
+      properties.usesLimit &&
+      math.gte(properties.uses, properties.usesLimit)
     )
       return false;
 

package/lib/order/getOrderItemSubscriptions.js

@@ -26,15 +26,15 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     }
 
     const { quantity, price } = orderItem;
-    let numberOfUses = quantity;
+    let uses = quantity;
     if (remaining) {
       const left = remaining - (used || 0);
-      if (quantity > left) numberOfUses = left;
+      if (quantity > left) uses = left;
     }
 
     const modifier = modifierActions.createSubscriptionModifier({
-      amount: math.mul(numberOfUses, price),
-      properties: { subscription: { numberOfUses } },
+      amount: math.mul(uses, price),
+      properties: { subscription: { uses } },
     });
     orderItem.modifiers.push(modifier);
 

package/lib/order/hasRemainingSubscription.js

@@ -1,13 +1,9 @@
 module.exports = ({ actions, modifierActions }) => {
   const getRemaining = (subscriptions, orderId) => {
     const remaining = subscriptions.reduce((total, subscription) => {
-      const {
-        numberOfUsesLimit = 0,
-        numberOfUses = 0,
-        history = {},
-      } = subscription;
+      const { usesLimit = 0, uses = 0, history = {} } = subscription;
       const orderHistory = history[orderId] || 0;
-      return total + numberOfUsesLimit + orderHistory - numberOfUses;
+      return total + usesLimit + orderHistory - uses;
     }, 0);
 
     return remaining;
@@ -27,16 +23,16 @@ module.exports = ({ actions, modifierActions }) => {
       ],
       []
     );
-    const numberOfUses = modifiers.reduce(
+    const uses = modifiers.reduce(
       (sum, each) =>
         sum +
         ((each.properties &&
           each.properties.subscription &&
-          each.properties.subscription.numberOfUses) ||
+          each.properties.subscription.uses) ||
           0),
       0
     );
-    return numberOfUses;
+    return uses;
   };
 
   const getSubscriptions = subscriptions =>
@@ -56,12 +52,14 @@ module.exports = ({ actions, modifierActions }) => {
 
     subscriptions = getSubscriptions(subscriptions);
 
-    const isUnlimited = subscriptions.some(each => !each.numberOfUsesLimit);
+    const isUnlimited = subscriptions.some(
+      each => !each.usesLimit || each.renewalType === 'limit_reached'
+    );
     if (isUnlimited) return [true];
 
     const remaining = getRemaining(subscriptions, order.parentId || order._id);
-    const numberOfUses = getNumberOfUses(order.items, item);
+    const uses = getNumberOfUses(order.items, item);
 
-    return [remaining > numberOfUses, remaining, numberOfUses];
+    return [remaining > uses, remaining, uses];
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.111",
+  "version": "1.0.114",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -55,5 +55,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "b12a6c9aef83deec91c4ebe365bd9d604a0eecdd"
+  "gitHead": "cf91c373155b5fe5207ec9234abffd772fd3df40"
 }