fixed some bugs

features/cart/components/CartItemCard.tsx

@@ -20,7 +20,6 @@ interface CartItemCardProps {
   onUpdate?: () => void;
 }
 
-// Session Storage Key
 const PENDING_CART_UPDATES_KEY = "pendingCartUpdates";
 
 interface PendingUpdate {
@@ -32,39 +31,33 @@ interface PendingUpdate {
 export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
   const t = useTranslations();
 
-  // Local UI State (Instant feedback)
   const [localQuantity, setLocalQuantity] = useState(item.quantity);
-
-  // Sync State
   const [isSyncing, setIsSyncing] = useState(false);
   const [syncError, setSyncError] = useState(false);
-
-  // Stock limit modal
   const [showStockModal, setShowStockModal] = useState(false);
 
-  // Refs
   const debounceTimerRef = useRef<NodeJS.Timeout | undefined>(undefined);
   const isRequestInFlightRef = useRef(false);
   const pendingQuantityRef = useRef<number | null>(null);
   const retryCountRef = useRef(0);
   const retryTimerRef = useRef<NodeJS.Timeout | undefined>(undefined);
+  const isInitializedRef = useRef(false);
 
-  // Function refs to solve circular dependency
   const syncToServerRef = useRef<((quantity: number) => void) | null>(null);
   const retrySyncRef = useRef<((quantity: number) => void) | null>(null);
 
   const { mutate: updateQuantity } = useUpdateCartItemQuantity();
   const { mutate: removeItem, isPending: isRemoving } = useRemoveFromCart();
 
-  // Get available stock
   const availableStock = item.product.stock || 0;
 
-  // Initialize from server state
   useEffect(() => {
     setLocalQuantity(item.quantity);
+    if (!isInitializedRef.current) {
+      isInitializedRef.current = true;
+    }
   }, [item.quantity]);
 
-  // Save to sessionStorage
   const savePendingUpdate = useCallback(
     (quantity: number) => {
       try {
@@ -90,7 +83,6 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
     [item.product_id],
   );
 
-  // Remove from sessionStorage
   const clearPendingUpdate = useCallback(() => {
     try {
       const stored = sessionStorage.getItem(PENDING_CART_UPDATES_KEY);
@@ -112,7 +104,6 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
     }
   }, [item.product_id]);
 
-  // Exponential backoff retry
   const retrySync = useCallback((quantity: number) => {
     const maxRetries = 4;
     const retryCount = retryCountRef.current;
@@ -123,7 +114,7 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
       return;
     }
 
-    const delay = Math.min(1000 * Math.pow(2, retryCount), 16000); // Max 16s
+    const delay = Math.min(1000 * Math.pow(2, retryCount), 16000);
     retryCountRef.current++;
 
     retryTimerRef.current = setTimeout(() => {
@@ -131,19 +122,15 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
     }, delay);
   }, []);
 
-  // Update ref
   retrySyncRef.current = retrySync;
 
-  // Sync to server
   const syncToServer = useCallback(
     (quantity: number) => {
-      // If already syncing, queue this update
       if (isRequestInFlightRef.current) {
         pendingQuantityRef.current = quantity;
         return;
       }
 
-      // Mark as syncing
       isRequestInFlightRef.current = true;
       setIsSyncing(true);
       setSyncError(false);
@@ -157,7 +144,6 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
             clearPendingUpdate();
             onUpdate?.();
 
-            // Process queued update if any
             if (pendingQuantityRef.current !== null) {
               const nextQuantity = pendingQuantityRef.current;
               pendingQuantityRef.current = null;
@@ -181,7 +167,6 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
               clearPendingUpdate();
               onUpdate?.();
 
-              // Process queued update if any
               if (pendingQuantityRef.current !== null) {
                 const nextQuantity = pendingQuantityRef.current;
                 pendingQuantityRef.current = null;
@@ -192,7 +177,6 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
               console.error("Update failed:", error);
               isRequestInFlightRef.current = false;
 
-              // Rollback on error after retries exhausted
               if (retryCountRef.current >= 3) {
                 setLocalQuantity(item.quantity);
                 clearPendingUpdate();
@@ -214,55 +198,29 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
     ],
   );
 
-  // Update ref
   syncToServerRef.current = syncToServer;
 
-  // Load pending updates from sessionStorage on mount
   useEffect(() => {
-    const loadPendingUpdates = () => {
-      try {
-        const stored = sessionStorage.getItem(PENDING_CART_UPDATES_KEY);
-        if (stored) {
-          const pending: Record<number, PendingUpdate> = JSON.parse(stored);
-          const productPending = pending[item.product_id];
+    if (!isInitializedRef.current) {
+      return;
+    }
 
-          if (productPending && productPending.quantity !== item.quantity) {
-            // Apply pending update
-            setLocalQuantity(productPending.quantity);
-            pendingQuantityRef.current = productPending.quantity;
-            retryCountRef.current = productPending.retryCount;
-
-            // Trigger sync after a short delay
-            setTimeout(
-              () => syncToServerRef.current?.(productPending.quantity),
-              500,
-            );
-          }
-        }
-      } catch (error) {
-        console.error("Failed to load pending updates:", error);
-      }
-    };
-
-    loadPendingUpdates();
-  }, [item.product_id, item.quantity]);
-
-  // Debounced sync
-  useEffect(() => {
-    // Clear existing timers
     if (debounceTimerRef.current) {
       clearTimeout(debounceTimerRef.current);
     }
 
-    // If local quantity matches server, no sync needed
     if (localQuantity === item.quantity) {
       return;
     }
 
-    // Save to sessionStorage immediately
+    if (localQuantity <= 0 && item.quantity > 0) {
+      // Delete operation
+    } else if (localQuantity <= 0) {
+      return;
+    }
+
     savePendingUpdate(localQuantity);
 
-    // Debounce the API call
     debounceTimerRef.current = setTimeout(() => {
       syncToServerRef.current?.(localQuantity);
     }, 800);
@@ -274,7 +232,6 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
     };
   }, [localQuantity, item.quantity, savePendingUpdate]);
 
-  // Cleanup
   useEffect(() => {
     return () => {
       if (debounceTimerRef.current) clearTimeout(debounceTimerRef.current);
@@ -286,13 +243,11 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
     e.preventDefault();
     e.stopPropagation();
 
-    // Check stock limit
     if (localQuantity >= availableStock) {
       setShowStockModal(true);
       return;
     }
 
-    // Optimistic update (instant UI feedback)
     setLocalQuantity((prev) => prev + 1);
   };
 
@@ -305,7 +260,6 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
       return;
     }
 
-    // Optimistic update (instant UI feedback)
     setLocalQuantity((prev) => prev - 1);
   };
 
@@ -323,49 +277,70 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
 
   return (
     <>
-      <Card className="p-4 shadow-none border">
-        <div className="flex flex-col sm:flex-row gap-4">
+      <Card className="p-6 shadow-sm border border-gray-200 rounded-2xl hover:shadow-md transition-shadow duration-200">
+        <div className="flex flex-col sm:flex-row gap-6">
+          {/* Product Image & Info */}
           <div className="flex gap-4 flex-1">
-            <div className="relative w-[88px] h-[117px] rounded-xl border overflow-hidden shrink-0">
+            <div className="relative w-[100px] h-[133px] rounded-xl border border-gray-200 overflow-hidden shrink-0 bg-gray-50">
               <Image
                 src={getImageSrc()}
                 alt={item.product.name}
                 fill
-                className="object-contain"
+                className="object-contain p-2"
               />
             </div>
+
             <div className="flex flex-col gap-2">
-              <h3 className="font-semibold text-base">{item.product.name}</h3>
+              <h3 className="font-bold text-base text-gray-900 line-clamp-2">
+                {item.product.name}
+              </h3>
+              {/* <p className="text-sm text-gray-500 font-medium">
+                {item.seller?.name || "Store"}
+              </p> */}
+
+              {/* {availableStock <= 5 && (
+                <div className="flex items-center gap-1.5">
+                  <div className="h-2 w-2 rounded-full bg-amber-500 animate-pulse" />
+                  <p className="text-xs text-amber-600 font-semibold">
+                    {t("only_left", { count: availableStock })}
+                  </p>
+                </div>
+              )} */}
+
               <Button
                 variant="ghost"
                 size="sm"
                 onClick={handleDelete}
                 disabled={isRemoving}
-                className="w-fit cursor-pointer p-0 h-auto hover:bg-transparent hover:text-red-500"
+                className="w-fit cursor-pointer p-0 h-auto hover:bg-transparent text-gray-600 hover:text-red-500 transition-colors group"
               >
-                <Trash2 className="h-5 w-5" />
+                <Trash2 className="h-5 w-5 group-hover:scale-110 transition-transform" />
               </Button>
             </div>
           </div>
 
-          <div className="flex flex-col sm:flex-row items-start sm:items-center gap-4 justify-between">
-            <div className="space-y-1">
-              <p className="text-sm font-semibold">
+          {/* Price & Quantity */}
+          <div className="flex flex-col sm:flex-row items-start sm:items-center gap-6 justify-between">
+            <div className="space-y-2">
+              <p className="text-sm font-medium text-gray-600">
                 {t("unit_price")}{" "}
-                <span className="text-primary">{item.price_formatted}</span>
+                <span className="text-gray-900 font-bold">
+                  {item.price_formatted}
+                </span>
               </p>
 
               {item.discount_formatted &&
                 item.discount_formatted !== "0 TMT" && (
-                  <p className="text-sm font-semibold">
+                  <p className="text-sm font-medium text-emerald-600">
                     {t("discount")} {item.discount_formatted}
                   </p>
                 )}
+
               <div className="flex items-center gap-2">
-                <span className="text-sm font-semibold">
+                <span className="text-sm font-medium text-gray-600">
                   {t("total_price")}
                 </span>
-                <span className="bg-green-500 text-white px-3 py-1 rounded-lg font-semibold text-base">
+                <span className="bg-emerald-500 text-white px-4 py-1.5 rounded-[10px] font-bold text-base shadow-sm">
                   {(
                     parseFloat(item.product.price_amount || "0") * localQuantity
                   ).toFixed(2)}{" "}
@@ -374,23 +349,31 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
               </div>
             </div>
 
-            <div className="flex items-center gap-2">
+            {/* Quantity Controls */}
+            <div className="flex items-center gap-3">
               <Button
                 variant="outline"
                 size="icon"
                 onClick={handleQuantityDecrease}
-                className={` cursor-pointer rounded-lg bg-blue-50 ${
-                  isSyncing ? "opacity-70" : ""
+                disabled={isSyncing}
+                className={`cursor-pointer rounded-[10px] h-10 w-10 border-2 border-gray-200 hover:border-gray-900 hover:bg-gray-50 transition-all duration-200 ${
+                  isSyncing ? "opacity-50" : ""
                 }`}
               >
-                <Minus className="h-4 w-4" />
+                <Minus className="h-4 w-4 text-gray-700" />
               </Button>
 
-              <div className="w-12 text-center font-semibold relative">
-                {localQuantity}
+              <div className="min-w-[48px] text-center font-bold text-lg relative">
+                {isSyncing ? (
+                  <div className="flex items-center justify-center">
+                    <div className="w-4 h-4 border-2 border-gray-300 border-t-gray-900 rounded-full animate-spin" />
+                  </div>
+                ) : (
+                  localQuantity
+                )}
                 {syncError && (
                   <span
-                    className="absolute -top-1 -right-3 h-2 w-2 bg-red-500 rounded-full"
+                    className="absolute -top-1 -right-2 h-2.5 w-2.5 bg-red-500 rounded-full border-2 border-white shadow-sm"
                     title="Sync error"
                   />
                 )}
@@ -400,16 +383,16 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
                 variant="outline"
                 size="icon"
                 onClick={handleQuantityIncrease}
-                // disabled={localQuantity >= availableStock}
-                className={`rounded-lg cursor-pointer bg-blue-50 ${
-                  isSyncing ? "opacity-70" : ""
-                } ${
+                disabled={isSyncing || localQuantity >= availableStock}
+                className={`rounded-[10px] h-10 w-10 cursor-pointer border-2 transition-all duration-200 ${
                   localQuantity >= availableStock
-                    ? "opacity-50 cursor-not-allowed"
-                    : ""
-                }`}
+                    ? "opacity-30 cursor-not-allowed border-gray-200"
+                    : "border-gray-900 bg-gray-900 hover:bg-gray-800"
+                } ${isSyncing ? "opacity-50" : ""}`}
               >
-                <Plus className="h-4 w-4 text-[#007AFF]" />
+                <Plus
+                  className={`h-4 w-4 ${localQuantity >= availableStock ? "text-gray-400" : "text-white"}`}
+                />
               </Button>
             </div>
           </div>
@@ -418,27 +401,27 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
 
       {/* Stock Limit Modal */}
       <Dialog open={showStockModal} onOpenChange={setShowStockModal}>
-        <DialogContent className="sm:max-w-md">
+        <DialogContent className="sm:max-w-md rounded-3xl border-gray-200">
           <DialogHeader>
             <div className="flex items-center justify-center mb-4">
-              <div className="rounded-full bg-orange-100 p-3">
-                <AlertTriangle className="h-6 w-6 text-orange-600" />
+              <div className="rounded-full bg-amber-100 p-4">
+                <AlertTriangle className="h-7 w-7 text-amber-600" />
               </div>
             </div>
-            <DialogTitle className="text-center text-xl">
+            <DialogTitle className="text-center text-2xl font-bold text-gray-900">
               {t("stock_limit_title")}
             </DialogTitle>
-            <DialogDescription className="text-center text-base pt-2">
+            <DialogDescription className="text-center text-base pt-3 text-gray-600 leading-relaxed">
               {t("stock_limit_message", {
                 product: item.product.name,
                 stock: availableStock,
               })}
             </DialogDescription>
           </DialogHeader>
-          <div className="flex justify-center mt-4">
+          <div className="flex justify-center mt-6">
             <Button
               onClick={() => setShowStockModal(false)}
-              className="w-full rounded-lg cursor-pointer"
+              className="w-full h-12 rounded-2xl cursor-pointer bg-gray-900 hover:bg-gray-800 font-semibold shadow-md"
             >
               {t("understood")}
             </Button>

features/cart/components/DeliveryTypeSelector.tsx

@@ -1,52 +1,62 @@
-"use client"
-import { Truck, Warehouse } from "lucide-react"
-import { Card } from "@/components/ui/card"
-import { useTranslations } from "next-intl"
-import type { DeliveryType } from "@/lib/types/api"
+"use client";
+import { Truck, Warehouse } from "lucide-react";
+import { Card } from "@/components/ui/card";
+import { useTranslations } from "next-intl";
+import type { DeliveryType } from "@/lib/types/api";
 
 interface DeliveryTypeSelectorProps {
-  selectedType: DeliveryType
-  onSelect: (type: DeliveryType) => void
+  selectedType: DeliveryType;
+  onSelect: (type: DeliveryType) => void;
 }
 
 export default function DeliveryTypeSelector({
   selectedType,
   onSelect,
 }: DeliveryTypeSelectorProps) {
-  const t = useTranslations()
-  
+  const t = useTranslations();
+
   const deliveryOptions: {
-    type: DeliveryType
-    label: string
-    icon: typeof Truck
+    type: DeliveryType;
+    label: string;
+    icon: typeof Truck;
   }[] = [
     { type: "SELECTED_DELIVERY", label: t("delivery"), icon: Truck },
     { type: "PICK_UP", label: t("pickup"), icon: Warehouse },
-  ]
+  ];
 
   return (
-    <div className="mb-6">
-      <h3 className="text-lg font-semibold mb-3">{t("delivery_type")}</h3>
-      <div className="flex gap-2">
+    <div className="mb-8">
+      <h3 className="text-lg font-bold mb-4 text-gray-900">
+        {t("delivery_type")}
+      </h3>
+      <div className="flex gap-3">
         {deliveryOptions.map(({ type, label, icon: Icon }) => (
           <Card
             key={type}
-            className={`flex-1 cursor-pointer transition-all hover:shadow-md ${
+            className={`flex-1 cursor-pointer transition-all duration-200 hover:shadow-md rounded-lg ${
               selectedType === type
-                ? "border-2 border-[#005bff] bg-blue-50"
-                : "border-2 border-gray-200"
+                ? "border-2 border-gray-900 bg-gray-50 shadow-md"
+                : "border-2 border-gray-200 hover:border-gray-400"
             }`}
             onClick={() => onSelect(type)}
           >
-            <div className="flex flex-col items-center justify-center p-4 gap-2">
-              <Icon
-                className={`h-8 w-8 ${
-                  selectedType === type ? "text-[#005bff]" : "text-gray-600"
+            <div className="flex flex-col items-center justify-center p-5 gap-3">
+              <div
+                className={`h-12 w-12 rounded-lg flex items-center justify-center transition-colors ${
+                  selectedType === type ? "bg-gray-900" : "bg-gray-100"
                 }`}
-              />
-              <span className={`text-xs font-medium ${
-                selectedType === type ? "text-[#005bff]" : "text-gray-700"
-              }`}>
+              >
+                <Icon
+                  className={`h-6 w-6 transition-colors ${
+                    selectedType === type ? "text-white" : "text-gray-700"
+                  }`}
+                />
+              </div>
+              <span
+                className={`text-sm font-semibold transition-colors ${
+                  selectedType === type ? "text-gray-900" : "text-gray-600"
+                }`}
+              >
                 {label}
               </span>
             </div>
@@ -54,5 +64,5 @@ export default function DeliveryTypeSelector({
         ))}
       </div>
     </div>
-  )
-}
+  );
+}

features/cart/components/EmptyCart.tsx

@@ -4,24 +4,28 @@ import { useTranslations } from "next-intl";
 import { useRouter } from "next/navigation";
 
 export default function EmptyCart() {
-  const t=useTranslations();
-  const router=useRouter();
+  const t = useTranslations();
+  const router = useRouter();
+  
   return (
     <div className="flex min-h-[60vh] items-center justify-center px-4">
-      <div className="w-full max-w-md rounded-2xl bg-linear-to-br from-blue-50 to-white p-8 text-center shadow-lg">
-        <div className="mx-auto mb-6 flex h-20 w-20 items-center justify-center rounded-full bg-blue-100">
-          <ShoppingCart className="h-10 w-10 text-blue-600" />
+      <div className="w-full max-w-md rounded-3xl bg-gradient-to-br from-gray-50 to-white p-12 text-center shadow-xl border border-gray-100">
+        <div className="mx-auto mb-8 flex h-24 w-24 items-center justify-center rounded-full bg-gray-100">
+          <ShoppingCart className="h-12 w-12 text-gray-700" />
         </div>
 
-        <h2 className="mb-2 text-2xl font-semibold text-gray-900">
+        <h2 className="mb-3 text-3xl font-bold text-gray-900">
           {t("cart_empty")}
         </h2>
 
-        <p className="mb-6 text-sm text-gray-500">
+        <p className="mb-8 text-base text-gray-600 leading-relaxed">
           {t("cart_empty_message")}
         </p>
 
-        <Button onClick={()=>router.push("/")} className="w-full cursor-pointer rounded-xl bg-blue-600 px-6 py-3 text-sm font-medium text-white transition hover:bg-blue-700 active:scale-95">
+        <Button 
+          onClick={() => router.push("/")} 
+          className="w-full cursor-pointer rounded-2xl bg-gradient-to-r from-gray-900 to-gray-800 hover:from-gray-800 hover:to-gray-700 px-8 py-6 text-base font-bold text-white shadow-lg hover:shadow-xl transition-all duration-300 active:scale-95"
+        >
           {t("start_shopping")}
         </Button>
       </div>

features/cart/components/OrderSummary.tsx

@@ -111,7 +111,6 @@ export default function OrderSummary({
     }
 
     const digitsOnly = input.substring(prefix.length).replace(/\D/g, "");
-
     const limitedDigits = digitsOnly.substring(0, 8);
 
     let formattedPhone = prefix;
@@ -134,15 +133,15 @@ export default function OrderSummary({
   };
 
   return (
-    <Card className="w-full md:w-[380px] p-4 md:p-6 rounded-xl h-fit sticky top-20">
+    <Card className="w-full md:w-[420px] p-8 rounded-lg border border-gray-200 shadow-lg h-fit sticky top-20">
       {/* Customer Information */}
-      <div className="mb-6">
-        <h3 className="text-lg font-semibold mb-3">
+      <div className="mb-8">
+        <h3 className="text-xl font-bold mb-5 text-gray-900">
           {t("customer_information")}
         </h3>
         <div className="space-y-5">
           <div>
-            <Label className="text-sm font-medium mb-2 block">
+            <Label className="text-sm font-semibold mb-2 block text-gray-700">
               {t("name")}
             </Label>
             <Input
@@ -150,16 +149,21 @@ export default function OrderSummary({
               value={name}
               onChange={(e) => onNameChange(e.target.value)}
               placeholder={t("name")}
-              className={`rounded-lg ${
-                showValidation && name.trim() === "" ? "border-red-500" : ""
+              className={`rounded-[10px] h-12 border-2 transition-colors ${
+                showValidation && name.trim() === ""                      
+                  ? "border-red-500"
+                  : "border-gray-200 focus:border-gray-900"
               }`}
             />
             {showValidation && name.trim() === "" && (
-              <p className="text-xs text-red-500 mt-1">{t("requiredField")}</p>
+              <p className="text-xs text-red-500 mt-2 font-medium">
+                {t("requiredField")}
+              </p>
             )}
           </div>
+
           <div>
-            <Label className="text-sm font-medium mb-2 block">
+            <Label className="text-sm font-semibold mb-2 block text-gray-700">
               {t("last_name")}
             </Label>
             <Input
@@ -167,16 +171,21 @@ export default function OrderSummary({
               value={lastName}
               onChange={(e) => onLastNameChange(e.target.value)}
               placeholder={t("last_name")}
-              className={`rounded-lg ${
-                showValidation && lastName.trim() === "" ? "border-red-500" : ""
+              className={`rounded-[10px] h-12 border-2 transition-colors ${
+                showValidation && lastName.trim() === ""
+                  ? "border-red-500"
+                  : "border-gray-200 focus:border-gray-900"
               }`}
             />
             {showValidation && lastName.trim() === "" && (
-              <p className="text-xs text-red-500 mt-1">{t("requiredField")}</p>
+              <p className="text-xs text-red-500 mt-2 font-medium">
+                {t("requiredField")}
+              </p>
             )}
           </div>
+
           <div>
-            <Label className="text-sm font-medium mb-2 block">
+            <Label className="text-sm font-semibold mb-2 block text-gray-700">
               {t("phone")}
             </Label>
             <Input
@@ -184,20 +193,24 @@ export default function OrderSummary({
               value={phone}
               onChange={handlePhoneChange}
               placeholder="+993 61 097651"
-              className={`rounded-lg ${
-                showValidation && !isPhoneValid ? "border-red-500" : ""
+              className={`rounded-[10px] h-12 border-2 transition-colors ${
+                showValidation && !isPhoneValid
+                  ? "border-red-500"
+                  : "border-gray-200 focus:border-gray-900"
               }`}
             />
             {showValidation && !isPhoneValid && (
-              <p className="text-xs text-red-500 mt-1">{t("requiredField")}</p>
+              <p className="text-xs text-red-500 mt-2 font-medium">
+                {t("requiredField")}
+              </p>
             )}
           </div>
         </div>
       </div>
 
       {/* Region Selection */}
-      <div className="mb-6">
-        <Label className="text-lg font-semibold mb-3 block">
+      <div className="mb-8">
+        <Label className="text-xl font-bold mb-4 block text-gray-900">
           {t("choose_region")}
         </Label>
         <RadioGroup
@@ -209,19 +222,19 @@ export default function OrderSummary({
           className="flex flex-wrap gap-4"
         >
           {availableRegions.map((regionCode) => (
-            <div key={regionCode} className="flex items-center space-x-2">
+            <div key={regionCode} className="flex items-center space-x-3">
               <RadioGroupItem
                 value={regionCode}
                 id={`region-${regionCode}`}
-                className={`border-2 ${
+                className={`border-2 h-5 w-5 ${
                   showValidation && !selectedRegion
                     ? "border-red-500"
                     : "border-gray-400"
-                } data-[state=checked]:border-[#005bff] data-[state=checked]:bg-white`}
+                } data-[state=checked]:border-gray-900 data-[state=checked]:bg-gray-900`}
               />
               <Label
                 htmlFor={`region-${regionCode}`}
-                className="cursor-pointer uppercase"
+                className="cursor-pointer uppercase font-semibold text-gray-700 hover:text-gray-900 transition-colors"
               >
                 {regionCode}
               </Label>
@@ -229,14 +242,16 @@ export default function OrderSummary({
           ))}
         </RadioGroup>
         {showValidation && !selectedRegion && (
-          <p className="text-xs text-red-500 mt-1">{t("requiredField")}</p>
+          <p className="text-xs text-red-500 mt-3 font-medium">
+            {t("requiredField")}
+          </p>
         )}
       </div>
 
       {/* Province Selection */}
       {selectedRegion && provincesForSelectedRegion.length > 0 && (
-        <div className="mb-6">
-          <Label className="text-lg font-semibold mb-3 block">
+        <div className="mb-8">
+          <Label className="text-xl font-bold mb-4 block text-gray-900">
             {t("choose_address")}
           </Label>
           <Select
@@ -244,44 +259,54 @@ export default function OrderSummary({
             onValueChange={(value) => onProvinceChange(parseInt(value))}
           >
             <SelectTrigger
-              className={`rounded-lg w-full ${
-                showValidation && !selectedProvince ? "border-red-500" : ""
+              className={`rounded-[10px] h-12 w-full border-2 font-medium ${
+                showValidation && !selectedProvince
+                  ? "border-red-500"
+                  : "border-gray-200 hover:border-gray-900"
               }`}
             >
               <SelectValue placeholder={t("choose_address")} />
             </SelectTrigger>
-            <SelectContent>
+            <SelectContent className="rounded-lg">
               {provincesForSelectedRegion.map((province) => (
-                <SelectItem key={province.id} value={province.id.toString()}>
+                <SelectItem
+                  key={province.id}
+                  value={province.id.toString()}
+                  className="rounded-lg"
+                >
                   {province.name}
                 </SelectItem>
               ))}
             </SelectContent>
           </Select>
           {showValidation && !selectedProvince && (
-            <p className="text-xs text-red-500 mt-1">{t("requiredField")}</p>
+            <p className="text-xs text-red-500 mt-3 font-medium">
+              {t("requiredField")}
+            </p>
           )}
         </div>
       )}
 
       {/* Note */}
-      <div className="mb-6">
-        <Label className="text-lg font-semibold mb-3 block">{t("note")}</Label>
+      <div className="mb-8">
+        <Label className="text-xl font-bold mb-4 block text-gray-900">
+          {t("note")}
+        </Label>
         <Textarea
           value={note}
           onChange={(e) => onNoteChange(e.target.value)}
-          className="rounded-xl resize-none"
+          className="rounded-[10px] resize-none border-2 border-gray-200 focus:border-gray-900 transition-colors"
           rows={3}
           placeholder={t("note")}
         />
       </div>
 
       {/* Billing */}
-      <div className="space-y-2 mb-4">
+      <div className="space-y-3 mb-6">
         {order.billing.body.map((item, index) => (
           <div
             key={index}
-            className="flex justify-between text-base font-medium"
+            className="flex justify-between text-base font-semibold text-gray-700"
           >
             <span>{item.title}:</span>
             <span>{item.value}</span>
@@ -289,13 +314,13 @@ export default function OrderSummary({
         ))}
       </div>
 
-      <Separator className="my-4" />
+      <Separator className="my-6 bg-gray-200" />
 
-      <div className="flex justify-between items-center mb-6">
-        <span className="text-lg font-semibold">
+      <div className="flex justify-between items-center mb-8">
+        <span className="text-xl font-bold text-gray-900">
           {order.billing.footer.title}:
         </span>
-        <span className="text-lg font-bold text-green-600">
+        <span className="text-2xl font-bold text-emerald-600">
           {order.billing.footer.value}
         </span>
       </div>
@@ -303,10 +328,17 @@ export default function OrderSummary({
       <Button
         onClick={handleCompleteOrderClick}
         disabled={isLoading}
-        className="w-full rounded-lg cursor-pointer bg-[#005bff] hover:bg-[#004dcc] h-12 text-lg font-bold disabled:opacity-50"
+        className="w-full rounded-[10px] cursor-pointer bg-gradient-to-r from-gray-900 to-gray-800 hover:from-gray-800 hover:to-gray-700 h-14 text-lg font-bold disabled:opacity-50 shadow-md hover:shadow-lg transition-all duration-300"
         size="lg"
       >
-        {isLoading ? `${t("order")}...` : t("order")}
+        {isLoading ? (
+          <div className="flex items-center gap-2">
+            <div className="w-5 h-5 border-2 border-white/30 border-t-white rounded-full animate-spin" />
+            <span>{t("order")}...</span>
+          </div>
+        ) : (
+          t("order")
+        )}
       </Button>
     </Card>
   );

features/cart/hooks/useCart.ts

@@ -151,7 +151,7 @@ export function useAddToCart() {
 
         pendingUpdates.forEach((pendingQty, pendingId) => {
           const idx = updated.data.findIndex(
-            (item: any) => item.product?.id === pendingId
+            (item: any) => item.product?.id === pendingId,
           );
           if (idx !== -1) {
             updated.data[idx] = {
@@ -162,7 +162,7 @@ export function useAddToCart() {
         });
 
         const existingItem = updated.data.find(
-          (item: any) => item.product?.id === productId
+          (item: any) => item.product?.id === productId,
         );
 
         if (existingItem) {
@@ -172,7 +172,7 @@ export function useAddToCart() {
                   ...item,
                   product_quantity: item.product_quantity + quantity,
                 }
-              : item
+              : item,
           );
         } else {
           updated.data = [
@@ -185,7 +185,7 @@ export function useAddToCart() {
         }
 
         const finalItem = updated.data.find(
-          (item: any) => item.product?.id === productId
+          (item: any) => item.product?.id === productId,
         );
         if (finalItem) {
           pendingUpdates.set(productId, finalItem.product_quantity);
@@ -261,7 +261,7 @@ export function useRemoveFromCart() {
         pendingUpdates.forEach((pendingQty, pendingId) => {
           if (pendingId !== productId) {
             const idx = updated.data.findIndex(
-              (item: any) => item.product?.id === pendingId
+              (item: any) => item.product?.id === pendingId,
             );
             if (idx !== -1) {
               updated.data[idx] = {
@@ -273,7 +273,7 @@ export function useRemoveFromCart() {
         });
 
         updated.data = updated.data.filter(
-          (item: any) => item.product?.id !== productId
+          (item: any) => item.product?.id !== productId,
         );
 
         pendingUpdates.delete(productId);
@@ -413,7 +413,7 @@ export function useUpdateCartItemQuantity() {
 
         pendingUpdates.forEach((pendingQty, pendingId) => {
           const idx = updated.data.findIndex(
-            (item: any) => item.product?.id === pendingId
+            (item: any) => item.product?.id === pendingId,
           );
           if (idx !== -1) {
             updated.data[idx] = {
@@ -426,7 +426,7 @@ export function useUpdateCartItemQuantity() {
         updated.data = updated.data.map((item: any) =>
           item.product?.id === productId
             ? { ...item, product_quantity: quantity }
-            : item
+            : item,
         );
 
         pendingUpdates.set(productId, quantity);
@@ -470,14 +470,16 @@ export function useCreateOrder() {
       delivery_time?: string;
       delivery_at?: string;
       region: string;
-      note?: string;
+      notes?: string;
     }) => {
       const response = await apiClient.post("/orders", payload);
       return response.data;
     },
     onSuccess: (data) => {
-      if (data && data.payment_url) {
-        window.open(data.payment_url, '_blank')?.focus();
+      // Handle payment URL - check both data.payment_url and data.data.payment_url
+      const paymentUrl = data?.data?.payment_url || data?.payment_url;
+      if (paymentUrl) {
+        window.open(paymentUrl, "_blank")?.focus();
       }
 
       pendingUpdates.clear();
@@ -491,7 +493,7 @@ export function useCreateOrder() {
     onError: (error: any) => {
       console.error(
         "Create order error:",
-        error.response?.data?.message || error.message
+        error.response?.data?.message || error.message,
       );
     },
   });
@@ -502,7 +504,7 @@ export function useCartCount() {
   return (
     data?.data?.reduce(
       (sum: number, item: any) => sum + (item.product_quantity || 0),
-      0
+      0,
     ) || 0
   );
 }