@darkpos/pricing 1.0.149 → 1.0.151

package/__TEST__/order/hasSerial.test.js

@@ -77,6 +77,29 @@ describe('hasSerial function', () => {
     expect(result).toBe(false);
   });
 
+  test('returns false when the matching serial belongs to a pending item', () => {
+    const { hasSerial } = pricingService.order;
+
+    const order = {
+      items: [
+        {
+          _id: '1',
+          serial: 'ABC-123',
+          isPending: true,
+        },
+      ],
+    };
+
+    const item = {
+      _id: '2',
+      serial: 'ABC-123',
+    };
+
+    const result = hasSerial({ order, item });
+
+    expect(result).toBe(false);
+  });
+
   test('returns false when order or item is missing', () => {
     const { hasSerial } = pricingService.order;
 

package/lib/item/index.js

@@ -69,6 +69,7 @@ const applyNotesOverridesToItem = require('./applyNotesOverridesToItem');
 const getModifiersToNotCompute = require('./getModifiersToNotCompute');
 const getSplitDepartment = require('./getSplitDepartment');
 const isPriceChanged = require('./isPriceChanged');
+const isPending = require('./isPending');
 const isSerialRequired = require('./isSerialRequired');
 const isSerialLengthValid = require('./isSerialLengthValid');
 const getSerialStatus = require('./getSerialStatus');
@@ -166,6 +167,7 @@ const itemActions = (deps = {}) => {
     getModifiersToNotCompute: getModifiersToNotCompute(innerDeps),
     getSplitDepartment: getSplitDepartment(innerDeps),
     isPriceChanged: isPriceChanged(innerDeps),
+    isPending: isPending(innerDeps),
     isSerialRequired: isSerialRequired(innerDeps),
     isSerialLengthValid: isSerialLengthValid(innerDeps),
     getSerialStatus: getSerialStatus(innerDeps),

package/lib/item/isPending.js

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

package/lib/order/addItem.js

@@ -130,11 +130,12 @@ module.exports = ({ actions, itemActions, modifierActions, settings, _ }) => {
 
     const pendingItem = actions.getSelectedItem({ order, itemIndex });
 
-    if (pendingItem && pendingItem.isPending && !combined) {
+    if (pendingItem && itemActions.isPending(pendingItem) && !combined) {
       idx = itemIndex;
       combined = !!pendingItem.itemId;
       orderItem.quantity = pendingItem.quantity;
-      orderItem.isPending = orderItem.isPending || !orderItem.itemId;
+      orderItem.isPending =
+        itemActions.isPending(orderItem) || !orderItem.itemId;
       // add inventory
       if (pendingItem.inventory) {
         const inventory = getInventory(pendingItem);

package/lib/order/hasRemainingSubscription.js

@@ -1,7 +1,7 @@
-module.exports = ({ actions, modifierActions }) => {
+module.exports = ({ actions, modifierActions, _ }) => {
   const getRemaining = (subscriptions, orderId) => {
     const remaining = subscriptions.reduce((total, subscription) => {
-      const { usesLimit = 0, uses = 0, history = {} } = subscription;
+      const { usesLimit = 0, uses = 0, history = {} } = subscription.item || {};
       const orderHistory = history[orderId] || 0;
       return total + usesLimit + orderHistory - uses;
     }, 0);
@@ -37,8 +37,18 @@ module.exports = ({ actions, modifierActions }) => {
 
   const getSubscriptions = subscriptions =>
     subscriptions
-      .map(each => modifierActions.getSubscriptionItem(each))
-      .filter(Boolean);
+      .map(each => _.get(each, 'properties.subscription'))
+      .filter(Boolean)
+      .filter(each => {
+        const renewalType = _.get(each, 'item.renewalType');
+        const endDate = _.get(each, 'dateLimit.to');
+        const today = new Date();
+
+        if (renewalType === 'none' && endDate && new Date(endDate) < today)
+          return false;
+
+        return true;
+      });
 
   return function hasRemainingSubscription({ order, item }) {
     if (!order || !item || !item.itemId) return [false];
@@ -53,7 +63,9 @@ module.exports = ({ actions, modifierActions }) => {
     subscriptions = getSubscriptions(subscriptions);
 
     const isUnlimited = subscriptions.some(
-      each => !each.usesLimit || each.renewalType === 'limit_reached'
+      each =>
+        !_.get(each, 'item.usesLimit') ||
+        _.get(each, 'item.renewalType') === 'limit_reached'
     );
     if (isUnlimited) return [true];
 

package/lib/order/hasSerial.js

@@ -21,7 +21,9 @@ module.exports = ({ itemActions }) =>
     return order.items
       .filter(
         orderItem =>
-          orderItem._id !== item._id && !itemActions.isRelatedItem(orderItem)
+          orderItem._id !== item._id &&
+          !itemActions.isRelatedItem(orderItem) &&
+          !itemActions.isPending(orderItem)
       )
       .some(
         orderItem => normalizeSerial(orderItem.serial) === normalizedSerial

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.149",
+  "version": "1.0.151",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -54,5 +54,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "0d01074b06953dfc95097eb12cbace0ad7175ee9"
+  "gitHead": "f95dc7f14dcf4673e5fe25cb2faeb5eee26fb592"
 }