@darkpos/pricing 1.0.93 → 1.0.96

package/lib/order/addItem.js

@@ -218,18 +218,16 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
     );
 
     if (modifiersToAdd.length) {
-      nextOrder = modifiersToAdd
-        .filter(modToAdd => !modifierActions.isOverride(modToAdd))
-        .reduce(
-          (acc, modifier) =>
-            actions.addItemModifier({
-              itemIndex: nextItemIndex,
-              order: acc,
-              modifier,
-              originalItem: item,
-            }),
-          nextOrder
-        );
+      nextOrder = modifiersToAdd.reduce(
+        (acc, modifier) =>
+          actions.addItemModifier({
+            itemIndex: nextItemIndex,
+            order: acc,
+            modifier,
+            originalItem: item,
+          }),
+        nextOrder
+      );
     }
 
     const { reArrangedOrder, newIndex } = reArrangeNewItem({

package/lib/order/addItemModifier.js

@@ -1,14 +1,5 @@
 module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
   const { math } = utils;
-  const { getComputeModField } = require('../modifier/utils');
-
-  const getPrice = ({ item, modifier }) => {
-    const compute = getComputeModField(modifier);
-    const amount = (modifier && compute && compute.amount) || 0;
-    const { price = 0 } = item;
-    if (modifierActions.isMultiplier(modifier)) return math.mul(price, amount);
-    return amount;
-  };
 
   const filterByRemoveModifiers = (modifiers, modifier) => {
     const { delModifiers = [] } = modifier;
@@ -89,8 +80,6 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     order,
     modifier: _modifier,
     item: itemProp,
-    customer,
-    originalItem,
     onConditionsNotMet,
     onError,
   }) => {
@@ -107,64 +96,25 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     }
 
     const modifier = modifierActions.removeGroupRelations(_modifier); // to avoid no param reassign lint rule
-    let item = { ...itemProp };
-    const compute = getComputeModField(modifier);
+    const item = { ...itemProp };
     const conditionsBag = areConditionsMet(item, modifier.conditions);
-    const isAmountOverride = modifierActions.isAmountOverride(modifier);
-    const isPriceOverride = modifierActions.isPriceOverride(modifier);
-    // is the modifier suggestion required
+
     if (conditionsBag.length > 0 && !modifierActions.isRequired(modifier)) {
       if (onConditionsNotMet) onConditionsNotMet(conditionsBag);
       return item;
     }
-    const modifierToAdd = modifierActions.mutateModifier(modifier);
-    const modifierIndex = item.modifiers.findIndex(
-      ieach => ieach.modifierId === modifier._id
-    );
+    const modifierToAdd = modifierActions.duplicate(modifier);
 
-    if (modifierActions.isOverride(modifier) && !isAmountOverride) {
-      if (modifierIndex > -1) item.modifiers[modifierIndex] = modifierToAdd;
-      else item.modifiers.push(modifierToAdd);
-    } else {
-      item.modifiers.push(modifierToAdd);
-    }
+    item.modifiers.push(modifierToAdd);
 
     if (modifierActions.isRemoveModifier(modifier)) {
       item.modifiers = filterByRemoveModifiers(item.modifiers, modifier);
     }
 
-    if (modifierActions.isAmountOverride(modifier)) {
-      item = {
-        ...item,
-        price: compute.amount,
-      };
-    }
+    item.properties = {
+      ...(item.properties || {}),
+    };
 
-    if (modifierActions.isQuantityOverride(modifier)) {
-      if (modifier.compute && typeof modifier.compute.amount === 'number') {
-        item.quantity = modifier.compute.amount || 1;
-      } else if (typeof modifier.properties.override.fixedValue === 'number') {
-        item.quantity = modifier.properties.override.fixedValue;
-      }
-    }
-
-    if (isPriceOverride) {
-      item.properties = {
-        ...(item.properties || {}),
-        basePrice: item.price,
-      };
-      item.price = getPrice({ modifier: modifierToAdd, item });
-    } else {
-      item.properties = {
-        ...(item.properties || {}),
-        basePrice: item.price,
-      };
-      item.price = itemActions.getItemPrice({
-        item,
-        itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
-        customer,
-      });
-    }
     return item;
   };
 
@@ -204,7 +154,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     ) {
       return order;
     }
-    // Remove if it has it already only if it is not group of value or override modifier
+    // Remove if it has it already only if it is not group of value
 
     const maxApplies = modifierActions.getMaxItemUse(modifier) || 0;
     const isUnlimitedItemUse = modifierActions.isUnlimitedItemUse(modifier);
