@darkpos/pricing 1.0.136 → 1.0.138

package/lib/index.js

@@ -9,6 +9,7 @@ const makeItemActions = require('./item');
 const makeOrderActions = require('./order');
 const makeModifierActions = require('./modifier');
 const makePaymentActions = require('./payment');
+const makeInvoiceActions = require('./invoice');
 
 const constants = require('./constants');
 
@@ -50,12 +51,22 @@ module.exports = session => {
     storeActions,
   });
 
+  const invoiceActions = makeInvoiceActions({
+    ...deps,
+    itemActions,
+    modifierActions,
+    orderActions,
+    storeActions,
+    paymentActions,
+  });
+
   return {
     item: itemActions,
     order: orderActions,
     modifier: modifierActions,
     store: storeActions,
     payment: paymentActions,
+    invoice: invoiceActions,
     constants,
   };
 };

package/lib/invoice/getStatusByItems.js

@@ -0,0 +1,22 @@
+module.exports = ({ utils, _ }) =>
+  function getStatusByItems({ items }) {
+    const { math } = utils;
+    if (!Array.isArray(items) || items.length === 0) return 'pending';
+
+    const totalPaid = items.reduce(
+      (total, item) => math.add(total, item.totalPaid),
+      0
+    );
+    const isInvoicePaid = items.every(
+      item => !!_.get(item, 'status.paid.value', false)
+    );
+    const isInvoicePartialPaid =
+      !isInvoicePaid &&
+      items.some(item => !!_.get(item, 'status.paid.value', false));
+
+    if (isInvoicePaid) return 'paid';
+    if (isInvoicePartialPaid || (!isInvoicePartialPaid && totalPaid > 0))
+      return 'partial';
+
+    return 'pending';
+  };

package/lib/invoice/getTotalByItems.js

@@ -0,0 +1,12 @@
+module.exports = ({ utils }) =>
+  function getTotalByItems({ items }) {
+    const { math } = utils;
+    if (!Array.isArray(items) || items.length === 0) return 0;
+
+    const total = items.reduce(
+      (itemsTotal, item) => math.add(itemsTotal, item.total),
+      0
+    );
+
+    return total;
+  };

package/lib/invoice/index.js

@@ -0,0 +1,24 @@
+const getStatusByItems = require('./getStatusByItems');
+const getTotalByItems = require('./getTotalByItems');
+
+const invoiceActions = (deps = {}) => {
+  const actions = {};
+
+  const innerDeps = {
+    ...deps,
+    actions,
+  };
+
+  const freezedActions = Object.freeze({
+    getStatusByItems: getStatusByItems(innerDeps),
+    getTotalByItems: getTotalByItems(innerDeps),
+  });
+
+  Object.keys(freezedActions).forEach(actionName => {
+    actions[actionName] = freezedActions[actionName];
+  });
+
+  return freezedActions;
+};
+
+module.exports = invoiceActions;

package/lib/item/applyPayment.js

@@ -0,0 +1,22 @@
+module.exports = () =>
+  function applyPayment({ paymentOrderItems, orderItem }) {
+    const itemOption = paymentOrderItems.find(
+      ({ orderItemId }) => String(orderItemId) === String(orderItem._id)
+    );
+
+    if (!itemOption) return orderItem;
+
+    const item = orderItem;
+
+    const paid =
+      itemOption.status && itemOption.status.paid && itemOption.status.paid;
+
+    return {
+      ...item,
+      status: {
+        ...item.status,
+        ...itemOption.status,
+        paid,
+      },
+    };
+  };

package/lib/item/calculate.js

@@ -8,8 +8,11 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
       ...inputItem,
       quantity: math.max(0, Number(inputItem.quantity) || 0),
     });
-    const amountToPay =
-      typeof opts.amountToPay === 'number' ? opts.amountToPay : 0;
+    const amountToPay = actions.getAmountToPayById({
+      amountsToPay: opts.amountsToPay,
+      id: inputItem._id,
+    });
+
     const paymentMethod = opts.paymentMethod || null;
     const paymentType = opts.paymentType || null;
     const isPrepay = opts.isPrepay || false;
