Merge branch 'main' of https://git.webulgam.com/nurmuhammet/postshop-frontend

app/[locale]/cart/page.tsx

@@ -11,21 +11,21 @@ import {
   useCreateOrder,
   useRegions,
   usePaymentTypes,
+  useOrderDeliveries,
 } from "@/lib/hooks";
 import { useTranslations } from "next-intl";
 import { useRouter } from "next/navigation";
-import type { DeliveryType, PaymentType } from "@/lib/types/api";
+import type { PaymentType, OrderDelivery } from "@/lib/types/api";
 import EmptyCart from "@/features/cart/components/EmptyCart";
 import ErrorPage from "@/components/ErrorPage";
 
 export default function CartPage() {
   const [isClient, setIsClient] = useState(false);
   const [paymentType, setPaymentType] = useState<PaymentType | null>(null);
-  const [deliveryType, setDeliveryType] =
-    useState<DeliveryType>("SELECTED_DELIVERY");
+  const [selectedOrderDelivery, setSelectedOrderDelivery] = useState<OrderDelivery | null>(null);
   const [selectedRegion, setSelectedRegion] = useState<string>("");
   const [selectedProvince, setSelectedProvince] = useState<number | null>(null);
-  const [note, setNote] = useState<string>("");
+  const [notes, setNote] = useState<string>("");
   const [phone, setPhone] = useState<string>("+993 "); 
   const [name, setName] = useState<string>("");
   const [lastName, setLastName] = useState<string>("");
@@ -36,15 +36,22 @@ export default function CartPage() {
   const { data: provinces = [], isLoading: provincesLoading } = useRegions();
   const { data: paymentTypes = [], isLoading: paymentTypesLoading } =
     usePaymentTypes();
+  const { data: orderDeliveries = [], isLoading: deliveriesLoading } = useOrderDeliveries();
   const { mutate: createOrder, isPending: isCreatingOrder } = useCreateOrder();
 
   const cartItems = cartResponse?.data || [];
-  const isLoading = cartLoading || provincesLoading || paymentTypesLoading;
+  const isLoading = cartLoading || provincesLoading || paymentTypesLoading || deliveriesLoading;
 
   useEffect(() => {
     setIsClient(true);
   }, []);
 
+  const handleRegionChange = (region: string) => {
+    setSelectedRegion(region);
+    setSelectedProvince(null);
+    setSelectedOrderDelivery(null);
+  };
+
   const regionGroups = useMemo(() => {
     return provinces.reduce((acc, province) => {
       if (!acc[province.region]) {
@@ -77,25 +84,25 @@ export default function CartPage() {
   }, [cartItems]);
 
   const totalAmount = useMemo(() => {
-    return cartItems.reduce((sum, item) => {
+    const productsTotal = cartItems.reduce((sum, item) => {
       const price = parseFloat(item.product.price_amount || "0");
       return sum + price * item.product_quantity;
     }, 0);
+    return productsTotal;
   }, [cartItems]);
 
-  const handleDeliveryTypeChange = (type: DeliveryType) => {
-    setDeliveryType(type);
-    setSelectedProvince(null);
-  };
+  const finalTotal = useMemo(() => {
+    const shippingPrice = selectedOrderDelivery?.price || 0;
+    return totalAmount + shippingPrice;
+  }, [totalAmount, selectedOrderDelivery]);
 
- 
   const formatPhoneForBackend = (phoneNumber: string): string => {
    
     return phoneNumber.replace(/^\+993\s*/, "").replace(/\s+/g, "");
   };
 
   const handleCompleteOrder = () => {
-  if (!selectedRegion || !selectedProvince || !paymentType || !phone || !name) {
+  if (!selectedRegion || !selectedProvince || !paymentType || !phone || !name || !selectedOrderDelivery) {
     console.warn("Missing required fields for order");
     return;
   }
@@ -112,12 +119,13 @@ export default function CartPage() {
   createOrder(
     {
       customer_name: `${name} ${lastName}`.trim(),
-      customer_phone: parseInt(phoneDigits, 10), 
+      customer_phone: phoneDigits, 
       customer_address: selectedProvinceData.name,
-      shipping_method: "standart",
+      shipping_method: selectedOrderDelivery.name,
+      shipping_price: selectedOrderDelivery.price,
       payment_type_id: paymentType.id,
       region: selectedRegion,
-      note: note || undefined,
+      notes: notes || undefined,
     },
     {
       onSuccess: () => {
@@ -226,18 +234,28 @@ export default function CartPage() {
                   title: t("products"),
                   value: `${totalAmount.toFixed(2)} TMT`,
                 },
+                ...(selectedOrderDelivery
+                  ? [
+                      {
+                        title: t("shipping_method"),
+                        value: `${selectedOrderDelivery.price.toFixed(2)} TMT`,
+                      },
+                    ]
+                  : []),
               ],
               footer: {
                 title: t("total_price"),
-                value: `${totalAmount.toFixed(2)} TMT`,
+                value: `${finalTotal.toFixed(2)} TMT`,
               },
             },
           }}
           paymentType={paymentType}
-          deliveryType={deliveryType}
+          orderDeliveries={orderDeliveries}
+          selectedOrderDelivery={selectedOrderDelivery}
+          onOrderDeliveryChange={setSelectedOrderDelivery}
           selectedRegion={selectedRegion}
           selectedProvince={selectedProvince}
-          note={note}
+          notes={notes}
           regionGroups={regionGroups}
           availableRegions={availableRegions}
           paymentTypes={paymentTypes}
@@ -248,8 +266,7 @@ export default function CartPage() {
           onNameChange={setName}
           onLastNameChange={setLastName}
           onPaymentTypeChange={setPaymentType}
-          onDeliveryTypeChange={handleDeliveryTypeChange}
-          onRegionChange={setSelectedRegion}
+          onRegionChange={handleRegionChange}
           onProvinceChange={setSelectedProvince}
           onNoteChange={setNote}
           onCompleteOrder={handleCompleteOrder}

components/layout/ui/AuthDialog.tsx

@@ -12,7 +12,7 @@ import {
 } from "@/components/ui/dialog";
 import { toast } from "sonner";
 import Logo from "@/public/logo.webp";
-import { useLogin, useVerifyToken } from "@/lib/hooks/useAuth";
+import { useLogin, useRegister, useVerifyToken } from "@/lib/hooks/useAuth";
 import { useTranslations } from "next-intl";
 
 interface AuthDialogProps {
@@ -20,19 +20,28 @@ interface AuthDialogProps {
   onClose: () => void;
 }
 
+type AuthStep = "phone" | "register" | "verify";
+
 export default function AuthDialog({ isOpen, onClose }: AuthDialogProps) {
   const [phone, setPhone] = useState("+993 ");
+  const [name, setName] = useState("");
+  const [address, setAddress] = useState("");
   const [otp, setOtp] = useState("");
-  const [otpSent, setOtpSent] = useState(false);
+  const [authStep, setAuthStep] = useState<AuthStep>("phone");
+  const [isNewUser, setIsNewUser] = useState(false);
   const t = useTranslations();
 
   const { mutate: login, isPending: isLoginLoading } = useLogin();
+  const { mutate: register, isPending: isRegisterLoading } = useRegister();
   const { mutate: verifyToken, isPending: isVerifyLoading } = useVerifyToken();
 
   const resetDialog = useCallback(() => {
-    setOtpSent(false);
+    setAuthStep("phone");
     setPhone("+993 ");
+    setName("");
+    setAddress("");
     setOtp("");
+    setIsNewUser(false);
     onClose();
   }, [onClose]);
 
@@ -50,7 +59,6 @@ export default function AuthDialog({ isOpen, onClose }: AuthDialogProps) {
     }
 
     const digitsOnly = input.substring(prefix.length).replace(/\D/g, "");
-
     const limitedDigits = digitsOnly.substring(0, 8);
 
     let formattedPhone = prefix;
@@ -70,7 +78,7 @@ export default function AuthDialog({ isOpen, onClose }: AuthDialogProps) {
     return phoneDigits.length === 8;
   };
 
-  const handleSendOtp = useCallback(() => {
+  const handleCheckPhone = useCallback(() => {
     if (!isPhoneValid()) {
       toast.error(t("invalid_phone"));
       return;
@@ -78,21 +86,71 @@ export default function AuthDialog({ isOpen, onClose }: AuthDialogProps) {
 
     const phoneNumber = formatPhoneForBackend(phone);
 
+    // Try to login first to check if user exists
     login(
       { phone_number: parseInt(phoneNumber, 10) },
       {
         onSuccess: () => {
           toast.success(t("code_sent"));
-          setOtpSent(true);
+          setIsNewUser(false);
+          setAuthStep("verify");
+        },
+        onError: (error: any) => {
+          // Check if error indicates user not found
+          const errorMessage = error?.response?.data?.message || "";
+          const lowerMessage = errorMessage.toLowerCase();
+          if (
+            lowerMessage.includes("tapylmady") ||
+            lowerMessage.includes("not found") ||
+            lowerMessage.includes("does not exist") ||
+            lowerMessage.includes("not exist") ||
+            error?.response?.status === 404
+          ) {
+            // User doesn't exist, show registration form
+            setIsNewUser(true);
+            setAuthStep("register");
+          } else {
+            toast.error(errorMessage || t("error_occurred"));
+          }
+        },
+      },
+    );
+  }, [phone, login, t]);
+
+  const handleRegister = useCallback(() => {
+    if (!name.trim()) {
+      toast.error(t("name_required") || "Adyňyzy giriziň");
+      return;
+    }
+
+    if (!address.trim()) {
+      toast.error(t("address_required") || "Salgyňyzy giriziň");
+      return;
+    }
+
+    const phoneNumber = formatPhoneForBackend(phone);
+
+    register(
+      {
+        phone_number: phoneNumber,
+        name: name.trim(),
+        address: address.trim(),
+      },
+      {
+        onSuccess: () => {
+          toast.success(
+            t("registration_success") || "Hasaba alyndy! Kody giriziň",
+          );
+          setAuthStep("verify");
         },
         onError: (error: any) => {
           toast.error(error?.response?.data?.message || t("error_occurred"));
         },
-      }
+      },
     );
-  }, [phone, login, t]);
+  }, [phone, name, address, register, t]);
 
-  const handleLogin = useCallback(() => {
+  const handleVerify = useCallback(() => {
     if (otp.length < 4) {
       toast.error(t("invalid_code"));
       return;
@@ -114,7 +172,7 @@ export default function AuthDialog({ isOpen, onClose }: AuthDialogProps) {
         onError: (error: any) => {
           toast.error(error?.response?.data?.message || t("wrong_code"));
         },
-      }
+      },
     );
   }, [otp, phone, verifyToken, resetDialog, t]);
 
@@ -124,9 +182,35 @@ export default function AuthDialog({ isOpen, onClose }: AuthDialogProps) {
         action();
       }
     },
-    []
+    [],
   );
 
+  const getTitle = () => {
+    switch (authStep) {
+      case "phone":
+        return t("common.enterPhone");
+      case "register":
+        return t("register_title") || "Hasaba alyş";
+      case "verify":
+        return t("verify_title") || "Kody giriziň";
+      default:
+        return t("common.enterPhone");
+    }
+  };
+
+  const getDescription = () => {
+    switch (authStep) {
+      case "phone":
+        return t("common.weWillSendCode");
+      case "register":
+        return t("register_description") || "Maglumatyňyzy dolduryň";
+      case "verify":
+        return t("verify_description") || "Telefonyňyza gelen kody giriziň";
+      default:
+        return t("common.weWillSendCode");
+    }
+  };
+
   return (
     <Dialog open={isOpen} onOpenChange={resetDialog}>
       <DialogContent className="sm:max-w-md">
@@ -137,14 +221,15 @@ export default function AuthDialog({ isOpen, onClose }: AuthDialogProps) {
             </div>
           </div>
           <DialogTitle className="text-2xl text-center">
-            {t("common.enterPhone")}
+            {getTitle()}
           </DialogTitle>
           <p className="text-center text-sm text-gray-600">
-            {t("common.weWillSendCode")}
+            {getDescription()}
           </p>
         </DialogHeader>
 
         <div className="space-y-4 mt-4">
+          {/* Phone Input - Always shown but disabled after first step */}
           <div>
             <Input
               type="tel"
@@ -152,13 +237,40 @@ export default function AuthDialog({ isOpen, onClose }: AuthDialogProps) {
               value={phone}
               onChange={handlePhoneChange}
               className="h-12 rounded-xl"
-              onKeyDown={(e) => handleKeyPress(e, handleSendOtp)}
-              disabled={otpSent || isLoginLoading}
+              onKeyDown={(e) => handleKeyPress(e, handleCheckPhone)}
+              disabled={authStep !== "phone" || isLoginLoading}
             />
             <p className="text-xs text-gray-500 mt-1">{t("phone_format")}</p>
           </div>
 
-          {otpSent && (
+          {/* Registration Form */}
+          {authStep === "register" && (
+            <>
+              <Input
+                type="text"
+                placeholder={t("name_placeholder") || "Adyňyz"}
+                value={name}
+                onChange={(e) => setName(e.target.value)}
+                className="h-12 rounded-xl"
+                disabled={isRegisterLoading}
+                autoFocus
+              />
+              <Input
+                type="text"
+                placeholder={
+                  t("address_placeholder") || "Salgyňyz (mysal: Tejen)"
+                }
+                value={address}
+                onChange={(e) => setAddress(e.target.value)}
+                className="h-12 rounded-xl"
+                onKeyDown={(e) => handleKeyPress(e, handleRegister)}
+                disabled={isRegisterLoading}
+              />
+            </>
+          )}
+
+          {/* Verification Code Input */}
+          {authStep === "verify" && (
             <Input
               type="text"
               placeholder={t("common.code")}
@@ -167,29 +279,64 @@ export default function AuthDialog({ isOpen, onClose }: AuthDialogProps) {
                 setOtp(e.target.value.replace(/\D/g, "").substring(0, 6))
               }
               className="h-12 rounded-xl"
-              onKeyDown={(e) => handleKeyPress(e, handleLogin)}
+              onKeyDown={(e) => handleKeyPress(e, handleVerify)}
               disabled={isVerifyLoading}
               autoFocus
               maxLength={6}
             />
           )}
 
+          {/* Action Button */}
           <Button
-            onClick={otpSent ? handleLogin : handleSendOtp}
+            onClick={
+              authStep === "phone"
+                ? handleCheckPhone
+                : authStep === "register"
+                  ? handleRegister
+                  : handleVerify
+            }
             className="w-full cursor-pointer h-12 rounded-xl font-bold text-base bg-[#005bff] hover:bg-[#0041c4]"
             size="lg"
             disabled={
-              isLoginLoading || isVerifyLoading || (!otpSent && !isPhoneValid())
+              isLoginLoading ||
+              isRegisterLoading ||
+              isVerifyLoading ||
+              (authStep === "phone" && !isPhoneValid())
             }
           >
             {isLoginLoading
-              ? t("sending")
-              : isVerifyLoading
-              ? t("verifying")
-              : otpSent
-              ? t("verify")
-              : t("common.send")}
+              ? t("checking") || "Barlanýar..."
+              : isRegisterLoading
+                ? t("registering") || "Hasaba alynýar..."
+                : isVerifyLoading
+                  ? t("verifying")
+                  : authStep === "phone"
+                    ? t("common.send")
+                    : authStep === "register"
+                      ? t("register_button") || "Hasaba al"
+                      : t("verify")}
           </Button>
+
+          {/* Back Button for Register and Verify steps */}
+          {authStep !== "phone" && (
+            <Button
+              onClick={() => {
+                if (authStep === "register") {
+                  setAuthStep("phone");
+                  setName("");
+                  setAddress("");
+                } else if (authStep === "verify") {
+                  setAuthStep(isNewUser ? "register" : "phone");
+                  setOtp("");
+                }
+              }}
+              variant="ghost"
+              className="w-full"
+              disabled={isLoginLoading || isRegisterLoading || isVerifyLoading}
+            >
+              {t("back") || "Yza"}
+            </Button>
+          )}
         </div>
       </DialogContent>
     </Dialog>

context/AuthWrapper.tsx

@@ -32,10 +32,12 @@ export default function AuthWrapper({
   useEffect(() => {
     if (isLoading) return;
 
+    // Only fetch guest token once on initial mount if no token exists
     if (!TokenStorage.hasAnyToken() && !isGettingGuestToken) {
       getGuestToken();
     }
-  }, [isLoading, getGuestToken, isGettingGuestToken]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isLoading]); // Only run when isLoading changes (initial mount)
 
   useEffect(() => {
     if (isLoading || isGettingGuestToken) return;

features/cart/components/CartItemCard.tsx

@@ -48,6 +48,7 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
   const pendingQuantityRef = useRef<number | null>(null);
   const retryCountRef = useRef(0);
   const retryTimerRef = useRef<NodeJS.Timeout | undefined>(undefined);
+  const isInitializedRef = useRef(false); // Track if component has been initialized
 
   // Function refs to solve circular dependency
   const syncToServerRef = useRef<((quantity: number) => void) | null>(null);
@@ -62,6 +63,10 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
   // Initialize from server state
   useEffect(() => {
     setLocalQuantity(item.quantity);
+    // Mark as initialized after first render
+    if (!isInitializedRef.current) {
+      isInitializedRef.current = true;
+    }
   }, [item.quantity]);
 
   // Save to sessionStorage
@@ -81,13 +86,13 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
 
         sessionStorage.setItem(
           PENDING_CART_UPDATES_KEY,
-          JSON.stringify(pending)
+          JSON.stringify(pending),
         );
       } catch (error) {
         console.error("Failed to save pending update:", error);
       }
     },
-    [item.product_id]
+    [item.product_id],
   );
 
   // Remove from sessionStorage
@@ -103,7 +108,7 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
         } else {
           sessionStorage.setItem(
             PENDING_CART_UPDATES_KEY,
-            JSON.stringify(pending)
+            JSON.stringify(pending),
           );
         }
       }
@@ -200,7 +205,7 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
 
               retrySyncRef.current?.(quantity);
             },
-          }
+          },
         );
       }
     },
@@ -211,13 +216,16 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
       removeItem,
       onUpdate,
       clearPendingUpdate,
-    ]
+    ],
   );
 
   // Update ref
   syncToServerRef.current = syncToServer;
 
   // Load pending updates from sessionStorage on mount
+  // DISABLED: This was causing automatic sync on mount, sending 0 quantity to server
+  // Users should manually refresh or re-add items if there were pending updates
+  /*
   useEffect(() => {
     const loadPendingUpdates = () => {
       try {
@@ -246,9 +254,15 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
 
     loadPendingUpdates();
   }, [item.product_id, item.quantity]);
+  */
 
   // Debounced sync
   useEffect(() => {
+    // Don't sync on initial mount - only sync after user interaction
+    if (!isInitializedRef.current) {
+      return;
+    }
+
     // Clear existing timers
     if (debounceTimerRef.current) {
       clearTimeout(debounceTimerRef.current);
@@ -259,6 +273,14 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
       return;
     }
 
+    // Don't sync if quantity is 0 or invalid (unless it's a delete operation)
+    if (localQuantity <= 0 && item.quantity > 0) {
+      // This is a delete operation, allow it
+    } else if (localQuantity <= 0) {
+      // Invalid state, don't sync
+      return;
+    }
+
     // Save to sessionStorage immediately
     savePendingUpdate(localQuantity);
 
@@ -336,14 +358,14 @@ export default function CartItemCard({ item, onUpdate }: CartItemCardProps) {
             </div>
             <div className="flex flex-col gap-2">
               <h3 className="font-semibold text-base">{item.product.name}</h3>
-              <p className="text-sm text-gray-600">
+              {/* <p className="text-sm text-gray-600">
                 {item.seller?.name || "Store"}
-              </p>
-              {availableStock <= 5 && (
+              </p> */}
+              {/* {availableStock <= 5 && (
                 <p className="text-xs text-orange-600 font-medium">
                   {t("only_left", { count: availableStock })}
                 </p>
-              )}
+              )} */}
               <Button
                 variant="ghost"
                 size="sm"

features/cart/components/OrderSummary.tsx

@@ -13,9 +13,13 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { Input } from "@/components/ui/input";
-import DeliveryTypeSelector from "./DeliveryTypeSelector";
 import { useTranslations } from "next-intl";
-import type { DeliveryType, PaymentType, Province } from "@/lib/types/api";
+import type {
+  DeliveryType,
+  PaymentType,
+  Province,
+  OrderDelivery,
+} from "@/lib/types/api";
 import { useState } from "react";
 
 interface OrderBillingItem {
@@ -37,10 +41,11 @@ interface OrderSummaryProps {
     billing: OrderBilling;
   };
   paymentType: PaymentType | null;
-  deliveryType: DeliveryType;
+  orderDeliveries: OrderDelivery[];
+  selectedOrderDelivery: OrderDelivery | null;
   selectedRegion: string;
   selectedProvince: number | null;
-  note: string;
+  notes: string;
   regionGroups: Record<string, Province[]>;
   availableRegions: string[];
   paymentTypes: PaymentType[];
@@ -51,10 +56,10 @@ interface OrderSummaryProps {
   onNameChange: (name: string) => void;
   onLastNameChange: (lastName: string) => void;
   onPaymentTypeChange: (type: PaymentType) => void;
-  onDeliveryTypeChange: (type: DeliveryType) => void;
+  onOrderDeliveryChange: (delivery: OrderDelivery) => void;
   onRegionChange: (regionCode: string) => void;
   onProvinceChange: (provinceId: number) => void;
-  onNoteChange: (note: string) => void;
+  onNoteChange: (notes: string) => void;
   onCompleteOrder: () => void;
   isLoading: boolean;
 }
@@ -62,10 +67,11 @@ interface OrderSummaryProps {
 export default function OrderSummary({
   order,
   paymentType,
-  deliveryType,
+  orderDeliveries,
+  selectedOrderDelivery,
   selectedRegion,
   selectedProvince,
-  note,
+  notes,
   regionGroups,
   availableRegions,
   paymentTypes,
@@ -76,7 +82,7 @@ export default function OrderSummary({
   onNameChange,
   onLastNameChange,
   onPaymentTypeChange,
-  onDeliveryTypeChange,
+  onOrderDeliveryChange,
   onRegionChange,
   onProvinceChange,
   onNoteChange,
@@ -90,6 +96,15 @@ export default function OrderSummary({
     ? regionGroups[selectedRegion] || []
     : [];
 
+  const filteredDeliveries = orderDeliveries.filter((delivery) => {
+    if (!selectedRegion) return true;
+    if (selectedRegion === "ag") {
+      return delivery.name === "standart" || delivery.name === "self_pickup";
+    } else {
+      return delivery.name === "region";
+    }
+  });
+
   const phoneDigits = phone.replace(/\D/g, "");
   const isPhoneValid = phoneDigits.length === 11;
 
@@ -97,6 +112,7 @@ export default function OrderSummary({
     selectedRegion &&
     selectedProvince &&
     paymentType &&
+    selectedOrderDelivery &&
     isPhoneValid &&
     name.trim() !== "" &&
     lastName.trim() !== "";
@@ -136,7 +152,7 @@ export default function OrderSummary({
   return (
     <Card className="w-full md:w-[380px] p-4 md:p-6 rounded-xl h-fit sticky top-20">
       {/* Customer Information */}
-      <div className="mb-6">
+      <div className="mb-4">
         <h3 className="text-lg font-semibold mb-3">
           {t("customer_information")}
         </h3>
@@ -198,7 +214,7 @@ export default function OrderSummary({
       </div>
 
       {/* Payment Type */}
-      <div className="mb-6">
+      <div className="mb-4">
         <h3 className="text-lg font-semibold mb-3">{t("payment_type")}</h3>
         <div className="flex gap-2">
           {paymentTypes.map((type) => (
@@ -231,16 +247,13 @@ export default function OrderSummary({
       </div>
 
       {/* Region Selection */}
-      <div className="mb-6">
+      <div className="mb-4">
         <Label className="text-lg font-semibold mb-3 block">
           {t("choose_region")}
         </Label>
         <RadioGroup
           value={selectedRegion}
-          onValueChange={(value) => {
-            onRegionChange(value);
-            onProvinceChange(null as any);
-          }}
+          onValueChange={(value) => onRegionChange(value)}
           className="flex flex-wrap gap-4"
         >
           {availableRegions.map((regionCode) => (
@@ -270,7 +283,7 @@ export default function OrderSummary({
 
       {/* Province Selection */}
       {selectedRegion && provincesForSelectedRegion.length > 0 && (
-        <div className="mb-6">
+        <div className="mb-4">
           <Label className="text-lg font-semibold mb-3 block">
             {t("choose_address")}
           </Label>
@@ -299,11 +312,59 @@ export default function OrderSummary({
         </div>
       )}
 
+      {/* Shipping Method */}
+      {selectedRegion && (
+        <div className="mb-4">
+          <h3 className="text-lg font-semibold mb-3">{t("shipping_method")}</h3>
+          <div className="flex gap-2">
+            {filteredDeliveries.map((delivery) => (
+              <Card
+                key={delivery.name}
+                className={`flex-1 cursor-pointer py-4 transition-all ${
+                  selectedOrderDelivery?.name === delivery.name
+                    ? "border-2 border-[#005bff] bg-blue-50"
+                    : showValidation && !selectedOrderDelivery
+                    ? "border-2 border-red-500"
+                    : "border-2 border-gray-200"
+                }`}
+                onClick={() => onOrderDeliveryChange(delivery)}
+              >
+                <div className="flex items-center flex-col p-4">
+                  <div className="flex flex-col">
+                    <span
+                      className={`text-sm font-medium ${
+                        selectedOrderDelivery?.name === delivery.name
+                          ? "text-[#005bff]"
+                          : ""
+                      }`}
+                    >
+                      {t(delivery.name)}
+                    </span>
+                  </div>
+                  <span
+                    className={`text-sm font-bold ${
+                      selectedOrderDelivery?.name === delivery.name
+                        ? "text-[#005bff]"
+                        : "text-green-600"
+                    }`}
+                  >
+                    {delivery.price === 0 ? t("free") : `${delivery.price} TMT`}
+                  </span>
+                </div>
+              </Card>
+            ))}
+          </div>
+          {showValidation && !selectedOrderDelivery && (
+            <p className="text-xs text-red-500 mt-1">{t("requiredField")}</p>
+          )}
+        </div>
+      )}
+
       {/* Note */}
-      <div className="mb-6">
+      <div className="mb-4">
         <Label className="text-lg font-semibold mb-3 block">{t("note")}</Label>
         <Textarea
-          value={note}
+          value={notes}
           onChange={(e) => onNoteChange(e.target.value)}
           className="rounded-xl resize-none"
           rows={3}

features/cart/hooks/useCart.ts

@@ -5,15 +5,14 @@ import {
   UseQueryOptions,
 } from "@tanstack/react-query";
 import { apiClient } from "@/lib/api";
-import type { CartItem } from "@/lib/types/api";
+import type {
+  CartItem,
+  CartResponse,
+  CreateOrderPayload,
+  OrderDelivery,
+} from "@/lib/types/api";
 import { useEffect } from "react";
 
-interface CartResponse {
-  message: string;
-  data: CartItem[];
-  errorDetails?: string;
-}
-
 const pendingUpdates = new Map<number, number>();
 let updateLock = false;
 
@@ -151,7 +150,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 +161,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 +171,7 @@ export function useAddToCart() {
                   ...item,
                   product_quantity: item.product_quantity + quantity,
                 }
-              : item
+              : item,
           );
         } else {
           updated.data = [
@@ -185,7 +184,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 +260,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 +272,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 +412,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 +425,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);
@@ -457,27 +456,32 @@ export function useUpdateCartItemQuantity() {
   });
 }
 
+export function useOrderDeliveries() {
+  return useQuery({
+    queryKey: ["order-deliveries"],
+    queryFn: async () => {
+      const response = await apiClient.get<{
+        message: string;
+        data: OrderDelivery[];
+      }>("/order-deliveries");
+      return response.data.data;
+    },
+  });
+}
+
 export function useCreateOrder() {
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: async (payload: {
-      customer_name?: string;
-      customer_phone: number;
-      customer_address: string;
-      shipping_method: string;
-      payment_type_id: number;
-      delivery_time?: string;
-      delivery_at?: string;
-      region: string;
-      note?: string;
-    }) => {
+    mutationFn: async (payload: CreateOrderPayload) => {
       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 +495,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 +506,7 @@ export function useCartCount() {
   return (
     data?.data?.reduce(
       (sum: number, item: any) => sum + (item.product_quantity || 0),
-      0
+      0,
     ) || 0
   );
 }

features/orders/components/OrderPage.tsx

@@ -23,9 +23,10 @@ import {
   MapPin,
   CreditCard,
   ShoppingBag,
+  Banknote,
 } from "lucide-react";
 import { toast } from "sonner";
-import { useOrders, useCancelOrder } from "@/lib/hooks";
+import { useOrders, useCancelOrder, useOrderDeliveries } from "@/lib/hooks";
 import { useTranslations } from "next-intl";
 import type { Order } from "@/lib/types/api";
 import EmptyOrders from "./EmptyOrders";
@@ -42,6 +43,8 @@ export default function OrdersPageClient({ locale }: OrdersPageClientProps) {
   const t = useTranslations();
 
   const { data: orders, isLoading, isError } = useOrders();
+  const { data: orderDeliveries, isLoading: deliveriesLoading } =
+    useOrderDeliveries();
   const { mutate: cancelOrder, isPending: isCancellingOrder } =
     useCancelOrder();
 
@@ -83,7 +86,7 @@ export default function OrdersPageClient({ locale }: OrdersPageClientProps) {
     if (
       lowerStatus.includes("ожидается") ||
       lowerStatus.includes("pending") ||
-      lowerStatus.includes("garaşlama")
+      lowerStatus.includes("garaşylýar")
     ) {
       return (
         <Badge
@@ -147,20 +150,89 @@ export default function OrdersPageClient({ locale }: OrdersPageClientProps) {
 
   const activeOrders = useMemo(
     () => orders?.filter((o) => isActiveOrder(o.status)) || [],
-    [orders, isActiveOrder]
+    [orders, isActiveOrder],
   );
   const completedOrders = useMemo(
     () => orders?.filter((o) => !isActiveOrder(o.status)) || [],
-    [orders, isActiveOrder]
+    [orders, isActiveOrder],
   );
 
-  const calculateTotal = useCallback((order: Order) => {
-    return order.orderItems.reduce((sum, item) => {
-      return sum + parseFloat(item.unit_price_amount) * item.quantity;
-    }, 0);
-  }, []);
+  const getShippingPrice = useCallback(
+    (order: Order) => {
+      if (order.shipping_price !== undefined && order.shipping_price !== null) {
+        return Number(order.shipping_price);
+      }
 
-  if (isLoading) {
+      if (!orderDeliveries || orderDeliveries.length === 0) return 0;
+
+      const methodFromOrder = order.shipping_method.toLowerCase();
+
+      // Find delivery method by matching internal name, translated name, or common keywords
+      const delivery = orderDeliveries.find((d) => {
+        const internalName = d.name.toLowerCase();
+        const translatedName = t(internalName).toLowerCase(); // d.name should be used for translation
+
+        // Direct match
+        if (
+          internalName === methodFromOrder ||
+          translatedName === methodFromOrder
+        ) {
+          return true;
+        }
+
+        // Keyword based matching for "region"
+        if (
+          (internalName === "region" || internalName === "çapar") &&
+          (methodFromOrder.includes("welaýat") ||
+            methodFromOrder.includes("region") ||
+            methodFromOrder.includes("регион") ||
+            methodFromOrder.includes("çapar") ||
+            methodFromOrder.includes("welayat"))
+        ) {
+          return true;
+        }
+
+        // Keyword based matching for "self_pickup"
+        if (
+          internalName === "self_pickup" &&
+          (methodFromOrder.includes("özüm") ||
+            methodFromOrder.includes("özüň") ||
+            methodFromOrder.includes("pickup") ||
+            methodFromOrder.includes("самовывоз"))
+        ) {
+          return true;
+        }
+
+        // Keyword based matching for "standart"
+        if (
+          internalName === "standart" &&
+          (methodFromOrder.includes("standart") ||
+            methodFromOrder.includes("standard"))
+        ) {
+          return true;
+        }
+
+        return false;
+      });
+
+      return delivery ? Number(delivery.price) : 0;
+    },
+    [orderDeliveries, t],
+  );
+
+  const calculateTotal = useCallback(
+    (order: Order) => {
+      const itemsTotal = order.orderItems.reduce((sum, item) => {
+        return sum + parseFloat(item.unit_price_amount) * item.quantity;
+      }, 0);
+
+      const shippingPrice = getShippingPrice(order);
+      return itemsTotal + shippingPrice;
+    },
+    [getShippingPrice],
+  );
+
+  if (isLoading || deliveriesLoading) {
     return (
       <div className="mx-auto p-2 lg:p-6 md:p-4 mb-16 min-h-screen">
         <h1 className="text-xl md:text-2xl lg:text-3xl font-bold mb-6">
@@ -247,8 +319,10 @@ export default function OrdersPageClient({ locale }: OrdersPageClientProps) {
                   isCancelling={isCancellingOrder}
                   getStatusBadge={getStatusBadge}
                   calculateTotal={calculateTotal}
+                  getShippingPrice={getShippingPrice}
                   showCancelButton
                   t={t}
+                  orderDeliveries={orderDeliveries || []}
                 />
               ))}
             </div>
@@ -270,12 +344,13 @@ export default function OrdersPageClient({ locale }: OrdersPageClientProps) {
                   order={order}
                   isExpanded={expandedOrders.has(order.id)}
                   onToggle={() => toggleOrderExpand(order.id)}
-                  onCancel={handleCancelOrder}
                   isCancelling={isCancellingOrder}
                   getStatusBadge={getStatusBadge}
                   calculateTotal={calculateTotal}
+                  getShippingPrice={getShippingPrice}
                   showCancelButton={false}
                   t={t}
+                  orderDeliveries={orderDeliveries || []}
                 />
               ))}
             </div>
@@ -319,12 +394,14 @@ interface CompactOrderCardProps {
   order: Order;
   isExpanded: boolean;
   onToggle: () => void;
-  onCancel: (order: Order) => void;
+  onCancel?: (order: Order) => void;
   isCancelling: boolean;
   getStatusBadge: (status: string) => React.ReactNode;
   calculateTotal: (order: Order) => number;
+  getShippingPrice: (order: Order) => number;
   showCancelButton: boolean;
   t: any;
+  orderDeliveries: any[];
 }
 
 function CompactOrderCard({
@@ -335,12 +412,19 @@ function CompactOrderCard({
   isCancelling,
   getStatusBadge,
   calculateTotal,
+  getShippingPrice,
   showCancelButton,
   t,
+  orderDeliveries,
 }: CompactOrderCardProps) {
   const total = useMemo(() => calculateTotal(order), [calculateTotal, order]);
   const itemCount = order.orderItems.length;
 
+  const shippingPrice = useMemo(
+    () => getShippingPrice(order),
+    [order, getShippingPrice],
+  );
+
   return (
     <Card className="overflow-hidden transition-all py-2 md:py-4 lg:py-6 hover:shadow-md">
       {/* Compact Header - Always Visible */}
@@ -430,6 +514,20 @@ function CompactOrderCard({
                 <p className="text-sm text-gray-900">{order.shipping_method}</p>
               </div>
             </div>
+
+            <div className="flex items-start gap-3 border-t md:border-t-0 pt-2 md:pt-0">
+              <Banknote className="h-5 w-5 text-orange-500 mt-0.5" />
+              <div>
+                <p className="text-sm font-medium text-gray-700">
+                  {t("shipping_price")}
+                </p>
+                <p className="text-sm font-bold text-green-600">
+                  {shippingPrice === 0
+                    ? t("free")
+                    : `${shippingPrice.toFixed(2)} TMT`}
+                </p>
+              </div>
+            </div>
           </div>
 
           {/* Products List */}
@@ -476,7 +574,22 @@ function CompactOrderCard({
 
           {/* Footer with Total and Actions */}
           <div className="border-t p-4 bg-gray-50">
-            <div className="flex items-center justify-between mb-3">
+            <div className="space-y-2 mb-4">
+              <div className="flex justify-between text-sm text-gray-600">
+                <span>{t("products")}:</span>
+                <span>{(total - shippingPrice).toFixed(2)} TMT</span>
+              </div>
+              <div className="flex justify-between text-sm text-gray-600">
+                <span>{t("shipping_method")}:</span>
+                <span>
+                  {shippingPrice === 0
+                    ? t("free")
+                    : `${shippingPrice.toFixed(2)} TMT`}
+                </span>
+              </div>
+            </div>
+
+            <div className="flex items-center justify-between mb-3 pt-2 border-t">
               <span className="text-base font-semibold text-gray-700">
                 {t("total_price")}:
               </span>
@@ -490,7 +603,7 @@ function CompactOrderCard({
                 variant="destructive"
                 onClick={(e) => {
                   e.stopPropagation();
-                  onCancel(order);
+                  onCancel?.(order);
                 }}
                 disabled={isCancelling}
                 className="w-full cursor-pointer"

features/products/components/ProductImageGallery.tsx

@@ -1,6 +1,16 @@
 import { useState, useEffect, useRef, useCallback } from "react";
 import Image from "next/image";
-
+import {
+  X,
+  ZoomIn,
+  ZoomOut,
+  RotateCw,
+  RotateCcw,
+  Maximize2,
+  ChevronLeft,
+  ChevronRight,
+} from "lucide-react";
+import { useTranslations } from "next-intl";
 interface ProductImageGalleryProps {
   images: string[];
   productName: string;
@@ -13,10 +23,22 @@ export function ProductImageGallery({
   noImageText,
 }: ProductImageGalleryProps) {
   const [selectedImage, setSelectedImage] = useState(0);
+  const [isModalOpen, setIsModalOpen] = useState(false);
+  const [zoom, setZoom] = useState(1);
+  const [rotation, setRotation] = useState(0);
+  const [position, setPosition] = useState({ x: 0, y: 0 });
+  const [isDragging, setIsDragging] = useState(false);
+  const [dragStart, setDragStart] = useState({ x: 0, y: 0 });
+  const t = useTranslations();
   const autoplayTimerRef = useRef<NodeJS.Timeout | undefined>(undefined);
+  const modalImageRef = useRef<HTMLDivElement>(null);
 
   useEffect(() => {
-    if (images.length <= 1) return;
+    setSelectedImage(0);
+  }, [images]);
+
+  useEffect(() => {
+    if (images.length <= 1 || isModalOpen) return;
 
     const startAutoplay = () => {
       autoplayTimerRef.current = setInterval(() => {
@@ -28,63 +50,417 @@ export function ProductImageGallery({
     return () => {
       if (autoplayTimerRef.current) clearInterval(autoplayTimerRef.current);
     };
-  }, [images.length]);
+  }, [images.length, isModalOpen]);
+
+  useEffect(() => {
+    if (isModalOpen) {
+      document.body.style.overflow = "hidden";
+      if (autoplayTimerRef.current) clearInterval(autoplayTimerRef.current);
+    } else {
+      document.body.style.overflow = "unset";
+    }
+    return () => {
+      document.body.style.overflow = "unset";
+    };
+  }, [isModalOpen]);
 
   const handleImageSelect = useCallback(
     (index: number) => {
       setSelectedImage(index);
       if (autoplayTimerRef.current) clearInterval(autoplayTimerRef.current);
-      if (images.length > 1) {
+      if (images.length > 1 && !isModalOpen) {
         autoplayTimerRef.current = setInterval(() => {
           setSelectedImage((prev) => (prev + 1) % images.length);
         }, 3000);
       }
     },
-    [images.length]
+    [images.length, isModalOpen],
   );
 
+  const openModal = () => {
+    setIsModalOpen(true);
+    resetTransform();
+  };
+
+  const closeModal = () => {
+    setIsModalOpen(false);
+    resetTransform();
+  };
+
+  const resetTransform = () => {
+    setZoom(1);
+    setRotation(0);
+    setPosition({ x: 0, y: 0 });
+  };
+
+  const handleZoomIn = () => {
+    setZoom((prev) => Math.min(prev + 0.25, 5));
+  };
+
+  const handleZoomOut = () => {
+    setZoom((prev) => Math.max(prev - 0.25, 0.5));
+  };
+
+  const handleRotateClockwise = () => {
+    setRotation((prev) => (prev + 90) % 360);
+  };
+
+  const handleRotateCounterClockwise = () => {
+    setRotation((prev) => (prev - 90 + 360) % 360);
+  };
+
+  const handleMouseDown = (e: React.MouseEvent | React.TouchEvent) => {
+    if (zoom > 1) {
+      setIsDragging(true);
+      const clientX = "touches" in e ? e.touches[0].clientX : e.clientX;
+      const clientY = "touches" in e ? e.touches[0].clientY : e.clientY;
+      setDragStart({
+        x: clientX - position.x,
+        y: clientY - position.y,
+      });
+    }
+  };
+
+  const handleMouseMove = (e: React.MouseEvent | React.TouchEvent) => {
+    if (isDragging && zoom > 1) {
+      const clientX = "touches" in e ? e.touches[0].clientX : e.clientX;
+      const clientY = "touches" in e ? e.touches[0].clientY : e.clientY;
+      setPosition({
+        x: clientX - dragStart.x,
+        y: clientY - dragStart.y,
+      });
+    }
+  };
+
+  const handleMouseUp = () => {
+    setIsDragging(false);
+  };
+
+  const handleWheel = (e: React.WheelEvent) => {
+    e.preventDefault();
+    if (e.deltaY < 0) {
+      handleZoomIn();
+    } else {
+      handleZoomOut();
+    }
+  };
+
+  const handleModalImageChange = (direction: "prev" | "next") => {
+    if (direction === "next") {
+      setSelectedImage((prev) => (prev + 1) % images.length);
+    } else {
+      setSelectedImage((prev) => (prev - 1 + images.length) % images.length);
+    }
+    resetTransform();
+  };
+
   return (
-    <div className="contents  max-w-2xl">
-      <div className="relative">
-        <div className="relative aspect-square w-full rounded-2xl overflow-hidden bg-white">
-          {images.length > 0 ? (
-            <Image
-              src={images[selectedImage]}
-              alt={productName}
-              fill
-              className="object-contain"
-              priority
-            />
-          ) : (
-            <div className="flex items-center justify-center h-full text-gray-400">
-              {noImageText}
+    <>
+      <div className="w-full lg:flex-1 max-w-2xl">
+        <div className="relative">
+          <div
+            className="relative aspect-square w-full rounded-xl md:rounded-2xl overflow-hidden bg-gradient-to-br from-gray-50 to-gray-100 cursor-pointer group shadow-sm hover:shadow-md transition-all"
+            onClick={openModal}
+          >
+            {images.length > 0 && images[selectedImage] ? (
+              <>
+                <Image
+                  src={images[selectedImage]}
+                  alt={productName}
+                  fill
+                  sizes="(max-width: 768px) 100vw, (max-width: 1200px) 50vw, 33vw"
+                  className="object-contain transition-transform group-hover:scale-105"
+                  priority
+                />
+                <div className="absolute inset-0 bg-gradient-to-t from-black/20 via-transparent to-transparent opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center">
+                  <div className="bg-white/90 backdrop-blur-sm rounded-full p-2 md:p-3 transform translate-y-4 group-hover:translate-y-0 transition-transform">
+                    <Maximize2 className="w-4 h-4 md:w-5 md:h-5 text-gray-800" />
+                  </div>
+                </div>
+              </>
+            ) : (
+              <div className="flex items-center justify-center h-full text-gray-400 text-sm md:text-base">
+                {noImageText}
+              </div>
+            )}
+          </div>
+
+          {images.length > 1 && (
+            <div className="mt-4 flex gap-2 overflow-x-auto pb-2">
+              {images.map((image, index) => (
+                <button
+                  key={index}
+                  onClick={() => handleImageSelect(index)}
+                  className={`relative w-16 h-16 shrink-0 rounded cursor-pointer overflow-hidden border-2 transition-all ${
+                    selectedImage === index
+                      ? "border-primary ring-2 ring-primary/20"
+                      : "border-gray-200 hover:border-gray-300"
+                  }`}
+                >
+                  <Image
+                    src={image}
+                    alt={`${productName} ${index + 1}`}
+                    fill
+                    className="object-cover"
+                  />
+                </button>
+              ))}
             </div>
           )}
         </div>
+      </div>
 
-        {images.length > 1 && (
-          <div className="mt-4 flex gap-2 overflow-x-auto pb-2">
-            {images.map((image, index) => (
+      {/* Modal */}
+      {isModalOpen && (
+        <div className="fixed inset-0 z-99 bg-gradient-to-br from-gray-900/95 via-gray-800/95 to-gray-900/95 backdrop-blur-xl flex flex-col">
+          {/* Top Bar */}
+          <div className="absolute top-0 left-0 right-0 p-3 md:p-4 z-20 bg-gradient-to-b from-black/20 to-transparent">
+            <div className="max-w-7xl mx-auto flex items-center justify-between">
+              <div className="flex items-center gap-2 md:gap-3 min-w-0 flex-1">
+                <div className="w-1 h-4 md:h-6 bg-blue-500 rounded-full shrink-0" />
+                <span className="text-white font-medium text-sm md:text-base truncate">
+                  {productName}
+                </span>
+              </div>
               <button
-                key={index}
-                onClick={() => handleImageSelect(index)}
-                className={`relative w-16 h-16 shrink-0 rounded cursor-pointer overflow-hidden border-2 transition-all ${
-                  selectedImage === index
-                    ? "border-primary ring-2 ring-primary/20"
-                    : "border-gray-200 hover:border-gray-300"
-                }`}
+                onClick={closeModal}
+                className="p-2 md:p-2.5 bg-white/10 hover:bg-white/20 rounded-lg md:rounded-xl transition-all backdrop-blur-sm border border-white/10 shrink-0 ml-2"
+                aria-label="Close"
+              >
+                <X className="w-4 h-4 md:w-5 md:h-5 text-white" />
+              </button>
+            </div>
+          </div>
+
+          {/* Main Image Area */}
+          <div className="flex-1 flex items-center justify-center relative px-2 md:px-16 lg:px-20">
+            {/* Left Arrow - Desktop */}
+            {images.length > 1 && (
+              <button
+                onClick={() => handleModalImageChange("prev")}
+                className="hidden md:flex absolute left-3 lg:left-6 p-2.5 md:p-3 bg-white/10 hover:bg-white/20 rounded-xl md:rounded-2xl transition-all backdrop-blur-md border border-white/10 hover:scale-110 z-10 group"
+                aria-label="Previous image"
+              >
+                <ChevronLeft className="w-5 h-5 md:w-6 md:h-6 text-white" />
+              </button>
+            )}
+
+            {/* Image Container */}
+            <div
+              ref={modalImageRef}
+              className="w-full h-full flex items-center justify-center overflow-hidden"
+              onMouseDown={handleMouseDown}
+              onMouseMove={handleMouseMove}
+              onMouseUp={handleMouseUp}
+              onMouseLeave={handleMouseUp}
+              onTouchStart={handleMouseDown}
+              onTouchMove={handleMouseMove}
+              onTouchEnd={handleMouseUp}
+              onWheel={handleWheel}
+              style={{
+                cursor:
+                  zoom > 1 ? (isDragging ? "grabbing" : "grab") : "default",
+              }}
+            >
+              <div
+                style={{
+                  transform: `translate(${position.x}px, ${position.y}px) scale(${zoom}) rotate(${rotation}deg)`,
+                  transition: isDragging
+                    ? "none"
+                    : "transform 0.3s cubic-bezier(0.4, 0, 0.2, 1)",
+                }}
+                className="relative w-[90vw] h-[60vh] md:w-[75vw] md:h-[70vh]"
               >
                 <Image
-                  src={image}
-                  alt={`${productName} ${index + 1}`}
+                  src={images[selectedImage]}
+                  alt={productName}
                   fill
-                  className="object-cover"
+                  className="object-contain pointer-events-none select-none"
+                  priority
+                  draggable={false}
                 />
+              </div>
+            </div>
+
+            {/* Right Arrow - Desktop */}
+            {images.length > 1 && (
+              <button
+                onClick={() => handleModalImageChange("next")}
+                className="hidden md:flex absolute right-3 lg:right-6 p-2.5 md:p-3 bg-white/10 hover:bg-white/20 rounded-xl md:rounded-2xl transition-all backdrop-blur-md border border-white/10 hover:scale-110 z-10 group"
+                aria-label="Next image"
+              >
+                <ChevronRight className="w-5 h-5 md:w-6 md:h-6 text-white" />
               </button>
-            ))}
+            )}
           </div>
-        )}
-      </div>
-    </div>
+
+          {/* Bottom Control Bar */}
+          <div className="bg-gradient-to-t from-black/40 via-black/20 to-transparent backdrop-blur-xl border-t border-white/10">
+            <div className="max-w-7xl mx-auto px-3 md:px-6 py-3 md:py-4">
+              {/* Mobile Layout */}
+              <div className="md:hidden flex flex-col gap-2">
+                {/* Row 1: Navigation */}
+                {images.length > 1 && (
+                  <div className="flex items-center justify-between gap-2">
+                    <button
+                      onClick={() => handleModalImageChange("prev")}
+                      className="flex-1 p-2 bg-white/10 hover:bg-white/20 rounded-lg transition-all border border-white/10"
+                      aria-label="Previous"
+                    >
+                      <ChevronLeft className="w-5 h-5 text-white mx-auto" />
+                    </button>
+                    <div className="px-4 py-2 bg-white/10 backdrop-blur-md rounded-lg border border-white/10">
+                      <span className="text-white text-sm font-medium whitespace-nowrap">
+                        {selectedImage + 1} / {images.length}
+                      </span>
+                    </div>
+                    <button
+                      onClick={() => handleModalImageChange("next")}
+                      className="flex-1 p-2 bg-white/10 hover:bg-white/20 rounded-lg transition-all border border-white/10"
+                      aria-label="Next"
+                    >
+                      <ChevronRight className="w-5 h-5 text-white mx-auto" />
+                    </button>
+                  </div>
+                )}
+
+                {/* Row 2: Zoom & Rotate */}
+                <div className="flex items-center gap-2">
+                  <div className="flex items-center gap-1 bg-white/10 backdrop-blur-md rounded-lg p-1 border border-white/10 flex-1">
+                    <button
+                      onClick={handleZoomOut}
+                      className="p-2 hover:bg-white/20 rounded-md transition-all flex-1"
+                      aria-label="Zoom out"
+                    >
+                      <ZoomOut className="w-4 h-4 text-white mx-auto" />
+                    </button>
+                    <div className="px-2 py-1 bg-white/10 rounded text-center min-w-[50px]">
+                      <span className="text-white text-xs font-medium">
+                        {Math.round(zoom * 100)}%
+                      </span>
+                    </div>
+                    <button
+                      onClick={handleZoomIn}
+                      className="p-2 hover:bg-white/20 rounded-md transition-all flex-1"
+                      aria-label="Zoom in"
+                    >
+                      <ZoomIn className="w-4 h-4 text-white mx-auto" />
+                    </button>
+                  </div>
+
+                  <div className="flex items-center gap-1 bg-white/10 backdrop-blur-md rounded-lg p-1 border border-white/10">
+                    <button
+                      onClick={handleRotateCounterClockwise}
+                      className="p-2 hover:bg-white/20 rounded-md transition-all"
+                      aria-label="Rotate counter-clockwise"
+                    >
+                      <RotateCcw className="w-4 h-4 text-white" />
+                    </button>
+                    <button
+                      onClick={handleRotateClockwise}
+                      className="p-2 hover:bg-white/20 rounded-md transition-all"
+                      aria-label="Rotate clockwise"
+                    >
+                      <RotateCw className="w-4 h-4 text-white" />
+                    </button>
+                  </div>
+
+                  <button
+                    onClick={resetTransform}
+                    className="px-3 py-2 bg-white/10 hover:bg-white/20 rounded-lg transition-all text-white text-xs font-medium border border-white/10"
+                    aria-label="Reset view"
+                  >
+                    {t("reset")}
+                  </button>
+                </div>
+              </div>
+
+              {/* Desktop Layout */}
+              <div className="hidden md:flex items-center justify-center gap-2">
+                <button
+                  onClick={() => handleModalImageChange("prev")}
+                  disabled={images.length <= 1}
+                  className="p-2 bg-white/10 hover:bg-white/20 rounded-lg transition-all disabled:opacity-30 disabled:cursor-not-allowed border border-white/10"
+                  aria-label="Previous"
+                >
+                  <ChevronLeft className="w-4 h-4 text-white" />
+                </button>
+
+                <div className="flex items-center gap-1.5 bg-white/10 backdrop-blur-md rounded-lg p-1 border border-white/10">
+                  <button
+                    onClick={handleZoomOut}
+                    className="p-2 hover:bg-white/20 rounded-md transition-all"
+                    aria-label="Zoom out"
+                  >
+                    <ZoomOut className="w-4 h-4 text-white" />
+                  </button>
+                  <div className="px-3 py-1 bg-white/10 rounded min-w-[60px] text-center">
+                    <span className="text-white text-sm font-medium">
+                      {Math.round(zoom * 100)}%
+                    </span>
+                  </div>
+                  <button
+                    onClick={handleZoomIn}
+                    className="p-2 hover:bg-white/20 rounded-md transition-all"
+                    aria-label="Zoom in"
+                  >
+                    <ZoomIn className="w-4 h-4 text-white" />
+                  </button>
+                </div>
+
+                <div className="w-px h-8 bg-white/20" />
+
+                <div className="flex items-center gap-1.5 bg-white/10 backdrop-blur-md rounded-lg p-1 border border-white/10">
+                  <button
+                    onClick={handleRotateCounterClockwise}
+                    className="p-2 hover:bg-white/20 rounded-md transition-all"
+                    aria-label="Rotate counter-clockwise"
+                  >
+                    <RotateCcw className="w-4 h-4 text-white" />
+                  </button>
+                  <button
+                    onClick={handleRotateClockwise}
+                    className="p-2 hover:bg-white/20 rounded-md transition-all"
+                    aria-label="Rotate clockwise"
+                  >
+                    <RotateCw className="w-4 h-4 text-white" />
+                  </button>
+                </div>
+
+                <button
+                  onClick={resetTransform}
+                  className="px-4 py-2 bg-white/10 hover:bg-white/20 rounded-lg transition-all text-white text-sm font-medium border border-white/10"
+                  aria-label="Reset view"
+                >
+                  Reset
+                </button>
+
+                <div className="w-px h-8 bg-white/20" />
+
+                <button
+                  onClick={() => handleModalImageChange("next")}
+                  disabled={images.length <= 1}
+                  className="p-2 bg-white/10 hover:bg-white/20 rounded-lg transition-all disabled:opacity-30 disabled:cursor-not-allowed border border-white/10"
+                  aria-label="Next"
+                >
+                  <ChevronRight className="w-4 h-4 text-white" />
+                </button>
+
+                {images.length > 1 && (
+                  <>
+                    <div className="w-px h-8 bg-white/20" />
+                    <div className="px-4 py-2 bg-white/10 backdrop-blur-md rounded-lg border border-white/10">
+                      <span className="text-white text-sm font-medium">
+                        {selectedImage + 1} / {images.length}
+                      </span>
+                    </div>
+                  </>
+                )}
+              </div>
+            </div>
+          </div>
+        </div>
+      )}
+    </>
   );
-}
+}

features/products/components/ProductPageContent.tsx

@@ -72,7 +72,7 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
     refetch: refetchProduct,
   } = useProductsBySlug(slug);
   const { isFavorite, isLoading: isFavLoading } = useIsFavorite(
-    product?.id || 0
+    product?.id || 0,
   );
   const cartOptions = useMemo(
     () => ({
@@ -80,7 +80,7 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
       refetchOnWindowFocus: true,
       staleTime: 0,
     }),
-    []
+    [],
   );
   const { mutate: toggleFavoriteMutation } = useToggleFavorite();
   const {
@@ -100,7 +100,7 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
 
   const cartItem = useMemo(() => {
     const item = cartData?.data?.find(
-      (item: any) => item.product?.id === product?.id
+      (item: any) => item.product?.id === product?.id,
     );
 
     return item;
@@ -109,19 +109,26 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
   const isInCart = !!cartItem;
   const availableStock = product?.stock || 0;
 
-  const imageUrls = useMemo(
-    () =>
-      product?.media?.map(
-        (m) => m.images_800x800 || m.images_720x720 || m.thumbnail
-      ) || [],
-    [product]
-  );
+  const imageUrls = useMemo(() => {
+  
+  if (!product?.media || product.media.length === 0) {
+    return [];
+  }
+  
+  const urls = product.media
+    .map((m) => {
+      const url = m.images_800x800 || m.images_720x720 || m.images_400x400 || m.thumbnail;
+      return url;
+    })
+    .filter(Boolean); 
+  return urls;
+}, [product]);
 
   const reviews = useMemo(() => product?.reviews_resources || [], [product]);
   const averageRating = useMemo(
     () =>
       product?.reviews?.rating ? Number.parseFloat(product.reviews.rating) : 0,
-    [product]
+    [product],
   );
 
   const transformedRelatedProducts = useMemo(() => {
@@ -173,13 +180,13 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
         };
         sessionStorage.setItem(
           PENDING_PRODUCT_UPDATES_KEY,
-          JSON.stringify(pending)
+          JSON.stringify(pending),
         );
       } catch (error) {
         console.error("Failed to save pending update:", error);
       }
     },
-    [product?.id]
+    [product?.id],
   );
 
   const clearPendingUpdate = useCallback(() => {
@@ -194,7 +201,7 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
         } else {
           sessionStorage.setItem(
             PENDING_PRODUCT_UPDATES_KEY,
-            JSON.stringify(pending)
+            JSON.stringify(pending),
           );
         }
       }
@@ -225,7 +232,7 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
         syncToServerRef.current?.(quantity);
       }, delay);
     },
-    [t]
+    [t],
   );
 
   retrySyncRef.current = retrySync;
@@ -288,7 +295,7 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
       cartItem,
       clearPendingUpdate,
       t,
-    ]
+    ],
   );
 
   syncToServerRef.current = syncToServer;
@@ -401,7 +408,7 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
             toast.success(
               data?.wasAdded
                 ? t("added_to_favorites")
-                : t("removed_from_favorites")
+                : t("removed_from_favorites"),
             );
           },
           onError: () => {
@@ -409,10 +416,10 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
               description: "Try again later",
             });
           },
-        }
+        },
       );
     },
-    [product?.id, isFavorite, toggleFavoriteMutation, t]
+    [product?.id, isFavorite, toggleFavoriteMutation, t],
   );
 
   const handleSubmitReview = useCallback(
@@ -442,7 +449,7 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
         });
       }
     },
-    [product?.id, submitReviewMutation, refetchProduct, t]
+    [product?.id, submitReviewMutation, refetchProduct, t],
   );
 
   const loadingSkeleton = useMemo(
@@ -464,7 +471,7 @@ export default function ProductPageContent({ slug }: ProductDetailProps) {
         </div>
       </div>
     ),
-    []
+    [],
   );
 
   if (productLoading) return loadingSkeleton;

i18n/messages/ru.json

@@ -19,9 +19,11 @@
     "loading": "Загрузка...",
     "all_collections_loaded": "Все коллекции загружены"
   },
+
   "category": "Категория",
   "checkout": "Оформить заказ",
   "price_label": "Цена:",
+  "shipping_price": "Цена доставки",
   "extra_price": "Доп. цена:",
   "discount": "Скидка:",
   "total_price": "Общая цена:",
@@ -45,6 +47,10 @@
   "delivery_type": "Тип доставки",
   "delivery": "Доставка",
   "pickup": "Самовывоз",
+  "standart": "Стандартная",
+  "self_pickup": "Самовывоз",
+  "region": "Çapar ugrat",
+  "free": "Бесплатно",
   "payment_type": "Тип оплаты",
   "cash": "Наличные",
   "card": "Карта",
@@ -81,7 +87,7 @@
   "become_seller": "Стать продавцом",
   "choose_region": "Выберите регион",
   "choose_or_enter_address": "Выберите или введите свой адрес",
-  "note": "Заметка",
+  "note": "Укажите подробнее свой адрес",
   "seller_application_form": "Форма подачи заявления на открытие магазина",
   "phone": "Телефон",
   "unit_price": "Цена за 1 шт.:",
@@ -189,8 +195,19 @@
   "enter_email": "Введите email",
   "uploadPatent": "Загрузить патент",
   "outOfStock": "Нет в наличии",
-   "requiredField": "Обязательное поле",
-   "fileRequired": "Файл загрузить"
+  "requiredField": "Обязательное поле",
+  "fileRequired": "Файл загрузить",
+  "register_title": "Регистрация",
+  "register_description": "Заполните ваши данные",
+  "register_button": "Зарегистрироваться",
+  "name_required": "Введите ваше имя",
+  "address_required": "Введите ваш адрес",
+  "name_placeholder": "Ваше имя",
+  "address_placeholder": "Ваш адрес (например: Теджен)",
+  "checking": "Проверка...",
+  "registering": "Регистрация...",
+  "registration_success": "Регистрация успешна! Введите код",
+  "verify_title": "Введите код",
+  "verify_description": "Введите код, отправленный на ваш телефон",
+  "back": "Назад"
 }
-  
-  

i18n/messages/tm.json

@@ -1,7 +1,7 @@
 {
   "common": {
     "categories": "Bölümler",
-    "products": "Azyk harytlary",
+    "products": "Harytlar",
     "catalog": "Katalog",
     "search": "Haryt gözleg",
     "orders": "Sargytlar",
@@ -22,6 +22,7 @@
   "category": "Bölümler",
   "checkout": "Sargyt et",
   "price_label": "Baha:",
+  "shipping_price": "Eltip berme bahasy",
   "extra_price": "Goşmaça baha:",
   "discount": "Arzanladyş:",
   "total_price": "Jemi baha:",
@@ -45,10 +46,14 @@
   "delivery_type": "Elip bermek görnüşi",
   "delivery": "Eltip bermek",
   "pickup": "Özüň baryp al",
+  "standart": "Standart",
+  "self_pickup": "Özüm baryp aljak",
+  "region": "Çapar ugrat",
+  "free": "Mugt",
   "payment_type": "Töleg görnüşi",
   "cash": "Nagt",
   "card": "Kartdan tölemek",
-  "choose_address": "Adres saýla",
+  "choose_address": "Etrap saýla",
   "brands": "Brendler",
   "color": "Reňk",
   "price": "Baha",
@@ -76,13 +81,13 @@
   "yes": "Hawa",
   "cart_empty": "Siziň söwda sebediňiz boş",
   "add_to_cart": "Sebede goş",
-  
+
   "go_to_cart": "Sebede geçmek",
-  "products": "Azyk harytlary",
+  "products": "Harytlar",
   "become_seller": "Satyjy bolmak",
-  "choose_region": "Etrap saýlaň",
+  "choose_region": "Welaýat saýlaň",
   "choose_or_enter_address": "Salgyňyzy saýlaň ýa-da ýazyň",
-  "note": "Bellik",
+  "note": "Adresiňiz barada giňişleýin ýazyň",
   "seller_application_form": "Dükan açmak üçin arza görnüşi",
   "phone": "Telefon",
   "unit_price": "1 san bahasy:",
@@ -191,5 +196,18 @@
   "uploadPatent": "Patent goş",
   "outOfStock": "Ammarda ýok",
   "requiredField": "Zerur maglumat",
-  "fileRequired": "Fayl goş"
+  "fileRequired": "Fayl goş",
+  "register_title": "Hasaba alyş",
+  "register_description": "Maglumatyňyzy dolduryň",
+  "register_button": "Hasaba al",
+  "name_required": "Adyňyzy giriziň",
+  "address_required": "Salgyňyzy giriziň",
+  "name_placeholder": "Adyňyz",
+  "address_placeholder": "Salgyňyz (mysal: Tejen)",
+  "checking": "Barlanýar...",
+  "registering": "Hasaba alynýar...",
+  "registration_success": "Hasaba alyndy! Kody giriziň",
+  "verify_title": "Kody giriziň",
+  "verify_description": "Telefonyňyza gelen kody giriziň",
+  "back": "Yza"
 }

lib/api.ts

@@ -1,6 +1,10 @@
 // lib/api.ts
 
-import axios, { type AxiosInstance, type AxiosRequestConfig, type AxiosResponse } from "axios";
+import axios, {
+  type AxiosInstance,
+  type AxiosRequestConfig,
+  type AxiosResponse,
+} from "axios";
 import TokenStorage from "./tokenStorage";
 
 const localeToApiLang = (locale: string): string => {
@@ -42,27 +46,32 @@ class APIClient {
           config.headers.Authorization = `Bearer ${token}`;
         }
 
-        // Add language parameter
-        let lang = "tm";
-        
-        if (typeof window !== "undefined") {
-          if ((window as any).i18n?.language) {
-            lang = localeToApiLang((window as any).i18n.language);
-          } else {
-            const pathLocale = window.location.pathname.split("/")[1];
-            if (pathLocale === "tm" || pathLocale === "ru") {
-              lang = localeToApiLang(pathLocale);
+        // Add language parameter (except for POST requests to /orders)
+        const url = config.url || "";
+        const isOrderPost =
+          config.method?.toLowerCase() === "post" && url.includes("/orders");
+
+        if (!isOrderPost) {
+          let lang = "tm";
+
+          if (typeof window !== "undefined") {
+            if ((window as any).i18n?.language) {
+              lang = localeToApiLang((window as any).i18n.language);
+            } else {
+              const pathLocale = window.location.pathname.split("/")[1];
+              if (pathLocale === "tm" || pathLocale === "ru") {
+                lang = localeToApiLang(pathLocale);
+              }
             }
           }
-        }
 
-        const url = config.url || "";
-        const separator = url.includes("?") ? "&" : "?";
-        config.url = `${url}${separator}lang=${lang}`;
+          const separator = url.includes("?") ? "&" : "?";
+          config.url = `${url}${separator}lang=${lang}`;
+        }
 
         return config;
       },
-      (error) => Promise.reject(error)
+      (error) => Promise.reject(error),
     );
 
     // Response interceptor
@@ -92,11 +101,12 @@ class APIClient {
                   "Content-Type": "application/json",
                   "Api-Token": process.env.NEXT_PUBLIC_API_TOKEN || "123",
                 },
-              }
+              },
             );
 
-            const newToken = guestTokenResponse.data?.token || guestTokenResponse.data?.data;
-            
+            const newToken =
+              guestTokenResponse.data?.token || guestTokenResponse.data?.data;
+
             if (newToken) {
               TokenStorage.setGuestToken(newToken);
               this.processQueue(null);
@@ -105,11 +115,11 @@ class APIClient {
           } catch (refreshError) {
             this.processQueue(refreshError);
             TokenStorage.clearTokens();
-            
+
             if (typeof window !== "undefined") {
               window.location.href = "/login";
             }
-            
+
             return Promise.reject(refreshError);
           } finally {
             this.isRefreshing = false;
@@ -131,7 +141,7 @@ class APIClient {
         }
 
         return Promise.reject(error);
-      }
+      },
     );
   }
 
@@ -146,25 +156,43 @@ class APIClient {
     this.failedQueue = [];
   }
 
-  get<T = any>(url: string, config?: AxiosRequestConfig): Promise<AxiosResponse<T>> {
+  get<T = any>(
+    url: string,
+    config?: AxiosRequestConfig,
+  ): Promise<AxiosResponse<T>> {
     return this.client.get<T>(url, config);
   }
 
-  post<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<AxiosResponse<T>> {
+  post<T = any>(
+    url: string,
+    data?: any,
+    config?: AxiosRequestConfig,
+  ): Promise<AxiosResponse<T>> {
     return this.client.post<T>(url, data, config);
   }
 
-  put<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<AxiosResponse<T>> {
+  put<T = any>(
+    url: string,
+    data?: any,
+    config?: AxiosRequestConfig,
+  ): Promise<AxiosResponse<T>> {
     return this.client.put<T>(url, data, config);
   }
 
-  patch<T = any>(url: string, data?: any, config?: AxiosRequestConfig): Promise<AxiosResponse<T>> {
+  patch<T = any>(
+    url: string,
+    data?: any,
+    config?: AxiosRequestConfig,
+  ): Promise<AxiosResponse<T>> {
     return this.client.patch<T>(url, data, config);
   }
 
-  delete<T = any>(url: string, config?: AxiosRequestConfig): Promise<AxiosResponse<T>> {
+  delete<T = any>(
+    url: string,
+    config?: AxiosRequestConfig,
+  ): Promise<AxiosResponse<T>> {
     return this.client.delete<T>(url, config);
   }
 }
 
-export const apiClient = new APIClient();
+export const apiClient = new APIClient();

lib/hooks/useAuth.ts

@@ -14,8 +14,8 @@ interface LoginCredentials {
 
 interface RegisterData {
   phone_number: string;
-  name?: string;
-  email?: string;
+  name: string;
+  address: string;
 }
 
 interface VerifyTokenData {
@@ -52,31 +52,31 @@ function extractToken(data: AuthResponse): string {
 
 function handleAuthError(error: unknown): AuthError {
   if (error instanceof AxiosError) {
-    if (error.code === 'ECONNABORTED') {
+    if (error.code === "ECONNABORTED") {
       return {
         message: "Request timeout - server not responding",
         code: "TIMEOUT",
-        statusCode: 408
+        statusCode: 408,
       };
     }
     if (error.response) {
       return {
         message: error.response.data?.message || "Authentication failed",
         code: error.response.data?.code || "AUTH_ERROR",
-        statusCode: error.response.status
+        statusCode: error.response.status,
       };
     }
     if (error.request) {
       return {
         message: "Network error - cannot reach server",
         code: "NETWORK_ERROR",
-        statusCode: 0
+        statusCode: 0,
       };
     }
   }
   return {
     message: error instanceof Error ? error.message : "Unknown error occurred",
-    code: "UNKNOWN_ERROR"
+    code: "UNKNOWN_ERROR",
   };
 }
 
@@ -106,8 +106,8 @@ export function useGetGuestToken() {
           {},
           {
             signal: controller.signal,
-            timeout: 10000
-          }
+            timeout: 10000,
+          },
         );
         clearTimeout(timeoutId);
         return extractToken(response.data);
@@ -123,7 +123,7 @@ export function useGetGuestToken() {
       console.error("[Guest Token] Failed:", {
         message: error.message,
         code: error.code,
-        statusCode: error.statusCode
+        statusCode: error.statusCode,
       });
     },
     retry: (failureCount, error) => {
@@ -147,7 +147,7 @@ export function useLogin() {
       const response = await apiClient.post<AuthResponse>(
         "/auth/login",
         credentials,
-        { timeout: 15000 }
+        { timeout: 15000 },
       );
       return extractToken(response.data);
     },
@@ -172,7 +172,7 @@ export function useRegister() {
       const response = await apiClient.post<AuthResponse>(
         "/auth/register",
         userData,
-        { timeout: 15000 }
+        { timeout: 15000 },
       );
       return extractToken(response.data);
     },
@@ -197,7 +197,7 @@ export function useVerifyToken() {
       const response = await apiClient.post<AuthResponse>(
         "/auth/verify",
         verifyData,
-        { timeout: 15000 }
+        { timeout: 15000 },
       );
       return extractToken(response.data);
     },
@@ -222,7 +222,9 @@ export function useLogout() {
       try {
         await apiClient.post("/auth/logout", {}, { timeout: 5000 });
       } catch (error) {
-        console.warn("[Logout] Server call failed, clearing local state anyway");
+        console.warn(
+          "[Logout] Server call failed, clearing local state anyway",
+        );
       }
     },
     onSuccess: () => {
@@ -234,4 +236,4 @@ export function useLogout() {
       queryClient.clear();
     },
   });
-}
+}

lib/types/api.ts

@@ -153,7 +153,8 @@ export interface CartItem {
 }
 
 export interface CartResponse {
-  message?: string;
+  message: string;
+  errorDetails?: string;
   data: CartItem[];
   count?: number;
   total?: number;
@@ -200,6 +201,7 @@ export interface Order {
   id: number;
   status: string;
   shipping_method: string;
+  shipping_price?: number;
   notes: string | null;
   customer_name: string;
   customer_phone: string;
@@ -235,7 +237,7 @@ export interface CreateOrderRequest {
   delivery_time?: string;
   delivery_at?: string;
   region: string;
-  note?: string;
+  notes?: string;
 }
 
 export interface CreateOrderPayload {
@@ -243,11 +245,12 @@ export interface CreateOrderPayload {
   customer_phone?: string;
   customer_address: string;
   shipping_method: string;
+  shipping_price: number;
   payment_type_id: number;
   delivery_time?: string;
   delivery_at?: string;
   region: string;
-  note?: string;
+  notes?: string;
 }
 
 // Pagination Types
@@ -396,6 +399,11 @@ export interface ShippingMethod {
   code: string;
 }
 
+export interface OrderDelivery {
+  name: string;
+  price: number;
+}
+
 // Generic API Error Response
 export interface ApiError {
   message: string;

next.config.ts

@@ -11,8 +11,8 @@ const nextConfig: NextConfig = {
     unoptimized: true,
     remotePatterns: [
       {
-        protocol: "http",
-        hostname: "shop.post.tm",
+        protocol: "https",
+        hostname: "hyzmat.app",
         // port: "8080",
       },
     ],