@darkpos/pricing 1.0.129 → 1.0.131

package/__TEST__/modifier/addItemModifier.test.js

@@ -374,4 +374,172 @@ describe('addItemModifier Function', () => {
 
     expect(result.items[0].price).toBe(129);
   });
+
+  test('Calculate item with Override Modifier and unitAsAmountMultiplier=true', () => {
+    const item = {
+      location: {},
+      status: {
+        picked: {
+          value: false,
+          date: '',
+        },
+        paid: {
+          value: false,
+          date: '',
+        },
+        tracker: [],
+      },
+      name: 'Short Pants2',
+      description: '',
+      pieces: 1,
+      modifiersTotalAmount: 0,
+      total: 510,
+      totalPaid: 0,
+      price: 10,
+      quantity: 1,
+      path: ',68eeba20cbfa2b080d75f7ea,68eeba2d9366a6367d7baaea,',
+      notes: [],
+      serial: null,
+      sku: '',
+      modifiers: [
+        {
+          _id: '690a3d23de696e15c594f7f2',
+          attributes: ['department'],
+          modifierId: '68efd827aeec0b1c557f79d4',
+          _parentId: null,
+          locked: false,
+          name: 'Dry Cleaning',
+          sku: '',
+          description: '',
+          group: '',
+          type: '',
+          tags: ['default'],
+          order: 0,
+          included: false,
+          direct: true,
+          hidden: false,
+          print: true,
+          required: false,
+          recommended: false,
+          default: false,
+          code: 'DC',
+          properties: {
+            department: {
+              tagSize: 'small',
+              splitUnit: 'quantity',
+              maxItems: '',
+              autoSplit: false,
+            },
+            sort: null,
+          },
+          _computed: {
+            amount: 0,
+            description: 'Dry Cleaning',
+          },
+          conditions: {
+            valid: true,
+          },
+          compute: null,
+          _createdAt: '2025-10-15T17:21:43.526Z',
+          _updatedAt: '2025-10-15T17:26:13.671Z',
+          __typename: 'Modifier',
+          addModifiers: [],
+          delModifiers: [],
+        },
+        {
+          _id: '690a3d2ede696e15c594f7f3',
+          attributes: ['override'],
+          modifierId: '690a195d3117c6cb92a692c0',
+          _parentId: null,
+          locked: false,
+          name: 'Pleats',
+          sku: '',
+          description: '',
+          group: '',
+          type: '',
+          tags: ['default'],
+          order: 0,
+          included: false,
+          direct: true,
+          hidden: false,
+          print: true,
+          required: false,
+          recommended: false,
+          default: false,
+          code: '',
+          properties: {
+            subscription: {},
+            override: {
+              field: 'amount',
+              type: 'manual',
+              options: null,
+              fixedValue: 20,
+              service: null,
+              unitAsAmountMultiplier: true,
+              amountMultiplier: 25,
+              multiplier: false,
+            },
+            group: {
+              items: [],
+              modifiers: [],
+            },
+            department: {},
+            sort: null,
+          },
+          _computed: {
+            amount: 500,
+            description: 'Pleats ($500.00)',
+          },
+          conditions: {
+            valid: true,
+          },
+          compute: {
+            type: 'fixed',
+            amount: 20,
+            action: 'add',
+          },
+          _createdAt: '2025-11-04T15:18:53.231Z',
+          _updatedAt: '2025-11-04T16:54:33.773Z',
+          __typename: 'Modifier',
+          addModifiers: [],
+          delModifiers: [],
+        },
+      ],
+      _id: '690a3d23de696e15c594f7f1',
+      _updatedAt: '2025-11-04T17:05:05.845Z',
+      _createdAt: '2025-10-14T21:02:10.991Z',
+      weight: 0,
+      properties: {},
+      hasInventory: true,
+      inventoryType: 'push',
+      serialRequired: false,
+      tags: [],
+      category: null,
+      __typename: 'OrderItem',
+      priceLevels: [
+        {
+          value: 10,
+          tags: ['default'],
+        },
+        {
+          value: 8,
+          tags: ['default', 'vip'],
+        },
+      ],
+      costLevels: [],
+      itemId: '68eeba52cbfa2b080d75fa02',
+      menuRuleId: '68eeba559366a6367d7bab08',
+      subTotals: {
+        _included: 0,
+        _xincluded: 500,
+        _direct: 500,
+        _xdirect: 0,
+        _simple: 10,
+        _actual: 10,
+        '': 500,
+      },
+    };
+    const calculatedItem = pricingService.item.calculate(item);
+    expect(calculatedItem.total).toBe(510);
+  });
 });

