@darkpos/pricing 1.0.83 → 1.0.85

package/__TEST__/modifier.test.js

@@ -1855,4 +1855,74 @@ describe('Modifier actions', () => {
 
     expect(updatedOrder2.items[0].modifiers.length).toEqual(1);
   });
+
+  test('Should not add modifiers if tags do not match', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+      tags: ['tagA', 'tagB'],
+    };
+    order.items.push({
+      quantity: 2,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+      tags: ['otherTag'],
+    });
+
+    const updatedOrder = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+    });
+
+    expect(updatedOrder.items[0].modifiers.length).toEqual(0);
+  });
+
+  test('Should add modifier if tags match', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+    };
+    const modifier = {
+      _id: 1,
+      compute: {
+        amount: 10,
+        action: 'subtract',
+        type: 'fixed',
+      },
+      tags: ['tagA', 'tagB'],
+    };
+    order.items.push({
+      quantity: 2,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+      tags: ['tagA'],
+    });
+
+    let error = '';
+    const updatedOrder = pricingService.order.addItemModifier({
+      order,
+      modifier,
+      itemIndex: 0,
+      onError: err => {
+        error = err;
+      },
+    });
+
+    expect(error).toEqual('');
+
+    expect(updatedOrder.items[0].modifiers.length).toEqual(1);
+  });
 });

package/__TEST__/order/order.test.js

@@ -3863,4 +3863,32 @@ describe('Order actions', () => {
 
     expect(currentOrder.modifiers.length).toBe(2);
   });
+  test('Get calculated Order, one item with correct rounded amount in modifier description', () => {
+    const discountModifier = {
+      compute: {
+        amount: 30,
+        type: 'percentage',
+        action: 'subtract',
+      },
+      name: 'modifier1',
+      type: 'discount',
+    };
+
+    const orderItem = {
+      price: 3.65,
+      quantity: 1,
+      modifiers: [discountModifier],
+    };
+    const order = { items: [orderItem] };
+    const newOrder = pricingService.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 2.56);
+    expect(newOrder.items[0].modifiers[0]._computed.amount).toEqual(-1.09);
+    expect(newOrder.items[0].modifiers[0]._computed.description).toEqual(
+      'modifier1 (-$1.09)'
+    );
+    expect(newOrder).toHaveProperty('subTotals', {
+      discount: -1.09,
+    });
+  });
 });

package/lib/item/calculate.js

