@darkpos/pricing 1.0.108 → 1.0.110

package/__TEST__/item.test.js

@@ -1689,4 +1689,146 @@ describe('Item actions', () => {
       description: '$7.59 discount (-$7.59)',
     });
   });
+
+  test('Should use a price override modifier and quantity override modifier in combination accordingly', () => {
+    const overridePriceMod = {
+      _id: '675354ee39a47228afd1f1a4',
+      attributes: ['override'],
+      modifierId: '6751f7eeb60c71cefee138ee',
+      name: 'Override item price fixed 0',
+      tags: ['default', 'all'],
+      direct: true,
+      properties: {
+        override: {
+          type: 'fixed',
+          field: 'price',
+          fixedValue: 0,
+          multiplier: false,
+        },
+      },
+    };
+    const overrideQuantityMod = {
+      _id: '675354ee39a47228afd1f1a5',
+      attributes: ['override'],
+      modifierId: '6751f7eeb60c71cefee138ff',
+      name: 'Override item quantity fixed 20',
+      tags: ['default', 'all'],
+      direct: true,
+      properties: {
+        override: {
+          type: 'fixed',
+          field: 'quantity',
+          fixedValue: 20,
+          multiplier: false,
+        },
+      },
+    };
+
+    const itemWithModifierAmountFixed10 = {
+      name: "Men's 3pc Tuxedo",
+      pieces: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [overridePriceMod, overrideQuantityMod],
+      _id: '675354e939a47228afd1f199',
+      itemId: '62cdbfd01ee1b400193281ee',
+    };
+    const newItem = pricingService.item.calculate(
+      itemWithModifierAmountFixed10
+    );
+    expect(newItem.price).toBe(0);
+    expect(newItem.total).toBe(0);
+    expect(newItem.quantity).toBe(20);
+    expect(newItem).toHaveProperty('price', 0);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 0,
+      description: 'Override item price fixed 0 ($0.00/Unit)',
+    });
+
+    expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: 0,
+      description: 'Override item quantity fixed 20',
+    });
+
+    expect(newItem).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: 0,
+      _direct: 0,
+      _xdirect: 0,
+      _simple: 0,
+      _actual: 0,
+    });
+  });
+
+  test('Should use a total override modifier and quantity override modifier in combination accordingly', () => {
+    const overrideTotalMod = {
+      _id: '675354ee39a47228afd1f1a4',
+      attributes: ['override'],
+      modifierId: '6751f7eeb60c71cefee138ee',
+      name: 'Override item total fixed 0',
+      tags: ['default', 'all'],
+      direct: true,
+      properties: {
+        override: {
+          type: 'fixed',
+          field: 'total',
+          fixedValue: 0,
+          multiplier: false,
+        },
+        sort: 2,
+      },
+    };
+    const overrideQuantityMod = {
+      _id: '675354ee39a47228afd1f1a5',
+      attributes: ['override'],
+      modifierId: '6751f7eeb60c71cefee138ff',
+      name: 'Override item quantity fixed 20',
+      tags: ['default', 'all'],
+      direct: true,
+      properties: {
+        override: {
+          type: 'fixed',
+          field: 'quantity',
+          fixedValue: 20,
+          multiplier: false,
+        },
+        sort: 1,
+      },
+    };
+
+    const itemWithModifierAmountFixed10 = {
+      name: "Men's 3pc Tuxedo",
+      pieces: 1,
+      price: 10,
+      quantity: 1,
+      modifiers: [overrideTotalMod, overrideQuantityMod],
+      _id: '675354e939a47228afd1f199',
+      itemId: '62cdbfd01ee1b400193281ee',
+    };
+    const newItem = pricingService.item.calculate(
+      itemWithModifierAmountFixed10
+    );
+    expect(newItem.price).toBe(10);
+    expect(newItem.total).toBe(0);
+    expect(newItem.quantity).toBe(20);
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+      amount: 0,
+      description: 'Override item quantity fixed 20',
+    });
+
+    expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+      amount: -200,
+      description: 'Override item total fixed 0 (-$200.00)',
+    });
+
+    expect(newItem).toHaveProperty('subTotals', {
+      _included: 0,
+      _xincluded: -200,
+      undefined: -200,
+      _direct: -200,
+      _xdirect: 0,
+      _simple: 200,
+      _actual: 200,
+    });
+  });
 });

package/__TEST__/payment.test.js

