rerobe-js-orm 3.6.5 → 3.6.7

package/lib/helpers/OrderHelpers.js

@@ -353,9 +353,16 @@ class OrderHelpers {
             return 0;
         }
         const cumsum = productsFullInfoWithQuantity
-            .map((i) => {
-            const price = i.product.isOnSale && i.product.clearanceTimestamp ? i.product.salePrice : i.product.price;
-            return Number(price || 0) * Number(i.quantity);
+            .map((item) => {
+            // Determine if the product is on sale and set the price accordingly
+            const price = item.product.isOnSale && item.product.clearanceTimestamp ? item.product.salePrice : item.product.price;
+            const basePrice = Number(price || 0) * Number(item.quantity);
+            // Apply tax if the item is taxable
+            if (item.isTaxable && item.taxRate) {
+                const taxAmount = basePrice * Number(item.taxRate); // Calculate the tax based on the base price
+                return basePrice + taxAmount; // Return the total including tax
+            }
+            return basePrice; // Return the price without tax for non-taxable items
         })
             .reduce((a, b) => a + b, 0);
         return Number(this.toFixedPointPrice(cumsum));
@@ -422,7 +429,7 @@ class OrderHelpers {
             };
         }
         const subtotalPricePresentmentWithSalePrice = lineItems
-            .map((i) => { var _a; return Number((_a = i.presentmentTotalPrice) === null || _a === void 0 ? void 0 : _a.amount); })
+            .map((i) => { var _a, _b; return Number((_a = i.presentmentTotalPrice) === null || _a === void 0 ? void 0 : _a.amount) + Number(((_b = i.presentmentTaxPrice) === null || _b === void 0 ? void 0 : _b.amount) || 0); })
             .reduce((a, b) => a + b, 0);
         const saleDiscountPresentmentAmount = subtotalOriginalPresentment - subtotalPricePresentmentWithSalePrice;
         const creditDiscountPresentmentAmount = convertAndFixPrice(creditDiscountAmount || 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rerobe-js-orm",
-  "version": "3.6.5",
+  "version": "3.6.7",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",