@darkpos/pricing 1.0.139 → 1.0.140

package/__TEST__/order/order.test.js

@@ -3808,6 +3808,27 @@ describe('Order actions', () => {
     expect(newOrder2.items[0].status).toMatchObject({ paid: { value: true } });
   });
 
+  test('Mark paid status true if totalPaid is greater than total', () => {
+    const orderItem = {
+      price: 25,
+      quantity: 1,
+      status: {},
+      totalPaid: 30,
+    };
+    const pricing = usePricing({
+      store: { _settings: { order: { autoMarkAsPaid: false } } },
+    });
+    const order = { items: [orderItem], status: {} };
+    const newOrder = pricing.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 25);
+    expect(newOrder).toHaveProperty('totalPaid', 30);
+    expect(newOrder.status).toMatchObject({ paid: true });
+    expect(newOrder.items[0].status).toMatchObject({
+      paid: { value: true },
+    });
+  });
+
   test('Dont update status if not needed', () => {
     const orderItem = {
       price: 25,

package/lib/item/getOverpaidAmount.js

@@ -0,0 +1,7 @@
+module.exports = ({ utils }) =>
+  function getOverpaidAmount({ item }) {
+    const total = Number(item.total || 0);
+    const totalPaid = Number(item.totalPaid || 0);
+
+    return utils.math.sub(totalPaid, total);
+  };

package/lib/item/getPaidStatus.js

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

package/lib/item/index.js

@@ -82,6 +82,8 @@ const getTaxes = require('./getTaxes');
 const getAmountToPayById = require('./getAmountToPayById');
 const applyPayment = require('./applyPayment');
 const getBalanceForPaymentModifier = require('./getBalanceForPaymentModifier');
+const isOverpaid = require('./isOverpaid');
+const getOverpaidAmount = require('./getOverpaidAmount');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -177,6 +179,8 @@ const itemActions = (deps = {}) => {
     getAmountToPayById: getAmountToPayById(innerDeps),
     applyPayment: applyPayment(innerDeps),
     getBalanceForPaymentModifier: getBalanceForPaymentModifier(innerDeps),
+    isOverpaid: isOverpaid(innerDeps),
+    getOverpaidAmount: getOverpaidAmount(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/isOverpaid.js

@@ -0,0 +1,7 @@
+module.exports = () =>
+  function isOverpaid({ item }) {
+    const total = Number(item.total || 0);
+    const totalPaid = Number(item.totalPaid || 0);
+
+    return totalPaid > total;
+  };

package/lib/order/getOverpaidAmount.js

@@ -0,0 +1,8 @@
+module.exports = ({ utils }) =>
+  function getOverPaidAmount({ order }) {
+    if (!order) return 0;
+    const total = Number(order.total || 0);
+    const totalPaid = Number(order.totalPaid || 0);
+
+    return utils.math.sub(totalPaid, total);
+  };

package/lib/order/index.js

@@ -100,6 +100,7 @@ const removeEmptyNotes = require('./removeEmptyNotes');
 const getTaxes = require('./getTaxes');
 const getPickedStatus = require('./getPickedStatus');
 const calculateWithPayment = require('./calculateWithPayment');
+const getOverpaidAmount = require('./getOverpaidAmount');
 
 const orderActions = (deps = {}) => {
   const actions = {};
@@ -211,6 +212,7 @@ const orderActions = (deps = {}) => {
     getTaxes: getTaxes(innerDeps),
     getPickedStatus: getPickedStatus(innerDeps),
     calculateWithPayment: calculateWithPayment(innerDeps),
+    getOverpaidAmount: getOverpaidAmount(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.139",
+  "version": "1.0.140",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -53,5 +53,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "643797505f915f1c4562c19e59a82dd98ae888ec"
+  "gitHead": "a679a827cb2a83762ae4ec5ce76ae5416b654a48"
 }