@darkpos/pricing 1.0.92 → 1.0.95

package/lib/modifier/isPaymentModifier.js

@@ -2,6 +2,7 @@ module.exports = ({ actions }) =>
   function isPaymentModifier(modifier) {
     return (
       actions.isPaymentTypeModifier(modifier) ||
-      actions.isPaymentMethodModifier(modifier)
+      actions.isPaymentMethodModifier(modifier) ||
+      actions.isPrepayModifier(modifier)
     );
   };

package/lib/modifier/isPercentage.js

@@ -1,6 +1,6 @@
 module.exports = ({ constants }) => {
   const { Modifier } = constants;
-  return function isFixed(modifier) {
+  return function isPercentage(modifier) {
     return !!(
       modifier &&
       modifier.compute &&

package/lib/modifier/isPrepayModifier.js

@@ -0,0 +1,11 @@
+module.exports = () =>
+  function isPrepayModifier(modifier) {
+    return !!(
+      modifier &&
+      modifier.conditions &&
+      Array.isArray(modifier.conditions.rules) &&
+      modifier.conditions.rules.some(
+        condition => condition.key === 'payment' && condition.value === 'prepay'
+      )
+    );
+  };

package/lib/modifier/{isService.js → isServiceOverride.js}

@@ -1,5 +1,5 @@
 module.exports = () =>
-  function isService(modifier) {
+  function isServiceOverride(modifier) {
     return !!(
       modifier &&
       modifier.properties &&

package/lib/modifier/isTotalOverride.js

@@ -0,0 +1,7 @@
+module.exports = ({ actions }) =>
+  function isTotalOverride(modifier) {
+    return (
+      actions.isOverride(modifier) &&
+      modifier.properties.override.field === 'total'
+    );
+  };

package/lib/modifier/sort.js

@@ -2,7 +2,6 @@
 module.exports = ({ actions }) => {
   function compareValues(key, order = 'asc') {
     return function innerSort(a, b) {
-      // property doesn't exist on either object
       const aVal = actions.getProperty(a, key);
       const bVal = actions.getProperty(b, key);
 
@@ -13,38 +12,27 @@ module.exports = ({ actions }) => {
       const bIsCalculatedPaymentModifier =
         actions.isCalculatedPaymentModifier(b);
 
-      if (aIsCalculatedPaymentModifier && bIsPaymentModifier && aVal === null) {
-        return -1;
-      }
-      if (bIsCalculatedPaymentModifier && aIsPaymentModifier && bVal === null) {
-        return -1;
-      }
+      const aIsPercentageNoSort = actions.isPercentage(a) && aVal == null;
+      const bIsPercentageNoSort = actions.isPercentage(b) && bVal == null;
 
-      if (
-        (aIsPaymentModifier || aIsCalculatedPaymentModifier) &&
-        aVal === null
-      ) {
+      if (bIsPaymentModifier && aIsPercentageNoSort && !bIsPercentageNoSort)
         return 1;
-      }
-
-      if (
-        (bIsPaymentModifier || bIsCalculatedPaymentModifier) &&
-        bVal === null
-      ) {
-        return 1;
-      }
-
-      if (aVal == null && bVal === null) {
-        return 0;
-      }
+      if (aIsPaymentModifier && !aIsPercentageNoSort && bIsPercentageNoSort)
+        return -1;
 
-      if (aVal == null) {
+      if (aIsCalculatedPaymentModifier && bIsPaymentModifier && aVal === null)
+        return -1;
+      if (bIsCalculatedPaymentModifier && aIsPaymentModifier && bVal === null)
         return -1;
-      }
 
-      if (bVal === null) {
+      if ((aIsPaymentModifier || aIsCalculatedPaymentModifier) && aVal === null)
+        return 1;
+      if ((bIsPaymentModifier || bIsCalculatedPaymentModifier) && bVal === null)
         return 1;
-      }
+
+      if (aVal == null && bVal === null) return 0;
+      if (aVal == null) return -1;
+      if (bVal === null) return 1;
 
       const varA = typeof aVal === 'string' ? aVal.toUpperCase() : aVal;
       const varB = typeof bVal === 'string' ? bVal.toUpperCase() : bVal;
@@ -52,6 +40,7 @@ module.exports = ({ actions }) => {
       let comparison = 0;
       if (varA > varB) comparison = 1;
       else if (varA < varB) comparison = -1;
+
       return order === 'desc' ? comparison * -1 : comparison;
     };
   }

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;
@@ -107,64 +98,31 @@ 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,
-      };
-    }
-
-    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;
-      }
-    }
+    item.properties = {
+      ...(item.properties || {}),
+      basePrice: item.price,
+    };
+    item.price = itemActions.getItemPrice({
+      item,
+      itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
+      customer,
+    });
 
-    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 +162,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 +170,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/getTotals.js

@@ -1,29 +1,28 @@
 module.exports = ({ utils }) => {
   const { math } = utils;
+
   return function getTotals(orders) {
-    if (!Array.isArray(orders)) return { total: 0, subTotals: {} };
-    return orders
-      .filter(each => !!each.parentId || !each.isParent)
-      .reduce(
-        (acc, order) => {
-          const subTotals = {};
-          const { subTotals: orderSubTotals } = order;
-          if (orderSubTotals) {
-            const keys = Object.keys(orderSubTotals);
-            // eslint-disable-next-line no-restricted-syntax
-            for (const key of keys)
-              subTotals[key] = math.add(
-                acc.subTotals[key] || 0,
-                orderSubTotals[key]
-              );
+    if (!Array.isArray(orders)) {
+      return { total: 0, subTotal: 0, subTotals: {} };
+    }
+
+    return orders.reduce(
+      (acc, order) => {
+        const { subTotals: orderSubTotals, subTotal = 0, total = 0 } = order;
+
+        if (orderSubTotals) {
+          // eslint-disable-next-line no-restricted-syntax
+          for (const [key, value] of Object.entries(orderSubTotals)) {
+            acc.subTotals[key] = math.add(acc.subTotals[key] || 0, value);
           }
+        }
+
+        acc.total = math.add(acc.total, total);
+        acc.subTotal = math.add(acc.subTotal, subTotal);
 
-          return {
-            total: math.add(acc.total, order.total),
-            subTotals,
-          };
-        },
-        { total: 0, subTotals: {} }
-      );
+        return acc;
+      },
+      { total: 0, subTotal: 0, subTotals: {} }
+    );
   };
 };

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, itemActions, _ }) => {
+  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;
   };
 
@@ -56,10 +35,6 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
 
     if (!contains) return order;
 
-    if (modifierActions.isRequiredAndOverride(modifier)) {
-      return order;
-    }
-
     // Remove
     item = removeModifier({
       item,

package/lib/order/splitItems.js

@@ -1,4 +1,4 @@
-module.exports = ({ actions, modifierActions, itemActions }) =>
+module.exports = ({ actions, modifierActions, itemActions, utils }) =>
   function splitItems({ order }) {
     if (!order || !order.items) return order;
 
@@ -32,6 +32,7 @@ module.exports = ({ actions, modifierActions, itemActions }) =>
           ...item,
           quantity: splitQty,
           modifiers: [],
+          _id: utils.helpers.getObjectID(),
         });
         remaining -= splitQty;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.92",
+  "version": "1.0.95",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -27,6 +27,9 @@
     "test:modifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier.test.js",
     "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": {
@@ -51,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "ae4955dc540555ef6c2e4b8c758e9d8df4d0a03c"
+  "gitHead": "edb497d37801c9749d2c3722a67657abe77c9ab6"
 }

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;
-  };