@darkpos/pricing 1.0.9 → 1.0.12

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/item/removeModifier.js

@@ -59,7 +59,7 @@ module.exports = ({ modifierActions, _, actions }) => {
     );
 
     const hasOverride = modifiersToApply.find(each =>
-      modifierActions.isOverride(each)
+      modifierActions.isOverride(each) || modifierActions.isComputedOverride(each)
     );
 
     if (hasOverride) {
@@ -68,7 +68,7 @@ module.exports = ({ modifierActions, _, actions }) => {
 
       if (modifierActions.isQuantityOverride(modifier)) nextItem.quantity = 1;
 
-      if (modifierActions.isPriceOverride(modifier))
+      if (modifierActions.isPriceOverride(modifier) || modifierActions.isComputedOverride(modifier))
         nextItem.price = actions.getItemPrice({
           item: originalItem,
           cache,

package/lib/modifier/calculate.js

@@ -1,7 +1,7 @@
 /**
  * Get calculated modifier
  */
-module.exports = ({ _, constants, utils, localization, actions }) => {
+ module.exports = ({ _, constants, utils, localization, actions }) => {
   const { math } = utils;
   const { Modifier } = constants;
 
@@ -29,7 +29,7 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
         );
 
       if (!type || action === Modifier.Compute.Actions.OVERRIDE)
-        _computed.amount = amount;
+        _computed.amount = 0;
 
       if (maxAmount && math.gt(math.abs(_computed.amount), maxAmount))
         _computed.amount = maxAmount;

package/lib/modifier/index.js

@@ -85,6 +85,7 @@ const isService = require('./isService');
 const isSingleValue = require('./isSingleValue');
 const isGroupOfItems = require('./isGroupOfItems');
 const isOverride = require('./isOverride');
+const isComputedOverride = require('./isComputedOverride');
 const isDepartment = require('./isDepartment');
 const isRequired = require('./isRequired');
 const isMultiplier = require('./isMultiplier');
@@ -98,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');
@@ -207,6 +209,7 @@ const modifierActions = (deps = {}) => {
     isSingleValue: isSingleValue(innerDeps),
     isGroupOfItems: isGroupOfItems(innerDeps),
     isOverride: isOverride(innerDeps),
+    isComputedOverride: isComputedOverride(innerDeps),
     isDepartment: isDepartment(innerDeps),
     isRequired: isRequired(innerDeps),
     isMultiplier: isMultiplier(innerDeps),
@@ -219,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/isComputedOverride.js

@@ -0,0 +1,7 @@
+module.exports = ({ actions, constants }) => {
+  const { Modifier } = constants;
+  return function isComputedOverride(modifier) {
+    const computeAction = modifier && modifier.compute && modifier.compute.action;
+    return computeAction === Modifier.Attributes.OVERRIDE;
+  };
+};

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/addItemModifier.js

@@ -76,7 +76,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     // group of values use case
     if (
       modifierActions.isGroupOfValues(modifier) ||
-      modifierActions.isRequiredAndOverride(modifier)
+      modifierActions.isOverride(modifier)
     ) {
       if (modifierIndex > -1) item.modifiers[modifierIndex] = modifierToAdd;
       else item.modifiers.push(modifierToAdd);
@@ -99,7 +99,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       item.quantity = modifier.compute.amount || 1;
     }
 
-    if (modifierActions.isPriceOverride(modifier)) {
+    if (modifierActions.isPriceOverride(modifier) ||  modifierActions.isComputedOverride(modifier)) {
       item.price = getPrice({ modifier, item });
     } else {
       item.price = itemActions.getItemPrice({
@@ -144,7 +144,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       usingCount >= item.quantity &&
       !(
         modifierActions.isGroupOfValues(modifier) ||
-        modifierActions.isRequiredAndOverride(modifier)
+        modifierActions.isOverride(modifier)
       )
     ) {
       // console.log('Removing MODIFIER ...');

package/lib/order/pickEndDate.js

@@ -1,27 +1,19 @@
 module.exports = ({ settings, _, moment }) => {
   const timezone = _.get(settings, 'localization.timezone', 'America/New_York');
-  const isInSchedule = (each, date) => {
-    const isoWeekday = moment(date).tz(timezone).isoWeekday();
-    let check = false;
-    if (each.day !== undefined && each.day !== null)
-      check = String(each.day) === String(isoWeekday === 7 ? 0 : isoWeekday);
 
-    if (each.date)
-      check =
-        moment(date).startOf('day').tz(timezone).format('YYYYMMDD') ===
-        moment(each.date).startOf('day').tz(timezone).format('YYYYMMDD');
-    return check;
-  };
-
-  const checkStoreSchedule = date => {
+  const getClosedDays = () => {
     const schedule = _.get(settings, 'schedule', {});
     const { close = [] } = schedule;
 
-    if (close.length) return !close.find(each => isInSchedule(each, date));
+    if (!Array.isArray(close)) return [];
+    return close.map(closedDate => ({
+      isoWeekDay: moment(closedDate.date).tz(timezone).isoWeekday(),
+      date: moment(closedDate.date).tz(timezone)
+    }));
+  }
+
+  return function pickEndDate(schedule = {}) {
 
-    return true;
-  };
-  return function pickEndDate(schedule = {}, skip = 0, date = undefined) {
     const {
       addDays = 1,
       hour,
@@ -30,41 +22,37 @@ module.exports = ({ settings, _, moment }) => {
       cutHour,
       cutDay = 1,
     } = schedule;
-    let days = skip || Number(addDays);
 
-    const todayTimezone = moment().tz(timezone);
-    const dateTimezone = date || todayTimezone;
+    const todayTZ = moment().tz(timezone);
+    let endDateTZ = todayTZ.clone();
+
+    const closedDays = getClosedDays();
 
     if (
-      !skip &&
-      !date &&
       cutHour &&
-      todayTimezone.isAfter(moment(schedule.cutHour, 'hh:mm:ss').tz(timezone))
+      todayTZ.isAfter(moment(cutHour, 'hh:mm:ss').tz(timezone))
     ) {
-      console.log('cut day applied');
-      days += cutDay;
+      endDateTZ = endDateTZ.add(cutDay, 'days')
     }
 
-    const endDate = dateTimezone.add(Number(days), 'days');
-    console.log('check date => ', endDate.format());
+    let addDaysCounter = 0;
 
-    const isoWeekday = endDate.isoWeekday();
-    console.log('isoWeekday => ', isoWeekday);
+    while (addDaysCounter < addDays) {
+      endDateTZ = endDateTZ.add(1, 'days');
+      const endDateISOWeekday = endDateTZ.isoWeekday() === 7 ? 0 : endDateTZ.isoWeekday();
+
+      if (!skipDays.includes(endDateISOWeekday) && !closedDays.some(closedDay => {
+        return closedDay.date.isSame(endDateTZ, 'day');
+      })) {
+        addDaysCounter++;
+      } 
 
-    if (skipDays && skipDays.includes(isoWeekday === 7 ? 0 : isoWeekday)) {
-      console.log('check next day: in Skip days');
-      return pickEndDate(schedule, 1, endDate);
-    }
-    if (!checkStoreSchedule(endDate)) {
-      console.log('check next day: in Close days');
-      return pickEndDate(schedule, 1, endDate);
     }
 
-    if (hour !== undefined) endDate.set('hour', hour);
-    if (minute !== undefined) endDate.set('minute', minute);
-    endDate.set('second', 0);
+    if (hour !== undefined) endDateTZ.set('hour', hour);
+    if (minute !== undefined) endDateTZ.set('minute', minute);
+    endDateTZ.set('second', 0);
 
-    console.log('final date in local', endDate.format());
-    return moment.utc(endDate).format();
+    return moment.utc(endDateTZ).format();
   };
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.9",
+  "version": "1.0.12",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -35,5 +35,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "49aabd35419a731d175953158d83ff27206a9db7"
+  "gitHead": "c4950f95d5e9b9a8d9af97699a9f7f2acd1d35ca"
 }