@@ -212,12 +162,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     const maxQuantity =
       math.mul(item.quantity || 0, maxApplies) || item.quantity;
 
-    if (
-      !isUnlimitedItemUse &&
-      contains &&
-      usingCount >= maxQuantity &&
-      !modifierActions.isOverride(modifier)
-    ) {
+    if (!isUnlimitedItemUse && contains && usingCount >= maxQuantity) {
       if (maxApplies && onError) {
         onError('modifier.has.reached.the.maximum.amount.of.applies');
         return order;

package/lib/order/removeItemModifier.js

@@ -1,15 +1,5 @@
-module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
-  const { math } = utils;
-
-  const getPrice = ({ item, modifier }) => {
-    const amount =
-      (modifier && modifier.compute && modifier.compute.amount) || 0;
-    const { price = 0 } = item;
-    if (modifierActions.isMultiplier(modifier)) return math.mul(price, amount);
-    return amount;
-  };
-
-  const removeModifier = ({ item, modifier, originalItem }) => {
+module.exports = ({ actions, modifierActions, _ }) => {
+  const removeModifier = ({ item, modifier }) => {
     const nextItem = { ...item, modifiers: [] };
 
     nextItem.modifiers = item.modifiers.filter(each => {
@@ -19,17 +9,6 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
       return each._id !== modifier._id;
     });
 
-    if (modifierActions.isAmountOverride(modifier))
-      return {
-        ...originalItem,
-        ...nextItem,
-      };
-
-    if (modifierActions.isPriceOverride(modifier))
-      nextItem.price = getPrice({ modifier, item: nextItem });
-
-    if (modifierActions.isQuantityOverride(modifier)) nextItem.quantity = 1;
-
     return nextItem;
   };
 
@@ -50,16 +29,11 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
       return order;
 
     let item = actions.getSelectedItem({ order, itemIndex });
-    const customer = actions.getCustomer(order);
 
     const contains = modifierActions.contains(item.modifiers, modifier);
 
     if (!contains) return order;
 
-    if (modifierActions.isRequiredAndOverride(modifier)) {
-      return order;
-    }
-
     // Remove
     item = removeModifier({
       item,
@@ -67,11 +41,6 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
       originalItem,
     });
 
-    item.price = itemActions.getItemPrice({
-      item,
-      itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
-      customer,
-    });
     order.items[itemIndex] = item;
 
     return order;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.93",
+  "version": "1.0.96",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -28,6 +28,8 @@
     "test:paymentModifiers": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/order-payment-modifier.test.js",
     "test:addItem": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/addItem.test.js",
     "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",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
@@ -52,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "fb466ad4fdad14d593a1ee3dc2814f683b10ec24"
+  "gitHead": "aed710f165a1442c14bba31c5936682faa6b9364"
 }

package/lib/modifier/createAmountOverrideModifier.js

@@ -1,18 +0,0 @@
-module.exports = ({ constants, actions }) => {
-  const { Modifier } = constants;
-
-  return function createAmountOverrideModifier(params) {
-    return actions.create({
-      compute: {
-        amount: params.amount,
-        action: Modifier.Compute.Actions.OVERRIDE,
-      },
-      properties: {
-        override: { field: 'amount' },
-      },
-      attributes: [Modifier.Attributes.OVERRIDE],
-      name: `Modifier Amount ${Modifier.Compute.Actions.OVERRIDE}`,
-      included: true,
-    });
-  };
-};

package/lib/modifier/getService.js

@@ -1,5 +0,0 @@
-module.exports = ({ actions }) =>
-  function getService(modifier) {
-    if (!actions.isService(modifier)) return null;
-    return modifier.properties.override.service;
-  };

package/lib/modifier/mutateModifier.js

@@ -1,23 +0,0 @@
-module.exports = ({ _, actions }) =>
-  function mutateModifier(mod) {
-    const modifier = actions.duplicate(mod);
-    const fixedValue = _.get(modifier, 'properties.override.fixedValue', '');
-    const isAmountOverride = actions.isAmountOverride(mod);
-    const isPriceOverride = actions.isPriceOverride(mod);
-
-    if (isPriceOverride && fixedValue) {
-      modifier.compute = {
-        amount: fixedValue,
-      };
-    }
-
-    if (isAmountOverride && fixedValue) {
-      modifier.compute = {
-        type: 'fixed',
-        amount: fixedValue,
-        action: 'add',
-      };
-    }
-
-    return modifier;
-  };