@darkpos/pricing 1.0.39 → 1.0.41

package/__TEST__/mocks/items/item1Mock.json

@@ -0,0 +1,73 @@
+{
+  "location": {},
+  "status": {
+    "picked": {
+      "value": false,
+      "date": ""
+    },
+    "paid": {
+      "value": false,
+      "date": ""
+    },
+    "tracker": []
+  },
+  "name": "Dummy Pants 1",
+  "description": "Dummy Pants 1",
+  "pieces": 1,
+  "modifiersTotalAmount": 0,
+  "total": 2,
+  "totalPaid": 0,
+  "price": 2,
+  "quantity": 1,
+  "path": ",66da070aac2d4ae39904050f,66da131a81cf1303bc32a2c7,",
+  "notes": [],
+  "serial": null,
+  "sku": "DUN-PAN1",
+  "modifiers": [],
+  "_id": "66ec759cd57e32c3455724a0",
+  "weight": null,
+  "properties": null,
+  "hasInventory": true,
+  "inventoryType": "pull",
+  "category": null,
+  "priceLevels": [
+    {
+      "value": 10,
+      "tags": [
+        "default"
+      ]
+    },
+    {
+      "value": 2,
+      "tags": [
+        "vip"
+      ]
+    },
+    {
+      "value": 10,
+      "tags": [
+        "default",
+        "press only"
+      ]
+    },
+    {
+      "value": 2,
+      "tags": [
+        "vip",
+        "press only"
+      ]
+    }
+  ],
+  "costLevels": [],
+  "itemId": "66da11fdac2d4ae39904465e",
+  "menuRuleId": "66da132381cf1303bc32a2c8",
+  "__typename": "OrderItem",
+  "subTotals": {
+    "_included": 0,
+    "_xincluded": 0,
+    "_direct": 0,
+    "_xdirect": 0,
+    "_simple": 2,
+    "_actual": 2
+  }
+}

package/__TEST__/mocks/items/item2Mock.json

@@ -0,0 +1,73 @@
+{
+  "location": {},
+  "status": {
+    "picked": {
+      "value": false,
+      "date": ""
+    },
+    "paid": {
+      "value": false,
+      "date": ""
+    },
+    "tracker": []
+  },
+  "name": "Dummy Pants 2",
+  "description": "Dummy Pants 2",
+  "pieces": 1,
+  "modifiersTotalAmount": 0,
+  "total": 2,
+  "totalPaid": 0,
+  "price": 2,
+  "quantity": 1,
+  "path": ",66da070aac2d4ae39904050f,66da131a81cf1303bc32a2c7,",
+  "notes": [],
+  "serial": null,
+  "sku": "DUN-PAN2",
+  "modifiers": [],
+  "_id": "66ec759cd57e32c3455724a0",
+  "weight": null,
+  "properties": null,
+  "hasInventory": true,
+  "inventoryType": "pull",
+  "category": null,
+  "priceLevels": [
+    {
+      "value": 10,
+      "tags": [
+        "default"
+      ]
+    },
+    {
+      "value": 2,
+      "tags": [
+        "vip"
+      ]
+    },
+    {
+      "value": 10,
+      "tags": [
+        "default",
+        "press only"
+      ]
+    },
+    {
+      "value": 2,
+      "tags": [
+        "vip",
+        "press only"
+      ]
+    }
+  ],
+  "costLevels": [],
+  "itemId": "66da11fdac2d4ae39904465e",
+  "menuRuleId": "66da132381cf1303bc32a2c8",
+  "__typename": "OrderItem",
+  "subTotals": {
+    "_included": 0,
+    "_xincluded": 0,
+    "_direct": 0,
+    "_xdirect": 0,
+    "_simple": 2,
+    "_actual": 2
+  }
+}

package/__TEST__/mocks/items/item3Mock.json

