@darkpos/pricing 1.0.11 → 1.0.13

package/lib/item/addIndirectModifier.js

@@ -41,10 +41,14 @@ module.exports = ({ utils, modifierActions }) => {
           compute: {
             ...inheritedModifier.compute,
             amount: math.add(
-              inheritedModifier.compute.amount,
-              math.div(difference, selectedItem.quantity)
+              math.mul(inheritedModifier.compute.amount, selectedItem.quantity),
+              difference
             ),
           },
+          properties: {
+            ...inheritedModifier.properties,
+            ignoreQuantity: true,
+          },
         };
       }
       return itemsModifiers;

package/lib/item/calculate.js

@@ -67,7 +67,9 @@ module.exports = ({ _, utils, modifierActions }) => {
         modifiers.push(_modifier);
         const { type, _computed } = _modifier;
         // console.log('computedPrice => ', _computed);
-        let computedAmount = math.mul(_computed.amount, quantity);
+        let computedAmount = modifierActions.isIgnoreQuantity(_modifier)
+          ? _computed.amount
+          : math.mul(_computed.amount, quantity);
         // subscription modifiers have fixed amount and can't be multiplied by quantity
         if (modifierActions.isSubscription(_modifier))
           computedAmount = _computed.amount;

package/lib/modifier/index.js

@@ -99,6 +99,7 @@ const isCustomerTagsExtend = require('./isCustomerTagsExtend');
 const isAmountOverride = require('./isAmountOverride');
 const isDiscount = require('./isDiscount');
 const isHidden = require('./isHidden');
+const isIgnoreQuantity = require('./isIgnoreQuantity');
 const isGratuity = require('./isGratuity');
 const isPaymentMethods = require('./isPaymentMethods');
 const isPaymentTypes = require('./isPaymentTypes');
@@ -221,6 +222,7 @@ const modifierActions = (deps = {}) => {
     isAmountOverride: isAmountOverride(innerDeps),
     isDiscount: isDiscount(innerDeps),
     isHidden: isHidden(innerDeps),
+    isIgnoreQuantity: isIgnoreQuantity(innerDeps),
     isGratuity: isGratuity(innerDeps),
     isPaymentMethods: isPaymentMethods(innerDeps),
     isPaymentTypes: isPaymentTypes(innerDeps),

package/lib/modifier/isIgnoreQuantity.js

@@ -0,0 +1,5 @@
+module.exports = () =>
+  function isIgnoreQuantity(modifier) {
+    if (!modifier || !modifier.properties) return false;
+    return modifier.properties.ignoreQuantity;
+  };

package/lib/order/addItem.js

@@ -1,12 +1,4 @@
-module.exports = ({
-  actions,
-  itemActions,
-  modifierActions,
-  utils,
-  settings,
-  _,
-}) => {
-  const { math } = utils;
+module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
   const orderSettings = _.get(settings, 'order');
 
   const getQuantity = ({ order, item, pendingItemIndex = -1 }) => {
@@ -55,46 +47,6 @@ module.exports = ({
     };
   };
 
-  const getSubscription = ({ order, item, combined, cache }) => {
-    const [hasSubscription, remaining, used] = actions.hasRemainingSubscription(
-      {
-        order,
-        item,
-        combined,
-      }
-    );
-    let orderItem = item;
-
-    if (!hasSubscription) return orderItem;
-
-    const subscriptionModifiers = modifierActions.getSubscriptionModifiers(
-      orderItem.modifiers
-    );
-    if (!_.isEmpty(subscriptionModifiers)) {
-      orderItem = itemActions.removeModifiers({
-        item: orderItem,
-        modifiers: subscriptionModifiers,
-        cache,
-        customer: order.customer,
-      });
-    }
-
-    const { quantity, price } = orderItem;
-    let numberOfUses = quantity;
-    if (remaining) {
-      const left = remaining - (used || 0);
-      if (quantity > left) numberOfUses = left;
-    }
-
-    const modifier = modifierActions.createSubscriptionModifier({
-      amount: math.mul(numberOfUses, price),
-      properties: { subscription: { numberOfUses } },
-    });
-    orderItem.modifiers.push(modifier);
-
-    return orderItem;
-  };
-
   const addOrderItem = ({ itemIndex, order, item }) => {
     if (itemIndex > -1) {
       const updatedOrder = actions.updateItem({
@@ -241,7 +193,7 @@ module.exports = ({
     if (!_.isEmpty(requiredModifiers))
       modifiersToAdd.push(...requiredModifiers);
 
-    orderItem = getSubscription({
+    orderItem = actions.getOrderItemSubscriptions({
       order,
       item: orderItem,
       combined,

package/lib/order/getOrderItemSubscriptions.js

@@ -0,0 +1,43 @@
+module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
+  const { math } = utils;
+
+  return ({ order, item, combined, cache }) => {
+    const [hasSubscription, remaining, used] = actions.hasRemainingSubscription(
+      {
+        order,
+        item,
+        combined,
+      }
+    );
+    let orderItem = item;
+
+    if (!hasSubscription) return orderItem;
+
+    const subscriptionModifiers = modifierActions.getSubscriptionModifiers(
+      orderItem.modifiers
+    );
+    if (!_.isEmpty(subscriptionModifiers)) {
+      orderItem = itemActions.removeModifiers({
+        item: orderItem,
+        modifiers: subscriptionModifiers,
+        cache,
+        customer: order.customer,
+      });
+    }
+
+    const { quantity, price } = orderItem;
+    let numberOfUses = quantity;
+    if (remaining) {
+      const left = remaining - (used || 0);
+      if (quantity > left) numberOfUses = left;
+    }
+
+    const modifier = modifierActions.createSubscriptionModifier({
+      amount: math.mul(numberOfUses, price),
+      properties: { subscription: { numberOfUses } },
+    });
+    orderItem.modifiers.push(modifier);
+
+    return orderItem;
+  };
+};

package/lib/order/index.js

@@ -8,6 +8,7 @@ const getSelectedItem = require('./getSelectedItem');
 const updateItem = require('./updateItem');
 const removeItemByIndex = require('./removeItemByIndex');
 const addItem = require('./addItem');
+const getOrderItemSubscriptions = require('./getOrderItemSubscriptions');
 const duplicateItem = require('./duplicateItem');
 const getCustomer = require('./getCustomer');
 const setCustomer = require('./setCustomer');
@@ -90,6 +91,7 @@ const orderActions = (deps = {}) => {
     updateItem: updateItem(innerDeps),
     removeItemByIndex: removeItemByIndex(innerDeps),
     addItem: addItem(innerDeps),
+    getOrderItemSubscriptions: getOrderItemSubscriptions(innerDeps),
     duplicateItem: duplicateItem(innerDeps),
     getCustomer: getCustomer(innerDeps),
     setCustomer: setCustomer(innerDeps),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -35,5 +35,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "d839ed87a99ef0c4297ba95cd647e358cba38639"
+  "gitHead": "e70158333e19e0d6106cb2db4efe0a25842c323b"
 }