@darkpos/pricing 1.0.92 → 1.0.95

package/__TEST__/order/conditionsNotMet.test.js

@@ -884,4 +884,128 @@ describe('Conditions not met for the item', () => {
     expect(order.items[1].total).toBe(20);
     expect(order.items[1].modifiers.length).toBe(1);
   });
+
+  test('Payment type condition is met (payment modifier and using prepay at the same time)', () => {
+    const prePayDiscount1Usd = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '1 usd pre pay disc',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'paymentMethods',
+            value: ['cash'],
+            operand: '$in',
+          },
+          {
+            key: 'paymentTypes',
+            value: ['cash'],
+            operand: '$in',
+          },
+          {
+            key: 'payment',
+            value: 'prepay',
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [prePayDiscount1Usd],
+    };
+
+    const resultedOrder = pricingService.order.calculate(
+      {
+        id: 'ord-123',
+        items: [item],
+        modifiers: [],
+      },
+      {
+        paymentMethod: 'cash',
+        paymentType: 'cash',
+      }
+    );
+
+    expect(resultedOrder.total).toBe(10);
+    expect(resultedOrder.items[0].total).toBe(10);
+    expect(resultedOrder.items[0].modifiers[0]._computed.amount).toBe(0);
+
+    const resultedOrderPrepay = pricingService.order.calculate(resultedOrder, {
+      paymentMethod: 'cash',
+      paymentType: 'cash',
+      isPrepay: true,
+    });
+
+    expect(resultedOrderPrepay.total).toBe(9);
+    expect(resultedOrderPrepay.items[0].total).toBe(9);
+    expect(resultedOrderPrepay.items[0].modifiers[0]._computed.amount).toBe(0);
+    expect(resultedOrderPrepay.items[0].modifiers[1]._computed.amount).toBe(-1);
+  });
+
+  test('Payment type condition is met (using only prepay rule)', () => {
+    const prePayDiscount1Usd = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '1 usd pre pay disc',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'payment',
+            value: 'prepay',
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [prePayDiscount1Usd],
+    };
+
+    const resultedOrder = pricingService.order.calculate({
+      id: 'ord-123',
+      items: [item],
+      modifiers: [],
+    });
+
+    expect(resultedOrder.total).toBe(10);
+    expect(resultedOrder.items[0].total).toBe(10);
+    expect(resultedOrder.items[0].modifiers[0]._computed.amount).toBe(0);
+
+    const resultedOrderPrepay = pricingService.order.calculate(resultedOrder, {
+      isPrepay: true,
+    });
+
+    expect(resultedOrderPrepay.total).toBe(9);
+    expect(resultedOrderPrepay.items[0].total).toBe(9);
+    expect(resultedOrderPrepay.items[0].modifiers[0]._computed.amount).toBe(0);
+    expect(resultedOrderPrepay.items[0].modifiers[1]._computed.amount).toBe(-1);
+    expect(resultedOrderPrepay.items[0].modifiers[1].properties).toMatchObject({
+      isCalculatedPaymentModifier: true,
+      paymentId: undefined,
+    });
+  });
 });

package/__TEST__/order/getParentTotals.test.js

@@ -0,0 +1,79 @@
+const usePricing = require('../../index');
+const mockStores = require('../mocks/stores');
+
+const session = {
+  store: mockStores[0],
+};
+
+const pricingService = usePricing(session);
+describe('Get parent totals', () => {
+  it('should return zero totals if input is not an array', () => {
+    expect(pricingService.order.getTotals(null)).toEqual({
+      total: 0,
+      subTotal: 0,
+      subTotals: {},
+    });
+  });
+
+  it('should calculate totals for simple sub-orders', () => {
+    const orders = [
+      {
+        parentId: '123',
+        total: 10,
+        subTotal: 8,
+        subTotals: {
+          base: 8,
+          tax: 2,
+        },
+      },
+      {
+        parentId: '123',
+        total: 20,
+        subTotal: 18,
+        subTotals: {
+          base: 18,
+          tax: 2,
+        },
+      },
+    ];
+
+    expect(pricingService.order.getTotals(orders)).toEqual({
+      total: 30,
+      subTotal: 26,
+      subTotals: {
+        base: 26,
+        tax: 4,
+      },
+    });
+  });
+
+  it('should merge subtotals with missing keys', () => {
+    const orders = [
+      {
+        parentId: '1',
+        total: 5,
+        subTotal: 5,
+        subTotals: {
+          fee: 1,
+        },
+      },
+      {
+        parentId: '1',
+        total: 10,
+        subTotal: 10,
+        subTotals: {
+          tax: 2,
+        },
+      },
+    ];
+
+    expect(pricingService.order.getTotals(orders)).toEqual({
+      total: 15,
+      subTotal: 15,
+      subTotals: {
+        fee: 1,
+        tax: 2,
+      },
+    });
+  });
+});

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