@@ -0,0 +1,73 @@
+{
+  "location": {},
+  "status": {
+    "picked": {
+      "value": false,
+      "date": ""
+    },
+    "paid": {
+      "value": false,
+      "date": ""
+    },
+    "tracker": []
+  },
+  "name": "Dummy Pants 3",
+  "description": "Dummy Pants 3",
+  "pieces": 1,
+  "modifiersTotalAmount": 0,
+  "total": 2,
+  "totalPaid": 0,
+  "price": 2,
+  "quantity": 1,
+  "path": ",66da070aac2d4ae39904050f,66da131a81cf1303bc32a2c7,",
+  "notes": [],
+  "serial": null,
+  "sku": "DUN-PAN3",
+  "modifiers": [],
+  "_id": "66ec759cd57e32c3455724a0",
+  "weight": null,
+  "properties": null,
+  "hasInventory": true,
+  "inventoryType": "pull",
+  "category": null,
+  "priceLevels": [
+    {
+      "value": 10,
+      "tags": [
+        "default"
+      ]
+    },
+    {
+      "value": 2,
+      "tags": [
+        "vip"
+      ]
+    },
+    {
+      "value": 10,
+      "tags": [
+        "default",
+        "press only"
+      ]
+    },
+    {
+      "value": 2,
+      "tags": [
+        "vip",
+        "press only"
+      ]
+    }
+  ],
+  "costLevels": [],
+  "itemId": "66da11fdac2d4ae39904465e",
+  "menuRuleId": "66da132381cf1303bc32a2c8",
+  "__typename": "OrderItem",
+  "subTotals": {
+    "_included": 0,
+    "_xincluded": 0,
+    "_direct": 0,
+    "_xdirect": 0,
+    "_simple": 2,
+    "_actual": 2
+  }
+}

package/__TEST__/order/createSuborder.test.js

@@ -0,0 +1,36 @@
+const usePricing = require('../../index');
+const mockStores = require('../mocks/stores');
+const orderMock = require('../modifier/mocks/orderMock.json');
+const item1Mock = require('../mocks/items/item1Mock.json');
+const item2Mock = require('../mocks/items/item2Mock.json');
+const item3Mock = require('../mocks/items/item3Mock.json');
+
+const session = {
+  store: mockStores[0],
+};
+
+const pricingService = usePricing(session);
+
+describe('Create suborder', () => {
+  test('Create a suborder with one order', () => {
+    const subOrders = pricingService.order.createSuborder(orderMock);
+    const order = {
+      ...orderMock,
+      orders: subOrders,
+    };
+    expect(order.orders).toHaveLength(1);
+    expect(subOrders).toHaveLength(1);
+  });
+
+  test('Create suborder with multiple items in the order', () => {
+    const multipleItemsOrderMock = {
+      ...orderMock,
+      items: [item1Mock, item2Mock, item3Mock], // assuming items is an array of items
+    };
+    const subOrders = pricingService.order.createSuborder(
+      multipleItemsOrderMock
+    );
+
+    expect(subOrders[0].items).toHaveLength(3); // Suborders should match number of items
+  });
+});

package/__TEST__/order/getSuborder.test.js

