@darkpos/pricing 1.0.61 → 1.0.62

package/__TEST__/mocks/addItemMock.js

@@ -526,7 +526,6 @@ const addItemMock = {
           subscription: {},
           override: {},
           group: {
-            values: [],
             displayType: 'card',
             enableAutoPopup: false,
             includeInGroup: true,
@@ -974,7 +973,6 @@ const addItemMock = {
           subscription: {},
           override: {},
           group: {
-            values: [],
             includeInGroup: true,
             singleValue: false,
             modifiers: [

package/lib/item/getModifierTags.js

@@ -14,10 +14,6 @@ module.exports = ({ modifierActions, settings }) =>
 
         let label = name;
 
-        if (modifierActions.isGroupOfValues(modifier)) {
-          label = modifierActions.getSelectedValues(modifier) || label;
-        }
-
         if (
           modifier &&
           !modifier.included &&

package/lib/item/index.js

@@ -21,7 +21,6 @@ const getTotal = require('./getTotal');
 const getPendingIndex = require('./getPendingIndex');
 const getItemsTotals = require('./getItemsTotals');
 const getNotIncludedModifiers = require('./getNotIncludedModifiers');
-const hasModifierWithValue = require('./hasModifierWithValue');
 const getItemsTotalPaid = require('./getItemsTotalPaid');
 const getModifierTags = require('./getModifierTags');
 const isRelatedItem = require('./isRelatedItem');
@@ -80,7 +79,6 @@ const itemActions = (deps = {}) => {
     getPendingIndex: getPendingIndex(innerDeps),
     getItemsTotals: getItemsTotals(innerDeps),
     getNotIncludedModifiers: getNotIncludedModifiers(innerDeps),
-    hasModifierWithValue: hasModifierWithValue(innerDeps),
     getItemsTotalPaid: getItemsTotalPaid(innerDeps),
     getModifierTags: getModifierTags(innerDeps),
     isRelatedItem: isRelatedItem(innerDeps),

package/lib/item/removeModifier.js

@@ -1,18 +1,6 @@
 module.exports = ({ modifierActions, _, actions }) => {
-  const hasRelatedItems = (modifiers = []) =>
-    !!modifiers.find(each => modifierActions.isGroupOfItems(each));
-
-  const isValid = (itemModifiers, modifier) => {
-    if (!modifierActions.findById(itemModifiers, modifier._id)) return false;
-
-    if (
-      !modifierActions.isGroupOfItems(modifier) &&
-      hasRelatedItems(itemModifiers)
-    )
-      return false;
-
-    return true;
-  };
+  const isValid = (itemModifiers, modifier) =>
+    !!modifierActions.findById(itemModifiers, modifier._id);
 
   return function removeModifier({ item, modifier, customer, originalItem }) {
     const nextItem = _.cloneDeep(item);

package/lib/modifier/index.js

@@ -1,6 +1,4 @@
 //
-const addFile = require('./addFile');
-const addImage = require('./addImage');
 const calculate = require('./calculate');
 const contains = require('./contains');
 const convertMenuModifiers = require('./convertMenuModifiers');
@@ -9,7 +7,6 @@ const createAmountOverrideModifier = require('./createAmountOverrideModifier');
 const createCreditModifier = require('./createCreditModifier');
 const createDiscountModifier = require('./createDiscountModifier');
 const createFeeModifier = require('./createFeeModifier');
-const createGroupValuesModifier = require('./createGroupValuesModifier');
 const createIndirectModifier = require('./createIndirectModifier');
 const createSubscriptionModifier = require('./createSubscriptionModifier');
 const displayAsCard = require('./displayAsCard');
@@ -34,11 +31,9 @@ const getDescriptions = require('./getDescriptions');
 const getEntityModifiers = require('./getEntityModifiers');
 const getExtendedTags = require('./getExtendedTags');
 const getEntityPromotions = require('./getEntityPromotions');
-const getFiles = require('./getFiles');
 const getGroupOfItemsModifiers = require('./getGroupOfItemsModifiers');
 const getGroupRelatedModifiers = require('./getGroupRelatedModifiers');
 const getGroupModifiers = require('./getGroupModifiers');
-const getImages = require('./getImages');
 const getItemModifiers = require('./getItemModifiers');
 const getInheritedModifiers = require('./getInheritedModifiers');
 const getMatchTagsModifiers = require('./getMatchTagsModifiers');
@@ -51,7 +46,6 @@ const getProperty = require('./getProperty');
 const getRelatedModifiers = require('./getRelatedModifiers');
 const getRecommendedModifiers = require('./getRecommendedModifiers');
 const getRequiredModifiers = require('./getRequiredModifiers');
-const getSelectedValues = require('./getSelectedValues');
 const getSubscriptionItem = require('./getSubscriptionItem');
 const getSubscriptionModifiers = require('./getSubscriptionModifiers');
 const getService = require('./getService');
@@ -105,10 +99,7 @@ const isGratuity = require('./isGratuity');
 const isPaymentMethodModifier = require('./isPaymentMethodModifier');
 const isPaymentTypeModifier = require('./isPaymentTypeModifier');
 const isPreferences = require('./isPreferences');
-const isGroupOfValues = require('./isGroupOfValues');
 const isCompact = require('./isCompact');
-const isValueSelected = require('./isValueSelected');
-const isEditable = require('./isEditable');
 const isCredit = require('./isCredit');
 const purifyModifiers = require('./purifyModifiers');
 const sort = require('./sort');
@@ -159,8 +150,6 @@ const modifierActions = (deps = {}) => {
   };
 
   const freezedActions = Object.freeze({
-    addFile: addFile(innerDeps),
-    addImage: addImage(innerDeps),
     calculate: calculate(innerDeps),
     contains: contains(innerDeps),
     convertMenuModifiers: convertMenuModifiers(innerDeps),
@@ -169,7 +158,6 @@ const modifierActions = (deps = {}) => {
     createCreditModifier: createCreditModifier(innerDeps),
     createDiscountModifier: createDiscountModifier(innerDeps),
     createFeeModifier: createFeeModifier(innerDeps),
-    createGroupValuesModifier: createGroupValuesModifier(innerDeps),
     createIndirectModifier: createIndirectModifier(innerDeps),
     createSubscriptionModifier: createSubscriptionModifier(innerDeps),
     displayAsCard: displayAsCard(innerDeps),
@@ -195,11 +183,9 @@ const modifierActions = (deps = {}) => {
     getEntityModifiers: getEntityModifiers(innerDeps),
     getExtendedTags: getExtendedTags(innerDeps),
     getEntityPromotions: getEntityPromotions(innerDeps),
-    getFiles: getFiles(innerDeps),
     getGroupRelatedModifiers: getGroupRelatedModifiers(innerDeps),
     getGroupModifiers: getGroupModifiers(innerDeps),
     getGroupOfItemsModifiers: getGroupOfItemsModifiers(innerDeps),
-    getImages: getImages(innerDeps),
     getInheritedModifiers: getInheritedModifiers(innerDeps),
     getItemModifiers: getItemModifiers(innerDeps),
     getMatchTagsModifiers: getMatchTagsModifiers(innerDeps),
@@ -212,7 +198,6 @@ const modifierActions = (deps = {}) => {
     getRelatedModifiers: getRelatedModifiers(innerDeps),
     getRecommendedModifiers: getRecommendedModifiers(innerDeps),
     getRequiredModifiers: getRequiredModifiers(innerDeps),
-    getSelectedValues: getSelectedValues(innerDeps),
     getSubscriptionItem: getSubscriptionItem(innerDeps),
     getSubscriptionModifiers: getSubscriptionModifiers(innerDeps),
     getService: getService(innerDeps),
@@ -237,7 +222,6 @@ const modifierActions = (deps = {}) => {
     includesInGroup: includesInGroup(innerDeps),
     isTrackUsageSubscription: isTrackUsageSubscription(innerDeps),
     isDirect: isDirect(innerDeps),
-    isEditable: isEditable(innerDeps),
     isRemoveModifier: isRemoveModifier(innerDeps),
     isGroupOfModifiers: isGroupOfModifiers(innerDeps),
     isRequiredAndOverride: isRequiredAndOverride(innerDeps),
@@ -265,9 +249,7 @@ const modifierActions = (deps = {}) => {
     isPaymentMethodModifier: isPaymentMethodModifier(innerDeps),
     isPaymentTypeModifier: isPaymentTypeModifier(innerDeps),
     isPreferences: isPreferences(innerDeps),
-    isGroupOfValues: isGroupOfValues(innerDeps),
     isCompact: isCompact(innerDeps),
-    isValueSelected: isValueSelected(innerDeps),
     isCredit: isCredit(innerDeps),
     isIncluded: isIncluded(innerDeps),
     purifyModifiers: purifyModifiers(innerDeps),

package/lib/order/addItemModifier.js

@@ -18,15 +18,6 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     );
   };
 
-  const hasBehaivoralFields = modifier => {
-    if (
-      !modifierActions.hasRelatedItems(modifier) &&
-      modifierActions.isGroupOfItems(modifier)
-    )
-      return true;
-    return false;
-  };
-
   const areConditionsMet = (item, conditions) => {
     const conditionsBag = [];
     if (!conditions || !conditions.rules) return conditionsBag;
@@ -104,7 +95,6 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     const modifier = _modifier; // to avoid no param reassign lint rule
     let item = { ...itemProp };
     const compute = getComputeModField(modifier);
-    if (hasBehaivoralFields(modifier)) return item;
     const conditionsBag = areConditionsMet(item, modifier.conditions);
     const isAmountOverride = modifierActions.isAmountOverride(modifier);
     const isPriceOverride = modifierActions.isPriceOverride(modifier);
@@ -117,11 +107,8 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     const modifierIndex = item.modifiers.findIndex(
       ieach => ieach.modifierId === modifier._id
     );
-    // group of values use case
-    if (
-      modifierActions.isGroupOfValues(modifier) ||
-      (modifierActions.isOverride(modifier) && !isAmountOverride)
-    ) {
+
+    if (modifierActions.isOverride(modifier) && !isAmountOverride) {
       if (modifierIndex > -1) item.modifiers[modifierIndex] = modifierToAdd;
       else item.modifiers.push(modifierToAdd);
     } else {
@@ -206,10 +193,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     if (
       contains &&
       usingCount >= item.quantity &&
-      !(
-        modifierActions.isGroupOfValues(modifier) ||
-        modifierActions.isOverride(modifier)
-      )
+      !modifierActions.isOverride(modifier)
     ) {
       order = actions.removeItemModifier({
         order,

package/lib/order/removeItemModifier.js

@@ -44,11 +44,7 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
     const contains = modifierActions.contains(item.modifiers, modifier);
 
     if (!contains) return order;
-    if (
-      modifierActions.isGroupOfValues(modifier) ||
-      modifierActions.isRequiredAndOverride(modifier)
-    )
-      return order;
+    if (modifierActions.isRequiredAndOverride(modifier)) return order;
 
     // Remove
     item = removeModifier({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.61",
+  "version": "1.0.62",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -45,5 +45,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "b84b082f63b719b2ad7a30e18aff3e4cb491a739"
+  "gitHead": "46945a727cbb12468ce5e88b5d28a37ec1d321ee"
 }

package/lib/item/hasModifierWithValue.js

@@ -1,11 +0,0 @@
-module.exports = ({ modifierActions }) =>
-  function hasModifierWithValue({ item, modifier, value }) {
-    if (!item || !modifier || !item.modifiers) return false;
-    const relatedModifier = item.modifiers.find(
-      itemModifier => modifier._id === itemModifier.modifierId
-    );
-    return modifierActions.isValueSelected({
-      modifier: relatedModifier,
-      value,
-    });
-  };

package/lib/modifier/addFile.js

@@ -1,19 +0,0 @@
-module.exports = ({ actions }) =>
-  function addFile({ modifier, file, add = true }) {
-    if (!modifier || !file || !actions.isGroupOfValues(modifier)) return null;
-    let files = [...(modifier.properties.group.files || [])];
-
-    if (add) files.push(file);
-    else files = files.filter(each => each._id !== file._id);
-
-    return {
-      ...modifier,
-      properties: {
-        ...modifier.properties,
-        group: {
-          ...modifier.properties.group,
-          files,
-        },
-      },
-    };
-  };

package/lib/modifier/addImage.js

@@ -1,18 +0,0 @@
-module.exports = ({ actions }) =>
-  function addImage({ modifier, image, add = true }) {
-    if (!modifier || !image || !actions.isGroupOfValues(modifier)) return null;
-    let images = [...(modifier.properties.group.images || [])];
-    if (add) images.push(image);
-    else images = images.filter(each => each !== image);
-
-    return {
-      ...modifier,
-      properties: {
-        ...modifier.properties,
-        group: {
-          ...modifier.properties.group,
-          images,
-        },
-      },
-    };
-  };

package/lib/modifier/createGroupValuesModifier.js

@@ -1,29 +0,0 @@
-module.exports = ({ actions }) =>
-  function createGroupValuesModifier({ modifier, value, add = false }) {
-    if (!modifier || !value || !actions.isGroupOfValues(modifier)) return null;
-
-    const multiSelect = !actions.isSingleValue(modifier);
-    let selectedValues = [];
-    const modifierValues = [...modifier.properties.group.values, value];
-
-    if (!add) {
-      selectedValues = [...(modifier.properties.group.selectedValues || [])];
-      const remove = selectedValues.includes(value);
-      if (remove)
-        selectedValues = selectedValues.filter(each => each !== value);
-      else if (multiSelect) selectedValues.push(value);
-      else selectedValues = [value];
-    }
-
-    return {
-      ...modifier,
-      properties: {
-        ...modifier.properties,
-        group: {
-          ...modifier.properties.group,
-          selectedValues,
-          values: add ? [...new Set(modifierValues)] : [],
-        },
-      },
-    };
-  };

package/lib/modifier/getFiles.js

@@ -1,5 +0,0 @@
-module.exports = ({ actions }) =>
-  function getFiles(modifier) {
-    if (!actions.isGroupOfValues(modifier)) return [];
-    return modifier.properties.group.files || [];
-  };

package/lib/modifier/getImages.js

@@ -1,5 +0,0 @@
-module.exports = ({ actions }) =>
-  function getImages(modifier) {
-    if (!actions.isGroupOfValues(modifier)) return [];
-    return modifier.properties.group.images || [];
-  };

package/lib/modifier/getSelectedValues.js

@@ -1,7 +0,0 @@
-module.exports = ({ actions }) =>
-  function getSelectedValues(modifier) {
-    if (!actions.isGroupOfValues(modifier)) return null;
-    if (Array.isArray(modifier.properties.group.selectedValues))
-      return modifier.properties.group.selectedValues.join(', ');
-    return null;
-  };

package/lib/modifier/isEditable.js

@@ -1,10 +0,0 @@
-module.exports = ({ actions }) =>
-  function isEditable(modifier) {
-    const { properties = {} } = modifier || {};
-    return !!(
-      actions.isGroupOfValues(modifier) &&
-      properties &&
-      properties.group &&
-      properties.group.editGroupValues
-    );
-  };

package/lib/modifier/isGroupOfValues.js

@@ -1,13 +0,0 @@
-module.exports = ({ actions, constants }) => {
-  const { Modifier } = constants;
-  return function isGroupOfValues(modifier) {
-    const { properties = {} } = modifier || {};
-    return !!(
-      actions.hasAttribute(modifier, Modifier.Attributes.GROUP) &&
-      properties &&
-      properties.group &&
-      ((properties.group.values || []).length ||
-        (properties.group.selectedValues || []).length)
-    );
-  };
-};

package/lib/modifier/isValueSelected.js

@@ -1,7 +0,0 @@
-module.exports = ({ actions }) =>
-  function isValueSelected({ modifier, value }) {
-    if (!modifier || !value) return false;
-    if (!actions.isGroupOfValues(modifier)) return false;
-    if (!Array.isArray(modifier.properties.group.selectedValues)) return false;
-    return modifier.properties.group.selectedValues.includes(value);
-  };