@darkpos/pricing 1.0.87 → 1.0.89

package/__TEST__/mocks/setPieces/ordersMock.js

@@ -0,0 +1,107 @@
+const orders = [
+  {
+    end: {
+      requestDate: '2025-05-07T20:28:00Z',
+      actualDate: '',
+      location: {
+        name: 'PPSOL',
+        locationType: 'store',
+        storeId: '67b78ebcb1f0420011470f2b',
+      },
+    },
+    properties: {
+      pieceCount: '',
+      pieces: [
+        {
+          departmentId: '67fea241af24e570c032b33f',
+          name: 'Dry Cleaning',
+          code: 'D',
+          tagSize: 'small',
+          count: '',
+        },
+        {
+          departmentId: '67fea241af24e570c032b340',
+          name: 'Laundry',
+          code: 'L',
+          tagSize: 'small',
+          count: '',
+        },
+      ],
+      notify: {},
+      print: ['quick-order-receipt'],
+    },
+    customer: {
+      _id: '67f6dedcf5384804f5a42e43',
+    },
+    status: {
+      order: 'open',
+      detailed: false,
+    },
+    subTotal: 0,
+    subTotals: {},
+    total: 0,
+    tax: 0,
+    start: {
+      requestDate: '2025-05-07T19:28',
+      actualDate: '2025-05-07T19:28',
+      location: {
+        name: 'PPSOL',
+        locationType: 'store',
+        storeId: '67b78ebcb1f0420011470f2b',
+      },
+    },
+  },
+  {
+    end: {
+      requestDate: '2025-05-07T20:30:00Z',
+      actualDate: '',
+      location: {
+        name: 'Sunshine Cleaners',
+        locationType: 'store',
+        storeId: '67e1c09c05b96100127280a8',
+      },
+    },
+    properties: {
+      pieceCount: '10',
+      pieces: [
+        {
+          departmentId: '67fea241af24e570c032b33f',
+          name: 'Dry Cleaning',
+          code: 'D',
+          tagSize: 'small',
+          count: '5',
+        },
+        {
+          departmentId: '67fea241af24e570c032b340',
+          name: 'Laundry',
+          code: 'L',
+          tagSize: 'small',
+          count: '5',
+        },
+      ],
+      notify: {},
+      print: ['quick-order-receipt'],
+    },
+    customer: {
+      _id: '67edaa1721d00ec86d54071e',
+    },
+    status: {
+      order: 'open',
+      detailed: false,
+    },
+    subTotal: 0,
+    subTotals: {},
+    total: 0,
+    tax: 0,
+    start: {
+      requestDate: '2025-05-07T19:30',
+      actualDate: '2025-05-07T19:30',
+      location: {
+        name: 'Sunshine Cleaners',
+        locationType: 'store',
+        storeId: '67e1c09c05b96100127280a8',
+      },
+    },
+  },
+];
+module.exports = orders;

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/__TEST__/order/setPieces.test.js

@@ -0,0 +1,51 @@
+const utils = require('@darkpos/utils');
+const usePricing = require('../../index');
+const mockStores = require('../mocks/stores');
+const orders = require('../mocks/setPieces/ordersMock');
+
+const session = {
+  store: mockStores[0],
+};
+
+const pricingService = usePricing(session);
+
+describe('set pieces', () => {
+  test('Normalize pieces that are not numbers', () => {
+    const order = orders[0];
+
+    const newOrder = pricingService.order.setPieces({ order });
+    expect(newOrder.properties.pieceCount).toBe(0);
+    newOrder.properties.pieces.map(item => expect(item.count).toBe(0));
+  });
+
+  test('Normalize pieces that are strings into numbers', () => {
+    const order = orders[1];
+
+    const newOrder = pricingService.order.setPieces({ order });
+    expect(newOrder.properties.pieceCount).toBe(10);
+    expect(typeof newOrder.properties.pieceCount).toBe('number');
+    newOrder.properties.pieces.map(item => {
+      expect(item.count).toBe(5);
+      expect(typeof item.count).toBe('number');
+      return {};
+    });
+  });
+  test('utils helpers to toNumberOrZero', () => {
+    const number1 = 0;
+    const number2 = '';
+    const number3 = NaN;
+    const number4 = 'abc';
+    const number5 = 10;
+
+    const value1 = utils.helpers.toNumberOrZero(number1);
+    const value2 = utils.helpers.toNumberOrZero(number2);
+    const value3 = utils.helpers.toNumberOrZero(number3);
+    const value4 = utils.helpers.toNumberOrZero(number4);
+    const value5 = utils.helpers.toNumberOrZero(number5);
+    expect(value1).toBe(0);
+    expect(value2).toBe(0);
+    expect(value3).toBe(0);
+    expect(value4).toBe(0);
+    expect(value5).toBe(10);
+  });
+});

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/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,9 @@ 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 setPieces = require('./setPieces');
 
 const orderActions = (deps = {}) => {
   const actions = {};
@@ -193,6 +196,9 @@ const orderActions = (deps = {}) => {
     splitItems: splitItems(innerDeps),
     getNewItems: getNewItems(innerDeps),
     mapSubOrders: mapSubOrders(innerDeps),
+    isFullyPaid: isFullyPaid(innerDeps),
+    getUpdatedStatus: getUpdatedStatus(innerDeps),
+    setPieces: setPieces(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/lib/order/setPieces.js

@@ -0,0 +1,24 @@
+module.exports = ({ utils }) => {
+  const { helpers } = utils;
+  return function setPieces({ order }) {
+    const nextOrder = {
+      ...order,
+      properties: {
+        ...(order.properties || {}),
+      },
+    };
+
+    nextOrder.properties.pieceCount = helpers.toNumberOrZero(
+      nextOrder.properties.pieceCount
+    );
+
+    if (Array.isArray(nextOrder.properties.pieces)) {
+      nextOrder.properties.pieces = nextOrder.properties.pieces.map(pc => ({
+        ...pc,
+        count: helpers.toNumberOrZero(pc.count),
+      }));
+    }
+
+    return nextOrder;
+  };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.87",
+  "version": "1.0.89",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@darkpos/utils": "^1.0.12",
+    "@darkpos/utils": "^1.0.13",
     "crypto-js": "^4.2.0",
     "lodash": "^4.17.21",
     "moment-timezone": "^0.5.34"
@@ -51,5 +51,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "db2f94064217c3854f11ea7da9e4e2793ee5a387"
+  "gitHead": "94c96f8e898bff82463d49bfb39f27ef0e70909e"
 }