shopoflex-types 1.0.183 → 1.0.185

package/dist/common.d.ts

@@ -356,7 +356,7 @@ export interface Vendor {
     };
     allowCustomPricing?: boolean;
     pixelsOptions?: PixelsOptions;
-    taxManagement?: TaxManagement;
+    taxManagement?: TaxConfig;
     currentPlan?: {
         planDiscount?: any;
         planId?: IPlanPackage;
@@ -617,14 +617,18 @@ export interface successResponse {
 }
 export type Industry = "restaurant" | "grocery" | "retail" | "pharmacy" | "services";
 export interface TaxConfig {
-    active: boolean;
-    show: boolean;
-    payer: 'vendor' | 'customer';
-    percentage: number;
-}
-export interface TaxManagement {
-    type: 'perCountry' | 'fixed';
-    fixed: TaxConfig;
-    perCountry: Record<string, TaxConfig>;
+    type: "fixed" | "perCountry";
+    fixed?: {
+        active: boolean;
+        show: boolean;
+        payer: "vendor" | "customer";
+        percentage: number;
+    };
+    perCountry?: Record<string, {
+        active: boolean;
+        show: boolean;
+        payer: "vendor" | "customer";
+        percentage: number;
+    }>;
 }
 export {};

package/dist/samples.d.ts

@@ -1,21 +1,6 @@
-import { Address, Discount, IZone } from "./common";
+import { Address, Discount, IZone, TaxConfig } from "./common";
 import { CartItem } from "./productCart";
-export interface SampleTaxConfig {
-    type: "fixed" | "perCountry";
-    fixed?: {
-        active: boolean;
-        show: boolean;
-        payer: "vendor" | "customer";
-        percentage: number;
-    };
-    perCountry?: Record<string, {
-        active: boolean;
-        show: boolean;
-        payer: "vendor" | "customer";
-        percentage: number;
-    }>;
-}
-export declare const calculateCartTotalsWithDiscounts: (items: CartItem[], deliveryFee: number, allDiscounts: Discount[], manualDiscount?: Discount, vendorTaxConfig?: SampleTaxConfig, customerAddress?: Address | any) => {
+export declare const calculateCartTotalsWithDiscounts: (items: CartItem[], deliveryFee: number, allDiscounts: Discount[], manualDiscount?: Discount, vendorTaxConfig?: TaxConfig, customerAddress?: Address | any, deliveryFeeOverride?: number, discountOverride?: number) => {
     items: CartItem[];
     subtotal: number;
     totalQuantity: number;

package/dist/samples.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateDeliveryFeeForZones = exports.calculateCartTotalsWithDiscounts = void 0;
-const calculateCartTotalsWithDiscounts = (items, deliveryFee, allDiscounts, manualDiscount, vendorTaxConfig, customerAddress) => {
+const calculateCartTotalsWithDiscounts = (items, deliveryFee, allDiscounts, manualDiscount, vendorTaxConfig, customerAddress, deliveryFeeOverride, discountOverride) => {
     // Calculate initial totals for each item
     const itemsWithTotals = items.map((item) => {
         const basePrice = item.selectedVariant?.priceModel?.price || 0;
@@ -18,14 +18,16 @@ const calculateCartTotalsWithDiscounts = (items, deliveryFee, allDiscounts, manu
     });
     const subtotal = itemsWithTotals.reduce((sum, item) => sum + (item.totalPrice ?? 0), 0);
     const totalQuantity = itemsWithTotals.reduce((sum, item) => sum + item.quantity, 0);
+    // Use delivery fee override if provided, otherwise use normal delivery fee
+    const finalDeliveryFee = deliveryFeeOverride !== undefined ? deliveryFeeOverride : deliveryFee;
     // Create base cart for discount calculations
     const baseCart = {
         items: itemsWithTotals,
         subtotal,
         totalQuantity,
-        delivery: deliveryFee,
+        delivery: finalDeliveryFee,
         discount: 0,
-        total: subtotal + deliveryFee,
+        total: subtotal + finalDeliveryFee,
     };
     // Apply discounts and get updated cart
     const applyDiscounts = (cart, allDiscounts, manualDiscount) => {
@@ -61,7 +63,6 @@ const calculateCartTotalsWithDiscounts = (items, deliveryFee, allDiscounts, manu
                 }, 0);
             }
             else if (discount.discountCategory === "product_discount") {
-                // Calculate total basePrice of applicable products (excludes modifiers)
                 applicableTotal = cart.items.reduce((total, item) => {
                     if (!item._id)
                         return total;
@@ -261,7 +262,25 @@ const calculateCartTotalsWithDiscounts = (items, deliveryFee, allDiscounts, manu
             totalDiscount: cappedCartLevelDiscountAmount + deliveryDiscountAmount,
         };
     };
-    const { updatedCart, totalDiscount } = applyDiscounts(baseCart, allDiscounts, manualDiscount);
+    // Apply discount override if provided, otherwise calculate discounts normally
+    let updatedCart;
+    let totalDiscount;
+    if (discountOverride !== undefined) {
+        // Use discount override (percentage) - skip all discount calculations
+        const overrideDiscountAmount = (subtotal * discountOverride) / 100;
+        updatedCart = {
+            ...baseCart,
+            discount: overrideDiscountAmount,
+            total: Math.max(0, subtotal - overrideDiscountAmount + finalDeliveryFee),
+        };
+        totalDiscount = overrideDiscountAmount;
+    }
+    else {
+        // Apply normal discount calculations
+        const result = applyDiscounts(baseCart, allDiscounts, manualDiscount);
+        updatedCart = result.updatedCart;
+        totalDiscount = result.totalDiscount;
+    }
     // Calculate vendor tax if configuration is provided
     let taxInfo = {
         taxAmount: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shopoflex-types",
-  "version": "1.0.183",
+  "version": "1.0.185",
   "description": "Shared TypeScript types for Shopoflex applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",