@darkpos/pricing 1.0.102 → 1.0.104

package/__TEST__/modifier.test.js

@@ -676,7 +676,7 @@ describe('Modifier actions', () => {
             properties: {
               isManual: true,
             },
-            _id: 'ead6eb247a93bca8f802f9b2',
+            _id: '5d97805a91c31603f8fc6ab0',
           }),
           expect.objectContaining({
             name: 'Blue Label',
@@ -685,7 +685,7 @@ describe('Modifier actions', () => {
             properties: {
               isManual: true,
             },
-            _id: '4e23edf8fa734884f4618003',
+            _id: '49327d26c324cb709456a279',
           }),
         ])
       );
@@ -739,21 +739,21 @@ describe('Modifier actions', () => {
       expect(result).toStrictEqual([
         {
           name: 'Red Tag',
-          _id: 'ead6eb247a93bca8f802f9b2',
+          _id: '5d97805a91c31603f8fc6ab0',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'White Shirt',
-          _id: '4e23edf8fa734884f4618003',
+          _id: '3b115e8ff1d00d9ae4ea3601',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'Blue Label',
-          _id: '94b02ee7ba009b09a913a786',
+          _id: '49327d26c324cb709456a279',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
@@ -815,21 +815,21 @@ describe('Modifier actions', () => {
       expect(result).toStrictEqual([
         {
           name: 'Red Tag',
-          _id: 'ead6eb247a93bca8f802f9b2',
+          _id: '5d97805a91c31603f8fc6ab0',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'White Shirt',
-          _id: '4e23edf8fa734884f4618003',
+          _id: '3b115e8ff1d00d9ae4ea3601',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },
         },
         {
           name: 'Blue Label',
-          _id: '94b02ee7ba009b09a913a786',
+          _id: '49327d26c324cb709456a279',
           direct: true,
           group: 'colorGroup1',
           properties: { isManual: true, spreadFrom: 'abc123' },

package/__TEST__/order/conditionsNotMet.test.js

@@ -1259,4 +1259,232 @@ describe('Conditions not met for the item', () => {
 
     expect(result.modifiers.length).toBe(0);
   });
+
+  test('Should mark modifier as valid if customerTotalSales === 0', () => {
+    const modifier = {
+      _id: '6819114c06c23d37c1f19412',
+      name: 'first order discount',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'customerTotalSales',
+            value: 0,
+            operand: '$eq',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 25,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [],
+    };
+
+    let order = {
+      items: [item],
+      customer: {
+        _id: '123456789',
+        stats: {
+          totalSales: 0,
+          totalVisits: 0,
+        },
+      },
+    };
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    expect(order.items[0].modifiers.length).toBe(1);
+
+    const calculatedOrder = pricingService.order.calculate(order);
+
+    expect(calculatedOrder.total).toBe(7.5);
+    expect(calculatedOrder.items[0].total).toBe(7.5);
+    expect(calculatedOrder.items[0].modifiers[0].conditions.valid).toBe(true);
+  });
+
+  test('Should mark modifier as not valid if customerTotalSales !== 0', () => {
+    const modifier = {
+      _id: '6819114c06c23d37c1f19412',
+      name: 'first order discount',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'customerTotalSales',
+            value: 0,
+            operand: '$eq',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 25,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [],
+    };
+
+    let order = {
+      items: [item],
+      customer: {
+        _id: '123456789',
+        stats: {
+          totalSales: 15,
+          totalVisits: 0,
+        },
+      },
+    };
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    expect(order.items[0].modifiers.length).toBe(1);
+
+    const calculatedOrder = pricingService.order.calculate(order);
+
+    expect(calculatedOrder.total).toBe(10);
+    expect(calculatedOrder.items[0].total).toBe(10);
+    expect(calculatedOrder.items[0].modifiers[0].conditions.valid).toBe(false);
+  });
+
+  test('Should mark modifier as valid if customerTotalVisits === 0', () => {
+    const modifier = {
+      _id: '6819114c06c23d37c1f19412',
+      name: 'first order discount',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'customerTotalVisits',
+            value: 0,
+            operand: '$eq',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 25,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [],
+    };
+
+    let order = {
+      items: [item],
+      customer: {
+        _id: '123456789',
+        stats: {
+          totalSales: 0,
+          totalVisits: 0,
+        },
+      },
+    };
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    expect(order.items[0].modifiers.length).toBe(1);
+
+    const calculatedOrder = pricingService.order.calculate(order);
+
+    expect(calculatedOrder.total).toBe(7.5);
+    expect(calculatedOrder.items[0].total).toBe(7.5);
+    expect(calculatedOrder.items[0].modifiers[0].conditions.valid).toBe(true);
+  });
+
+  test('Should mark modifier as not valid if customerTotalVisits !== 0', () => {
+    const modifier = {
+      _id: '6819114c06c23d37c1f19412',
+      name: 'first order discount',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'customerTotalVisits',
+            value: 0,
+            operand: '$eq',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 25,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [],
+    };
+
+    let order = {
+      items: [item],
+      customer: {
+        _id: '123456789',
+        stats: {
+          totalSales: 0,
+          totalVisits: 15,
+        },
+      },
+    };
+
+    order = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    expect(order.items[0].modifiers.length).toBe(1);
+
+    const calculatedOrder = pricingService.order.calculate(order);
+
+    expect(calculatedOrder.total).toBe(10);
+    expect(calculatedOrder.items[0].total).toBe(10);
+    expect(calculatedOrder.items[0].modifiers[0].conditions.valid).toBe(false);
+  });
 });

package/lib/item/calculate.js

@@ -12,6 +12,19 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
     const isPrepay = opts.isPrepay || false;
     const startRequestDate = opts.startRequestDate || null;
     const endRequestDate = opts.endRequestDate || null;
+
+    let customerTotalVisits = 0;
+    let customerTotalSales = 0;
+
+    if (
+      opts.customer &&
+      typeof opts.customer !== 'string' &&
+      opts.customer.stats
+    ) {
+      customerTotalVisits = opts.customer.stats.totalVisits || 0;
+      customerTotalSales = opts.customer.stats.totalSales || 0;
+    }
+
     const lockPaymentModifiers = !!opts.lockPaymentModifiers;
     const allItems = Array.isArray(opts.items) ? opts.items : [];
 
@@ -61,6 +74,8 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
       paymentMethod,
       paymentType,
       isPrepay,
+      customerTotalVisits,
+      customerTotalSales,
     });
 
     const modifiersToCompute = validatedModifiers.filter(

package/lib/item/validateModifiers.js

@@ -8,6 +8,8 @@ module.exports = ({ modifierActions }) =>
     paymentMethod,
     paymentType,
     isPrepay,
+    customerTotalVisits,
+    customerTotalSales,
   }) {
     const validatedModifiers = [];
     const firstValidatedModifiers = itemModifiers.map(each =>
@@ -19,6 +21,8 @@ module.exports = ({ modifierActions }) =>
         paymentMethod,
         paymentType,
         isPrepay,
+        customerTotalVisits,
+        customerTotalSales,
       })
     );
 

package/lib/modifier/areConditionsMet.js

@@ -9,6 +9,8 @@ module.exports = ({ actions, utils }) => {
       paymentMethod,
       paymentType,
       isPrepay,
+      customerTotalVisits,
+      customerTotalSales,
     }
   ) =>
     modifier.conditions && Array.isArray(modifier.conditions.rules)
@@ -83,6 +85,18 @@ module.exports = ({ actions, utils }) => {
                 condition.value,
                 condition.operand
               );
+            case 'customerTotalVisits':
+              return actions.validateNumberCondition(
+                customerTotalVisits,
+                condition.value,
+                condition.operand
+              );
+            case 'customerTotalSales':
+              return actions.validateNumberCondition(
+                customerTotalSales,
+                condition.value,
+                condition.operand
+              );
             case 'modifiers':
               return actions.validateRequiredModifiers(
                 item.modifiers,
@@ -124,6 +138,8 @@ module.exports = ({ actions, utils }) => {
       paymentMethod,
       paymentType,
       isPrepay,
+      customerTotalVisits,
+      customerTotalSales,
     } = opts;
     return (
       modifier &&
@@ -135,6 +151,8 @@ module.exports = ({ actions, utils }) => {
         paymentMethod,
         paymentType,
         isPrepay,
+        customerTotalVisits,
+        customerTotalSales,
       })
     );
   }

package/lib/modifier/createManualModifier.js

@@ -0,0 +1,48 @@
+module.exports = ({ sha256 }) => {
+  function combineHashParts(partA, partB) {
+    let combined = '';
+    try {
+      combined = partA
+        .split('')
+        .map((char, index) => {
+          const digitA = parseInt(char, 16);
+          const digitB = parseInt(partB[index], 16);
+
+          // eslint-disable-next-line no-bitwise
+          return (digitA ^ digitB).toString(16);
+        })
+        .join('')
+        .padStart(partA.length, '0');
+    } catch (err) {
+      console.log(JSON.stringify(err));
+    }
+
+    return combined;
+  }
+
+  function generateManualModifierId(parentId, name) {
+    const input = `${parentId}-${name}`;
+    const hash = sha256(input).toString(); // 64 hex characters
+
+    const firstPart = hash.slice(0, 24);
+    const lastPart = hash.slice(-24);
+
+    return combineHashParts(firstPart, lastPart); // 24-char hex string
+  }
+
+  return function createManualModifier({ parentId, name, group }) {
+    const _id = generateManualModifierId(parentId, name);
+
+    const manualModifier = {
+      name,
+      _id,
+      direct: true,
+      group,
+      properties: {
+        isManual: true,
+      },
+    };
+
+    return manualModifier;
+  };
+};

package/lib/modifier/getManualModifiers.js

@@ -1,4 +1,4 @@
-module.exports = ({ sha256 }) => {
+module.exports = ({ actions }) => {
   const csvToArray = input =>
     input
       .split(',')
@@ -39,23 +39,13 @@ module.exports = ({ sha256 }) => {
       ).filter(modName => otherModifiers.every(mod => mod.name !== modName));
 
       modifiers.push(
-        ...manualModifiersNames.map((each, index) => {
-          const hash = sha256(`${index}-${modifier._id}`).toString();
-
-          const _id = hash.substring(0, 24);
-
-          const manualModifier = {
+        ...manualModifiersNames.map(each =>
+          actions.createManualModifier({
+            parentId: modifier._id,
             name: each,
-            _id,
-            direct: true,
             group: modifier.group,
-            properties: {
-              isManual: true,
-            },
-          };
-
-          return manualModifier;
-        })
+          })
+        )
       );
     }
 

package/lib/modifier/index.js

@@ -166,6 +166,7 @@ const getOverrideNote = require('./getOverrideNote');
 const isNotesOverride = require('./isNotesOverride');
 const isOverrideSubtotal = require('./isOverrideSubtotal');
 const validatePaymentCondition = require('./validatePaymentCondition');
+const createManualModifier = require('./createManualModifier');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -345,6 +346,7 @@ const modifierActions = (deps = {}) => {
     isNotesOverride: isNotesOverride(innerDeps),
     isOverrideSubtotal: isOverrideSubtotal(innerDeps),
     validatePaymentCondition: validatePaymentCondition(innerDeps),
+    createManualModifier: createManualModifier(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/order/calculate.js

@@ -13,7 +13,7 @@ module.exports = ({
   function calculateorder(inputOrder, opts = {}) {
     if (!inputOrder) return inputOrder;
     const order = _.cloneDeep(inputOrder);
-    const { items = [], orders = [] } = order;
+    const { items = [], orders = [], customer } = order;
     if (!items.length) {
       if (!orders.length)
         return { ...order, subTotals: {}, subTotal: 0, total: 0 };
@@ -22,10 +22,12 @@ module.exports = ({
     }
     const startRequestDate = order.start ? order.start.requestDate : null;
     const endRequestDate = order.end ? order.end.requestDate : null;
+
     const options = {
       ...opts,
       startRequestDate,
       endRequestDate,
+      customer,
     };
     const sortedOrderModifiers = modifierActions.sort(order.modifiers || []);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.102",
+  "version": "1.0.104",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "a4c2dff797325d1c452db5eab1e9bda8f9de4e97"
+  "gitHead": "0a74400677d6852460e9a7773a3e6480912ad8b3"
 }