@darkpos/pricing 1.0.112 → 1.0.115

package/__TEST__/item.test.js

@@ -8,1689 +8,1962 @@ const session = {
 const pricingService = usePricing(session);
 
 describe('Item actions', () => {
-  test('Get calculated Item: included: false && direct: false', () => {
-    const modifiers = [
-      {
-        _id: 1111,
-        compute: {
-          amount: 20,
-          type: 'percentage',
-          action: 'add',
-        },
-        name: 'modifier1',
-        type: 'discount',
-        direct: false,
-        included: false,
-        properties: {
-          isQuantityMultiplier: true,
-        },
-      },
-      {
-        _id: 2222,
-        compute: {
-          amount: 20,
-          type: 'percentage',
-          action: 'subtract',
-        },
-        name: 'modifier2',
-        type: 'discount',
-        direct: false,
-        included: false,
-        properties: {
-          isQuantityMultiplier: true,
-        },
-      },
-      {
-        _id: 3333,
-        compute: {
-          amount: 2,
-          type: 'fixed',
-          action: 'subtract',
-        },
-        name: 'modifier3',
-        type: 'discount',
-        direct: false,
-        included: false,
-        properties: {
-          isQuantityMultiplier: true,
-        },
-      },
-    ];
-    const orderItem = { price: 30, quantity: 2, modifiers };
-    const newItem = pricingService.item.calculate(orderItem);
-    expect(newItem).toHaveProperty('total', 56);
-    expect(newItem).toHaveProperty('subTotals', {
-      discount: -4,
-      _included: 0,
-      _xincluded: -4,
-      _direct: 0,
-      _xdirect: -4,
-      _simple: 60,
-      _actual: 60,
-    });
-  });
-  test('Get calculated Item: included: false && direct: true', () => {
-    const modifiers = [
-      {
-        _id: '123213213',
-        compute: { amount: 2, type: 'fixed', action: 'subtract' },
-        type: 'discount',
-        name: 'modifier1',
-        direct: true,
-        included: false,
-        properties: {
-          isQuantityMultiplier: true,
-        },
-      },
-      {
-        _id: '22222',
-        compute: {
-          amount: 20,
-          type: 'percentage',
-          action: 'subtract',
-        },
-        name: 'modifier2',
-        type: 'discount',
-        direct: true,
-        included: false,
-        properties: {
-          isQuantityMultiplier: true,
-        },
-      },
-      {
-        _id: '3333',
-        compute: {
-          amount: 2,
-          type: 'fixed',
-          action: 'add',
-        },
-        name: 'modifier3',
-        type: 'tax',
-        direct: true,
-        included: false,
-        properties: {
-          isQuantityMultiplier: true,
-        },
-      },
-    ];
-    const orderItem = { price: 30, quantity: 2, modifiers };
-    const newItem = pricingService.item.calculate(orderItem);
-    expect(newItem).toHaveProperty('total', 48);
-    expect(newItem).toHaveProperty('subTotals', {
-      discount: -16,
-      tax: 4,
-      _included: 0,
-      _xincluded: -12,
-      _direct: -12,
-      _xdirect: 0,
-      _simple: 60,
-      _actual: 60,
-    });
-  });
-  test('Get calculated Item: included: true && direct: true', () => {
-    const modifiers = [
-      {
-        _id: '111111',
-        compute: {
-          amount: 2,
-          type: 'fixed',
-          action: 'subtract',
-        },
-        name: 'modifier1',
-        type: 'discount',
-        direct: true,
-        included: true,
-        properties: {
-          isQuantityMultiplier: true,
-        },
-      },
-      {
-        _id: '222222',
-
-        compute: {
-          amount: 20,
-          type: 'percentage',
-          action: 'subtract',
-        },
-        name: 'modifier2',
-        type: 'discount',
-        direct: true,
-        included: true,
-        properties: {
-          isQuantityMultiplier: true,
-        },
-      },
-      {
-        _id: '33333',
-
-        compute: {
-          amount: 2,
-          type: 'fixed',
-          action: 'add',
-        },
-        name: 'modifier3',
-        type: 'upcharge',
-        direct: true,
-        included: true,
-        properties: {
-          isQuantityMultiplier: true,
-        },
-      },
-    ];
-    const orderItem = { price: 30, quantity: 2, modifiers };
-    const newItem = pricingService.item.calculate(orderItem);
-    expect(newItem).toHaveProperty('total', 48);
-    expect(newItem).toHaveProperty('subTotals', {
-      _included: -12,
-      _xincluded: 0,
-      _direct: -12,
-      _xdirect: 0,
-      _simple: 60,
-      _actual: 48,
-    });
-  });
-  test('Get calculated Item: included: true, sample 1', () => {
-    const modifiers = [
-      {
-        compute: {
-          amount: 2,
-          type: 'fixed',
-          action: 'add',
-        },
-        name: 'modifier1',
-        type: 'upcharge',
-        included: true,
-        direct: true,
-      },
-    ];
-    const orderItem = { price: 2, quantity: 1, modifiers };
-    const newItem = pricingService.item.calculate(orderItem);
-    expect(newItem).toHaveProperty('total', 4);
-    expect(newItem).toHaveProperty('subTotals', {
-      _included: 2,
-      _xincluded: 0,
-      _direct: 2,
-      _xdirect: 0,
-      _simple: 2,
-      _actual: 4,
-    });
-  });
-  test('Get calculated Item: included: true, sample 2', () => {
-    const modifiers = [
-      {
-        compute: { amount: 2, type: 'fixed', action: 'add' },
-        name: 'modifier1',
-        type: 'upcharge',
-        included: true,
-        direct: true,
-        properties: {
-          sort: 1,
-        },
-        _id: '1255115',
-      },
-      {
-        compute: {
-          amount: 10,
-          type: 'percentage',
-          action: 'add',
-        },
-        name: 'modifier2',
-        type: 'tax',
-        properties: {
-          sort: 2,
-        },
-        included: true,
-        direct: true,
-        _id: '2256659',
-      },
-    ];
-    const orderItem = { price: 2, quantity: 1, modifiers };
-    const newItem = pricingService.item.calculate(orderItem);
-    expect(newItem).toHaveProperty('total', 4.4);
-    expect(newItem).toHaveProperty('subTotals', {
-      _included: 2.4,
-      _xincluded: 0,
-      _direct: 2.4,
-      _xdirect: 0,
-      _simple: 2,
-      _actual: 4.4,
-    });
-  });
-  test('Get calculated Item: included: true, sample 3', () => {
-    const modifiers = [
-      {
-        _id: 12323,
-        compute: {
-          amount: 2,
-          type: 'fixed',
-          action: 'subtract',
-        },
-        name: 'modifier1',
-        type: 'discount',
-        properties: {
-          sort: 1,
-        },
-        included: true,
-        direct: true,
-      },
-      {
-        _id: 5555,
-        compute: {
-          amount: 2,
-          type: 'fixed',
-          action: 'add',
-        },
-        name: 'modifier1',
-        type: 'upcharge',
-        included: true,
-        direct: true,
-        properties: {
-          sort: 1,
-        },
-      },
-      {
-        _id: 77777,
-        compute: {
-          amount: 10,
-          type: 'percentage',
-          action: 'add',
-        },
-        name: 'modifier2',
-        type: 'tax',
-        properties: {
-          sort: 2,
-        },
-        included: true,
-        direct: true,
-      },
-      {
-        _id: 8888,
-        compute: {
-          amount: 6,
-          type: 'percentage',
-          action: 'add',
-        },
-        name: 'modifier3',
-        type: 'tax',
-        properties: {
-          sort: 2,
-        },
-        included: true,
-        direct: true,
-      },
-    ];
-    const orderItem = { price: 2, quantity: 1, modifiers };
-    const newItem = pricingService.item.calculate(orderItem);
-    expect(newItem).toHaveProperty('total', 2.32);
-    expect(newItem).toHaveProperty('subTotals', {
-      _xdirect: 0,
-      _simple: 2,
-      _actual: 2.32,
-      _direct: 0.32,
-      _included: 0.32,
-      _xincluded: 0,
-    });
-  });
-
-  test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true percentageDiscount16', () => {
-    const percentageDiscount16 = {
-      compute: {
-        amount: 16,
-        type: 'percentage',
-        action: 'subtract',
-      },
-      properties: {
-        extractCalculatedValue: true,
-      },
-      name: 'percentageDiscount16',
-      type: 'discount',
-    };
-
-    const orderItem = {
-      price: 116,
-      quantity: 1,
-      modifiers: [percentageDiscount16],
-    };
-    const newItem = pricingService.item.calculate(orderItem);
-
-    expect(newItem).toHaveProperty('total', 116);
-    expect(newItem).toHaveProperty('price', 116);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: -22.095238095238095,
-      description: 'percentageDiscount16 (-$22.10)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      discount: -22.095238095238095,
-      _included: 0,
-      _xincluded: -22.095238095238095,
-      _direct: 0,
-      _xdirect: -22.095238095238095,
-      _simple: 138.0952380952381,
-      _actual: 138.0952380952381,
-    });
-  });
-
-  test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true percentageFee16', () => {
-    const percentageFee16 = {
-      compute: {
-        amount: 16,
-        type: 'percentage',
-        action: 'add',
-      },
-      properties: {
-        extractCalculatedValue: true,
-      },
-      name: 'percentageFee16',
-      type: 'tax',
-    };
-
-    const orderItem = { price: 116, quantity: 1, modifiers: [percentageFee16] };
-    const newItem = pricingService.item.calculate(orderItem);
-
-    expect(newItem).toHaveProperty('total', 116);
-    expect(newItem).toHaveProperty('price', 116);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 16,
-      description: 'percentageFee16 ($16.00)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      tax: 16,
-      _included: 0,
-      _xincluded: 16,
-      _direct: 0,
-      _xdirect: 16,
-      _simple: 100,
-      _actual: 100,
-    });
-  });
-
-  test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true fixedDiscount16', () => {
-    const fixedDiscount16 = {
-      compute: {
-        amount: 16,
-        type: 'fixed',
-        action: 'subtract',
-      },
-      properties: {
-        extractCalculatedValue: true,
-      },
-      name: 'fixedDiscount16',
-      type: 'discount',
-    };
-
-    const orderItem = {
-      price: 116,
-      quantity: 1,
-      modifiers: [fixedDiscount16],
-    };
-    const newItem = pricingService.item.calculate(orderItem);
-
-    expect(newItem).toHaveProperty('total', 116);
-    expect(newItem).toHaveProperty('price', 116);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: -16,
-      description: 'fixedDiscount16 (-$16.00)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      discount: -16,
-      _included: 0,
-      _xincluded: -16,
-      _direct: 0,
-      _xdirect: -16,
-      _simple: 132,
-      _actual: 132,
-    });
-  });
-
-  test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true fixedFee16', () => {
-    const fixedFee16 = {
-      compute: {
-        amount: 16,
-        type: 'fixed',
-        action: 'add',
-      },
-      properties: {
-        extractCalculatedValue: true,
-      },
-      name: 'fixedFee16',
-      type: 'tax',
-    };
-
-    const orderItem = {
-      price: 116,
-      quantity: 1,
-      modifiers: [fixedFee16],
-    };
-    const newItem = pricingService.item.calculate(orderItem);
-
-    expect(newItem).toHaveProperty('total', 116);
-    expect(newItem).toHaveProperty('price', 116);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 16,
-      description: 'fixedFee16 ($16.00)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      tax: 16,
-      _included: 0,
-      _xincluded: 16,
-      _direct: 0,
-      _xdirect: 16,
-      _simple: 100,
-      _actual: 100,
-    });
-  });
-
-  test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true fixedFee16 and other fixed fee of 10%', () => {
-    const fixedFee16 = {
-      compute: {
-        amount: 16,
-        type: 'fixed',
-        action: 'add',
-      },
-      properties: {
-        extractCalculatedValue: true,
-      },
-      name: 'fixedFee16',
-      type: 'tax',
-      modifierId: '11111',
-      _id: '123',
-    };
-
-    const fixedFee10 = {
-      compute: {
-        amount: 10,
-        type: 'fixed',
-        action: 'add',
-      },
-      name: 'fixedFee10',
-      type: 'tax',
-      modifierId: '22222',
-      _id: '234',
-    };
-
-    const orderItem = {
-      price: 116,
-      quantity: 1,
-      modifiers: [fixedFee16, fixedFee10],
-    };
-    const newItem = pricingService.item.calculate(orderItem);
-
-    expect(newItem).toHaveProperty('total', 126);
-    expect(newItem).toHaveProperty('price', 116);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 16,
-      description: 'fixedFee16 ($16.00)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      tax: 26,
-      _included: 0,
-      _xincluded: 26,
-      _direct: 0,
-      _xdirect: 26,
-      _simple: 100,
-      _actual: 100,
-    });
-  });
-
-  test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true fixedFee16 and other percentage fee of 10%', () => {
-    const fixedFee16 = {
-      compute: {
-        amount: 16,
-        type: 'fixed',
-        action: 'add',
-      },
-      properties: {
-        extractCalculatedValue: true,
-      },
-      name: 'fixedFee16',
-      type: 'tax',
-      _id: '123',
-      modifierId: 1111,
-    };
-
-    const percentageFee10 = {
-      compute: {
-        amount: 10,
-        type: 'percentage',
-        action: 'add',
-      },
-      name: 'percentageFee10',
-      type: 'tax',
-      _id: '234',
-      modifierId: 222,
-    };
-
-    const orderItem = {
-      price: 116,
-      quantity: 1,
-      modifiers: [fixedFee16, percentageFee10],
-    };
-    const newItem = pricingService.item.calculate(orderItem);
-
-    expect(newItem).toHaveProperty('total', 126);
-    expect(newItem).toHaveProperty('price', 116);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 16,
-      description: 'fixedFee16 ($16.00)',
-    });
-    expect(newItem.modifiers[1]).toHaveProperty('_computed', {
-      amount: 10,
-      description: 'percentageFee10 ($10.00)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      tax: 26,
-      _included: 0,
-      _xincluded: 26,
-      _direct: 0,
-      _xdirect: 26,
-      _simple: 100,
-      _actual: 100,
-    });
-  });
-  test('CU-86dvbn63z: Calculate item with quantity > 1 and modifierAmountFixed10', () => {
-    const itemWithModifierAmountFixed10 = {
-      name: "Men's 3pc Tuxedo",
-      pieces: 3,
-      total: 53.03,
-      price: 13.5,
-      quantity: 3,
-      modifiers: [
-        {
-          _id: '675354ee39a47228afd1f1a4',
-          attributes: ['override'],
-          modifierId: '6751f7eeb60c71cefee138ee',
-          name: 'Override modamount fixed 10',
-          group: 'Upcharge',
-          type: 'fee',
-          tags: ['default', 'all'],
-          direct: true,
-          properties: {
-            override: {
-              type: 'fixed',
-              field: 'amount',
-              fixedValue: 10,
-              multiplier: false,
-            },
-          },
-          compute: { type: 'fixed', amount: 10, action: 'add' },
-        },
-      ],
-      _id: '675354e939a47228afd1f199',
-
-      itemId: '62cdbfd01ee1b400193281ee',
-    };
-    const newItem = pricingService.item.calculate(
-      itemWithModifierAmountFixed10
-    );
-
-    expect(newItem).toHaveProperty('total', 50.5);
-    expect(newItem).toHaveProperty('price', 13.5);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 10,
-      description: 'Override modamount fixed 10 ($10.00)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      fee: 10,
-      _included: 0,
-      _xincluded: 10,
-      _direct: 10,
-      _xdirect: 0,
-      _simple: 40.5,
-      _actual: 40.5,
-    });
-  });
-
-  test('CU-86dvbn63z: Calculate item with quantity > 1 and modifierAmountFixed10 Multiplier', () => {
-    const itemWithModifierAmountFixed10Multiplier = {
-      name: "Men's 3pc Tuxedo",
-      pieces: 3,
-      total: 53.03,
-      price: 13.5,
-      quantity: 3,
-      modifiers: [
-        {
-          _id: '675354ee39a47228afd1f1a4',
-          attributes: ['override'],
-          modifierId: '6751f7eeb60c71cefee138ee',
-          name: 'Override modamount fixed 10',
-          group: 'Upcharge',
-          type: 'fee',
-          tags: ['default', 'all'],
-          direct: true,
-          properties: {
-            override: {
-              type: 'fixed',
-              field: 'amount',
-              fixedValue: 10,
-              multiplier: true,
-            },
-          },
-        },
-      ],
-      _id: '675354e939a47228afd1f199',
-
-      itemId: '62cdbfd01ee1b400193281ee',
-    };
-    const newItem = pricingService.item.calculate(
-      itemWithModifierAmountFixed10Multiplier
-    );
-
-    expect(newItem).toHaveProperty('total', 70.5);
-    expect(newItem).toHaveProperty('price', 13.5);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 30,
-      description: 'Override modamount fixed 10 ($30.00)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      fee: 30,
-      _included: 0,
-      _xincluded: 30,
-      _direct: 30,
-      _xdirect: 0,
-      _simple: 40.5,
-      _actual: 40.5,
-    });
-  });
-
-  test('CU-86dvbn63z: Calculate item with quantity > 1 and quantity override modifier', () => {
-    const quantityOverrideMod = {
-      _id: '67535f3ab4c5ea63d2d7964b',
-      attributes: ['override'],
-      modifierId: '675359b5d08f91f558233f85',
-      name: 'Override Item Quantity 5',
-      group: 'Upcharge',
-      type: 'tax',
-      tags: ['default'],
-      direct: true,
-      properties: {
-        subscription: {},
-        override: { type: 'fixed', field: 'quantity', fixedValue: 5 },
-        group: { items: [], modifiers: [] },
-        department: {},
-        sort: null,
-      },
-      compute: null,
-    };
-    const itemWithQuantityOverride5 = {
-      name: "Men's 3pc Tuxedo",
-      pieces: 3,
-      total: 70.88,
-      price: 13.5,
-      quantity: 3,
-      modifiers: [quantityOverrideMod],
-      _id: '67535f34b4c5ea63d2d79640',
-      itemId: '62cdbfd01ee1b400193281ee',
-      menuRuleId: '65660855dfffaf2da26fb870',
-      __typename: 'OrderItem',
-    };
-    let newItem = pricingService.item.calculate(itemWithQuantityOverride5);
-
-    expect(newItem).toHaveProperty('total', 67.5);
-    expect(newItem).toHaveProperty('price', 13.5);
-    expect(newItem).toHaveProperty('quantity', 5);
-
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 0,
-      description: 'Override Item Quantity 5',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      _included: 0,
-      _xincluded: 0,
-      _direct: 0,
-      _xdirect: 0,
-      _simple: 67.5,
-      _actual: 67.5,
-    });
-
-    newItem = pricingService.item.calculate(
-      pricingService.item.removeModifiers({
-        item: newItem,
-        modifiers: [quantityOverrideMod],
-        customer: undefined,
-        order: { items: [newItem] },
-      })
-    );
-    expect(newItem.price).toBe(13.5);
-    expect(newItem.total).toBe(40.5);
-    expect(newItem.quantity).toBe(3);
-
-    expect(newItem.modifiers.length).toBe(0);
-
-    expect(newItem).toHaveProperty('subTotals', {
-      _included: 0,
-      _xincluded: 0,
-      _direct: 0,
-      _xdirect: 0,
-      _simple: 40.5,
-      _actual: 40.5,
-    });
-  });
-
-  test('CU-86dvbn63z: Calculate item with quantity > 1 and modifieritemPriceFixed10', () => {
-    const itemWithModifierAmountFixed10 = {
-      name: "Men's 3pc Tuxedo",
-      pieces: 3,
-      price: 10,
-      quantity: 3,
-      modifiers: [
-        {
-          _id: '675354ee39a47228afd1f1a4',
-          attributes: ['override'],
-          modifierId: '6751f7eeb60c71cefee138ee',
-          name: 'Override item price fixed 10',
-          group: 'Upcharge',
-          type: 'fee',
-          tags: ['default', 'all'],
-          direct: true,
-          properties: {
-            override: {
-              type: 'fixed',
-              field: 'price',
-              fixedValue: 10,
-              multiplier: false,
-            },
-          },
-        },
-      ],
-      _id: '675354e939a47228afd1f199',
-
-      itemId: '62cdbfd01ee1b400193281ee',
-    };
-    const newItem = pricingService.item.calculate(
-      itemWithModifierAmountFixed10
-    );
-
-    expect(newItem).toHaveProperty('total', 30);
-    expect(newItem).toHaveProperty('price', 10);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 0,
-      description: 'Override item price fixed 10 ($10.00/Unit)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      _included: 0,
-      _xincluded: 0,
-      _direct: 0,
-      _xdirect: 0,
-      _simple: 30,
-      _actual: 30,
-    });
-  });
-
-  test('CU-86dvbn63z: Calculate item with quantity > 1 and modifieritemPriceFixed1 multiplier', () => {
-    const item = {
-      name: "Men's 3pc Tuxedo",
-      pieces: 3,
-      total: 141.75,
-      price: 13.5,
-      quantity: 1,
-      modifiers: [
-        {
-          _id: '67536495bc57ccecf751a5dc',
-          attributes: ['override'],
-          modifierId: '6751e9c0b60c71cefee0c3cc',
-          _parentId: null,
-          locked: false,
-          name: 'Override Item Price 10 USD Multiplier',
-          group: 'Upcharge',
-          type: 'fee',
-          tags: ['default', 'all'],
-
-          direct: true,
-
-          properties: {
-            override: {
-              type: 'fixed',
-              field: 'price',
-              fixedValue: 10,
-              multiplier: true,
-            },
-          },
-        },
-      ],
-      _id: '675360d5bc57ccecf751a5b5',
-      itemId: '62cdbfd01ee1b400193281ee',
-    };
-    const newItem = pricingService.item.calculate(item);
-
-    expect(newItem).toHaveProperty('total', 135);
-    expect(newItem).toHaveProperty('price', 135);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 0,
-      description:
-        'Override Item Price 10 USD Multiplier (10 Unit @ $13.50/Unit)',
-    });
-
-    expect(newItem).toHaveProperty('subTotals', {
-      _included: 0,
-      _xincluded: 0,
-      _direct: 0,
-      _xdirect: 0,
-      _simple: 135,
-      _actual: 135,
-    });
-  });
-
-  test('Remove Item', () => {
-    const item1 = {
-      _id: '1',
-    };
-    const item2 = {
-      _id: '2',
-    };
-
-    const order = {
-      items: [item1, item2],
-    };
-    const result = pricingService.order.removeItem({ order, item: item2 });
-
-    expect(result.items).toMatchObject([{ _id: '1' }]);
-  });
-
-  test('Remove related Item', () => {
-    const item1 = {
-      _id: '1',
-      itemId: 'a',
-    };
-    const item2 = {
-      _id: '2',
-    };
-    const item3 = {
-      _id: '3',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-
-    const order = {
-      items: [item1, item2, item3],
-    };
-    const result = pricingService.order.removeItem({ order, item: item3 });
-
-    expect(result.items).toMatchObject([
-      {
-        _id: '1',
-      },
-      {
-        _id: '2',
-      },
-    ]);
-  });
-
-  test('Remove parent Item having 1 related item', () => {
-    const item1 = {
-      _id: '1',
-      itemId: 'a',
-    };
-    const item2 = {
-      _id: '2',
-    };
-    const item3 = {
-      _id: '3',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-
-    const order = {
-      items: [item1, item2, item3],
-    };
-    const result = pricingService.order.removeItem({ order, item: item1 });
-
-    expect(result.items).toMatchObject([
-      {
-        _id: '2',
-      },
-    ]);
-  });
-
-  test('Remove parent Item, having more than 1 related item', () => {
-    const item1 = {
-      _id: '1',
-      itemId: 'a',
-    };
-    const item2 = {
-      _id: '2',
-    };
-    const item3 = {
-      _id: '3',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-    const item4 = {
-      _id: '4',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-
-    const order = {
-      items: [item1, item2, item3, item4],
-    };
-    const result = pricingService.order.removeItem({ order, item: item1 });
-
-    expect(result.items).toMatchObject([
-      {
-        _id: '2',
-      },
-    ]);
-  });
-
-  test('Remove related Item, having nested related items', () => {
-    const item1 = {
-      _id: '1',
-      itemId: 'a',
-    };
-    const item2 = {
-      _id: '2',
-    };
-    const item3 = {
-      _id: '3',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-    const item4 = {
-      _id: '4',
-      itemId: 'd',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-
-    const nestedItem5 = {
-      _id: '5',
-      properties: {
-        relatedItem: true,
-        parentId: item4._id,
-        parentItemId: item4.itemId,
-      },
-    };
-
-    const order = {
-      items: [item1, item2, item3, item4, nestedItem5],
-    };
-    const result = pricingService.order.removeItem({
-      order,
-      item: nestedItem5,
-    });
-
-    expect(result.items).toMatchObject([item1, item2, item3, item4]);
-  });
-
-  test('Remove related Item, having nested related items 2', () => {
-    const item1 = {
-      _id: '1',
-      itemId: 'a',
-    };
-    const item2 = {
-      _id: '2',
-    };
-    const item3 = {
-      _id: '3',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-    const item4 = {
-      _id: '4',
-      itemId: 'd',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-
-    const nestedItem5 = {
-      _id: '5',
-      properties: {
-        relatedItem: true,
-        parentId: item4._id,
-        parentItemId: item4.itemId,
-      },
-    };
-
-    const nestedItem6 = {
-      _id: '6',
-      properties: {
-        relatedItem: true,
-        parentId: item4._id,
-        parentItemId: item4.itemId,
-      },
-    };
-
-    const order = {
-      items: [item1, item2, item3, item4, nestedItem5, nestedItem6],
-    };
-    const result = pricingService.order.removeItem({
-      order,
-      item: nestedItem5,
-    });
-
-    expect(result.items).toMatchObject([
-      item1,
-      item2,
-      item3,
-      item4,
-      nestedItem6,
-    ]);
-  });
-
-  test('Remove parent related Item, having nested related items', () => {
-    const item1 = {
-      _id: '1',
-      itemId: 'a',
-    };
-    const item2 = {
-      _id: '2',
-    };
-    const item3 = {
-      _id: '3',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-    const item4 = {
-      _id: '4',
-      itemId: 'd',
-      properties: {
-        relatedItem: true,
-        parentId: item1._id,
-        parentItemId: item1.itemId,
-      },
-    };
-
-    const nestedItem5 = {
-      _id: '5',
-      properties: {
-        relatedItem: true,
-        parentId: item4._id,
-        parentItemId: item4.itemId,
-      },
-    };
-
-    const nestedItem6 = {
-      _id: '6',
-      properties: {
-        relatedItem: true,
-        parentId: item4._id,
-        parentItemId: item4.itemId,
-      },
-    };
-
-    const order = {
-      items: [item1, item2, item3, item4, nestedItem5, nestedItem6],
-    };
-    const result = pricingService.order.removeItem({ order, item: item1 });
-
-    expect(result.items).toMatchObject([item2]);
-  });
-
-  test('Should add related item and its related addModifiers to the parent item, then removing that relateditem should also remove the mod from the parent item', () => {
-    const rawRelatedItem1 = {
-      name: 'the related item',
-      _id: '67e2cadd8dcf08ebcc5ef888',
-    };
-
-    const rawRelatedItem2 = {
-      name: 'the 2nd related item',
-      _id: '67e2cadd8dcf08ebcc5ef88a',
-    };
-
-    const groupMod = {
-      _id: '67e2cadd8dcf08ebcc5ef889',
-      name: 'General Repair Department',
-      attributes: ['group'],
-      modifierId: 'mod1',
-      properties: {
-        group: {
-          items: [],
-        },
-      },
-    };
-
-    const parentItem = {
-      name: 'the parent item',
-      modifiers: [groupMod],
-      _id: '67e2cadd8dcf08ebcc5ef887',
-      __typename: 'OrderItem',
-    };
-
-    const relatedItem1 = {
-      ...rawRelatedItem1,
-      properties: {
-        relatedItem: true,
-        parentId: parentItem._id,
-        includeParent: true,
-        addModifiers: [groupMod],
-        groupPath: ',67e2cadd8dcf08ebcc5ef889',
-      },
-      __typename: 'OrderItem',
-    };
-
-    const relatedItem2 = {
-      ...rawRelatedItem2,
-      properties: {
-        relatedItem: true,
-        parentId: parentItem._id,
-        includeParent: true,
-        addModifiers: [groupMod],
-        groupPath: ',67e2cadd8dcf08ebcc5ef889',
-      },
-      __typename: 'OrderItem',
-    };
-    const order = {
-      items: [parentItem, relatedItem1, relatedItem2],
-    };
-
-    const result = pricingService.order.removeItem({
-      order,
-      item: relatedItem2,
-    });
-
-    expect(result.items.length).toBe(2);
-    expect(result.items[0].modifiers.length).toBe(1);
-    expect(result.items[0].modifiers[0].modifierId).toBe('mod1');
-
-    const result2 = pricingService.order.removeItem({
-      order: result,
-      item: relatedItem1,
-    });
-
-    expect(result2.items.length).toBe(1);
-    expect(result2.items[0].modifiers.length).toBe(0);
-  });
-
-  test('Should not remove the group modifier if it still hasModifiers', () => {
-    const rawRelatedItem1 = {
-      name: 'the related item',
-      _id: '67e2cadd8dcf08ebcc5ef888',
-    };
-
-    const rawRelatedItem2 = {
-      name: 'the 2nd related item',
-      _id: '67e2cadd8dcf08ebcc5ef88a',
-    };
-
-    const rawRelatedMod1 = {
-      name: 'related modifier',
-      _id: '123',
-      modifierId: 'abc',
-      addModifiers: [
-        {
-          _id: '67e2cadd8dcf08ebcc5ef889',
-          name: 'General Repair Department',
-          attributes: ['group'],
-          modifierId: 'mod1',
-          properties: {
-            group: {
-              items: [],
-            },
-          },
-        },
-      ],
-    };
-
-    const groupMod = {
-      _id: '67e2cadd8dcf08ebcc5ef889',
-      name: 'General Repair Department',
-      attributes: ['group'],
-      modifierId: 'mod1',
-      properties: {
-        group: {
-          items: [],
-          modifiers: [],
-        },
-      },
-    };
-
-    const parentItem = {
-      name: 'the parent item',
-      modifiers: [groupMod, rawRelatedMod1],
-      _id: '67e2cadd8dcf08ebcc5ef887',
-      __typename: 'OrderItem',
-    };
-
-    const relatedItem1 = {
-      ...rawRelatedItem1,
-      properties: {
-        relatedItem: true,
-        parentId: parentItem._id,
-        includeParent: true,
-        addModifiers: [groupMod],
-        groupPath: ',67e2cadd8dcf08ebcc5ef889',
-      },
-      __typename: 'OrderItem',
-    };
-
-    const relatedItem2 = {
-      ...rawRelatedItem2,
-      properties: {
-        relatedItem: true,
-        parentId: parentItem._id,
-        includeParent: true,
-        addModifiers: [groupMod],
-        groupPath: ',67e2cadd8dcf08ebcc5ef889',
-      },
-      __typename: 'OrderItem',
-    };
-    const order = {
-      items: [parentItem, relatedItem1, relatedItem2],
-    };
-
-    const newItem = pricingService.item.removeModifiers({
-      item: parentItem,
-      modifiers: [rawRelatedMod1],
-      originalItem: parentItem,
-      customer: undefined,
-      order,
-    });
-
-    expect(newItem.modifiers.length).toBe(1);
-    expect(newItem.modifiers[0].name).toBe('General Repair Department');
-  });
-
-  test('1- Item total should not be below 0, having price override modifiers', () => {
-    const order = {
-      _id: '685c2d2bd7f68fccd07af8c7',
-      tax: 0,
-      modifiers: [],
-      discount: 0,
-      total: -2.28,
-      fee: 0,
-      items: [
-        {
-          name: 'Pants',
-          description: null,
-          pieces: 1,
-          modifiersTotalAmount: 0,
-          total: -2.28,
-          totalPaid: 0,
-          price: 0,
-          quantity: 1,
-          notes: [],
-          modifiers: [
-            {
-              _id: '685c2d64d7f68fccd07af8cd',
-              attributes: ['override'],
-              modifierId: '67fea241af24e570c032b40d',
-              _parentId: null,
-              locked: false,
-              name: 'No Clean',
-              tags: ['default'],
-              order: 0,
-              included: false,
-              direct: true,
-              default: true,
-              code: null,
-              properties: {
-                override: {
-                  field: 'price',
-                  type: 'fixed',
-                  multiplier: true,
-                  fixedValue: 0,
-                },
-                group: null,
-                department: null,
-                url: null,
-                color: null,
-                label: {
-                  backgroundColor: null,
-                  align: null,
-                },
-                sort: null,
-              },
-              compute: null,
-              __typename: 'Modifier',
-              addModifiers: [],
-              delModifiers: [],
-            },
-            {
-              _id: '685c2d65d7f68fccd07af8ce',
-              attributes: [],
-              modifierId: '67fea241af24e570c032b324',
-              _parentId: null,
-              locked: false,
-              name: '30% Family Discount',
-              type: 'discount',
-              tags: ['default'],
-              order: 0,
-              included: false,
-              direct: true,
-              hidden: false,
-              print: true,
-              required: false,
-              recommended: false,
-              default: false,
-              code: null,
-              properties: {
-                group: null,
-                department: null,
-                url: null,
-                color: null,
-                label: {
-                  backgroundColor: null,
-                  align: null,
-                },
-                sort: null,
-                isQuantityMultiplier: true,
-              },
-              compute: {
-                type: 'percentage',
-                action: 'subtract',
-                amount: 30,
-              },
-              __typename: 'Modifier',
-              addModifiers: [],
-              delModifiers: [],
-            },
-          ],
-          weight: 0,
-          properties: {
-            overwrittenPrice: 7.59,
-          },
-        },
-      ],
-      customer: {
-        _id: '67feae8eeb5aa1e1848374b9',
-        tags: ['default'],
-      },
-    };
-
-    const calculatedOrder = pricingService.order.calculate(order);
-
-    expect(calculatedOrder.total).toBe(0);
-    expect(calculatedOrder.items[0].price).toBe(0);
-    expect(calculatedOrder.items[0].total).toBe(0);
-    expect(calculatedOrder.items[0].modifiers[0]._computed.description).toBe(
-      'No Clean (0 Unit @ $0.00/Unit)'
-    );
-    expect(calculatedOrder.items[0].modifiers[1]._computed.description).toBe(
-      '30% Family Discount'
-    );
-  });
-
-  test('2- Item total should not be below 0, having price override modifiers', () => {
-    const order = {
-      _id: '685c2d2bd7f68fccd07af8c7',
-      tax: 0,
-      modifiers: [],
-      discount: 0,
-      total: -2.28,
-      fee: 0,
-      items: [
-        {
-          name: 'Pants',
-          description: null,
-          pieces: 1,
-          modifiersTotalAmount: 0,
-          total: -2.28,
-          totalPaid: 0,
-          price: 0,
-          quantity: 1,
-          notes: [],
-          modifiers: [
-            {
-              _id: '685c2d65d7f68fccd07af8ce',
-              attributes: [],
-              modifierId: '67fea241af24e570c032b324',
-              _parentId: null,
-              locked: false,
-              name: '30% Family Discount',
-              type: 'discount',
-              tags: ['default'],
-              order: 0,
-              included: false,
-              direct: true,
-              hidden: false,
-              print: true,
-              required: false,
-              recommended: false,
-              default: false,
-              code: null,
-              properties: {
-                group: null,
-                department: null,
-                url: null,
-                color: null,
-                label: {
-                  backgroundColor: null,
-                  align: null,
-                },
-                sort: null,
-                isQuantityMultiplier: true,
-              },
-              compute: {
-                type: 'percentage',
-                action: 'subtract',
-                amount: 30,
-              },
-              __typename: 'Modifier',
-              addModifiers: [],
-              delModifiers: [],
-            },
-            {
-              _id: '685c2d64d7f68fccd07af8cd',
-              attributes: ['override'],
-              modifierId: '67fea241af24e570c032b40d',
-              _parentId: null,
-              locked: false,
-              name: 'No Clean',
-              tags: ['default'],
-              order: 0,
-              included: false,
-              direct: true,
-              default: true,
-              code: null,
-              properties: {
-                override: {
-                  field: 'price',
-                  type: 'fixed',
-                  multiplier: true,
-                  fixedValue: 0,
-                },
-                group: null,
-                department: null,
-                url: null,
-                color: null,
-                label: {
-                  backgroundColor: null,
-                  align: null,
-                },
-                sort: null,
-              },
-              compute: null,
-              __typename: 'Modifier',
-              addModifiers: [],
-              delModifiers: [],
-            },
-          ],
-          weight: 0,
-          properties: {
-            overwrittenPrice: 7.59,
-          },
-        },
-      ],
-      customer: {
-        _id: '67feae8eeb5aa1e1848374b9',
-        tags: ['default'],
-      },
-    };
-
-    const calculatedOrder = pricingService.order.calculate(order);
-
-    expect(calculatedOrder.total).toBe(0);
-    expect(calculatedOrder.items[0].price).toBe(0);
-    expect(calculatedOrder.items[0].total).toBe(0);
-
-    expect(calculatedOrder.items[0].modifiers[0]._computed.description).toBe(
-      '30% Family Discount'
-    );
-    expect(calculatedOrder.items[0].modifiers[1]._computed.description).toBe(
-      'No Clean (0 Unit @ $0.00/Unit)'
-    );
-  });
-
-  test('Should not apply modifier value when extractCalculatedValue is true but modifier is invalid', () => {
-    const prepayDiscount50Percent = {
-      compute: {
-        amount: 50,
-        type: 'percentage',
-        action: 'subtract',
-      },
-      properties: {
-        extractCalculatedValue: true,
-      },
-      conditions: {
-        valid: null,
-        rules: [
-          {
-            key: 'payment',
-            value: 'prepay',
-            operand: '$in',
-          },
-        ],
-      },
-      name: 'percentageDiscount50',
-      type: 'discount',
-    };
-
-    const orderItem = {
-      price: 7.59,
-      quantity: 1,
-      modifiers: [prepayDiscount50Percent],
-    };
-    const order = {
-      items: [orderItem],
-    };
-
-    const calculatedOrder = pricingService.order.calculate(order);
-
-    expect(calculatedOrder.total).toBe(7.59);
-    expect(calculatedOrder.items[0].price).toBe(7.59);
-    expect(calculatedOrder.items[0].total).toBe(7.59);
-    expect(calculatedOrder.items[0].modifiers.length).toBe(1);
-    expect(calculatedOrder.items[0].modifiers[0]._computed).toMatchObject({
-      amount: 0,
-      description: 'percentageDiscount50',
-    });
-  });
-
-  test('Should apply modifier value when extractCalculatedValue is true and modifier is valid', () => {
-    const prepayDiscount50Percent = {
-      compute: {
-        amount: 50,
-        type: 'percentage',
-        action: 'subtract',
-      },
-      properties: {
-        extractCalculatedValue: true,
-      },
-      name: 'percentageDiscount50',
-      type: 'discount',
-    };
-
-    const orderItem = {
-      price: 7.59,
-      quantity: 1,
-      modifiers: [prepayDiscount50Percent],
-    };
-    const order = {
-      items: [orderItem],
-    };
-
-    const calculatedOrder = pricingService.order.calculate(order);
-
-    expect(calculatedOrder.total).toBe(7.59);
-    expect(calculatedOrder.items[0].price).toBe(7.59);
-    expect(calculatedOrder.items[0].total).toBe(7.59);
-    expect(calculatedOrder.items[0].modifiers.length).toBe(1);
-    expect(calculatedOrder.items[0].modifiers[0]._computed).toMatchObject({
-      amount: -7.59,
-      description: 'percentageDiscount50 (-$7.59)',
-    });
-  });
-
-  test('Should apply modifier value when extractCalculatedValue is true and modifier is valid (being also a payment modifier)', () => {
-    const prepayDiscount50Percent = {
-      compute: {
-        amount: 50,
-        type: 'percentage',
-        action: 'subtract',
-      },
-      properties: {
-        extractCalculatedValue: true,
-      },
-      conditions: {
-        valid: null,
-        rules: [
-          {
-            key: 'payment',
-            value: 'prepay',
-            operand: '$in',
-          },
-        ],
-      },
-      name: 'percentageDiscount50',
-      type: 'discount',
-    };
-
-    const orderItem = {
-      price: 7.59,
-      quantity: 1,
-      modifiers: [prepayDiscount50Percent],
-    };
-    const order = {
-      items: [orderItem],
-    };
-
-    const calculatedOrder = pricingService.order.calculate(order, {
-      isPrepay: true,
-    });
-
-    expect(calculatedOrder.total).toBe(7.59);
-    expect(calculatedOrder.items[0].price).toBe(7.59);
-    expect(calculatedOrder.items[0].total).toBe(7.59);
-    expect(calculatedOrder.items[0].modifiers.length).toBe(2);
-
-    expect(calculatedOrder.items[0].modifiers[0]._computed).toMatchObject({
-      amount: 0,
-      description: 'percentageDiscount50',
-    });
-    expect(calculatedOrder.items[0].modifiers[1]._computed).toMatchObject({
-      amount: -7.59,
-      description: '$7.59 discount (-$7.59)',
-    });
-  });
-
-  test('Should use a price override modifier and quantity override modifier in combination accordingly', () => {
+  // test('Get calculated Item: included: false && direct: false', () => {
+  //   const modifiers = [
+  //     {
+  //       _id: 1111,
+  //       compute: {
+  //         amount: 20,
+  //         type: 'percentage',
+  //         action: 'add',
+  //       },
+  //       name: 'modifier1',
+  //       type: 'discount',
+  //       direct: false,
+  //       included: false,
+  //       properties: {
+  //         isQuantityMultiplier: true,
+  //       },
+  //     },
+  //     {
+  //       _id: 2222,
+  //       compute: {
+  //         amount: 20,
+  //         type: 'percentage',
+  //         action: 'subtract',
+  //       },
+  //       name: 'modifier2',
+  //       type: 'discount',
+  //       direct: false,
+  //       included: false,
+  //       properties: {
+  //         isQuantityMultiplier: true,
+  //       },
+  //     },
+  //     {
+  //       _id: 3333,
+  //       compute: {
+  //         amount: 2,
+  //         type: 'fixed',
+  //         action: 'subtract',
+  //       },
+  //       name: 'modifier3',
+  //       type: 'discount',
+  //       direct: false,
+  //       included: false,
+  //       properties: {
+  //         isQuantityMultiplier: true,
+  //       },
+  //     },
+  //   ];
+  //   const orderItem = { price: 30, quantity: 2, modifiers };
+  //   const newItem = pricingService.item.calculate(orderItem);
+  //   expect(newItem).toHaveProperty('total', 56);
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     discount: -4,
+  //     _included: 0,
+  //     _xincluded: -4,
+  //     _direct: 0,
+  //     _xdirect: -4,
+  //     _simple: 60,
+  //     _actual: 60,
+  //   });
+  // });
+  // test('Get calculated Item: included: false && direct: true', () => {
+  //   const modifiers = [
+  //     {
+  //       _id: '123213213',
+  //       compute: { amount: 2, type: 'fixed', action: 'subtract' },
+  //       type: 'discount',
+  //       name: 'modifier1',
+  //       direct: true,
+  //       included: false,
+  //       properties: {
+  //         isQuantityMultiplier: true,
+  //       },
+  //     },
+  //     {
+  //       _id: '22222',
+  //       compute: {
+  //         amount: 20,
+  //         type: 'percentage',
+  //         action: 'subtract',
+  //       },
+  //       name: 'modifier2',
+  //       type: 'discount',
+  //       direct: true,
+  //       included: false,
+  //       properties: {
+  //         isQuantityMultiplier: true,
+  //       },
+  //     },
+  //     {
+  //       _id: '3333',
+  //       compute: {
+  //         amount: 2,
+  //         type: 'fixed',
+  //         action: 'add',
+  //       },
+  //       name: 'modifier3',
+  //       type: 'tax',
+  //       direct: true,
+  //       included: false,
+  //       properties: {
+  //         isQuantityMultiplier: true,
+  //       },
+  //     },
+  //   ];
+  //   const orderItem = { price: 30, quantity: 2, modifiers };
+  //   const newItem = pricingService.item.calculate(orderItem);
+  //   expect(newItem).toHaveProperty('total', 48);
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     discount: -16,
+  //     tax: 4,
+  //     _included: 0,
+  //     _xincluded: -12,
+  //     _direct: -12,
+  //     _xdirect: 0,
+  //     _simple: 60,
+  //     _actual: 60,
+  //   });
+  // });
+  // test('Get calculated Item: included: true && direct: true', () => {
+  //   const modifiers = [
+  //     {
+  //       _id: '111111',
+  //       compute: {
+  //         amount: 2,
+  //         type: 'fixed',
+  //         action: 'subtract',
+  //       },
+  //       name: 'modifier1',
+  //       type: 'discount',
+  //       direct: true,
+  //       included: true,
+  //       properties: {
+  //         isQuantityMultiplier: true,
+  //       },
+  //     },
+  //     {
+  //       _id: '222222',
+
+  //       compute: {
+  //         amount: 20,
+  //         type: 'percentage',
+  //         action: 'subtract',
+  //       },
+  //       name: 'modifier2',
+  //       type: 'discount',
+  //       direct: true,
+  //       included: true,
+  //       properties: {
+  //         isQuantityMultiplier: true,
+  //       },
+  //     },
+  //     {
+  //       _id: '33333',
+
+  //       compute: {
+  //         amount: 2,
+  //         type: 'fixed',
+  //         action: 'add',
+  //       },
+  //       name: 'modifier3',
+  //       type: 'upcharge',
+  //       direct: true,
+  //       included: true,
+  //       properties: {
+  //         isQuantityMultiplier: true,
+  //       },
+  //     },
+  //   ];
+  //   const orderItem = { price: 30, quantity: 2, modifiers };
+  //   const newItem = pricingService.item.calculate(orderItem);
+  //   expect(newItem).toHaveProperty('total', 48);
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: -12,
+  //     _xincluded: 0,
+  //     _direct: -12,
+  //     _xdirect: 0,
+  //     _simple: 60,
+  //     _actual: 48,
+  //   });
+  // });
+  // test('Get calculated Item: included: true, sample 1', () => {
+  //   const modifiers = [
+  //     {
+  //       compute: {
+  //         amount: 2,
+  //         type: 'fixed',
+  //         action: 'add',
+  //       },
+  //       name: 'modifier1',
+  //       type: 'upcharge',
+  //       included: true,
+  //       direct: true,
+  //     },
+  //   ];
+  //   const orderItem = { price: 2, quantity: 1, modifiers };
+  //   const newItem = pricingService.item.calculate(orderItem);
+  //   expect(newItem).toHaveProperty('total', 4);
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 2,
+  //     _xincluded: 0,
+  //     _direct: 2,
+  //     _xdirect: 0,
+  //     _simple: 2,
+  //     _actual: 4,
+  //   });
+  // });
+  // test('Get calculated Item: included: true, sample 2', () => {
+  //   const modifiers = [
+  //     {
+  //       compute: { amount: 2, type: 'fixed', action: 'add' },
+  //       name: 'modifier1',
+  //       type: 'upcharge',
+  //       included: true,
+  //       direct: true,
+  //       properties: {
+  //         sort: 1,
+  //       },
+  //       _id: '1255115',
+  //     },
+  //     {
+  //       compute: {
+  //         amount: 10,
+  //         type: 'percentage',
+  //         action: 'add',
+  //       },
+  //       name: 'modifier2',
+  //       type: 'tax',
+  //       properties: {
+  //         sort: 2,
+  //       },
+  //       included: true,
+  //       direct: true,
+  //       _id: '2256659',
+  //     },
+  //   ];
+  //   const orderItem = { price: 2, quantity: 1, modifiers };
+  //   const newItem = pricingService.item.calculate(orderItem);
+  //   expect(newItem).toHaveProperty('total', 4.4);
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 2.4,
+  //     _xincluded: 0,
+  //     _direct: 2.4,
+  //     _xdirect: 0,
+  //     _simple: 2,
+  //     _actual: 4.4,
+  //   });
+  // });
+  // test('Get calculated Item: included: true, sample 3', () => {
+  //   const modifiers = [
+  //     {
+  //       _id: 12323,
+  //       compute: {
+  //         amount: 2,
+  //         type: 'fixed',
+  //         action: 'subtract',
+  //       },
+  //       name: 'modifier1',
+  //       type: 'discount',
+  //       properties: {
+  //         sort: 1,
+  //       },
+  //       included: true,
+  //       direct: true,
+  //     },
+  //     {
+  //       _id: 5555,
+  //       compute: {
+  //         amount: 2,
+  //         type: 'fixed',
+  //         action: 'add',
+  //       },
+  //       name: 'modifier1',
+  //       type: 'upcharge',
+  //       included: true,
+  //       direct: true,
+  //       properties: {
+  //         sort: 1,
+  //       },
+  //     },
+  //     {
+  //       _id: 77777,
+  //       compute: {
+  //         amount: 10,
+  //         type: 'percentage',
+  //         action: 'add',
+  //       },
+  //       name: 'modifier2',
+  //       type: 'tax',
+  //       properties: {
+  //         sort: 2,
+  //       },
+  //       included: true,
+  //       direct: true,
+  //     },
+  //     {
+  //       _id: 8888,
+  //       compute: {
+  //         amount: 6,
+  //         type: 'percentage',
+  //         action: 'add',
+  //       },
+  //       name: 'modifier3',
+  //       type: 'tax',
+  //       properties: {
+  //         sort: 2,
+  //       },
+  //       included: true,
+  //       direct: true,
+  //     },
+  //   ];
+  //   const orderItem = { price: 2, quantity: 1, modifiers };
+  //   const newItem = pricingService.item.calculate(orderItem);
+  //   expect(newItem).toHaveProperty('total', 2.32);
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _xdirect: 0,
+  //     _simple: 2,
+  //     _actual: 2.32,
+  //     _direct: 0.32,
+  //     _included: 0.32,
+  //     _xincluded: 0,
+  //   });
+  // });
+
+  // test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true percentageDiscount16', () => {
+  //   const percentageDiscount16 = {
+  //     compute: {
+  //       amount: 16,
+  //       type: 'percentage',
+  //       action: 'subtract',
+  //     },
+  //     properties: {
+  //       extractCalculatedValue: true,
+  //     },
+  //     name: 'percentageDiscount16',
+  //     type: 'discount',
+  //   };
+
+  //   const orderItem = {
+  //     price: 116,
+  //     quantity: 1,
+  //     modifiers: [percentageDiscount16],
+  //   };
+  //   const newItem = pricingService.item.calculate(orderItem);
+
+  //   expect(newItem).toHaveProperty('total', 116);
+  //   expect(newItem).toHaveProperty('price', 116);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: -22.095238095238095,
+  //     description: 'percentageDiscount16 (-$22.10)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     discount: -22.095238095238095,
+  //     _included: 0,
+  //     _xincluded: -22.095238095238095,
+  //     _direct: 0,
+  //     _xdirect: -22.095238095238095,
+  //     _simple: 138.0952380952381,
+  //     _actual: 138.0952380952381,
+  //   });
+  // });
+
+  // test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true percentageFee16', () => {
+  //   const percentageFee16 = {
+  //     compute: {
+  //       amount: 16,
+  //       type: 'percentage',
+  //       action: 'add',
+  //     },
+  //     properties: {
+  //       extractCalculatedValue: true,
+  //     },
+  //     name: 'percentageFee16',
+  //     type: 'tax',
+  //   };
+
+  //   const orderItem = { price: 116, quantity: 1, modifiers: [percentageFee16] };
+  //   const newItem = pricingService.item.calculate(orderItem);
+
+  //   expect(newItem).toHaveProperty('total', 116);
+  //   expect(newItem).toHaveProperty('price', 116);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 16,
+  //     description: 'percentageFee16 ($16.00)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     tax: 16,
+  //     _included: 0,
+  //     _xincluded: 16,
+  //     _direct: 0,
+  //     _xdirect: 16,
+  //     _simple: 100,
+  //     _actual: 100,
+  //   });
+  // });
+
+  // test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true fixedDiscount16', () => {
+  //   const fixedDiscount16 = {
+  //     compute: {
+  //       amount: 16,
+  //       type: 'fixed',
+  //       action: 'subtract',
+  //     },
+  //     properties: {
+  //       extractCalculatedValue: true,
+  //     },
+  //     name: 'fixedDiscount16',
+  //     type: 'discount',
+  //   };
+
+  //   const orderItem = {
+  //     price: 116,
+  //     quantity: 1,
+  //     modifiers: [fixedDiscount16],
+  //   };
+  //   const newItem = pricingService.item.calculate(orderItem);
+
+  //   expect(newItem).toHaveProperty('total', 116);
+  //   expect(newItem).toHaveProperty('price', 116);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: -16,
+  //     description: 'fixedDiscount16 (-$16.00)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     discount: -16,
+  //     _included: 0,
+  //     _xincluded: -16,
+  //     _direct: 0,
+  //     _xdirect: -16,
+  //     _simple: 132,
+  //     _actual: 132,
+  //   });
+  // });
+
+  // test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true fixedFee16', () => {
+  //   const fixedFee16 = {
+  //     compute: {
+  //       amount: 16,
+  //       type: 'fixed',
+  //       action: 'add',
+  //     },
+  //     properties: {
+  //       extractCalculatedValue: true,
+  //     },
+  //     name: 'fixedFee16',
+  //     type: 'tax',
+  //   };
+
+  //   const orderItem = {
+  //     price: 116,
+  //     quantity: 1,
+  //     modifiers: [fixedFee16],
+  //   };
+  //   const newItem = pricingService.item.calculate(orderItem);
+
+  //   expect(newItem).toHaveProperty('total', 116);
+  //   expect(newItem).toHaveProperty('price', 116);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 16,
+  //     description: 'fixedFee16 ($16.00)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     tax: 16,
+  //     _included: 0,
+  //     _xincluded: 16,
+  //     _direct: 0,
+  //     _xdirect: 16,
+  //     _simple: 100,
+  //     _actual: 100,
+  //   });
+  // });
+
+  // test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true fixedFee16 and other fixed fee of 10%', () => {
+  //   const fixedFee16 = {
+  //     compute: {
+  //       amount: 16,
+  //       type: 'fixed',
+  //       action: 'add',
+  //     },
+  //     properties: {
+  //       extractCalculatedValue: true,
+  //     },
+  //     name: 'fixedFee16',
+  //     type: 'tax',
+  //     modifierId: '11111',
+  //     _id: '123',
+  //   };
+
+  //   const fixedFee10 = {
+  //     compute: {
+  //       amount: 10,
+  //       type: 'fixed',
+  //       action: 'add',
+  //     },
+  //     name: 'fixedFee10',
+  //     type: 'tax',
+  //     modifierId: '22222',
+  //     _id: '234',
+  //   };
+
+  //   const orderItem = {
+  //     price: 116,
+  //     quantity: 1,
+  //     modifiers: [fixedFee16, fixedFee10],
+  //   };
+  //   const newItem = pricingService.item.calculate(orderItem);
+
+  //   expect(newItem).toHaveProperty('total', 126);
+  //   expect(newItem).toHaveProperty('price', 116);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 16,
+  //     description: 'fixedFee16 ($16.00)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     tax: 26,
+  //     _included: 0,
+  //     _xincluded: 26,
+  //     _direct: 0,
+  //     _xdirect: 26,
+  //     _simple: 100,
+  //     _actual: 100,
+  //   });
+  // });
+
+  // test('CU-86duwyvrr: Calculate item with modifier.extractCalculatedvalue=true fixedFee16 and other percentage fee of 10%', () => {
+  //   const fixedFee16 = {
+  //     compute: {
+  //       amount: 16,
+  //       type: 'fixed',
+  //       action: 'add',
+  //     },
+  //     properties: {
+  //       extractCalculatedValue: true,
+  //     },
+  //     name: 'fixedFee16',
+  //     type: 'tax',
+  //     _id: '123',
+  //     modifierId: 1111,
+  //   };
+
+  //   const percentageFee10 = {
+  //     compute: {
+  //       amount: 10,
+  //       type: 'percentage',
+  //       action: 'add',
+  //     },
+  //     name: 'percentageFee10',
+  //     type: 'tax',
+  //     _id: '234',
+  //     modifierId: 222,
+  //   };
+
+  //   const orderItem = {
+  //     price: 116,
+  //     quantity: 1,
+  //     modifiers: [fixedFee16, percentageFee10],
+  //   };
+  //   const newItem = pricingService.item.calculate(orderItem);
+
+  //   expect(newItem).toHaveProperty('total', 126);
+  //   expect(newItem).toHaveProperty('price', 116);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 16,
+  //     description: 'fixedFee16 ($16.00)',
+  //   });
+  //   expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+  //     amount: 10,
+  //     description: 'percentageFee10 ($10.00)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     tax: 26,
+  //     _included: 0,
+  //     _xincluded: 26,
+  //     _direct: 0,
+  //     _xdirect: 26,
+  //     _simple: 100,
+  //     _actual: 100,
+  //   });
+  // });
+  // test('CU-86dvbn63z: Calculate item with quantity > 1 and modifierAmountFixed10', () => {
+  //   const itemWithModifierAmountFixed10 = {
+  //     name: "Men's 3pc Tuxedo",
+  //     pieces: 3,
+  //     total: 53.03,
+  //     price: 13.5,
+  //     quantity: 3,
+  //     modifiers: [
+  //       {
+  //         _id: '675354ee39a47228afd1f1a4',
+  //         attributes: ['override'],
+  //         modifierId: '6751f7eeb60c71cefee138ee',
+  //         name: 'Override modamount fixed 10',
+  //         group: 'Upcharge',
+  //         type: 'fee',
+  //         tags: ['default', 'all'],
+  //         direct: true,
+  //         properties: {
+  //           override: {
+  //             type: 'fixed',
+  //             field: 'amount',
+  //             fixedValue: 10,
+  //             multiplier: false,
+  //           },
+  //         },
+  //         compute: { type: 'fixed', amount: 10, action: 'add' },
+  //       },
+  //     ],
+  //     _id: '675354e939a47228afd1f199',
+
+  //     itemId: '62cdbfd01ee1b400193281ee',
+  //   };
+  //   const newItem = pricingService.item.calculate(
+  //     itemWithModifierAmountFixed10
+  //   );
+
+  //   expect(newItem).toHaveProperty('total', 50.5);
+  //   expect(newItem).toHaveProperty('price', 13.5);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 10,
+  //     description: 'Override modamount fixed 10 ($10.00)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     fee: 10,
+  //     _included: 0,
+  //     _xincluded: 10,
+  //     _direct: 10,
+  //     _xdirect: 0,
+  //     _simple: 40.5,
+  //     _actual: 40.5,
+  //   });
+  // });
+
+  // test('CU-86dvbn63z: Calculate item with quantity > 1 and modifierAmountFixed10 Multiplier', () => {
+  //   const itemWithModifierAmountFixed10Multiplier = {
+  //     name: "Men's 3pc Tuxedo",
+  //     pieces: 3,
+  //     total: 53.03,
+  //     price: 13.5,
+  //     quantity: 3,
+  //     modifiers: [
+  //       {
+  //         _id: '675354ee39a47228afd1f1a4',
+  //         attributes: ['override'],
+  //         modifierId: '6751f7eeb60c71cefee138ee',
+  //         name: 'Override modamount fixed 10',
+  //         group: 'Upcharge',
+  //         type: 'fee',
+  //         tags: ['default', 'all'],
+  //         direct: true,
+  //         properties: {
+  //           override: {
+  //             type: 'fixed',
+  //             field: 'amount',
+  //             fixedValue: 10,
+  //             multiplier: true,
+  //           },
+  //         },
+  //       },
+  //     ],
+  //     _id: '675354e939a47228afd1f199',
+
+  //     itemId: '62cdbfd01ee1b400193281ee',
+  //   };
+  //   const newItem = pricingService.item.calculate(
+  //     itemWithModifierAmountFixed10Multiplier
+  //   );
+
+  //   expect(newItem).toHaveProperty('total', 70.5);
+  //   expect(newItem).toHaveProperty('price', 13.5);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 30,
+  //     description: 'Override modamount fixed 10 ($30.00)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     fee: 30,
+  //     _included: 0,
+  //     _xincluded: 30,
+  //     _direct: 30,
+  //     _xdirect: 0,
+  //     _simple: 40.5,
+  //     _actual: 40.5,
+  //   });
+  // });
+
+  // test('CU-86dvbn63z: Calculate item with quantity > 1 and quantity override modifier', () => {
+  //   const quantityOverrideMod = {
+  //     _id: '67535f3ab4c5ea63d2d7964b',
+  //     attributes: ['override'],
+  //     modifierId: '675359b5d08f91f558233f85',
+  //     name: 'Override Item Quantity 5',
+  //     group: 'Upcharge',
+  //     type: 'tax',
+  //     tags: ['default'],
+  //     direct: true,
+  //     properties: {
+  //       subscription: {},
+  //       override: { type: 'fixed', field: 'quantity', fixedValue: 5 },
+  //       group: { items: [], modifiers: [] },
+  //       department: {},
+  //       sort: null,
+  //     },
+  //     compute: null,
+  //   };
+  //   const itemWithQuantityOverride5 = {
+  //     name: "Men's 3pc Tuxedo",
+  //     pieces: 3,
+  //     total: 70.88,
+  //     price: 13.5,
+  //     quantity: 3,
+  //     modifiers: [quantityOverrideMod],
+  //     _id: '67535f34b4c5ea63d2d79640',
+  //     itemId: '62cdbfd01ee1b400193281ee',
+  //     menuRuleId: '65660855dfffaf2da26fb870',
+  //     __typename: 'OrderItem',
+  //   };
+  //   let newItem = pricingService.item.calculate(itemWithQuantityOverride5);
+
+  //   expect(newItem).toHaveProperty('total', 67.5);
+  //   expect(newItem).toHaveProperty('price', 13.5);
+  //   expect(newItem).toHaveProperty('quantity', 5);
+
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 0,
+  //     description: 'Override Item Quantity 5',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 0,
+  //     _xincluded: 0,
+  //     _direct: 0,
+  //     _xdirect: 0,
+  //     _simple: 67.5,
+  //     _actual: 67.5,
+  //   });
+
+  //   newItem = pricingService.item.calculate(
+  //     pricingService.item.removeModifiers({
+  //       item: newItem,
+  //       modifiers: [quantityOverrideMod],
+  //       customer: undefined,
+  //       order: { items: [newItem] },
+  //     })
+  //   );
+  //   expect(newItem.price).toBe(13.5);
+  //   expect(newItem.total).toBe(40.5);
+  //   expect(newItem.quantity).toBe(3);
+
+  //   expect(newItem.modifiers.length).toBe(0);
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 0,
+  //     _xincluded: 0,
+  //     _direct: 0,
+  //     _xdirect: 0,
+  //     _simple: 40.5,
+  //     _actual: 40.5,
+  //   });
+  // });
+
+  // test('CU-86dvbn63z: Calculate item with quantity > 1 and modifieritemPriceFixed10', () => {
+  //   const itemWithModifierAmountFixed10 = {
+  //     name: "Men's 3pc Tuxedo",
+  //     pieces: 3,
+  //     price: 10,
+  //     quantity: 3,
+  //     modifiers: [
+  //       {
+  //         _id: '675354ee39a47228afd1f1a4',
+  //         attributes: ['override'],
+  //         modifierId: '6751f7eeb60c71cefee138ee',
+  //         name: 'Override item price fixed 10',
+  //         group: 'Upcharge',
+  //         type: 'fee',
+  //         tags: ['default', 'all'],
+  //         direct: true,
+  //         properties: {
+  //           override: {
+  //             type: 'fixed',
+  //             field: 'price',
+  //             fixedValue: 10,
+  //             multiplier: false,
+  //           },
+  //         },
+  //       },
+  //     ],
+  //     _id: '675354e939a47228afd1f199',
+
+  //     itemId: '62cdbfd01ee1b400193281ee',
+  //   };
+  //   const newItem = pricingService.item.calculate(
+  //     itemWithModifierAmountFixed10
+  //   );
+
+  //   expect(newItem).toHaveProperty('total', 30);
+  //   expect(newItem).toHaveProperty('price', 10);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 0,
+  //     description: 'Override item price fixed 10 ($10.00/Unit)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 0,
+  //     _xincluded: 0,
+  //     _direct: 0,
+  //     _xdirect: 0,
+  //     _simple: 30,
+  //     _actual: 30,
+  //   });
+  // });
+
+  // test('CU-86dvbn63z: Calculate item with quantity > 1 and modifieritemPriceFixed1 multiplier', () => {
+  //   const item = {
+  //     name: "Men's 3pc Tuxedo",
+  //     pieces: 3,
+  //     total: 141.75,
+  //     price: 13.5,
+  //     quantity: 1,
+  //     modifiers: [
+  //       {
+  //         _id: '67536495bc57ccecf751a5dc',
+  //         attributes: ['override'],
+  //         modifierId: '6751e9c0b60c71cefee0c3cc',
+  //         _parentId: null,
+  //         locked: false,
+  //         name: 'Override Item Price 10 USD Multiplier',
+  //         group: 'Upcharge',
+  //         type: 'fee',
+  //         tags: ['default', 'all'],
+
+  //         direct: true,
+
+  //         properties: {
+  //           override: {
+  //             type: 'fixed',
+  //             field: 'price',
+  //             fixedValue: 10,
+  //             multiplier: true,
+  //           },
+  //         },
+  //       },
+  //     ],
+  //     _id: '675360d5bc57ccecf751a5b5',
+  //     itemId: '62cdbfd01ee1b400193281ee',
+  //   };
+  //   const newItem = pricingService.item.calculate(item);
+
+  //   expect(newItem).toHaveProperty('total', 135);
+  //   expect(newItem).toHaveProperty('price', 135);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 0,
+  //     description:
+  //       'Override Item Price 10 USD Multiplier (10 Unit @ $13.50/Unit)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 0,
+  //     _xincluded: 0,
+  //     _direct: 0,
+  //     _xdirect: 0,
+  //     _simple: 135,
+  //     _actual: 135,
+  //   });
+  // });
+
+  // test('Remove Item', () => {
+  //   const item1 = {
+  //     _id: '1',
+  //   };
+  //   const item2 = {
+  //     _id: '2',
+  //   };
+
+  //   const order = {
+  //     items: [item1, item2],
+  //   };
+  //   const result = pricingService.order.removeItem({ order, item: item2 });
+
+  //   expect(result.items).toMatchObject([{ _id: '1' }]);
+  // });
+
+  // test('Remove related Item', () => {
+  //   const item1 = {
+  //     _id: '1',
+  //     itemId: 'a',
+  //   };
+  //   const item2 = {
+  //     _id: '2',
+  //   };
+  //   const item3 = {
+  //     _id: '3',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+
+  //   const order = {
+  //     items: [item1, item2, item3],
+  //   };
+  //   const result = pricingService.order.removeItem({ order, item: item3 });
+
+  //   expect(result.items).toMatchObject([
+  //     {
+  //       _id: '1',
+  //     },
+  //     {
+  //       _id: '2',
+  //     },
+  //   ]);
+  // });
+
+  // test('Remove parent Item having 1 related item', () => {
+  //   const item1 = {
+  //     _id: '1',
+  //     itemId: 'a',
+  //   };
+  //   const item2 = {
+  //     _id: '2',
+  //   };
+  //   const item3 = {
+  //     _id: '3',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+
+  //   const order = {
+  //     items: [item1, item2, item3],
+  //   };
+  //   const result = pricingService.order.removeItem({ order, item: item1 });
+
+  //   expect(result.items).toMatchObject([
+  //     {
+  //       _id: '2',
+  //     },
+  //   ]);
+  // });
+
+  // test('Remove parent Item, having more than 1 related item', () => {
+  //   const item1 = {
+  //     _id: '1',
+  //     itemId: 'a',
+  //   };
+  //   const item2 = {
+  //     _id: '2',
+  //   };
+  //   const item3 = {
+  //     _id: '3',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+  //   const item4 = {
+  //     _id: '4',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+
+  //   const order = {
+  //     items: [item1, item2, item3, item4],
+  //   };
+  //   const result = pricingService.order.removeItem({ order, item: item1 });
+
+  //   expect(result.items).toMatchObject([
+  //     {
+  //       _id: '2',
+  //     },
+  //   ]);
+  // });
+
+  // test('Remove related Item, having nested related items', () => {
+  //   const item1 = {
+  //     _id: '1',
+  //     itemId: 'a',
+  //   };
+  //   const item2 = {
+  //     _id: '2',
+  //   };
+  //   const item3 = {
+  //     _id: '3',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+  //   const item4 = {
+  //     _id: '4',
+  //     itemId: 'd',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+
+  //   const nestedItem5 = {
+  //     _id: '5',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item4._id,
+  //       parentItemId: item4.itemId,
+  //     },
+  //   };
+
+  //   const order = {
+  //     items: [item1, item2, item3, item4, nestedItem5],
+  //   };
+  //   const result = pricingService.order.removeItem({
+  //     order,
+  //     item: nestedItem5,
+  //   });
+
+  //   expect(result.items).toMatchObject([item1, item2, item3, item4]);
+  // });
+
+  // test('Remove related Item, having nested related items 2', () => {
+  //   const item1 = {
+  //     _id: '1',
+  //     itemId: 'a',
+  //   };
+  //   const item2 = {
+  //     _id: '2',
+  //   };
+  //   const item3 = {
+  //     _id: '3',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+  //   const item4 = {
+  //     _id: '4',
+  //     itemId: 'd',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+
+  //   const nestedItem5 = {
+  //     _id: '5',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item4._id,
+  //       parentItemId: item4.itemId,
+  //     },
+  //   };
+
+  //   const nestedItem6 = {
+  //     _id: '6',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item4._id,
+  //       parentItemId: item4.itemId,
+  //     },
+  //   };
+
+  //   const order = {
+  //     items: [item1, item2, item3, item4, nestedItem5, nestedItem6],
+  //   };
+  //   const result = pricingService.order.removeItem({
+  //     order,
+  //     item: nestedItem5,
+  //   });
+
+  //   expect(result.items).toMatchObject([
+  //     item1,
+  //     item2,
+  //     item3,
+  //     item4,
+  //     nestedItem6,
+  //   ]);
+  // });
+
+  // test('Remove parent related Item, having nested related items', () => {
+  //   const item1 = {
+  //     _id: '1',
+  //     itemId: 'a',
+  //   };
+  //   const item2 = {
+  //     _id: '2',
+  //   };
+  //   const item3 = {
+  //     _id: '3',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+  //   const item4 = {
+  //     _id: '4',
+  //     itemId: 'd',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item1._id,
+  //       parentItemId: item1.itemId,
+  //     },
+  //   };
+
+  //   const nestedItem5 = {
+  //     _id: '5',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item4._id,
+  //       parentItemId: item4.itemId,
+  //     },
+  //   };
+
+  //   const nestedItem6 = {
+  //     _id: '6',
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: item4._id,
+  //       parentItemId: item4.itemId,
+  //     },
+  //   };
+
+  //   const order = {
+  //     items: [item1, item2, item3, item4, nestedItem5, nestedItem6],
+  //   };
+  //   const result = pricingService.order.removeItem({ order, item: item1 });
+
+  //   expect(result.items).toMatchObject([item2]);
+  // });
+
+  // test('Should add related item and its related addModifiers to the parent item, then removing that relateditem should also remove the mod from the parent item', () => {
+  //   const rawRelatedItem1 = {
+  //     name: 'the related item',
+  //     _id: '67e2cadd8dcf08ebcc5ef888',
+  //   };
+
+  //   const rawRelatedItem2 = {
+  //     name: 'the 2nd related item',
+  //     _id: '67e2cadd8dcf08ebcc5ef88a',
+  //   };
+
+  //   const groupMod = {
+  //     _id: '67e2cadd8dcf08ebcc5ef889',
+  //     name: 'General Repair Department',
+  //     attributes: ['group'],
+  //     modifierId: 'mod1',
+  //     properties: {
+  //       group: {
+  //         items: [],
+  //       },
+  //     },
+  //   };
+
+  //   const parentItem = {
+  //     name: 'the parent item',
+  //     modifiers: [groupMod],
+  //     _id: '67e2cadd8dcf08ebcc5ef887',
+  //     __typename: 'OrderItem',
+  //   };
+
+  //   const relatedItem1 = {
+  //     ...rawRelatedItem1,
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: parentItem._id,
+  //       includeParent: true,
+  //       addModifiers: [groupMod],
+  //       groupPath: ',67e2cadd8dcf08ebcc5ef889',
+  //     },
+  //     __typename: 'OrderItem',
+  //   };
+
+  //   const relatedItem2 = {
+  //     ...rawRelatedItem2,
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: parentItem._id,
+  //       includeParent: true,
+  //       addModifiers: [groupMod],
+  //       groupPath: ',67e2cadd8dcf08ebcc5ef889',
+  //     },
+  //     __typename: 'OrderItem',
+  //   };
+  //   const order = {
+  //     items: [parentItem, relatedItem1, relatedItem2],
+  //   };
+
+  //   const result = pricingService.order.removeItem({
+  //     order,
+  //     item: relatedItem2,
+  //   });
+
+  //   expect(result.items.length).toBe(2);
+  //   expect(result.items[0].modifiers.length).toBe(1);
+  //   expect(result.items[0].modifiers[0].modifierId).toBe('mod1');
+
+  //   const result2 = pricingService.order.removeItem({
+  //     order: result,
+  //     item: relatedItem1,
+  //   });
+
+  //   expect(result2.items.length).toBe(1);
+  //   expect(result2.items[0].modifiers.length).toBe(0);
+  // });
+
+  // test('Should not remove the group modifier if it still hasModifiers', () => {
+  //   const rawRelatedItem1 = {
+  //     name: 'the related item',
+  //     _id: '67e2cadd8dcf08ebcc5ef888',
+  //   };
+
+  //   const rawRelatedItem2 = {
+  //     name: 'the 2nd related item',
+  //     _id: '67e2cadd8dcf08ebcc5ef88a',
+  //   };
+
+  //   const rawRelatedMod1 = {
+  //     name: 'related modifier',
+  //     _id: '123',
+  //     modifierId: 'abc',
+  //     addModifiers: [
+  //       {
+  //         _id: '67e2cadd8dcf08ebcc5ef889',
+  //         name: 'General Repair Department',
+  //         attributes: ['group'],
+  //         modifierId: 'mod1',
+  //         properties: {
+  //           group: {
+  //             items: [],
+  //           },
+  //         },
+  //       },
+  //     ],
+  //   };
+
+  //   const groupMod = {
+  //     _id: '67e2cadd8dcf08ebcc5ef889',
+  //     name: 'General Repair Department',
+  //     attributes: ['group'],
+  //     modifierId: 'mod1',
+  //     properties: {
+  //       group: {
+  //         items: [],
+  //         modifiers: [],
+  //       },
+  //     },
+  //   };
+
+  //   const parentItem = {
+  //     name: 'the parent item',
+  //     modifiers: [groupMod, rawRelatedMod1],
+  //     _id: '67e2cadd8dcf08ebcc5ef887',
+  //     __typename: 'OrderItem',
+  //   };
+
+  //   const relatedItem1 = {
+  //     ...rawRelatedItem1,
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: parentItem._id,
+  //       includeParent: true,
+  //       addModifiers: [groupMod],
+  //       groupPath: ',67e2cadd8dcf08ebcc5ef889',
+  //     },
+  //     __typename: 'OrderItem',
+  //   };
+
+  //   const relatedItem2 = {
+  //     ...rawRelatedItem2,
+  //     properties: {
+  //       relatedItem: true,
+  //       parentId: parentItem._id,
+  //       includeParent: true,
+  //       addModifiers: [groupMod],
+  //       groupPath: ',67e2cadd8dcf08ebcc5ef889',
+  //     },
+  //     __typename: 'OrderItem',
+  //   };
+  //   const order = {
+  //     items: [parentItem, relatedItem1, relatedItem2],
+  //   };
+
+  //   const newItem = pricingService.item.removeModifiers({
+  //     item: parentItem,
+  //     modifiers: [rawRelatedMod1],
+  //     originalItem: parentItem,
+  //     customer: undefined,
+  //     order,
+  //   });
+
+  //   expect(newItem.modifiers.length).toBe(1);
+  //   expect(newItem.modifiers[0].name).toBe('General Repair Department');
+  // });
+
+  // test('1- Item total should not be below 0, having price override modifiers', () => {
+  //   const order = {
+  //     _id: '685c2d2bd7f68fccd07af8c7',
+  //     tax: 0,
+  //     modifiers: [],
+  //     discount: 0,
+  //     total: -2.28,
+  //     fee: 0,
+  //     items: [
+  //       {
+  //         name: 'Pants',
+  //         description: null,
+  //         pieces: 1,
+  //         modifiersTotalAmount: 0,
+  //         total: -2.28,
+  //         totalPaid: 0,
+  //         price: 0,
+  //         quantity: 1,
+  //         notes: [],
+  //         modifiers: [
+  //           {
+  //             _id: '685c2d64d7f68fccd07af8cd',
+  //             attributes: ['override'],
+  //             modifierId: '67fea241af24e570c032b40d',
+  //             _parentId: null,
+  //             locked: false,
+  //             name: 'No Clean',
+  //             tags: ['default'],
+  //             order: 0,
+  //             included: false,
+  //             direct: true,
+  //             default: true,
+  //             code: null,
+  //             properties: {
+  //               override: {
+  //                 field: 'price',
+  //                 type: 'fixed',
+  //                 multiplier: true,
+  //                 fixedValue: 0,
+  //               },
+  //               group: null,
+  //               department: null,
+  //               url: null,
+  //               color: null,
+  //               label: {
+  //                 backgroundColor: null,
+  //                 align: null,
+  //               },
+  //               sort: null,
+  //             },
+  //             compute: null,
+  //             __typename: 'Modifier',
+  //             addModifiers: [],
+  //             delModifiers: [],
+  //           },
+  //           {
+  //             _id: '685c2d65d7f68fccd07af8ce',
+  //             attributes: [],
+  //             modifierId: '67fea241af24e570c032b324',
+  //             _parentId: null,
+  //             locked: false,
+  //             name: '30% Family Discount',
+  //             type: 'discount',
+  //             tags: ['default'],
+  //             order: 0,
+  //             included: false,
+  //             direct: true,
+  //             hidden: false,
+  //             print: true,
+  //             required: false,
+  //             recommended: false,
+  //             default: false,
+  //             code: null,
+  //             properties: {
+  //               group: null,
+  //               department: null,
+  //               url: null,
+  //               color: null,
+  //               label: {
+  //                 backgroundColor: null,
+  //                 align: null,
+  //               },
+  //               sort: null,
+  //               isQuantityMultiplier: true,
+  //             },
+  //             compute: {
+  //               type: 'percentage',
+  //               action: 'subtract',
+  //               amount: 30,
+  //             },
+  //             __typename: 'Modifier',
+  //             addModifiers: [],
+  //             delModifiers: [],
+  //           },
+  //         ],
+  //         weight: 0,
+  //         properties: {
+  //           overwrittenPrice: 7.59,
+  //         },
+  //       },
+  //     ],
+  //     customer: {
+  //       _id: '67feae8eeb5aa1e1848374b9',
+  //       tags: ['default'],
+  //     },
+  //   };
+
+  //   const calculatedOrder = pricingService.order.calculate(order);
+
+  //   expect(calculatedOrder.total).toBe(0);
+  //   expect(calculatedOrder.items[0].price).toBe(0);
+  //   expect(calculatedOrder.items[0].total).toBe(0);
+  //   expect(calculatedOrder.items[0].modifiers[0]._computed.description).toBe(
+  //     'No Clean (0 Unit @ $0.00/Unit)'
+  //   );
+  //   expect(calculatedOrder.items[0].modifiers[1]._computed.description).toBe(
+  //     '30% Family Discount'
+  //   );
+  // });
+
+  // test('2- Item total should not be below 0, having price override modifiers', () => {
+  //   const order = {
+  //     _id: '685c2d2bd7f68fccd07af8c7',
+  //     tax: 0,
+  //     modifiers: [],
+  //     discount: 0,
+  //     total: -2.28,
+  //     fee: 0,
+  //     items: [
+  //       {
+  //         name: 'Pants',
+  //         description: null,
+  //         pieces: 1,
+  //         modifiersTotalAmount: 0,
+  //         total: -2.28,
+  //         totalPaid: 0,
+  //         price: 0,
+  //         quantity: 1,
+  //         notes: [],
+  //         modifiers: [
+  //           {
+  //             _id: '685c2d65d7f68fccd07af8ce',
+  //             attributes: [],
+  //             modifierId: '67fea241af24e570c032b324',
+  //             _parentId: null,
+  //             locked: false,
+  //             name: '30% Family Discount',
+  //             type: 'discount',
+  //             tags: ['default'],
+  //             order: 0,
+  //             included: false,
+  //             direct: true,
+  //             hidden: false,
+  //             print: true,
+  //             required: false,
+  //             recommended: false,
+  //             default: false,
+  //             code: null,
+  //             properties: {
+  //               group: null,
+  //               department: null,
+  //               url: null,
+  //               color: null,
+  //               label: {
+  //                 backgroundColor: null,
+  //                 align: null,
+  //               },
+  //               sort: null,
+  //               isQuantityMultiplier: true,
+  //             },
+  //             compute: {
+  //               type: 'percentage',
+  //               action: 'subtract',
+  //               amount: 30,
+  //             },
+  //             __typename: 'Modifier',
+  //             addModifiers: [],
+  //             delModifiers: [],
+  //           },
+  //           {
+  //             _id: '685c2d64d7f68fccd07af8cd',
+  //             attributes: ['override'],
+  //             modifierId: '67fea241af24e570c032b40d',
+  //             _parentId: null,
+  //             locked: false,
+  //             name: 'No Clean',
+  //             tags: ['default'],
+  //             order: 0,
+  //             included: false,
+  //             direct: true,
+  //             default: true,
+  //             code: null,
+  //             properties: {
+  //               override: {
+  //                 field: 'price',
+  //                 type: 'fixed',
+  //                 multiplier: true,
+  //                 fixedValue: 0,
+  //               },
+  //               group: null,
+  //               department: null,
+  //               url: null,
+  //               color: null,
+  //               label: {
+  //                 backgroundColor: null,
+  //                 align: null,
+  //               },
+  //               sort: null,
+  //             },
+  //             compute: null,
+  //             __typename: 'Modifier',
+  //             addModifiers: [],
+  //             delModifiers: [],
+  //           },
+  //         ],
+  //         weight: 0,
+  //         properties: {
+  //           overwrittenPrice: 7.59,
+  //         },
+  //       },
+  //     ],
+  //     customer: {
+  //       _id: '67feae8eeb5aa1e1848374b9',
+  //       tags: ['default'],
+  //     },
+  //   };
+
+  //   const calculatedOrder = pricingService.order.calculate(order);
+
+  //   expect(calculatedOrder.total).toBe(0);
+  //   expect(calculatedOrder.items[0].price).toBe(0);
+  //   expect(calculatedOrder.items[0].total).toBe(0);
+
+  //   expect(calculatedOrder.items[0].modifiers[0]._computed.description).toBe(
+  //     '30% Family Discount'
+  //   );
+  //   expect(calculatedOrder.items[0].modifiers[1]._computed.description).toBe(
+  //     'No Clean (0 Unit @ $0.00/Unit)'
+  //   );
+  // });
+
+  // test('Should not apply modifier value when extractCalculatedValue is true but modifier is invalid', () => {
+  //   const prepayDiscount50Percent = {
+  //     compute: {
+  //       amount: 50,
+  //       type: 'percentage',
+  //       action: 'subtract',
+  //     },
+  //     properties: {
+  //       extractCalculatedValue: true,
+  //     },
+  //     conditions: {
+  //       valid: null,
+  //       rules: [
+  //         {
+  //           key: 'payment',
+  //           value: 'prepay',
+  //           operand: '$in',
+  //         },
+  //       ],
+  //     },
+  //     name: 'percentageDiscount50',
+  //     type: 'discount',
+  //   };
+
+  //   const orderItem = {
+  //     price: 7.59,
+  //     quantity: 1,
+  //     modifiers: [prepayDiscount50Percent],
+  //   };
+  //   const order = {
+  //     items: [orderItem],
+  //   };
+
+  //   const calculatedOrder = pricingService.order.calculate(order);
+
+  //   expect(calculatedOrder.total).toBe(7.59);
+  //   expect(calculatedOrder.items[0].price).toBe(7.59);
+  //   expect(calculatedOrder.items[0].total).toBe(7.59);
+  //   expect(calculatedOrder.items[0].modifiers.length).toBe(1);
+  //   expect(calculatedOrder.items[0].modifiers[0]._computed).toMatchObject({
+  //     amount: 0,
+  //     description: 'percentageDiscount50',
+  //   });
+  // });
+
+  // test('Should apply modifier value when extractCalculatedValue is true and modifier is valid', () => {
+  //   const prepayDiscount50Percent = {
+  //     compute: {
+  //       amount: 50,
+  //       type: 'percentage',
+  //       action: 'subtract',
+  //     },
+  //     properties: {
+  //       extractCalculatedValue: true,
+  //     },
+  //     name: 'percentageDiscount50',
+  //     type: 'discount',
+  //   };
+
+  //   const orderItem = {
+  //     price: 7.59,
+  //     quantity: 1,
+  //     modifiers: [prepayDiscount50Percent],
+  //   };
+  //   const order = {
+  //     items: [orderItem],
+  //   };
+
+  //   const calculatedOrder = pricingService.order.calculate(order);
+
+  //   expect(calculatedOrder.total).toBe(7.59);
+  //   expect(calculatedOrder.items[0].price).toBe(7.59);
+  //   expect(calculatedOrder.items[0].total).toBe(7.59);
+  //   expect(calculatedOrder.items[0].modifiers.length).toBe(1);
+  //   expect(calculatedOrder.items[0].modifiers[0]._computed).toMatchObject({
+  //     amount: -7.59,
+  //     description: 'percentageDiscount50 (-$7.59)',
+  //   });
+  // });
+
+  // test('Should apply modifier value when extractCalculatedValue is true and modifier is valid (being also a payment modifier)', () => {
+  //   const prepayDiscount50Percent = {
+  //     compute: {
+  //       amount: 50,
+  //       type: 'percentage',
+  //       action: 'subtract',
+  //     },
+  //     properties: {
+  //       extractCalculatedValue: true,
+  //     },
+  //     conditions: {
+  //       valid: null,
+  //       rules: [
+  //         {
+  //           key: 'payment',
+  //           value: 'prepay',
+  //           operand: '$in',
+  //         },
+  //       ],
+  //     },
+  //     name: 'percentageDiscount50',
+  //     type: 'discount',
+  //   };
+
+  //   const orderItem = {
+  //     price: 7.59,
+  //     quantity: 1,
+  //     modifiers: [prepayDiscount50Percent],
+  //   };
+  //   const order = {
+  //     items: [orderItem],
+  //   };
+
+  //   const calculatedOrder = pricingService.order.calculate(order, {
+  //     isPrepay: true,
+  //   });
+
+  //   expect(calculatedOrder.total).toBe(7.59);
+  //   expect(calculatedOrder.items[0].price).toBe(7.59);
+  //   expect(calculatedOrder.items[0].total).toBe(7.59);
+  //   expect(calculatedOrder.items[0].modifiers.length).toBe(2);
+
+  //   expect(calculatedOrder.items[0].modifiers[0]._computed).toMatchObject({
+  //     amount: 0,
+  //     description: 'percentageDiscount50',
+  //   });
+  //   expect(calculatedOrder.items[0].modifiers[1]._computed).toMatchObject({
+  //     amount: -7.59,
+  //     description: '$7.59 discount (-$7.59)',
+  //   });
+  // });
+
+  // test('Should use a price override modifier and quantity override modifier in combination accordingly', () => {
+  //   const overridePriceMod = {
+  //     _id: '675354ee39a47228afd1f1a4',
+  //     attributes: ['override'],
+  //     modifierId: '6751f7eeb60c71cefee138ee',
+  //     name: 'Override item price fixed 0',
+  //     tags: ['default', 'all'],
+  //     direct: true,
+  //     properties: {
+  //       override: {
+  //         type: 'fixed',
+  //         field: 'price',
+  //         fixedValue: 0,
+  //         multiplier: false,
+  //       },
+  //     },
+  //   };
+  //   const overrideQuantityMod = {
+  //     _id: '675354ee39a47228afd1f1a5',
+  //     attributes: ['override'],
+  //     modifierId: '6751f7eeb60c71cefee138ff',
+  //     name: 'Override item quantity fixed 20',
+  //     tags: ['default', 'all'],
+  //     direct: true,
+  //     properties: {
+  //       override: {
+  //         type: 'fixed',
+  //         field: 'quantity',
+  //         fixedValue: 20,
+  //         multiplier: false,
+  //       },
+  //     },
+  //   };
+
+  //   const itemWithModifierAmountFixed10 = {
+  //     name: "Men's 3pc Tuxedo",
+  //     pieces: 1,
+  //     price: 10,
+  //     quantity: 1,
+  //     modifiers: [overridePriceMod, overrideQuantityMod],
+  //     _id: '675354e939a47228afd1f199',
+  //     itemId: '62cdbfd01ee1b400193281ee',
+  //   };
+  //   const newItem = pricingService.item.calculate(
+  //     itemWithModifierAmountFixed10
+  //   );
+  //   expect(newItem.price).toBe(0);
+  //   expect(newItem.total).toBe(0);
+  //   expect(newItem.quantity).toBe(20);
+  //   expect(newItem).toHaveProperty('price', 0);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 0,
+  //     description: 'Override item price fixed 0 ($0.00/Unit)',
+  //   });
+
+  //   expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+  //     amount: 0,
+  //     description: 'Override item quantity fixed 20',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 0,
+  //     _xincluded: 0,
+  //     _direct: 0,
+  //     _xdirect: 0,
+  //     _simple: 0,
+  //     _actual: 0,
+  //   });
+  // });
+
+  // test('Should use a total override modifier and quantity override modifier in combination accordingly', () => {
+  //   const overrideTotalMod = {
+  //     _id: '675354ee39a47228afd1f1a4',
+  //     attributes: ['override'],
+  //     modifierId: '6751f7eeb60c71cefee138ee',
+  //     name: 'Override item total fixed 0',
+  //     tags: ['default', 'all'],
+  //     direct: true,
+  //     properties: {
+  //       override: {
+  //         type: 'fixed',
+  //         field: 'total',
+  //         fixedValue: 0,
+  //         multiplier: false,
+  //       },
+  //       sort: 2,
+  //     },
+  //   };
+  //   const overrideQuantityMod = {
+  //     _id: '675354ee39a47228afd1f1a5',
+  //     attributes: ['override'],
+  //     modifierId: '6751f7eeb60c71cefee138ff',
+  //     name: 'Override item quantity fixed 20',
+  //     tags: ['default', 'all'],
+  //     direct: true,
+  //     properties: {
+  //       override: {
+  //         type: 'fixed',
+  //         field: 'quantity',
+  //         fixedValue: 20,
+  //         multiplier: false,
+  //       },
+  //       sort: 1,
+  //     },
+  //   };
+
+  //   const itemWithModifierAmountFixed10 = {
+  //     name: "Men's 3pc Tuxedo",
+  //     pieces: 1,
+  //     price: 10,
+  //     quantity: 1,
+  //     modifiers: [overrideTotalMod, overrideQuantityMod],
+  //     _id: '675354e939a47228afd1f199',
+  //     itemId: '62cdbfd01ee1b400193281ee',
+  //   };
+  //   const newItem = pricingService.item.calculate(
+  //     itemWithModifierAmountFixed10
+  //   );
+  //   expect(newItem.price).toBe(10);
+  //   expect(newItem.total).toBe(0);
+  //   expect(newItem.quantity).toBe(20);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 0,
+  //     description: 'Override item quantity fixed 20',
+  //   });
+
+  //   expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+  //     amount: -200,
+  //     description: 'Override item total fixed 0 (-$200.00)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 0,
+  //     _xincluded: -200,
+  //     undefined: -200,
+  //     _direct: -200,
+  //     _xdirect: 0,
+  //     _simple: 200,
+  //     _actual: 200,
+  //   });
+  // });
+
+  // test('Should calculate a price override modifier and a tax modifier properly', () => {
+  //   const overridePriceMod = {
+  //     _id: '675354ee39a47228afd1f1a4',
+  //     attributes: ['override'],
+  //     modifierId: '6751f7eeb60c71cefee138ee',
+  //     name: 'Override item price fixed 0',
+  //     tags: ['default', 'all'],
+  //     direct: true,
+  //     properties: {
+  //       override: {
+  //         type: 'fixed',
+  //         field: 'price',
+  //         fixedValue: 5,
+  //         multiplier: false,
+  //       },
+  //     },
+  //   };
+
+  //   const percentageFee10 = {
+  //     compute: {
+  //       amount: 10,
+  //       type: 'percentage',
+  //       action: 'add',
+  //     },
+  //     name: 'percentageFee10',
+  //     type: 'tax',
+  //     _id: '234',
+  //     modifierId: 222,
+  //   };
+
+  //   const itemWithModifierAmountFixed10 = {
+  //     name: "Men's 3pc Tuxedo",
+  //     pieces: 1,
+  //     price: 10,
+  //     quantity: 1,
+  //     modifiers: [overridePriceMod, percentageFee10],
+  //     _id: '675354e939a47228afd1f199',
+  //     itemId: '62cdbfd01ee1b400193281ee',
+  //   };
+  //   const newItem = pricingService.item.calculate(
+  //     itemWithModifierAmountFixed10
+  //   );
+  //   expect(newItem.price).toBe(5);
+  //   expect(newItem.total).toBe(5.5);
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 0,
+  //     description: 'Override item price fixed 0 ($5.00/Unit)',
+  //   });
+
+  //   expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+  //     amount: 0.5,
+  //     description: 'percentageFee10 ($0.50)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 0,
+  //     _xincluded: 0.5,
+  //     _direct: 0,
+  //     _xdirect: 0.5,
+  //     _simple: 5,
+  //     _actual: 5,
+  //     tax: 0.5,
+  //   });
+  // });
+
+  // test('Should calculate a tax modifier and a price override modifier properly', () => {
+  //   const overridePriceMod = {
+  //     _id: '675354ee39a47228afd1f1a4',
+  //     attributes: ['override'],
+  //     modifierId: '6751f7eeb60c71cefee138ee',
+  //     name: 'Override item price fixed 0',
+  //     tags: ['default', 'all'],
+  //     direct: true,
+  //     properties: {
+  //       override: {
+  //         type: 'fixed',
+  //         field: 'price',
+  //         fixedValue: 5,
+  //         multiplier: false,
+  //       },
+  //     },
+  //   };
+
+  //   const percentageFee10 = {
+  //     compute: {
+  //       amount: 10,
+  //       type: 'percentage',
+  //       action: 'add',
+  //     },
+  //     name: 'percentageFee10',
+  //     type: 'tax',
+  //     _id: '234',
+  //     modifierId: 222,
+  //   };
+
+  //   const itemWithModifierAmountFixed10 = {
+  //     name: "Men's 3pc Tuxedo",
+  //     pieces: 1,
+  //     price: 10,
+  //     quantity: 1,
+  //     modifiers: [percentageFee10, overridePriceMod],
+  //     _id: '675354e939a47228afd1f199',
+  //     itemId: '62cdbfd01ee1b400193281ee',
+  //   };
+  //   const newItem = pricingService.item.calculate(
+  //     itemWithModifierAmountFixed10
+  //   );
+  //   expect(newItem.price).toBe(5);
+  //   expect(newItem.total).toBe(6);
+
+  //   expect(newItem.modifiers[0]).toHaveProperty('_computed', {
+  //     amount: 1,
+  //     description: 'percentageFee10 ($1.00)',
+  //   });
+
+  //   expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+  //     amount: 0,
+  //     description: 'Override item price fixed 0 ($5.00/Unit)',
+  //   });
+
+  //   expect(newItem).toHaveProperty('subTotals', {
+  //     _included: 0,
+  //     _xincluded: 1,
+  //     _direct: 0,
+  //     _xdirect: 1,
+  //     _simple: 5,
+  //     _actual: 5,
+  //     tax: 1,
+  //   });
+  // });
+
+  test('Should mark modifers as not valid if quantity is 0, then after changing the quantity to > 0 it should mark modifier valid', () => {
     const overridePriceMod = {
       _id: '675354ee39a47228afd1f1a4',
       attributes: ['override'],
@@ -1702,23 +1975,7 @@ describe('Item actions', () => {
         override: {
           type: 'fixed',
           field: 'price',
-          fixedValue: 0,
-          multiplier: false,
-        },
-      },
-    };
-    const overrideQuantityMod = {
-      _id: '675354ee39a47228afd1f1a5',
-      attributes: ['override'],
-      modifierId: '6751f7eeb60c71cefee138ff',
-      name: 'Override item quantity fixed 20',
-      tags: ['default', 'all'],
-      direct: true,
-      properties: {
-        override: {
-          type: 'fixed',
-          field: 'quantity',
-          fixedValue: 20,
+          fixedValue: 5,
           multiplier: false,
         },
       },
@@ -1728,27 +1985,20 @@ describe('Item actions', () => {
       name: "Men's 3pc Tuxedo",
       pieces: 1,
       price: 10,
-      quantity: 1,
-      modifiers: [overridePriceMod, overrideQuantityMod],
+      quantity: 0,
+      modifiers: [overridePriceMod],
       _id: '675354e939a47228afd1f199',
       itemId: '62cdbfd01ee1b400193281ee',
     };
-    const newItem = pricingService.item.calculate(
-      itemWithModifierAmountFixed10
-    );
-    expect(newItem.price).toBe(0);
+    let newItem = pricingService.item.calculate(itemWithModifierAmountFixed10);
+    expect(newItem.price).toBe(10);
     expect(newItem.total).toBe(0);
-    expect(newItem.quantity).toBe(20);
-    expect(newItem).toHaveProperty('price', 0);
-    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
-      amount: 0,
-      description: 'Override item price fixed 0 ($0.00/Unit)',
-    });
 
-    expect(newItem.modifiers[1]).toHaveProperty('_computed', {
+    expect(newItem.modifiers[0]).toHaveProperty('_computed', {
       amount: 0,
-      description: 'Override item quantity fixed 20',
+      description: 'Override item price fixed 0 ($5.00/Unit)',
     });
+    expect(newItem.modifiers[0].conditions.valid).toBe(false);
 
     expect(newItem).toHaveProperty('subTotals', {
       _included: 0,
@@ -1758,77 +2008,24 @@ describe('Item actions', () => {
       _simple: 0,
       _actual: 0,
     });
-  });
 
-  test('Should use a total override modifier and quantity override modifier in combination accordingly', () => {
-    const overrideTotalMod = {
-      _id: '675354ee39a47228afd1f1a4',
-      attributes: ['override'],
-      modifierId: '6751f7eeb60c71cefee138ee',
-      name: 'Override item total fixed 0',
-      tags: ['default', 'all'],
-      direct: true,
-      properties: {
-        override: {
-          type: 'fixed',
-          field: 'total',
-          fixedValue: 0,
-          multiplier: false,
-        },
-        sort: 2,
-      },
-    };
-    const overrideQuantityMod = {
-      _id: '675354ee39a47228afd1f1a5',
-      attributes: ['override'],
-      modifierId: '6751f7eeb60c71cefee138ff',
-      name: 'Override item quantity fixed 20',
-      tags: ['default', 'all'],
-      direct: true,
-      properties: {
-        override: {
-          type: 'fixed',
-          field: 'quantity',
-          fixedValue: 20,
-          multiplier: false,
-        },
-        sort: 1,
-      },
-    };
+    newItem = pricingService.item.calculate({ ...newItem, quantity: 1 });
+    expect(newItem.price).toBe(5);
+    expect(newItem.total).toBe(5);
 
-    const itemWithModifierAmountFixed10 = {
-      name: "Men's 3pc Tuxedo",
-      pieces: 1,
-      price: 10,
-      quantity: 1,
-      modifiers: [overrideTotalMod, overrideQuantityMod],
-      _id: '675354e939a47228afd1f199',
-      itemId: '62cdbfd01ee1b400193281ee',
-    };
-    const newItem = pricingService.item.calculate(
-      itemWithModifierAmountFixed10
-    );
-    expect(newItem.price).toBe(10);
-    expect(newItem.total).toBe(0);
-    expect(newItem.quantity).toBe(20);
     expect(newItem.modifiers[0]).toHaveProperty('_computed', {
       amount: 0,
-      description: 'Override item quantity fixed 20',
-    });
-
-    expect(newItem.modifiers[1]).toHaveProperty('_computed', {
-      amount: -200,
-      description: 'Override item total fixed 0 (-$200.00)',
+      description: 'Override item price fixed 0 ($5.00/Unit)',
     });
+    expect(newItem.modifiers[0].conditions.valid).toBe(true);
 
     expect(newItem).toHaveProperty('subTotals', {
       _included: 0,
-      _xincluded: -200,
-      undefined: -200,
-      _direct: -200,
+      _xincluded: 0,
+      _direct: 0,
       _xdirect: 0,
-      _simple: 200,
-      _actual: 200,
+      _simple: 5,
+      _actual: 5,
     });
   });
 });