@darkpos/pricing 1.0.62 → 1.0.64

package/__TEST__/modifier.test.js

@@ -193,4 +193,491 @@ describe('Modifier actions', () => {
     expect(error).toEqual('');
     expect(updatedOrder2).toEqual(order);
   });
+
+  test('CU-86dum5w1q Should not allow more than 1 child modifier with the same singleParentGroupId', () => {
+    const params = {
+      itemIndex: 0,
+      modifier: {
+        _id: '62cdbfd01ee1b400193281e1',
+        attributes: [],
+        cost: 0,
+        tags: [],
+        included: false,
+        direct: true,
+        hidden: false,
+        print: true,
+        required: false,
+        recommended: false,
+        default: false,
+        addModifiers: [],
+        delModifiers: [],
+        _hidden: false,
+        _isDeleted: false,
+        modifierId: null,
+        name: 'Dark Golden Rod',
+        sku: '',
+        description: 'Color: Orange',
+        group: 'Color',
+        type: '',
+        color: '#b8860b',
+        backgroundColor: '',
+        icon: '',
+        url: '',
+        order: 0,
+        code: '',
+        conditions: null,
+        compute: null,
+        _accountId: '62cdbfcdaaf93c00193d2dd3',
+        _storeId: '62cdbfce1ee1b40019328156',
+        _createdAt: '2022-07-12T18:39:18.038Z',
+        _updatedAt: '2022-07-12T18:39:18.038Z',
+        __typename: 'Modifier',
+        properties: { singleValueGroupId: '62cdbfd01ee1b4001932816a' },
+      },
+      order: {
+        _id: '67b4fb03c2d2f55164464c51',
+        parentId: null,
+        isParent: false,
+        subTotal: 213,
+        tax: 0,
+        modifiers: [],
+        discount: 0,
+        total: 213,
+        description: '',
+        displayId: '',
+        type: '',
+        location: {},
+        status: {
+          order: 'open',
+          kitchen: 'open',
+          delivery: 'none',
+          detailed: true,
+        },
+        attributes: [],
+        properties: {},
+        fee: 0,
+        user: null,
+        items: [
+          {
+            location: {},
+            status: {
+              picked: { value: false, date: '' },
+              paid: { value: false, date: '' },
+              tracker: [],
+            },
+            name: '2pc Dress with Long Jacket2',
+            description: 'a long jacket.',
+            pieces: 2,
+            modifiersTotalAmount: 0,
+            total: 213,
+            totalPaid: 0,
+            price: 213,
+            quantity: 1,
+            path: ',67213668c4b950f2f3c41e64,672136a0f3116216ca955091,',
+            notes: [],
+            serial: null,
+            sku: '',
+            modifiers: [
+              {
+                _id: '67b4fb13c2d2f55164464c55',
+                attributes: ['group'],
+                modifierId: '62cdbfd01ee1b4001932816a',
+                _parentId: null,
+                locked: false,
+                name: 'White',
+                sku: '',
+                description: 'Color: White',
+                group: 'Color',
+                type: null,
+                tags: ['default', 'all'],
+                order: null,
+                included: false,
+                direct: true,
+                hidden: false,
+                print: false,
+                required: true,
+                recommended: false,
+                default: false,
+                code: null,
+                properties: {
+                  override: null,
+                  group: {
+                    displayType: 'card',
+                    includeInGroup: true,
+                    singleValue: true,
+                    compact: false,
+                    enableAutoPopup: true,
+                    displayReplacePrompt: true,
+                    promptMessage: '',
+                    modifiers: [],
+                    items: [],
+                    values: ['RegularItem'],
+                    manualModifiers: 'test1, asd,123',
+                  },
+                  sort: null,
+                  label: {
+                    text: 'White Label',
+                    align: 'center',
+                    backgroundColor: 'rgba(76,175,80,1)',
+                  },
+                  color: 'rgba(0,150,136,1)',
+                },
+                _computed: { amount: 0, description: 'White' },
+                conditions: { valid: true },
+                compute: null,
+                _createdAt: '2022-07-12T18:39:17.922Z',
+                _updatedAt: '2025-02-17T21:23:21.422Z',
+                addModifiers: [],
+                delModifiers: [],
+              },
+              {
+                _id: '67b4fb13c2d2f55164464c56',
+                attributes: ['group'],
+                modifierId: '62cdbfd01ee1b400193281b1',
+                _parentId: null,
+                locked: false,
+                name: 'Red',
+                sku: '',
+                description: 'Color: Red',
+                group: 'Color',
+                type: null,
+                tags: ['default', 'all'],
+                order: null,
+                included: false,
+                direct: true,
+                hidden: false,
+                print: false,
+                required: true,
+                recommended: false,
+                default: false,
+                code: null,
+                properties: {
+                  group: {
+                    displayType: 'list',
+                    modifiers: [],
+                    items: [],
+                    compact: null,
+                    includeInGroup: true,
+                    singleValue: null,
+                    enableAutoPopup: true,
+                    displayReplacePrompt: null,
+                    manualModifiers: '',
+                  },
+                  label: { text: '' },
+                  sort: null,
+                  color: 'rgba(255,0,0,1)',
+                },
+                _computed: { amount: 0, description: 'Red' },
+                conditions: { valid: true },
+                compute: null,
+                _createdAt: '2022-07-12T18:39:17.990Z',
+                _updatedAt: '2025-02-12T19:26:05.372Z',
+                addModifiers: [],
+                delModifiers: [],
+              },
+              {
+                _id: '67b4fb14c2d2f55164464c57',
+                attributes: [],
+                cost: 0,
+                tags: [],
+                included: false,
+                direct: true,
+                hidden: false,
+                print: true,
+                required: false,
+                recommended: false,
+                default: false,
+                addModifiers: [],
+                delModifiers: [],
+                _hidden: false,
+                _isDeleted: false,
+                modifierId: '62cdbfd01ee1b40019328188',
+                name: 'Linen',
+                sku: '',
+                description: 'Color: White',
+                group: 'Color',
+                type: '',
+                color: '#faf0e6',
+                backgroundColor: '',
+                icon: '',
+                url: '',
+                order: 0,
+                code: '',
+                conditions: { valid: true },
+                compute: null,
+                _accountId: '62cdbfcdaaf93c00193d2dd3',
+                _storeId: '62cdbfce1ee1b40019328156',
+                _createdAt: '2022-07-12T18:39:18.038Z',
+                _updatedAt: '2022-07-12T18:39:18.038Z',
+                __typename: 'Modifier',
+                properties: { singleValueGroupId: '62cdbfd01ee1b4001932816a' },
+                _computed: { amount: 0, description: 'Linen' },
+              },
+              {
+                _id: '67b4fb15c2d2f55164464c58',
+                attributes: [],
+                cost: 0,
+                tags: null,
+                included: false,
+                direct: true,
+                hidden: false,
+                print: false,
+                required: false,
+                recommended: false,
+                default: false,
+                addModifiers: [],
+                delModifiers: [],
+                _hidden: false,
+                _isDeleted: false,
+                modifierId: '62cdbfd01ee1b400193281b2',
+                name: 'Dark Red',
+                sku: '',
+                description: 'Color: Red',
+                group: 'Color',
+                type: null,
+                color: '#8b0000',
+                url: '',
+                conditions: { valid: true },
+                backgroundColor: null,
+                code: null,
+                compute: null,
+                icon: null,
+                order: null,
+                properties: { singleValueGroupId: null },
+                _accountId: '62cdbfcdaaf93c00193d2dd3',
+                _storeId: '62cdbfce1ee1b40019328156',
+                _createdAt: '2022-07-12T18:39:17.985Z',
+                _updatedAt: '2022-07-12T18:39:17.985Z',
+                __typename: 'Modifier',
+                _computed: { amount: 0, description: 'Dark Red' },
+              },
+            ],
+            _id: '67b4fb13c2d2f55164464c54',
+            _updatedAt: '2025-02-17T20:59:00.398Z',
+            _createdAt: '2022-07-12T18:39:17.318Z',
+            weight: null,
+            properties: {
+              label: { text: '', align: 'center', backgroundColor: null },
+              url: null,
+              color: 'rgba(254,86,33,1)',
+              iconName: 'ActivitySquare',
+              basePrice: 213,
+            },
+            hasInventory: true,
+            inventoryType: 'push',
+            category: { _id: '66db73e570fdebea682d28e2' },
+            __typename: 'OrderItem',
+            priceLevels: [
+              { value: 213, tags: ['default'] },
+              { value: 200, tags: ['vip'] },
+              { value: 12, tags: ['wholesale'] },
+              { value: 113, tags: ['default', 'press only'] },
+              { value: 100, tags: ['vip', 'press only'] },
+              { value: 0, tags: ['wholesale', 'press only'] },
+            ],
+            costLevels: [],
+            itemId: '62cdbfd01ee1b4001932821a',
+            categoryId: '66db73e570fdebea682d28e2',
+            menuRuleId: '672136a9f3116216ca955092',
+            subTotals: {
+              _included: 0,
+              _xincluded: 0,
+              _direct: 0,
+              _xdirect: 0,
+              _simple: 213,
+              _actual: 213,
+            },
+          },
+        ],
+        notes: [],
+        customer: {
+          _id: '66a3d7d366107c7369873980',
+          username: '',
+          firstName: 'Esteban',
+          lastName: 'Mathieu',
+          description: '',
+          attributes: [],
+          properties: {
+            charge: {
+              enabled: true,
+              walletCard: {
+                customerToken: 'cus_RCWJ73mmqUM5Td',
+                cardToken: 'card_1QKLmQFS0LoOx3AS7L9LWHUt',
+              },
+            },
+            billing: { name: 'Andreparent Pinto', enabled: false, limit: null },
+            events: [],
+            relationships: [],
+            defaultStore: '62cdbfce1ee1b40019328156',
+            gender: '',
+            company: 'WWE',
+            profilePic:
+              'https://res.cloudinary.com/darkpos/image/upload/v1731358649/67326fb8260f353e43272369.jpg',
+            starch: '62cdbfd01ee1b4001932822e',
+            packing: '66cd14a4b74b7da4b9f195d3',
+            cycle: false,
+            declineNotifications: false,
+            escExempt: false,
+            route: false,
+            taxExempt: false,
+            term: '',
+            customFieldTest: '',
+          },
+          tags: ['default'],
+          status: '',
+          parent: { tags: ['default'] },
+          parentId: '66f174ddc289cb1302b2eb8e',
+          loyalty: null,
+          wallet: [
+            {
+              isDefault: true,
+              provider: 'credit-card-ppec',
+              customerToken: 'cus_R5fHSveVoEOdrg',
+              cardToken: 'card_1QDTwmFS0LoOx3ASEGiVK7nD',
+              cards: [
+                {
+                  _id: 'card_1QfQNwFS0LoOx3AS3Zp8jIdx',
+                  name: 'Andre S Dark',
+                  token: 'card_1QfQNwFS0LoOx3AS3Zp8jIdx',
+                  last4: '4444',
+                  month: '12',
+                  year: '2033',
+                  billingAddress: 'Rua 6 130 c2',
+                  zipCode: '21478',
+                  type: 'card',
+                  amount: null,
+                  pin: null,
+                  number: null,
+                },
+              ],
+            },
+            {
+              isDefault: false,
+              provider: 'darkpos',
+              customerToken: '673f93ddbb1a78190bb48361',
+              cardToken: null,
+              cards: [
+                {
+                  _id: '673f93ddbb1a78190bb48362',
+                  name: null,
+                  token: '673f93ddbb1a78190bb48362',
+                  last4: null,
+                  month: null,
+                  year: null,
+                  billingAddress: null,
+                  zipCode: null,
+                  type: 'credit',
+                  amount: 0,
+                  pin: null,
+                  number: null,
+                },
+              ],
+            },
+          ],
+          modifiers: [],
+          addresses: [
+            {
+              address1: '21 Jump Street',
+              address2: '',
+              city: 'LA',
+              state: 'California',
+              zip: '',
+              country: null,
+              primary: true,
+              type: null,
+              description: null,
+              location: { lat: 0, lng: 0 },
+            },
+          ],
+          contacts: [],
+          notes: [],
+          _accountId: '62cdbfcdaaf93c00193d2dd3',
+          _storeId: '62cdbfce1ee1b40019328156',
+          _isDeleted: false,
+          _deletedAt: null,
+          _updatedAt: '2025-02-17T20:59:00.355Z',
+          _createdAt: '2024-07-26T17:07:41.027Z',
+          isEmbedded: true,
+        },
+        start: {
+          actualDate: '2025-02-18T21:26:27.782Z',
+          requestDate: '2025-02-18T21:26:27.782Z',
+          __typename: 'OrderStart',
+          location: {
+            name: 'Tico Store #1',
+            locationType: 'store',
+            storeId: '62cdbfce1ee1b40019328156',
+          },
+        },
+        end: {
+          __typename: 'OrderEnd',
+          actualDate: '',
+          requestDate: '2025-02-21T21:30:00.000Z',
+          location: {
+            name: 'Tico Store #1',
+            locationType: 'store',
+            storeId: '62cdbfce1ee1b40019328156',
+          },
+        },
+        _storeId: '',
+        __typename: 'Order',
+        isOrderNew: true,
+        subTotals: {},
+      },
+      force: true,
+      originalItem: {
+        _id: '62cdbfd01ee1b4001932821a',
+        _updatedAt: '2025-02-17T20:59:00.398Z',
+        _createdAt: '2022-07-12T18:39:17.318Z',
+        name: '2pc Dress with Long Jacket2',
+        description: 'a long jacket.',
+        pieces: 2,
+        weight: 0,
+        properties: {
+          label: { text: '', align: 'center', backgroundColor: null },
+          url: null,
+          color: 'rgba(254,86,33,1)',
+          iconName: 'ActivitySquare',
+        },
+        sku: '',
+        hasInventory: true,
+        inventoryType: 'push',
+        quantity: 67,
+        category: { _id: '66db73e570fdebea682d28e2' },
+        __typename: 'Item',
+        modifiers: [],
+        priceLevels: [
+          { value: 213, tags: ['default'] },
+          { value: 200, tags: ['vip'] },
+          { value: 12, tags: ['wholesale'] },
+          { value: 113, tags: ['default', 'press only'] },
+          { value: 100, tags: ['vip', 'press only'] },
+          { value: 0, tags: ['wholesale', 'press only'] },
+        ],
+        costLevels: [],
+      },
+    };
+
+    const updatedOrder = pricingService.order.addItemModifier({
+      order: params.order,
+      modifier: params.modifier,
+      itemIndex: params.itemIndex,
+    });
+
+    expect(updatedOrder.items[0].modifiers.length).toEqual(4);
+    expect(updatedOrder.items[0].modifiers[0].name).toEqual('White');
+    expect(updatedOrder.items[0].modifiers[1].name).toEqual('Red');
+    expect(updatedOrder.items[0].modifiers[2].name).toEqual('Dark Red');
+    expect(updatedOrder.items[0].modifiers[2].properties).toEqual(
+      expect.objectContaining({
+        singleValueGroupId: null,
+      })
+    );
+    expect(updatedOrder.items[0].modifiers[3].name).toEqual('Dark Golden Rod');
+    expect(updatedOrder.items[0].modifiers[3].properties).toEqual(
+      expect.objectContaining({
+        singleValueGroupId: '62cdbfd01ee1b4001932816a',
+      })
+    );
+  });
 });

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/getModifiersBySingleValueId.js

