@darkpos/pricing 1.0.32 → 1.0.33

package/__TEST__/order/split.test.js

@@ -0,0 +1,356 @@
+const usePricing = require('../../index');
+const mockStores = require('../mocks/stores');
+
+const session = {
+  store: mockStores[0],
+};
+
+const pricingService = usePricing(session);
+
+const dryCleaningModNoAutoSplit = {
+  name: 'Dry Cleaning',
+  attributes: ['department'],
+  code: 'D',
+  _id: '66d89d9b4f04f9eb99666483',
+};
+
+const laundryModNoAutoSplit = {
+  name: 'Laundry',
+  attributes: ['department'],
+  code: 'L',
+  _id: '66d89d9b4f04f9eb99666487',
+};
+
+const tailorinModNoAutoSplit = {
+  name: 'Tailoring',
+  attributes: ['department'],
+  code: 'T',
+  _id: '66d89d9b4f04f9eb99666484',
+};
+
+describe('Auto Split', () => {
+  test('Auto split only by department', () => {
+    const { autoSplit } = pricingService.order;
+
+    // Mock item to compare
+    const item1 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [laundryModNoAutoSplit],
+    };
+
+    const item2 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [dryCleaningModNoAutoSplit],
+    };
+
+    const item3 = {
+      _id: '567',
+      itemId: '567',
+      modifiers: [tailorinModNoAutoSplit],
+      quantity: 1000,
+      pieces: 2,
+    };
+
+    const item4 = {
+      _id: '444',
+      itemId: '444',
+      quantity: 1000,
+      modifiers: [tailorinModNoAutoSplit],
+      pieces: 2,
+    };
+
+    const subOrders = autoSplit({
+      parentOrder: {
+        items: [item1, item2, item3, item4],
+        status: {},
+        modifiers: [],
+        displayId: 1,
+      },
+    });
+
+    expect(subOrders.length).toEqual(3);
+  });
+
+  test('Auto split by department and Items Quantity', () => {
+    const { autoSplit } = pricingService.order;
+
+    const laundryModMaxItemsQuantity4 = {
+      ...laundryModNoAutoSplit,
+      properties: {
+        department: { autoSplit: true, maxItems: 2, splitUnit: 'quantity' },
+      },
+    };
+
+    // Mock item to compare
+    const item1 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [laundryModMaxItemsQuantity4],
+      quantity: 5,
+      pieces: 4,
+    };
+
+    const item2 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [laundryModMaxItemsQuantity4],
+      quantity: 5,
+      pieces: 4,
+    };
+
+    const item3 = {
+      _id: '567',
+      itemId: '567',
+      modifiers: [dryCleaningModNoAutoSplit],
+      quantity: 1000,
+      pieces: 2,
+    };
+
+    const item4 = {
+      _id: '444',
+      itemId: '444',
+      quantity: 1000,
+      modifiers: [tailorinModNoAutoSplit],
+      pieces: 2,
+    };
+
+    const subOrders = autoSplit({
+      parentOrder: {
+        items: [item1, item2, item3, item4],
+        status: {},
+        modifiers: [],
+        displayId: 1,
+      },
+    });
+
+    expect(subOrders.length).toEqual(7);
+  });
+
+  test('Auto split by department and Items Pieces', () => {
+    const { autoSplit } = pricingService.order;
+
+    const laundryModMaxItemsQuantity4 = {
+      ...laundryModNoAutoSplit,
+      properties: {
+        department: { autoSplit: true, maxItems: 2, splitUnit: 'pieces' },
+      },
+    };
+
+    // Mock item to compare
+    const item1 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [laundryModMaxItemsQuantity4],
+      quantity: 5,
+      pieces: 2,
+    };
+
+    const item2 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [laundryModMaxItemsQuantity4],
+      quantity: 5,
+      pieces: 2,
+    };
+
+    const item3 = {
+      _id: '567',
+      itemId: '567',
+      modifiers: [dryCleaningModNoAutoSplit],
+      quantity: 1000,
+      pieces: 2,
+    };
+
+    const item4 = {
+      _id: '444',
+      itemId: '444',
+      quantity: 1000,
+      modifiers: [tailorinModNoAutoSplit],
+      pieces: 2,
+    };
+
+    const subOrders = autoSplit({
+      parentOrder: {
+        items: [item1, item2, item3, item4],
+        status: {},
+        modifiers: [],
+        displayId: 1,
+      },
+    });
+
+    expect(subOrders.length).toEqual(12);
+  });
+
+  test('Auto split by department and Items Pieces 2', () => {
+    const { autoSplit } = pricingService.order;
+
+    const laundryModMaxItemsQuantity4 = {
+      ...laundryModNoAutoSplit,
+      properties: {
+        department: { autoSplit: true, maxItems: 6, splitUnit: 'pieces' },
+      },
+    };
+
+    const item1 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [laundryModMaxItemsQuantity4],
+      quantity: 10,
+      pieces: 2,
+    };
+
+    const subOrders = autoSplit({
+      parentOrder: {
+        items: [item1],
+        status: {},
+        modifiers: [],
+        displayId: 1,
+      },
+    });
+
+    expect(subOrders.length).toEqual(4);
+    expect(subOrders[0].items[0].quantity).toEqual(3);
+    expect(subOrders[1].items[0].quantity).toEqual(3);
+    expect(subOrders[2].items[0].quantity).toEqual(3);
+    expect(subOrders[3].items[0].quantity).toEqual(1);
+  });
+
+  test('Auto split by department and Items Pieces 3', () => {
+    const { autoSplit } = pricingService.order;
+
+    const laundryModMaxItemsQuantity4 = {
+      ...laundryModNoAutoSplit,
+      properties: {
+        department: { autoSplit: true, maxItems: 6, splitUnit: 'pieces' },
+      },
+    };
+
+    const item1 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [laundryModMaxItemsQuantity4],
+      quantity: 10,
+      pieces: 2,
+    };
+
+    const item2 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [tailorinModNoAutoSplit],
+      quantity: 5,
+      pieces: 2,
+    };
+
+    const item3 = {
+      _id: '567',
+      itemId: '567',
+      modifiers: [dryCleaningModNoAutoSplit],
+      quantity: 1000,
+      pieces: 2,
+    };
+
+    const subOrders = autoSplit({
+      parentOrder: {
+        items: [item1, item2, item3],
+        status: {},
+        modifiers: [],
+        displayId: 1,
+      },
+    });
+
+    expect(subOrders.length).toEqual(6);
+    expect(subOrders[0].items[0].quantity).toEqual(3);
+    expect(subOrders[1].items[0].quantity).toEqual(3);
+    expect(subOrders[2].items[0].quantity).toEqual(3);
+    expect(subOrders[3].items[0].quantity).toEqual(1);
+    expect(subOrders[4].items[0].quantity).toEqual(5);
+    expect(subOrders[5].items[0].quantity).toEqual(1000);
+  });
+
+  test('Auto split by department and Items Weight', () => {
+    const { autoSplit } = pricingService.order;
+
+    const laundryModMaxItems = {
+      ...laundryModNoAutoSplit,
+      properties: {
+        department: {
+          autoSplit: true,
+          maxItems: 100,
+          splitUnit: 'weight',
+        },
+      },
+    };
+
+    const item1 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [laundryModMaxItems],
+      quantity: 10,
+      pieces: 2,
+      weight: 30,
+    };
+
+    const subOrders = autoSplit({
+      parentOrder: {
+        items: [item1],
+        status: {},
+        modifiers: [],
+        displayId: 1,
+      },
+    });
+
+    expect(subOrders.length).toEqual(4);
+    expect(subOrders[0].items[0].quantity).toEqual(3);
+    expect(subOrders[1].items[0].quantity).toEqual(3);
+    expect(subOrders[2].items[0].quantity).toEqual(3);
+    expect(subOrders[3].items[0].quantity).toEqual(1);
+  });
+
+  test('Auto split by department and Items Weight 2', () => {
+    const { autoSplit } = pricingService.order;
+
+    const laundryModMaxItems = {
+      ...laundryModNoAutoSplit,
+      properties: {
+        department: {
+          autoSplit: true,
+          maxItems: 25,
+          splitUnit: 'weight',
+        },
+      },
+    };
+
+    const item1 = {
+      _id: '123',
+      itemId: '234',
+      modifiers: [laundryModMaxItems],
+      quantity: 1,
+      pieces: 2,
+      weight: 25,
+    };
+
+    const item2 = {
+      _id: '322',
+      itemId: '4555',
+      modifiers: [laundryModMaxItems],
+      quantity: 1,
+      pieces: 2,
+      weight: 25,
+    };
+
+    const subOrders = autoSplit({
+      parentOrder: {
+        items: [item1, item2],
+        status: {},
+        modifiers: [],
+        displayId: 1,
+      },
+    });
+
+    expect(subOrders.length).toEqual(2);
+    expect(subOrders[0].items[0].quantity).toEqual(1);
+    expect(subOrders[1].items[0].quantity).toEqual(1);
+  });
+});

