@darkpos/pricing 1.0.49 → 1.0.51

package/__TEST__/modifier.test.js

@@ -0,0 +1,27 @@
+const usePricing = require('../index');
+
+const pricingService = usePricing();
+
+describe('Modifier actions', () => {
+  test('CU-86dv8hzxg modifier.isGroup fn', () => {
+    expect(
+      pricingService.modifier.isGroup({
+        attributes: ['group'],
+      })
+    ).toBe(true);
+
+    expect(
+      pricingService.modifier.isGroup({
+        properties: {
+          group: {},
+        },
+      })
+    ).toBe(false);
+    expect(
+      pricingService.modifier.isGroup({
+        atrributes: [],
+        properties: {},
+      })
+    ).toBe(false);
+  });
+});

package/__TEST__/order/split.test.js

@@ -353,4 +353,46 @@ describe('Auto Split', () => {
     expect(subOrders[0].items[0].quantity).toEqual(1);
     expect(subOrders[1].items[0].quantity).toEqual(1);
   });
+
+  test('Auto split -> No departments. Should return items withouth joining them.', () => {
+    const { autoSplit } = pricingService.order;
+
+    const item1 = {
+      _id: '111',
+      itemId: '444',
+      modifiers: [{ _id: '123' }],
+      quantity: 1,
+      pieces: 2,
+      weight: 25,
+    };
+
+    const item2 = {
+      _id: '222',
+      itemId: '444',
+      modifiers: [{ _id: '234' }, { _id: '456' }],
+      quantity: 5,
+      pieces: 2,
+      weight: 25,
+    };
+
+    const subOrders = autoSplit({
+      parentOrder: {
+        items: [item1, item2],
+        status: {},
+        modifiers: [],
+        displayId: 1,
+      },
+    });
+
+    expect(subOrders.length).toEqual(1);
+    expect(subOrders[0].items.length).toEqual(2);
+    expect(subOrders[0].items[0].quantity).toEqual(1);
+    expect(subOrders[0].items[0].modifiers.length).toEqual(1);
+    expect(subOrders[0].items[0].modifiers[0]._id).toEqual('123');
+
+    expect(subOrders[0].items[1].quantity).toEqual(5);
+    expect(subOrders[0].items[1].modifiers.length).toEqual(2);
+    expect(subOrders[0].items[1].modifiers[0]._id).toEqual('234');
+    expect(subOrders[0].items[1].modifiers[1]._id).toEqual('456');
+  });
 });

package/lib/item/getItemModifiersDescription.js

@@ -11,7 +11,7 @@ module.exports = ({ modifierActions, _, settings }) =>
           !modifierActions.isAmountOverride(each) &&
           !modifierActions.isDepartment(each) &&
           modifierActions.isDirect(each) &&
