rerobe-js-orm 3.9.8 → 4.0.0

package/lib/helpers/OrderHelpers.js

@@ -355,26 +355,41 @@ 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: Calculate the total tax based on the pre-tax 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
+            // Calculate tax only for taxable items
             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 basePrice * 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 3: Calculate subtotal with tax
+        const subtotalWithTax = preTaxSubtotal + totalTax;
+        // Step 4: Apply discount logic
+        let finalSubtotal;
+        if (orderDiscount >= preTaxSubtotal) {
+            // If the discount is greater than or equal to the pre-tax subtotal, the subtotal is 0 and no tax is applied
+            finalSubtotal = 0;
+        }
+        else {
+            // If the discount is less than the pre-tax subtotal, apply it to the subtotal with tax
+            finalSubtotal = Math.max(subtotalWithTax - orderDiscount, 0);
+        }
+        // Step 5: Return the final total, rounded to the correct decimal places
+        return Number(this.toFixedPointPrice(finalSubtotal));
     }
     getSaleDiscountAmount(productsFullInfoWithQuantity) {
         return productsFullInfoWithQuantity

package/package.json

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