@darkpos/pricing 1.0.52 → 1.0.54

package/__TEST__/order/order.test.js

@@ -21,6 +21,9 @@ describe('Order actions', () => {
         },
         name: 'modifier1',
         type: 'discount',
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
       {
         compute: {
@@ -30,11 +33,17 @@ describe('Order actions', () => {
         },
         name: 'modifier2',
         type: 'discount',
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
       {
         compute: { amount: 2, type: 'fixed', action: 'subtract' },
         name: 'modifier3',
         type: 'discount',
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
     ];
     const orderItem = { price: 30, quantity: 2, modifiers };
@@ -61,6 +70,9 @@ describe('Order actions', () => {
           },
           name: 'modifier1',
           type: 'discount',
+          properties: {
+            isQuantityMultiplier: true,
+          },
         },
       ],
     };
@@ -107,6 +119,9 @@ describe('Order actions', () => {
       },
       name: 'modifier1',
       type: 'discount',
+      properties: {
+        isQuantityMultiplier: true,
+      },
     };
 
     const order = { items: [item1, item2], modifiers: [modifier1] };
@@ -720,6 +735,7 @@ describe('Order actions', () => {
       },
       properties: {
         sort: 99,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -734,6 +750,7 @@ describe('Order actions', () => {
       type: 'discount',
       properties: {
         sort: 1,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -812,6 +829,7 @@ describe('Order actions', () => {
       },
       properties: {
         sort: 99,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -826,6 +844,7 @@ describe('Order actions', () => {
       type: 'discount',
       properties: {
         sort: 1,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -904,6 +923,7 @@ describe('Order actions', () => {
       },
       properties: {
         sort: 99,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -918,6 +938,7 @@ describe('Order actions', () => {
       type: 'discount',
       properties: {
         sort: 1,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -1006,7 +1027,7 @@ describe('Order actions', () => {
       name: `1 USD`,
       type: 'fixed',
       properties: {
-        ignoreQuantity: true,
+        isQuantityMultiplier: false,
       },
     };
 
@@ -1085,6 +1106,7 @@ describe('Order actions', () => {
       },
       properties: {
         sort: 2,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -1099,6 +1121,7 @@ describe('Order actions', () => {
       type: 'fixed',
       properties: {
         sort: 1,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -1157,7 +1180,7 @@ describe('Order actions', () => {
 
     expect(newOrder.items[2].modifiers[0]._computed).toHaveProperty(
       'amount',
-      -0.16666666666666666
+      -0.3333333333333333
     );
     expect(newOrder.items[2].modifiers[1]._computed).toHaveProperty(
       'amount',
@@ -1871,6 +1894,7 @@ describe('Order actions', () => {
       },
       properties: {
         sort: 2,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -1885,6 +1909,7 @@ describe('Order actions', () => {
       type: 'percentage',
       properties: {
         sort: 1,
+        isQuantityMultiplier: true,
       },
     };
 
@@ -2087,7 +2112,7 @@ describe('Order actions', () => {
     expect(newOrderFixedModifier).toHaveProperty('total', 20);
   });
 
-  test('CU-86dtxh2y5: #2.A- Get calculated Order, One item and fixed Fee Modifier (ignoreQuantity: false)', () => {
+  test('CU-86dtxh2y5: #2.A- Get calculated Order, One item and fixed Fee Modifier (isQuantityMultiplier: true)', () => {
     const newOrderFixedModifier = pricingService.order.calculate({
       items: [
         {
@@ -2103,6 +2128,9 @@ describe('Order actions', () => {
               },
               name: 'fee 20 USD',
               type: 'fee',
+              properties: {
+                isQuantityMultiplier: true,
+              },
             },
           ],
         },
@@ -2111,7 +2139,7 @@ describe('Order actions', () => {
     expect(newOrderFixedModifier).toHaveProperty('total', 50);
   });
 
-  test('CU-86dtxh2y5: #2.B- Get calculated Order, One item and fixed Fee Modifier (ignoreQuantity: true)', () => {
+  test('CU-86dtxh2y5: #2.B- Get calculated Order, One item and fixed Fee Modifier (isQuantityMultiplier: false)', () => {
     const newOrderFixedModifier = pricingService.order.calculate({
       items: [
         {
@@ -2128,7 +2156,7 @@ describe('Order actions', () => {
               name: 'fee 20 USD',
               type: 'fee',
               properties: {
-                ignoreQuantity: true,
+                isQuantityMultiplier: false,
               },
             },
           ],
@@ -2158,7 +2186,7 @@ describe('Order actions', () => {
     expect(newOrderFixedModifier).toHaveProperty('total', 120);
   });
 
-  test('CU-86dtxh2y5: #4- Get calculated Order, One item and fixed Fee Modifier, using createFeeModifier (ignoreQuantity: true)', () => {
+  test('CU-86dtxh2y5: #4- Get calculated Order, One item and fixed Fee Modifier, using createFeeModifier (isQuantityMultiplier: false)', () => {
     const newOrderFixedModifier = pricingService.order.calculate({
       items: [
         {
@@ -2172,7 +2200,7 @@ describe('Order actions', () => {
           amount: 100,
           type: Types.FIXED,
           properties: {
-            ignoreQuantity: true,
+            isQuantityMultiplier: false,
           },
         }),
       ],
@@ -2620,4 +2648,462 @@ describe('Order actions', () => {
       _actual: 4.65,
     });
   });
+
+  test('CU-86dvd3dbp Get calculated Order, multiple items and indirect modifiers #2 toNeareastMultiple (No Order Modifiers)', () => {
+    const pricingService2 = usePricing({
+      store: { _settings: { localization: { nearestMultiple: '0.5' } } },
+    });
+
+    const item1 = {
+      _id: 1,
+      price: 15.99,
+      quantity: 1,
+    };
+    const item2 = {
+      _id: 2,
+      price: 4.65,
+      quantity: 1,
+    };
+
+    const order = { items: [item1, item2] };
+    const newOrder = pricingService2.order.calculate(order);
+    expect(newOrder).toHaveProperty('total', 21);
+    expect(newOrder).toHaveProperty('subTotal', 20.64);
+    expect(newOrder).toHaveProperty('subTotals', {});
+    expect(newOrder.items[0]).toHaveProperty('total', 16.35);
+    expect(newOrder.items[0]).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 0,
+      _direct: 0,
+      _xdirect: 0,
+      _simple: 15.99,
+      _actual: 15.99,
+    });
+    expect(newOrder.items[1]).toHaveProperty('total', 4.65);
+    expect(newOrder.items[1]).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 0,
+      _direct: 0,
+      _xdirect: 0,
+      _simple: 4.65,
+      _actual: 4.65,
+    });
+  });
+  test('CU-861n7pum9 - Calculate order -> discountMod percentage isIgnoreQuanity=true qt=1', () => {
+    const discountMod = {
+      _id: 1,
+      compute: {
+        amount: 50,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `50% discount`,
+      type: 'discount',
+      properties: {
+        isQuantityMultiplier: false,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [discountMod],
+    };
+
+    const order = {
+      items: [item1],
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 5);
+    expect(newOrder).toHaveProperty('subTotal', 10);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -5,
+    });
+    expect(newOrder.items[0]).toHaveProperty('total', 5);
+    expect(newOrder.items[0].modifiers[0]._computed).toHaveProperty(
+      'amount',
+      -5
+    );
+  });
+
+  test('CU-861n7pum9 - Calculate order -> discountMod percentage isIgnoreQuanity=true qt=2', () => {
+    const discountMod = {
+      _id: 1,
+      compute: {
+        amount: 50,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `50% discount`,
+      type: 'discount',
+      properties: {
+        isQuantityMultiplier: false,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 2,
+      modifiers: [discountMod],
+    };
+
+    const order = {
+      items: [item1],
+    };
+
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 15);
+    expect(newOrder).toHaveProperty('subTotal', 20);
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -5,
+    });
+    expect(newOrder.items[0]).toHaveProperty('total', 15);
+    expect(newOrder.items[0].modifiers[0]).toHaveProperty('_computed', {
+      amount: -5,
+      description: '50% discount (-$5.00)',
+    });
+  });
+  test('CU-861n7pum9 - Calculate order -> discountMod100Fixed   qt=1', () => {
+    const discountMod100Fixed = {
+      _id: 1,
+      compute: {
+        amount: 100,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `100% discount`,
+      type: 'discount',
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [discountMod100Fixed],
+    };
+
+    const calculatedItem = pricingService.item.calculate(item1);
+
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem).toHaveProperty('subTotals', {
+      _actual: 10,
+      _direct: 0,
+      _included: 0,
+      _simple: 10,
+      _xdirect: -10,
+      _xincluded: -10,
+      discount: -10,
+    });
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: -10,
+      description: '100% discount (-$10.00)',
+    });
+  });
+
+  test('CU-861n7pum9 - Calculate order -> discountMod100Fixed and discountMod100Percentage  qt=1', () => {
+    const discountMod100Fixed = {
+      _id: 1,
+      compute: {
+        amount: 100,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `100% discount`,
+      type: 'discount',
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [discountMod100Fixed, discountMod100Fixed],
+    };
+
+    const calculatedItem = pricingService.item.calculate(item1);
+
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem).toHaveProperty('subTotals', {
+      _actual: 10,
+      _direct: 0,
+      _included: 0,
+      _simple: 10,
+      _xdirect: -10,
+      _xincluded: -10,
+      discount: -10,
+    });
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: -10,
+      description: '100% discount (-$10.00)',
+    });
+
+    expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: -0,
+      description: '100% discount',
+    });
+  });
+
+  test('CU-861n7pum9 - Calculate order -> discountMod100Fixed  qt=2', () => {
+    const discountMod100Fixed = {
+      _id: 1,
+      compute: {
+        amount: 100,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `100 USD discount`,
+      type: 'discount',
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 2,
+      modifiers: [discountMod100Fixed, discountMod100Fixed],
+    };
+
+    const calculatedItem = pricingService.item.calculate(item1);
+
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem).toHaveProperty('subTotals', {
+      _actual: 20,
+      _direct: 0,
+      _included: 0,
+      _simple: 20,
+      _xdirect: -20,
+      _xincluded: -20,
+      discount: -20,
+    });
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: -20,
+      description: '100 USD discount (-$20.00)',
+    });
+
+    expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: -0,
+      description: '100 USD discount',
+    });
+  });
+
+  test('CU-861n7pum9 - Calculate order -> discountMod100Percentage  qt=1', () => {
+    const discountMod100Percentage = {
+      _id: 1,
+      compute: {
+        amount: 100,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `100% discount`,
+      type: 'discount',
+      properties: {
+        isQuantityMultiplier: true,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 2,
+      modifiers: [discountMod100Percentage, discountMod100Percentage],
+    };
+
+    const calculatedItem = pricingService.item.calculate(item1);
+
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem).toHaveProperty('subTotals', {
+      _actual: 20,
+      _direct: 0,
+      _included: 0,
+      _simple: 20,
+      _xdirect: -20,
+      _xincluded: -20,
+      discount: -20,
+    });
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: -20,
+      description: '100% discount (-$20.00)',
+    });
+
+    expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: -0,
+      description: '100% discount',
+    });
+  });
+
+  test('CU-861n7pum9 - Calculate order -> discountMod100Percentage discountMod100Fixed  qt=2', () => {
+    const discountMod100Percentage = {
+      _id: 1,
+      compute: {
+        amount: 100,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `100% discount`,
+      type: 'discount',
+      properties: {
+        isQuantityMultiplier: true,
+      },
+    };
+
+    const discountMod100Fixed = {
+      _id: 1,
+      compute: {
+        amount: 100,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `100 USD discount`,
+      type: 'discount',
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 2,
+      modifiers: [
+        discountMod100Percentage,
+        discountMod100Fixed,
+        discountMod100Percentage,
+        discountMod100Fixed,
+      ],
+    };
+
+    const calculatedItem = pricingService.item.calculate(item1);
+
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem).toHaveProperty('subTotals', {
+      _actual: 20,
+      _direct: 0,
+      _included: 0,
+      _simple: 20,
+      _xdirect: -20,
+      _xincluded: -20,
+      discount: -20,
+    });
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: -20,
+      description: '100% discount (-$20.00)',
+    });
+
+    expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: -0,
+      description: '100 USD discount',
+    });
+  });
+
+  test('CU-861n7pum9 - Calculate order -> discountMod60Percentage discountMod100Fixed, sort,  qt=2', () => {
+    const discountMod60Percentage = {
+      _id: 1,
+      compute: {
+        amount: 60,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: `60% discount`,
+      type: 'discount',
+      properties: {
+        sort: 3,
+        isQuantityMultiplier: true,
+      },
+    };
+
+    const discountMod100Fixed = {
+      _id: 1,
+      compute: {
+        amount: 100,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `100 USD discount`,
+      type: 'discount',
+      properties: {
+        sort: 4,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 2,
+      modifiers: [discountMod60Percentage, discountMod100Fixed],
+    };
+
+    const calculatedItem = pricingService.item.calculate(item1);
+
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem).toHaveProperty('subTotals', {
+      _actual: 20,
+      _direct: 0,
+      _included: 0,
+      _simple: 20,
+      _xdirect: -20,
+      _xincluded: -20,
+      discount: -20,
+    });
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: -12,
+      description: '60% discount (-$12.00)',
+    });
+
+    expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: -8,
+      description: '100 USD discount (-$8.00)',
+    });
+  });
+
+  test('CU-861n7pum9 - Calculate order -> discountMod9Fixed , sort,  qt=2', () => {
+    const discountMod9Fixed = {
+      _id: 1,
+      compute: {
+        amount: 12,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      name: `12 USD discount`,
+      type: 'discount',
+      properties: {
+        isQuantityMultiplier: true,
+      },
+    };
+
+    const item1 = {
+      _id: 1,
+      price: 10,
+      quantity: 2,
+      modifiers: [discountMod9Fixed, discountMod9Fixed],
+    };
+
+    const calculatedItem = pricingService.item.calculate(item1);
+
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem).toHaveProperty('subTotals', {
+      _actual: 20,
+      _direct: 0,
+      _included: 0,
+      _simple: 20,
+      _xdirect: -20,
+      _xincluded: -20,
+      discount: -20,
+    });
+    expect(calculatedItem).toHaveProperty('total', 0);
+    expect(calculatedItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: -20,
+      description: '12 USD discount (-$20.00)',
+    });
+
+    expect(calculatedItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: -0,
+      description: '12 USD discount',
+    });
+  });
 });

package/lib/item/addIndirectModifier.js

@@ -50,7 +50,7 @@ module.exports = ({ utils, modifierActions, _ }) => {
           },
           properties: {
             ...inheritedModifier.properties,
-            ignoreQuantity: true,
+            isQuantityMultiplier: false,
           },
         };
       }