@darkpos/pricing 1.0.99 → 1.0.101

package/lib/item/index.js

@@ -65,6 +65,7 @@ const getUpdatedStatus = require('./getUpdatedStatus');
 const isOverwrittenPrice = require('./isOverwrittenPrice');
 const isOverwrittenQuantity = require('./isOverwrittenQuantity');
 const overrideNotes = require('./overrideNotes');
+const validateModifiers = require('./validateModifiers');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -143,6 +144,7 @@ const itemActions = (deps = {}) => {
     isOverwrittenPrice: isOverwrittenPrice(innerDeps),
     isOverwrittenQuantity: isOverwrittenQuantity(innerDeps),
     overrideNotes: overrideNotes(innerDeps),
+    validateModifiers: validateModifiers(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/removeModifier.js

@@ -15,24 +15,21 @@ module.exports = ({ modifierActions, _, actions }) => {
 
     const modifiersToApply = [
       modifier,
-      ...addModifiers.filter(
-        addMod =>
-          !addMod.required &&
-          (!order ||
-            !actions.hasModifier({
-              item: {
-                ...item,
-                modifiers: item.modifiers.filter(
-                  mod => mod._id !== modifier._id
-                ),
-              },
-              modifier: addMod,
-              relatedItems: actions.getRelatedItems({
-                items: order.items,
-                item,
-              }),
-            }))
-      ),
+      ...addModifiers.filter(addMod => {
+        if (addMod.required) return false;
+        const hasModifier = actions.hasModifier({
+          item: {
+            ...item,
+            modifiers: item.modifiers.filter(mod => mod._id !== modifier._id),
+          },
+          modifier: addMod,
+          relatedItems: actions.getRelatedItems({
+            items: order ? order.items : [],
+            item,
+          }),
+        });
+        return modifierActions.isGroup(addMod) ? !hasModifier : !!hasModifier;
+      }),
     ];
 
     // Remove

package/lib/item/validateModifiers.js

@@ -0,0 +1,71 @@
+module.exports = ({ modifierActions }) =>
+  function validateModifiers({
+    item,
+    itemModifiers,
+    startRequestDate,
+    endRequestDate,
+    allItems,
+    paymentMethod,
+    paymentType,
+    isPrepay,
+  }) {
+    const validatedModifiers = [];
+    const firstValidatedModifiers = itemModifiers.map(each =>
+      modifierActions.validate(each, {
+        item,
+        startRequestDate,
+        endRequestDate,
+        allItems,
+        paymentMethod,
+        paymentType,
+        isPrepay,
+      })
+    );
+
+    firstValidatedModifiers.forEach(validModifier => {
+      const parentAddModifier = firstValidatedModifiers.find(
+        validMod =>
+          validMod.addModifiers &&
+          validMod.addModifiers.some(
+            addMod => addMod._id === validModifier.modifierId
+          )
+      );
+
+      const parentDelModifier = firstValidatedModifiers.find(
+        validMod =>
+          validMod.delModifiers &&
+          validMod.delModifiers.some(
+            delMod => delMod._id === validModifier.modifierId
+          )
+      );
+
+      let nextValidModifier = { ...validModifier };
+      const shouldInvalidateAddModifier =
+        parentAddModifier &&
+        !parentAddModifier.conditions.valid &&
+        nextValidModifier.conditions.valid;
+
+      const shouldInvalidateDelModifier =
+        parentDelModifier &&
+        parentDelModifier.conditions.valid &&
+        nextValidModifier.conditions.valid;
+
+      if (shouldInvalidateAddModifier || shouldInvalidateDelModifier) {
+        nextValidModifier = {
+          ...nextValidModifier,
+          conditions: {
+            ...validModifier.conditions,
+            valid: false,
+          },
+        };
+      }
+
+      if (
+        !validatedModifiers.some(validMod => validMod._id === validModifier._id)
+      ) {
+        validatedModifiers.push(nextValidModifier);
+      }
+    });
+
+    return validatedModifiers;
+  };

package/lib/modifier/getDepartmentModifiers.js

@@ -5,7 +5,7 @@ module.exports = ({ actions, utils }) => {
   return function getDepartmentModifiers(modifiers) {
     if (!modifiers || !Array.isArray(modifiers)) return [];
     return modifiers
-      .filter(each => actions.isDepartment(each))
+      .filter(each => actions.isValid(each) && actions.isDepartment(each))
       .sort((mod1, mod2) => math.sub(getOrder(mod1), getOrder(mod2)));
   };
 };

package/lib/modifier/getInheritedModifiers.js

@@ -25,6 +25,6 @@ module.exports = ({ actions }) => {
       if (inheritedModifiers.length) modifiers.push(...inheritedModifiers);
     }
 
-    return actions.purifyModifiers(modifiers);
+    return modifiers;
   };
 };

package/lib/modifier/index.js

@@ -102,7 +102,6 @@ const isPaymentTypeModifier = require('./isPaymentTypeModifier');
 const isPreferences = require('./isPreferences');
 const isCompact = require('./isCompact');
 const isCredit = require('./isCredit');
-const purifyModifiers = require('./purifyModifiers');
 const sort = require('./sort');
 const isPaymentModifier = require('./isPaymentModifier');
 const isSubtract = require('./isSubtract');
@@ -278,7 +277,6 @@ const modifierActions = (deps = {}) => {
     isCompact: isCompact(innerDeps),
     isCredit: isCredit(innerDeps),
     isIncluded: isIncluded(innerDeps),
-    purifyModifiers: purifyModifiers(innerDeps),
     sort: sort(innerDeps),
     isPaymentModifier: isPaymentModifier(innerDeps),
     isSubtract: isSubtract(innerDeps),

package/lib/order/addItemModifier.js

@@ -1,88 +1,12 @@
 module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
   const { math } = utils;
 
-  const filterByRemoveModifiers = (modifiers, modifier) => {
-    const { delModifiers = [] } = modifier;
-
-    return modifiers.filter(
-      each => !modifierActions.findById(delModifiers, each.modifierId)
-    );
-  };
-
-  const areConditionsMet = (item, conditions) => {
-    const conditionsBag = [];
-    if (!conditions || !conditions.rules) return conditionsBag;
-    // Find conditions with itemPieces as key
-    const itemPiecesConditions = conditions.rules.filter(
-      each => each.key === 'itemPieces'
-    );
-    if (itemPiecesConditions.length > 0) {
-      itemPiecesConditions.forEach(each => {
-        if (
-          !modifierActions.validateNumberCondition(
-            item.pieces,
-            each.value,
-            each.operand
-          )
-        ) {
-          conditionsBag.push({
-            name: `${each.operand}.itemPieces`,
-            value: each.value,
-            current: item.pieces,
-          });
-        }
-      });
-    }
-    const itemQtyConditions = conditions.rules.filter(
-      each => each.key === 'itemQuantity'
-    );
-    if (itemQtyConditions.length > 0) {
-      itemQtyConditions.forEach(each => {
-        if (
-          !modifierActions.validateNumberCondition(
-            item.quantity,
-            each.value,
-            each.operand
-          )
-        ) {
-          conditionsBag.push({
-            name: `${each.operand}.itemQuantity`,
-            value: each.value,
-            current: item.quantity,
-          });
-        }
-      });
-    }
-    const requiredModifiersConditions = conditions.rules.filter(
-      each => each.key === 'modifiers'
-    );
-    if (requiredModifiersConditions.length > 0) {
-      requiredModifiersConditions.forEach(each => {
-        if (
-          !modifierActions.validateRequiredModifiers(
-            item.modifiers,
-            each.value,
-            each.operand
-          )
-        ) {
-          conditionsBag.push({
-            name: `${each.operand}.modifiers`,
-            value: each.value,
-            current: item.modifiers,
-          });
-        }
-      });
-    }
-    return conditionsBag;
-  };
-
   const addModifier = ({
     order,
     modifier: _modifier,
     item: itemProp,
     customer,
     originalItem,
-    onConditionsNotMet,
     onError,
   }) => {
     if (
@@ -99,20 +23,11 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
 
     const modifier = modifierActions.removeGroupRelations(_modifier); // to avoid no param reassign lint rule
     const item = { ...itemProp };
-    const conditionsBag = areConditionsMet(item, modifier.conditions);
 
-    if (conditionsBag.length > 0 && !modifierActions.isRequired(modifier)) {
-      if (onConditionsNotMet) onConditionsNotMet(conditionsBag);
-      return item;
-    }
     const modifierToAdd = modifierActions.duplicate(modifier);
 
     item.modifiers.push(modifierToAdd);
 
-    if (modifierActions.isRemoveModifier(modifier)) {
-      item.modifiers = filterByRemoveModifiers(item.modifiers, modifier);
-    }
-
     item.properties = {
       ...(item.properties || {}),
     };
@@ -131,7 +46,6 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     modifier,
     itemIndex,
     originalItem,
-    onConditionsNotMet,
     onError,
   }) {
     let order = _.cloneDeep(orderProp);
@@ -225,7 +139,6 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       modifier,
       originalItem,
       customer,
-      onConditionsNotMet,
       onError,
     });
 

package/lib/order/splitByDepartments.js

@@ -1,4 +1,12 @@
-module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
+module.exports = ({
+  utils,
+  _,
+  actions,
+  itemActions,
+  modifierActions,
+  settings,
+  storeActions,
+}) => {
   const { helpers } = utils;
 
   const isSplitByPieces = splitUnit => splitUnit === 'pieces';
@@ -26,16 +34,45 @@ module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
       return { ...order, items };
     });
 
