diff --git a/app/cart/page.tsx b/app/cart/page.tsx index 2ceb75f..b11afa3 100644 --- a/app/cart/page.tsx +++ b/app/cart/page.tsx @@ -48,18 +48,20 @@ export default function CartPage() { }, []); const subtotal = getCartTotal(); + const tax = Math.round((subtotal * (18 / 82)) * 100) / 100; + const grossSubtotal = subtotal + tax; const isFreeDelivery = Boolean( deliverySettings?.free_delivery_enabled && deliverySettings?.free_delivery_min_order_amount && - subtotal >= deliverySettings.free_delivery_min_order_amount + grossSubtotal >= deliverySettings.free_delivery_min_order_amount ); const baseDeliveryFee = deliverySettings ? deliverySettings.delivery_charge : 99.0; const shipping = subtotal > 0 ? (isFreeDelivery ? 0 : baseDeliveryFee) : 0; - const total = subtotal + shipping; + const total = subtotal + tax + shipping; const freeThreshold = deliverySettings?.free_delivery_min_order_amount || 999; - const progressPercent = Math.min(100, (subtotal / freeThreshold) * 100); - const amountNeeded = Math.max(0, freeThreshold - subtotal); + const progressPercent = Math.min(100, (grossSubtotal / freeThreshold) * 100); + const amountNeeded = Math.max(0, freeThreshold - grossSubtotal); return (
@@ -243,11 +245,17 @@ export default function CartPage() {
- Subtotal + Taxable Subtotal {formatCurrency(subtotal)}
+
+ GST (18%) + + {formatCurrency(tax)} + +
Shipping diff --git a/app/checkout/page.tsx b/app/checkout/page.tsx index 6973af9..a63d457 100644 --- a/app/checkout/page.tsx +++ b/app/checkout/page.tsx @@ -137,9 +137,9 @@ export default function CheckoutPage() { couponDiscount = Math.min(subtotal, Math.max(0, couponDiscount)); const postDiscountSubtotal = Math.max(0, subtotal - couponDiscount); - const taxable_amount = postDiscountSubtotal / 1.18; - const tax = Math.round((postDiscountSubtotal - taxable_amount) * 100) / 100; - const grossTotal = Math.round(postDiscountSubtotal + shipping); + // Pre-tax base pricing: subtotal is pre-tax base (e.g. 820), 18% GST is added (e.g. 180) to equal catalog MRP (1000) + const tax = Math.round((postDiscountSubtotal * (18 / 82)) * 100) / 100; + const grossTotal = Math.round(postDiscountSubtotal + tax + shipping); // Store credits deduction calculation const availableCredits = wallet?.active_balance || 0; @@ -1178,13 +1178,13 @@ export default function CheckoutPage() {
- Item Total + Taxable Subtotal {formatCurrency(subtotal)}
- Includes GST (18%) + GST (18%) {formatCurrency(tax)} diff --git a/components/ProductCard.tsx b/components/ProductCard.tsx index 8e4c10d..06375e5 100644 --- a/components/ProductCard.tsx +++ b/components/ProductCard.tsx @@ -442,6 +442,9 @@ export const ProductCard: React.FC = ({ {formatCurrency(product.price)} + + +18% GST + )}
diff --git a/components/pdp/ProductInteractiveGrid.tsx b/components/pdp/ProductInteractiveGrid.tsx index 8ff8bd4..e3a16d3 100644 --- a/components/pdp/ProductInteractiveGrid.tsx +++ b/components/pdp/ProductInteractiveGrid.tsx @@ -621,6 +621,9 @@ export const ProductInteractiveGrid: React.FC = ({ {formatCurrency(selectedCompare)} )} + + +18% GST at checkout {selectedVariant?.mrp ? `(MRP: ${formatCurrency(selectedVariant.mrp)})` : ''} +
{/* Store Credit Cashback Incentive Badge */} diff --git a/components/store/ProductCard.tsx b/components/store/ProductCard.tsx index ca61a1c..66b0326 100644 --- a/components/store/ProductCard.tsx +++ b/components/store/ProductCard.tsx @@ -152,6 +152,9 @@ export function ProductCard({ product }: ProductCardProps) { {formatCurrency(price)} + + +18% GST + {comparePrice && ( {formatCurrency(comparePrice)} diff --git a/services/api/catalogService.ts b/services/api/catalogService.ts index 42f8953..8b43ca2 100644 --- a/services/api/catalogService.ts +++ b/services/api/catalogService.ts @@ -87,6 +87,7 @@ export interface ProductVariantResponse { /** API may return decimal strings like "199.00" */ price: number | string; compare_price: number | string | null; + mrp?: number | string | null; cost_price: number | string; low_stock_threshold: number; status: string; @@ -117,6 +118,9 @@ export interface ProductResponse { description: string | null; status: string; created_at: string; + price?: number | string; + compare_price?: number | string | null; + mrp?: number | string | null; thumbnail_url?: string | null; images: ProductImageResponse[]; variants: ProductVariantResponse[];