@darkpos/pricing 1.0.56 → 1.0.57

package/__TEST__/modifier.test.js

@@ -74,6 +74,64 @@ describe('Modifier actions', () => {
       },
     });
 
+    expect(conditionsBag).toEqual([]);
+    expect(error).toEqual('');
+
+    expect(updatedOrder2.items[0].modifiers.length).toEqual(2);
+  });
+
+  test('CU-86dve27tq Should not allow adding a modifier more than once to an item if isQuantityMultiplier={true} QTY={2}', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+      properties: {
+        isQuantityMultiplier: true,
+      },
+    };
+    order.items.push({
+      quantity: 2,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+    });
+
+    const conditionsBag = [];
+
+    const updatedOrder = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+    });
+
+    let error = '';
+    const updatedOrder2 = pricingService.order.addItemModifier({
+      order: { ...updatedOrder },
+      modifier,
+      itemIndex: 0,
+      onConditionsNotMet: bag => {
+        bag.forEach(condition => {
+          conditionsBag.push(condition);
+        });
+      },
+      onError: errorMessage => {
+        error = errorMessage;
+      },
+    });
+
     expect(conditionsBag).toEqual([]);
     expect(error).toEqual('modifier.has.reached.the.maximum.amount.of.applies');
     expect(updatedOrder2).toEqual(updatedOrder);

package/__TEST__/order/unvoid.test.js

@@ -0,0 +1,32 @@
+const usePricing = require('../../index');
+const mockStores = require('../mocks/stores');
+const orderNotPaid = require('../mocks/unpaid/order-not-paid.json');
+const constants = require('../../lib/constants/Status');
+
+const session = {
+  store: mockStores[0],
+};
+
+const pricingService = usePricing(session);
+
+describe('Unvoid order', () => {
+  test('Should update status.order to OPEN if order has existing status', () => {
+    const updatedOrder = pricingService.order.unvoidOrder(orderNotPaid);
+    expect(updatedOrder.status.order).toBe(constants.Order.OPEN);
+  });
+
+  test('Should return null if order is null', () => {
+    const updatedOrder = pricingService.order.unvoidOrder(null);
+    expect(updatedOrder).toBeNull();
+  });
+  test('Should return undefined if order is undefined', () => {
+    const updatedOrder = pricingService.order.unvoidOrder(undefined);
+    expect(updatedOrder).toBeUndefined();
+  });
+  test('Should not mutate the original order object', () => {
+    const order = { ...orderNotPaid };
+    const orderClone = JSON.parse(JSON.stringify(orderNotPaid));
+    pricingService.order.unvoidOrder(order);
+    expect(order).toEqual(orderClone);
+  });
+});

package/lib/order/addItemModifier.js

@@ -227,7 +227,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     if (
       contains &&
       modifierActions.isCompute(modifier) &&
-      !modifierActions.isQuantityMultiplier(modifier)
+      modifierActions.isQuantityMultiplier(modifier)
     ) {
       if (onError)
         onError('modifier.has.reached.the.maximum.amount.of.applies');

package/lib/order/index.js

@@ -38,6 +38,7 @@ const addDiscountModifier = require('./addDiscountModifier');
 const calculateDue = require('./calculateDue');
 const toggleModifier = require('./toggleModifier');
 const voidOrder = require('./void');
+const unvoidOrder = require('./unvoid');
 const holdOrder = require('./hold');
 const openOrder = require('./open');
 const isDetailed = require('./isDetailed');
@@ -137,6 +138,7 @@ const orderActions = (deps = {}) => {
     calculateDue: calculateDue(innerDeps),
     toggleModifier: toggleModifier(innerDeps),
     voidOrder: voidOrder(innerDeps),
+    unvoidOrder: unvoidOrder(innerDeps),
     holdOrder: holdOrder(innerDeps),
     openOrder: openOrder(innerDeps),
     isDetailed: isDetailed(innerDeps),

package/lib/order/unvoid.js

@@ -0,0 +1,11 @@
+module.exports = ({ constants }) =>
+  function unvoid(order) {
+    if (!order) return order;
+    return {
+      ...order,
+      status: {
+        ...(order.status || {}),
+        order: constants.Status.Order.OPEN,
+      },
+    };
+  };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -45,5 +45,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "41b3ae5dcaec11195920c3b5f0a97b34b3982815"
+  "gitHead": "d7719dca121087e9f10644bcef8ccd76e1271104"
 }