@@ -148,16 +151,19 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
         let _modifier = modifier;
 
         if (modifierActions.isPaymentModifier(modifier)) {
+          const balance = actions.getBalanceForPaymentModifier({
+            item,
+            computedPrice,
+            modifier,
+          });
+
           _modifier = modifierActions.calculatePaymentModifier({
             paymentModifier: modifier,
             amountToPay:
               accumulatedAmount < 0 && amountToPay > 0
                 ? math.add(amountToPay, math.abs(accumulatedAmount))
                 : amountToPay,
-            itemBalance:
-              typeof item.totalPaid === 'number' && item.totalPaid > 0
-                ? actions.getItemsBalance({ items: [item] })
-                : math.sub(computedPrice, item.totalPaid),
+            itemBalance: math.max(0, balance),
             paymentId,
           });
         }
@@ -255,7 +261,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
       modifiers: [...modifiersToNotCompute, ...modifiers],
       subTotals,
       total,
-      status: actions.getUpdatedStatus({ status: item.status, total }),
+      ...(item.status || {}),
     };
   };
 

package/lib/item/getAmountToPayById.js

@@ -0,0 +1,6 @@
+module.exports = () =>
+  function getAmountToPayById({ amountsToPay, id }) {
+    if (!amountsToPay) return 0;
+
+    return amountsToPay[id] || 0;
+  };

package/lib/item/getBalanceForPaymentModifier.js

@@ -0,0 +1,30 @@
+module.exports = ({ utils, actions, modifierActions }) => {
+  const { math } = utils;
+  return function getBalanceForPaymentModifier({
+    item,
+    computedPrice,
+    modifier,
+  }) {
+    let balance =
+      typeof item.totalPaid === 'number' && item.totalPaid > 0
+        ? actions.getItemsBalance({ items: [item] })
+        : math.sub(computedPrice, item.totalPaid);
+
+    const modifiersAmount = item.modifiers.reduce((amount, mod) => {
+      if (
+        modifierActions.isCalculatedPaymentModifier(mod) &&
+        mod.locked &&
+        modifier.modifierId === mod.modifierId
+      ) {
+        return math.add(amount, mod._computed.amount);
+      }
+      return amount;
+    }, 0);
+
+    if (modifiersAmount > 0) {
+      balance = math.sub(balance, modifiersAmount);
+    }
+
+    return balance;
+  };
+};

package/lib/item/getPaidStatus.js

@@ -0,0 +1,29 @@
+module.exports = ({ actions, settings }) =>
+  function getPaidStatus({
+    status,
+    total: totalParam,
+    totalPaid: totalPaidParam,
+  }) {
+    const localStatus = status || {};
+
+    const total = totalParam || 0;
+    const totalPaid = totalPaidParam || 0;
+
+    if (
+      actions.isPaid({ item: { status: localStatus } }) &&
+      total !== 0 &&
+      total > totalPaid
+    ) {
+      return undefined;
+    }
+
+    if (!settings || !settings.order || !settings.order.autoMarkAsPaid) {
+      return localStatus.paid;
+    }
+
+    if (!actions.isPaid({ item: { status: localStatus } }) && total === 0) {
+      return { value: true, date: new Date() };
+    }
+
+    return localStatus.paid;
+  };

package/lib/item/index.js

@@ -59,7 +59,7 @@ const getSubtotal = require('./getSubtotal');
 const isSomeTagsMatch = require('./isSomeTagsMatch');
 const getTotals = require('./getTotals');
 const patchItem = require('./patchItem');
-const getUpdatedStatus = require('./getUpdatedStatus');
+const getPaidStatus = require('./getPaidStatus');
 const isOverwrittenPrice = require('./isOverwrittenPrice');
 const isOverwrittenQuantity = require('./isOverwrittenQuantity');
 const overrideNotes = require('./overrideNotes');
