@darkpos/pricing 1.0.46 → 1.0.47

package/__TEST__/order/addItem.test.js

@@ -26,7 +26,11 @@ describe('addItem function', () => {
     };
 
     // Call the function
-    const [updatedOrder, itemIndex, addedItem] = addItem({
+    const {
+      updatedOrder,
+      itemIndex,
+      item: addedItem,
+    } = addItem({
       order,
       item,
       itemIndex: -1, // No existing item in order
@@ -67,7 +71,11 @@ describe('addItem function', () => {
     };
 
     // Call the function
-    const [updatedOrder, itemIndex, addedItem] = addItem({
+    const {
+      updatedOrder,
+      itemIndex,
+      item: addedItem,
+    } = addItem({
       order,
       item,
       itemIndex: -1, // Assuming no explicit index
@@ -99,7 +107,7 @@ describe('addItem function', () => {
     };
 
     // Call the function with an overridden quantity
-    const [updatedOrder, , addedItem] = addItem({
+    const { updatedOrder, item: addedItem } = addItem({
       order,
       item,
       itemIndex: -1, // Assuming no explicit index
@@ -179,7 +187,7 @@ describe('addItem function', () => {
     };
 
     // Call the function
-    const [updatedOrder] = addItem({
+    const { updatedOrder } = addItem({
       order,
       item,
       itemIndex: -1, // Assuming no explicit index

package/lib/order/addItem.js

@@ -187,6 +187,7 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
       !_.isEmpty(orderItem.modifiers)
     )
       requiredModifiers = getUnselectedModifiers(orderItem, requiredModifiers);
+
     if (!_.isEmpty(requiredModifiers)) {
       modifiersToAdd.push(
         ...requiredModifiers.filter(
@@ -213,17 +214,23 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
     let [nextOrder, nextItemIndex] = params;
     const [, , nextItem] = params;
 
+    const overrideModifiers = modifiersToAdd.filter(modToAdd =>
+      modifierActions.isOverride(modToAdd)
+    );
+
     if (modifiersToAdd.length) {
-      nextOrder = modifiersToAdd.reduce(
-        (acc, modifier) =>
-          actions.addItemModifier({
-            itemIndex: nextItemIndex,
-            order: acc,
-            modifier,
-            cache,
-          }),
-        nextOrder
-      );
+      nextOrder = modifiersToAdd
+        .filter(modToAdd => !modifierActions.isOverride(modToAdd))
+        .reduce(
+          (acc, modifier) =>
+            actions.addItemModifier({
+              itemIndex: nextItemIndex,
+              order: acc,
+              modifier,
+              cache,
+            }),
+          nextOrder
+        );
     }
 
     const { reArrangedOrder, newIndex } = reArrangeNewItem({
@@ -243,6 +250,11 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
       nextOrder.items.splice(idxToRemove, 1);
     }
 
-    return [nextOrder, nextItemIndex, nextItem];
+    return {
+      updatedOrder: nextOrder,
+      itemIndex: nextItemIndex,
+      item: nextItem,
+      overrideModifiers,
+    };
   };
 };

package/lib/order/addItemModifier.js

@@ -244,7 +244,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
 
     if (modifierActions.hasRelatedItems(modifier)) {
       order = modifier.properties.group.items.reduce((acc, each) => {
-        const [nextOrder] = actions.addItem({
+        const { updatedOrder: nextOrder } = actions.addItem({
           item: {
             ...each,
             itemId: each._id,

package/lib/order/updateItemQuantity.js

@@ -14,7 +14,7 @@ module.exports = ({ actions, settings, _ }) => {
       const updatedQuantity = reset
         ? quantity
         : parseInt(`${item.quantity}${quantity}`, 10);
-      return actions.updateItem({
+      const { updatedOrder } = actions.updateItem({
         order,
         itemIndex,
         item: {
@@ -22,6 +22,7 @@ module.exports = ({ actions, settings, _ }) => {
           quantity: updatedQuantity,
         },
       });
+      return updatedOrder;
     }
     if (isBefore) {
       return actions.addItem({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.46",
+  "version": "1.0.47",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -39,5 +39,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "e048578555dc3d2147bbc4e5b4e0d55809261dcc"
+  "gitHead": "98185abdf0b1e4c22098c17b8eb1fde30c673093"
 }