package/lib/item/getItemsTotalQuantity.js

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

package/lib/item/getItemsTotalWeight.js

@@ -0,0 +1,7 @@
+module.exports = ({ actions }) =>
+  function getItemsTotalWeight(items) {
+    return items.reduce(
+      (total, item) => total + actions.getTotalWeight(item),
+      0
+    );
+  };

package/lib/item/getTotalPieces.js

@@ -2,6 +2,6 @@ module.exports = ({ utils }) => {
   const { math } = utils;
   return function getTotalPieces(item) {
     if (!item) return 0;
-    return math.mul(item.quantity || 1, item.pieces || 1);
+    return math.mul(item.quantity || 0, item.pieces || 0);
   };
 };

package/lib/item/getTotalQuantity.js

@@ -0,0 +1,5 @@
+module.exports = () =>
+  function getQuantity(item) {
+    if (!item || !item.quantity) return 0;
+    return item.quantity;
+  };

package/lib/item/getTotalWeight.js

@@ -0,0 +1,7 @@
+module.exports = ({ utils }) => {
+  const { math } = utils;
+  return function getTotalWeight(item) {
+    if (!item) return 0;
+    return math.mul(item.quantity || 0, item.weight || 0);
+  };
+};

package/lib/item/index.js

@@ -1,5 +1,9 @@
 const getItemsTotalPieces = require('./getItemsTotalPieces');
 const getTotalPieces = require('./getTotalPieces');