-          !modifierActions.isGroupOfModifiers(each)
+          !modifierActions.isGroup(each)
       )
       .map(modifier => {
         const { name, _id, compute = {} } = modifier;

package/lib/modifier/index.js

@@ -148,6 +148,7 @@ const isCalculatedPaymentModifier = require('./isCalculatedPaymentModifier');
 const isChild = require('./isChild');
 const isExtractCalculatedValue = require('./isExtractCalculatedValue');
 const getPriceWithoutModifier = require('./getPriceWithoutModifier');
+const isGroup = require('./isGroup');
 
 const modifierActions = (deps = {}) => {
   const actions = {};
@@ -309,6 +310,7 @@ const modifierActions = (deps = {}) => {
     isChild: isChild(innerDeps),
     isExtractCalculatedValue: isExtractCalculatedValue(innerDeps),
     getPriceWithoutModifier: getPriceWithoutModifier(innerDeps),
+    isGroup: isGroup(innerDeps),
   });
 
   Object.keys(freezedActions).forEach(actionName => {

package/lib/modifier/isGroup.js

@@ -0,0 +1,10 @@
+module.exports = ({ actions }) =>
+  function isGroup(modifier) {
+    if (!modifier) return false;
+    return !!(
+      actions.hasAttribute(modifier, 'group') ||
+      (modifier.properties &&
+        modifier.properties.group &&
+        Object.keys(modifier.properties.group) > 0)
+    );
+  };

package/lib/order/splitByDepartments.js

@@ -1,24 +1,19 @@
 module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
   const { helpers } = utils;
 
-  const joinItemQuantity = orders =>
+  const getDepartmentName = item => {
+    const deps = itemActions.getDepartmentModifiers(item);
+    return (deps.length && deps[0].name) || 'other';
+  };
+
+  const isSplitByPieces = splitUnit => splitUnit === 'pieces';
+  const isSplitByWeight = splitUnit => splitUnit === 'weight';
+
+  const joinItemQuantityById = orders =>
     orders.map(order => {
       const items = order.items.reduce((arr, item) => {
         const _items = arr;
-        const index = _items.findIndex(each => {
-          const preSubs = modifierActions.getSubscriptionModifiers(
-            each.modifiers
-          );
-          const curSubs = modifierActions.getSubscriptionModifiers(
-            item.modifiers
-          );
-          return (
-            each.itemId === item.itemId &&
-            ((!each.serial && !item.serial) || each.serial === item.serial) &&
-            ((preSubs.length < 1 && curSubs.length < 1) ||
-              (preSubs.length > 0 && curSubs.length > 0))
-          );
-        });
+        const index = _items.findIndex(each => each._id === item._id);
         if (index !== -1)
           _items[index] = {
             ..._items[index],
@@ -30,14 +25,6 @@ module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
       return { ...order, items };
     });
 
-  const getDepartmentName = item => {
-    const deps = itemActions.getDepartmentModifiers(item);
-    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);
@@ -83,12 +70,14 @@ module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
       const totalCount = getItemsTotalCount(newItems);
 
       if (department && autoSplit && maxItems && totalCount > maxItems) {
+        let newItemid = helpers.getObjectID();
+
         newItems.forEach(newItem => {
           for (let j = 0; j < newItem.quantity; j += 1) {
             const item = {
               ...newItem,
               quantity: 1,
-              _id: helpers.getObjectID(),
+              _id: newItemid,
             };
             const totalCountPerItem = getItemTotalCount(item);
 
@@ -99,14 +88,20 @@ module.exports = ({ utils, _, actions, itemActions, modifierActions }) => {
                   maxItems &&
                 departmentName === getDepartmentName(newOrder.items[0])
             );
-            if (index > -1) splitOrders[index].items.push(item);
-            else splitOrders.push(create([item], splitOrders.length + 1));
+            if (index > -1) {
+              splitOrders[index].items.push(item);
+            } else {
+              newItemid = helpers.getObjectID();
+              splitOrders.push(
+                create([{ ...item, _id: newItemid }], splitOrders.length + 1)
+              );
+            }
           }
         });
       } else splitOrders.push(create(newItems, splitOrders.length + 1));
     });
 
-    splitOrders = joinItemQuantity(splitOrders);
+    splitOrders = joinItemQuantityById(splitOrders);
 
     return splitOrders;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.49",
+  "version": "1.0.51",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -17,6 +17,7 @@
     "test:validateConditions": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/validateConditionsCalculate.test.js",
     "test:hasModifier": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/modifier/hasModifier.test.js",
     "test:item": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/item.test.js",
+    "test:split": "jest --runInBand --detectOpenHandles --logHeapUsage  --forceExit ./__TEST__/order/split.test.js",
     "lint": "eslint --quiet lib/"
   },
   "publishConfig": {
@@ -40,5 +41,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "7f4c199f3f67a3d9d3c2d4b01fe4f04c7113f5ad"
+  "gitHead": "256cf9e7f41cbdf88d38713f8edae725ec5e855e"
 }