rerobe-js-orm 3.9.9 → 4.0.1

package/lib/helpers/OrderHelpers.js

@@ -364,26 +364,32 @@ class OrderHelpers {
             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
+        // 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);
-            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
+            // Calculate tax only for taxable items
             if (item.isTaxable && item.taxRate) {
-                return taxableAmount * Number(item.taxRate);
+                return basePrice * Number(item.taxRate);
             }
             return 0; // No tax for non-taxable items
         })
             .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));
+        // 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/lib/models/Order.js

@@ -276,6 +276,11 @@ class Order extends Base_1.default {
                     name: 'orderNumber',
                     type: 'int32',
                 },
+                {
+                    facet: true,
+                    name: 'orderNumberString',
+                    type: 'string',
+                },
                 {
                     facet: true,
                     name: 'customerName',
@@ -393,6 +398,7 @@ class Order extends Base_1.default {
             merchantId: this.utilities.sanitizeString(this.merchantId),
             image: this.utilities.sanitizeString(image),
             orderNumber: this.utilities.sanitizeNumber(this.orderNumber),
+            orderNumberString: this.utilities.sanitizeString(this.orderNumber),
             customerName: this.utilities.sanitizeString(this.customerName),
             customerEmail: this.utilities.sanitizeString(this.email),
             totalPrice: this.utilities.sanitizeNumber(Number(this.totalPrice.amount) - Number(this.totalRefunded.amount)),

package/lib/types/rerobe-order-types.d.ts

@@ -885,6 +885,7 @@ type TypesenseOrderObj = {
     updatedAtTimestamp: number;
     image: string;
     orderNumber: number;
+    orderNumberString: string;
     customerName: string;
     customerEmail: string;
     totalPrice: number;

package/package.json

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