package/lib/modifier/calculate.js

@@ -70,6 +70,14 @@ module.exports = ({ _, constants, utils, actions }) => {
         _computed.amount = math.mul(_computed.amount, options.quantity);
       }
 
+      if (
+        actions.isAmountOverride(_modifier) &&
+        actions.isAmountMultiplier(_modifier)
+      ) {
+        const amountMultiplier = actions.getAmountMultiplier(_modifier);
+        _computed.amount = math.mul(_computed.amount, amountMultiplier);
+      }
+
       if (actions.isTotalOverride(_modifier)) {
         _computed.amount = math.sub(compute.amount, options.maxDiscountAmount);
       }

package/lib/modifier/getAmountMultiplier.js

@@ -0,0 +1,10 @@
+module.exports = ({ actions }) =>
+  function getAmountMultiplier(modifier) {
+    if (!actions.isOverride(modifier)) return 1;
+    if (!actions.isAmountMultiplier(modifier)) return 1;
+
+    return (
+      (modifier.properties && modifier.properties.override.amountMultiplier) ||
+      1
+    );
+  };

package/lib/modifier/index.js

@@ -179,6 +179,8 @@ const isEmptyOverride = require('./isEmptyOverride');
 const getMaxUsesPerCustomer = require('./getMaxUsesPerCustomer');
 const getPromoCustomerIds = require('./getPromoCustomerIds');
 const getCountPerCustomer = require('./getCountPerCustomer');
+const getAmountMultiplier = require('./getAmountMultiplier');
+const isAmountMultiplier = require('./isAmountMultiplier');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -370,6 +372,8 @@ const modifierActions = (deps = {}) => {
     getMaxUsesPerCustomer: getMaxUsesPerCustomer(innerDeps),
     getPromoCustomerIds: getPromoCustomerIds(innerDeps),
     getCountPerCustomer: getCountPerCustomer(innerDeps),
+    getAmountMultiplier: getAmountMultiplier(innerDeps),
+    isAmountMultiplier: isAmountMultiplier(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/isAmountMultiplier.js

@@ -0,0 +1,10 @@
+module.exports = () =>
+  function isAmountMultiplier(modifier) {
+    if (!modifier) return false;
+    return !!(
+      modifier &&
+      modifier.properties &&
+      modifier.properties.override &&
+      modifier.properties.override.unitAsAmountMultiplier
+    );
+  };

package/lib/order/create.js

@@ -1,6 +1,4 @@
 module.exports = ({ utils, constants = {} }) => {
-  const { helpers } = utils;
-
   const defaultOrderStatus = {
     order: constants.Status.Order.OPEN,
     kitchen: constants.Status.Kitchen.OPEN,
@@ -20,9 +18,6 @@ module.exports = ({ utils, constants = {} }) => {
     __typename: 'OrderStart',
   };
   const defaultOrder = {
-    get _id() {
-      return helpers.getObjectID();
-    },
     parentId: null,
     isParent: false,
     subTotal: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.129",
+  "version": "1.0.131",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -52,5 +52,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "958c254c252446558919666dfd3c524e5ec3acb5"
+  "gitHead": "b4f267cbf11b2857a4fc01053cc315036e63392f"
 }