@darkpos/pricing 1.0.86 → 1.0.88

package/__TEST__/order/order.test.js

@@ -3891,4 +3891,78 @@ describe('Order actions', () => {
       discount: -1.09,
     });
   });
+
+  test('Mark paid status true if total is 0 and autoMarkAsPaid: true', () => {
+    const orderItem = {
+      price: 0,
+      quantity: 1,
+    };
+    const order = { items: [orderItem] };
+    const pricing = usePricing({
+      store: { _settings: { order: { autoMarkAsPaid: true } } },
+    });
+    const newOrder = pricing.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 0);
+    expect(newOrder.status).toMatchObject({ fullyPaid: true });
+    expect(newOrder.items[0].total).toBe(0);
+    expect(newOrder.items[0].status).toMatchObject({
+      paid: {
+        value: true,
+      },
+    });
+
+    const newOrder2 = pricingService.order.calculate(order);
+
+    expect(newOrder2).toHaveProperty('total', 0);
+    expect(newOrder2.status).toBe(undefined);
+    expect(newOrder2.items[0].total).toBe(0);
+    expect(newOrder2.items[0].status).toBe(undefined);
+  });
+
+  test('Unset paid status if total is > 0  and autoMarkAsPaid: true', () => {
+    const orderItem = {
+      price: 25,
+      quantity: 1,
+      status: {
+        paid: { value: true, date: new Date() },
+      },
+    };
+    const pricing = usePricing({
+      store: { _settings: { order: { autoMarkAsPaid: true } } },
+    });
+    const order = { items: [orderItem], status: { fullyPaid: true } };
+    const newOrder = pricing.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 25);
+    expect(newOrder.status).toMatchObject({ fullyPaid: false });
+    expect(newOrder.items[0].total).toBe(25);
+    expect(newOrder.items[0].status).toMatchObject({
+      paid: undefined,
+    });
+
+    const newOrder2 = pricingService.order.calculate(order);
+
+    expect(newOrder2).toHaveProperty('total', 25);
+    expect(newOrder2.status).toMatchObject({ fullyPaid: true });
+    expect(newOrder2.items[0].total).toBe(25);
+    expect(newOrder2.items[0].status).toMatchObject({ paid: { value: true } });
+  });
+
+  test('Dont update status if not needed', () => {
+    const orderItem = {
+      price: 25,
+      quantity: 1,
+    };
+    const pricing = usePricing({
+      store: { _settings: { order: { autoMarkAsPaid: true } } },
+    });
+    const order = { items: [orderItem] };
+    const newOrder = pricing.order.calculate(order);
+
+    expect(newOrder).toHaveProperty('total', 25);
+    expect(newOrder.status).toMatchObject({});
+    expect(newOrder.items[0].total).toBe(25);
+    expect(newOrder.items[0].status).toMatchObject({});
+  });
 });

package/lib/item/calculate.js

@@ -189,6 +189,7 @@ module.exports = ({ _, utils, actions, modifierActions }) => {
       modifiers: [...modifiersToNotCompute, ...modifiers],
       subTotals,
       total,
+      status: actions.getUpdatedStatus({ status: item.status, total }),
     };
   };
 

package/lib/item/getUpdatedStatus.js

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

package/lib/item/index.js

@@ -62,6 +62,7 @@ const getSubtotal = require('./getSubtotal');
 const isSomeTagsMatch = require('./isSomeTagsMatch');
 const getTotals = require('./getTotals');
 const patchItem = require('./patchItem');
+const getUpdatedStatus = require('./getUpdatedStatus');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -137,6 +138,7 @@ const itemActions = (deps = {}) => {
     isSomeTagsMatch: isSomeTagsMatch(innerDeps),
     getTotals: getTotals(innerDeps),
     patchItem: patchItem(innerDeps),
+    getUpdatedStatus: getUpdatedStatus(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/item/isFullyPaid.js

@@ -2,5 +2,5 @@ module.exports = () =>
   function isFullyPaid({ item }) {
     if (!item) return false;
 
-    return item.status && item.status.paid.value;
+    return item.status && item.status.paid && item.status.paid.value;
   };

package/lib/order/calculate.js

@@ -150,9 +150,15 @@ module.exports = ({
       if (difference > 0) addToItemTotal(difference);
     }
 
+    const { subTotals, subTotal, total } =
+      itemActions.getItemsTotals(calculatedItems);
+
     return {
       ...order,
-      ...itemActions.getItemsTotals(calculatedItems),
+      subTotals,
+      subTotal,
+      total,
       items: calculatedItems,
+      status: actions.getUpdatedStatus({ status: order.status, total }),
     };
   };

package/lib/order/createSubOrder.js

@@ -1,24 +1,37 @@
-module.exports = ({ actions }) =>
-  function createSubOrder({ parentOrder, items }) {
+module.exports = ({ actions, settings, _ }) => {
+  const orderSettings = _.get(settings, 'order');
+
+  return function createSubOrder({ parentOrder, items }) {
+    // exclude props from order
+    const {
+      _id,
+      displayId,
+      parentId,
+      isParent,
+      subTotal,
+      discount,
+      fee,
+      tax,
+      total,
+      items: parentItems,
+      modifiers,
+      status,
+      ...rest
+    } = parentOrder;
+
     const subOrder = actions.create({
-      // ...order,
-      displayId: null,
-      discount: 0,
-      tax: 0,
-      totalPaid: 0,
-      total: 0,
+      ...rest,
+      parentId: orderSettings.allowSuborder ? _id : null,
       status: {
         order: 'open',
-        delivery: parentOrder.status.delivery,
-        detailed: parentOrder.status.detailed,
+        delivery: status.delivery || false,
+        detailed: status.detailed || false,
         fullyPaid: false,
         fullyPicked: false,
       },
-      parentId: parentOrder._id,
       items,
-      modifiers: [],
-      notes: parentOrder.notes || [],
     });
 
     return subOrder;
   };
+};

package/lib/order/getUpdatedStatus.js

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

package/lib/order/index.js

@@ -91,6 +91,8 @@ const resetItem = require('./resetItem');
 const splitItems = require('./splitItems');
 const getNewItems = require('./getNewItems');
 const mapSubOrders = require('./mapSubOrders');
+const isFullyPaid = require('./isFullyPaid');
+const getUpdatedStatus = require('./getUpdatedStatus');
 
 const orderActions = (deps = {}) => {
   const actions = {};
@@ -193,6 +195,8 @@ const orderActions = (deps = {}) => {
     splitItems: splitItems(innerDeps),
     getNewItems: getNewItems(innerDeps),
     mapSubOrders: mapSubOrders(innerDeps),
+    isFullyPaid: isFullyPaid(innerDeps),
+    getUpdatedStatus: getUpdatedStatus(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/order/isFullyPaid.js

@@ -0,0 +1,6 @@
+module.exports = () =>
+  function isFullyPaid({ order }) {
+    if (!order) return false;
+
+    return order.status && order.status.fullyPaid;
+  };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.86",
+  "version": "1.0.88",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -51,5 +51,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "feab9f47beb2312e3b82bae4eb2ec63f18d64be3"
+  "gitHead": "3090bddbb5b0651296b29acf011c2bfe8db6d42d"
 }