@darkpos/pricing 1.0.52 → 1.0.54

package/__TEST__/item/addIndirectModifier.test.js

@@ -71,7 +71,7 @@ describe('addIndirectModifier Function', () => {
     expect(result).toEqual({
       item1: {
         compute: { amount: 50 }, // Adjusted amount to fix the total distribution difference
-        properties: { ignoreQuantity: true },
+        properties: { isQuantityMultiplier: false },
       },
       item2: { compute: { amount: 50 }, properties: {} },
     });
@@ -127,7 +127,7 @@ describe('addIndirectModifier Function', () => {
       item1: {
         compute: { amount: -35 },
         properties: {
-          ignoreQuantity: true,
+          isQuantityMultiplier: false,
         },
         _computed: { amount: 15 },
       },
@@ -160,7 +160,7 @@ describe('addIndirectModifier Function', () => {
       item1: {
         compute: { amount: -30 },
         properties: {
-          ignoreQuantity: true,
+          isQuantityMultiplier: false,
         },
       },
       item2: { compute: { amount: 50 }, properties: {} },

package/__TEST__/item.test.js

@@ -15,6 +15,9 @@ describe('Item actions', () => {
         type: 'discount',
         direct: false,
         included: false,
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
       {
         compute: {
@@ -26,6 +29,9 @@ describe('Item actions', () => {
         type: 'discount',
         direct: false,
         included: false,
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
       {
         compute: {
@@ -37,6 +43,9 @@ describe('Item actions', () => {
         type: 'discount',
         direct: false,
         included: false,
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
     ];
     const orderItem = { price: 30, quantity: 2, modifiers };
@@ -60,6 +69,9 @@ describe('Item actions', () => {
         name: 'modifier1',
         direct: true,
         included: false,
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
       {
         compute: {
@@ -71,6 +83,9 @@ describe('Item actions', () => {
         type: 'discount',
         direct: true,
         included: false,
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
       {
         compute: {
@@ -82,6 +97,9 @@ describe('Item actions', () => {
         type: 'tax',
         direct: true,
         included: false,
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
     ];
     const orderItem = { price: 30, quantity: 2, modifiers };
@@ -110,6 +128,9 @@ describe('Item actions', () => {
         type: 'discount',
         direct: true,
         included: true,
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
       {
         compute: {
@@ -121,6 +142,9 @@ describe('Item actions', () => {
         type: 'discount',
         direct: true,
         included: true,
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
       {
         compute: {
@@ -132,6 +156,9 @@ describe('Item actions', () => {
         type: 'upcharge',
         direct: true,
         included: true,
+        properties: {
+          isQuantityMultiplier: true,
+        },
       },
     ];
     const orderItem = { price: 30, quantity: 2, modifiers };
@@ -631,7 +658,7 @@ describe('Item actions', () => {
     expect(newItem).toHaveProperty('total', 70.5);
     expect(newItem).toHaveProperty('price', 13.5);
     expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 10,
+      amount: 30,
       description: 'Override modamount fixed 10 ($30.00)',
     });
 

package/__TEST__/mocks/addItemMock.js

@@ -1672,7 +1672,7 @@ const addItemMock = {
             items: [],
           },
           sort: null,
-          ignoreQuantity: true,
+          isQuantityMultiplier: false,
         },
         _computed: null,
         addModifiers: [],
@@ -1795,7 +1795,7 @@ const addItemMock = {
           },
           department: {},
           sort: null,
-          ignoreQuantity: false,
+          isQuantityMultiplier: true,
         },
         _computed: null,
         addModifiers: [],

package/__TEST__/mocks/order-credit.json

@@ -262,7 +262,7 @@
                     },
                     "properties": {
                         "sort": 999,
-                        "ignoreQuantity": true
+                        "isQuantityMultiplier": false
                     },
                     "_id": "63ade222dd19604ca368eb29",
                     "modifierId": "63ade212dd19604ca368eb23",

package/__TEST__/mocks/partially-paid/order-partially-paid.json

@@ -96,7 +96,7 @@
           "default": false,
           "code": "",
           "properties": {
-            "ignoreQuantity": true
+            "isQuantityMultiplier": false
           },
           "_computed": {
             "amount": -2.36,
@@ -149,7 +149,7 @@
           "default": false,
           "code": "",
           "properties": {
-            "ignoreQuantity": true
+            "isQuantityMultiplier": false
           },
           "_computed": {
             "amount": 0.48,

package/__TEST__/mocks/unpaid/order-not-paid.json

@@ -98,7 +98,7 @@
                     "default": false,
                     "code": "",
                     "properties": {
-                        "ignoreQuantity": true
+                        "isQuantityMultiplier": false
                     },
                     "_computed": {
                         "amount": -2.36,

package/__TEST__/modifier/createIndirectModifier.test.js

@@ -1,38 +1,14 @@
-const _ = require('lodash');
-const utils = require('@darkpos/utils');
-const createIndirectModifierFunction = require('../../lib/modifier/createIndirectModifier');
+const usePricing = require('../../index');
+
+const pricingService = usePricing();
 
 describe('createIndirectModifier Function', () => {
   test('create indirect modifier with an undefined modifier compute', () => {
-    const constants = {
-      Modifier: {
-        Compute: {
-          Types: {
-            PERCENTAGE: 'percentage',
-            FIXED: 'fixed',
-          },
-          Actions: {
-            SUBTRACT: 'subtract',
-          },
-        },
-      },
-    };
-    const actions = {
-      getProperty: (modifier, prop) => modifier[prop],
-      create: modifier => modifier,
-    };
-    // const getComputeModField = jest.fn().mockReturnValue(null);
-
-    const createIndirectModifier = createIndirectModifierFunction({
-      _,
-      utils,
-      constants,
-      actions,
-    });
-
     const modifier = {
       type: 'credit',
-      properties: {},
+      properties: {
+        isQuantityMultiplier: true,
+      },
     };
     const options = {
       orderTotal: 100,
@@ -40,9 +16,12 @@ describe('createIndirectModifier Function', () => {
       itemTotal: 50,
     };
 
-    const result = createIndirectModifier(modifier, options);
+    const result = pricingService.modifier.createIndirectModifier(
+      modifier,
+      options
+    );
 
-    expect(result).toEqual({
+    expect(result).toMatchObject({
       ...modifier,
       direct: false,
       compute: {
@@ -51,39 +30,14 @@ describe('createIndirectModifier Function', () => {
         action: 'subtract',
       },
       properties: {
-        ignoreQuantity: false,
+        isQuantityMultiplier: true,
       },
     });
   });
   test('create indirect modifier with a null modifier compute', () => {
-    const constants = {
-      Modifier: {
-        Compute: {
-          Types: {
-            PERCENTAGE: 'percentage',
-            FIXED: 'fixed',
-          },
-          Actions: {
-            SUBTRACT: 'subtract',
-          },
-        },
-      },
-    };
-    const actions = {
-      getProperty: (modifier, prop) => modifier[prop],
-      create: modifier => modifier,
-    };
-
-    const createIndirectModifier = createIndirectModifierFunction({
-      _,
-      utils,
-      constants,
-      actions,
-    });
-
     const modifier = {
       type: 'credit',
-      properties: {},
+      properties: { isQuantityMultiplier: true },
       compute: null,
     };
     const options = {
@@ -92,9 +46,12 @@ describe('createIndirectModifier Function', () => {
       itemTotal: 50,
     };
 
-    const result = createIndirectModifier(modifier, options);
+    const result = pricingService.modifier.createIndirectModifier(
+      modifier,
+      options
+    );
 
-    expect(result).toEqual({
+    expect(result).toMatchObject({
       ...modifier,
       direct: false,
       compute: {
@@ -103,39 +60,14 @@ describe('createIndirectModifier Function', () => {
         action: 'subtract',
       },
       properties: {
-        ignoreQuantity: false,
+        isQuantityMultiplier: true,
       },
     });
   });
   test('create indirect modifier regular modifier', () => {
-    const constants = {
-      Modifier: {
-        Compute: {
-          Types: {
-            PERCENTAGE: 'percentage',
-            FIXED: 'fixed',
-          },
-          Actions: {
-            SUBTRACT: 'subtract',
-          },
-        },
-      },
-    };
-    const actions = {
-      getProperty: (modifier, prop) => modifier[prop],
-      create: modifier => modifier,
-    };
-
-    const createIndirectModifier = createIndirectModifierFunction({
-      _,
-      utils,
-      constants,
-      actions,
-    });
-
     const modifier = {
       type: 'credit',
-      properties: {},
+      properties: { isQuantityMultiplier: true },
       compute: {
         type: 'fixed',
         action: 'add',
@@ -148,9 +80,12 @@ describe('createIndirectModifier Function', () => {
       itemTotal: 50,
     };
 
-    const result = createIndirectModifier(modifier, options);
+    const result = pricingService.modifier.createIndirectModifier(
+      modifier,
+      options
+    );
 
-    expect(result).toEqual({
+    expect(result).toMatchObject({
       ...modifier,
       direct: false,
       compute: {
@@ -159,7 +94,7 @@ describe('createIndirectModifier Function', () => {
         amount: 2.5,
       },
       properties: {
-        ignoreQuantity: false,
+        isQuantityMultiplier: true,
       },
     });
   });

package/__TEST__/modifier/hasModifier.test.js

@@ -1485,7 +1485,7 @@ describe('hasModifier Function', () => {
             action: 'subtract',
           },
           properties: {
-            ignoreQuantity: false,
+            isQuantityMultiplier: true,
           },
           _id: '67226d7fe779680a203df892',
           modifierId: '62cdbfd01ee1b4001932822e',
@@ -1531,7 +1531,7 @@ describe('hasModifier Function', () => {
             action: 'subtract',
           },
           properties: {
-            ignoreQuantity: false,
+            isQuantityMultiplier: true,
             subscription: {},
             override: {},
             group: {

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

@@ -806,7 +806,7 @@ describe('Order actions', () => {
               default: false,
               code: 'L',
               properties: {
-                ignoreQuantity: false,
+                isQuantityMultiplier: true,
               },
               _computed: {
                 amount: 0,
@@ -848,7 +848,7 @@ describe('Order actions', () => {
               default: false,
               code: '',
               properties: {
-                ignoreQuantity: false,
+                isQuantityMultiplier: true,
                 group: {
                   modifiers: [],
                   items: [],