+const getItemsTotalQuantity = require('./getItemsTotalQuantity');
+const getTotalQuantity = require('./getTotalQuantity');
+const getItemsTotalWeight = require('./getItemsTotalWeight');
+const getTotalWeight = require('./getTotalWeight');
 const removeModifier = require('./removeModifier');
 const removeModifiers = require('./removeModifiers');
 const findOriginalItem = require('./findOriginalItem');
@@ -45,6 +49,10 @@ const itemActions = (deps = {}) => {
   };
 
   const freezedActions = Object.freeze({
+    getItemsTotalWeight: getItemsTotalWeight(innerDeps),
+    getTotalWeight: getTotalWeight(innerDeps),
+    getItemsTotalQuantity: getItemsTotalQuantity(innerDeps),
+    getTotalQuantity: getTotalQuantity(innerDeps),
     getItemsTotalPieces: getItemsTotalPieces(innerDeps),
     getTotalPieces: getTotalPieces(innerDeps),
     removeModifier: removeModifier(innerDeps),

package/lib/modifier/index.js

@@ -76,7 +76,6 @@ const hasModifier = require('./hasModifier');
 const hasRelatedItems = require('./hasRelatedItems');
 const hasFixedModifier = require('./hasFixedModifier');
 const hasCreditModifier = require('./hasCreditModifier');
-const includePiecesInQuantity = require('./includePiecesInQuantity');
 const includesInGroup = require('./includesInGroup');
 const isTrackUsageSubscription = require('./isTrackUsageSubscription');
 const isDirect = require('./isDirect');
@@ -218,7 +217,6 @@ const modifierActions = (deps = {}) => {
     hasAttributes: hasAttributes(innerDeps),
     hasFixedModifier: hasFixedModifier(innerDeps),
     hasCreditModifier: hasCreditModifier(innerDeps),
-    includePiecesInQuantity: includePiecesInQuantity(innerDeps),
     includesInGroup: includesInGroup(innerDeps),
     isTrackUsageSubscription: isTrackUsageSubscription(innerDeps),
     isDirect: isDirect(innerDeps),

package/lib/order/splitByDepartments.js

@@ -80,6 +80,9 @@ module.exports = ({ utils, _, itemActions, modifierActions, settings }) => {
     return (deps.length && deps[0].name) || 'other';
   };
 
+  const isSplitByPieces = splitUnit => splitUnit === 'pieces';
+  const isSplitByWeight = splitUnit => splitUnit === 'weight';
+
   return function splitByDepartments(order) {
     const { items } = order;
     const itemsByDepartments = _.groupBy(items, getDepartmentName);
@@ -94,11 +97,37 @@ module.exports = ({ utils, _, itemActions, modifierActions, settings }) => {
       const departmentName = getDepartmentName(newItems[0]);
       const maxItems = modifierActions.getDepartmentMaxItems(department);
 
-      if (
-        department &&
-        maxItems &&
-        itemActions.getItemsTotalPieces(newItems) > maxItems
-      ) {
+      const autoSplit = _.get(
+        department || {},
+        'properties.department.autoSplit',
+        false
+      );
+
+      const splitUnit = _.get(
+        department || {},
+        'properties.department.splitUnit',
+        'quantity'
+      );
+
+      const getItemsTotalCount = itemsParam => {
+        if (isSplitByPieces(splitUnit))
+          return itemActions.getItemsTotalPieces(itemsParam);
+        if (isSplitByWeight(splitUnit))
+          return itemActions.getItemsTotalWeight(itemsParam);
+        return itemActions.getItemsTotalQuantity(itemsParam);
+      };
+
+      const getItemTotalCount = itemParam => {
+        if (isSplitByPieces(splitUnit))
+          return itemActions.getTotalPieces(itemParam);
+        if (isSplitByWeight(splitUnit))
+          return itemActions.getTotalWeight(itemParam);
+        return itemActions.getTotalQuantity(itemParam);
+      };
+
+      const totalCount = getItemsTotalCount(newItems);
+
+      if (department && autoSplit && maxItems && totalCount > maxItems) {
         newItems.forEach(newItem => {
           for (let j = 0; j < newItem.quantity; j += 1) {
             const item = {
@@ -106,11 +135,12 @@ module.exports = ({ utils, _, itemActions, modifierActions, settings }) => {
               quantity: 1,
               _id: helpers.getObjectID(),
             };
-            const totalPieces = itemActions.getTotalPieces(item);
+            const totalCountPerItem = getItemTotalCount(item);
+
             const index = splitOrders.findIndex(
               newOrder =>
                 newOrder.items &&
-                itemActions.getItemsTotalPieces(newOrder.items) + totalPieces <=
+                getItemsTotalCount(newOrder.items) + totalCountPerItem <=
                   maxItems &&
                 departmentName === getDepartmentName(newOrder.items[0])
             );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -36,5 +36,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "5c5b8c5f55437733d8f9d8f9bbba00d27a6f7c59"
+  "gitHead": "fed12242f23f92ff8cad9122afd770e6569f627a"
 }

package/lib/modifier/includePiecesInQuantity.js

@@ -1,10 +0,0 @@
-module.exports = () =>
-  function includePiecesInQuantity(modifier) {
-    return (
-      (modifier &&
-        modifier.properties &&
-        modifier.properties.department &&
-        modifier.properties.department.includePieces) ||
-      false
-    );
-  };