@@ -0,0 +1,89 @@
+const usePricing = require('../../index');
+const mockStores = require('../mocks/stores');
+const orderMock = require('../modifier/mocks/orderMock.json');
+
+const session = {
+  store: mockStores[0],
+};
+
+const pricingService = usePricing(session);
+
+const mockItem = {
+  location: {},
+  status: {
+    picked: {
+      value: false,
+      date: '',
+    },
+    paid: {
+      value: false,
+      date: '',
+    },
+    tracker: [],
+  },
+  name: 'Andre Pants 2',
+  description: 'Andre Pants 2',
+  pieces: 1,
+  modifiersTotalAmount: 0,
+  total: 2,
+  totalPaid: 0,
+  price: 2,
+  quantity: 1,
+  path: ',66da070aac2d4ae39904050f,66da131a81cf1303bc32a2c7,',
+  notes: [],
+  serial: null,
+  sku: 'AND-PAN2',
+  modifiers: [],
+  _id: '66ec759cd57e32c3455724a0',
+  weight: null,
+  properties: null,
+  hasInventory: true,
+  inventoryType: 'pull',
+  category: null,
+  priceLevels: [
+    {
+      value: 10,
+      tags: ['default'],
+    },
+    {
+      value: 2,
+      tags: ['vip'],
+    },
+    {
+      value: 10,
+      tags: ['default', 'press only'],
+    },
+    {
+      value: 2,
+      tags: ['vip', 'press only'],
+    },
+  ],
+  costLevels: [],
+  itemId: '66da11fdac2d4ae39904465e',
+  menuRuleId: '66da132381cf1303bc32a2c8',
+  __typename: 'OrderItem',
+  subTotals: {
+    _included: 0,
+    _xincluded: 0,
+    _direct: 0,
+    _xdirect: 0,
+    _simple: 2,
+    _actual: 2,
+  },
+};
+
+describe('Get sub order', () => {
+  test('Get a suborder with one item', () => {
+    const order = orderMock;
+    const create = pricingService.order.getSuborder({ order });
+    const newSubOrders = [create(order.items, 1)];
+    expect(newSubOrders).toHaveLength(1);
+  });
+  test('Get a suborder with multiple items', () => {
+    const order = orderMock;
+    const create = pricingService.order.getSuborder({ order });
+    order.items = [...order.items, mockItem];
+    const newSubOrders = [create(order.items, 2)];
+    expect(newSubOrders).toHaveLength(1);
+  });
+});

package/lib/constants/index.js

