@darkpos/pricing 1.0.95 → 1.0.96

package/__TEST__/item.test.js

@@ -597,7 +597,6 @@ describe('Item actions', () => {
         },
       ],
       _id: '675354e939a47228afd1f199',
-      properties: { basePrice: 13.5 },
 
       itemId: '62cdbfd01ee1b400193281ee',
     };
@@ -651,7 +650,6 @@ describe('Item actions', () => {
         },
       ],
       _id: '675354e939a47228afd1f199',
-      properties: { basePrice: 13.5 },
 
       itemId: '62cdbfd01ee1b400193281ee',
     };
@@ -704,7 +702,6 @@ describe('Item actions', () => {
       quantity: 3,
       modifiers: [quantityOverrideMod],
       _id: '67535f34b4c5ea63d2d79640',
-      properties: { basePrice: 13.5 },
       itemId: '62cdbfd01ee1b400193281ee',
       menuRuleId: '65660855dfffaf2da26fb870',
       __typename: 'OrderItem',
@@ -780,7 +777,6 @@ describe('Item actions', () => {
         },
       ],
       _id: '675354e939a47228afd1f199',
-      properties: { basePrice: 13.5 },
 
       itemId: '62cdbfd01ee1b400193281ee',
     };
@@ -810,7 +806,7 @@ describe('Item actions', () => {
       name: "Men's 3pc Tuxedo",
       pieces: 3,
       total: 141.75,
-      price: 135,
+      price: 13.5,
       quantity: 1,
       modifiers: [
         {
@@ -837,7 +833,6 @@ describe('Item actions', () => {
         },
       ],
       _id: '675360d5bc57ccecf751a5b5',
-      properties: { basePrice: 13.5 },
       itemId: '62cdbfd01ee1b400193281ee',
     };
     const newItem = pricingService.item.calculate(item);
@@ -1161,9 +1156,6 @@ describe('Item actions', () => {
       modifiers: [groupMod],
       _id: '67e2cadd8dcf08ebcc5ef887',
       __typename: 'OrderItem',
-      properties: {
-        basePrice: 100,
-      },
     };
 
     const relatedItem1 = {
@@ -1259,9 +1251,6 @@ describe('Item actions', () => {
       modifiers: [groupMod, rawRelatedMod1],
       _id: '67e2cadd8dcf08ebcc5ef887',
       __typename: 'OrderItem',
-      properties: {
-        basePrice: 100,
-      },
     };
 
     const relatedItem1 = {

package/__TEST__/manualTest.test.js

@@ -36,9 +36,7 @@ describe('Manual actions', () => {
       modifiers: [groupMod],
       _id: '67e2cadd8dcf08ebcc5ef887',
       __typename: 'OrderItem',
-      properties: {
-        basePrice: 100,
-      },
+
       itemId: 'abcd123',
     };
 

package/__TEST__/modifier/getInvalidRequiredModifiers.test.js

@@ -265,7 +265,6 @@ test('getInvalidRequiredModifiers  having related items', () => {
         parentItemId: '62cdbfd01ee1b4001932821a',
         parentId: '67dc63610c106ab7d481d7dd',
         includeParent: true,
-        basePrice: 3,
         groupPath: ',67dc63610c106ab7d481d7de',
       },
     },

package/__TEST__/modifier.test.js

@@ -162,9 +162,7 @@ describe('Modifier actions', () => {
       itemId: '123',
       price: 100,
       modifiers: [],
-      properties: {
-        basePrice: 100,
-      },
+      properties: {},
     });
 
     const conditionsBag = [];
@@ -467,7 +465,6 @@ describe('Modifier actions', () => {
               url: null,
               color: 'rgba(254,86,33,1)',
               iconName: 'ActivitySquare',
-              basePrice: 213,
             },
             hasInventory: true,
             inventoryType: 'push',

package/__TEST__/order/order.test.js

@@ -3300,9 +3300,6 @@ describe('Order actions', () => {
       totalPaid: 0,
       notes: [],
       subTotals: {},
-      properties: {
-        basePrice: 0,
-      },
     };
 
     const item2 = {
@@ -3322,9 +3319,6 @@ describe('Order actions', () => {
       total: 12,
       totalPaid: 0,
       subTotals: {},
-      properties: {
-        basePrice: 12,
-      },
     };
 
     const order = {
@@ -3474,9 +3468,6 @@ describe('Order actions', () => {
       totalPaid: 0,
       notes: [],
       subTotals: {},
-      properties: {
-        basePrice: 0,
-      },
     };
 
     const item2 = {
@@ -3496,9 +3487,6 @@ describe('Order actions', () => {
       total: 12,
       totalPaid: 0,
       subTotals: {},
-      properties: {
-        basePrice: 12,
-      },
     };
 
     const order = {
@@ -3648,9 +3636,6 @@ describe('Order actions', () => {
       totalPaid: 0,
       notes: [],
       subTotals: {},
-      properties: {
-        basePrice: 0,
-      },
       _id: 1,
     };
 

package/lib/item/getBasePrice.js

@@ -1,7 +1,5 @@
 module.exports = () =>
   function getBasePrice(item) {
     if (!item) return 0;
-    if (!item.properties || typeof item.properties.basePrice !== 'number')
-      return item.price;
-    return item.properties.basePrice;
+    return item.price || 0;
   };

package/lib/modifier/createDescription.js

@@ -1,4 +1,4 @@
-module.exports = ({ actions, localization, _ }) =>
+module.exports = ({ actions, localization, _, utils }) =>
   function createDescription({ modifier, price }) {
     const { _computed, compute, name } = modifier;
 
@@ -15,8 +15,11 @@ module.exports = ({ actions, localization, _ }) =>
     description = `${name}${localAmount ? ` (${localAmount})` : ''}`;
 
     if (actions.isPriceOverride(modifier)) {
+      const dividedPrice = localization.formatAmount(
+        price && compute.amount ? utils.math.div(price, compute.amount) : 0
+      );
       description = isMultiplier
-        ? `${name} (${compute.amount} Unit @ ${localBasePrice}/Unit)`
+        ? `${name} (${compute.amount} Unit @ ${dividedPrice}/Unit)`
         : `${name} (${localization.formatAmount(compute.amount)}/Unit)`;
     }
 

package/lib/order/addItemModifier.js

@@ -80,8 +80,6 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
     order,
     modifier: _modifier,
     item: itemProp,
-    customer,
-    originalItem,
     onConditionsNotMet,
     onError,
   }) => {
@@ -115,13 +113,7 @@ module.exports = ({ actions, itemActions, modifierActions, utils, _ }) => {
 
     item.properties = {
       ...(item.properties || {}),
-      basePrice: item.price,
     };
-    item.price = itemActions.getItemPrice({
-      item,
-      itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
-      customer,
-    });
 
     return item;
   };

package/lib/order/removeItemModifier.js

@@ -1,4 +1,4 @@
-module.exports = ({ actions, modifierActions, itemActions, _ }) => {
+module.exports = ({ actions, modifierActions, _ }) => {
   const removeModifier = ({ item, modifier }) => {
     const nextItem = { ...item, modifiers: [] };
 
@@ -29,7 +29,6 @@ module.exports = ({ actions, modifierActions, itemActions, _ }) => {
       return order;
 
     let item = actions.getSelectedItem({ order, itemIndex });
-    const customer = actions.getCustomer(order);
 
     const contains = modifierActions.contains(item.modifiers, modifier);
 
@@ -42,11 +41,6 @@ module.exports = ({ actions, modifierActions, itemActions, _ }) => {
       originalItem,
     });
 
-    item.price = itemActions.getItemPrice({
-      item,
-      itemPriceLevels: originalItem ? originalItem.priceLevels : undefined,
-      customer,
-    });
     order.items[itemIndex] = item;
 
     return order;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.95",
+  "version": "1.0.96",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "edb497d37801c9749d2c3722a67657abe77c9ab6"
+  "gitHead": "aed710f165a1442c14bba31c5936682faa6b9364"
 }