@@ -44,40 +44,28 @@ describe('Order actions', () => {
       total: 10,
       totalPaid: 0,
     };
-
     let cashPercentageDiscountOrder = pricingService.order.calculate(
       { items: [orderItem] },
       { paymentType: 'cash' }
     );
-
     expect(cashPercentageDiscountOrder).toHaveProperty('total', 9);
     expect(cashPercentageDiscountOrder).toHaveProperty('subTotal', 10);
     expect(cashPercentageDiscountOrder).toHaveProperty('subTotals', {
       discount: -1,
     });
     expect(cashPercentageDiscountOrder.items[0].modifiers).toHaveLength(2);
-
     expect(cashPercentageDiscountOrder.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
         description: 'CASH 10% DISCOUNT',
       })
     );
-
     expect(cashPercentageDiscountOrder.items[0].modifiers[1]._computed).toEqual(
       expect.objectContaining({
         amount: -1,
         description: '$1.00 discount (-$1.00)',
       })
     );
-
-    expect(cashPercentageDiscountOrder.items[0].modifiers[0]._computed).toEqual(
-      expect.objectContaining({
-        amount: 0,
-        description: 'CASH 10% DISCOUNT',
-      })
-    );
-
     cashPercentageDiscountOrder = pricingService.order.calculate(
       { items: [orderItem] },
       {
@@ -88,14 +76,12 @@ describe('Order actions', () => {
       }
     );
     cashPercentageDiscountOrder.items[0].totalPaid = 1;
-
     expect(cashPercentageDiscountOrder).toHaveProperty('total', 9.89);
     expect(cashPercentageDiscountOrder).toHaveProperty('subTotal', 10);
     expect(cashPercentageDiscountOrder).toHaveProperty('subTotals', {
       discount: -0.1111111111111112,
     });
     expect(cashPercentageDiscountOrder.items[0].modifiers).toHaveLength(2);
-
     cashPercentageDiscountOrder = pricingService.order.calculate(
       cashPercentageDiscountOrder,
       {
@@ -106,7 +92,6 @@ describe('Order actions', () => {
       }
     );
     cashPercentageDiscountOrder.items[0].totalPaid = 3;
-
     expect(cashPercentageDiscountOrder).toHaveProperty('total', 9.67);
     expect(cashPercentageDiscountOrder).toHaveProperty('subTotal', 10);
     expect(cashPercentageDiscountOrder).toHaveProperty('subTotals', {
@@ -141,7 +126,6 @@ describe('Order actions', () => {
         paymentId: '111',
       })
     );
-
     cashPercentageDiscountOrder = pricingService.order.calculate(
       cashPercentageDiscountOrder,
       {
@@ -151,7 +135,6 @@ describe('Order actions', () => {
         paymentId: '333',
       }
     );
-
     expect(cashPercentageDiscountOrder).toHaveProperty('total', 9);
     expect(cashPercentageDiscountOrder).toHaveProperty('subTotal', 10);
     expect(cashPercentageDiscountOrder).toHaveProperty('subTotals', {
@@ -703,7 +686,7 @@ describe('Order actions', () => {
           modifiers: [
             {
               _id: '671818d40e5dd150d9830904',
-              attributes: ['override'],
+              attributes: [],
               modifierId: '62cdbfd01ee1b4001932818f',
               _parentId: null,
               locked: null,
@@ -722,15 +705,7 @@ describe('Order actions', () => {
               recommended: false,
               default: false,
               code: '',
-              properties: {
-                override: {
-                  field: 'price',
-                  type: 'manual',
-                  multiplier: true,
-                },
-                group: null,
-                sort: null,
-              },
+              properties: {},
               _computed: {
                 amount: 0,
                 description: 'Alice Blue',
@@ -1110,7 +1085,7 @@ describe('Order actions', () => {
     expect(resultedOrder.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
-        description: 'Alice Blue (0 Unit @ $13.50/Unit)',
+        description: 'Alice Blue',
       })
     );
 
@@ -1128,4 +1103,336 @@ describe('Order actions', () => {
       })
     );
   });
+
+  test('Applies fixed and percentage discounts with fixed modifier added first (both payment modifiers)', () => {
+    const prePayDiscount1Usd = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '1 usd pre pay disc',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'paymentTypes',
+            value: ['cash'],
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+    };
+
+    const cashDiscount10Percent = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '10 % cash discount',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'paymentTypes',
+            value: ['cash'],
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 10,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [prePayDiscount1Usd, cashDiscount10Percent],
+    };
+
+    const resultedOrderPrepay = pricingService.item.calculate(item, {
+      paymentType: 'cash',
+      paymentMethod: 'cash',
+      isPrepay: true,
+      lockPaymentModifiers: true,
+      paymentId: 'abcd123',
+      amountToPay: 8,
+    });
+
+    expect(resultedOrderPrepay.total).toBe(8);
+
+    expect(resultedOrderPrepay.modifiers[0]._computed.amount).toBe(0);
+    expect(resultedOrderPrepay.modifiers[1]._computed.amount).toBe(0);
+    expect(resultedOrderPrepay.modifiers[2]._computed.amount).toBe(-1);
+    expect(resultedOrderPrepay.modifiers[3]._computed.amount).toBe(-1);
+  });
+
+  test('Applies percentage and fixed discounts with percentage modifier added first (both paymentModifiers)', () => {
+    const prePayDiscount1Usd = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '1 usd pre pay disc',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'paymentTypes',
+            value: ['cash'],
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+    };
+
+    const cashDiscount10Percent = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '10 % cash discount',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'paymentTypes',
+            value: ['cash'],
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 10,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [cashDiscount10Percent, prePayDiscount1Usd],
+    };
+
+    const resultedOrderPrepay = pricingService.item.calculate(item, {
+      paymentType: 'cash',
+      paymentMethod: 'cash',
+      isPrepay: true,
+      lockPaymentModifiers: true,
+      paymentId: 'abcd123',
+      amountToPay: 8,
+    });
+
+    expect(resultedOrderPrepay.total).toBe(8);
+
+    expect(resultedOrderPrepay.modifiers[0]._computed.amount).toBe(0);
+    expect(resultedOrderPrepay.modifiers[1]._computed.amount).toBe(0);
+    expect(resultedOrderPrepay.modifiers[2]._computed.amount).toBe(-1);
+    expect(resultedOrderPrepay.modifiers[3]._computed.amount).toBe(-1);
+  });
+
+  test('Applies one payment discount and one regular fixed discount (percentage first)', () => {
+    const prePayDiscount1Usd = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '1 usd pre pay disc',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+    };
+
+    const cashDiscount10Percent = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '10 % cash discount',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'paymentTypes',
+            value: ['cash'],
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 10,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [cashDiscount10Percent, prePayDiscount1Usd],
+    };
+
+    const resultedOrderPrepay = pricingService.item.calculate(item, {
+      paymentType: 'cash',
+      paymentMethod: 'cash',
+      isPrepay: true,
+      lockPaymentModifiers: true,
+      paymentId: 'abcd123',
+      amountToPay: 8,
+    });
+
+    expect(resultedOrderPrepay.total).toBe(8);
+
+    expect(resultedOrderPrepay.modifiers[0]._computed.amount).toBe(0);
+    expect(resultedOrderPrepay.modifiers[1]._computed.amount).toBe(-1);
+    expect(resultedOrderPrepay.modifiers[2]._computed.amount).toBe(-1);
+  });
+
+  test('Applies one payment discount and one regular percentage discount (fixed first)', () => {
+    const prePayDiscount1Usd = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '1 usd pre pay disc',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+    };
+
+    const cashDiscount10Percent = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '10 % cash discount',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'paymentTypes',
+            value: ['cash'],
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 10,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [prePayDiscount1Usd, cashDiscount10Percent],
+    };
+
+    const resultedOrderPrepay = pricingService.item.calculate(item, {
+      paymentType: 'cash',
+      paymentMethod: 'cash',
+      isPrepay: true,
+      lockPaymentModifiers: true,
+      paymentId: 'abcd123',
+      amountToPay: 8,
+    });
+
+    expect(resultedOrderPrepay.total).toBe(8);
+
+    expect(resultedOrderPrepay.modifiers[0]._computed.amount).toBe(0);
+    expect(resultedOrderPrepay.modifiers[1]._computed.amount).toBe(-1);
+    expect(resultedOrderPrepay.modifiers[2]._computed.amount).toBe(-1);
+  });
+
+  test('Applies one payment discount and one regular percentage discount (fixed first) withouth sending amountToPay', () => {
+    const prePayDiscount1Usd = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '1 usd pre pay disc',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [],
+      },
+      compute: {
+        type: 'fixed',
+        action: 'subtract',
+        amount: 1,
+      },
+    };
+
+    const cashDiscount10Percent = {
+      _id: '6819114c06c23d37c1f19412',
+      name: '10 % cash discount',
+      type: 'discount',
+      tags: ['default'],
+      direct: true,
+      conditions: {
+        valid: null,
+        rules: [
+          {
+            key: 'paymentTypes',
+            value: ['cash'],
+            operand: '$in',
+          },
+        ],
+      },
+      compute: {
+        type: 'percentage',
+        action: 'subtract',
+        amount: 10,
+      },
+    };
+
+    const item = {
+      _id: 'abc',
+      price: 10,
+      quantity: 1,
+      modifiers: [prePayDiscount1Usd, cashDiscount10Percent],
+    };
+
+    const resultedOrderPrepay = pricingService.item.calculate(item, {
+      paymentType: 'cash',
+      paymentMethod: 'cash',
+      isPrepay: true,
+      paymentId: 'abcd123',
+    });
+
+    expect(resultedOrderPrepay.total).toBe(8);
+
+    expect(resultedOrderPrepay.modifiers[0]._computed.amount).toBe(0);
+    expect(resultedOrderPrepay.modifiers[1]._computed.amount).toBe(-1);
+    expect(resultedOrderPrepay.modifiers[2]._computed.amount).toBe(-1);
+  });
 });