@darkpos/pricing 1.0.133 → 1.0.134

package/__TEST__/mocks/partially-paid/order-partially-paid.json

@@ -904,8 +904,8 @@
     "kitchen": "open",
     "delivery": "none",
     "detailed": true,
-    "fullyPaid": false,
-    "fullyPicked": true,
+    "paid": false,
+    "picked": true,
     "invoice": "partial"
   },
   "attributes": [],

package/__TEST__/order/order-payment-modifier.test.js

@@ -559,45 +559,45 @@ describe('Order actions', () => {
     expect(itemBalance).toEqual(1.25);
 
     // paying with a paymenttype that doesn match the payment modifiers
-    const fullyPaidOrderWithCredit = pricingService.order.calculate(testOrder, {
+    const paidOrderWithCredit = pricingService.order.calculate(testOrder, {
       paymentType: 'credit',
       amountToPay: 1.25,
       lockPaymentModifiers: true,
     });
-    fullyPaidOrderWithCredit.items[0].totalPaid += 1.25;
-    fullyPaidOrderWithCredit.totalPaid += 1.25;
+    paidOrderWithCredit.items[0].totalPaid += 1.25;
+    paidOrderWithCredit.totalPaid += 1.25;
 
     const orderBalanceWithCredit = pricingService.order.getOrdersBalance({
-      orders: [fullyPaidOrderWithCredit],
+      orders: [paidOrderWithCredit],
     });
     const itemBalanceWithCredit = pricingService.item.getItemsBalance({
-      items: fullyPaidOrderWithCredit.items,
+      items: paidOrderWithCredit.items,
     });
 
-    expect(fullyPaidOrderWithCredit).toHaveProperty('total', 11.59);
-    expect(fullyPaidOrderWithCredit).toHaveProperty('subTotal', 13.5);
-    expect(fullyPaidOrderWithCredit).toHaveProperty('subTotals', {
+    expect(paidOrderWithCredit).toHaveProperty('total', 11.59);
+    expect(paidOrderWithCredit).toHaveProperty('subTotal', 13.5);
+    expect(paidOrderWithCredit).toHaveProperty('subTotals', {
       discount: -2.585,
       fee: 0.675,
     });
 
-    expect(fullyPaidOrderWithCredit.items[0].modifiers).toHaveLength(3);
+    expect(paidOrderWithCredit.items[0].modifiers).toHaveLength(3);
 
-    expect(fullyPaidOrderWithCredit.items[0].modifiers[0]._computed).toEqual(
+    expect(paidOrderWithCredit.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
         description: 'CASH 20% DISCOUNT',
       })
     );
 
-    expect(fullyPaidOrderWithCredit.items[0].modifiers[1]._computed).toEqual(
+    expect(paidOrderWithCredit.items[0].modifiers[1]._computed).toEqual(
       expect.objectContaining({
         amount: 0.675,
         description: '5% FEE ($0.68)',
       })
     );
 
-    expect(fullyPaidOrderWithCredit.items[0].modifiers[2]._computed).toEqual(
+    expect(paidOrderWithCredit.items[0].modifiers[2]._computed).toEqual(
       expect.objectContaining({
         amount: -2.585,
         description: '$2.59 discount (-$2.59)',
@@ -608,52 +608,52 @@ describe('Order actions', () => {
     expect(itemBalanceWithCredit).toEqual(0);
 
     // paying with a paymenttype that doesn match the payment modifiers
-    const fullyPaidOrderWithCash = pricingService.order.calculate(testOrder, {
+    const paidOrderWithCash = pricingService.order.calculate(testOrder, {
       paymentType: 'cash',
       amountToPay: 1,
       lockPaymentModifiers: true,
     });
-    fullyPaidOrderWithCash.items[0].totalPaid += 1;
-    fullyPaidOrderWithCash.totalPaid += 1;
+    paidOrderWithCash.items[0].totalPaid += 1;
+    paidOrderWithCash.totalPaid += 1;
 
     const orderBalanceWithCash = pricingService.order.getOrdersBalance({
-      orders: [fullyPaidOrderWithCash],
+      orders: [paidOrderWithCash],
     });
     const itemBalanceWithCash = pricingService.item.getItemsBalance({
-      items: fullyPaidOrderWithCash.items,
+      items: paidOrderWithCash.items,
     });
 
-    expect(fullyPaidOrderWithCash).toHaveProperty('total', 11.34);
-    expect(fullyPaidOrderWithCash).toHaveProperty('subTotal', 13.5);
-    expect(fullyPaidOrderWithCash).toHaveProperty('subTotals', {
+    expect(paidOrderWithCash).toHaveProperty('total', 11.34);
+    expect(paidOrderWithCash).toHaveProperty('subTotal', 13.5);
+    expect(paidOrderWithCash).toHaveProperty('subTotals', {
       discount: -2.835,
       fee: 0.675,
     });
 
-    expect(fullyPaidOrderWithCash.items[0].modifiers).toHaveLength(4);
+    expect(paidOrderWithCash.items[0].modifiers).toHaveLength(4);
 
-    expect(fullyPaidOrderWithCash.items[0].modifiers[0]._computed).toEqual(
+    expect(paidOrderWithCash.items[0].modifiers[0]._computed).toEqual(
       expect.objectContaining({
         amount: 0,
         description: 'CASH 20% DISCOUNT',
       })
     );
 
-    expect(fullyPaidOrderWithCash.items[0].modifiers[1]._computed).toEqual(
+    expect(paidOrderWithCash.items[0].modifiers[1]._computed).toEqual(
       expect.objectContaining({
         amount: 0.675,
         description: '5% FEE ($0.68)',
       })
     );
 
-    expect(fullyPaidOrderWithCash.items[0].modifiers[2]._computed).toEqual(
+    expect(paidOrderWithCash.items[0].modifiers[2]._computed).toEqual(
       expect.objectContaining({
         amount: -0.25,
         description: '$0.25 discount (-$0.25)',
       })
     );
 
-    expect(fullyPaidOrderWithCash.items[0].modifiers[3]._computed).toEqual(
+    expect(paidOrderWithCash.items[0].modifiers[3]._computed).toEqual(
       expect.objectContaining({
         amount: -2.585,
         description: '$2.59 discount (-$2.59)',

package/__TEST__/order/order.test.js

@@ -3743,7 +3743,7 @@ describe('Order actions', () => {
     const newOrder = pricing.order.calculate(order);
 
     expect(newOrder).toHaveProperty('total', 0);
-    expect(newOrder.status).toMatchObject({ fullyPaid: true });
+    expect(newOrder.status).toMatchObject({ paid: true });
     expect(newOrder.items[0].total).toBe(0);
     expect(newOrder.items[0].status).toMatchObject({
       paid: {
@@ -3770,11 +3770,11 @@ describe('Order actions', () => {
     const pricing = usePricing({
       store: { _settings: { order: { autoMarkAsPaid: true } } },
     });
-    const order = { items: [orderItem], status: { fullyPaid: true } };
+    const order = { items: [orderItem], status: { paid: true } };
     const newOrder = pricing.order.calculate(order);
 
     expect(newOrder).toHaveProperty('total', 25);
-    expect(newOrder.status).toMatchObject({ fullyPaid: false });
+    expect(newOrder.status).toMatchObject({ paid: false });
     expect(newOrder.items[0].total).toBe(25);
     expect(newOrder.items[0].status).toMatchObject({
       paid: undefined,
@@ -3783,7 +3783,7 @@ describe('Order actions', () => {
     const newOrder2 = pricingService.order.calculate(order);
 
     expect(newOrder2).toHaveProperty('total', 25);
-    expect(newOrder2.status).toMatchObject({ fullyPaid: true });
+    expect(newOrder2.status).toMatchObject({ paid: true });
     expect(newOrder2.items[0].total).toBe(25);
     expect(newOrder2.items[0].status).toMatchObject({ paid: { value: true } });
   });
@@ -3933,4 +3933,37 @@ describe('Order actions', () => {
     expect(parentCount).toBe(1);
     expect(result).toEqual(items);
   });
+
+  test('Should remove notes with no message, file, or url', () => {
+    const order = {
+      notes: [
+        { message: '', file: '', url: '' }, // empty
+        { message: 'Hello', file: '', url: '' }, // valid
+        { message: '', file: 'a.pdf', url: '' }, // valid
+        { message: '', file: '', url: 'http://x.com' }, // valid
+      ],
+    };
+
+    const { removeEmptyNotes } = pricingService.order;
+    const result = removeEmptyNotes(order);
+
+    expect(result.notes.length).toBe(3);
+    expect(result.notes).toEqual([
+      { message: 'Hello', file: '', url: '' },
+      { message: '', file: 'a.pdf', url: '' },
+      { message: '', file: '', url: 'http://x.com' },
+    ]);
+  });
+
+  test('Should return order unchanged if notes is missing or not an array', () => {
+    const { removeEmptyNotes } = pricingService.order;
+
+    const order1 = {};
+    const order2 = { notes: null };
+    const order3 = { notes: 'invalid' };
+
+    expect(removeEmptyNotes(order1)).toEqual(order1);
+    expect(removeEmptyNotes(order2)).toEqual(order2);
+    expect(removeEmptyNotes(order3)).toEqual(order3);
+  });
 });

package/__TEST__/order/pickEndDate.test.js

@@ -5,7 +5,7 @@ const getDefaultSettings = schedules => ({
   store: {
     _settings: {
       schedule: {
-        close: [
+        closed: [
           {
             date: '2024-09-03',
           },

package/__TEST__/order/unpick.order.test.js

@@ -14,9 +14,9 @@ describe('Order actions - unpick order', () => {
       quantity: 2,
       status: { picked: { value: true, date: new Date() } },
     };
-    const order = { items: [orderItem], status: { fullyPicked: true } };
+    const order = { items: [orderItem], status: { picked: true } };
     const newOrder = pricingService.order.unpickOrder(order);
-    expect(newOrder.status.fullyPicked).toBe(false);
+    expect(newOrder.status.picked).toBe(false);
     newOrder.items.map(item =>
       expect(item.status.picked).toStrictEqual({ value: false, date: '' })
     );
@@ -28,7 +28,7 @@ describe('Order actions - unpick order', () => {
       status: { picked: { value: true, date: new Date() } },
     };
     const order = {
-      status: { fullyPicked: true },
+      status: { picked: true },
       items: [
         orderItem,
         orderItem,
@@ -43,7 +43,7 @@ describe('Order actions - unpick order', () => {
       ],
     };
     const newOrder = pricingService.order.unpickOrder(order);
-    expect(newOrder.status.fullyPicked).toBe(false);
+    expect(newOrder.status.picked).toBe(false);
     newOrder.items.map(item =>
       expect(item.status.picked).toStrictEqual({ value: false, date: '' })
     );
@@ -61,10 +61,10 @@ describe('Order actions - unpick order', () => {
     };
     const order = {
       items: [orderItem, orderItemNotPicked],
-      status: { fullyPicked: true },
+      status: { picked: true },
     };
     const newOrder = pricingService.order.unpickOrder(order);
-    expect(newOrder.status.fullyPicked).toBe(false);
+    expect(newOrder.status.picked).toBe(false);
     newOrder.items.map(item =>
       expect(item.status.picked).toStrictEqual({ value: false, date: '' })
     );
@@ -77,18 +77,18 @@ describe('Order actions - unpick order', () => {
       status: { picked: { value: true, date: new Date() } },
     };
 
-    const subOrder = { items: [orderItem], status: { fullyPicked: true } };
+    const subOrder = { items: [orderItem], status: { picked: true } };
     const order = {
       items: [orderItem],
       orders: [subOrder],
-      status: { fullyPicked: true },
+      status: { picked: true },
     };
     const newOrder = pricingService.order.unpickOrder(order);
     newOrder.items.map(item =>
       expect(item.status.picked).toStrictEqual({ value: false, date: '' })
     );
     newOrder.orders.map(_order => {
-      expect(_order.status.fullyPicked).toBe(false);
+      expect(_order.status.picked).toBe(false);
       return _order.items.map(item =>
         expect(item.status.picked).toStrictEqual({ value: false, date: '' })
       );

package/lib/constants/Status/index.js

@@ -2,13 +2,13 @@ const Order = Object.freeze({
   OPEN: 'open',
   HOLD: 'hold',
   VOID: 'void',
-  CLOSED: 'close',
+  CLOSED: 'closed',
 });
 
 const Invoice = Object.freeze({
   PARTIAL: 'partial',
   PENDING: 'pending',
-  CLOSED: 'close',
+  CLOSED: 'closed',
 });
 
 const Kitchen = Object.freeze({

package/lib/item/adjustCreditModifiersDifference.js

@@ -5,7 +5,7 @@ module.exports = ({ utils, actions, modifierActions }) => {
     const selectedSubItemIndex = subItems.findIndex(
       subItem =>
         modifierActions.hasCreditModifier(subItem.modifiers) &&
-        !actions.isFullyPaid(subItem) &&
+        !actions.isPaid(subItem) &&
         subItem.total > difference
     );
 

package/lib/item/adjustFixedModifiersDifference.js

@@ -5,7 +5,7 @@ module.exports = ({ utils, actions, modifierActions, _ }) => {
     const selectedSubItemIndex = subItems.findIndex(
       subItem =>
         modifierActions.hasFixedModifier(subItem.modifiers) &&
-        !actions.isFullyPaid(subItem) &&
+        !actions.isPaid(subItem) &&
         subItem.total > difference
     );
 

package/lib/item/getUpdatedStatus.js

@@ -5,14 +5,11 @@ module.exports = ({ actions, settings }) =>
 
     const localStatus = status || {};
 
-    if (actions.isFullyPaid({ item: { status: localStatus } }) && total !== 0) {
+    if (actions.isPaid({ item: { status: localStatus } }) && total !== 0) {
       return { ...localStatus, paid: undefined };
     }
 
-    if (
-      !actions.isFullyPaid({ item: { status: localStatus } }) &&
-      total === 0
-    ) {
+    if (!actions.isPaid({ item: { status: localStatus } }) && total === 0) {
       return { ...localStatus, paid: { value: true, date: new Date() } };
     }
 

package/lib/item/index.js

@@ -29,7 +29,7 @@ const isRepairOnly = require('./isRepairOnly');
 const hasCreateSubscription = require('./hasCreateSubscription');
 const getItemModifiers = require('./getItemModifiers');
 const getItemsBalance = require('./getItemsBalance');
-const isFullyPaid = require('./isFullyPaid');
+const isPaid = require('./isPaid');
 const getTotalPrice = require('./getTotalPrice');
 const getItems = require('./getItems');
 const getAmounts = require('./getAmounts');
@@ -118,7 +118,7 @@ const itemActions = (deps = {}) => {
     hasCreateSubscription: hasCreateSubscription(innerDeps),
     getItemModifiers: getItemModifiers(innerDeps),
     getItemsBalance: getItemsBalance(innerDeps),
-    isFullyPaid: isFullyPaid(innerDeps),
+    isPaid: isPaid(innerDeps),
     getTotalPrice: getTotalPrice(innerDeps),
     getItems: getItems(innerDeps),
     getAmounts: getAmounts(innerDeps),

package/lib/item/{isFullyPaid.js → isPaid.js}

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

package/lib/order/calculate.js

@@ -123,7 +123,7 @@ module.exports = ({
 
       const itemIndex = calculatedItems.findIndex(
         item =>
-          !itemActions.isFullyPaid(item) &&
+          !itemActions.isPaid(item) &&
           item.modifiers.some(
             mod =>
               modifierActions.isPercentage(mod) ||

package/lib/order/createSubOrder.js

@@ -26,8 +26,8 @@ module.exports = ({ actions, settings, _ }) => {
         order: 'open',
         delivery: status.delivery || false,
         detailed: status.detailed || false,
-        fullyPaid: false,
-        fullyPicked: false,
+        paid: false,
+        picked: false,
       },
       items,
     });

package/lib/order/getUpdatedStatus.js

@@ -5,18 +5,12 @@ module.exports = ({ actions, settings }) =>
 
     const localStatus = status || {};
 
-    if (
-      actions.isFullyPaid({ order: { status: localStatus } }) &&
-      total !== 0
-    ) {
-      return { ...localStatus, fullyPaid: false };
+    if (actions.isPaid({ order: { status: localStatus } }) && total !== 0) {
+      return { ...localStatus, paid: false };
     }
 
-    if (
-      !actions.isFullyPaid({ order: { status: localStatus } }) &&
-      total === 0
-    ) {
-      return { ...localStatus, fullyPaid: true };
+    if (!actions.isPaid({ order: { status: localStatus } }) && total === 0) {
+      return { ...localStatus, paid: true };
     }
 
     return localStatus;

package/lib/order/index.js

@@ -89,12 +89,13 @@ const resetItem = require('./resetItem');
 const splitItems = require('./splitItems');
 const getNewItems = require('./getNewItems');
 const mapSubOrders = require('./mapSubOrders');
-const isFullyPaid = require('./isFullyPaid');
+const isPaid = require('./isPaid');
 const getUpdatedStatus = require('./getUpdatedStatus');
 const setPieces = require('./setPieces');
 const copyItemToParents = require('./copyItemToParents');
 const getItemsWithParents = require('./getItemsWithParents');
 const addModifiersToParentItem = require('./addModifiersToParentItem');
+const removeEmptyNotes = require('./removeEmptyNotes');
 
 const orderActions = (deps = {}) => {
   const actions = {};
@@ -195,12 +196,13 @@ const orderActions = (deps = {}) => {
     splitItems: splitItems(innerDeps),
     getNewItems: getNewItems(innerDeps),
     mapSubOrders: mapSubOrders(innerDeps),
-    isFullyPaid: isFullyPaid(innerDeps),
+    isPaid: isPaid(innerDeps),
     getUpdatedStatus: getUpdatedStatus(innerDeps),
     setPieces: setPieces(innerDeps),
     copyItemToParents: copyItemToParents(innerDeps),
     getItemsWithParents: getItemsWithParents(innerDeps),
     addModifiersToParentItem: addModifiersToParentItem(innerDeps),
+    removeEmptyNotes: removeEmptyNotes(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/order/isPaid.js

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

package/lib/order/removeEmptyNotes.js

@@ -0,0 +1,11 @@
+module.exports = () =>
+  function removeEmptyNotes(order) {
+    if (!order || !Array.isArray(order.notes)) return order;
+
+    return {
+      ...order,
+      notes: order.notes.filter(
+        note => !!note.message || !!note.file || !!note.url
+      ),
+    };
+  };

package/lib/order/unpick.js

@@ -6,8 +6,8 @@ module.exports = ({ itemActions }) =>
       const orderItems = [...(order.items || [])].map(item =>
         itemActions.unpickItem(item)
       );
-      if (nextOrder.status && nextOrder.status.fullyPicked) {
-        nextOrder.status.fullyPicked = false;
+      if (nextOrder.status && nextOrder.status.picked) {
+        nextOrder.status.picked = false;
       }
       nextOrder.items = orderItems;
     }
@@ -17,8 +17,8 @@ module.exports = ({ itemActions }) =>
           ..._order,
           items: _order.items.map(item => itemActions.unpickItem(item)),
         };
-        if (nextsubOrder.status && nextsubOrder.status.fullyPicked) {
-          nextsubOrder.status.fullyPicked = false;
+        if (nextsubOrder.status && nextsubOrder.status.picked) {
+          nextsubOrder.status.picked = false;
         }
         return nextsubOrder;
       });

package/lib/store/pickEndDate.js

@@ -35,9 +35,9 @@ module.exports = ({ settings, _, moment }) => {
 
   const getClosedDays = () => {
     const schedule = _.get(settings, 'schedule', {});
-    const { close = [] } = schedule;
-    if (!Array.isArray(close)) return [];
-    return close;
+    const { closed = [] } = schedule;
+    if (!Array.isArray(closed)) return [];
+    return closed;
   };
 
   const MAX_ADD_DAYS = 365;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.133",
+  "version": "1.0.134",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -52,5 +52,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "1cec04f4a6fc32238922712068994984b62ab92d"
+  "gitHead": "cfe52c49a64c3418b808a7c5ce7f76324b8340a5"
 }

package/lib/order/isFullyPaid.js

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