@darkpos/pricing 1.0.38 → 1.0.40

package/lib/constants/index.js

@@ -1,4 +1,4 @@
-const Status = require('./Status');
+const Status = require('./status');
 const Modifier = require('./Modifier');
 
 module.exports = {

package/lib/item/getItemModifiers.js

@@ -1,5 +1,4 @@
 module.exports = () =>
   function getItemModifiers(item) {
-
     return item.modifiers;
   };

package/lib/item/getItemsTotalQuantity.js

@@ -1,5 +1,5 @@
 module.exports = ({ actions }) =>
-  function getItemsTotalPieces(items) {
+  function getItemsTotalQuantity(items) {
     return items.reduce(
       (total, item) => total + actions.getTotalQuantity(item),
       0

package/lib/item/getTotalPrice.js

@@ -6,5 +6,4 @@ module.exports = ({ utils }) =>
       (totalPrice, item) => utils.math.add(totalPrice, item.price),
       0
     );
-
   };

package/lib/item/index.js

@@ -11,10 +11,8 @@ const create = require('./create');
 const hasModifier = require('./hasModifier');
 const isSelected = require('./isSelected');
 const hasModifiers = require('./hasModifiers');
-const openRecommendationDialog = require('./openRecommendationDialog');
 const addIndirectModifier = require('./addIndirectModifier');
 const calculate = require('./calculate');
-const filterByDirectModifiers = require('./filterByDirectModifiers');
 const getItemPrice = require('./getItemPrice');
 const getDepartmentModifiers = require('./getDepartmentModifiers');
 const hasSubscription = require('./hasSubscription');
@@ -62,10 +60,8 @@ const itemActions = (deps = {}) => {
     hasModifier: hasModifier(innerDeps),
     isSelected: isSelected(innerDeps),
     hasModifiers: hasModifiers(innerDeps),
-    openRecommendationDialog: openRecommendationDialog(innerDeps),
     addIndirectModifier: addIndirectModifier(innerDeps),
     calculate: calculate(innerDeps),
-    filterByDirectModifiers: filterByDirectModifiers(innerDeps),
     getItemPrice: getItemPrice(innerDeps),
     getDepartmentModifiers: getDepartmentModifiers(innerDeps),
     hasSubscription: hasSubscription(innerDeps),

package/lib/modifier/calculate.js

@@ -14,7 +14,6 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
     const modifier = _modifier;
     const { name } = modifier;
     const compute = getComputeModField(modifier);
-    modifier.compute = compute;
     const { type, action, amount = 0 } = compute;
     const _computed = {
       amount: 0,
@@ -24,9 +23,10 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
     const maxAmountProp = actions.getProperty(modifier, 'maxAmount');
 
     if (!options.skip) {
-      const maxAmountCalc = actions.isFixedAdd(modifier)
-        ? amount
-        : math.mul(options.price, options.quantity);
+      const maxAmountCalc =
+        actions.isFixedAdd(modifier) || actions.isAmountOverride(modifier)
+          ? amount
+          : math.mul(options.price, options.quantity);
 
       const maxAmount = maxAmountProp
         ? math.min(maxAmountProp, maxAmountCalc)

package/lib/modifier/createCreditModifier.js

@@ -1,6 +1,5 @@
-module.exports = ({ _, actions }) => {
-
-  return function createCreditModifier(modifier = {}) {
+module.exports = ({ _, actions }) =>
+  function createCreditModifier(modifier = {}) {
     const { customerStoredCredit, ...rest } = _.cloneDeep(modifier);
     if (!customerStoredCredit) return null;
     let creditModifier;
@@ -27,4 +26,3 @@ module.exports = ({ _, actions }) => {
     };
     return creditModifier;
   };
-};

package/lib/modifier/getItemModifiers.js

@@ -1,5 +1,5 @@
-module.exports = ({ actions }) => {
-  return function getItemModifiers({ modifiers, customer, cache }) {
+module.exports = ({ actions }) =>
+  function getItemModifiers({ modifiers, customer, cache }) {
     const matchedModifiers = actions.getMatchTagsModifiers({
       modifiers,
       entity: customer,
@@ -34,4 +34,3 @@ module.exports = ({ actions }) => {
       modifierId: each.modifierId || each._id,
     }));
   };
-};

package/lib/order/pickEndDate.js

@@ -48,8 +48,10 @@ module.exports = ({ settings, _, moment }) => {
       // day condition stays working until addDaysCounter is greater than loop
       if (
         !shouldSkip ||
+        // eslint-disable-next-line no-loop-func
         !closedDays.some(closedDay => closedDay.date.isSame(endDateTZ, 'day'))
       ) {
+        // eslint-disable-next-line no-plusplus
         addDaysCounter++;
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -36,5 +36,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "6d87c96080369a419d9f2ae7fb77205be0c62d02"
+  "gitHead": "da5bee1f9a5c7e67c1776be8c31b093551d5df0d"
 }

package/lib/item/filterByDirectModifiers.js

@@ -1,13 +0,0 @@
-/**
- * Remove order modifiers from items
- */
-module.exports = ({ modifierActions }) =>
-  //
-  function filterByDirectModifiers(items = []) {
-    return items.map(item => ({
-      ...item,
-      modifiers: (item.modifiers || []).filter(modifier =>
-        modifierActions.isDirect(modifier)
-      ),
-    }));
-  };

package/lib/item/openRecommendationDialog.js

@@ -1,4 +0,0 @@
-module.exports = () =>
-  function openRecommendationDialog(item) {
-    return !!(item && item.openRecommendationDialog);
-  };