@@ -2,6 +2,7 @@
 module.exports = ({ _, utils, actions, modifierActions }) => {
   const { math } = utils;
   //
+
   const calculateOne = (inputItem, opts = {}) => {
     const item = _.cloneDeep(inputItem);
     const amountToPay =
@@ -17,7 +18,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
 
     if (!item) return item;
 
-    const subTotals = {
+    let subTotals = {
       _included: 0,
       _xincluded: 0,
       _direct: 0,
@@ -169,18 +170,13 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
         prvPrice = math.add(prvPrice, math.div(_computed.amount, quantity));
         prvSort = sort;
 
-        if (included) {
-          subTotals._included = math.add(subTotals._included, computedAmount);
-        } else {
-          subTotals._xincluded = math.add(subTotals._xincluded, computedAmount);
-          subTotals[type] = math.add(subTotals[type] || 0, computedAmount);
-        }
-        if (direct)
-          subTotals._direct = math.add(subTotals._direct, computedAmount);
-        else subTotals._xdirect = math.add(subTotals._xdirect, computedAmount);
-
-        subTotals._actual = math.add(subTotals._simple, subTotals._included);
-        total = actions.getTotal({ subTotals });
+        ({ subTotals, total } = actions.getTotals({
+          subTotals,
+          amountToAdd: computedAmount,
+          included,
+          type,
+          direct,
+        }));
       }
     }
 

package/lib/item/getTotals.js

@@ -0,0 +1,27 @@
+module.exports = ({ utils, actions }) => {
+  const { math } = utils;
+  return function getTotals({
+    subTotals: subTotalsParam,
+    amountToAdd,
+    included,
+    type,
+    direct,
+  }) {
+    const subTotals = { ...subTotalsParam };
+    if (included) {
+      subTotals._included = math.add(subTotals._included, amountToAdd);
+    } else {
+      subTotals._xincluded = math.add(subTotals._xincluded, amountToAdd);
+      subTotals[type] = math.add(subTotals[type] || 0, amountToAdd);
+    }
+    if (direct) subTotals._direct = math.add(subTotals._direct, amountToAdd);
+    else subTotals._xdirect = math.add(subTotals._xdirect, amountToAdd);
+
+    subTotals._actual = math.add(subTotals._simple, subTotals._included);
+
+    return {
+      subTotals,
+      total: actions.getTotal({ subTotals }),
+    };
+  };
+};

package/lib/item/index.js

@@ -59,6 +59,9 @@ const adjustFixedModifiersDifference = require('./adjustFixedModifiersDifference
 const validateCreditModifiersTotal = require('./validateCreditModifiersTotal');
 const adjustCreditModifiersDifference = require('./adjustCreditModifiersDifference');
 const getSubtotal = require('./getSubtotal');
+const isSomeTagsMatch = require('./isSomeTagsMatch');
+const getTotals = require('./getTotals');
+const patchItem = require('./patchItem');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -131,6 +134,9 @@ const itemActions = (deps = {}) => {
     validateCreditModifiersTotal: validateCreditModifiersTotal(innerDeps),
     adjustCreditModifiersDifference: adjustCreditModifiersDifference(innerDeps),
     getSubtotal: getSubtotal(innerDeps),
+    isSomeTagsMatch: isSomeTagsMatch(innerDeps),
+    getTotals: getTotals(innerDeps),
+    patchItem: patchItem(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/isSomeTagsMatch.js

@@ -0,0 +1,13 @@
+module.exports = () =>
+  function isSomeTagsMatch({ item, tags }) {
+    if (
+      !item ||
+      !Array.isArray(item.tags) ||
+      item.tags.length === 0 ||
+      !Array.isArray(tags) ||
+      tags.length === 0
+    )
+      return true;
+
+    return item.tags.some(tag => tags.includes(tag));
+  };

package/lib/item/patchItem.js

@@ -0,0 +1,31 @@
+module.exports = ({ actions, modifierActions }) =>
+  function patchItem({ item, difference }) {
+    if (!item) return undefined;
+
+    const localItem = { ...item };
+
+    const modifierIndex = item.modifiers.findIndex(
+      mod => modifierActions.isPercentage(mod) || !modifierActions.isDirect(mod)
+    );
+
+    localItem.modifiers[modifierIndex] = modifierActions.patchModifier({
+      mod: localItem.modifiers[modifierIndex],
+      difference,
+      price: actions.getBasePrice(localItem) || localItem.price,
+    });
+
+    const { included, type, direct } = localItem.modifiers[modifierIndex];
+
+    const result = actions.getTotals({
+      subTotals: localItem.subTotals,
+      amountToAdd: difference,
+      included,
+      type,
+      direct,
+    });
+
+    localItem.subTotals = result.subTotals;
+    localItem.total = result.total;
+
+    return localItem;
+  };

package/lib/modifier/calculate.js

@@ -3,7 +3,7 @@ const { getComputeModField } = require('./utils');
 /**
  * Get calculated modifier
  */
-module.exports = ({ _, constants, utils, localization, actions }) => {
+module.exports = ({ _, constants, utils, actions }) => {
   const { math } = utils;
   const { Modifier } = constants;
 
@@ -12,7 +12,6 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
     options = { price: 0, quantity: 0, skip: false, basePrice: 0 }
   ) {
     const modifier = _modifier;
-    const { name } = modifier;
     const compute = getComputeModField(modifier);
     const { type, amount: computeAmount = 0 } = compute;
     const _computed = {
@@ -71,42 +70,14 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
       }
     }
 
-    const localAmount =
-      !!_computed.amount && Number(_computed.amount) !== 0
-        ? `${localization.formatAmount(_computed.amount)}`
-        : '';
-
-    const localBasePrice = localization.formatAmount(
-      options.basePrice || options.price || 0
-    );
-
-    const isMultiplier = actions.isMultiplier(modifier);
-
-    _computed.description = `${name}${localAmount ? ` (${localAmount})` : ''}`;
-
-    if (actions.isPriceOverride(modifier)) {
-      _computed.description = isMultiplier
-        ? `${name} (${compute.amount} Unit @ ${localBasePrice}/Unit)`
-        : `${name} (${localization.formatAmount(compute.amount)}/Unit)`;
-    }
-
-    if (actions.isAmountOverride(modifier) && isMultiplier) {
-      _computed.description = `${name} (${localization.formatAmount(
-        _computed.amount
-      )})`;
-    }
-
-    if (actions.isOptionsSelectedOverride(modifier)) {
-      const selectedOverrideOptions = _.get(
-        modifier,
-        'properties.override.selected'
-      );
-      _computed.description = isMultiplier
-        ? `${name} (${compute.amount} Unit @ ${localBasePrice}/${selectedOverrideOptions.selectedUnit})`
-        : `${name} (${localization.formatAmount(compute.amount)}/${
-            selectedOverrideOptions.selectedUnit
-          })`;
-    }
+    _computed.description = actions.createDescription({
+      modifier: {
+        ...modifier,
+        compute,
+        _computed,
+      },
+      price: options.basePrice || options.price,
+    });
 
     return { ..._.cloneDeep(modifier), _computed };
   };

package/lib/modifier/createDescription.js

@@ -0,0 +1,40 @@
+module.exports = ({ actions, localization, _ }) =>
+  function createDescription({ modifier, price }) {
+    const { _computed, compute, name } = modifier;
+
+    let description = '';
+    const localAmount =
+      !!_computed.amount && Number(_computed.amount) !== 0
+        ? `${localization.formatAmount(_computed.amount)}`
+        : '';
+
+    const localBasePrice = localization.formatAmount(price || 0);
+
+    const isMultiplier = actions.isMultiplier(modifier);
+
+    description = `${name}${localAmount ? ` (${localAmount})` : ''}`;
+
+    if (actions.isPriceOverride(modifier)) {
+      description = isMultiplier
+        ? `${name} (${compute.amount} Unit @ ${localBasePrice}/Unit)`
+        : `${name} (${localization.formatAmount(compute.amount)}/Unit)`;
+    }
+
+    if (actions.isAmountOverride(modifier) && isMultiplier) {
+      description = `${name} (${localization.formatAmount(_computed.amount)})`;
+    }
+
+    if (actions.isOptionsSelectedOverride(modifier)) {
+      const selectedOverrideOptions = _.get(
+        modifier,
+        'properties.override.selected'
+      );
+      description = isMultiplier
+        ? `${name} (${compute.amount} Unit @ ${localBasePrice}/${selectedOverrideOptions.selectedUnit})`
+        : `${name} (${localization.formatAmount(compute.amount)}/${
+            selectedOverrideOptions.selectedUnit
+          })`;
+    }
+
+    return description;
+  };

package/lib/modifier/index.js

@@ -161,6 +161,8 @@ const isLimits = require('./isLimits');
 const isItemSet = require('./isItemSet');
 const isOrderUseValid = require('./isOrderUseValid');
 const getMaxItemQuantity = require('./getMaxItemQuantity');
+const createDescription = require('./createDescription');
+const patchModifier = require('./patchModifier');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -335,6 +337,8 @@ const modifierActions = (deps = {}) => {
     getMaxItemQuantity: getMaxItemQuantity(innerDeps),
     getFixedModifiersTotalEntities: getFixedModifiersTotalEntities(innerDeps),
     getCreditModifiersTotalEntities: getCreditModifiersTotalEntities(innerDeps),
+    createDescription: createDescription(innerDeps),
+    patchModifier: patchModifier(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/patchModifier.js

@@ -0,0 +1,21 @@
+module.exports = ({ utils, actions }) =>
+  function patchModifier({ mod, difference, price }) {
+    if (!mod || !mod._computed) return mod;
+
+    const modifier = { ...mod };
+
+    modifier._computed.amount = utils.math.add(
+      modifier._computed.amount,
+      difference
+    );
+
+    modifier._computed.description = actions.createDescription({
+      modifier: {
+        ...modifier,
+        _computed: modifier._computed,
+      },
+      price,
+    });
+
+    return modifier;
+  };

package/lib/order/addItemModifier.js

@@ -180,6 +180,11 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     if (!order || itemIndex < 0 || !modifier) return order;
 
     let item = actions.getSelectedItem({ order, itemIndex });
+
+    if (!itemActions.isSomeTagsMatch({ item, tags: modifier.tags })) {
+      return order;
+    }
+
     const customer = actions.getCustomer(order);
     const contains =
       !_.isEmpty(item.modifiers) &&

package/lib/order/calculate.js

@@ -108,19 +108,38 @@ module.exports = ({
     }
 
     const addToItemTotal = difference => {
-      if (difference > 0 && calculatedItems.length) {
+      if (difference !== 0 && calculatedItems.length) {
         calculatedItems[0].total = utils.math.toDecimalPlaces(
           utils.math.add(calculatedItems[0].total, difference)
         );
       }
     };
 
-    if (calculatedItems.length > 1) {
-      const difference = itemActions.getTotalsDifference({
+    if (calculatedItems.length > 0) {
+      let difference = itemActions.getTotalsDifference({
         items: calculatedItems,
       });
 
-      addToItemTotal(difference);
+      if (difference < 0) {
+        difference = difference < -0.005 ? 0 : utils.math.abs(difference);
+      }
+
+      const itemIndex = calculatedItems.findIndex(
+        item =>
+          !itemActions.isFullyPaid(item) &&
+          item.modifiers.some(
+            mod =>
+              modifierActions.isPercentage(mod) ||
+              !modifierActions.isDirect(mod)
+          )
+      );
+
+      if (itemIndex >= 0 && difference >= 0.005) {
+        calculatedItems[itemIndex] = itemActions.patchItem({
+          item: calculatedItems[itemIndex],
+          difference,
+        });
+      }
     }
 
     if (storeActions.isNeareastMultiple() && calculatedItems.length > 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.83",
+  "version": "1.0.85",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -51,5 +51,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "d52fea81582a64b1ca707af442d41981ed6ce78d"
+  "gitHead": "275e9dcadc8bca5f47d4c444685c154f998d2862"
 }