@@ -78,6 +78,9 @@ const hasRelatedItems = require('./hasRelatedItems');
 const getAddModifiers = require('./getAddModifiers');
 const hasAddModifiers = require('./hasAddModifiers');
 const getTaxes = require('./getTaxes');
+const getAmountToPayById = require('./getAmountToPayById');
+const applyPayment = require('./applyPayment');
+const getBalanceForPaymentModifier = require('./getBalanceForPaymentModifier');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -150,7 +153,7 @@ const itemActions = (deps = {}) => {
     isSomeTagsMatch: isSomeTagsMatch(innerDeps),
     getTotals: getTotals(innerDeps),
     patchItem: patchItem(innerDeps),
-    getUpdatedStatus: getUpdatedStatus(innerDeps),
+    getPaidStatus: getPaidStatus(innerDeps),
     isOverwrittenPrice: isOverwrittenPrice(innerDeps),
     isOverwrittenQuantity: isOverwrittenQuantity(innerDeps),
     overrideNotes: overrideNotes(innerDeps),
@@ -169,6 +172,9 @@ const itemActions = (deps = {}) => {
     getAddModifiers: getAddModifiers(innerDeps),
     hasAddModifiers: hasAddModifiers(innerDeps),
     getTaxes: getTaxes(innerDeps),
+    getAmountToPayById: getAmountToPayById(innerDeps),
+    applyPayment: applyPayment(innerDeps),
+    getBalanceForPaymentModifier: getBalanceForPaymentModifier(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/patchItem.js

@@ -5,7 +5,9 @@ module.exports = ({ actions, modifierActions }) =>
     const localItem = { ...item };
 
     const modifierIndex = item.modifiers.findIndex(
-      mod => modifierActions.isPercentage(mod) || !modifierActions.isDirect(mod)
+      mod =>
+        modifierActions.isValid(mod) &&
+        (modifierActions.isPercentage(mod) || !modifierActions.isDirect(mod))
     );
 
     localItem.modifiers[modifierIndex] = modifierActions.patchModifier({

package/lib/modifier/hasMatchTags.js

@@ -1,25 +1,8 @@
 module.exports = ({ actions }) =>
-  /* checks if the customer can be matched with the entity or not,
-   * This function will return true in these conditions:
-   *    Neither customer nor the entity has any tags
-   *    Customer has no tags and entity has the 'all' tag
-   *    customer has the 'all' tag and entity has no tags
-   *    customer and entity have at least one exact tag (case-sensitive)
-   * In any other case the function should return false
-   * */
   function hasMatchTags(modifier, entity) {
     const entityNoTags = actions.hasNoTags(entity);
     const modifierNoTags = actions.hasNoTags(modifier);
-    if (
-      (modifierNoTags && entityNoTags) ||
-      (entityNoTags && actions.hasAllTag(modifier)) || // customer has no tags but modifier has the all tag
-      (modifierNoTags && actions.hasAllTag(entity)) // modifier has no tags but customer has the all tag
-    ) {
-      return true;
-    }
-
-    if (!entity || !entity.tags) return false;
-    if (!modifier || !modifier.tags) return false;
+    if (modifierNoTags || entityNoTags) return true;
 
     const sameTag = modifier.tags.find(tag => entity.tags.includes(tag));
 

package/lib/modifier/patchModifier.js

@@ -9,6 +9,10 @@ module.exports = ({ utils, actions }) =>
       difference
     );
 
+    modifier.properties = {
+      ...(modifier.properties || {}),
+    };
+
     modifier._computed.description = actions.createDescription({
       modifier: {
         ...modifier,

package/lib/order/calculate.js

@@ -126,8 +126,9 @@ module.exports = ({
           !itemActions.isPaid(item) &&
           item.modifiers.some(
             mod =>
-              modifierActions.isPercentage(mod) ||
-              !modifierActions.isDirect(mod)
+              modifierActions.isValid(mod) &&
+              (modifierActions.isPercentage(mod) ||
+                !modifierActions.isDirect(mod))
           )
       );
 
@@ -153,13 +154,56 @@ module.exports = ({
     const pieceCount = calculatedItems.length
       ? itemActions.getItemsTotalPieces(calculatedItems)
       : order.properties.pieceCount;
+
+    calculatedItems = calculatedItems.map(calcItem => {
+      let itemTotalPaid = calcItem.totalPaid;
+
+      const amountToPay = itemActions.getAmountToPayById({
+        amountsToPay: opts.amountsToPay,
+        id: calcItem._id,
+      });
+      if (amountToPay) {
+        itemTotalPaid = utils.math.add(itemTotalPaid, amountToPay);
+      }
+      return {
+        ...calcItem,
+        totalPaid: itemTotalPaid,
+        status: {
+          ...calcItem.status,
+          paid: itemActions.getPaidStatus({
+            status: calcItem.status,
+            total: calcItem.total,
+            totalPaid: itemTotalPaid,
+          }),
+        },
+      };
+    });
+
+    const totalPaid = itemActions.getItemsTotalPaid({
+      orderItems: calculatedItems,
+    });
+
+    const picked = actions.getPickedStatus({ items: calculatedItems });
+    const paid = actions.getPaidStatus({
+      items: calculatedItems,
+      status: order.status,
+      total,
+      totalPaid,
+    });
+
     return {
       ...order,
       subTotals,
       subTotal,
       total,
       items: calculatedItems,
-      status: actions.getUpdatedStatus({ status: order.status, total }),
+      status: {
+        ...(order.status || {}),
+        picked,
+        paid,
+        order: picked && paid ? 'closed' : 'open',
+      },
+      totalPaid,
       properties: {
         ...(order.properties || {}),
         pieceCount,

package/lib/order/calculateWithPayment.js

@@ -0,0 +1,36 @@
+module.exports = ({ actions, itemActions }) =>
+  function calculateWithPayment({
+    order,
+    paymentOrderItems,
+    paymentMethod,
+    paymentType,
+    isPrepay,
+    paymentId,
+  }) {
+    const amountsToPay = paymentOrderItems
+      .filter(each => order.items.find(item => each.orderItemId === item._id))
+      .reduce(
+        (prevVal, val) => ({
+          ...prevVal,
+          [val.orderItemId]: val.amount,
+        }),
+        {}
+      );
+
+    return actions.calculate(
+      {
+        ...order,
+        items: order.items.map(orderItem =>
+          itemActions.applyPayment({ paymentOrderItems, orderItem })
+        ),
+      },
+      {
+        paymentMethod,
+        paymentType,
+        isPrepay,
+        amountsToPay,
+        lockPaymentModifiers: true,
+        paymentId,
+      }
+    );
+  };

package/lib/order/getPaidStatus.js

@@ -0,0 +1,35 @@
+module.exports = ({ actions, settings, _ }) =>
+  function getPaidStatus({
+    items,
+    status,
+    total: totalParam,
+    totalPaid: totalPaidParam,
+  }) {
+    const localStatus = status || {};
+
+    const total = totalParam || 0;
+    const totalPaid = totalPaidParam || 0;
+
+    const areAllItemsPaid = items.every(
+      item => !!_.get(item, 'status.paid.value', false)
+    );
+
+    if (areAllItemsPaid) return true;
+
+    if (
+      actions.isPaid({ order: { status: localStatus } }) &&
+      total !== 0 &&
+      total > totalPaid
+    ) {
+      return false;
+    }
+
+    if (!settings || !settings.order || !settings.order.autoMarkAsPaid)
+      return !!localStatus.paid;
+
+    if (!actions.isPaid({ order: { status: localStatus } }) && total === 0) {
+      return true;
+    }
+
+    return !!localStatus.paid;
+  };

package/lib/order/getPickedStatus.js

@@ -0,0 +1,4 @@
+module.exports = ({ _ }) =>
+  function getPickedStatus({ items }) {
+    return items.every(item => !!_.get(item, 'status.picked.value', false));
+  };

package/lib/order/index.js

@@ -90,13 +90,15 @@ const splitItems = require('./splitItems');
 const getNewItems = require('./getNewItems');
 const mapSubOrders = require('./mapSubOrders');
 const isPaid = require('./isPaid');
-const getUpdatedStatus = require('./getUpdatedStatus');
+const getPaidStatus = require('./getPaidStatus');
 const setPieces = require('./setPieces');
 const copyItemToParents = require('./copyItemToParents');
 const getItemsWithParents = require('./getItemsWithParents');
 const addModifiersToParentItem = require('./addModifiersToParentItem');
 const removeEmptyNotes = require('./removeEmptyNotes');
 const getTaxes = require('./getTaxes');
+const getPickedStatus = require('./getPickedStatus');
+const calculateWithPayment = require('./calculateWithPayment');
 
 const orderActions = (deps = {}) => {
   const actions = {};
@@ -198,13 +200,15 @@ const orderActions = (deps = {}) => {
     getNewItems: getNewItems(innerDeps),
     mapSubOrders: mapSubOrders(innerDeps),
     isPaid: isPaid(innerDeps),
-    getUpdatedStatus: getUpdatedStatus(innerDeps),
+    getPaidStatus: getPaidStatus(innerDeps),
     setPieces: setPieces(innerDeps),
     copyItemToParents: copyItemToParents(innerDeps),
     getItemsWithParents: getItemsWithParents(innerDeps),
     addModifiersToParentItem: addModifiersToParentItem(innerDeps),
     removeEmptyNotes: removeEmptyNotes(innerDeps),
     getTaxes: getTaxes(innerDeps),
+    getPickedStatus: getPickedStatus(innerDeps),
+    calculateWithPayment: calculateWithPayment(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.136",
+  "version": "1.0.138",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -31,13 +31,14 @@
     "test:overrideModifiers": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/overrideModifiers.test.js",
     "test:addItemModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/addItemModifier.test.js",
     "test:payment": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/payment.test.js",
+    "test:orderPaymentModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/order-payment-modifier.test.js",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@darkpos/utils": "^1.0.13",
+    "@darkpos/utils": "^1.0.14",
     "crypto-js": "^4.2.0",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.34"
@@ -52,5 +53,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "9e4e2bf0729c8be75468d488d0199d2d74ec0139"
+  "gitHead": "95d90c9dccaf934d7d4a8adc8e46115e90b81664"
 }

package/lib/item/getUpdatedStatus.js

@@ -1,17 +0,0 @@
-module.exports = ({ actions, settings }) =>
-  function getUpdatedStatus({ status, total }) {
-    if (!settings || !settings.order || !settings.order.autoMarkAsPaid)
-      return status;
-
-    const localStatus = status || {};
-
-    if (actions.isPaid({ item: { status: localStatus } }) && total !== 0) {
-      return { ...localStatus, paid: undefined };
-    }
-
-    if (!actions.isPaid({ item: { status: localStatus } }) && total === 0) {
-      return { ...localStatus, paid: { value: true, date: new Date() } };
-    }
-
-    return localStatus;
-  };

package/lib/order/getUpdatedStatus.js

@@ -1,17 +0,0 @@
-module.exports = ({ actions, settings }) =>
-  function getUpdatedStatus({ status, total }) {
-    if (!settings || !settings.order || !settings.order.autoMarkAsPaid)
-      return status;
-
-    const localStatus = status || {};
-
-    if (actions.isPaid({ order: { status: localStatus } }) && total !== 0) {
-      return { ...localStatus, paid: false };
-    }
-
-    if (!actions.isPaid({ order: { status: localStatus } }) && total === 0) {
-      return { ...localStatus, paid: true };
-    }
-
-    return localStatus;
-  };