rerobe-js-orm 3.9.8 → 3.9.9

package/lib/helpers/OrderHelpers.js

@@ -355,26 +355,35 @@ class OrderHelpers {
         if (!productsFullInfoWithQuantity || productsFullInfoWithQuantity.length === 0) {
             return 0;
         }
-        // Step 1: Calculate the total before applying the order-wide discount
-        const totalBeforeDiscount = 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 and discounts
+            // 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);
-            let totalPrice = basePrice;
-            // Apply tax if the item is taxable
+            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 tax based on base price
-                totalPrice += taxAmount; // Add tax to the base price
+                return taxableAmount * Number(item.taxRate);
             }
-            return totalPrice; // Return the total price (including tax if applicable)
+            return 0; // No tax for non-taxable items
         })
-            .reduce((a, b) => a + b, 0); // Sum up the totals for all items
-        // Step 2: Apply the order-wide discount, ensuring it doesn't exceed the total before discount
-        const totalAfterDiscount = Math.max(totalBeforeDiscount - orderDiscount, 0);
-        // Step 3: Return the final subtotal, rounded to fixed decimal points
-        return Number(this.toFixedPointPrice(totalAfterDiscount));
+            .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.8",
+  "version": "3.9.9",
   "description": "ReRobe's Javascript ORM Framework",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",