@@ -1,4 +1,4 @@
-const Status = require('./Status');
+const Status = require('./status');
 const Modifier = require('./Modifier');
 
 module.exports = {

package/lib/item/getItemModifiers.js

@@ -1,5 +1,4 @@
 module.exports = () =>
   function getItemModifiers(item) {
-
     return item.modifiers;
   };

package/lib/item/getItemsTotalQuantity.js

@@ -1,5 +1,5 @@
 module.exports = ({ actions }) =>
-  function getItemsTotalPieces(items) {
+  function getItemsTotalQuantity(items) {
     return items.reduce(
       (total, item) => total + actions.getTotalQuantity(item),
       0

package/lib/item/getTotalPrice.js

@@ -6,5 +6,4 @@ module.exports = ({ utils }) =>
       (totalPrice, item) => utils.math.add(totalPrice, item.price),
       0
     );
-
   };

package/lib/item/index.js

@@ -11,10 +11,8 @@ const create = require('./create');
 const hasModifier = require('./hasModifier');
 const isSelected = require('./isSelected');
 const hasModifiers = require('./hasModifiers');
-const openRecommendationDialog = require('./openRecommendationDialog');
 const addIndirectModifier = require('./addIndirectModifier');
 const calculate = require('./calculate');
-const filterByDirectModifiers = require('./filterByDirectModifiers');
 const getItemPrice = require('./getItemPrice');
 const getDepartmentModifiers = require('./getDepartmentModifiers');
 const hasSubscription = require('./hasSubscription');
@@ -62,10 +60,8 @@ const itemActions = (deps = {}) => {
     hasModifier: hasModifier(innerDeps),
     isSelected: isSelected(innerDeps),
     hasModifiers: hasModifiers(innerDeps),
-    openRecommendationDialog: openRecommendationDialog(innerDeps),
     addIndirectModifier: addIndirectModifier(innerDeps),
     calculate: calculate(innerDeps),
-    filterByDirectModifiers: filterByDirectModifiers(innerDeps),
     getItemPrice: getItemPrice(innerDeps),
     getDepartmentModifiers: getDepartmentModifiers(innerDeps),
     hasSubscription: hasSubscription(innerDeps),

package/lib/modifier/calculate.js

@@ -23,10 +23,10 @@ module.exports = ({ _, constants, utils, localization, actions }) => {
     const maxAmountProp = actions.getProperty(modifier, 'maxAmount');
 
     if (!options.skip) {
-      const maxAmountCalc = 
+      const maxAmountCalc =
         actions.isFixedAdd(modifier) || actions.isAmountOverride(modifier)
-        ? amount
-        : math.mul(options.price, options.quantity);
+          ? amount
+          : math.mul(options.price, options.quantity);
 
       const maxAmount = maxAmountProp
         ? math.min(maxAmountProp, maxAmountCalc)

package/lib/modifier/createCreditModifier.js

@@ -1,6 +1,5 @@
-module.exports = ({ _, actions }) => {
-
-  return function createCreditModifier(modifier = {}) {
+module.exports = ({ _, actions }) =>
+  function createCreditModifier(modifier = {}) {
     const { customerStoredCredit, ...rest } = _.cloneDeep(modifier);
     if (!customerStoredCredit) return null;
     let creditModifier;
@@ -27,4 +26,3 @@ module.exports = ({ _, actions }) => {
     };
     return creditModifier;
   };
-};

package/lib/modifier/getItemModifiers.js

@@ -1,5 +1,5 @@
-module.exports = ({ actions }) => {
-  return function getItemModifiers({ modifiers, customer, cache }) {
+module.exports = ({ actions }) =>
+  function getItemModifiers({ modifiers, customer, cache }) {
     const matchedModifiers = actions.getMatchTagsModifiers({
       modifiers,
       entity: customer,
@@ -34,4 +34,3 @@ module.exports = ({ actions }) => {
       modifierId: each.modifierId || each._id,
     }));
   };
-};

package/lib/order/createSuborder.js

@@ -0,0 +1,17 @@
+module.exports = ({ actions }) =>
+  function createSuborder(order) {
+    const create = actions.getSuborder({ order });
+    let subOrders = order.orders || [];
+    const newSubOrders = [create(order.items, 1)];
+    subOrders = [...subOrders, ...newSubOrders].map((subOrder, idx) => ({
+      ...subOrder,
+      displayId: `${order.displayId}-${idx + 1}`,
+    }));
+
+    subOrders = actions.spreadModifiers({
+      parentOrder: order,
+      subOrders,
+    });
+
+    return subOrders;
+  };

package/lib/order/getSuborder.js

@@ -0,0 +1,49 @@
+module.exports = ({ utils, _, settings }) => {
+  const orderSettings = _.get(settings, 'order');
+  const { date, helpers } = utils;
+  const noteDefaults = {
+    message: '',
+    attributes: [],
+    date: date.toISOString(),
+    user: null,
+    url: '',
+    __typename: 'Note',
+  };
+  const getSubOrder =
+    ({ order }) =>
+    (items, index) => {
+      let displayId = '';
+      if (orderSettings.allowSuborder)
+        displayId = `${order.displayId}-${index}`;
+      else if (index === 1) displayId = order.displayId;
+
+      return {
+        ...order,
+        _id: helpers.getObjectID(),
+        displayId,
+        discount: 0,
+        tax: 0,
+        totalPaid: 0,
+        total: 0,
+        status: {
+          order: 'open',
+          delivery: order.status.delivery,
+          detailed: order.status.detailed,
+          fullyPaid: false,
+          fullyPicked: false,
+        },
+        parentId: orderSettings.allowSuborder ? order._id : null,
+        items,
+        modifiers: [],
+        notes: [
+          ...(order.notes || []),
+          {
+            ...noteDefaults,
+            message: `Suborder from ${order.displayId}`, // ask about this message
+          },
+        ],
+      };
+    };
+
+  return getSubOrder;
+};

package/lib/order/index.js

@@ -86,6 +86,8 @@ const validateFixedModifiersTotal = require('./validateFixedModifiersTotal');
 const markModifiersAsLocked = require('./markModifiersAsLocked');
 const removeModifiers = require('./removeModifiers');
 const addModifiers = require('./addModifiers');
+const createSuborder = require('./createSuborder');
+const getSuborder = require('./getSuborder');
 
 const orderActions = (deps = {}) => {
   const actions = {};
@@ -184,6 +186,8 @@ const orderActions = (deps = {}) => {
     markModifiersAsLocked: markModifiersAsLocked(innerDeps),
     removeModifiers: removeModifiers(innerDeps),
     addModifiers: addModifiers(innerDeps),
+    createSuborder: createSuborder(innerDeps),
+    getSuborder: getSuborder(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/order/pickEndDate.js

@@ -48,8 +48,10 @@ module.exports = ({ settings, _, moment }) => {
       // day condition stays working until addDaysCounter is greater than loop
       if (
         !shouldSkip ||
+        // eslint-disable-next-line no-loop-func
         !closedDays.some(closedDay => closedDay.date.isSame(endDateTZ, 'day'))
       ) {
+        // eslint-disable-next-line no-plusplus
         addDaysCounter++;
       }
     }

package/lib/order/splitByDepartments.js

@@ -1,14 +1,5 @@
-module.exports = ({ utils, _, itemActions, modifierActions, settings }) => {
-  const orderSettings = _.get(settings, 'order');
-  const { date, helpers } = utils;
-  const noteDefaults = {
-    message: '',
-    attributes: [],
-    date: date.toISOString(),
-    user: null,
-    url: '',
-    __typename: 'Note',
-  };
+module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
+  const { helpers } = utils;
 
   const joinItemQuantity = orders =>
     orders.map(order => {
@@ -39,42 +30,6 @@ module.exports = ({ utils, _, itemActions, modifierActions, settings }) => {
       return { ...order, items };
     });
 
-  const getOrder =
-    ({ order, name }) =>
-    (items, index) => {
-      let displayId = '';
-      if (orderSettings.allowSuborder)
-        displayId = `${order.displayId}-${index}`;
-      else if (index === 1) displayId = order.displayId;
-
-      return {
-        ...order,
-        _id: helpers.getObjectID(),
-        displayId,
-        discount: 0,
-        tax: 0,
-        totalPaid: 0,
-        total: 0,
-        status: {
-          order: 'open',
-          delivery: order.status.delivery,
-          detailed: order.status.detailed,
-          fullyPaid: false,
-          fullyPicked: false,
-        },
-        parentId: orderSettings.allowSuborder ? order._id : null,
-        items,
-        modifiers: [],
-        notes: [
-          ...(order.notes || []),
-          {
-            ...noteDefaults,
-            message: `Split from ${order.displayId}, for department ${name}`,
-          },
-        ],
-      };
-    };
-
   const getDepartmentName = item => {
     const deps = itemActions.getDepartmentModifiers(item);
     return (deps.length && deps[0].name) || 'other';
@@ -91,7 +46,7 @@ module.exports = ({ utils, _, itemActions, modifierActions, settings }) => {
 
     orders.forEach(each => {
       const [name, newItems] = each;
-      const create = getOrder({ order, name });
+      const create = actions.getSuborder({ order, name });
       // Assuming there is one department in the item
       const department = itemActions.getDepartmentModifiers(newItems[0])[0];
       const departmentName = getDepartmentName(newItems[0]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -36,5 +36,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "810d5db51e47904e9813b4abdf5867d823117e4c"
+  "gitHead": "0ab9e8f6bf59ef671ffb2005712a5ec6f998b36e"
 }

package/lib/item/filterByDirectModifiers.js

@@ -1,13 +0,0 @@
-/**
- * Remove order modifiers from items
- */
-module.exports = ({ modifierActions }) =>
-  //
-  function filterByDirectModifiers(items = []) {
-    return items.map(item => ({
-      ...item,
-      modifiers: (item.modifiers || []).filter(modifier =>
-        modifierActions.isDirect(modifier)
-      ),
-    }));
-  };

package/lib/item/openRecommendationDialog.js

@@ -1,4 +0,0 @@
-module.exports = () =>
-  function openRecommendationDialog(item) {
-    return !!(item && item.openRecommendationDialog);
-  };