@darkpos/pricing 1.0.63 → 1.0.65

package/__TEST__/order/addItem.test.js

@@ -1,6 +1,5 @@
 const usePricing = require('../../index');
 const mockStores = require('../mocks/stores');
-const addItemObj = require('../mocks/addItemMock');
 
 const session = {
   store: mockStores[0],

package/__TEST__/order/order.test.js

@@ -3170,4 +3170,68 @@ describe('Order actions', () => {
       },
     });
   });
+
+  test('should return the latest location= tracker', () => {
+    const status = {
+      assembled: { location: '1', date: '2024-02-25T12:00:00Z' },
+      tracker: { location: 'Truck', date: '2024-02-26T12:00:00Z' },
+      racked: { location: '%AB', date: '2024-02-24T15:00:00Z' },
+    };
+    expect(pricingService.order.getLastLocation({ status })).toEqual({
+      location: 'Truck',
+      date: '2024-02-26T12:00:00Z',
+      isTracker: true,
+    });
+  });
+
+  test('should return the latest location= assembled', () => {
+    const status = {
+      assembled: { location: '1', date: '2024-02-27T12:00:00Z' },
+      tracker: { location: 'Truck', date: '2024-02-26T12:00:00Z' },
+      racked: { location: '%AB', date: '2024-02-25T15:00:00Z' },
+    };
+    expect(pricingService.order.getLastLocation({ status })).toEqual({
+      location: '1',
+      date: '2024-02-27T12:00:00Z',
+      isAssembled: true,
+      prefix: 'spot',
+    });
+  });
+
+  test('should return the latest location= racked', () => {
+    const status = {
+      assembled: { location: '1', date: '2024-02-25T12:00:00Z' },
+      tracker: { location: 'Truck', date: '2024-02-26T12:00:00Z' },
+      racked: { location: '%AB', date: '2024-02-27T15:00:00Z' },
+    };
+    expect(pricingService.order.getLastLocation({ status })).toEqual({
+      location: '%AB',
+      date: '2024-02-27T15:00:00Z',
+      isRacked: true,
+      prefix: 'rack',
+    });
+  });
+
+  test('should handle null values correctly and still return the latest location', () => {
+    const status = {
+      assembled: null,
+      tracker: { location: 'Truck', date: '2024-02-26T12:00:00Z' },
+      racked: { location: '%AB', date: '2024-02-27T15:00:00Z' },
+    };
+    expect(pricingService.order.getLastLocation({ status })).toEqual({
+      location: '%AB',
+      date: '2024-02-27T15:00:00Z',
+      isRacked: true,
+      prefix: 'rack',
+    });
+  });
+
+  test('should return null if all locations are missing or null', () => {
+    const status = {
+      assembled: null,
+      tracker: null,
+      racked: null,
+    };
+    expect(pricingService.order.getLastLocation({ status })).toEqual(null);
+  });
 });

package/__TEST__/order/validateConditionsCalculate.test.js

@@ -154,16 +154,16 @@ describe('Conditions not met for the item', () => {
     expect(calculatedOrder).toHaveProperty('total', 70);
     expect(calculatedOrder).toHaveProperty('subTotal', 100);
   });
