rerobe-js-orm 3.9.7 → 3.9.9

package/lib/helpers/OrderHelpers.d.ts

@@ -26,7 +26,7 @@ export default class OrderHelpers {
         currency: string;
     }): string;
     getSubtotalWithoutSalePrice(productsFullInfoWithQuantity?: ProductsFullInfoWithQuantity): number;
-    getSubtotalWithSalePriceIncluded(productsFullInfoWithQuantity?: ProductsFullInfoWithQuantity): number;
+    getSubtotalWithSalePriceIncluded(productsFullInfoWithQuantity?: ProductsFullInfoWithQuantity, orderDiscount?: number): number;
     getSaleDiscountAmount(productsFullInfoWithQuantity: ProductsFullInfoWithQuantity): number;
     preparePresentmentData({ merchantName, merchantCurrency, presentmentCurrencyCode, productsFullInfoWithQuantity, currencyConverter, saleDiscountAmount, creditDiscountAmount, additionalDiscount, shippingPrice, itemsTax, shippingFeeTax, subTotalWithSalePriceIncluded, totalIncludingShipping, totalIncludingShippingAndTaxes, }: {
         merchantName: string;

package/lib/helpers/OrderHelpers.js

@@ -351,23 +351,39 @@ class OrderHelpers {
             .reduce((a, b) => a + b, 0);
         return Number(this.toFixedPointPrice(cumsum));
     }
-    getSubtotalWithSalePriceIncluded(productsFullInfoWithQuantity) {
+    getSubtotalWithSalePriceIncluded(productsFullInfoWithQuantity, orderDiscount = 0) {
         if (!productsFullInfoWithQuantity || productsFullInfoWithQuantity.length === 0) {
             return 0;
         }
-        const cumsum = productsFullInfoWithQuantity
+        // Step 1: Calculate the pre-tax subtotal (no taxes yet)
+        const preTaxSubtotal = productsFullInfoWithQuantity
             .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;
+            // Base price for this item before tax
+            return Number(price || 0) * Number(item.quantity);
+        })
+            .reduce((a, b) => a + b, 0); // Sum up the pre-tax prices of all items
+        // Step 2: Apply the order-wide discount to the pre-tax subtotal, ensuring it doesn't exceed the pre-tax subtotal
+        const discountedSubtotal = Math.max(preTaxSubtotal - orderDiscount, 0);
+        // Step 3: Calculate the total tax based on the discounted subtotal
+        const totalTax = productsFullInfoWithQuantity
+            .map((item) => {
+            const price = item.product.isOnSale && item.product.clearanceTimestamp ? item.product.salePrice : item.product.price;
             const basePrice = Number(price || 0) * Number(item.quantity);
+            const discountFactor = basePrice / preTaxSubtotal; // Determine how much of the discount applies to this item
+            const discountedPriceForItem = basePrice - orderDiscount * discountFactor; // Apply discount proportionally to this item
+            const taxableAmount = Math.max(discountedPriceForItem, 0); // Cap the discounted price at 0
+            // Calculate tax only for taxable items, based on the discounted price
             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 taxableAmount * Number(item.taxRate);
             }
-            return basePrice; // Return the price without tax for non-taxable items
+            return 0; // No tax for non-taxable items
         })
-            .reduce((a, b) => a + b, 0);
-        return Number(this.toFixedPointPrice(cumsum));
+            .reduce((a, b) => a + b, 0); // Sum up the taxes for all items
+        // Step 4: Return the final total (discounted subtotal + total tax)
+        const totalAfterDiscountAndTax = discountedSubtotal + totalTax;
+        return Number(this.toFixedPointPrice(totalAfterDiscountAndTax));
     }
     getSaleDiscountAmount(productsFullInfoWithQuantity) {
         return productsFullInfoWithQuantity

package/package.json

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