@darkpos/pricing 1.0.103 → 1.0.104

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/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.103",
+  "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": "032bea629a5c32d78886daca4d2382b847b5d075"
+  "gitHead": "0a74400677d6852460e9a7773a3e6480912ad8b3"
 }