@@ -0,0 +1,11 @@
+module.exports = ({ modifierActions }) =>
+  function getModifiersBySingleValueId({ item, singleValueGroupId }) {
+    if (!singleValueGroupId) return [];
+
+    if (!item || !item.modifiers) return [];
+    return item.modifiers.filter(
+      each =>
+        modifierActions.getProperty(each, 'singleValueGroupId') ===
+        singleValueGroupId
+    );
+  };

package/lib/item/index.js

@@ -46,6 +46,8 @@ const getTotalNeareastDifference = require('./getTotalNeareastDifference');
 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 = {};
@@ -105,6 +107,8 @@ const itemActions = (deps = {}) => {
     getNoteTags: getNoteTags(innerDeps),
     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/contains.js

@@ -1,5 +1,7 @@
 module.exports = () =>
   function contains(modifiers = [], modifier = null) {
     if (!modifiers || !modifier) return false;
-    return !!modifiers.find(each => each.modifierId === modifier._id);
+    return !!modifiers.find(
+      each => each.modifierId === modifier._id || each._id === modifier._id
+    );
   };

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/addItemModifier.js

@@ -204,6 +204,30 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
       return order;
     }
 
+    const modifiersToRemove = itemActions.getModifiersBySingleValueId({
+      item,
+      singleValueGroupId: modifierActions.getProperty(
+        modifier,
+        'singleValueGroupId'
+      ),
+    });
+
+    if (modifiersToRemove.length > 0) {
+      order = modifiersToRemove.reduce(
+        (prevVal, modToRemove) => {
+          const result = actions.removeItemModifier({
+            order: prevVal,
+            modifier: modToRemove,
+            itemIndex,
+            originalItem,
+          });
+          return result;
+        },
+        { ...order }
+      );
+      item = actions.getSelectedItem({ order, itemIndex });
+    }
+
     if (
       contains &&
       modifierActions.isCompute(modifier) &&

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/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/lib/order/removeItemModifier.js

@@ -12,9 +12,12 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
   const removeModifier = ({ item, modifier, originalItem }) => {
     const nextItem = { ...item, modifiers: [] };
 
-    nextItem.modifiers = item.modifiers.filter(
-      each => (each.modifierId || each._id) !== modifier._id
-    );
+    nextItem.modifiers = item.modifiers.filter(each => {
+      if (each.modifierId) {
+        return each.modifierId !== modifier._id && each._id !== modifier._id;
+      }
+      return each._id !== modifier._id;
+    });
 
     if (modifierActions.isAmountOverride(modifier))
       return {
@@ -41,10 +44,14 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
 
     let item = actions.getSelectedItem({ order, itemIndex });
     const customer = actions.getCustomer(order);
+
     const contains = modifierActions.contains(item.modifiers, modifier);
 
     if (!contains) return order;
-    if (modifierActions.isRequiredAndOverride(modifier)) return order;
+
+    if (modifierActions.isRequiredAndOverride(modifier)) {
+      return order;
+    }
 
     // Remove
     item = removeModifier({
@@ -52,6 +59,7 @@ module.exports = ({ actions, modifierActions, itemActions, utils, _ }) => {
       modifier,
       originalItem,
     });
+
     item.price = itemActions.getItemPrice({
       item,
       itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.62",
+  "version": "1.0.64",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -22,6 +22,7 @@
     "test:createIndirectModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/createIndirectModifier.test.js",
     "test:conditionsNotMet": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/conditionsNotMet.test.js",
     "test:pickEndDate": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/pickEndDate.test.js",
+    "test:modifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier.test.js",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
@@ -45,5 +46,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "46945a727cbb12468ce5e88b5d28a37ec1d321ee"
+  "gitHead": "000ac6a4b480b4a219b1411d29cbd74f86aa9716"
 }