@@ -0,0 +1,51 @@
+const usePricing = require('../index');
+const mockStores = require('./mocks/stores');
+
+const session = {
+  store: mockStores[0],
+};
+
+const pricingService = usePricing(session);
+
+describe('getMaxAmountToRefund tests', () => {
+  test('Returns 0 when payment is undefined', () => {
+    expect(
+      pricingService.payment.getMaxAmountToRefund({ payment: undefined })
+    ).toBe(0);
+  });
+
+  test('Returns full payment amount when no deductions', () => {
+    const payment = { amount: 100 };
+    expect(pricingService.payment.getMaxAmountToRefund({ payment })).toBe(100);
+  });
+
+  test('Subtracts credit only', () => {
+    const payment = { amount: 100, credit: 20 };
+    expect(pricingService.payment.getMaxAmountToRefund({ payment })).toBe(80);
+  });
+
+  test('Subtracts change only', () => {
+    const payment = { amount: 100, change: 10 };
+    expect(pricingService.payment.getMaxAmountToRefund({ payment })).toBe(90);
+  });
+
+  test('Subtracts refundedAmount only', () => {
+    const payment = { amount: 100, refundedAmount: 25 };
+    expect(pricingService.payment.getMaxAmountToRefund({ payment })).toBe(75);
+  });
+
+  test('Subtracts credit, change, and refundedAmount', () => {
+    const payment = {
+      amount: 100,
+      credit: 10,
+      change: 5,
+      refundedAmount: 20,
+    };
+    expect(pricingService.payment.getMaxAmountToRefund({ payment })).toBe(65);
+  });
+
+  test('Handles all fields missing gracefully', () => {
+    const payment = { amount: 50 };
+    expect(pricingService.payment.getMaxAmountToRefund({ payment })).toBe(50);
+  });
+});

package/lib/index.js

@@ -8,6 +8,8 @@ const makeStoreActions = require('./store');
 const makeItemActions = require('./item');
 const makeOrderActions = require('./order');
 const makeModifierActions = require('./modifier');
+const makePaymentActions = require('./payment');
+
 const constants = require('./constants');
 
 module.exports = session => {
@@ -40,12 +42,20 @@ module.exports = session => {
     modifierActions,
     storeActions,
   });
+  const paymentActions = makePaymentActions({
+    ...deps,
+    itemActions,
+    modifierActions,
+    orderActions,
+    storeActions,
+  });
 
   return {
     item: itemActions,
     order: orderActions,
     modifier: modifierActions,
     store: storeActions,
+    payment: paymentActions,
     constants,
   };
 };

package/lib/item/calculate.js

@@ -99,7 +99,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
         );
       });
 
-    const price = parseFloat(
+    let price = parseFloat(
       actions.getPriceWithoutModifiers({
         price: item.price,
         modifiers: validatedModifiers,
@@ -174,6 +174,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
             overwrittenPrice: item.price,
           };
           item.price = priceOverride;
+          price = priceOverride;
         }
 
         if (modifierActions.isQuantityOverride(modifier)) {
@@ -182,7 +183,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
             ...(item.properties ? item.properties : {}),
             overwrittenQuantity: item.quantity,
           };
-          subTotals._simple = math.mul(price, newQuantity);
+          subTotals._simple = math.mul(item.price, newQuantity);
           item.quantity = parseInt(newQuantity, 10);
           quantity = parseInt(newQuantity, 10);
         }

package/lib/payment/getMaxAmountToRefund.js

@@ -0,0 +1,13 @@
+module.exports = ({ utils }) => {
+  const { math } = utils;
+
+  return function getMaxAmountToRefund({ payment }) {
+    if (!payment) return 0;
+    return math.sub(
+      payment.amount,
+      payment.credit || 0,
+      payment.change || 0,
+      payment.refundedAmount || 0
+    );
+  };
+};

package/lib/payment/index.js

@@ -0,0 +1,23 @@
+//
+const getMaxAmountToRefund = require('./getMaxAmountToRefund');
+
+const orderActions = (deps = {}) => {
+  const actions = {};
+
+  const innerDeps = {
+    ...deps,
+    actions,
+  };
+
+  const freezedActions = Object.freeze({
+    getMaxAmountToRefund: getMaxAmountToRefund(innerDeps),
+  });
+
+  Object.keys(freezedActions).forEach(actionName => {
+    actions[actionName] = freezedActions[actionName];
+  });
+
+  return freezedActions;
+};
+
+module.exports = orderActions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.108",
+  "version": "1.0.110",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -30,6 +30,7 @@
     "test:getParentTotals": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/getParentTotals.test.js",
     "test:overrideModifiers": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/overrideModifiers.test.js",
     "test:addItemModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/addItemModifier.test.js",
+    "test:payment": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/payment.test.js",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
@@ -54,5 +55,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "263ab257a926d73b861d12ae2ccfdb46b7d162ee"
+  "gitHead": "3e47ebde1cb164b785b001a37853316ec3c8e352"
 }