-  test('#5: endDateDays condition is not met, item price remains the same', () => {
+  test('#5: endDateHours condition is not met, item price remains the same', () => {
     const order = {
       id: 'ord-123',
       items: [],
       modifiers: [],
       start: {
-        requestDate: new Date('2020-01-01'),
+        requestDate: '2025-02-14T17:00:00.000',
       },
       end: {
-        requestDate: new Date('2020-01-02'),
+        requestDate: '2025-02-14T20:00:00.000',
       },
     };
     const item = {
@@ -177,7 +177,7 @@ describe('Conditions not met for the item', () => {
       conditions: {
         rules: [
           {
-            key: 'endDateDays',
+            key: 'endDateHours',
             value: 5,
             operand: '$gt',
           },
@@ -196,16 +196,16 @@ describe('Conditions not met for the item', () => {
     expect(calculatedOrder).toHaveProperty('total', 100);
     expect(calculatedOrder).toHaveProperty('subTotal', 100);
   });
-  test('#6: endDateDays condition is met, item total is updated', () => {
+  test('#6: endDateHours condition is met, item total is updated', () => {
     const order = {
       id: 'ord-123',
       items: [],
       modifiers: [],
       start: {
-        requestDate: new Date('2020-01-01'),
+        requestDate: '2025-02-14T17:00:00.000',
       },
       end: {
-        requestDate: new Date('2020-01-08'),
+        requestDate: '2025-02-14T23:00:00.000',
       },
     };
     const item = {
@@ -224,7 +224,7 @@ describe('Conditions not met for the item', () => {
       conditions: {
         rules: [
           {
-            key: 'endDateDays',
+            key: 'endDateHours',
             value: 5,
             operand: '$gt',
           },
@@ -235,6 +235,50 @@ describe('Conditions not met for the item', () => {
     const { calculate } = pricingService.order;
     // Calculate the order
     const calculatedOrder = calculate(order);
+
+    expect(calculatedOrder).toHaveProperty('total', 70);
+    expect(calculatedOrder).toHaveProperty('subTotal', 100);
+  });
+  test('#6.5: endDateHours condition is met with gte, item total is updated', () => {
+    const order = {
+      id: 'ord-123',
+      items: [],
+      modifiers: [],
+      start: {
+        requestDate: '2025-02-14T17:00:00.000',
+      },
+      end: {
+        requestDate: '2025-02-14T22:00:00.000',
+      },
+    };
+    const item = {
+      quantity: 1,
+      itemId: '123',
+      price: 100,
+      modifiers: [],
+    };
+    order.items.push(item);
+    const modifier = {
+      compute: {
+        amount: 30,
+        type: 'fixed',
+        action: 'subtract',
+      },
+      conditions: {
+        rules: [
+          {
+            key: 'endDateHours',
+            value: 5,
+            operand: '$gte',
+          },
+        ],
+      },
+    };
+    item.modifiers.push(modifier);
+    const { calculate } = pricingService.order;
+    // Calculate the order
+    const calculatedOrder = calculate(order);
+
     expect(calculatedOrder).toHaveProperty('total', 70);
     expect(calculatedOrder).toHaveProperty('subTotal', 100);
   });

package/lib/item/getLastLocation.js

@@ -0,0 +1,30 @@
+module.exports = () =>
+  function getLastLocation(item) {
+    if (!item || !item.status) return null;
+
+    const { assembled = {}, tracker = [], racked = {} } = item.status;
+
+    let latestLocation =
+      Array.isArray(tracker) && tracker.length > 0
+        ? { ...tracker[tracker.length - 1], isTracker: true }
+        : {};
+
+    if (
+      assembled &&
+      assembled.date &&
+      (!latestLocation.date ||
+        new Date(assembled.date) > new Date(latestLocation.date))
+    ) {
+      latestLocation = { ...assembled, isAssembled: true, prefix: 'spot' };
+    }
+    if (
+      racked &&
+      racked.date &&
+      (!latestLocation.date ||
+        new Date(racked.date) > new Date(latestLocation.date))
+    ) {
+      latestLocation = { ...racked, isRacked: true, prefix: 'rack' };
+    }
+
+    return Object.keys(latestLocation).length !== 0 ? latestLocation : null;
+  };

package/lib/item/index.js

@@ -47,6 +47,7 @@ const getNoteTags = require('./getNoteTags');
 const getBasePrice = require('./getBasePrice');
 const removeModifiersByQuantity = require('./removeModifiersByQuantity');
 const getModifiersBySingleValueId = require('./getModifiersBySingleValueId');
+const getLastLocation = require('./getLastLocation');
 
 const itemActions = (deps = {}) => {
   const actions = {};
@@ -107,6 +108,7 @@ const itemActions = (deps = {}) => {
     getBasePrice: getBasePrice(innerDeps),
     removeModifiersByQuantity: removeModifiersByQuantity(innerDeps),
     getModifiersBySingleValueId: getModifiersBySingleValueId(innerDeps),
+    getLastLocation: getLastLocation(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/areConditionsMet.js

@@ -24,8 +24,8 @@ module.exports = ({ actions }) => {
                 condition.value,
                 condition.operand
               );
-            case 'endDateDays':
-              return actions.validateDateDaysDiff(
+            case 'endDateHours':
+              return actions.validateDateHoursDiff(
                 startRequestDate,
                 endRequestDate,
                 condition.value,

package/lib/modifier/index.js

@@ -121,7 +121,7 @@ const getGroupedModifierLabels = require('./getGroupedModifierLabels');
 const validate = require('./validate');
 const validateNumberCondition = require('./validateNumberCondition');
 const validateRequiredModifiers = require('./validateRequiredModifiers');
-const validateDateDaysDiff = require('./validateDateDaysDiff');
+const validateDateHoursDiff = require('./validateDateHoursDiff');
 const validateInArr = require('./validateInArr');
 const isPercentage = require('./isPercentage');
 const getChildren = require('./getChildren');
@@ -272,7 +272,7 @@ const modifierActions = (deps = {}) => {
     validate: validate(innerDeps),
     validateNumberCondition: validateNumberCondition(innerDeps),
     validateRequiredModifiers: validateRequiredModifiers(innerDeps),
-    validateDateDaysDiff: validateDateDaysDiff(innerDeps),
+    validateDateHoursDiff: validateDateHoursDiff(innerDeps),
     validateInArr: validateInArr(innerDeps),
     areConditionsMet: areConditionsMet(innerDeps),
     isPercentage: isPercentage(innerDeps),

package/lib/modifier/{validateDateDaysDiff.js → validateDateHoursDiff.js}

@@ -2,7 +2,7 @@ module.exports = () =>
   function validateDateDaysDiff(
     startRequestDate,
     endRequestDate,
-    conditionNumber,
+    conditionNumber, // in hours
     operand
   ) {
     if (!conditionNumber && !operand) return true;
@@ -10,20 +10,21 @@ module.exports = () =>
     const diff = Math.abs(
       new Date(endRequestDate) - new Date(startRequestDate)
     );
-    const diffDays = Math.ceil(diff / (1000 * 60 * 60 * 24));
+    const diffHours = Math.ceil(diff / (1000 * 60 * 60));
+
     switch (operand) {
       case '$eq':
-        return diffDays === conditionNumber;
+        return diffHours === conditionNumber;
       case '$ne':
-        return diffDays !== conditionNumber;
+        return diffHours !== conditionNumber;
       case '$gt':
-        return diffDays > conditionNumber;
+        return diffHours > conditionNumber;
       case '$gte':
-        return diffDays >= conditionNumber;
+        return diffHours >= conditionNumber;
       case '$lt':
-        return diffDays < conditionNumber;
+        return diffHours < conditionNumber;
       case '$lte':
-        return diffDays <= conditionNumber;
+        return diffHours <= conditionNumber;
       default:
         return false;
     }

package/lib/order/getLastLocation.js

@@ -0,0 +1,28 @@
+module.exports = () =>
+  function getLastLocation(order) {
+    if (!order || !order.status) return null;
+
+    const { assembled = {}, tracker = {}, racked = {} } = order.status;
+
+    let latestLocation =
+      tracker && tracker.date ? { ...tracker, isTracker: true } : {};
+
+    if (
+      assembled &&
+      assembled.date &&
+      (!latestLocation.date ||
+        new Date(assembled.date) > new Date(latestLocation.date))
+    ) {
+      latestLocation = { ...assembled, isAssembled: true, prefix: 'spot' };
+    }
+    if (
+      racked &&
+      racked.date &&
+      (!latestLocation.date ||
+        new Date(racked.date) > new Date(latestLocation.date))
+    ) {
+      latestLocation = { ...racked, isRacked: true, prefix: 'rack' };
+    }
+
+    return Object.keys(latestLocation).length !== 0 ? latestLocation : null;
+  };

package/lib/order/getSuborder.js

@@ -1,14 +1,7 @@
 module.exports = ({ utils, _, settings }) => {
   const orderSettings = _.get(settings, 'order');
-  const { date, helpers } = utils;
-  const noteDefaults = {
-    message: '',
-    attributes: [],
-    date: date.toISOString(),
-    user: null,
-    url: '',
-    __typename: 'Note',
-  };
+  const { helpers } = utils;
+
   const getSubOrder =
     ({ order }) =>
     (items, index) => {
@@ -35,13 +28,7 @@ module.exports = ({ utils, _, settings }) => {
         parentId: orderSettings.allowSuborder ? order._id : null,
         items,
         modifiers: [],
-        notes: [
-          ...(order.notes || []),
-          {
-            ...noteDefaults,
-            message: `Suborder from ${order.displayId}`, // ask about this message
-          },
-        ],
+        notes: order.notes || [],
       };
     };
 

package/lib/order/index.js

@@ -88,6 +88,7 @@ const manualSplit = require('./manualSplit');
 const manualSplitByQuantity = require('./manualSplitByQuantity');
 const applyPayment = require('./applyPayment');
 const getBalance = require('./getBalance');
+const getLastLocation = require('./getLastLocation');
 
 const orderActions = (deps = {}) => {
   const actions = {};
@@ -187,6 +188,7 @@ const orderActions = (deps = {}) => {
     manualSplitByQuantity: manualSplitByQuantity(innerDeps),
     applyPayment: applyPayment(innerDeps),
     getOrdersBalance: getOrdersBalance(innerDeps),
+    getLastLocation: getLastLocation(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.63",
+  "version": "1.0.65",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -46,5 +46,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "0d2bce7580b5ba1078a16390ae63680af8b27d66"
+  "gitHead": "f80b944b57b9f03791606ca809fb55590bea5436"
 }