-  return function splitByDepartments({ parentOrder, newItems }) {
+  const getDepartmentSchedules = department => {
+    if (!department) return null;
+    const allSchedules = _.get(settings, 'order.schedules', []);
+    return allSchedules.filter(item =>
+      item.departments.some(dep => dep._id === department.modifierId)
+    );
+  };
+
+  return function splitByDepartments({
+    parentOrder: parentOrderParam,
+    newItems,
+  }) {
     const itemsByDepartments = _.groupBy(newItems, getDepartmentName);
     const itemGroups = Object.values(itemsByDepartments);
     let splitOrders = [];
+    const defaultEndDate = storeActions.pickEndDate();
+    const isDefaultEndDate =
+      !parentOrderParam.end ||
+      !parentOrderParam.end.requestDate ||
+      utils.date.isEqual(defaultEndDate, parentOrderParam.end.requestDate);
 
     itemGroups.forEach(items => {
       // Assuming there is one department in the item
       const department = itemActions.getDepartmentModifiers(items[0])[0];
       const departmentName = getDepartmentName(items[0]);
       const maxItems = modifierActions.getDepartmentMaxItems(department);
+      const departmentSchedules = getDepartmentSchedules(department);
+      let parentOrder = { ...parentOrderParam };
+
+      if (
+        departmentSchedules &&
+        departmentSchedules.length &&
+        isDefaultEndDate
+      ) {
+        parentOrder = actions.changeEndDate({
+          date: storeActions.pickEndDate(departmentSchedules),
+          order: parentOrder,
+        });
+      }
 
       const autoSplit = _.get(
         department || {},

package/lib/store/pickEndDate.js

@@ -1,5 +1,7 @@
 module.exports = ({ settings, _, moment }) => {
-  const timezone = _.get(settings, 'localization.timezone', 'America/New_York');
+  const timezone =
+    _.get(settings, 'localization.timezone', 'America/New_York') ||
+    'America/New_York';
 
   const getSchedule = (schedules, isoWeekday) => {
     const todayTZ = moment().tz(timezone);
@@ -7,7 +9,9 @@ module.exports = ({ settings, _, moment }) => {
     const _schedules =
       schedules && schedules.length
         ? schedules
-        : _.get(settings, 'order.schedules', []);
+        : _.get(settings, 'order.schedules', []).filter(
+            item => !item.departments || !item.departments.length
+          );
 
     if (!_schedules.length) {
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.99",
+  "version": "1.0.101",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "4c83ad5f183f5b887c0ebd70e00e143282bf85a4"
+  "gitHead": "aad940d770d15b6072fd45e300302002bfc8fc08"
 }

package/lib/modifier/purifyModifiers.js

@@ -1,15 +0,0 @@
-module.exports = ({ actions }) =>
-  function purifyModifiers(modifiers) {
-    if (!modifiers) return [];
-    const removeIds = modifiers
-      .filter(modifier => actions.isRemoveModifier(modifier))
-      .reduce(
-        (acc, modifier) => [
-          ...acc,
-          modifier.properties.delModifiers.map(each => each._id),
-        ],
-        []
-      );
-
-    return modifiers.filter(each => !removeIds.includes(each.modifierId));
-  };