diff --git a/app/checkout/page.tsx b/app/checkout/page.tsx
index 8d6255a..2bf7fa0 100644
--- a/app/checkout/page.tsx
+++ b/app/checkout/page.tsx
@@ -23,6 +23,7 @@ import {
type CustomerAddress,
type CheckoutCreateResponse,
} from '@/services/api/checkoutService';
+import { deliveryService, DeliverySettings } from '@/services/api/deliveryService';
import GoogleAuthModal from '@/components/auth/GoogleAuthModal';
import { Header } from '@/layout/Header';
import { Footer } from '@/layout/Footer';
@@ -47,8 +48,10 @@ import {
RefreshCw,
Trash2,
KeyRound,
+ Sparkles,
} from 'lucide-react';
import { motion, AnimatePresence } from 'framer-motion';
+import { creditService, WalletSummary } from '@/services/api/creditService';
type CheckoutStep = 'shipping' | 'payment' | 'review';
@@ -69,7 +72,10 @@ export default function CheckoutPage() {
const [authModalOpen, setAuthModalOpen] = useState(false);
const [addresses, setAddresses] = useState([]);
const [selectedAddressId, setSelectedAddressId] = useState(null);
- const [paymentMethod, setPaymentMethod] = useState<'COD' | 'RAZORPAY'>('COD');
+ const paymentMethod = 'RAZORPAY';
+ const [wallet, setWallet] = useState(null);
+ const [deliverySettings, setDeliverySettings] = useState(null);
+ const [useWalletCredits, setUseWalletCredits] = useState(false);
const [loadingAddresses, setLoadingAddresses] = useState(false);
const [submitting, setSubmitting] = useState(false);
const [errorMsg, setErrorMsg] = useState(null);
@@ -90,11 +96,26 @@ export default function CheckoutPage() {
});
const subtotal = getCartTotal();
- // Free shipping on INR orders over ₹999; ₹99 flat shipping for orders below ₹999
- const shipping = subtotal > 0 && subtotal < 999 ? 99.0 : 0;
+ // Dynamic shipping calculation from backend admin settings
+ const isFreeDelivery = Boolean(
+ deliverySettings?.free_delivery_enabled &&
+ deliverySettings?.free_delivery_min_order_amount &&
+ subtotal >= deliverySettings.free_delivery_min_order_amount
+ );
+ const baseDeliveryFee = deliverySettings ? deliverySettings.delivery_charge : 99.0;
+ const shipping = subtotal > 0 ? (isFreeDelivery ? 0 : baseDeliveryFee) : 0;
- const tax = Math.round(subtotal * 0.18 * 100) / 100;
- const total = subtotal + shipping + tax;
+ const taxable_amount = subtotal / 1.18;
+ const tax = Math.round((subtotal - taxable_amount) * 100) / 100;
+ const grossTotal = Math.round(subtotal + shipping);
+
+ // Store credits deduction calculation
+ const availableCredits = wallet?.active_balance || 0;
+ const maxCreditsToApply = Math.min(availableCredits, grossTotal);
+ const appliedCredits = useWalletCredits ? maxCreditsToApply : 0;
+ const finalPayableTotal = Math.max(0, grossTotal - appliedCredits);
+ const total = finalPayableTotal;
+ const estimatedCashback = Math.round(finalPayableTotal * 0.05);
const hasOutOfStockItems = cart.some((item) =>
outOfStockVariantIds.has(item.selectedVariant.variant_id)
@@ -102,6 +123,7 @@ export default function CheckoutPage() {
useEffect(() => {
void bootstrapAuth();
+ deliveryService.getDeliverySettings().then(setDeliverySettings).catch(() => {});
}, [bootstrapAuth]);
useEffect(() => {
@@ -122,6 +144,7 @@ export default function CheckoutPage() {
setAuthModalOpen(false);
loadAddresses();
void syncAndValidateCart();
+ creditService.getMyWallet().then(setWallet).catch(() => null);
}, [isAuthenticated, authReady]);
const syncAndValidateCart = async () => {
@@ -358,94 +381,89 @@ export default function CheckoutPage() {
const orderData = await createCheckoutOrder({
address_id: selectedAddressId,
payment_method: paymentMethod,
+ use_wallet_credits: useWalletCredits,
});
- if (paymentMethod === 'COD') {
+ const scriptLoaded = await loadRazorpayScript();
+ if (!scriptLoaded) {
+ throw new Error(
+ 'Razorpay SDK failed to load. Please check your internet connection.'
+ );
+ }
+
+ const initRes = await initiatePayment(orderData.order_id);
+
+ if (initRes.zero_amount) {
clearCart();
- setOrderResult(orderData);
+ setOrderResult({
+ ...orderData,
+ payment_status: 'PAYMENT_CAPTURED',
+ status: 'ORDER_CONFIRMED',
+ invoice_id: initRes.invoice_id || orderData.invoice_id,
+ invoice_no: initRes.invoice_no || orderData.invoice_no,
+ });
setSubmitting(false);
- } else {
- const scriptLoaded = await loadRazorpayScript();
- if (!scriptLoaded) {
- throw new Error(
- 'Razorpay SDK failed to load. Please check your internet connection.'
- );
- }
+ return;
+ }
- const initRes = await initiatePayment(orderData.order_id);
+ const selAddr = addresses.find((a) => a.address_id === selectedAddressId);
- if (initRes.zero_amount) {
- clearCart();
- setOrderResult({
- ...orderData,
- payment_status: 'PAYMENT_CAPTURED',
- status: 'ORDER_CONFIRMED',
- invoice_id: initRes.invoice_id || orderData.invoice_id,
- invoice_no: initRes.invoice_no || orderData.invoice_no,
- });
- setSubmitting(false);
- return;
- }
+ const options = {
+ key: initRes.rzp_key_id,
+ amount: initRes.amount,
+ currency: initRes.currency,
+ name: 'iFixKart',
+ description: `Order #${orderData.order_no}`,
+ order_id: initRes.rzp_order_id,
+ redirect: false,
+ prefill: {
+ name: selAddr?.full_name || '',
+ contact: selAddr?.phone || '',
+ },
+ theme: {
+ color: '#1976F3',
+ },
+ handler: async function (response: any) {
+ try {
+ setSubmitting(true);
+ const verifyRes = await verifyPayment({
+ order_id: orderData.order_id,
+ razorpay_order_id: response.razorpay_order_id,
+ razorpay_payment_id: response.razorpay_payment_id,
+ razorpay_signature: response.razorpay_signature,
+ });
- const selAddr = addresses.find((a) => a.address_id === selectedAddressId);
-
- const options = {
- key: initRes.rzp_key_id,
- amount: initRes.amount,
- currency: initRes.currency,
- name: 'iFixKart',
- description: `Order #${orderData.order_no}`,
- order_id: initRes.rzp_order_id,
- redirect: false,
- prefill: {
- name: selAddr?.full_name || '',
- contact: selAddr?.phone || '',
- },
- theme: {
- color: '#1976F3',
- },
- handler: async function (response: any) {
+ clearCart();
+ setOrderResult({
+ ...orderData,
+ payment_status: 'PAYMENT_CAPTURED',
+ status: 'ORDER_CONFIRMED',
+ invoice_no: verifyRes.invoice_no || orderData.invoice_no,
+ });
+ } catch (vErr: any) {
+ setErrorMsg(vErr.message || 'Payment verification failed.');
+ } finally {
+ setSubmitting(false);
+ }
+ },
+ modal: {
+ escape: true,
+ handleback: true,
+ confirm_close: true,
+ ondismiss: async function () {
+ setSubmitting(false);
+ setErrorMsg('Payment popup was closed before completion. Order cancelled.');
try {
- setSubmitting(true);
- const verifyRes = await verifyPayment({
- order_id: orderData.order_id,
- razorpay_order_id: response.razorpay_order_id,
- razorpay_payment_id: response.razorpay_payment_id,
- razorpay_signature: response.razorpay_signature,
- });
-
- clearCart();
- setOrderResult({
- ...orderData,
- payment_status: 'PAYMENT_CAPTURED',
- status: 'ORDER_CONFIRMED',
- invoice_no: verifyRes.invoice_no || orderData.invoice_no,
- });
- } catch (vErr: any) {
- setErrorMsg(vErr.message || 'Payment verification failed.');
- } finally {
- setSubmitting(false);
+ await cancelPayment(orderData.order_id, 'Payment popup closed by customer');
+ } catch (cErr) {
+ console.error('Failed to cancel payment session:', cErr);
}
},
- modal: {
- escape: true,
- handleback: true,
- confirm_close: true,
- ondismiss: async function () {
- setSubmitting(false);
- setErrorMsg('Payment popup was closed before completion. Order cancelled.');
- try {
- await cancelPayment(orderData.order_id, 'Payment popup closed by customer');
- } catch (cErr) {
- console.error('Failed to cancel payment session:', cErr);
- }
- },
- },
- };
+ },
+ };
- const rzp = new (window as any).Razorpay(options);
- rzp.open();
- }
+ const rzp = new (window as any).Razorpay(options);
+ rzp.open();
} catch (err: any) {
const detail = err.message || 'Failed to place order';
@@ -835,65 +853,25 @@ export default function CheckoutPage() {
-
- setPaymentMethod('RAZORPAY')}
- className="mt-1 accent-[var(--color-primary,#1976F3)] w-4 h-4"
- />
+
+
Online payment
- Instant
+ Instant & Secure
- Cards, net banking, wallets, or UPI (GPay, PhonePe,
- Paytm).
+ Cards, UPI (GPay, PhonePe, Paytm), Netbanking, and Wallets via Razorpay.
-
-
-
- setPaymentMethod('COD')}
- className="mt-1 accent-[var(--color-primary,#1976F3)] w-4 h-4"
- />
-
-
-
- Cash on delivery
-
-
-
-
- Pay in cash when your order arrives at the door.
-
-
-
+
@@ -962,18 +940,20 @@ export default function CheckoutPage() {
Payment
- {paymentMethod === 'RAZORPAY'
- ? 'Online payment'
- : 'Cash on delivery'}
+ Online payment
- {paymentMethod}
+ RAZORPAY
- {paymentMethod === 'RAZORPAY'
- ? 'Secured via Razorpay.'
- : 'Pay in cash on delivery.'}
+ Secured via Razorpay (UPI, Cards, Netbanking).
+ {useWalletCredits && appliedCredits > 0 && (
+
+
+ Store Credits Applied: -{formatCurrency(appliedCredits)}
+
+ )}
@@ -1112,13 +1092,13 @@ export default function CheckoutPage() {
- Subtotal
+ Item Total
{formatCurrency(subtotal)}
-
-
GST (18%)
+
+ Includes GST (18%)
{formatCurrency(tax)}
@@ -1137,12 +1117,57 @@ export default function CheckoutPage() {
)}
+
+ {/* Store Credits Applied Row */}
+ {useWalletCredits && appliedCredits > 0 && (
+
+
+ Store Credits Applied
+
+ -{formatCurrency(appliedCredits)}
+
+ )}
+ {/* Store Credit Redemption Card */}
+ {Boolean(wallet && wallet.active_balance > 0) && (
+
+
+
+ setUseWalletCredits(e.target.checked)}
+ className="w-4 h-4 rounded text-emerald-600 accent-emerald-600 focus:ring-emerald-500 cursor-pointer"
+ />
+
+ Redeem Store Credits
+
+
+
+ {formatCurrency(wallet?.active_balance || 0)} Available
+
+
+
+ {useWalletCredits
+ ? `Deducting ${formatCurrency(appliedCredits)} from your order total.`
+ : 'Check to deduct available store credits from this order.'}
+
+
+ )}
+
- Total
+ Payable Amount
- {formatCurrency(total)}
+ {formatCurrency(finalPayableTotal)}
+
+
+
+ {/* Cashback Reward Earn Preview */}
+
+
+
+ You will earn ≈ {formatCurrency(estimatedCashback)} Store Credit (5%) after the return window.
diff --git a/app/services/page.tsx b/app/services/page.tsx
index e857f10..436f58e 100644
--- a/app/services/page.tsx
+++ b/app/services/page.tsx
@@ -94,6 +94,7 @@ export default function ServiceBookingPage() {
null | 'preparing' | 'verifying'
>(null);
const paymentHandledRef = useRef(false);
+ const isPrefillingRef = useRef(false);
// Dynamic CMS Layout Sections State
const [layoutCMS, setLayoutCMS] = useState