@darkpos/pricing 1.0.122 → 1.0.125

package/__TEST__/order/order.test.js

@@ -1599,7 +1599,7 @@ describe('Order actions', () => {
         return 0;
       });
 
-    expect(subOrders[0].displayId).toBe('1-1');
+    expect(subOrders[0].displayId).toBe('');
     expect(subOrders[0].items.map(item => item.name)).toEqual([
       'Box Shirt - Fold',
       'Pants',

package/lib/order/calculate.js

@@ -20,8 +20,8 @@ module.exports = ({
 
       return { ...order, ...actions.getTotals(order.orders) };
     }
-    const startRequestDate = order.start ? order.start.requestDate : null;
-    const endRequestDate = order.end ? order.end.requestDate : null;
+    const startRequestDate = actions.getStartDate({ order });
+    const endRequestDate = actions.getEndDate({ order });
 
     const options = {
       ...opts,

package/lib/order/getStartDate.js

@@ -1,4 +1,4 @@
 module.exports = ({ _ }) =>
   function getStartDate({ order }) {
-    return _.get(order, 'start.actualDate', '');
+    return _.get(order, 'start.requestDate', '');
   };

package/lib/order/mapSubOrders.js

@@ -2,11 +2,7 @@ module.exports = ({ actions }) =>
   function mapSubOrders({ parentOrder, newSubOrders }) {
     let subOrders = parentOrder.orders || [];
 
-    // reassign displayIds
-    subOrders = [...subOrders, ...newSubOrders].map((subOrder, index) => ({
-      ...subOrder,
-      displayId: `${parentOrder.displayId}-${index + 1}`,
-    }));
+    subOrders = [...subOrders, ...newSubOrders];
 
     subOrders = actions.spreadModifiers({
       parentOrder,

package/lib/order/merge.js

@@ -74,9 +74,8 @@ module.exports = ({ _, actions, utils }) => {
 
     let subOrders = [];
     if (newOrder && subOrdersToMerge && subOrdersToMerge.length > 0) {
-      subOrders = subOrdersToMerge.map((s, index) => ({
+      subOrders = subOrdersToMerge.map(s => ({
         ...s,
-        displayId: `${newOrder.displayId || ''}-${index + 1}`,
         parentId: newOrder._id,
         customer: newOrder.customer,
       }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.122",
+  "version": "1.0.125",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -55,5 +55,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "b31fc15b593be32a295002440e550e5fd6a7e1da"
+  "gitHead": "75e2c7fc1237e4cb3fd5f019390d314ada58229f"
 }