diff --git a/frontend/app/[locale]/shop/cart/CartPageClient.tsx b/frontend/app/[locale]/shop/cart/CartPageClient.tsx
index 5bffd616..30b66fab 100644
--- a/frontend/app/[locale]/shop/cart/CartPageClient.tsx
+++ b/frontend/app/[locale]/shop/cart/CartPageClient.tsx
@@ -72,9 +72,14 @@ const ORDERS_CARD = cn('border-border rounded-md border p-4');
 type Props = {
   stripeEnabled: boolean;
   monobankEnabled: boolean;
+  monobankGooglePayEnabled: boolean;
 };
 
 type CheckoutProvider = 'stripe' | 'monobank';
+type CheckoutPaymentMethod =
+  | 'stripe_card'
+  | 'monobank_invoice'
+  | 'monobank_google_pay';
 
 function resolveInitialProvider(args: {
   stripeEnabled: boolean;
@@ -85,11 +90,22 @@ function resolveInitialProvider(args: {
   const canUseStripe = args.stripeEnabled;
   const canUseMonobank = args.monobankEnabled && isUah;
 
-  if (canUseStripe) return 'stripe';
   if (canUseMonobank) return 'monobank';
+  if (canUseStripe) return 'stripe';
   return 'stripe';
 }
 
+function resolveDefaultMethodForProvider(args: {
+  provider: CheckoutProvider;
+  currency: string | null | undefined;
+}): CheckoutPaymentMethod | null {
+  if (args.provider === 'stripe') return 'stripe_card';
+  if (args.provider === 'monobank') {
+    return args.currency === 'UAH' ? 'monobank_invoice' : null;
+  }
+  return null;
+}
+
 type OrdersSummaryState = {
   count: number;
   latestOrderId: string | null;
@@ -112,13 +128,84 @@ type ShippingWarehouse = {
   address: string | null;
 };
 
+function normalizeLookupValue(value: string): string {
+  return value.trim().toLocaleLowerCase();
+}
+
+function normalizeShippingCity(raw: unknown): ShippingCity | null {
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
+    return null;
+  }
+
+  const item = raw as Record<string, unknown>;
+
+  const ref = typeof item.ref === 'string' ? item.ref.trim() : '';
+
+  const rawName =
+    typeof item.nameUa === 'string'
+      ? item.nameUa
+      : typeof item.name_ua === 'string'
+        ? item.name_ua
+        : typeof item.name === 'string'
+          ? item.name
+          : typeof item.present === 'string'
+            ? item.present
+            : '';
+
+  const nameUa = rawName.trim();
+
+  if (!ref || !nameUa) {
+    return null;
+  }
+
+  return {
+    ref,
+    nameUa,
+  };
+}
+
+function parseShippingCitiesResponse(data: unknown): {
+  available: boolean | null;
+  items: ShippingCity[];
+} {
+  if (Array.isArray(data)) {
+    return {
+      available: null,
+      items: data
+        .map(normalizeShippingCity)
+        .filter((item): item is ShippingCity => item !== null),
+    };
+  }
+
+  if (!data || typeof data !== 'object') {
+    return {
+      available: null,
+      items: [],
+    };
+  }
+
+  const obj = data as Record<string, unknown>;
+  const itemsRaw = Array.isArray(obj.items) ? obj.items : [];
+
+  return {
+    available: typeof obj.available === 'boolean' ? obj.available : null,
+    items: itemsRaw
+      .map(normalizeShippingCity)
+      .filter((item): item is ShippingCity => item !== null),
+  };
+}
+
 function isWarehouseMethod(
   methodCode: CheckoutDeliveryMethodCode | null
 ): boolean {
   return methodCode === 'NP_WAREHOUSE' || methodCode === 'NP_LOCKER';
 }
 
-export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
+export default function CartPage({
+  stripeEnabled,
+  monobankEnabled,
+  monobankGooglePayEnabled,
+}: Props) {
   const { cart, updateQuantity, removeFromCart } = useCart();
   const router = useRouter();
   const t = useTranslations('shop.cart');
@@ -134,14 +221,20 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
   );
   const [isOrdersLoading, setIsOrdersLoading] = useState(false);
 
-  const [selectedProvider, setSelectedProvider] = useState<CheckoutProvider>(
-    () =>
-      resolveInitialProvider({
-        stripeEnabled,
-        monobankEnabled,
+  const initialProvider = resolveInitialProvider({
+    stripeEnabled,
+    monobankEnabled,
+    currency: cart?.summary?.currency,
+  });
+  const [selectedProvider, setSelectedProvider] =
+    useState<CheckoutProvider>(initialProvider);
+  const [selectedPaymentMethod, setSelectedPaymentMethod] =
+    useState<CheckoutPaymentMethod | null>(() =>
+      resolveDefaultMethodForProvider({
+        provider: initialProvider,
         currency: cart?.summary?.currency,
       })
-  );
+    );
   const [isClientReady, setIsClientReady] = useState(false);
   const [shippingMethods, setShippingMethods] = useState<ShippingMethod[]>([]);
   const [shippingMethodsLoading, setShippingMethodsLoading] = useState(true);
@@ -156,6 +249,7 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
   const [selectedCityRef, setSelectedCityRef] = useState<string | null>(null);
   const [selectedCityName, setSelectedCityName] = useState<string | null>(null);
   const [citiesLoading, setCitiesLoading] = useState(false);
+  const [cityLookupFailed, setCityLookupFailed] = useState(false);
 
   const [warehouseQuery, setWarehouseQuery] = useState('');
   const [warehouseOptions, setWarehouseOptions] = useState<ShippingWarehouse[]>(
@@ -188,6 +282,7 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
   const isUahCheckout = cart.summary.currency === 'UAH';
   const canUseStripe = stripeEnabled;
   const canUseMonobank = monobankEnabled && isUahCheckout;
+  const canUseMonobankGooglePay = canUseMonobank && monobankGooglePayEnabled;
   const hasSelectableProvider = canUseStripe || canUseMonobank;
   const country = localeToCountry(locale);
   const shippingUnavailableHardBlock =
@@ -246,6 +341,10 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
     if (key) return safeT(key, code ?? 'SHIPPING_INVALID');
     return safeT('delivery.validation.invalid', code ?? 'SHIPPING_INVALID');
   };
+  const clearCheckoutUiErrors = () => {
+    setDeliveryUiError(null);
+    setCheckoutError(null);
+  };
 
   useEffect(() => {
     if (selectedProvider === 'stripe' && !canUseStripe && canUseMonobank) {
@@ -257,6 +356,40 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
     }
   }, [canUseMonobank, canUseStripe, selectedProvider]);
 
+  useEffect(() => {
+    if (selectedProvider === 'stripe') {
+      if (selectedPaymentMethod !== 'stripe_card') {
+        setSelectedPaymentMethod('stripe_card');
+      }
+      return;
+    }
+
+    if (
+      selectedPaymentMethod === 'monobank_google_pay' &&
+      !canUseMonobankGooglePay
+    ) {
+      setSelectedPaymentMethod('monobank_invoice');
+      return;
+    }
+
+    if (
+      selectedPaymentMethod !== 'monobank_invoice' &&
+      selectedPaymentMethod !== 'monobank_google_pay'
+    ) {
+      setSelectedPaymentMethod(
+        resolveDefaultMethodForProvider({
+          provider: 'monobank',
+          currency: cart.summary.currency,
+        })
+      );
+    }
+  }, [
+    canUseMonobankGooglePay,
+    cart.summary.currency,
+    selectedPaymentMethod,
+    selectedProvider,
+  ]);
+
   useEffect(() => {
     let cancelled = false;
     const controller = new AbortController();
@@ -414,6 +547,7 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
   useEffect(() => {
     if (!shippingAvailable) {
       setCityOptions([]);
+      setCityLookupFailed(false);
       setCitiesLoading(false);
       return;
     }
@@ -421,14 +555,18 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
     const query = cityQuery.trim();
     if (query.length < 2) {
       setCityOptions([]);
+      setCityLookupFailed(false);
       setCitiesLoading(false);
       return;
     }
 
     let cancelled = false;
     const controller = new AbortController();
+
     const timeoutId = setTimeout(async () => {
       setCitiesLoading(true);
+      setCityLookupFailed(false);
+
       try {
         const qs = new URLSearchParams({
           q: query,
@@ -437,31 +575,47 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
           ...(country ? { country } : {}),
         });
 
-        const response = await fetch(`/api/shop/shipping/np/cities?${qs}`, {
-          method: 'GET',
-          headers: { Accept: 'application/json' },
-          cache: 'no-store',
-          signal: controller.signal,
-        });
+        const response = await fetch(
+          `/api/shop/shipping/np/cities?${qs.toString()}`,
+          {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+            cache: 'no-store',
+            signal: controller.signal,
+          }
+        );
 
         const data = await response.json().catch(() => null);
+        const parsed = parseShippingCitiesResponse(data);
 
-        if (!response.ok || !data || data.available === false) {
+        if (!response.ok || parsed.available === false) {
           if (!cancelled) {
-            setCityOptions([]);
+            setCityLookupFailed(true);
           }
           return;
         }
 
         if (!cancelled) {
-          const next = Array.isArray(data.items)
-            ? (data.items as ShippingCity[])
-            : [];
-          setCityOptions(next);
+          setCityLookupFailed(false);
+          const next = parsed.items;
+          const normalizedQuery = normalizeLookupValue(query);
+
+          const exactMatches = next.filter(
+            city => normalizeLookupValue(city.nameUa) === normalizedQuery
+          );
+
+          if (exactMatches.length === 1) {
+            const exactCity = exactMatches[0]!;
+            setSelectedCityRef(exactCity.ref);
+            setSelectedCityName(exactCity.nameUa);
+            setCityOptions([]);
+          } else {
+            setCityOptions(next);
+          }
         }
       } catch {
         if (!cancelled) {
-          setCityOptions([]);
+          setCityLookupFailed(true);
         }
       } finally {
         if (!cancelled) {
@@ -728,6 +882,16 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
       );
       return;
     }
+    if (
+      selectedProvider === 'monobank' &&
+      selectedPaymentMethod === 'monobank_google_pay' &&
+      !canUseMonobankGooglePay
+    ) {
+      setCheckoutError(
+        t('checkout.paymentMethod.monobankGooglePayUnavailable')
+      );
+      return;
+    }
     if (shippingMethodsLoading) {
       setCheckoutError(safeT('delivery.methodsLoading', 'METHODS_LOADING'));
       return;
@@ -772,7 +936,12 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
       }
 
       const idempotencyKey = generateIdempotencyKey();
-
+      const checkoutPaymentMethod =
+        selectedProvider === 'stripe' ? 'stripe_card' : selectedPaymentMethod;
+      if (!checkoutPaymentMethod) {
+        setCheckoutError(t('checkout.paymentMethod.noAvailable'));
+        return;
+      }
       const response = await fetch('/api/shop/checkout', {
         method: 'POST',
         headers: {
@@ -781,6 +950,7 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
         },
         body: JSON.stringify({
           paymentProvider: selectedProvider,
+          paymentMethod: checkoutPaymentMethod,
           ...(shippingPayloadResult?.ok
             ? {
                 shipping: shippingPayloadResult.shipping,
@@ -826,6 +996,11 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
         typeof data.pageUrl === 'string' && data.pageUrl.trim().length > 0
           ? data.pageUrl
           : null;
+      const statusToken: string | null =
+        typeof data.statusToken === 'string' &&
+        data.statusToken.trim().length > 0
+          ? data.statusToken
+          : null;
 
       const orderId = String(data.orderId);
       setCreatedOrderId(orderId);
@@ -838,14 +1013,30 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
         );
         return;
       }
-      if (paymentProvider === 'monobank' && monobankPageUrl) {
+
+      if (paymentProvider === 'monobank') {
+        if (checkoutPaymentMethod === 'monobank_google_pay') {
+          if (!statusToken) {
+            setCheckoutError(t('checkout.errors.unexpectedResponse'));
+            return;
+          }
+
+          router.push(
+            `${shopBase}/checkout/payment/monobank/${encodeURIComponent(
+              orderId
+            )}?statusToken=${encodeURIComponent(statusToken)}&clearCart=1`
+          );
+          return;
+        }
+
+        if (!monobankPageUrl) {
+          setCheckoutError(t('checkout.errors.unexpectedResponse'));
+          return;
+        }
+
         window.location.assign(monobankPageUrl);
         return;
       }
-      if (paymentProvider === 'monobank' && !monobankPageUrl) {
-        setCheckoutError(t('checkout.errors.unexpectedResponse'));
-        return;
-      }
 
       const paymentsDisabledFlag =
         paymentProvider !== 'stripe' || !clientSecret
@@ -866,8 +1057,16 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
 
   const shippingUnavailableText =
     resolveShippingUnavailableText(shippingReasonCode);
+  const hasValidPaymentSelection =
+    selectedProvider === 'stripe'
+      ? canUseStripe && selectedPaymentMethod === 'stripe_card'
+      : canUseMonobank &&
+        (selectedPaymentMethod === 'monobank_invoice' ||
+          (selectedPaymentMethod === 'monobank_google_pay' &&
+            canUseMonobankGooglePay));
   const canPlaceOrder =
     hasSelectableProvider &&
+    hasValidPaymentSelection &&
     !shippingMethodsLoading &&
     !shippingUnavailableHardBlock &&
     (!shippingAvailable || !!selectedShippingMethod);
@@ -1195,9 +1394,10 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                         name="delivery-method"
                         value={method.methodCode}
                         checked={selectedShippingMethod === method.methodCode}
-                        onChange={() =>
-                          setSelectedShippingMethod(method.methodCode)
-                        }
+                        onChange={() => {
+                          clearCheckoutUiErrors();
+                          setSelectedShippingMethod(method.methodCode);
+                        }}
                         className="h-4 w-4"
                       />
                       <span className="text-sm font-medium">
@@ -1218,7 +1418,11 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                     id="shipping-city-search"
                     type="text"
                     value={cityQuery}
+                    autoComplete="off"
+                    spellCheck={false}
                     onChange={event => {
+                      clearCheckoutUiErrors();
+                      setCityLookupFailed(false);
                       setCityQuery(event.target.value);
                       setSelectedCityRef(null);
                       setSelectedCityName(null);
@@ -1248,9 +1452,11 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                           key={city.ref}
                           type="button"
                           onClick={() => {
+                            clearCheckoutUiErrors();
                             setSelectedCityRef(city.ref);
                             setSelectedCityName(city.nameUa);
                             setCityQuery(city.nameUa);
+                            setCityOptions([]);
                           }}
                           className="hover:bg-secondary block w-full rounded px-2 py-1 text-left text-xs"
                         >
@@ -1259,6 +1465,16 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                       ))}
                     </div>
                   ) : null}
+
+                  {!citiesLoading &&
+                  !cityLookupFailed &&
+                  cityQuery.trim().length >= 2 &&
+                  !selectedCityRef &&
+                  cityOptions.length === 0 ? (
+                    <p className="text-muted-foreground text-xs" role="status">
+                      {t('delivery.city.noResults')}
+                    </p>
+                  ) : null}
                 </div>
 
                 {isWarehouseSelectionMethod ? (
@@ -1281,15 +1497,29 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                       type="text"
                       value={warehouseQuery}
                       onChange={event => {
+                        clearCheckoutUiErrors();
                         setWarehouseQuery(event.target.value);
                         setSelectedWarehouseRef(null);
                         setSelectedWarehouseName(null);
                       }}
-                      placeholder={t('delivery.warehouse.placeholder')}
+                      placeholder={
+                        selectedCityRef
+                          ? t('delivery.warehouse.placeholder')
+                          : t('delivery.warehouse.selectCityFirst')
+                      }
                       className="border-border bg-background w-full rounded-md border px-3 py-2 text-sm"
                       disabled={!selectedCityRef}
                     />
 
+                    {!selectedCityRef ? (
+                      <p
+                        className="text-muted-foreground text-xs"
+                        role="status"
+                      >
+                        {t('delivery.warehouse.cityRequired')}
+                      </p>
+                    ) : null}
+
                     {selectedWarehouseRef ? (
                       <p className="text-muted-foreground text-xs">
                         {t('delivery.warehouse.selected', {
@@ -1312,6 +1542,7 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                             key={warehouse.ref}
                             type="button"
                             onClick={() => {
+                              clearCheckoutUiErrors();
                               setSelectedWarehouseRef(warehouse.ref);
                               setSelectedWarehouseName(warehouse.name);
                               setWarehouseQuery(
@@ -1319,6 +1550,7 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                                   ? `${warehouse.name} (${warehouse.address})`
                                   : warehouse.name
                               );
+                              setWarehouseOptions([]);
                             }}
                             className="hover:bg-secondary block w-full rounded px-2 py-1 text-left text-xs"
                           >
@@ -1343,9 +1575,10 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                       id="shipping-address-1"
                       type="text"
                       value={courierAddressLine1}
-                      onChange={event =>
-                        setCourierAddressLine1(event.target.value)
-                      }
+                      onChange={event => {
+                        clearCheckoutUiErrors();
+                        setCourierAddressLine1(event.target.value);
+                      }}
                       placeholder={t(
                         'delivery.courierAddress.line1Placeholder'
                       )}
@@ -1354,9 +1587,10 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                     <input
                       type="text"
                       value={courierAddressLine2}
-                      onChange={event =>
-                        setCourierAddressLine2(event.target.value)
-                      }
+                      onChange={event => {
+                        clearCheckoutUiErrors();
+                        setCourierAddressLine2(event.target.value);
+                      }}
                       placeholder={t(
                         'delivery.courierAddress.line2Placeholder'
                       )}
@@ -1376,7 +1610,10 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                     id="recipient-name"
                     type="text"
                     value={recipientName}
-                    onChange={event => setRecipientName(event.target.value)}
+                    onChange={event => {
+                      clearCheckoutUiErrors();
+                      setRecipientName(event.target.value);
+                    }}
                     placeholder={t('delivery.recipientName.placeholder')}
                     className="border-border bg-background w-full rounded-md border px-3 py-2 text-sm"
                   />
@@ -1393,7 +1630,10 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                     id="recipient-phone"
                     type="tel"
                     value={recipientPhone}
-                    onChange={event => setRecipientPhone(event.target.value)}
+                    onChange={event => {
+                      clearCheckoutUiErrors();
+                      setRecipientPhone(event.target.value);
+                    }}
                     placeholder={t('delivery.recipientPhone.placeholder')}
                     className="border-border bg-background w-full rounded-md border px-3 py-2 text-sm"
                   />
@@ -1410,7 +1650,10 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                     id="recipient-email"
                     type="email"
                     value={recipientEmail}
-                    onChange={event => setRecipientEmail(event.target.value)}
+                    onChange={event => {
+                      clearCheckoutUiErrors();
+                      setRecipientEmail(event.target.value);
+                    }}
                     placeholder={t('delivery.recipientEmail.placeholder')}
                     className="border-border bg-background w-full rounded-md border px-3 py-2 text-sm"
                   />
@@ -1426,7 +1669,10 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                   <textarea
                     id="recipient-comment"
                     value={recipientComment}
-                    onChange={event => setRecipientComment(event.target.value)}
+                    onChange={event => {
+                      clearCheckoutUiErrors();
+                      setRecipientComment(event.target.value);
+                    }}
                     placeholder={t('delivery.recipientComment.placeholder')}
                     rows={2}
                     className="border-border bg-background w-full rounded-md border px-3 py-2 text-sm"
@@ -1455,7 +1701,11 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                     name="payment-provider"
                     value="stripe"
                     checked={selectedProvider === 'stripe'}
-                    onChange={() => setSelectedProvider('stripe')}
+                    onChange={() => {
+                      clearCheckoutUiErrors();
+                      setSelectedProvider('stripe');
+                      setSelectedPaymentMethod('stripe_card');
+                    }}
                     className="h-4 w-4"
                   />
                   <span className="text-sm font-medium">
@@ -1475,7 +1725,21 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                   name="payment-provider"
                   value="monobank"
                   checked={selectedProvider === 'monobank'}
-                  onChange={() => setSelectedProvider('monobank')}
+                  onChange={() => {
+                    clearCheckoutUiErrors();
+                    setSelectedProvider('monobank');
+                    if (
+                      selectedPaymentMethod !== 'monobank_invoice' &&
+                      selectedPaymentMethod !== 'monobank_google_pay'
+                    ) {
+                      setSelectedPaymentMethod(
+                        resolveDefaultMethodForProvider({
+                          provider: 'monobank',
+                          currency: cart.summary.currency,
+                        })
+                      );
+                    }
+                  }}
                   disabled={!canUseMonobank}
                   className="h-4 w-4"
                 />
@@ -1484,6 +1748,60 @@ export default function CartPage({ stripeEnabled, monobankEnabled }: Props) {
                 </span>
               </label>
 
+              {selectedProvider === 'monobank' && canUseMonobank ? (
+                <div className="ml-2 space-y-2">
+                  {canUseMonobankGooglePay ? (
+                    <label className="border-border flex cursor-pointer items-center gap-2 rounded-md border px-3 py-2">
+                      <input
+                        type="radio"
+                        name="payment-method-monobank"
+                        value="monobank_google_pay"
+                        checked={
+                          selectedPaymentMethod === 'monobank_google_pay'
+                        }
+                        onChange={() => {
+                          clearCheckoutUiErrors();
+                          setSelectedPaymentMethod('monobank_google_pay');
+                        }}
+                        className="h-4 w-4"
+                      />
+                      <span className="text-sm font-medium">
+                        {t('checkout.paymentMethod.monobankGooglePay')}
+                      </span>
+                    </label>
+                  ) : null}
+
+                  <label className="border-border flex cursor-pointer items-center gap-2 rounded-md border px-3 py-2">
+                    <input
+                      type="radio"
+                      name="payment-method-monobank"
+                      value="monobank_invoice"
+                      checked={selectedPaymentMethod === 'monobank_invoice'}
+                      onChange={() => {
+                        clearCheckoutUiErrors();
+                        setSelectedPaymentMethod('monobank_invoice');
+                      }}
+                      className="h-4 w-4"
+                    />
+                    <span className="text-sm font-medium">
+                      {t('checkout.paymentMethod.monobankInvoice')}
+                    </span>
+                  </label>
+
+                  {canUseMonobankGooglePay ? (
+                    <p className="text-muted-foreground text-xs">
+                      {t('checkout.paymentMethod.monobankGooglePayHint')}
+                    </p>
+                  ) : (
+                    <p className="text-muted-foreground text-xs">
+                      {t(
+                        'checkout.paymentMethod.monobankGooglePayFallbackHint'
+                      )}
+                    </p>
+                  )}
+                </div>
+              ) : null}
+
               {!canUseMonobank ? (
                 <p className="text-muted-foreground text-xs">
                   {monobankEnabled
diff --git a/frontend/app/[locale]/shop/cart/page.tsx b/frontend/app/[locale]/shop/cart/page.tsx
index b6324e22..504063f9 100644
--- a/frontend/app/[locale]/shop/cart/page.tsx
+++ b/frontend/app/[locale]/shop/cart/page.tsx
@@ -33,11 +33,17 @@ function resolveMonobankCheckoutEnabled(): boolean {
   }
 }
 
+function resolveMonobankGooglePayEnabled(): boolean {
+  const raw = (process.env.SHOP_MONOBANK_GPAY_ENABLED ?? '').trim().toLowerCase();
+  return raw === 'true' || raw === '1' || raw === 'yes' || raw === 'on';
+}
+
 export default function CartPage() {
   return (
     <CartPageClient
       stripeEnabled={resolveStripeCheckoutEnabled()}
       monobankEnabled={resolveMonobankCheckoutEnabled()}
+      monobankGooglePayEnabled={resolveMonobankGooglePayEnabled()}
     />
   );
 }
diff --git a/frontend/app/[locale]/shop/checkout/payment/monobank/MonobankGooglePayClient.tsx b/frontend/app/[locale]/shop/checkout/payment/monobank/MonobankGooglePayClient.tsx
new file mode 100644
index 00000000..b5ec1f3c
--- /dev/null
+++ b/frontend/app/[locale]/shop/checkout/payment/monobank/MonobankGooglePayClient.tsx
@@ -0,0 +1,588 @@
+'use client';
+
+import { useTranslations } from 'next-intl';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
+import { Link, useRouter } from '@/i18n/routing';
+import { generateIdempotencyKey } from '@/lib/shop/idempotency';
+import {
+  SHOP_CTA_BASE,
+  SHOP_CTA_INSET,
+  SHOP_CTA_INTERACTIVE,
+  SHOP_CTA_WAVE,
+  SHOP_DISABLED,
+  SHOP_FOCUS,
+  SHOP_OUTLINE_BTN_BASE,
+  SHOP_OUTLINE_BTN_INTERACTIVE,
+  shopCtaGradient,
+} from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
+
+type MonobankGooglePayClientProps = {
+  orderId: string;
+  statusToken: string | null;
+};
+
+type GooglePayConfig = {
+  paymentDataRequest: unknown;
+  readinessHints?: {
+    isReadyToPayRequest?: unknown;
+  };
+};
+
+type GooglePayPaymentData = {
+  paymentMethodData?: {
+    tokenizationData?: {
+      token?: unknown;
+    };
+  };
+};
+
+type GooglePayPaymentsClient = {
+  createButton(options: {
+    onClick: () => void;
+    buttonType?: string;
+    buttonColor?: string;
+    buttonSizeMode?: string;
+  }): HTMLElement;
+  isReadyToPay(request: unknown): Promise<{ result: boolean }>;
+  loadPaymentData(request: unknown): Promise<GooglePayPaymentData>;
+};
+
+type GooglePayPaymentsClientCtor = new (options: {
+  environment: 'TEST' | 'PRODUCTION';
+}) => GooglePayPaymentsClient;
+
+declare global {
+  interface Window {
+    google?: {
+      payments?: {
+        api?: {
+          PaymentsClient?: GooglePayPaymentsClientCtor;
+        };
+      };
+    };
+  }
+}
+
+const GOOGLE_PAY_SCRIPT_SRC = 'https://pay.google.com/gp/p/js/pay.js';
+
+let googlePayScriptPromise: Promise<void> | null = null;
+
+const SHOP_HERO_CTA = cn(
+  SHOP_CTA_BASE,
+  SHOP_CTA_INTERACTIVE,
+  SHOP_FOCUS,
+  SHOP_DISABLED,
+  'w-full items-center justify-center gap-2 px-6 py-3 text-sm text-white',
+  'shadow-[var(--shop-hero-btn-shadow)] hover:shadow-[var(--shop-hero-btn-shadow-hover)]'
+);
+
+const SHOP_OUTLINE_BTN = cn(
+  SHOP_OUTLINE_BTN_BASE,
+  SHOP_OUTLINE_BTN_INTERACTIVE,
+  SHOP_FOCUS,
+  SHOP_DISABLED
+);
+
+function HeroCtaInner({ children }: { children: React.ReactNode }) {
+  return (
+    <>
+      <span
+        className="absolute inset-0"
+        style={shopCtaGradient(
+          '--shop-hero-btn-bg',
+          '--shop-hero-btn-bg-hover'
+        )}
+        aria-hidden="true"
+      />
+      <span
+        className={SHOP_CTA_WAVE}
+        style={shopCtaGradient(
+          '--shop-hero-btn-bg-hover',
+          '--shop-hero-btn-bg'
+        )}
+        aria-hidden="true"
+      />
+      <span className={SHOP_CTA_INSET} aria-hidden="true" />
+      <span className="relative z-10">{children}</span>
+    </>
+  );
+}
+
+function loadGooglePayScript(): Promise<void> {
+  if (typeof window === 'undefined') return Promise.resolve();
+  if (window.google?.payments?.api?.PaymentsClient) return Promise.resolve();
+  if (googlePayScriptPromise) return googlePayScriptPromise;
+
+  const promise: Promise<void> = new Promise<void>((resolve, reject) => {
+    const existing = document.querySelector<HTMLScriptElement>(
+      `script[src="${GOOGLE_PAY_SCRIPT_SRC}"]`
+    );
+
+    if (existing) {
+      existing.addEventListener('load', () => resolve(), { once: true });
+      existing.addEventListener(
+        'error',
+        () => {
+          googlePayScriptPromise = null;
+          reject(new Error('google_pay_script_failed'));
+        },
+        { once: true }
+      );
+      return;
+    }
+
+    const script = document.createElement('script');
+    script.src = GOOGLE_PAY_SCRIPT_SRC;
+    script.async = true;
+    script.onload = () => resolve();
+    script.onerror = () => {
+      googlePayScriptPromise = null;
+      script.remove();
+      reject(new Error('google_pay_script_failed'));
+    };
+    document.head.appendChild(script);
+  }).catch((error: unknown) => {
+    googlePayScriptPromise = null;
+    throw error;
+  });
+
+  googlePayScriptPromise = promise;
+  return promise;
+}
+
+function normalizeToken(value: unknown): string | null {
+  if (typeof value !== 'string') return null;
+  const normalized = value.trim();
+  return normalized.length > 0 ? normalized : null;
+}
+
+function buildPendingReturnPath(orderId: string, statusToken: string | null) {
+  const params = new URLSearchParams({ orderId });
+  if (statusToken) params.set('statusToken', statusToken);
+  params.set('clearCart', '1');
+  return `/shop/checkout/return/monobank?${params.toString()}`;
+}
+
+function buildStatusTokenQuery(statusToken: string | null) {
+  if (!statusToken) return '';
+  return `?statusToken=${encodeURIComponent(statusToken)}`;
+}
+
+function extractGToken(payload: GooglePayPaymentData | null): string | null {
+  return normalizeToken(payload?.paymentMethodData?.tokenizationData?.token);
+}
+
+function createPaymentsClient(): GooglePayPaymentsClient | null {
+  const ctor = window.google?.payments?.api?.PaymentsClient;
+  if (!ctor) return null;
+
+  return new ctor({
+    environment: process.env.NODE_ENV === 'production' ? 'PRODUCTION' : 'TEST',
+  });
+}
+
+export default function MonobankGooglePayClient({
+  orderId,
+  statusToken,
+}: MonobankGooglePayClientProps) {
+  const t = useTranslations('shop.checkout');
+  const router = useRouter();
+
+  const [isScriptReady, setIsScriptReady] = useState(false);
+  const [config, setConfig] = useState<GooglePayConfig | null>(null);
+  const [isConfigLoading, setIsConfigLoading] = useState(true);
+  const [isReadyToPay, setIsReadyToPay] = useState(false);
+  const [isCheckingReadiness, setIsCheckingReadiness] = useState(true);
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [isInvoiceSubmitting, setIsInvoiceSubmitting] = useState(false);
+  const [uiMessage, setUiMessage] = useState<string | null>(null);
+  const [uiMessageTone, setUiMessageTone] = useState<'error' | 'info'>('error');
+
+  const paymentsClientRef = useRef<GooglePayPaymentsClient | null>(null);
+  const buttonHostRef = useRef<HTMLDivElement | null>(null);
+  const submitIdempotencyKeyRef = useRef<string | null>(null);
+  const pendingRedirectTimeoutRef = useRef<number | null>(null);
+  const pendingPath = buildPendingReturnPath(orderId, statusToken);
+  const statusTokenQuery = buildStatusTokenQuery(statusToken);
+
+  const goToPending = useCallback(() => {
+    router.push(pendingPath);
+  }, [pendingPath, router]);
+
+  useEffect(() => {
+    submitIdempotencyKeyRef.current = null;
+
+    if (pendingRedirectTimeoutRef.current !== null) {
+      window.clearTimeout(pendingRedirectTimeoutRef.current);
+      pendingRedirectTimeoutRef.current = null;
+    }
+  }, [orderId]);
+
+  useEffect(() => {
+    return () => {
+      if (pendingRedirectTimeoutRef.current !== null) {
+        window.clearTimeout(pendingRedirectTimeoutRef.current);
+        pendingRedirectTimeoutRef.current = null;
+      }
+    };
+  }, []);
+  useEffect(() => {
+    let cancelled = false;
+    void loadGooglePayScript()
+      .then(() => {
+        if (!cancelled) setIsScriptReady(true);
+      })
+      .catch(() => {
+        if (!cancelled) {
+          setIsScriptReady(false);
+          setUiMessageTone('error');
+          setUiMessage(t('monobankGooglePay.unableToInit'));
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [t]);
+
+  useEffect(() => {
+    let cancelled = false;
+
+    async function loadConfig() {
+      setIsConfigLoading(true);
+
+      try {
+        const response = await fetch(
+          `/api/shop/orders/${encodeURIComponent(
+            orderId
+          )}/payment/monobank/google-pay/config${statusTokenQuery}`,
+          {
+            method: 'GET',
+            headers: { Accept: 'application/json' },
+            cache: 'no-store',
+          }
+        );
+
+        const data = (await response.json().catch(() => null)) as Record<
+          string,
+          unknown
+        > | null;
+
+        if (!response.ok || !data) {
+          if (!cancelled) {
+            setConfig(null);
+            setUiMessageTone('error');
+            setUiMessage(t('monobankGooglePay.unableToInit'));
+          }
+          return;
+        }
+
+        if (!cancelled) {
+          setConfig({
+            paymentDataRequest: data.paymentDataRequest,
+            readinessHints:
+              typeof data.readinessHints === 'object' && data.readinessHints
+                ? (data.readinessHints as GooglePayConfig['readinessHints'])
+                : undefined,
+          });
+        }
+      } catch {
+        if (!cancelled) {
+          setConfig(null);
+          setUiMessageTone('error');
+          setUiMessage(t('monobankGooglePay.unableToInit'));
+        }
+      } finally {
+        if (!cancelled) {
+          setIsConfigLoading(false);
+        }
+      }
+    }
+
+    void loadConfig();
+
+    return () => {
+      cancelled = true;
+    };
+  }, [orderId, statusTokenQuery, t]);
+
+  useEffect(() => {
+    if (!isScriptReady || !config) {
+      setIsCheckingReadiness(false);
+      return;
+    }
+
+    let cancelled = false;
+    setIsCheckingReadiness(true);
+
+    const client = createPaymentsClient();
+    paymentsClientRef.current = client;
+    if (!client) {
+      setIsCheckingReadiness(false);
+      setIsReadyToPay(false);
+      return;
+    }
+
+    const readinessRequest =
+      config.readinessHints?.isReadyToPayRequest ?? config.paymentDataRequest;
+
+    void client
+      .isReadyToPay(readinessRequest)
+      .then(result => {
+        if (!cancelled) {
+          setIsReadyToPay(Boolean(result?.result));
+        }
+      })
+      .catch(() => {
+        if (!cancelled) {
+          setIsReadyToPay(false);
+        }
+      })
+      .finally(() => {
+        if (!cancelled) {
+          setIsCheckingReadiness(false);
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [config, isScriptReady]);
+
+  const onGooglePayClick = useCallback(async () => {
+    const client = paymentsClientRef.current;
+    if (!client || !config) return;
+
+    setUiMessage(null);
+    setUiMessageTone('error');
+    setIsSubmitting(true);
+
+    try {
+      const paymentData = await client.loadPaymentData(
+        config.paymentDataRequest
+      );
+      const gToken = extractGToken(paymentData);
+      if (!gToken) {
+        submitIdempotencyKeyRef.current = null;
+        setUiMessageTone('info');
+        setUiMessage(t('monobankGooglePay.processingFallback'));
+
+        if (pendingRedirectTimeoutRef.current !== null) {
+          window.clearTimeout(pendingRedirectTimeoutRef.current);
+        }
+
+        pendingRedirectTimeoutRef.current = window.setTimeout(() => {
+          pendingRedirectTimeoutRef.current = null;
+          goToPending();
+        }, 800);
+
+        return;
+      }
+
+      submitIdempotencyKeyRef.current ??= generateIdempotencyKey();
+
+      const response = await fetch(
+        `/api/shop/orders/${encodeURIComponent(
+          orderId
+        )}/payment/monobank/google-pay/submit${statusTokenQuery}`,
+        {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'Idempotency-Key': submitIdempotencyKeyRef.current,
+          },
+          body: JSON.stringify({ gToken }),
+        }
+      );
+
+      const data = (await response.json().catch(() => null)) as Record<
+        string,
+        unknown
+      > | null;
+      const redirectUrl =
+        typeof data?.redirectUrl === 'string' &&
+        data.redirectUrl.trim().length > 0
+          ? data.redirectUrl
+          : null;
+      const returnUrl =
+        typeof data?.returnUrl === 'string' && data.returnUrl.trim().length > 0
+          ? data.returnUrl
+          : null;
+
+      if (response.ok) {
+        if (redirectUrl) {
+          window.location.assign(redirectUrl);
+          return;
+        }
+
+        if (returnUrl) {
+          window.location.assign(returnUrl);
+          return;
+        }
+
+        goToPending();
+        return;
+      }
+
+      setUiMessageTone('error');
+      setUiMessage(t('monobankGooglePay.invoiceFallbackFailed'));
+    } catch (error) {
+      const statusCode =
+        error && typeof error === 'object' && 'statusCode' in error
+          ? String((error as { statusCode?: unknown }).statusCode ?? '')
+          : '';
+
+      if (statusCode === 'CANCELED') {
+        submitIdempotencyKeyRef.current = null;
+        setUiMessageTone('error');
+        setUiMessage(t('monobankGooglePay.cancelled'));
+        return;
+      }
+
+      setUiMessageTone('error');
+      setUiMessage(t('monobankGooglePay.unableToInit'));
+    } finally {
+      setIsSubmitting(false);
+    }
+  }, [config, goToPending, orderId, statusTokenQuery, t]);
+
+  useEffect(() => {
+    if (!isReadyToPay || !paymentsClientRef.current || !buttonHostRef.current) {
+      return;
+    }
+
+    const host = buttonHostRef.current;
+    host.innerHTML = '';
+    const button = paymentsClientRef.current.createButton({
+      onClick: onGooglePayClick,
+      buttonType: 'pay',
+      buttonColor: 'black',
+      buttonSizeMode: 'fill',
+    });
+    host.appendChild(button);
+
+    return () => {
+      host.innerHTML = '';
+    };
+  }, [isReadyToPay, onGooglePayClick]);
+
+  const onInvoiceFallback = useCallback(async () => {
+    submitIdempotencyKeyRef.current = null;
+    setUiMessage(null);
+    setUiMessageTone('error');
+    setIsInvoiceSubmitting(true);
+
+    try {
+      const response = await fetch(
+        `/api/shop/orders/${encodeURIComponent(
+          orderId
+        )}/payment/monobank/invoice${statusTokenQuery}`,
+        {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+        }
+      );
+
+      const data = (await response.json().catch(() => null)) as Record<
+        string,
+        unknown
+      > | null;
+      const pageUrl =
+        typeof data?.pageUrl === 'string' && data.pageUrl.trim().length > 0
+          ? data.pageUrl
+          : null;
+
+      if (response.ok && pageUrl) {
+        window.location.assign(pageUrl);
+        return;
+      }
+
+      setUiMessageTone('error');
+      setUiMessage(t('monobankGooglePay.invoiceFallbackFailed'));
+    } catch {
+      setUiMessageTone('error');
+      setUiMessage(t('monobankGooglePay.invoiceFallbackFailed'));
+    } finally {
+      setIsInvoiceSubmitting(false);
+    }
+  }, [orderId, statusTokenQuery, t]);
+
+  return (
+    <section className="space-y-4" aria-label="Monobank Google Pay">
+      <p className="text-muted-foreground text-sm">
+        {t('monobankGooglePay.supportedDevices')}
+      </p>
+
+      <p className="text-muted-foreground text-xs">
+        {t('monobankGooglePay.useInvoiceFallback')}
+      </p>
+
+      {isConfigLoading || isCheckingReadiness ? (
+        <p className="text-muted-foreground text-sm" role="status">
+          {t('monobankGooglePay.loading')}
+        </p>
+      ) : null}
+
+      {isReadyToPay ? (
+        <div className="space-y-3">
+          <div ref={buttonHostRef} className="min-h-12" />
+          <button
+            type="button"
+            className={SHOP_OUTLINE_BTN}
+            onClick={onInvoiceFallback}
+            disabled={isSubmitting || isInvoiceSubmitting}
+          >
+            {isInvoiceSubmitting
+              ? t('monobankGooglePay.invoiceLoading')
+              : t('monobankGooglePay.invoiceFallback')}
+          </button>
+        </div>
+      ) : null}
+
+      {!isConfigLoading && !isCheckingReadiness && !isReadyToPay ? (
+        <div className="space-y-3">
+          <button
+            type="button"
+            className={cn(SHOP_HERO_CTA, 'w-full sm:w-auto')}
+            onClick={onInvoiceFallback}
+            disabled={isInvoiceSubmitting}
+          >
+            <HeroCtaInner>
+              {isInvoiceSubmitting
+                ? t('monobankGooglePay.invoiceLoading')
+                : t('monobankGooglePay.invoiceFallback')}
+            </HeroCtaInner>
+          </button>
+        </div>
+      ) : null}
+
+      {isSubmitting ? (
+        <p className="text-muted-foreground text-sm" role="status">
+          {t('monobankGooglePay.submitting')}
+        </p>
+      ) : null}
+
+      {uiMessage ? (
+        <p
+          className={cn(
+            'text-sm',
+            uiMessageTone === 'error'
+              ? 'text-destructive'
+              : 'text-muted-foreground'
+          )}
+          aria-live={uiMessageTone === 'error' ? 'assertive' : 'polite'}
+        >
+          {uiMessage}
+        </p>
+      ) : null}
+
+      <div className="flex flex-wrap gap-3">
+        <Link href="/shop/cart" className={SHOP_OUTLINE_BTN}>
+          {t('actions.backToCart')}
+        </Link>
+      </div>
+    </section>
+  );
+}
diff --git a/frontend/app/[locale]/shop/checkout/payment/monobank/[orderId]/page.tsx b/frontend/app/[locale]/shop/checkout/payment/monobank/[orderId]/page.tsx
new file mode 100644
index 00000000..b153b505
--- /dev/null
+++ b/frontend/app/[locale]/shop/checkout/payment/monobank/[orderId]/page.tsx
@@ -0,0 +1,173 @@
+import type { Metadata } from 'next';
+import { getTranslations } from 'next-intl/server';
+
+import { ClearCartOnMount } from '@/components/shop/ClearCartOnMount';
+import { Link } from '@/i18n/routing';
+import { OrderNotFoundError } from '@/lib/services/errors';
+import { getOrderSummary } from '@/lib/services/orders';
+import { formatMoney } from '@/lib/shop/currency';
+import {
+  SHOP_FOCUS,
+  SHOP_OUTLINE_BTN_BASE,
+  SHOP_OUTLINE_BTN_INTERACTIVE,
+} from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
+import { orderIdParamSchema } from '@/lib/validation/shop';
+
+import MonobankGooglePayClient from '../MonobankGooglePayClient';
+
+type SearchParams = Record<string, string | string[] | undefined>;
+
+type PaymentPageProps = {
+  params: Promise<{ locale: string; orderId: string }>;
+  searchParams?: Promise<SearchParams>;
+};
+
+export const metadata: Metadata = {
+  title: 'Monobank Google Pay | DevLovers',
+  description: 'Complete your payment with Google Pay via Monobank.',
+};
+
+export const dynamic = 'force-dynamic';
+export const revalidate = 0;
+
+const SHOP_OUTLINE_BTN = cn(
+  SHOP_OUTLINE_BTN_BASE,
+  SHOP_OUTLINE_BTN_INTERACTIVE,
+  SHOP_FOCUS
+);
+
+function getStringParam(params: SearchParams | undefined, key: string): string {
+  const raw = params?.[key];
+  if (!raw) return '';
+  if (Array.isArray(raw)) return raw[0] ?? '';
+  return raw;
+}
+
+function parseStatusToken(params: SearchParams | undefined): string | null {
+  const value = getStringParam(params, 'statusToken').trim();
+  return value.length ? value : null;
+}
+
+function shouldClearCart(params: SearchParams | undefined): boolean {
+  const value = getStringParam(params, 'clearCart');
+  return value === '1' || value === 'true';
+}
+
+function parseOrderId(rawOrderId: string): string | null {
+  const parsed = orderIdParamSchema.safeParse({ id: rawOrderId });
+  if (!parsed.success) return null;
+  return parsed.data.id;
+}
+
+export default async function MonobankGooglePayPage(props: PaymentPageProps) {
+  const { locale, orderId: rawOrderId } = await props.params;
+  const searchParams = props.searchParams ? await props.searchParams : undefined;
+
+  const t = await getTranslations('shop.checkout');
+  const orderId = parseOrderId(rawOrderId);
+  const statusToken = parseStatusToken(searchParams);
+  const clearCart = shouldClearCart(searchParams);
+
+  if (!orderId) {
+    return (
+      <main className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8">
+        <section className="border-border bg-card rounded-lg border p-8 text-center">
+          <h1 className="text-foreground text-2xl font-bold">
+            {t('errors.invalidOrder')}
+          </h1>
+          <p className="text-muted-foreground mt-2 text-sm">
+            {t('missingOrder.message')}
+          </p>
+          <div className="mt-6 flex justify-center">
+            <Link href="/shop/cart" className={SHOP_OUTLINE_BTN}>
+              {t('actions.backToCart')}
+            </Link>
+          </div>
+        </section>
+      </main>
+    );
+  }
+
+  let order: Awaited<ReturnType<typeof getOrderSummary>> | null = null;
+  let loadState: 'ok' | 'not_found' | 'error' = 'ok';
+
+  try {
+    order = await getOrderSummary(orderId);
+  } catch (error) {
+    loadState = error instanceof OrderNotFoundError ? 'not_found' : 'error';
+  }
+
+  if (loadState === 'not_found') {
+    return (
+      <main className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8">
+        <section className="border-border bg-card rounded-lg border p-8 text-center">
+          <h1 className="text-foreground text-2xl font-bold">
+            {t('errors.orderNotFound')}
+          </h1>
+          <p className="text-muted-foreground mt-2 text-sm">
+            {t('notFoundOrder.message')}
+          </p>
+          <div className="mt-6 flex justify-center">
+            <Link href="/shop/cart" className={SHOP_OUTLINE_BTN}>
+              {t('actions.backToCart')}
+            </Link>
+          </div>
+        </section>
+      </main>
+    );
+  }
+
+  if (loadState === 'error' || !order) {
+    return (
+      <main className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8">
+        <section className="border-border bg-card rounded-lg border p-8 text-center">
+          <h1 className="text-foreground text-2xl font-bold">
+            {t('errors.unableToLoad')}
+          </h1>
+          <p className="text-muted-foreground mt-2 text-sm">
+            {t('errors.tryAgainLater')}
+          </p>
+        </section>
+      </main>
+    );
+  }
+
+  return (
+    <main className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8">
+      <ClearCartOnMount enabled={clearCart} />
+
+      <section className="border-border bg-card rounded-lg border p-8">
+        <p className="text-accent text-sm font-semibold tracking-wide uppercase">
+          {t('payment.title')}
+        </p>
+
+        <h1 className="text-foreground mt-2 text-3xl font-bold">
+          {t('payment.payForOrder', { orderId: order.id.slice(0, 8) })}
+        </h1>
+
+        <p className="text-muted-foreground mt-2 text-sm">
+          {t('monobankGooglePay.supportedDevices')}
+        </p>
+
+        <div className="border-border bg-muted/30 mt-6 rounded-md border p-4">
+          <div className="flex items-center justify-between">
+            <span className="text-muted-foreground text-sm">
+              {t('payment.amountDue')}
+            </span>
+            <span className="text-foreground text-xl font-bold">
+              {formatMoney(order.totalAmountMinor, order.currency, locale)}
+            </span>
+          </div>
+          <p className="text-muted-foreground mt-1 text-xs tracking-wide uppercase">
+            {order.currency}
+          </p>
+        </div>
+
+        <div className="mt-6">
+          <MonobankGooglePayClient orderId={order.id} statusToken={statusToken} />
+        </div>
+      </section>
+    </main>
+  );
+}
diff --git a/frontend/app/[locale]/shop/checkout/return/monobank/MonobankReturnStatus.tsx b/frontend/app/[locale]/shop/checkout/return/monobank/MonobankReturnStatus.tsx
new file mode 100644
index 00000000..ef4abb15
--- /dev/null
+++ b/frontend/app/[locale]/shop/checkout/return/monobank/MonobankReturnStatus.tsx
@@ -0,0 +1,254 @@
+'use client';
+
+import { useTranslations } from 'next-intl';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+
+import { Link, useRouter } from '@/i18n/routing';
+import {
+  type CurrencyCode,
+  currencyValues,
+  formatMoneyCode,
+} from '@/lib/shop/currency';
+import {
+  SHOP_FOCUS,
+  SHOP_OUTLINE_BTN_BASE,
+  SHOP_OUTLINE_BTN_INTERACTIVE,
+} from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
+
+type MonobankReturnStatusProps = {
+  orderId: string;
+  statusToken: string | null;
+  locale: string;
+};
+
+type LiteOrderStatus = {
+  id: string;
+  paymentStatus: string;
+  totalAmountMinor: number;
+  currency: CurrencyCode;
+  itemsCount: number;
+};
+type PaymentStatusLabelKey =
+  | 'paymentStatus.paid'
+  | 'paymentStatus.failed'
+  | 'paymentStatus.refunded'
+  | 'paymentStatus.pending'
+  | 'paymentStatus.confirming'
+  | 'paymentStatus.needsReview'
+  | 'paymentStatus.unknown';
+const POLL_DELAY_MS = 2_500;
+const TERMINAL_NON_PAID = new Set([
+  'failed',
+  'refunded',
+  'requires_payment',
+  'canceled',
+  'needs_review',
+]);
+
+const SHOP_OUTLINE_BTN = cn(
+  SHOP_OUTLINE_BTN_BASE,
+  SHOP_OUTLINE_BTN_INTERACTIVE,
+  SHOP_FOCUS
+);
+
+function normalizeToken(token: string | null): string | null {
+  if (!token) return null;
+  const normalized = token.trim();
+  return normalized.length ? normalized : null;
+}
+
+function getStatusLabelKey(status: string): PaymentStatusLabelKey {
+  if (status === 'paid') return 'paymentStatus.paid';
+  if (status === 'failed') return 'paymentStatus.failed';
+  if (status === 'refunded') return 'paymentStatus.refunded';
+  if (status === 'pending') return 'paymentStatus.pending';
+  if (status === 'requires_payment') return 'paymentStatus.confirming';
+  if (status === 'needs_review') return 'paymentStatus.needsReview';
+  return 'paymentStatus.unknown';
+}
+
+function parseStatusPayload(payload: unknown): LiteOrderStatus | null {
+  if (!payload || typeof payload !== 'object') return null;
+  const root = payload as Record<string, unknown>;
+  if (
+    typeof root.id !== 'string' ||
+    typeof root.paymentStatus !== 'string' ||
+    typeof root.totalAmountMinor !== 'number' ||
+    !currencyValues.includes(root.currency as CurrencyCode) ||
+    typeof root.itemsCount !== 'number'
+  ) {
+    return null;
+  }
+
+  return {
+    id: root.id,
+    paymentStatus: root.paymentStatus,
+    totalAmountMinor: root.totalAmountMinor,
+    currency: root.currency as CurrencyCode,
+    itemsCount: root.itemsCount,
+  };
+}
+
+export default function MonobankReturnStatus({
+  orderId,
+  statusToken,
+  locale,
+}: MonobankReturnStatusProps) {
+  const t = useTranslations('shop.checkout');
+  const router = useRouter();
+
+  const [status, setStatus] = useState<LiteOrderStatus | null>(null);
+  const [isPolling, setIsPolling] = useState(true);
+  const [pollError, setPollError] = useState<string | null>(null);
+  const [refreshSeed, setRefreshSeed] = useState(0);
+
+  const normalizedToken = normalizeToken(statusToken);
+
+  const fetchStatus = useCallback(async (): Promise<LiteOrderStatus | null> => {
+    const params = new URLSearchParams({ view: 'lite' });
+    if (normalizedToken) params.set('statusToken', normalizedToken);
+
+    const response = await fetch(
+      `/api/shop/orders/${encodeURIComponent(orderId)}/status?${params.toString()}`,
+      {
+        method: 'GET',
+        headers: { Accept: 'application/json' },
+        cache: 'no-store',
+      }
+    );
+
+    const payload = await response.json().catch(() => null);
+    if (!response.ok) return null;
+
+    return parseStatusPayload(payload);
+  }, [normalizedToken, orderId]);
+
+  useEffect(() => {
+    let cancelled = false;
+    let timer: ReturnType<typeof setTimeout> | null = null;
+
+    async function poll() {
+      if (cancelled) return;
+
+      try {
+        const nextStatus = await fetchStatus();
+        if (!nextStatus) {
+          if (!cancelled) {
+            setPollError(t('errors.tryAgainLater'));
+            timer = setTimeout(poll, POLL_DELAY_MS);
+          }
+          return;
+        }
+
+        if (cancelled) return;
+
+        setStatus(nextStatus);
+        setPollError(null);
+
+        if (nextStatus.paymentStatus === 'paid') {
+          router.replace(
+            `/shop/checkout/success?orderId=${encodeURIComponent(
+              orderId
+            )}&clearCart=1`
+          );
+          return;
+        }
+
+        if (TERMINAL_NON_PAID.has(nextStatus.paymentStatus)) {
+          router.replace(
+            `/shop/checkout/error?orderId=${encodeURIComponent(orderId)}`
+          );
+          return;
+        }
+
+        timer = setTimeout(poll, POLL_DELAY_MS);
+      } catch {
+        if (!cancelled) {
+          setPollError(t('errors.tryAgainLater'));
+          timer = setTimeout(poll, POLL_DELAY_MS);
+        }
+      }
+    }
+
+    void poll().finally(() => {
+      if (!cancelled) setIsPolling(false);
+    });
+
+    return () => {
+      cancelled = true;
+      if (timer) clearTimeout(timer);
+    };
+  }, [fetchStatus, orderId, refreshSeed, router, t]);
+
+  const statusLabel = useMemo(() => {
+    if (!status) return t('paymentStatus.confirming');
+    return t(getStatusLabelKey(status.paymentStatus));
+  }, [status, t]);
+
+  return (
+    <section className="border-border bg-card rounded-lg border p-8">
+      <h1 className="text-foreground text-2xl font-bold">
+        {t('monobankReturn.processing')}
+      </h1>
+
+      <p className="text-muted-foreground mt-2 text-sm">
+        {t('monobankReturn.checking')}
+      </p>
+
+      <div className="border-border bg-muted/30 mt-6 rounded-md border p-4">
+        <dl className="space-y-2 text-sm">
+          <div className="flex items-center justify-between gap-4">
+            <dt className="text-muted-foreground">{t('error.orderLabel')}</dt>
+            <dd className="text-foreground font-medium">{orderId}</dd>
+          </div>
+
+          <div className="flex items-center justify-between gap-4">
+            <dt className="text-muted-foreground">{t('error.statusLabel')}</dt>
+            <dd className="text-foreground font-semibold">{statusLabel}</dd>
+          </div>
+
+          {status ? (
+            <div className="flex items-center justify-between gap-4">
+              <dt className="text-muted-foreground">
+                {t('success.totalAmount')}
+              </dt>
+              <dd className="text-foreground font-semibold">
+                {formatMoneyCode(
+                  status.totalAmountMinor,
+                  status.currency,
+                  locale
+                )}
+              </dd>
+            </div>
+          ) : null}
+        </dl>
+      </div>
+
+      {pollError ? (
+        <p className="text-destructive mt-4 text-sm" role="status">
+          {pollError}
+        </p>
+      ) : null}
+
+      <div className="mt-6 flex flex-wrap gap-3">
+        <button
+          type="button"
+          className={SHOP_OUTLINE_BTN}
+          onClick={() => {
+            setPollError(null);
+            setIsPolling(true);
+            setRefreshSeed(seed => seed + 1);
+          }}
+          disabled={isPolling}
+        >
+          {t('monobankReturn.refresh')}
+        </button>
+
+        <Link href="/shop/cart" className={SHOP_OUTLINE_BTN}>
+          {t('actions.backToCart')}
+        </Link>
+      </div>
+    </section>
+  );
+}
diff --git a/frontend/app/[locale]/shop/checkout/return/monobank/page.tsx b/frontend/app/[locale]/shop/checkout/return/monobank/page.tsx
new file mode 100644
index 00000000..863434e3
--- /dev/null
+++ b/frontend/app/[locale]/shop/checkout/return/monobank/page.tsx
@@ -0,0 +1,101 @@
+import type { Metadata } from 'next';
+import { getTranslations } from 'next-intl/server';
+
+import { ClearCartOnMount } from '@/components/shop/ClearCartOnMount';
+import { Link } from '@/i18n/routing';
+import {
+  SHOP_FOCUS,
+  SHOP_OUTLINE_BTN_BASE,
+  SHOP_OUTLINE_BTN_INTERACTIVE,
+} from '@/lib/shop/ui-classes';
+import { cn } from '@/lib/utils';
+import { orderIdParamSchema } from '@/lib/validation/shop';
+
+import MonobankReturnStatus from './MonobankReturnStatus';
+
+type SearchParams = Record<string, string | string[] | undefined>;
+
+export const metadata: Metadata = {
+  title: 'Monobank Payment Status | DevLovers',
+  description: 'Waiting for Monobank webhook confirmation.',
+};
+
+export const dynamic = 'force-dynamic';
+export const revalidate = 0;
+
+const SHOP_OUTLINE_BTN = cn(
+  SHOP_OUTLINE_BTN_BASE,
+  SHOP_OUTLINE_BTN_INTERACTIVE,
+  SHOP_FOCUS
+);
+
+function getStringParam(params: SearchParams, key: string): string {
+  const raw = params[key];
+  if (!raw) return '';
+  if (Array.isArray(raw)) return raw[0] ?? '';
+  return raw;
+}
+
+function parseOrderId(searchParams: SearchParams): string | null {
+  const orderId = getStringParam(searchParams, 'orderId');
+  const parsed = orderIdParamSchema.safeParse({ id: orderId });
+  if (!parsed.success) return null;
+  return parsed.data.id;
+}
+
+function parseStatusToken(searchParams: SearchParams): string | null {
+  const raw = getStringParam(searchParams, 'statusToken').trim();
+  return raw.length ? raw : null;
+}
+
+function shouldClearCart(searchParams: SearchParams): boolean {
+  const raw = getStringParam(searchParams, 'clearCart');
+  return raw === '1' || raw === 'true';
+}
+
+export default async function MonobankReturnPage({
+  params,
+  searchParams,
+}: {
+  params: Promise<{ locale: string }>;
+  searchParams: Promise<SearchParams>;
+}) {
+  const { locale } = await params;
+  const resolvedSearchParams = await searchParams;
+  const t = await getTranslations('shop.checkout');
+
+  const orderId = parseOrderId(resolvedSearchParams);
+  const statusToken = parseStatusToken(resolvedSearchParams);
+  const clearCart = shouldClearCart(resolvedSearchParams);
+
+  if (!orderId) {
+    return (
+      <main className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8">
+        <section className="border-border bg-card rounded-lg border p-8 text-center">
+          <h1 className="text-foreground text-2xl font-bold">
+            {t('errors.missingOrderId')}
+          </h1>
+          <p className="text-muted-foreground mt-2 text-sm">
+            {t('missingOrder.message')}
+          </p>
+          <div className="mt-6 flex justify-center">
+            <Link href="/shop/cart" className={SHOP_OUTLINE_BTN}>
+              {t('actions.backToCart')}
+            </Link>
+          </div>
+        </section>
+      </main>
+    );
+  }
+
+  return (
+    <main className="mx-auto max-w-4xl px-4 py-16 sm:px-6 lg:px-8">
+      <ClearCartOnMount enabled={clearCart} />
+      <MonobankReturnStatus
+        orderId={orderId}
+        statusToken={statusToken}
+        locale={locale}
+      />
+    </main>
+  );
+}
diff --git a/frontend/app/api/shop/checkout/route.ts b/frontend/app/api/shop/checkout/route.ts
index 5e24160d..836dcf1a 100644
--- a/frontend/app/api/shop/checkout/route.ts
+++ b/frontend/app/api/shop/checkout/route.ts
@@ -14,8 +14,8 @@ import {
   getRateLimitSubject,
   rateLimitResponse,
 } from '@/lib/security/rate-limit';
-import { IdempotencyConflictError } from '@/lib/services/errors';
 import {
+  IdempotencyConflictError,
   InsufficientStockError,
   InvalidPayloadError,
   InvalidVariantError,
@@ -28,7 +28,13 @@ import {
   ensureStripePaymentIntentForOrder,
   PaymentAttemptsExhaustedError,
 } from '@/lib/services/orders/payment-attempts';
-import { type PaymentProvider, type PaymentStatus } from '@/lib/shop/payments';
+import { resolveCurrencyFromLocale } from '@/lib/shop/currency';
+import {
+  isMethodAllowed,
+  type PaymentMethod,
+  type PaymentProvider,
+  type PaymentStatus,
+} from '@/lib/shop/payments';
 import { resolveRequestLocale } from '@/lib/shop/request-locale';
 import { createStatusToken } from '@/lib/shop/status-token';
 import {
@@ -83,11 +89,32 @@ function parseRequestedProvider(
   return 'invalid';
 }
 
+function parseRequestedMethod(raw: unknown): PaymentMethod | 'invalid' | null {
+  if (raw === null || raw === undefined) return null;
+  if (typeof raw !== 'string') return 'invalid';
+
+  const normalized = raw.trim().toLowerCase();
+  if (!normalized) return 'invalid';
+
+  if (normalized === 'stripe_card') return 'stripe_card';
+  if (normalized === 'monobank_invoice') return 'monobank_invoice';
+  if (normalized === 'monobank_google_pay') return 'monobank_google_pay';
+
+  return 'invalid';
+}
+
 function isMonoAlias(raw: unknown): boolean {
   if (typeof raw !== 'string') return false;
   return raw.trim().toLowerCase() === 'mono';
 }
 
+function isMonobankGooglePayEnabled(): boolean {
+  const raw = (process.env.SHOP_MONOBANK_GPAY_ENABLED ?? '')
+    .trim()
+    .toLowerCase();
+  return raw === 'true' || raw === '1' || raw === 'yes' || raw === 'on';
+}
+
 function stripMonobankClientMoneyFields(payload: unknown): unknown {
   if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
     return payload;
@@ -508,14 +535,22 @@ export async function POST(request: NextRequest) {
     );
   }
 
+  const locale = resolveRequestLocale(request);
+
   let monobankRequestHint = false;
   if (body && typeof body === 'object' && !Array.isArray(body)) {
-    const { paymentProvider, provider } = body as Record<string, unknown>;
+    const { paymentProvider, provider, paymentMethod } = body as Record<
+      string,
+      unknown
+    >;
     const rawProvider = paymentProvider ?? provider;
     const parsedProvider = parseRequestedProvider(rawProvider);
+    const parsedMethod = parseRequestedMethod(paymentMethod);
     monobankRequestHint =
       parsedProvider === 'monobank' ||
-      (parsedProvider === 'invalid' && isMonoAlias(rawProvider));
+      (parsedProvider === 'invalid' && isMonoAlias(rawProvider)) ||
+      parsedMethod === 'monobank_invoice' ||
+      parsedMethod === 'monobank_google_pay';
   }
 
   const idempotencyKey = getIdempotencyKey(request);
@@ -572,13 +607,12 @@ export async function POST(request: NextRequest) {
   };
 
   let requestedProvider: CheckoutRequestedProvider | null = null;
+  let requestedMethod: PaymentMethod | null = null;
   let payloadForValidation: unknown = body;
 
   if (body && typeof body === 'object' && !Array.isArray(body)) {
-    const { paymentProvider, provider, ...rest } = body as Record<
-      string,
-      unknown
-    >;
+    const { paymentProvider, provider, paymentMethod, ...rest } =
+      body as Record<string, unknown>;
     const rawProvider = paymentProvider ?? provider;
     const parsedProvider = parseRequestedProvider(rawProvider);
 
@@ -594,12 +628,33 @@ export async function POST(request: NextRequest) {
       );
     }
 
+    const parsedMethod = parseRequestedMethod(paymentMethod);
+    if (parsedMethod === 'invalid') {
+      if (parsedProvider === 'monobank' || isMonoAlias(rawProvider)) {
+        return errorResponse('INVALID_REQUEST', 'Invalid request.', 422);
+      }
+
+      return errorResponse(
+        'PAYMENTS_METHOD_INVALID',
+        'Invalid payment method.',
+        422
+      );
+    }
+
     requestedProvider = parsedProvider;
+    requestedMethod = parsedMethod;
     payloadForValidation = rest;
   }
 
   const selectedProvider: CheckoutRequestedProvider =
     requestedProvider ?? 'stripe';
+  // Explicit default table (locked): stripe -> stripe_card, monobank -> monobank_invoice.
+  const defaultMethod: PaymentMethod =
+    selectedProvider === 'monobank' ? 'monobank_invoice' : 'stripe_card';
+  const selectedMethod: PaymentMethod = requestedMethod ?? defaultMethod;
+  const selectedCurrency =
+    selectedProvider === 'monobank' ? 'UAH' : resolveCurrencyFromLocale(locale);
+
   if (selectedProvider === 'monobank') {
     payloadForValidation = stripMonobankClientMoneyFields(payloadForValidation);
   }
@@ -651,6 +706,45 @@ export async function POST(request: NextRequest) {
     }
   }
 
+  if (
+    selectedMethod === 'monobank_google_pay' &&
+    !isMonobankGooglePayEnabled()
+  ) {
+    return errorResponse('INVALID_REQUEST', 'Invalid request.', 422);
+  }
+
+  if (
+    !isMethodAllowed({
+      provider: selectedProvider,
+      method: selectedMethod,
+      currency: selectedCurrency,
+      flags: { monobankGooglePayEnabled: isMonobankGooglePayEnabled() },
+    })
+  ) {
+    if (selectedProvider === 'monobank') {
+      return errorResponse('INVALID_REQUEST', 'Invalid request.', 422);
+    }
+
+    return errorResponse(
+      'PAYMENTS_METHOD_INVALID',
+      'Invalid payment method.',
+      422
+    );
+  }
+
+  if (
+    payloadForValidation &&
+    typeof payloadForValidation === 'object' &&
+    !Array.isArray(payloadForValidation)
+  ) {
+    payloadForValidation = {
+      ...(payloadForValidation as Record<string, unknown>),
+      paymentProvider: selectedProvider,
+      paymentMethod: selectedMethod,
+      paymentCurrency: selectedCurrency,
+    };
+  }
+
   const parsedPayload = checkoutPayloadSchema.safeParse(payloadForValidation);
 
   if (!parsedPayload.success) {
@@ -685,7 +779,6 @@ export async function POST(request: NextRequest) {
 
   const { items, userId, shipping, country, legalConsent } = parsedPayload.data;
   const itemCount = items.reduce((total, item) => total + item.quantity, 0);
-  const locale = resolveRequestLocale(request);
 
   let currentUser: unknown = null;
   try {
@@ -789,6 +882,7 @@ export async function POST(request: NextRequest) {
       shipping: shipping ?? null,
       legalConsent: legalConsent ?? null,
       paymentProvider: selectedProvider === 'monobank' ? 'monobank' : undefined,
+      paymentMethod: selectedMethod,
     });
 
     const { order } = result;
diff --git a/frontend/app/api/shop/internal/shipping/np/sync/route.ts b/frontend/app/api/shop/internal/shipping/np/sync/route.ts
index 2623309e..36b28a14 100644
--- a/frontend/app/api/shop/internal/shipping/np/sync/route.ts
+++ b/frontend/app/api/shop/internal/shipping/np/sync/route.ts
@@ -14,8 +14,9 @@ import {
 } from '@/lib/services/shop/shipping/log-sanitizer';
 import {
   cacheSettlementsByQuery,
-  cacheWarehousesBySettlement,
+  cacheWarehousesByCityRef,
 } from '@/lib/services/shop/shipping/nova-poshta-catalog';
+import { NovaPoshtaApiError } from '@/lib/services/shop/shipping/nova-poshta-client';
 import {
   getInternalShippingMinIntervalFloorSeconds,
   internalNpSyncPayloadSchema,
@@ -83,6 +84,43 @@ function retryAfterSeconds(nextAllowedAt: Date | null): number {
   return Math.max(1, Math.ceil((nextAllowedAt.getTime() - Date.now()) / 1000));
 }
 
+function buildSafeDebugPayload(error: unknown) {
+  return {
+    env: {
+      isNpApiKeyConfigured: (process.env.NP_API_KEY ?? '').trim().length > 0,
+      shopShippingNpEnabled:
+        (process.env.SHOP_SHIPPING_NP_ENABLED ?? '').trim() || null,
+      shopShippingSyncEnabled:
+        (process.env.SHOP_SHIPPING_SYNC_ENABLED ?? '').trim() || null,
+      appEnv: (process.env.APP_ENV ?? '').trim() || null,
+      vercelEnv: (process.env.VERCEL_ENV ?? '').trim() || null,
+    },
+    error: {
+      errorClass: error instanceof Error ? error.name : typeof error,
+      isNovaPoshtaError: error instanceof NovaPoshtaApiError,
+      code: error instanceof NovaPoshtaApiError ? error.code : null,
+      status: error instanceof NovaPoshtaApiError ? error.status : null,
+    },
+  };
+}
+
+function isNonProductionAppStage(): boolean {
+  const appEnv = (process.env.APP_ENV ?? '').trim().toLowerCase();
+  const vercelEnv = (process.env.VERCEL_ENV ?? '').trim().toLowerCase();
+
+  if (appEnv) {
+    return appEnv !== 'production' && appEnv !== 'prod';
+  }
+
+  if (vercelEnv) {
+    return vercelEnv !== 'production';
+  }
+
+  // Deliberately fail closed: if stage env is unset, treat the route as
+  // production-like so debug payloads are not exposed by default.
+  return false;
+}
+
 export async function POST(request: NextRequest) {
   const requestId =
     request.headers.get('x-request-id')?.trim() || crypto.randomUUID();
@@ -93,7 +131,9 @@ export async function POST(request: NextRequest) {
     route: ROUTE_PATH,
     method: request.method,
   };
-
+  const debugEnabled =
+    isNonProductionAppStage() &&
+    (request.headers.get('x-shop-debug') ?? '').trim() === '1';
   const blocked = guardNonBrowserFailClosed(request, {
     surface: 'shop_shipping_np_sync',
   });
@@ -211,8 +251,8 @@ export async function POST(request: NextRequest) {
     }
 
     if (parsed.data.cityRef) {
-      const synced = await cacheWarehousesBySettlement({
-        settlementRef: parsed.data.cityRef,
+      const synced = await cacheWarehousesByCityRef({
+        cityRef: parsed.data.cityRef,
         runId,
       });
       warehousesUpserted += synced.upserted;
@@ -241,10 +281,14 @@ export async function POST(request: NextRequest) {
         code: 'NP_SYNC_FAILED',
       }
     );
+
+    const debug = debugEnabled ? buildSafeDebugPayload(error) : null;
+
     return noStoreJson(
       {
         success: false,
         code: 'NP_SYNC_FAILED',
+        ...(debug ? { debug } : {}),
       },
       requestId,
       503
diff --git a/frontend/app/api/shop/orders/[id]/payment/monobank/_shared.ts b/frontend/app/api/shop/orders/[id]/payment/monobank/_shared.ts
new file mode 100644
index 00000000..9055bb6a
--- /dev/null
+++ b/frontend/app/api/shop/orders/[id]/payment/monobank/_shared.ts
@@ -0,0 +1,150 @@
+import { eq } from 'drizzle-orm';
+import { NextResponse } from 'next/server';
+
+import { db } from '@/db';
+import { orders } from '@/db/schema';
+import { toDbMoney } from '@/lib/shop/money';
+import type { PaymentMethod } from '@/lib/shop/payments';
+
+const ORDER_PAYABLE_STATUSES = new Set(['pending', 'requires_payment']);
+
+type OrderPaymentRow = {
+  id: string;
+  paymentProvider: string;
+  paymentStatus: string;
+  currency: string;
+  totalAmountMinor: number;
+  pspPaymentMethod: string | null;
+  pspMetadata: Record<string, unknown> | null;
+};
+
+export function noStoreJson(body: unknown, status = 200) {
+  const res = NextResponse.json(body, { status });
+  res.headers.set('Cache-Control', 'no-store');
+  return res;
+}
+
+export function isMonobankGooglePayEnabled(): boolean {
+  const raw = (process.env.SHOP_MONOBANK_GPAY_ENABLED ?? '')
+    .trim()
+    .toLowerCase();
+  return raw === 'true' || raw === '1' || raw === 'yes' || raw === 'on';
+}
+
+export function getMonobankGooglePayMaxBodyBytes(): number {
+  const fallback = 16 * 1024;
+  const raw = (process.env.SHOP_MONOBANK_GPAY_MAX_BODY_BYTES ?? '').trim();
+  if (!raw) return fallback;
+  const parsed = Number.parseInt(raw, 10);
+  if (!Number.isFinite(parsed) || parsed <= 0) return fallback;
+  return parsed;
+}
+
+export async function readOrderPaymentRow(
+  orderId: string
+): Promise<OrderPaymentRow | null> {
+  const rows = await db
+    .select({
+      id: orders.id,
+      paymentProvider: orders.paymentProvider,
+      paymentStatus: orders.paymentStatus,
+      currency: orders.currency,
+      totalAmountMinor: orders.totalAmountMinor,
+      pspPaymentMethod: orders.pspPaymentMethod,
+      pspMetadata: orders.pspMetadata,
+    })
+    .from(orders)
+    .where(eq(orders.id, orderId))
+    .limit(1);
+
+  return rows[0] ?? null;
+}
+
+function parseKnownMethod(value: unknown): PaymentMethod | null {
+  if (typeof value !== 'string') return null;
+  const normalized = value.trim().toLowerCase();
+  if (normalized === 'stripe_card') return 'stripe_card';
+  if (normalized === 'monobank_invoice') return 'monobank_invoice';
+  if (normalized === 'monobank_google_pay') return 'monobank_google_pay';
+  return null;
+}
+
+export function readResolvedOrderPaymentMethod(
+  order: Pick<OrderPaymentRow, 'pspPaymentMethod' | 'pspMetadata'>
+): PaymentMethod | null {
+  const direct = parseKnownMethod(order.pspPaymentMethod);
+  if (direct) return direct;
+
+  const checkout =
+    order.pspMetadata &&
+    typeof order.pspMetadata === 'object' &&
+    !Array.isArray(order.pspMetadata)
+      ? ((order.pspMetadata.checkout as Record<string, unknown> | undefined) ??
+        null)
+      : null;
+  if (!checkout || typeof checkout !== 'object') return null;
+
+  return parseKnownMethod(checkout.requestedMethod);
+}
+
+export function ensureMonobankPayableOrder(args: {
+  order: OrderPaymentRow;
+  allowedMethods: PaymentMethod[];
+}) {
+  const { order, allowedMethods } = args;
+
+  if (order.paymentProvider !== 'monobank') {
+    return {
+      ok: false as const,
+      status: 409,
+      code: 'PAYMENT_PROVIDER_NOT_ALLOWED',
+      message: 'Order payment provider is not Monobank.',
+    };
+  }
+
+  if (order.currency !== 'UAH') {
+    return {
+      ok: false as const,
+      status: 409,
+      code: 'ORDER_CURRENCY_NOT_SUPPORTED',
+      message: 'Order currency must be UAH.',
+    };
+  }
+
+  if (!ORDER_PAYABLE_STATUSES.has(order.paymentStatus)) {
+    return {
+      ok: false as const,
+      status: 409,
+      code: 'ORDER_NOT_PAYABLE',
+      message: 'Order is not payable in the current state.',
+    };
+  }
+
+  if (
+    !Number.isSafeInteger(order.totalAmountMinor) ||
+    order.totalAmountMinor <= 0
+  ) {
+    return {
+      ok: false as const,
+      status: 409,
+      code: 'ORDER_TOTAL_INVALID',
+      message: 'Order total is invalid.',
+    };
+  }
+
+  const method = readResolvedOrderPaymentMethod(order);
+  if (!method || !allowedMethods.includes(method)) {
+    return {
+      ok: false as const,
+      status: 409,
+      code: 'PAYMENT_METHOD_NOT_ALLOWED',
+      message: 'Order payment method is not compatible with this endpoint.',
+    };
+  }
+
+  return { ok: true as const, method };
+}
+
+export function formatMinorToDecimalString(minor: number): string {
+  return toDbMoney(minor);
+}
diff --git a/frontend/app/api/shop/orders/[id]/payment/monobank/google-pay/config/route.ts b/frontend/app/api/shop/orders/[id]/payment/monobank/google-pay/config/route.ts
new file mode 100644
index 00000000..b2a9dd35
--- /dev/null
+++ b/frontend/app/api/shop/orders/[id]/payment/monobank/google-pay/config/route.ts
@@ -0,0 +1,159 @@
+import crypto from 'node:crypto';
+
+import { NextRequest } from 'next/server';
+
+import { logError, logWarn } from '@/lib/logging';
+import { guardBrowserSameOrigin } from '@/lib/security/origin';
+import { authorizeOrderMutationAccess } from '@/lib/services/shop/order-access';
+import { orderIdParamSchema } from '@/lib/validation/shop';
+
+import {
+  ensureMonobankPayableOrder,
+  formatMinorToDecimalString,
+  isMonobankGooglePayEnabled,
+  noStoreJson,
+  readOrderPaymentRow,
+} from '../../_shared';
+
+const ALLOWED_AUTH_METHODS = ['PAN_ONLY', 'CRYPTOGRAM_3DS'] as const;
+const ALLOWED_CARD_NETWORKS = ['MASTERCARD', 'VISA'] as const;
+
+function buildGooglePaySkeleton(args: {
+  totalAmountMinor: number;
+  gatewayMerchantId: string;
+  merchantName: string;
+}) {
+  const baseCardMethod = {
+    type: 'CARD' as const,
+    parameters: {
+      allowedAuthMethods: [...ALLOWED_AUTH_METHODS],
+      allowedCardNetworks: [...ALLOWED_CARD_NETWORKS],
+    },
+  };
+
+  return {
+    paymentDataRequest: {
+      apiVersion: 2,
+      apiVersionMinor: 0,
+      allowedPaymentMethods: [
+        {
+          ...baseCardMethod,
+          tokenizationSpecification: {
+            type: 'PAYMENT_GATEWAY' as const,
+            parameters: {
+              gateway: 'monobank',
+              gatewayMerchantId: args.gatewayMerchantId,
+            },
+          },
+        },
+      ],
+      merchantInfo: {
+        merchantName: args.merchantName,
+      },
+      transactionInfo: {
+        totalPriceStatus: 'FINAL' as const,
+        totalPrice: formatMinorToDecimalString(args.totalAmountMinor),
+        currencyCode: 'UAH',
+      },
+    },
+    readinessHints: {
+      isReadyToPayRequest: {
+        apiVersion: 2,
+        apiVersionMinor: 0,
+        allowedPaymentMethods: [baseCardMethod],
+      },
+    },
+  };
+}
+
+export async function GET(
+  request: NextRequest,
+  context: { params: Promise<{ id: string }> }
+) {
+  const requestId =
+    request.headers.get('x-request-id')?.trim() || crypto.randomUUID();
+  const baseMeta = {
+    requestId,
+    route: request.nextUrl.pathname,
+    method: request.method,
+  };
+
+  const blocked = guardBrowserSameOrigin(request);
+  if (blocked) return blocked;
+
+  const parsedParams = orderIdParamSchema.safeParse(await context.params);
+  if (!parsedParams.success) {
+    return noStoreJson(
+      { code: 'INVALID_ORDER_ID', message: 'Invalid order id.' },
+      400
+    );
+  }
+
+  const orderId = parsedParams.data.id;
+  const statusToken = request.nextUrl.searchParams.get('statusToken');
+  const auth = await authorizeOrderMutationAccess({
+    orderId,
+    statusToken,
+    requiredScope: 'order_payment_init',
+  });
+  if (!auth.authorized) {
+    return noStoreJson({ code: auth.code }, auth.status);
+  }
+
+  if (!isMonobankGooglePayEnabled()) {
+    return noStoreJson(
+      {
+        code: 'MONOBANK_GPAY_DISABLED',
+        message: 'Monobank Google Pay is disabled.',
+      },
+      409
+    );
+  }
+
+  const order = await readOrderPaymentRow(orderId);
+  if (!order) {
+    return noStoreJson({ code: 'ORDER_NOT_FOUND' }, 404);
+  }
+
+  const guard = ensureMonobankPayableOrder({
+    order,
+    allowedMethods: ['monobank_google_pay'],
+  });
+  if (!guard.ok) {
+    logWarn('monobank_google_pay_config_rejected', {
+      ...baseMeta,
+      orderId,
+      code: guard.code,
+    });
+    return noStoreJson({ code: guard.code, message: guard.message }, guard.status);
+  }
+
+  const gatewayMerchantId = (
+    process.env.MONO_GOOGLE_PAY_GATEWAY_MERCHANT_ID ?? ''
+  ).trim();
+  const merchantName = (process.env.MONO_GOOGLE_PAY_MERCHANT_NAME ?? '').trim();
+  if (!gatewayMerchantId || !merchantName) {
+    logError('monobank_google_pay_config_missing_env', null, {
+      ...baseMeta,
+      orderId,
+      code: 'MONOBANK_GPAY_CONFIG_MISSING',
+    });
+    return noStoreJson(
+      {
+        code: 'MONOBANK_GPAY_CONFIG_MISSING',
+        message: 'Monobank Google Pay configuration is missing.',
+      },
+      500
+    );
+  }
+
+  return noStoreJson({
+    success: true,
+    orderId,
+    ...buildGooglePaySkeleton({
+      totalAmountMinor: order.totalAmountMinor,
+      gatewayMerchantId,
+      merchantName,
+    }),
+  });
+}
diff --git a/frontend/app/api/shop/orders/[id]/payment/monobank/google-pay/submit/route.ts b/frontend/app/api/shop/orders/[id]/payment/monobank/google-pay/submit/route.ts
new file mode 100644
index 00000000..c43997e3
--- /dev/null
+++ b/frontend/app/api/shop/orders/[id]/payment/monobank/google-pay/submit/route.ts
@@ -0,0 +1,341 @@
+import crypto from 'node:crypto';
+
+import { NextRequest } from 'next/server';
+
+import { logError, logWarn } from '@/lib/logging';
+import { PspError } from '@/lib/psp/monobank';
+import { guardBrowserSameOrigin } from '@/lib/security/origin';
+import {
+  IdempotencyConflictError,
+  InvalidPayloadError,
+  OrderNotFoundError,
+  OrderStateInvalidError,
+} from '@/lib/services/errors';
+import {
+  MonobankWalletConflictError,
+  submitMonobankWalletPayment,
+} from '@/lib/services/orders/monobank-wallet';
+import { authorizeOrderMutationAccess } from '@/lib/services/shop/order-access';
+import { createStatusToken } from '@/lib/shop/status-token';
+import { toAbsoluteUrl } from '@/lib/shop/url';
+import {
+  idempotencyKeySchema,
+  orderIdParamSchema,
+} from '@/lib/validation/shop';
+
+import {
+  ensureMonobankPayableOrder,
+  getMonobankGooglePayMaxBodyBytes,
+  isMonobankGooglePayEnabled,
+  noStoreJson,
+  readOrderPaymentRow,
+} from '../../_shared';
+
+type SubmitPayload = {
+  gToken: string;
+};
+
+function sanitizeTokenForMonobank(gToken: string): string {
+  try {
+    const parsed = JSON.parse(gToken);
+    return JSON.stringify(parsed);
+  } catch {
+    return gToken;
+  }
+}
+
+function parseIdempotencyKey(request: NextRequest) {
+  const raw = request.headers.get('idempotency-key');
+  if (!raw || !raw.trim()) {
+    return { ok: false as const, code: 'MISSING_IDEMPOTENCY_KEY' };
+  }
+
+  const parsed = idempotencyKeySchema.safeParse(raw);
+  if (!parsed.success) {
+    return { ok: false as const, code: 'INVALID_IDEMPOTENCY_KEY' };
+  }
+
+  return { ok: true as const, idempotencyKey: parsed.data };
+}
+
+function parseSubmitPayload(rawBytes: Buffer, maxBytes: number) {
+  if (rawBytes.byteLength > maxBytes) {
+    return { ok: false as const, status: 413, code: 'PAYLOAD_TOO_LARGE' };
+  }
+
+  const text = rawBytes.toString('utf8').replace(/^\uFEFF/, '');
+
+  let parsed: unknown;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    return { ok: false as const, status: 400, code: 'INVALID_PAYLOAD' };
+  }
+
+  if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
+    return { ok: false as const, status: 400, code: 'INVALID_PAYLOAD' };
+  }
+
+  const gToken = (parsed as Record<string, unknown>).gToken;
+  if (typeof gToken !== 'string' || !gToken.trim()) {
+    return { ok: false as const, status: 400, code: 'INVALID_PAYLOAD' };
+  }
+
+  return { ok: true as const, payload: { gToken } satisfies SubmitPayload };
+}
+
+function resolveStatusToken(
+  orderId: string,
+  statusToken: string | null
+): string {
+  const normalized = statusToken?.trim() ?? '';
+  if (normalized) return normalized;
+
+  return createStatusToken({
+    orderId,
+    scopes: ['status_lite', 'order_payment_init'],
+  });
+}
+
+function buildPendingReturnUrl(
+  orderId: string,
+  statusToken: string | null
+): string {
+  const params = new URLSearchParams({ orderId });
+  const resolvedStatusToken = resolveStatusToken(orderId, statusToken);
+
+  params.set('statusToken', resolvedStatusToken);
+
+  return toAbsoluteUrl(`/shop/checkout/return/monobank?${params.toString()}`);
+}
+
+export async function POST(
+  request: NextRequest,
+  context: { params: Promise<{ id: string }> }
+) {
+  const requestId =
+    request.headers.get('x-request-id')?.trim() || crypto.randomUUID();
+  const baseMeta = {
+    requestId,
+    route: request.nextUrl.pathname,
+    method: request.method,
+  };
+
+  const blocked = guardBrowserSameOrigin(request);
+  if (blocked) return blocked;
+
+  const parsedParams = orderIdParamSchema.safeParse(await context.params);
+  if (!parsedParams.success) {
+    return noStoreJson(
+      { code: 'INVALID_ORDER_ID', message: 'Invalid order id.' },
+      400
+    );
+  }
+  const orderId = parsedParams.data.id;
+
+  const parsedIdempotency = parseIdempotencyKey(request);
+  if (!parsedIdempotency.ok) {
+    return noStoreJson(
+      {
+        code: parsedIdempotency.code,
+        message: 'Idempotency-Key header is required.',
+      },
+      400
+    );
+  }
+  const idempotencyKey = parsedIdempotency.idempotencyKey;
+
+  const statusToken = request.nextUrl.searchParams.get('statusToken');
+  const auth = await authorizeOrderMutationAccess({
+    orderId,
+    statusToken,
+    requiredScope: 'order_payment_init',
+  });
+  if (!auth.authorized) {
+    return noStoreJson({ code: auth.code }, auth.status);
+  }
+
+  if (!isMonobankGooglePayEnabled()) {
+    return noStoreJson(
+      {
+        code: 'MONOBANK_GPAY_DISABLED',
+        message: 'Monobank Google Pay is disabled.',
+      },
+      409
+    );
+  }
+
+  const order = await readOrderPaymentRow(orderId);
+  if (!order) {
+    return noStoreJson({ code: 'ORDER_NOT_FOUND' }, 404);
+  }
+
+  const guard = ensureMonobankPayableOrder({
+    order,
+    allowedMethods: ['monobank_google_pay'],
+  });
+  if (!guard.ok) {
+    logWarn('monobank_google_pay_submit_rejected', {
+      ...baseMeta,
+      orderId,
+      code: guard.code,
+    });
+    return noStoreJson(
+      { code: guard.code, message: guard.message },
+      guard.status
+    );
+  }
+
+  const maxBytes = getMonobankGooglePayMaxBodyBytes();
+  const contentLength = Number.parseInt(
+    request.headers.get('content-length') ?? '',
+    10
+  );
+  if (Number.isFinite(contentLength) && contentLength > maxBytes) {
+    return noStoreJson(
+      { code: 'PAYLOAD_TOO_LARGE', message: 'Request payload is too large.' },
+      413
+    );
+  }
+
+  let rawBodyBytes: Buffer;
+  try {
+    rawBodyBytes = Buffer.from(await request.arrayBuffer());
+  } catch {
+    return noStoreJson(
+      { code: 'INVALID_PAYLOAD', message: 'Invalid request body.' },
+      400
+    );
+  }
+
+  const parsedPayload = parseSubmitPayload(rawBodyBytes, maxBytes);
+  if (!parsedPayload.ok) {
+    const status = parsedPayload.status;
+    const code = parsedPayload.code;
+    return noStoreJson(
+      {
+        code,
+        message:
+          code === 'PAYLOAD_TOO_LARGE'
+            ? 'Request payload is too large.'
+            : 'Invalid payload.',
+      },
+      status
+    );
+  }
+
+  const cardToken = sanitizeTokenForMonobank(parsedPayload.payload.gToken);
+  const webHookUrl = toAbsoluteUrl('/api/shop/webhooks/monobank');
+  const pendingReturnUrl = buildPendingReturnUrl(orderId, statusToken);
+
+  try {
+    const result = await submitMonobankWalletPayment({
+      orderId,
+      idempotencyKey,
+      cardToken,
+      webHookUrl,
+      redirectUrl: pendingReturnUrl,
+    });
+
+    return noStoreJson(
+      {
+        success: true,
+        orderId,
+        status: 'pending',
+        submitOutcome: result.outcome,
+        reused: result.reused,
+        attemptId: result.attemptId,
+        attemptNumber: result.attemptNumber,
+        redirectUrl: result.redirectUrl,
+        returnUrl: pendingReturnUrl,
+      },
+      result.outcome === 'unknown' ? 202 : 200
+    );
+  } catch (error) {
+    if (error instanceof MonobankWalletConflictError) {
+      return noStoreJson(
+        {
+          code: 'MONOBANK_WALLET_CONFLICT',
+          message: error.message,
+        },
+        409
+      );
+    }
+
+    if (error instanceof IdempotencyConflictError) {
+      return noStoreJson(
+        {
+          code: error.code,
+          message: error.message,
+          ...(error.details ? { details: error.details } : {}),
+        },
+        409
+      );
+    }
+
+    if (error instanceof OrderNotFoundError) {
+      return noStoreJson({ code: error.code }, 404);
+    }
+
+    if (error instanceof OrderStateInvalidError) {
+      return noStoreJson(
+        {
+          code: error.code,
+          message: error.message,
+          ...(error.details ? { details: error.details } : {}),
+        },
+        409
+      );
+    }
+
+    if (error instanceof InvalidPayloadError) {
+      const status = error.code === 'PAYMENT_ATTEMPTS_EXHAUSTED' ? 409 : 400;
+      return noStoreJson(
+        {
+          code: error.code,
+          message: error.message,
+          ...(error.details ? { details: error.details } : {}),
+        },
+        status
+      );
+    }
+
+    if (error instanceof PspError) {
+      if (error.code === 'PSP_BAD_REQUEST') {
+        return noStoreJson(
+          {
+            code: error.code,
+            message: 'Wallet token was rejected by payment provider.',
+          },
+          400
+        );
+      }
+
+      logWarn('monobank_google_pay_submit_psp_error', {
+        ...baseMeta,
+        orderId,
+        code: error.code,
+      });
+      return noStoreJson(
+        {
+          code: 'PSP_UNAVAILABLE',
+          message: 'Payment provider is unavailable.',
+        },
+        503
+      );
+    }
+
+    logError('monobank_google_pay_submit_failed', error, {
+      ...baseMeta,
+      orderId,
+      code: 'INTERNAL_ERROR',
+    });
+    return noStoreJson(
+      {
+        code: 'INTERNAL_ERROR',
+        message: 'Unable to submit Google Pay payment.',
+      },
+      500
+    );
+  }
+}
diff --git a/frontend/app/api/shop/orders/[id]/payment/monobank/invoice/route.ts b/frontend/app/api/shop/orders/[id]/payment/monobank/invoice/route.ts
new file mode 100644
index 00000000..6d2f2eeb
--- /dev/null
+++ b/frontend/app/api/shop/orders/[id]/payment/monobank/invoice/route.ts
@@ -0,0 +1,156 @@
+import crypto from 'node:crypto';
+
+import { NextRequest } from 'next/server';
+
+import { logError, logWarn } from '@/lib/logging';
+import { guardBrowserSameOrigin } from '@/lib/security/origin';
+import {
+  InvalidPayloadError,
+  OrderNotFoundError,
+  OrderStateInvalidError,
+  PspInvoicePersistError,
+  PspUnavailableError,
+} from '@/lib/services/errors';
+import { createMonobankAttemptAndInvoice } from '@/lib/services/orders/monobank';
+import { authorizeOrderMutationAccess } from '@/lib/services/shop/order-access';
+import { createStatusToken } from '@/lib/shop/status-token';
+import { orderIdParamSchema } from '@/lib/validation/shop';
+
+import { ensureMonobankPayableOrder, noStoreJson, readOrderPaymentRow } from '../_shared';
+
+function resolveStatusToken(orderId: string, statusToken: string | null): string {
+  const normalized = statusToken?.trim() ?? '';
+  if (normalized) return normalized;
+  return createStatusToken({
+    orderId,
+    scopes: ['status_lite', 'order_payment_init'],
+  });
+}
+
+export async function POST(
+  request: NextRequest,
+  context: { params: Promise<{ id: string }> }
+) {
+  const requestId =
+    request.headers.get('x-request-id')?.trim() || crypto.randomUUID();
+  const baseMeta = {
+    requestId,
+    route: request.nextUrl.pathname,
+    method: request.method,
+  };
+
+  const blocked = guardBrowserSameOrigin(request);
+  if (blocked) return blocked;
+
+  const parsedParams = orderIdParamSchema.safeParse(await context.params);
+  if (!parsedParams.success) {
+    return noStoreJson(
+      { code: 'INVALID_ORDER_ID', message: 'Invalid order id.' },
+      400
+    );
+  }
+
+  const orderId = parsedParams.data.id;
+  const statusToken = request.nextUrl.searchParams.get('statusToken');
+  const auth = await authorizeOrderMutationAccess({
+    orderId,
+    statusToken,
+    requiredScope: 'order_payment_init',
+  });
+  if (!auth.authorized) {
+    return noStoreJson({ code: auth.code }, auth.status);
+  }
+
+  const order = await readOrderPaymentRow(orderId);
+  if (!order) {
+    return noStoreJson({ code: 'ORDER_NOT_FOUND' }, 404);
+  }
+
+  const guard = ensureMonobankPayableOrder({
+    order,
+    allowedMethods: ['monobank_invoice', 'monobank_google_pay'],
+  });
+  if (!guard.ok) {
+    logWarn('monobank_invoice_fallback_rejected', {
+      ...baseMeta,
+      orderId,
+      code: guard.code,
+    });
+    return noStoreJson({ code: guard.code, message: guard.message }, guard.status);
+  }
+
+  try {
+    const result = await createMonobankAttemptAndInvoice({
+      orderId,
+      statusToken: resolveStatusToken(orderId, statusToken),
+      requestId,
+    });
+
+    return noStoreJson({
+      success: true,
+      orderId,
+      status: 'pending',
+      attemptId: result.attemptId,
+      attemptNumber: result.attemptNumber,
+      invoiceId: result.invoiceId,
+      pageUrl: result.pageUrl,
+      currency: result.currency,
+      totalAmountMinor: result.totalAmountMinor,
+    });
+  } catch (error) {
+    if (error instanceof OrderNotFoundError) {
+      return noStoreJson({ code: error.code }, 404);
+    }
+
+    if (error instanceof OrderStateInvalidError) {
+      return noStoreJson(
+        {
+          code: error.code,
+          message: error.message,
+          ...(error.details ? { details: error.details } : {}),
+        },
+        409
+      );
+    }
+
+    if (error instanceof InvalidPayloadError) {
+      const status =
+        error.code === 'CHECKOUT_CONFLICT' ||
+        error.code === 'PAYMENT_ATTEMPTS_EXHAUSTED'
+          ? 409
+          : 400;
+
+      return noStoreJson(
+        {
+          code: error.code,
+          message: error.message,
+          ...(error.details ? { details: error.details } : {}),
+        },
+        status
+      );
+    }
+
+    if (
+      error instanceof PspUnavailableError ||
+      error instanceof PspInvoicePersistError
+    ) {
+      return noStoreJson(
+        {
+          code: error.code,
+          message: error.message,
+        },
+        503
+      );
+    }
+
+    logError('monobank_invoice_fallback_failed', error, {
+      ...baseMeta,
+      orderId,
+      code: 'INTERNAL_ERROR',
+    });
+    return noStoreJson(
+      { code: 'INTERNAL_ERROR', message: 'Unable to initialize invoice payment.' },
+      500
+    );
+  }
+}
diff --git a/frontend/app/api/shop/orders/[id]/status/route.ts b/frontend/app/api/shop/orders/[id]/status/route.ts
index ce8ca9e4..7bc49272 100644
--- a/frontend/app/api/shop/orders/[id]/status/route.ts
+++ b/frontend/app/api/shop/orders/[id]/status/route.ts
@@ -13,12 +13,12 @@ import {
   OrderNotFoundError,
   OrderStateInvalidError,
 } from '@/lib/services/errors';
-import { writeAdminAudit } from '@/lib/services/shop/events/write-admin-audit';
 import {
   getOrderAttemptSummary,
   getOrderStatusLiteSummary,
   getOrderSummary,
 } from '@/lib/services/orders/summary';
+import { writeAdminAudit } from '@/lib/services/shop/events/write-admin-audit';
 import {
   hasStatusTokenScope,
   verifyStatusToken,
diff --git a/frontend/app/api/shop/shipping/methods/route.ts b/frontend/app/api/shop/shipping/methods/route.ts
index 610cc8d8..23dfa333 100644
--- a/frontend/app/api/shop/shipping/methods/route.ts
+++ b/frontend/app/api/shop/shipping/methods/route.ts
@@ -10,13 +10,13 @@ import {
   getRateLimitSubject,
   rateLimitResponse,
 } from '@/lib/security/rate-limit';
-import { resolveCurrencyFromLocale } from '@/lib/shop/currency';
-import { resolveRequestLocale } from '@/lib/shop/request-locale';
 import { resolveShippingAvailability } from '@/lib/services/shop/shipping/availability';
 import {
   sanitizeShippingErrorForLog,
   sanitizeShippingLogMeta,
 } from '@/lib/services/shop/shipping/log-sanitizer';
+import { resolveCurrencyFromLocale } from '@/lib/shop/currency';
+import { resolveRequestLocale } from '@/lib/shop/request-locale';
 import { shippingMethodsQuerySchema } from '@/lib/validation/shop-shipping';
 
 export const runtime = 'nodejs';
diff --git a/frontend/app/api/shop/shipping/np/warehouses/route.ts b/frontend/app/api/shop/shipping/np/warehouses/route.ts
index 29a6efa0..38f74753 100644
--- a/frontend/app/api/shop/shipping/np/warehouses/route.ts
+++ b/frontend/app/api/shop/shipping/np/warehouses/route.ts
@@ -119,7 +119,7 @@ export async function GET(request: NextRequest) {
 
   try {
     const items = await findWarehousesWithCacheOnMiss({
-      settlementRef: parsed.data.cityRef,
+      cityRef: parsed.data.cityRef,
       q: parsed.data.q,
       limit: parsed.data.limit,
       runId: crypto.randomUUID(),
diff --git a/frontend/app/api/shop/webhooks/stripe/route.ts b/frontend/app/api/shop/webhooks/stripe/route.ts
index e3a63a6f..18315be5 100644
--- a/frontend/app/api/shop/webhooks/stripe/route.ts
+++ b/frontend/app/api/shop/webhooks/stripe/route.ts
@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 
-import { and, eq, isNull, lt, ne, or, sql } from 'drizzle-orm';
+import { and, eq, isNull, lt, or, sql } from 'drizzle-orm';
 import { NextRequest, NextResponse } from 'next/server';
 import Stripe from 'stripe';
 
@@ -8,7 +8,7 @@ import { db } from '@/db';
 import { orders, stripeEvents } from '@/db/schema';
 import { isCanonicalEventsDualWriteEnabled } from '@/lib/env/shop-canonical-events';
 import { logError, logInfo, logWarn } from '@/lib/logging';
-import { retrieveCharge, verifyWebhookSignature } from '@/lib/psp/stripe';
+import { verifyWebhookSignature } from '@/lib/psp/stripe';
 import { guardNonBrowserOnly } from '@/lib/security/origin';
 import {
   enforceRateLimit,
@@ -184,6 +184,12 @@ function warnRefundFullnessUndetermined(payload: {
   });
 }
 
+function isRefundChargeIdOnly(
+  refund: Stripe.Refund | null | undefined
+): boolean {
+  return typeof refund?.charge === 'string' && refund.charge.trim().length > 0;
+}
+
 function logWebhookEvent(payload: {
   requestId?: string;
   stripeEventId?: string;
@@ -289,6 +295,43 @@ function resolvePaymentMethod(
   return paymentMethodFromIntent ?? paymentMethodFromCharge ?? null;
 }
 
+type StripeWalletType = 'apple_pay' | 'google_pay' | null;
+type StripeWalletAttribution = {
+  provider: 'stripe';
+  type: Exclude<StripeWalletType, null>;
+  source: 'event';
+};
+
+function resolveStripeWalletType(
+  paymentIntent?: Stripe.PaymentIntent,
+  charge?: Stripe.Charge
+): StripeWalletType {
+  const chargeWithWallet = charge ?? getLatestCharge(paymentIntent as any);
+  const walletTypeRaw = (chargeWithWallet as any)?.payment_method_details?.card
+    ?.wallet?.type;
+
+  if (walletTypeRaw === 'apple_pay' || walletTypeRaw === 'google_pay') {
+    return walletTypeRaw;
+  }
+
+  return null;
+}
+
+function buildStripeWalletAttribution(args: {
+  paymentIntent?: Stripe.PaymentIntent;
+  charge?: Stripe.Charge;
+}): StripeWalletAttribution | null {
+  const type = resolveStripeWalletType(args.paymentIntent, args.charge);
+
+  if (!type) return null;
+
+  return {
+    provider: 'stripe',
+    type,
+    source: 'event',
+  };
+}
+
 function buildPspMetadata(params: {
   eventType: string;
   paymentIntent?: Stripe.PaymentIntent;
@@ -1140,6 +1183,10 @@ export async function POST(request: NextRequest) {
       const amountMatches = stripeAmount === orderAmountMinor;
       const currencyMatches =
         stripeCurrency?.toUpperCase() === order.currency.toUpperCase();
+      const walletAttribution = buildStripeWalletAttribution({
+        paymentIntent,
+        charge: getLatestCharge(paymentIntent as any),
+      });
 
       if (stripeAmount == null || !amountMatches || !currencyMatches) {
         const mismatchReason =
@@ -1157,6 +1204,7 @@ export async function POST(request: NextRequest) {
           paymentIntent,
           charge: chargeForIntent,
           extra: {
+            ...(walletAttribution ? { wallet: walletAttribution } : {}),
             mismatch: {
               reason: mismatchReason,
               eventId: event.id,
@@ -1221,6 +1269,7 @@ export async function POST(request: NextRequest) {
         eventType,
         paymentIntent,
         charge: chargeForIntent ?? undefined,
+        extra: walletAttribution ? { wallet: walletAttribution } : {},
       });
       const nextMeta = mergePspMetadata({
         prevMeta: order.pspMetadata,
@@ -1256,6 +1305,7 @@ export async function POST(request: NextRequest) {
           paymentIntentId,
           chargeId: latestChargeId ?? chargeForIntent?.id ?? null,
           paymentIntentStatus: paymentIntent?.status ?? null,
+          ...(walletAttribution ? { wallet: walletAttribution } : {}),
         },
       };
       const applyResult =
@@ -1668,12 +1718,45 @@ export async function POST(request: NextRequest) {
 
         isFullRefund = cumulativeRefunded === amt;
       } else if (eventType === 'charge.refund.updated' && refund) {
+        if (isRefundChargeIdOnly(refund)) {
+          warnRefundFullnessUndetermined({
+            ...warnBase,
+            eventId: event.id,
+            eventType,
+            chargeId: refundChargeId ?? null,
+            chargeAmount: null,
+            cumulativeRefunded: null,
+            hasRefundObject: true,
+            refundsListLength: null,
+            hasAmountRefundedField: false,
+            reason: 'id_only_refund_charge_not_expanded',
+            orderId: order.id,
+            paymentIntentId,
+            refundId: refund.id,
+            refundAmount:
+              typeof (refund as any)?.amount === 'number'
+                ? (refund as any).amount
+                : null,
+          });
+
+          logWebhookEvent({
+            requestId,
+            stripeEventId,
+            orderId: order.id,
+            paymentIntentId,
+            paymentStatus,
+            eventType,
+            refundId: refund.id,
+            chargeId: refundChargeId ?? null,
+          });
+
+          return ack();
+        }
+
         let effectiveCharge: Stripe.Charge | undefined;
 
         if (typeof refund.charge === 'object' && refund.charge) {
           effectiveCharge = refund.charge as Stripe.Charge;
-        } else if (typeof refund.charge === 'string' && refund.charge.trim()) {
-          effectiveCharge = await retrieveCharge(refund.charge.trim());
         }
 
         const amt =
@@ -1700,7 +1783,6 @@ export async function POST(request: NextRequest) {
             warnRefundFullnessUndetermined({
               ...warnBase,
               eventId: event.id,
-
               eventType,
               chargeId:
                 ((effectiveCharge as any)?.id as string | undefined) ??
diff --git a/frontend/components/shop/header/CartButton.tsx b/frontend/components/shop/header/CartButton.tsx
index a692f24f..9a764197 100644
--- a/frontend/components/shop/header/CartButton.tsx
+++ b/frontend/components/shop/header/CartButton.tsx
@@ -3,8 +3,8 @@
 import { ShoppingBag } from 'lucide-react';
 import { useTranslations } from 'next-intl';
 
-import { Link } from '@/i18n/routing';
 import { useMounted } from '@/hooks/use-mounted';
+import { Link } from '@/i18n/routing';
 
 import { useCart } from '../CartProvider';
 
diff --git a/frontend/db/queries/shop/admin-orders.ts b/frontend/db/queries/shop/admin-orders.ts
index 189b2f40..831253de 100644
--- a/frontend/db/queries/shop/admin-orders.ts
+++ b/frontend/db/queries/shop/admin-orders.ts
@@ -5,8 +5,8 @@ import { count, desc, eq, sql } from 'drizzle-orm';
 import { db } from '@/db';
 import {
   orderItems,
-  orderShipping,
   orders,
+  orderShipping,
   shippingShipments,
 } from '@/db/schema';
 import type { CurrencyCode } from '@/lib/shop/currency';
diff --git a/frontend/db/schema/shop.ts b/frontend/db/schema/shop.ts
index 090f904c..704484ec 100644
--- a/frontend/db/schema/shop.ts
+++ b/frontend/db/schema/shop.ts
@@ -1138,10 +1138,10 @@ export const npWarehouses = pgTable(
   'np_warehouses',
   {
     ref: text('ref').primaryKey(),
-    cityRef: text('city_ref'),
-    settlementRef: text('settlement_ref').references(() => npCities.ref, {
+    cityRef: text('city_ref').references(() => npCities.ref, {
       onDelete: 'set null',
     }),
+    settlementRef: text('settlement_ref'),
     number: text('number'),
     type: text('type'),
     name: text('name').notNull(),
diff --git a/frontend/drizzle.config.ts b/frontend/drizzle.config.ts
index 37ffd6b1..ca63fff9 100644
--- a/frontend/drizzle.config.ts
+++ b/frontend/drizzle.config.ts
@@ -2,7 +2,7 @@ import * as dotenv from 'dotenv';
 
 dotenv.config();
 
-export default {
+const config = {
   out: './drizzle',
   schema: './db/schema/index.ts',
   dialect: 'postgresql',
@@ -10,3 +10,5 @@ export default {
     url: process.env.DATABASE_URL!,
   },
 };
+
+export default config;
diff --git a/frontend/drizzle/0029_shop_np_warehouses_city_ref_fk.sql b/frontend/drizzle/0029_shop_np_warehouses_city_ref_fk.sql
new file mode 100644
index 00000000..11ba8f3a
--- /dev/null
+++ b/frontend/drizzle/0029_shop_np_warehouses_city_ref_fk.sql
@@ -0,0 +1,16 @@
+ALTER TABLE np_warehouses
+  DROP CONSTRAINT IF EXISTS np_warehouses_settlement_ref_np_cities_ref_fk;
+
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1 FROM pg_constraint
+    WHERE conname = 'np_warehouses_city_ref_np_cities_ref_fk'
+  ) THEN
+    ALTER TABLE np_warehouses
+      ADD CONSTRAINT np_warehouses_city_ref_np_cities_ref_fk
+      FOREIGN KEY (city_ref) REFERENCES np_cities(ref)
+      ON DELETE SET NULL;
+  END IF;
+END
+$$;
\ No newline at end of file
diff --git a/frontend/drizzle/0030_shop_np_warehouses_city_ref_fk_backfill.sql b/frontend/drizzle/0030_shop_np_warehouses_city_ref_fk_backfill.sql
new file mode 100644
index 00000000..e30c24ff
--- /dev/null
+++ b/frontend/drizzle/0030_shop_np_warehouses_city_ref_fk_backfill.sql
@@ -0,0 +1,23 @@
+UPDATE np_warehouses w
+SET city_ref = NULL
+WHERE city_ref IS NOT NULL
+  AND NOT EXISTS (
+    SELECT 1
+    FROM np_cities c
+    WHERE c.ref = w.city_ref
+  );
+
+DO $$
+BEGIN
+  IF NOT EXISTS (
+    SELECT 1
+    FROM pg_constraint
+    WHERE conname = 'np_warehouses_city_ref_np_cities_ref_fk'
+  ) THEN
+    ALTER TABLE np_warehouses
+      ADD CONSTRAINT np_warehouses_city_ref_np_cities_ref_fk
+      FOREIGN KEY (city_ref) REFERENCES np_cities(ref)
+      ON DELETE SET NULL;
+  END IF;
+END
+$$;
\ No newline at end of file
diff --git a/frontend/drizzle/meta/0029_snapshot.json b/frontend/drizzle/meta/0029_snapshot.json
new file mode 100644
index 00000000..7a645e58
--- /dev/null
+++ b/frontend/drizzle/meta/0029_snapshot.json
@@ -0,0 +1,6769 @@
+{
+  "id": "0ebecdab-8ea9-43d3-aa67-780d94c12060",
+  "prevId": "ac4e69dc-fffe-44ff-8817-92b4ee841e43",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.blog_author_translations": {
+      "name": "blog_author_translations",
+      "schema": "",
+      "columns": {
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "bio": {
+          "name": "bio",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_title": {
+          "name": "job_title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "company": {
+          "name": "company",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "city": {
+          "name": "city",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "blog_author_translations_author_id_blog_authors_id_fk": {
+          "name": "blog_author_translations_author_id_blog_authors_id_fk",
+          "tableFrom": "blog_author_translations",
+          "tableTo": "blog_authors",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "blog_author_translations_author_id_locale_pk": {
+          "name": "blog_author_translations_author_id_locale_pk",
+          "columns": [
+            "author_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_authors": {
+      "name": "blog_authors",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(100)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image_public_id": {
+          "name": "image_public_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "social_media": {
+          "name": "social_media",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "blog_authors_slug_unique": {
+          "name": "blog_authors_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_categories": {
+      "name": "blog_categories",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "blog_categories_slug_unique": {
+          "name": "blog_categories_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_category_translations": {
+      "name": "blog_category_translations",
+      "schema": "",
+      "columns": {
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "blog_category_translations_category_id_blog_categories_id_fk": {
+          "name": "blog_category_translations_category_id_blog_categories_id_fk",
+          "tableFrom": "blog_category_translations",
+          "tableTo": "blog_categories",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "blog_category_translations_category_id_locale_pk": {
+          "name": "blog_category_translations_category_id_locale_pk",
+          "columns": [
+            "category_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_post_categories": {
+      "name": "blog_post_categories",
+      "schema": "",
+      "columns": {
+        "post_id": {
+          "name": "post_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "blog_post_categories_category_id_idx": {
+          "name": "blog_post_categories_category_id_idx",
+          "columns": [
+            {
+              "expression": "category_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "blog_post_categories_post_id_blog_posts_id_fk": {
+          "name": "blog_post_categories_post_id_blog_posts_id_fk",
+          "tableFrom": "blog_post_categories",
+          "tableTo": "blog_posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "blog_post_categories_category_id_blog_categories_id_fk": {
+          "name": "blog_post_categories_category_id_blog_categories_id_fk",
+          "tableFrom": "blog_post_categories",
+          "tableTo": "blog_categories",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "blog_post_categories_post_id_category_id_pk": {
+          "name": "blog_post_categories_post_id_category_id_pk",
+          "columns": [
+            "post_id",
+            "category_id"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_post_translations": {
+      "name": "blog_post_translations",
+      "schema": "",
+      "columns": {
+        "post_id": {
+          "name": "post_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "body": {
+          "name": "body",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "blog_post_translations_post_id_blog_posts_id_fk": {
+          "name": "blog_post_translations_post_id_blog_posts_id_fk",
+          "tableFrom": "blog_post_translations",
+          "tableTo": "blog_posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "blog_post_translations_post_id_locale_pk": {
+          "name": "blog_post_translations_post_id_locale_pk",
+          "columns": [
+            "post_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_posts": {
+      "name": "blog_posts",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(200)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_image_url": {
+          "name": "main_image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_image_public_id": {
+          "name": "main_image_public_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tags": {
+          "name": "tags",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "resource_link": {
+          "name": "resource_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "published_at": {
+          "name": "published_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scheduled_publish_at": {
+          "name": "scheduled_publish_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_published": {
+          "name": "is_published",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "blog_posts_author_id_idx": {
+          "name": "blog_posts_author_id_idx",
+          "columns": [
+            {
+              "expression": "author_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "blog_posts_author_id_blog_authors_id_fk": {
+          "name": "blog_posts_author_id_blog_authors_id_fk",
+          "tableFrom": "blog_posts",
+          "tableTo": "blog_authors",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "blog_posts_slug_unique": {
+          "name": "blog_posts_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.categories": {
+      "name": "categories",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "categories_slug_unique": {
+          "name": "categories_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.category_translations": {
+      "name": "category_translations",
+      "schema": "",
+      "columns": {
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "category_translations_category_id_categories_id_fk": {
+          "name": "category_translations_category_id_categories_id_fk",
+          "tableFrom": "category_translations",
+          "tableTo": "categories",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "category_translations_category_id_locale_pk": {
+          "name": "category_translations_category_id_locale_pk",
+          "columns": [
+            "category_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.email_verification_tokens": {
+      "name": "email_verification_tokens",
+      "schema": "",
+      "columns": {
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "email_verification_tokens_user_id_idx": {
+          "name": "email_verification_tokens_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.notifications": {
+      "name": "notifications",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message": {
+          "name": "message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_read": {
+          "name": "is_read",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "notifications_user_id_users_id_fk": {
+          "name": "notifications_user_id_users_id_fk",
+          "tableFrom": "notifications",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.password_reset_tokens": {
+      "name": "password_reset_tokens",
+      "schema": "",
+      "columns": {
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "password_reset_tokens_user_id_idx": {
+          "name": "password_reset_tokens_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.point_transactions": {
+      "name": "point_transactions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "points": {
+          "name": "points",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "source": {
+          "name": "source",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'quiz'"
+        },
+        "source_id": {
+          "name": "source_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "point_transactions_user_id_idx": {
+          "name": "point_transactions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "point_transactions_user_id_users_id_fk": {
+          "name": "point_transactions_user_id_users_id_fk",
+          "tableFrom": "point_transactions",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.question_translations": {
+      "name": "question_translations",
+      "schema": "",
+      "columns": {
+        "question_id": {
+          "name": "question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "question": {
+          "name": "question",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "answer_blocks": {
+          "name": "answer_blocks",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "question_translations_question_id_questions_id_fk": {
+          "name": "question_translations_question_id_questions_id_fk",
+          "tableFrom": "question_translations",
+          "tableTo": "questions",
+          "columnsFrom": [
+            "question_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "question_translations_question_id_locale_pk": {
+          "name": "question_translations_question_id_locale_pk",
+          "columns": [
+            "question_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.questions": {
+      "name": "questions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "difficulty": {
+          "name": "difficulty",
+          "type": "varchar(20)",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'medium'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "questions_category_sort_order_idx": {
+          "name": "questions_category_sort_order_idx",
+          "columns": [
+            {
+              "expression": "category_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "questions_category_id_categories_id_fk": {
+          "name": "questions_category_id_categories_id_fk",
+          "tableFrom": "questions",
+          "tableTo": "categories",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "restrict",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_answer_translations": {
+      "name": "quiz_answer_translations",
+      "schema": "",
+      "columns": {
+        "quiz_answer_id": {
+          "name": "quiz_answer_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "answer_text": {
+          "name": "answer_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk": {
+          "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
+          "tableFrom": "quiz_answer_translations",
+          "tableTo": "quiz_answers",
+          "columnsFrom": [
+            "quiz_answer_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "quiz_answer_translations_quiz_answer_id_locale_pk": {
+          "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
+          "columns": [
+            "quiz_answer_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_answers": {
+      "name": "quiz_answers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "quiz_question_id": {
+          "name": "quiz_question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_correct": {
+          "name": "is_correct",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {
+        "quiz_answers_question_display_order_idx": {
+          "name": "quiz_answers_question_display_order_idx",
+          "columns": [
+            {
+              "expression": "quiz_question_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "quiz_answers_quiz_question_id_quiz_questions_id_fk": {
+          "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
+          "tableFrom": "quiz_answers",
+          "tableTo": "quiz_questions",
+          "columnsFrom": [
+            "quiz_question_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_attempt_answers": {
+      "name": "quiz_attempt_answers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "quiz_question_id": {
+          "name": "quiz_question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "selected_answer_id": {
+          "name": "selected_answer_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_correct": {
+          "name": "is_correct",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "answered_at": {
+          "name": "answered_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "quiz_attempt_answers_attempt_idx": {
+          "name": "quiz_attempt_answers_attempt_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk": {
+          "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
+          "tableFrom": "quiz_attempt_answers",
+          "tableTo": "quiz_attempts",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk": {
+          "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
+          "tableFrom": "quiz_attempt_answers",
+          "tableTo": "quiz_questions",
+          "columnsFrom": [
+            "quiz_question_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk": {
+          "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
+          "tableFrom": "quiz_attempt_answers",
+          "tableTo": "quiz_answers",
+          "columnsFrom": [
+            "selected_answer_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_attempts": {
+      "name": "quiz_attempts",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "quiz_id": {
+          "name": "quiz_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "score": {
+          "name": "score",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_questions": {
+          "name": "total_questions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "percentage": {
+          "name": "percentage",
+          "type": "numeric(5, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "time_spent_seconds": {
+          "name": "time_spent_seconds",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "integrity_score": {
+          "name": "integrity_score",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 100
+        },
+        "points_earned": {
+          "name": "points_earned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'::jsonb"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "quiz_attempts_user_id_idx": {
+          "name": "quiz_attempts_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "quiz_attempts_quiz_id_idx": {
+          "name": "quiz_attempts_quiz_id_idx",
+          "columns": [
+            {
+              "expression": "quiz_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "quiz_attempts_user_completed_at_idx": {
+          "name": "quiz_attempts_user_completed_at_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "completed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "quiz_attempts_quiz_percentage_completed_at_idx": {
+          "name": "quiz_attempts_quiz_percentage_completed_at_idx",
+          "columns": [
+            {
+              "expression": "quiz_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "percentage",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "completed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "quiz_attempts_quiz_integrity_score_idx": {
+          "name": "quiz_attempts_quiz_integrity_score_idx",
+          "columns": [
+            {
+              "expression": "quiz_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "integrity_score",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "quiz_attempts_user_id_users_id_fk": {
+          "name": "quiz_attempts_user_id_users_id_fk",
+          "tableFrom": "quiz_attempts",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "quiz_attempts_quiz_id_quizzes_id_fk": {
+          "name": "quiz_attempts_quiz_id_quizzes_id_fk",
+          "tableFrom": "quiz_attempts",
+          "tableTo": "quizzes",
+          "columnsFrom": [
+            "quiz_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_question_content": {
+      "name": "quiz_question_content",
+      "schema": "",
+      "columns": {
+        "quiz_question_id": {
+          "name": "quiz_question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "question_text": {
+          "name": "question_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "explanation": {
+          "name": "explanation",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "quiz_question_content_quiz_question_id_quiz_questions_id_fk": {
+          "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
+          "tableFrom": "quiz_question_content",
+          "tableTo": "quiz_questions",
+          "columnsFrom": [
+            "quiz_question_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "quiz_question_content_quiz_question_id_locale_pk": {
+          "name": "quiz_question_content_quiz_question_id_locale_pk",
+          "columns": [
+            "quiz_question_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_questions": {
+      "name": "quiz_questions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "quiz_id": {
+          "name": "quiz_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_question_id": {
+          "name": "source_question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "difficulty": {
+          "name": "difficulty",
+          "type": "varchar(20)",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'medium'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "quiz_questions_quiz_display_order_idx": {
+          "name": "quiz_questions_quiz_display_order_idx",
+          "columns": [
+            {
+              "expression": "quiz_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "quiz_questions_quiz_id_quizzes_id_fk": {
+          "name": "quiz_questions_quiz_id_quizzes_id_fk",
+          "tableFrom": "quiz_questions",
+          "tableTo": "quizzes",
+          "columnsFrom": [
+            "quiz_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_translations": {
+      "name": "quiz_translations",
+      "schema": "",
+      "columns": {
+        "quiz_id": {
+          "name": "quiz_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(200)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "quiz_translations_quiz_id_quizzes_id_fk": {
+          "name": "quiz_translations_quiz_id_quizzes_id_fk",
+          "tableFrom": "quiz_translations",
+          "tableTo": "quizzes",
+          "columnsFrom": [
+            "quiz_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "quiz_translations_quiz_id_locale_pk": {
+          "name": "quiz_translations_quiz_id_locale_pk",
+          "columns": [
+            "quiz_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quizzes": {
+      "name": "quizzes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(100)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "questions_count": {
+          "name": "questions_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 10
+        },
+        "time_limit_seconds": {
+          "name": "time_limit_seconds",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "status": {
+          "name": "status",
+          "type": "varchar(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ready'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "quizzes_slug_idx": {
+          "name": "quizzes_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "quizzes_category_id_categories_id_fk": {
+          "name": "quizzes_category_id_categories_id_fk",
+          "tableFrom": "quizzes",
+          "tableTo": "categories",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "restrict",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "quizzes_category_id_slug_unique": {
+          "name": "quizzes_category_id_slug_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "category_id",
+            "slug"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.active_sessions": {
+      "name": "active_sessions",
+      "schema": "",
+      "columns": {
+        "session_id": {
+          "name": "session_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "last_activity": {
+          "name": "last_activity",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "active_sessions_last_activity_idx": {
+          "name": "active_sessions_last_activity_idx",
+          "columns": [
+            {
+              "expression": "last_activity",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.admin_audit_log": {
+      "name": "admin_audit_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_user_id": {
+          "name": "actor_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_type": {
+          "name": "target_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_id": {
+          "name": "target_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "dedupe_key": {
+          "name": "dedupe_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "occurred_at": {
+          "name": "occurred_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "admin_audit_log_dedupe_key_uq": {
+          "name": "admin_audit_log_dedupe_key_uq",
+          "columns": [
+            {
+              "expression": "dedupe_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "admin_audit_log_order_id_idx": {
+          "name": "admin_audit_log_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "admin_audit_log_actor_user_id_idx": {
+          "name": "admin_audit_log_actor_user_id_idx",
+          "columns": [
+            {
+              "expression": "actor_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "admin_audit_log_occurred_at_idx": {
+          "name": "admin_audit_log_occurred_at_idx",
+          "columns": [
+            {
+              "expression": "occurred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "admin_audit_log_order_id_orders_id_fk": {
+          "name": "admin_audit_log_order_id_orders_id_fk",
+          "tableFrom": "admin_audit_log",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "admin_audit_log_actor_user_id_users_id_fk": {
+          "name": "admin_audit_log_actor_user_id_users_id_fk",
+          "tableFrom": "admin_audit_log",
+          "tableTo": "users",
+          "columnsFrom": [
+            "actor_user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.api_rate_limits": {
+      "name": "api_rate_limits",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "window_started_at": {
+          "name": "window_started_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "count": {
+          "name": "count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "api_rate_limits_updated_at_idx": {
+          "name": "api_rate_limits_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "api_rate_limits_count_non_negative": {
+          "name": "api_rate_limits_count_non_negative",
+          "value": "\"api_rate_limits\".\"count\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.internal_job_state": {
+      "name": "internal_job_state",
+      "schema": "",
+      "columns": {
+        "job_name": {
+          "name": "job_name",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "next_allowed_at": {
+          "name": "next_allowed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_run_id": {
+          "name": "last_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.inventory_moves": {
+      "name": "inventory_moves",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "move_key": {
+          "name": "move_key",
+          "type": "varchar(200)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "product_id": {
+          "name": "product_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "inventory_move_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "inventory_moves_move_key_uq": {
+          "name": "inventory_moves_move_key_uq",
+          "columns": [
+            {
+              "expression": "move_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inventory_moves_order_id_idx": {
+          "name": "inventory_moves_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "inventory_moves_product_id_idx": {
+          "name": "inventory_moves_product_id_idx",
+          "columns": [
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "inventory_moves_order_id_orders_id_fk": {
+          "name": "inventory_moves_order_id_orders_id_fk",
+          "tableFrom": "inventory_moves",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "inventory_moves_product_id_products_id_fk": {
+          "name": "inventory_moves_product_id_products_id_fk",
+          "tableFrom": "inventory_moves",
+          "tableTo": "products",
+          "columnsFrom": [
+            "product_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "inventory_moves_quantity_gt_0": {
+          "name": "inventory_moves_quantity_gt_0",
+          "value": "\"inventory_moves\".\"quantity\" > 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.monobank_events": {
+      "name": "monobank_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'monobank'"
+        },
+        "event_key": {
+          "name": "event_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "invoice_id": {
+          "name": "invoice_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "amount": {
+          "name": "amount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ccy": {
+          "name": "ccy",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "reference": {
+          "name": "reference",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "raw_payload": {
+          "name": "raw_payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "normalized_payload": {
+          "name": "normalized_payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_modified_at": {
+          "name": "provider_modified_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claim_expires_at": {
+          "name": "claim_expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_by": {
+          "name": "claimed_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "applied_at": {
+          "name": "applied_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "applied_result": {
+          "name": "applied_result",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "applied_error_code": {
+          "name": "applied_error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "applied_error_message": {
+          "name": "applied_error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "raw_sha256": {
+          "name": "raw_sha256",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "received_at": {
+          "name": "received_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "monobank_events_event_key_unique": {
+          "name": "monobank_events_event_key_unique",
+          "columns": [
+            {
+              "expression": "event_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "monobank_events_raw_sha256_unique": {
+          "name": "monobank_events_raw_sha256_unique",
+          "columns": [
+            {
+              "expression": "raw_sha256",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "monobank_events_order_id_idx": {
+          "name": "monobank_events_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "monobank_events_attempt_id_idx": {
+          "name": "monobank_events_attempt_id_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "monobank_events_claim_expires_idx": {
+          "name": "monobank_events_claim_expires_idx",
+          "columns": [
+            {
+              "expression": "claim_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "monobank_events_attempt_id_payment_attempts_id_fk": {
+          "name": "monobank_events_attempt_id_payment_attempts_id_fk",
+          "tableFrom": "monobank_events",
+          "tableTo": "payment_attempts",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "monobank_events_order_id_orders_id_fk": {
+          "name": "monobank_events_order_id_orders_id_fk",
+          "tableFrom": "monobank_events",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "monobank_events_provider_check": {
+          "name": "monobank_events_provider_check",
+          "value": "\"monobank_events\".\"provider\" in ('monobank')"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.monobank_payment_cancels": {
+      "name": "monobank_payment_cancels",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ext_ref": {
+          "name": "ext_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "invoice_id": {
+          "name": "invoice_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'requested'"
+        },
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "error_code": {
+          "name": "error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_response": {
+          "name": "psp_response",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "monobank_payment_cancels_ext_ref_unique": {
+          "name": "monobank_payment_cancels_ext_ref_unique",
+          "columns": [
+            {
+              "expression": "ext_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "monobank_payment_cancels_order_id_idx": {
+          "name": "monobank_payment_cancels_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "monobank_payment_cancels_attempt_id_idx": {
+          "name": "monobank_payment_cancels_attempt_id_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "monobank_payment_cancels_order_id_orders_id_fk": {
+          "name": "monobank_payment_cancels_order_id_orders_id_fk",
+          "tableFrom": "monobank_payment_cancels",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "monobank_payment_cancels_attempt_id_payment_attempts_id_fk": {
+          "name": "monobank_payment_cancels_attempt_id_payment_attempts_id_fk",
+          "tableFrom": "monobank_payment_cancels",
+          "tableTo": "payment_attempts",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "monobank_payment_cancels_status_check": {
+          "name": "monobank_payment_cancels_status_check",
+          "value": "\"monobank_payment_cancels\".\"status\" in ('requested','processing','success','failure')"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.monobank_refunds": {
+      "name": "monobank_refunds",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'monobank'"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ext_ref": {
+          "name": "ext_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'requested'"
+        },
+        "amount_minor": {
+          "name": "amount_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'UAH'"
+        },
+        "provider_created_at": {
+          "name": "provider_created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_modified_at": {
+          "name": "provider_modified_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "monobank_refunds_ext_ref_unique": {
+          "name": "monobank_refunds_ext_ref_unique",
+          "columns": [
+            {
+              "expression": "ext_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "monobank_refunds_order_id_idx": {
+          "name": "monobank_refunds_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "monobank_refunds_attempt_id_idx": {
+          "name": "monobank_refunds_attempt_id_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "monobank_refunds_order_id_orders_id_fk": {
+          "name": "monobank_refunds_order_id_orders_id_fk",
+          "tableFrom": "monobank_refunds",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "monobank_refunds_attempt_id_payment_attempts_id_fk": {
+          "name": "monobank_refunds_attempt_id_payment_attempts_id_fk",
+          "tableFrom": "monobank_refunds",
+          "tableTo": "payment_attempts",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "monobank_refunds_provider_check": {
+          "name": "monobank_refunds_provider_check",
+          "value": "\"monobank_refunds\".\"provider\" in ('monobank')"
+        },
+        "monobank_refunds_status_check": {
+          "name": "monobank_refunds_status_check",
+          "value": "\"monobank_refunds\".\"status\" in ('requested','processing','success','failure','needs_review')"
+        },
+        "monobank_refunds_amount_minor_non_negative": {
+          "name": "monobank_refunds_amount_minor_non_negative",
+          "value": "\"monobank_refunds\".\"amount_minor\" >= 0"
+        },
+        "monobank_refunds_currency_uah": {
+          "name": "monobank_refunds_currency_uah",
+          "value": "\"monobank_refunds\".\"currency\" = 'UAH'"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.notification_outbox": {
+      "name": "notification_outbox",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "channel": {
+          "name": "channel",
+          "type": "notification_channel",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'email'"
+        },
+        "template_key": {
+          "name": "template_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_domain": {
+          "name": "source_domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_event_id": {
+          "name": "source_event_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "attempt_count": {
+          "name": "attempt_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "max_attempts": {
+          "name": "max_attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 5
+        },
+        "next_attempt_at": {
+          "name": "next_attempt_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "lease_owner": {
+          "name": "lease_owner",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lease_expires_at": {
+          "name": "lease_expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_code": {
+          "name": "last_error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_message": {
+          "name": "last_error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sent_at": {
+          "name": "sent_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "dead_lettered_at": {
+          "name": "dead_lettered_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "dedupe_key": {
+          "name": "dedupe_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "notification_outbox_dedupe_key_uq": {
+          "name": "notification_outbox_dedupe_key_uq",
+          "columns": [
+            {
+              "expression": "dedupe_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "notification_outbox_status_next_attempt_idx": {
+          "name": "notification_outbox_status_next_attempt_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "next_attempt_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "notification_outbox_status_lease_expires_idx": {
+          "name": "notification_outbox_status_lease_expires_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "lease_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "notification_outbox_order_created_idx": {
+          "name": "notification_outbox_order_created_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "notification_outbox_template_status_idx": {
+          "name": "notification_outbox_template_status_idx",
+          "columns": [
+            {
+              "expression": "template_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "notification_outbox_order_id_orders_id_fk": {
+          "name": "notification_outbox_order_id_orders_id_fk",
+          "tableFrom": "notification_outbox",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "notification_outbox_source_domain_chk": {
+          "name": "notification_outbox_source_domain_chk",
+          "value": "\"notification_outbox\".\"source_domain\" in ('shipping_event','payment_event')"
+        },
+        "notification_outbox_status_chk": {
+          "name": "notification_outbox_status_chk",
+          "value": "\"notification_outbox\".\"status\" in ('pending','processing','sent','failed','dead_letter')"
+        },
+        "notification_outbox_attempt_count_non_negative_chk": {
+          "name": "notification_outbox_attempt_count_non_negative_chk",
+          "value": "\"notification_outbox\".\"attempt_count\" >= 0"
+        },
+        "notification_outbox_max_attempts_positive_chk": {
+          "name": "notification_outbox_max_attempts_positive_chk",
+          "value": "\"notification_outbox\".\"max_attempts\" >= 1"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.np_cities": {
+      "name": "np_cities",
+      "schema": "",
+      "columns": {
+        "ref": {
+          "name": "ref",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name_ua": {
+          "name": "name_ua",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name_ru": {
+          "name": "name_ru",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "area": {
+          "name": "area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "region": {
+          "name": "region",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "settlement_type": {
+          "name": "settlement_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "last_sync_run_id": {
+          "name": "last_sync_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "np_cities_active_name_idx": {
+          "name": "np_cities_active_name_idx",
+          "columns": [
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name_ua",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "np_cities_last_sync_run_idx": {
+          "name": "np_cities_last_sync_run_idx",
+          "columns": [
+            {
+              "expression": "last_sync_run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "np_cities_active_name_prefix_idx": {
+          "name": "np_cities_active_name_prefix_idx",
+          "columns": [
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name_ua",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.np_warehouses": {
+      "name": "np_warehouses",
+      "schema": "",
+      "columns": {
+        "ref": {
+          "name": "ref",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "city_ref": {
+          "name": "city_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "settlement_ref": {
+          "name": "settlement_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number": {
+          "name": "number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name_ru": {
+          "name": "name_ru",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "address": {
+          "name": "address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "address_ru": {
+          "name": "address_ru",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_post_machine": {
+          "name": "is_post_machine",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "last_sync_run_id": {
+          "name": "last_sync_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "np_warehouses_settlement_active_idx": {
+          "name": "np_warehouses_settlement_active_idx",
+          "columns": [
+            {
+              "expression": "settlement_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "np_warehouses_city_active_idx": {
+          "name": "np_warehouses_city_active_idx",
+          "columns": [
+            {
+              "expression": "city_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "np_warehouses_active_name_idx": {
+          "name": "np_warehouses_active_name_idx",
+          "columns": [
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "np_warehouses_last_sync_run_idx": {
+          "name": "np_warehouses_last_sync_run_idx",
+          "columns": [
+            {
+              "expression": "last_sync_run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "np_warehouses_city_ref_np_cities_ref_fk": {
+          "name": "np_warehouses_city_ref_np_cities_ref_fk",
+          "tableFrom": "np_warehouses",
+          "tableTo": "np_cities",
+          "columnsFrom": [
+            "city_ref"
+          ],
+          "columnsTo": [
+            "ref"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.order_items": {
+      "name": "order_items",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "product_id": {
+          "name": "product_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "selected_size": {
+          "name": "selected_size",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "selected_color": {
+          "name": "selected_color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unit_price_minor": {
+          "name": "unit_price_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "line_total_minor": {
+          "name": "line_total_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unit_price": {
+          "name": "unit_price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "line_total": {
+          "name": "line_total",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "product_title": {
+          "name": "product_title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "product_slug": {
+          "name": "product_slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "product_sku": {
+          "name": "product_sku",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "order_items_order_id_idx": {
+          "name": "order_items_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "order_items_order_variant_uq": {
+          "name": "order_items_order_variant_uq",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "selected_size",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "selected_color",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "order_items_order_id_orders_id_fk": {
+          "name": "order_items_order_id_orders_id_fk",
+          "tableFrom": "order_items",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "order_items_product_id_products_id_fk": {
+          "name": "order_items_product_id_products_id_fk",
+          "tableFrom": "order_items",
+          "tableTo": "products",
+          "columnsFrom": [
+            "product_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "order_items_quantity_positive": {
+          "name": "order_items_quantity_positive",
+          "value": "\"order_items\".\"quantity\" > 0"
+        },
+        "order_items_unit_price_minor_non_negative": {
+          "name": "order_items_unit_price_minor_non_negative",
+          "value": "\"order_items\".\"unit_price_minor\" >= 0"
+        },
+        "order_items_line_total_minor_non_negative": {
+          "name": "order_items_line_total_minor_non_negative",
+          "value": "\"order_items\".\"line_total_minor\" >= 0"
+        },
+        "order_items_line_total_consistent": {
+          "name": "order_items_line_total_consistent",
+          "value": "\"order_items\".\"line_total_minor\" = \"order_items\".\"unit_price_minor\" * \"order_items\".\"quantity\""
+        },
+        "order_items_unit_price_mirror_consistent": {
+          "name": "order_items_unit_price_mirror_consistent",
+          "value": "\"order_items\".\"unit_price\" = (\"order_items\".\"unit_price_minor\"::numeric / 100)"
+        },
+        "order_items_line_total_mirror_consistent": {
+          "name": "order_items_line_total_mirror_consistent",
+          "value": "\"order_items\".\"line_total\" = (\"order_items\".\"line_total_minor\"::numeric / 100)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.order_legal_consents": {
+      "name": "order_legal_consents",
+      "schema": "",
+      "columns": {
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "terms_accepted": {
+          "name": "terms_accepted",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "privacy_accepted": {
+          "name": "privacy_accepted",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "terms_version": {
+          "name": "terms_version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "privacy_version": {
+          "name": "privacy_version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "consented_at": {
+          "name": "consented_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "source": {
+          "name": "source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'checkout'"
+        },
+        "locale": {
+          "name": "locale",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "country": {
+          "name": "country",
+          "type": "varchar(2)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "order_legal_consents_consented_idx": {
+          "name": "order_legal_consents_consented_idx",
+          "columns": [
+            {
+              "expression": "consented_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "order_legal_consents_order_id_orders_id_fk": {
+          "name": "order_legal_consents_order_id_orders_id_fk",
+          "tableFrom": "order_legal_consents",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "order_legal_consents_terms_accepted_chk": {
+          "name": "order_legal_consents_terms_accepted_chk",
+          "value": "\"order_legal_consents\".\"terms_accepted\" = true"
+        },
+        "order_legal_consents_privacy_accepted_chk": {
+          "name": "order_legal_consents_privacy_accepted_chk",
+          "value": "\"order_legal_consents\".\"privacy_accepted\" = true"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.order_shipping": {
+      "name": "order_shipping",
+      "schema": "",
+      "columns": {
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "shipping_address": {
+          "name": "shipping_address",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "order_shipping_updated_idx": {
+          "name": "order_shipping_updated_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "order_shipping_order_id_orders_id_fk": {
+          "name": "order_shipping_order_id_orders_id_fk",
+          "tableFrom": "order_shipping",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.orders": {
+      "name": "orders",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_amount_minor": {
+          "name": "total_amount_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_amount": {
+          "name": "total_amount",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'USD'"
+        },
+        "fulfillment_mode": {
+          "name": "fulfillment_mode",
+          "type": "fulfillment_mode",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ua_np'"
+        },
+        "quote_status": {
+          "name": "quote_status",
+          "type": "quote_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        },
+        "quote_version": {
+          "name": "quote_version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_quote_minor": {
+          "name": "shipping_quote_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "items_subtotal_minor": {
+          "name": "items_subtotal_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "quote_accepted_at": {
+          "name": "quote_accepted_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quote_payment_deadline_at": {
+          "name": "quote_payment_deadline_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_required": {
+          "name": "shipping_required",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_payer": {
+          "name": "shipping_payer",
+          "type": "shipping_payer",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_provider": {
+          "name": "shipping_provider",
+          "type": "shipping_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_method_code": {
+          "name": "shipping_method_code",
+          "type": "shipping_method_code",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_amount_minor": {
+          "name": "shipping_amount_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_status": {
+          "name": "shipping_status",
+          "type": "shipping_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tracking_number": {
+          "name": "tracking_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_provider_ref": {
+          "name": "shipping_provider_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payment_status": {
+          "name": "payment_status",
+          "type": "payment_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "payment_provider": {
+          "name": "payment_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'stripe'"
+        },
+        "payment_intent_id": {
+          "name": "payment_intent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_charge_id": {
+          "name": "psp_charge_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_payment_method": {
+          "name": "psp_payment_method",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_status_reason": {
+          "name": "psp_status_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_metadata": {
+          "name": "psp_metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "status": {
+          "name": "status",
+          "type": "order_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'CREATED'"
+        },
+        "inventory_status": {
+          "name": "inventory_status",
+          "type": "inventory_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        },
+        "failure_code": {
+          "name": "failure_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "failure_message": {
+          "name": "failure_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "idempotency_request_hash": {
+          "name": "idempotency_request_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stock_restored": {
+          "name": "stock_restored",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "restocked_at": {
+          "name": "restocked_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "varchar(128)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "sweep_claimed_at": {
+          "name": "sweep_claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sweep_claim_expires_at": {
+          "name": "sweep_claim_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sweep_run_id": {
+          "name": "sweep_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sweep_claimed_by": {
+          "name": "sweep_claimed_by",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "orders_sweep_claim_expires_idx": {
+          "name": "orders_sweep_claim_expires_idx",
+          "columns": [
+            {
+              "expression": "sweep_claim_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "idx_orders_user_id_created_at": {
+          "name": "idx_orders_user_id_created_at",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "orders_shipping_status_idx": {
+          "name": "orders_shipping_status_idx",
+          "columns": [
+            {
+              "expression": "shipping_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "orders_quote_status_deadline_idx": {
+          "name": "orders_quote_status_deadline_idx",
+          "columns": [
+            {
+              "expression": "fulfillment_mode",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "quote_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "quote_payment_deadline_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "orders_quote_status_updated_idx": {
+          "name": "orders_quote_status_updated_idx",
+          "columns": [
+            {
+              "expression": "quote_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "orders_user_id_users_id_fk": {
+          "name": "orders_user_id_users_id_fk",
+          "tableFrom": "orders",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "orders_idempotency_key_unique": {
+          "name": "orders_idempotency_key_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "idempotency_key"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {
+        "orders_payment_provider_valid": {
+          "name": "orders_payment_provider_valid",
+          "value": "\"orders\".\"payment_provider\" in ('stripe', 'monobank', 'none')"
+        },
+        "orders_total_amount_minor_non_negative": {
+          "name": "orders_total_amount_minor_non_negative",
+          "value": "\"orders\".\"total_amount_minor\" >= 0"
+        },
+        "orders_items_subtotal_minor_non_negative": {
+          "name": "orders_items_subtotal_minor_non_negative",
+          "value": "\"orders\".\"items_subtotal_minor\" >= 0"
+        },
+        "orders_shipping_quote_minor_non_negative": {
+          "name": "orders_shipping_quote_minor_non_negative",
+          "value": "\"orders\".\"shipping_quote_minor\" is null or \"orders\".\"shipping_quote_minor\" >= 0"
+        },
+        "orders_payment_intent_id_null_when_none": {
+          "name": "orders_payment_intent_id_null_when_none",
+          "value": "\"orders\".\"payment_provider\" <> 'none' OR \"orders\".\"payment_intent_id\" IS NULL"
+        },
+        "orders_psp_fields_null_when_none": {
+          "name": "orders_psp_fields_null_when_none",
+          "value": "\"orders\".\"payment_provider\" <> 'none' OR (\n        \"orders\".\"psp_charge_id\" IS NULL AND\n        \"orders\".\"psp_payment_method\" IS NULL AND\n        \"orders\".\"psp_status_reason\" IS NULL\n      )"
+        },
+        "orders_total_amount_mirror_consistent": {
+          "name": "orders_total_amount_mirror_consistent",
+          "value": "\"orders\".\"total_amount\" = (\"orders\".\"total_amount_minor\"::numeric / 100)"
+        },
+        "orders_payment_status_valid_when_none": {
+          "name": "orders_payment_status_valid_when_none",
+          "value": "\"orders\".\"payment_provider\" <> 'none' OR \"orders\".\"payment_status\" in ('paid','failed')"
+        },
+        "orders_shipping_null_when_not_required_chk": {
+          "name": "orders_shipping_null_when_not_required_chk",
+          "value": "\n    \"orders\".\"shipping_required\" IS TRUE\n    OR (\n      \"orders\".\"shipping_provider\" IS NULL\n      AND \"orders\".\"shipping_method_code\" IS NULL\n      AND \"orders\".\"shipping_status\" IS NULL\n    )\n  "
+        },
+        "orders_shipping_present_when_required_chk": {
+          "name": "orders_shipping_present_when_required_chk",
+          "value": "\n    \"orders\".\"shipping_required\" IS DISTINCT FROM TRUE\n    OR (\n      \"orders\".\"shipping_provider\" IS NOT NULL\n      AND \"orders\".\"shipping_method_code\" IS NOT NULL\n      AND \"orders\".\"shipping_status\" IS NOT NULL\n    )\n  "
+        },
+        "orders_shipping_amount_minor_non_negative_chk": {
+          "name": "orders_shipping_amount_minor_non_negative_chk",
+          "value": "\"orders\".\"shipping_amount_minor\" IS NULL OR \"orders\".\"shipping_amount_minor\" >= 0"
+        },
+        "orders_shipping_payer_null_when_not_required_chk": {
+          "name": "orders_shipping_payer_null_when_not_required_chk",
+          "value": "\"orders\".\"shipping_required\" IS TRUE OR \"orders\".\"shipping_payer\" IS NULL"
+        },
+        "orders_shipping_payer_present_when_required_chk": {
+          "name": "orders_shipping_payer_present_when_required_chk",
+          "value": "\"orders\".\"shipping_required\" IS DISTINCT FROM TRUE OR \"orders\".\"shipping_payer\" IS NOT NULL"
+        },
+        "orders_intl_provider_restriction_chk": {
+          "name": "orders_intl_provider_restriction_chk",
+          "value": "\"orders\".\"fulfillment_mode\" <> 'intl' OR \"orders\".\"payment_provider\" in ('stripe', 'none')"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.payment_attempts": {
+      "name": "payment_attempts",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "attempt_number": {
+          "name": "attempt_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expected_amount_minor": {
+          "name": "expected_amount_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_payment_intent_id": {
+          "name": "provider_payment_intent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "checkout_url": {
+          "name": "checkout_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_created_at": {
+          "name": "provider_created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_modified_at": {
+          "name": "provider_modified_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "janitor_claimed_until": {
+          "name": "janitor_claimed_until",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "janitor_claimed_by": {
+          "name": "janitor_claimed_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_code": {
+          "name": "last_error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_message": {
+          "name": "last_error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "finalized_at": {
+          "name": "finalized_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "payment_attempts_order_provider_attempt_unique": {
+          "name": "payment_attempts_order_provider_attempt_unique",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "attempt_number",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_attempts_idempotency_key_unique": {
+          "name": "payment_attempts_idempotency_key_unique",
+          "columns": [
+            {
+              "expression": "idempotency_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_attempts_provider_pi_unique": {
+          "name": "payment_attempts_provider_pi_unique",
+          "columns": [
+            {
+              "expression": "provider_payment_intent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_attempts_order_provider_status_idx": {
+          "name": "payment_attempts_order_provider_status_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_attempts_order_provider_active_unique": {
+          "name": "payment_attempts_order_provider_active_unique",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "where": "\"payment_attempts\".\"status\" in ('active','creating')",
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_attempts_provider_status_updated_idx": {
+          "name": "payment_attempts_provider_status_updated_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_attempts_janitor_claim_idx": {
+          "name": "payment_attempts_janitor_claim_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "janitor_claimed_until",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "payment_attempts_order_id_orders_id_fk": {
+          "name": "payment_attempts_order_id_orders_id_fk",
+          "tableFrom": "payment_attempts",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "payment_attempts_provider_check": {
+          "name": "payment_attempts_provider_check",
+          "value": "\"payment_attempts\".\"provider\" in ('stripe','monobank')"
+        },
+        "payment_attempts_status_check": {
+          "name": "payment_attempts_status_check",
+          "value": "\"payment_attempts\".\"status\" in ('creating','active','succeeded','failed','canceled')"
+        },
+        "payment_attempts_attempt_number_check": {
+          "name": "payment_attempts_attempt_number_check",
+          "value": "\"payment_attempts\".\"attempt_number\" >= 1"
+        },
+        "payment_attempts_expected_amount_minor_non_negative": {
+          "name": "payment_attempts_expected_amount_minor_non_negative",
+          "value": "\"payment_attempts\".\"expected_amount_minor\" is null or \"payment_attempts\".\"expected_amount_minor\" >= 0"
+        },
+        "payment_attempts_mono_currency_uah": {
+          "name": "payment_attempts_mono_currency_uah",
+          "value": "\"payment_attempts\".\"provider\" <> 'monobank' OR \"payment_attempts\".\"currency\" = 'UAH'"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.payment_events": {
+      "name": "payment_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_name": {
+          "name": "event_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_source": {
+          "name": "event_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_ref": {
+          "name": "event_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_payment_intent_id": {
+          "name": "provider_payment_intent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_charge_id": {
+          "name": "provider_charge_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "amount_minor": {
+          "name": "amount_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "dedupe_key": {
+          "name": "dedupe_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "occurred_at": {
+          "name": "occurred_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "payment_events_dedupe_key_uq": {
+          "name": "payment_events_dedupe_key_uq",
+          "columns": [
+            {
+              "expression": "dedupe_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_events_order_id_idx": {
+          "name": "payment_events_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_events_attempt_id_idx": {
+          "name": "payment_events_attempt_id_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_events_event_ref_idx": {
+          "name": "payment_events_event_ref_idx",
+          "columns": [
+            {
+              "expression": "event_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "payment_events_occurred_at_idx": {
+          "name": "payment_events_occurred_at_idx",
+          "columns": [
+            {
+              "expression": "occurred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "payment_events_order_id_orders_id_fk": {
+          "name": "payment_events_order_id_orders_id_fk",
+          "tableFrom": "payment_events",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "payment_events_attempt_id_payment_attempts_id_fk": {
+          "name": "payment_events_attempt_id_payment_attempts_id_fk",
+          "tableFrom": "payment_events",
+          "tableTo": "payment_attempts",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.product_prices": {
+      "name": "product_prices",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "product_id": {
+          "name": "product_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "price_minor": {
+          "name": "price_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "original_price_minor": {
+          "name": "original_price_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "price": {
+          "name": "price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "original_price": {
+          "name": "original_price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "product_prices_product_id_idx": {
+          "name": "product_prices_product_id_idx",
+          "columns": [
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "product_prices_product_currency_uq": {
+          "name": "product_prices_product_currency_uq",
+          "columns": [
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "currency",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "product_prices_product_id_products_id_fk": {
+          "name": "product_prices_product_id_products_id_fk",
+          "tableFrom": "product_prices",
+          "tableTo": "products",
+          "columnsFrom": [
+            "product_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "product_prices_price_positive": {
+          "name": "product_prices_price_positive",
+          "value": "\"product_prices\".\"price_minor\" > 0"
+        },
+        "product_prices_original_price_valid": {
+          "name": "product_prices_original_price_valid",
+          "value": "\"product_prices\".\"original_price_minor\" is null or \"product_prices\".\"original_price_minor\" > \"product_prices\".\"price_minor\""
+        },
+        "product_prices_price_mirror_consistent": {
+          "name": "product_prices_price_mirror_consistent",
+          "value": "\"product_prices\".\"price\" = (\"product_prices\".\"price_minor\"::numeric / 100)"
+        },
+        "product_prices_original_price_null_coupled": {
+          "name": "product_prices_original_price_null_coupled",
+          "value": "(\"product_prices\".\"original_price_minor\" is null) = (\"product_prices\".\"original_price\" is null)"
+        },
+        "product_prices_original_price_mirror_consistent": {
+          "name": "product_prices_original_price_mirror_consistent",
+          "value": "\"product_prices\".\"original_price_minor\" is null or \"product_prices\".\"original_price\" = (\"product_prices\".\"original_price_minor\"::numeric / 100)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.products": {
+      "name": "products",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image_public_id": {
+          "name": "image_public_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "price": {
+          "name": "price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "original_price": {
+          "name": "original_price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'USD'"
+        },
+        "category": {
+          "name": "category",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "colors": {
+          "name": "colors",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "sizes": {
+          "name": "sizes",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "badge": {
+          "name": "badge",
+          "type": "product_badge",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'NONE'"
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "is_featured": {
+          "name": "is_featured",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "stock": {
+          "name": "stock",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "sku": {
+          "name": "sku",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "products_slug_unique": {
+          "name": "products_slug_unique",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "products_stock_non_negative": {
+          "name": "products_stock_non_negative",
+          "value": "\"products\".\"stock\" >= 0"
+        },
+        "products_currency_usd_only": {
+          "name": "products_currency_usd_only",
+          "value": "\"products\".\"currency\" = 'USD'"
+        },
+        "products_price_positive": {
+          "name": "products_price_positive",
+          "value": "\"products\".\"price\" > 0"
+        },
+        "products_original_price_valid": {
+          "name": "products_original_price_valid",
+          "value": "\"products\".\"original_price\" is null or \"products\".\"original_price\" > \"products\".\"price\""
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.return_items": {
+      "name": "return_items",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "return_request_id": {
+          "name": "return_request_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "order_item_id": {
+          "name": "order_item_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "product_id": {
+          "name": "product_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unit_price_minor": {
+          "name": "unit_price_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "line_total_minor": {
+          "name": "line_total_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "varchar(200)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "return_items_idempotency_key_uq": {
+          "name": "return_items_idempotency_key_uq",
+          "columns": [
+            {
+              "expression": "idempotency_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "return_items_return_request_idx": {
+          "name": "return_items_return_request_idx",
+          "columns": [
+            {
+              "expression": "return_request_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "return_items_order_id_idx": {
+          "name": "return_items_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "return_items_product_id_idx": {
+          "name": "return_items_product_id_idx",
+          "columns": [
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "return_items_return_request_id_return_requests_id_fk": {
+          "name": "return_items_return_request_id_return_requests_id_fk",
+          "tableFrom": "return_items",
+          "tableTo": "return_requests",
+          "columnsFrom": [
+            "return_request_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "return_items_order_id_orders_id_fk": {
+          "name": "return_items_order_id_orders_id_fk",
+          "tableFrom": "return_items",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "return_items_order_item_id_order_items_id_fk": {
+          "name": "return_items_order_item_id_order_items_id_fk",
+          "tableFrom": "return_items",
+          "tableTo": "order_items",
+          "columnsFrom": [
+            "order_item_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "return_items_product_id_products_id_fk": {
+          "name": "return_items_product_id_products_id_fk",
+          "tableFrom": "return_items",
+          "tableTo": "products",
+          "columnsFrom": [
+            "product_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "return_items_return_request_order_fk": {
+          "name": "return_items_return_request_order_fk",
+          "tableFrom": "return_items",
+          "tableTo": "return_requests",
+          "columnsFrom": [
+            "return_request_id",
+            "order_id"
+          ],
+          "columnsTo": [
+            "id",
+            "order_id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "return_items_quantity_positive_chk": {
+          "name": "return_items_quantity_positive_chk",
+          "value": "\"return_items\".\"quantity\" > 0"
+        },
+        "return_items_unit_price_minor_non_negative_chk": {
+          "name": "return_items_unit_price_minor_non_negative_chk",
+          "value": "\"return_items\".\"unit_price_minor\" >= 0"
+        },
+        "return_items_line_total_minor_non_negative_chk": {
+          "name": "return_items_line_total_minor_non_negative_chk",
+          "value": "\"return_items\".\"line_total_minor\" >= 0"
+        },
+        "return_items_line_total_consistent_chk": {
+          "name": "return_items_line_total_consistent_chk",
+          "value": "\"return_items\".\"line_total_minor\" = (\"return_items\".\"unit_price_minor\" * \"return_items\".\"quantity\")"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.return_requests": {
+      "name": "return_requests",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "return_request_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'requested'"
+        },
+        "reason": {
+          "name": "reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "policy_restock": {
+          "name": "policy_restock",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "refund_amount_minor": {
+          "name": "refund_amount_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "varchar(128)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "approved_at": {
+          "name": "approved_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "approved_by": {
+          "name": "approved_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rejected_at": {
+          "name": "rejected_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rejected_by": {
+          "name": "rejected_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "received_at": {
+          "name": "received_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "received_by": {
+          "name": "received_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refunded_at": {
+          "name": "refunded_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refunded_by": {
+          "name": "refunded_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refund_provider_ref": {
+          "name": "refund_provider_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "return_requests_order_id_uq": {
+          "name": "return_requests_order_id_uq",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "return_requests_id_order_id_uq": {
+          "name": "return_requests_id_order_id_uq",
+          "columns": [
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "return_requests_idempotency_key_uq": {
+          "name": "return_requests_idempotency_key_uq",
+          "columns": [
+            {
+              "expression": "idempotency_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "return_requests_status_created_idx": {
+          "name": "return_requests_status_created_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "return_requests_user_id_created_idx": {
+          "name": "return_requests_user_id_created_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "return_requests_order_id_orders_id_fk": {
+          "name": "return_requests_order_id_orders_id_fk",
+          "tableFrom": "return_requests",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "return_requests_user_id_users_id_fk": {
+          "name": "return_requests_user_id_users_id_fk",
+          "tableFrom": "return_requests",
+          "tableTo": "users",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "return_requests_approved_by_users_id_fk": {
+          "name": "return_requests_approved_by_users_id_fk",
+          "tableFrom": "return_requests",
+          "tableTo": "users",
+          "columnsFrom": [
+            "approved_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "return_requests_rejected_by_users_id_fk": {
+          "name": "return_requests_rejected_by_users_id_fk",
+          "tableFrom": "return_requests",
+          "tableTo": "users",
+          "columnsFrom": [
+            "rejected_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "return_requests_received_by_users_id_fk": {
+          "name": "return_requests_received_by_users_id_fk",
+          "tableFrom": "return_requests",
+          "tableTo": "users",
+          "columnsFrom": [
+            "received_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        },
+        "return_requests_refunded_by_users_id_fk": {
+          "name": "return_requests_refunded_by_users_id_fk",
+          "tableFrom": "return_requests",
+          "tableTo": "users",
+          "columnsFrom": [
+            "refunded_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "return_requests_refund_amount_minor_non_negative_chk": {
+          "name": "return_requests_refund_amount_minor_non_negative_chk",
+          "value": "\"return_requests\".\"refund_amount_minor\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.shipping_events": {
+      "name": "shipping_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "shipment_id": {
+          "name": "shipment_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_name": {
+          "name": "event_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_source": {
+          "name": "event_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_ref": {
+          "name": "event_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_from": {
+          "name": "status_from",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_to": {
+          "name": "status_to",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tracking_number": {
+          "name": "tracking_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "dedupe_key": {
+          "name": "dedupe_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "occurred_at": {
+          "name": "occurred_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "shipping_events_dedupe_key_uq": {
+          "name": "shipping_events_dedupe_key_uq",
+          "columns": [
+            {
+              "expression": "dedupe_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "shipping_events_order_id_idx": {
+          "name": "shipping_events_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "shipping_events_shipment_id_idx": {
+          "name": "shipping_events_shipment_id_idx",
+          "columns": [
+            {
+              "expression": "shipment_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "shipping_events_occurred_at_idx": {
+          "name": "shipping_events_occurred_at_idx",
+          "columns": [
+            {
+              "expression": "occurred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "shipping_events_order_id_orders_id_fk": {
+          "name": "shipping_events_order_id_orders_id_fk",
+          "tableFrom": "shipping_events",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "shipping_events_shipment_id_shipping_shipments_id_fk": {
+          "name": "shipping_events_shipment_id_shipping_shipments_id_fk",
+          "tableFrom": "shipping_events",
+          "tableTo": "shipping_shipments",
+          "columnsFrom": [
+            "shipment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.shipping_quotes": {
+      "name": "shipping_quotes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "quote_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "shipping_quote_minor": {
+          "name": "shipping_quote_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "offered_by": {
+          "name": "offered_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "offered_at": {
+          "name": "offered_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "accepted_at": {
+          "name": "accepted_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "declined_at": {
+          "name": "declined_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "shipping_quotes_order_version_uq": {
+          "name": "shipping_quotes_order_version_uq",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "version",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "shipping_quotes_order_status_idx": {
+          "name": "shipping_quotes_order_status_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "shipping_quotes_status_expires_idx": {
+          "name": "shipping_quotes_status_expires_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "shipping_quotes_order_updated_idx": {
+          "name": "shipping_quotes_order_updated_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "shipping_quotes_order_id_orders_id_fk": {
+          "name": "shipping_quotes_order_id_orders_id_fk",
+          "tableFrom": "shipping_quotes",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "shipping_quotes_offered_by_users_id_fk": {
+          "name": "shipping_quotes_offered_by_users_id_fk",
+          "tableFrom": "shipping_quotes",
+          "tableTo": "users",
+          "columnsFrom": [
+            "offered_by"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "shipping_quotes_version_positive_chk": {
+          "name": "shipping_quotes_version_positive_chk",
+          "value": "\"shipping_quotes\".\"version\" >= 1"
+        },
+        "shipping_quotes_quote_minor_non_negative_chk": {
+          "name": "shipping_quotes_quote_minor_non_negative_chk",
+          "value": "\"shipping_quotes\".\"shipping_quote_minor\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.shipping_shipments": {
+      "name": "shipping_shipments",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "shipping_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'nova_poshta'"
+        },
+        "status": {
+          "name": "status",
+          "type": "shipping_shipment_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'queued'"
+        },
+        "attempt_count": {
+          "name": "attempt_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "next_attempt_at": {
+          "name": "next_attempt_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_code": {
+          "name": "last_error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_message": {
+          "name": "last_error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_ref": {
+          "name": "provider_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tracking_number": {
+          "name": "tracking_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lease_owner": {
+          "name": "lease_owner",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lease_expires_at": {
+          "name": "lease_expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "shipping_shipments_order_id_uq": {
+          "name": "shipping_shipments_order_id_uq",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "shipping_shipments_queue_idx": {
+          "name": "shipping_shipments_queue_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "next_attempt_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "shipping_shipments_lease_idx": {
+          "name": "shipping_shipments_lease_idx",
+          "columns": [
+            {
+              "expression": "lease_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "shipping_shipments_provider_ref_idx": {
+          "name": "shipping_shipments_provider_ref_idx",
+          "columns": [
+            {
+              "expression": "provider_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "shipping_shipments_order_id_orders_id_fk": {
+          "name": "shipping_shipments_order_id_orders_id_fk",
+          "tableFrom": "shipping_shipments",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "shipping_shipments_attempt_count_non_negative_chk": {
+          "name": "shipping_shipments_attempt_count_non_negative_chk",
+          "value": "\"shipping_shipments\".\"attempt_count\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.stripe_events": {
+      "name": "stripe_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'stripe'"
+        },
+        "event_id": {
+          "name": "event_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payment_intent_id": {
+          "name": "payment_intent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "event_type": {
+          "name": "event_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payment_status": {
+          "name": "payment_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claim_expires_at": {
+          "name": "claim_expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_by": {
+          "name": "claimed_by",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processed_at": {
+          "name": "processed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "stripe_events_event_id_idx": {
+          "name": "stripe_events_event_id_idx",
+          "columns": [
+            {
+              "expression": "event_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        },
+        "stripe_events_claim_expires_idx": {
+          "name": "stripe_events_claim_expires_idx",
+          "columns": [
+            {
+              "expression": "claim_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "stripe_events_order_id_orders_id_fk": {
+          "name": "stripe_events_order_id_orders_id_fk",
+          "tableFrom": "stripe_events",
+          "tableTo": "orders",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'credentials'"
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'user'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "users_provider_provider_id_unique": {
+          "name": "users_provider_provider_id_unique",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.currency": {
+      "name": "currency",
+      "schema": "public",
+      "values": [
+        "USD",
+        "UAH"
+      ]
+    },
+    "public.fulfillment_mode": {
+      "name": "fulfillment_mode",
+      "schema": "public",
+      "values": [
+        "ua_np",
+        "intl"
+      ]
+    },
+    "public.inventory_move_type": {
+      "name": "inventory_move_type",
+      "schema": "public",
+      "values": [
+        "reserve",
+        "release"
+      ]
+    },
+    "public.inventory_status": {
+      "name": "inventory_status",
+      "schema": "public",
+      "values": [
+        "none",
+        "reserving",
+        "reserved",
+        "release_pending",
+        "released",
+        "failed"
+      ]
+    },
+    "public.notification_channel": {
+      "name": "notification_channel",
+      "schema": "public",
+      "values": [
+        "email",
+        "sms"
+      ]
+    },
+    "public.order_status": {
+      "name": "order_status",
+      "schema": "public",
+      "values": [
+        "CREATED",
+        "INVENTORY_RESERVED",
+        "INVENTORY_FAILED",
+        "PAID",
+        "CANCELED"
+      ]
+    },
+    "public.payment_status": {
+      "name": "payment_status",
+      "schema": "public",
+      "values": [
+        "pending",
+        "requires_payment",
+        "paid",
+        "failed",
+        "refunded",
+        "needs_review"
+      ]
+    },
+    "public.product_badge": {
+      "name": "product_badge",
+      "schema": "public",
+      "values": [
+        "NEW",
+        "SALE",
+        "NONE"
+      ]
+    },
+    "public.quote_status": {
+      "name": "quote_status",
+      "schema": "public",
+      "values": [
+        "none",
+        "requested",
+        "offered",
+        "accepted",
+        "declined",
+        "expired",
+        "requires_requote"
+      ]
+    },
+    "public.return_request_status": {
+      "name": "return_request_status",
+      "schema": "public",
+      "values": [
+        "requested",
+        "approved",
+        "rejected",
+        "received",
+        "refunded"
+      ]
+    },
+    "public.shipping_method_code": {
+      "name": "shipping_method_code",
+      "schema": "public",
+      "values": [
+        "NP_WAREHOUSE",
+        "NP_LOCKER",
+        "NP_COURIER"
+      ]
+    },
+    "public.shipping_payer": {
+      "name": "shipping_payer",
+      "schema": "public",
+      "values": [
+        "customer",
+        "merchant"
+      ]
+    },
+    "public.shipping_provider": {
+      "name": "shipping_provider",
+      "schema": "public",
+      "values": [
+        "nova_poshta",
+        "ukrposhta"
+      ]
+    },
+    "public.shipping_shipment_status": {
+      "name": "shipping_shipment_status",
+      "schema": "public",
+      "values": [
+        "queued",
+        "processing",
+        "succeeded",
+        "failed",
+        "needs_attention"
+      ]
+    },
+    "public.shipping_status": {
+      "name": "shipping_status",
+      "schema": "public",
+      "values": [
+        "pending",
+        "queued",
+        "creating_label",
+        "label_created",
+        "shipped",
+        "delivered",
+        "cancelled",
+        "needs_attention"
+      ]
+    }
+  },
+  "schemas": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/frontend/drizzle/meta/0030_snapshot.json b/frontend/drizzle/meta/0030_snapshot.json
new file mode 100644
index 00000000..16f07e60
--- /dev/null
+++ b/frontend/drizzle/meta/0030_snapshot.json
@@ -0,0 +1,6769 @@
+{
+  "id": "9ad53c63-72e0-49c9-9e57-354e2e6bd363",
+  "prevId": "0ebecdab-8ea9-43d3-aa67-780d94c12060",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "public.blog_author_translations": {
+      "name": "blog_author_translations",
+      "schema": "",
+      "columns": {
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "bio": {
+          "name": "bio",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "job_title": {
+          "name": "job_title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "company": {
+          "name": "company",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "city": {
+          "name": "city",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "blog_author_translations_author_id_blog_authors_id_fk": {
+          "name": "blog_author_translations_author_id_blog_authors_id_fk",
+          "tableFrom": "blog_author_translations",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "tableTo": "blog_authors",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "blog_author_translations_author_id_locale_pk": {
+          "name": "blog_author_translations_author_id_locale_pk",
+          "columns": [
+            "author_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_authors": {
+      "name": "blog_authors",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(100)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image_public_id": {
+          "name": "image_public_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "social_media": {
+          "name": "social_media",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'[]'::jsonb"
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "blog_authors_slug_unique": {
+          "name": "blog_authors_slug_unique",
+          "columns": [
+            "slug"
+          ],
+          "nullsNotDistinct": false
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_categories": {
+      "name": "blog_categories",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "blog_categories_slug_unique": {
+          "name": "blog_categories_slug_unique",
+          "columns": [
+            "slug"
+          ],
+          "nullsNotDistinct": false
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_category_translations": {
+      "name": "blog_category_translations",
+      "schema": "",
+      "columns": {
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "blog_category_translations_category_id_blog_categories_id_fk": {
+          "name": "blog_category_translations_category_id_blog_categories_id_fk",
+          "tableFrom": "blog_category_translations",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "tableTo": "blog_categories",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "blog_category_translations_category_id_locale_pk": {
+          "name": "blog_category_translations_category_id_locale_pk",
+          "columns": [
+            "category_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_post_categories": {
+      "name": "blog_post_categories",
+      "schema": "",
+      "columns": {
+        "post_id": {
+          "name": "post_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {
+        "blog_post_categories_category_id_idx": {
+          "name": "blog_post_categories_category_id_idx",
+          "columns": [
+            {
+              "expression": "category_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "blog_post_categories_post_id_blog_posts_id_fk": {
+          "name": "blog_post_categories_post_id_blog_posts_id_fk",
+          "tableFrom": "blog_post_categories",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "tableTo": "blog_posts",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "blog_post_categories_category_id_blog_categories_id_fk": {
+          "name": "blog_post_categories_category_id_blog_categories_id_fk",
+          "tableFrom": "blog_post_categories",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "tableTo": "blog_categories",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "blog_post_categories_post_id_category_id_pk": {
+          "name": "blog_post_categories_post_id_category_id_pk",
+          "columns": [
+            "post_id",
+            "category_id"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_post_translations": {
+      "name": "blog_post_translations",
+      "schema": "",
+      "columns": {
+        "post_id": {
+          "name": "post_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "body": {
+          "name": "body",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "blog_post_translations_post_id_blog_posts_id_fk": {
+          "name": "blog_post_translations_post_id_blog_posts_id_fk",
+          "tableFrom": "blog_post_translations",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "tableTo": "blog_posts",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "blog_post_translations_post_id_locale_pk": {
+          "name": "blog_post_translations_post_id_locale_pk",
+          "columns": [
+            "post_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.blog_posts": {
+      "name": "blog_posts",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(200)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "author_id": {
+          "name": "author_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_image_url": {
+          "name": "main_image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "main_image_public_id": {
+          "name": "main_image_public_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tags": {
+          "name": "tags",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'"
+        },
+        "resource_link": {
+          "name": "resource_link",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "published_at": {
+          "name": "published_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scheduled_publish_at": {
+          "name": "scheduled_publish_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_published": {
+          "name": "is_published",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "blog_posts_author_id_idx": {
+          "name": "blog_posts_author_id_idx",
+          "columns": [
+            {
+              "expression": "author_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "blog_posts_author_id_blog_authors_id_fk": {
+          "name": "blog_posts_author_id_blog_authors_id_fk",
+          "tableFrom": "blog_posts",
+          "columnsFrom": [
+            "author_id"
+          ],
+          "tableTo": "blog_authors",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "blog_posts_slug_unique": {
+          "name": "blog_posts_slug_unique",
+          "columns": [
+            "slug"
+          ],
+          "nullsNotDistinct": false
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.categories": {
+      "name": "categories",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "categories_slug_unique": {
+          "name": "categories_slug_unique",
+          "columns": [
+            "slug"
+          ],
+          "nullsNotDistinct": false
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.category_translations": {
+      "name": "category_translations",
+      "schema": "",
+      "columns": {
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "category_translations_category_id_categories_id_fk": {
+          "name": "category_translations_category_id_categories_id_fk",
+          "tableFrom": "category_translations",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "tableTo": "categories",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "category_translations_category_id_locale_pk": {
+          "name": "category_translations_category_id_locale_pk",
+          "columns": [
+            "category_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.email_verification_tokens": {
+      "name": "email_verification_tokens",
+      "schema": "",
+      "columns": {
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "email_verification_tokens_user_id_idx": {
+          "name": "email_verification_tokens_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.notifications": {
+      "name": "notifications",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "message": {
+          "name": "message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_read": {
+          "name": "is_read",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "notifications_user_id_users_id_fk": {
+          "name": "notifications_user_id_users_id_fk",
+          "tableFrom": "notifications",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.password_reset_tokens": {
+      "name": "password_reset_tokens",
+      "schema": "",
+      "columns": {
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "password_reset_tokens_user_id_idx": {
+          "name": "password_reset_tokens_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.point_transactions": {
+      "name": "point_transactions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "points": {
+          "name": "points",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "source": {
+          "name": "source",
+          "type": "varchar(50)",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'quiz'"
+        },
+        "source_id": {
+          "name": "source_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "point_transactions_user_id_idx": {
+          "name": "point_transactions_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "point_transactions_user_id_users_id_fk": {
+          "name": "point_transactions_user_id_users_id_fk",
+          "tableFrom": "point_transactions",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.question_translations": {
+      "name": "question_translations",
+      "schema": "",
+      "columns": {
+        "question_id": {
+          "name": "question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "question": {
+          "name": "question",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "answer_blocks": {
+          "name": "answer_blocks",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "question_translations_question_id_questions_id_fk": {
+          "name": "question_translations_question_id_questions_id_fk",
+          "tableFrom": "question_translations",
+          "columnsFrom": [
+            "question_id"
+          ],
+          "tableTo": "questions",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "question_translations_question_id_locale_pk": {
+          "name": "question_translations_question_id_locale_pk",
+          "columns": [
+            "question_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.questions": {
+      "name": "questions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "difficulty": {
+          "name": "difficulty",
+          "type": "varchar(20)",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'medium'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "questions_category_sort_order_idx": {
+          "name": "questions_category_sort_order_idx",
+          "columns": [
+            {
+              "expression": "category_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "sort_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "questions_category_id_categories_id_fk": {
+          "name": "questions_category_id_categories_id_fk",
+          "tableFrom": "questions",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "tableTo": "categories",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "restrict"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_answer_translations": {
+      "name": "quiz_answer_translations",
+      "schema": "",
+      "columns": {
+        "quiz_answer_id": {
+          "name": "quiz_answer_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "answer_text": {
+          "name": "answer_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk": {
+          "name": "quiz_answer_translations_quiz_answer_id_quiz_answers_id_fk",
+          "tableFrom": "quiz_answer_translations",
+          "columnsFrom": [
+            "quiz_answer_id"
+          ],
+          "tableTo": "quiz_answers",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "quiz_answer_translations_quiz_answer_id_locale_pk": {
+          "name": "quiz_answer_translations_quiz_answer_id_locale_pk",
+          "columns": [
+            "quiz_answer_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_answers": {
+      "name": "quiz_answers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "quiz_question_id": {
+          "name": "quiz_question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "is_correct": {
+          "name": "is_correct",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {
+        "quiz_answers_question_display_order_idx": {
+          "name": "quiz_answers_question_display_order_idx",
+          "columns": [
+            {
+              "expression": "quiz_question_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "quiz_answers_quiz_question_id_quiz_questions_id_fk": {
+          "name": "quiz_answers_quiz_question_id_quiz_questions_id_fk",
+          "tableFrom": "quiz_answers",
+          "columnsFrom": [
+            "quiz_question_id"
+          ],
+          "tableTo": "quiz_questions",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_attempt_answers": {
+      "name": "quiz_attempt_answers",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "quiz_question_id": {
+          "name": "quiz_question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "selected_answer_id": {
+          "name": "selected_answer_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_correct": {
+          "name": "is_correct",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "answered_at": {
+          "name": "answered_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "quiz_attempt_answers_attempt_idx": {
+          "name": "quiz_attempt_answers_attempt_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk": {
+          "name": "quiz_attempt_answers_attempt_id_quiz_attempts_id_fk",
+          "tableFrom": "quiz_attempt_answers",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "tableTo": "quiz_attempts",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk": {
+          "name": "quiz_attempt_answers_quiz_question_id_quiz_questions_id_fk",
+          "tableFrom": "quiz_attempt_answers",
+          "columnsFrom": [
+            "quiz_question_id"
+          ],
+          "tableTo": "quiz_questions",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk": {
+          "name": "quiz_attempt_answers_selected_answer_id_quiz_answers_id_fk",
+          "tableFrom": "quiz_attempt_answers",
+          "columnsFrom": [
+            "selected_answer_id"
+          ],
+          "tableTo": "quiz_answers",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_attempts": {
+      "name": "quiz_attempts",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "quiz_id": {
+          "name": "quiz_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "score": {
+          "name": "score",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_questions": {
+          "name": "total_questions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "percentage": {
+          "name": "percentage",
+          "type": "numeric(5, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "time_spent_seconds": {
+          "name": "time_spent_seconds",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "integrity_score": {
+          "name": "integrity_score",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "default": 100
+        },
+        "points_earned": {
+          "name": "points_earned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'{}'::jsonb"
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "quiz_attempts_user_id_idx": {
+          "name": "quiz_attempts_user_id_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "quiz_attempts_quiz_id_idx": {
+          "name": "quiz_attempts_quiz_id_idx",
+          "columns": [
+            {
+              "expression": "quiz_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "quiz_attempts_user_completed_at_idx": {
+          "name": "quiz_attempts_user_completed_at_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "completed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "quiz_attempts_quiz_percentage_completed_at_idx": {
+          "name": "quiz_attempts_quiz_percentage_completed_at_idx",
+          "columns": [
+            {
+              "expression": "quiz_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "percentage",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "completed_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "quiz_attempts_quiz_integrity_score_idx": {
+          "name": "quiz_attempts_quiz_integrity_score_idx",
+          "columns": [
+            {
+              "expression": "quiz_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "integrity_score",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "quiz_attempts_user_id_users_id_fk": {
+          "name": "quiz_attempts_user_id_users_id_fk",
+          "tableFrom": "quiz_attempts",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "quiz_attempts_quiz_id_quizzes_id_fk": {
+          "name": "quiz_attempts_quiz_id_quizzes_id_fk",
+          "tableFrom": "quiz_attempts",
+          "columnsFrom": [
+            "quiz_id"
+          ],
+          "tableTo": "quizzes",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_question_content": {
+      "name": "quiz_question_content",
+      "schema": "",
+      "columns": {
+        "quiz_question_id": {
+          "name": "quiz_question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "question_text": {
+          "name": "question_text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "explanation": {
+          "name": "explanation",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "quiz_question_content_quiz_question_id_quiz_questions_id_fk": {
+          "name": "quiz_question_content_quiz_question_id_quiz_questions_id_fk",
+          "tableFrom": "quiz_question_content",
+          "columnsFrom": [
+            "quiz_question_id"
+          ],
+          "tableTo": "quiz_questions",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "quiz_question_content_quiz_question_id_locale_pk": {
+          "name": "quiz_question_content_quiz_question_id_locale_pk",
+          "columns": [
+            "quiz_question_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_questions": {
+      "name": "quiz_questions",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "quiz_id": {
+          "name": "quiz_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_question_id": {
+          "name": "source_question_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "difficulty": {
+          "name": "difficulty",
+          "type": "varchar(20)",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'medium'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "quiz_questions_quiz_display_order_idx": {
+          "name": "quiz_questions_quiz_display_order_idx",
+          "columns": [
+            {
+              "expression": "quiz_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "display_order",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "quiz_questions_quiz_id_quizzes_id_fk": {
+          "name": "quiz_questions_quiz_id_quizzes_id_fk",
+          "tableFrom": "quiz_questions",
+          "columnsFrom": [
+            "quiz_id"
+          ],
+          "tableTo": "quizzes",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quiz_translations": {
+      "name": "quiz_translations",
+      "schema": "",
+      "columns": {
+        "quiz_id": {
+          "name": "quiz_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "locale": {
+          "name": "locale",
+          "type": "varchar(5)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "varchar(200)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "quiz_translations_quiz_id_quizzes_id_fk": {
+          "name": "quiz_translations_quiz_id_quizzes_id_fk",
+          "tableFrom": "quiz_translations",
+          "columnsFrom": [
+            "quiz_id"
+          ],
+          "tableTo": "quizzes",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {
+        "quiz_translations_quiz_id_locale_pk": {
+          "name": "quiz_translations_quiz_id_locale_pk",
+          "columns": [
+            "quiz_id",
+            "locale"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.quizzes": {
+      "name": "quizzes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "category_id": {
+          "name": "category_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(100)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "questions_count": {
+          "name": "questions_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 10
+        },
+        "time_limit_seconds": {
+          "name": "time_limit_seconds",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "status": {
+          "name": "status",
+          "type": "varchar(20)",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ready'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "quizzes_slug_idx": {
+          "name": "quizzes_slug_idx",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "quizzes_category_id_categories_id_fk": {
+          "name": "quizzes_category_id_categories_id_fk",
+          "tableFrom": "quizzes",
+          "columnsFrom": [
+            "category_id"
+          ],
+          "tableTo": "categories",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "restrict"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "quizzes_category_id_slug_unique": {
+          "name": "quizzes_category_id_slug_unique",
+          "columns": [
+            "category_id",
+            "slug"
+          ],
+          "nullsNotDistinct": false
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.active_sessions": {
+      "name": "active_sessions",
+      "schema": "",
+      "columns": {
+        "session_id": {
+          "name": "session_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "last_activity": {
+          "name": "last_activity",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "active_sessions_last_activity_idx": {
+          "name": "active_sessions_last_activity_idx",
+          "columns": [
+            {
+              "expression": "last_activity",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.admin_audit_log": {
+      "name": "admin_audit_log",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "actor_user_id": {
+          "name": "actor_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "action": {
+          "name": "action",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_type": {
+          "name": "target_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "target_id": {
+          "name": "target_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "dedupe_key": {
+          "name": "dedupe_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "occurred_at": {
+          "name": "occurred_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "admin_audit_log_dedupe_key_uq": {
+          "name": "admin_audit_log_dedupe_key_uq",
+          "columns": [
+            {
+              "expression": "dedupe_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "admin_audit_log_order_id_idx": {
+          "name": "admin_audit_log_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "admin_audit_log_actor_user_id_idx": {
+          "name": "admin_audit_log_actor_user_id_idx",
+          "columns": [
+            {
+              "expression": "actor_user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "admin_audit_log_occurred_at_idx": {
+          "name": "admin_audit_log_occurred_at_idx",
+          "columns": [
+            {
+              "expression": "occurred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "admin_audit_log_order_id_orders_id_fk": {
+          "name": "admin_audit_log_order_id_orders_id_fk",
+          "tableFrom": "admin_audit_log",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        },
+        "admin_audit_log_actor_user_id_users_id_fk": {
+          "name": "admin_audit_log_actor_user_id_users_id_fk",
+          "tableFrom": "admin_audit_log",
+          "columnsFrom": [
+            "actor_user_id"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.api_rate_limits": {
+      "name": "api_rate_limits",
+      "schema": "",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "window_started_at": {
+          "name": "window_started_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "count": {
+          "name": "count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "api_rate_limits_updated_at_idx": {
+          "name": "api_rate_limits_updated_at_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "api_rate_limits_count_non_negative": {
+          "name": "api_rate_limits_count_non_negative",
+          "value": "\"api_rate_limits\".\"count\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.internal_job_state": {
+      "name": "internal_job_state",
+      "schema": "",
+      "columns": {
+        "job_name": {
+          "name": "job_name",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "next_allowed_at": {
+          "name": "next_allowed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "last_run_id": {
+          "name": "last_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.inventory_moves": {
+      "name": "inventory_moves",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "move_key": {
+          "name": "move_key",
+          "type": "varchar(200)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "product_id": {
+          "name": "product_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "inventory_move_type",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "inventory_moves_move_key_uq": {
+          "name": "inventory_moves_move_key_uq",
+          "columns": [
+            {
+              "expression": "move_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "inventory_moves_order_id_idx": {
+          "name": "inventory_moves_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "inventory_moves_product_id_idx": {
+          "name": "inventory_moves_product_id_idx",
+          "columns": [
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "inventory_moves_order_id_orders_id_fk": {
+          "name": "inventory_moves_order_id_orders_id_fk",
+          "tableFrom": "inventory_moves",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "inventory_moves_product_id_products_id_fk": {
+          "name": "inventory_moves_product_id_products_id_fk",
+          "tableFrom": "inventory_moves",
+          "columnsFrom": [
+            "product_id"
+          ],
+          "tableTo": "products",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "inventory_moves_quantity_gt_0": {
+          "name": "inventory_moves_quantity_gt_0",
+          "value": "\"inventory_moves\".\"quantity\" > 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.monobank_events": {
+      "name": "monobank_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'monobank'"
+        },
+        "event_key": {
+          "name": "event_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "invoice_id": {
+          "name": "invoice_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "amount": {
+          "name": "amount",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ccy": {
+          "name": "ccy",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "reference": {
+          "name": "reference",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "raw_payload": {
+          "name": "raw_payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "normalized_payload": {
+          "name": "normalized_payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_modified_at": {
+          "name": "provider_modified_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claim_expires_at": {
+          "name": "claim_expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_by": {
+          "name": "claimed_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "applied_at": {
+          "name": "applied_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "applied_result": {
+          "name": "applied_result",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "applied_error_code": {
+          "name": "applied_error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "applied_error_message": {
+          "name": "applied_error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "raw_sha256": {
+          "name": "raw_sha256",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "received_at": {
+          "name": "received_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "monobank_events_event_key_unique": {
+          "name": "monobank_events_event_key_unique",
+          "columns": [
+            {
+              "expression": "event_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "monobank_events_raw_sha256_unique": {
+          "name": "monobank_events_raw_sha256_unique",
+          "columns": [
+            {
+              "expression": "raw_sha256",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "monobank_events_order_id_idx": {
+          "name": "monobank_events_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "monobank_events_attempt_id_idx": {
+          "name": "monobank_events_attempt_id_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "monobank_events_claim_expires_idx": {
+          "name": "monobank_events_claim_expires_idx",
+          "columns": [
+            {
+              "expression": "claim_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "monobank_events_attempt_id_payment_attempts_id_fk": {
+          "name": "monobank_events_attempt_id_payment_attempts_id_fk",
+          "tableFrom": "monobank_events",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "tableTo": "payment_attempts",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        },
+        "monobank_events_order_id_orders_id_fk": {
+          "name": "monobank_events_order_id_orders_id_fk",
+          "tableFrom": "monobank_events",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "monobank_events_provider_check": {
+          "name": "monobank_events_provider_check",
+          "value": "\"monobank_events\".\"provider\" in ('monobank')"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.monobank_payment_cancels": {
+      "name": "monobank_payment_cancels",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "ext_ref": {
+          "name": "ext_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "invoice_id": {
+          "name": "invoice_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'requested'"
+        },
+        "request_id": {
+          "name": "request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "error_code": {
+          "name": "error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "error_message": {
+          "name": "error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_response": {
+          "name": "psp_response",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "monobank_payment_cancels_ext_ref_unique": {
+          "name": "monobank_payment_cancels_ext_ref_unique",
+          "columns": [
+            {
+              "expression": "ext_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "monobank_payment_cancels_order_id_idx": {
+          "name": "monobank_payment_cancels_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "monobank_payment_cancels_attempt_id_idx": {
+          "name": "monobank_payment_cancels_attempt_id_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "monobank_payment_cancels_order_id_orders_id_fk": {
+          "name": "monobank_payment_cancels_order_id_orders_id_fk",
+          "tableFrom": "monobank_payment_cancels",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "monobank_payment_cancels_attempt_id_payment_attempts_id_fk": {
+          "name": "monobank_payment_cancels_attempt_id_payment_attempts_id_fk",
+          "tableFrom": "monobank_payment_cancels",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "tableTo": "payment_attempts",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "monobank_payment_cancels_status_check": {
+          "name": "monobank_payment_cancels_status_check",
+          "value": "\"monobank_payment_cancels\".\"status\" in ('requested','processing','success','failure')"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.monobank_refunds": {
+      "name": "monobank_refunds",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'monobank'"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "ext_ref": {
+          "name": "ext_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'requested'"
+        },
+        "amount_minor": {
+          "name": "amount_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'UAH'"
+        },
+        "provider_created_at": {
+          "name": "provider_created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_modified_at": {
+          "name": "provider_modified_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "monobank_refunds_ext_ref_unique": {
+          "name": "monobank_refunds_ext_ref_unique",
+          "columns": [
+            {
+              "expression": "ext_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "monobank_refunds_order_id_idx": {
+          "name": "monobank_refunds_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "monobank_refunds_attempt_id_idx": {
+          "name": "monobank_refunds_attempt_id_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "monobank_refunds_order_id_orders_id_fk": {
+          "name": "monobank_refunds_order_id_orders_id_fk",
+          "tableFrom": "monobank_refunds",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "monobank_refunds_attempt_id_payment_attempts_id_fk": {
+          "name": "monobank_refunds_attempt_id_payment_attempts_id_fk",
+          "tableFrom": "monobank_refunds",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "tableTo": "payment_attempts",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "monobank_refunds_provider_check": {
+          "name": "monobank_refunds_provider_check",
+          "value": "\"monobank_refunds\".\"provider\" in ('monobank')"
+        },
+        "monobank_refunds_status_check": {
+          "name": "monobank_refunds_status_check",
+          "value": "\"monobank_refunds\".\"status\" in ('requested','processing','success','failure','needs_review')"
+        },
+        "monobank_refunds_amount_minor_non_negative": {
+          "name": "monobank_refunds_amount_minor_non_negative",
+          "value": "\"monobank_refunds\".\"amount_minor\" >= 0"
+        },
+        "monobank_refunds_currency_uah": {
+          "name": "monobank_refunds_currency_uah",
+          "value": "\"monobank_refunds\".\"currency\" = 'UAH'"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.notification_outbox": {
+      "name": "notification_outbox",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "channel": {
+          "name": "channel",
+          "type": "notification_channel",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'email'"
+        },
+        "template_key": {
+          "name": "template_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_domain": {
+          "name": "source_domain",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "source_event_id": {
+          "name": "source_event_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "attempt_count": {
+          "name": "attempt_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "max_attempts": {
+          "name": "max_attempts",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 5
+        },
+        "next_attempt_at": {
+          "name": "next_attempt_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "lease_owner": {
+          "name": "lease_owner",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lease_expires_at": {
+          "name": "lease_expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_code": {
+          "name": "last_error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_message": {
+          "name": "last_error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sent_at": {
+          "name": "sent_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "dead_lettered_at": {
+          "name": "dead_lettered_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "dedupe_key": {
+          "name": "dedupe_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "notification_outbox_dedupe_key_uq": {
+          "name": "notification_outbox_dedupe_key_uq",
+          "columns": [
+            {
+              "expression": "dedupe_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "notification_outbox_status_next_attempt_idx": {
+          "name": "notification_outbox_status_next_attempt_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "next_attempt_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "notification_outbox_status_lease_expires_idx": {
+          "name": "notification_outbox_status_lease_expires_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "lease_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "notification_outbox_order_created_idx": {
+          "name": "notification_outbox_order_created_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "notification_outbox_template_status_idx": {
+          "name": "notification_outbox_template_status_idx",
+          "columns": [
+            {
+              "expression": "template_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "notification_outbox_order_id_orders_id_fk": {
+          "name": "notification_outbox_order_id_orders_id_fk",
+          "tableFrom": "notification_outbox",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "notification_outbox_source_domain_chk": {
+          "name": "notification_outbox_source_domain_chk",
+          "value": "\"notification_outbox\".\"source_domain\" in ('shipping_event','payment_event')"
+        },
+        "notification_outbox_status_chk": {
+          "name": "notification_outbox_status_chk",
+          "value": "\"notification_outbox\".\"status\" in ('pending','processing','sent','failed','dead_letter')"
+        },
+        "notification_outbox_attempt_count_non_negative_chk": {
+          "name": "notification_outbox_attempt_count_non_negative_chk",
+          "value": "\"notification_outbox\".\"attempt_count\" >= 0"
+        },
+        "notification_outbox_max_attempts_positive_chk": {
+          "name": "notification_outbox_max_attempts_positive_chk",
+          "value": "\"notification_outbox\".\"max_attempts\" >= 1"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.np_cities": {
+      "name": "np_cities",
+      "schema": "",
+      "columns": {
+        "ref": {
+          "name": "ref",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name_ua": {
+          "name": "name_ua",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name_ru": {
+          "name": "name_ru",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "area": {
+          "name": "area",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "region": {
+          "name": "region",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "settlement_type": {
+          "name": "settlement_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "last_sync_run_id": {
+          "name": "last_sync_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "np_cities_active_name_idx": {
+          "name": "np_cities_active_name_idx",
+          "columns": [
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name_ua",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "np_cities_last_sync_run_idx": {
+          "name": "np_cities_last_sync_run_idx",
+          "columns": [
+            {
+              "expression": "last_sync_run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "np_cities_active_name_prefix_idx": {
+          "name": "np_cities_active_name_prefix_idx",
+          "columns": [
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name_ua",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.np_warehouses": {
+      "name": "np_warehouses",
+      "schema": "",
+      "columns": {
+        "ref": {
+          "name": "ref",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "city_ref": {
+          "name": "city_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "settlement_ref": {
+          "name": "settlement_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "number": {
+          "name": "number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name_ru": {
+          "name": "name_ru",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "address": {
+          "name": "address",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "address_ru": {
+          "name": "address_ru",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "is_post_machine": {
+          "name": "is_post_machine",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "last_sync_run_id": {
+          "name": "last_sync_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "np_warehouses_settlement_active_idx": {
+          "name": "np_warehouses_settlement_active_idx",
+          "columns": [
+            {
+              "expression": "settlement_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "np_warehouses_city_active_idx": {
+          "name": "np_warehouses_city_active_idx",
+          "columns": [
+            {
+              "expression": "city_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "np_warehouses_active_name_idx": {
+          "name": "np_warehouses_active_name_idx",
+          "columns": [
+            {
+              "expression": "is_active",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "name",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "np_warehouses_last_sync_run_idx": {
+          "name": "np_warehouses_last_sync_run_idx",
+          "columns": [
+            {
+              "expression": "last_sync_run_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "np_warehouses_city_ref_np_cities_ref_fk": {
+          "name": "np_warehouses_city_ref_np_cities_ref_fk",
+          "tableFrom": "np_warehouses",
+          "columnsFrom": [
+            "city_ref"
+          ],
+          "tableTo": "np_cities",
+          "columnsTo": [
+            "ref"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.order_items": {
+      "name": "order_items",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "product_id": {
+          "name": "product_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "selected_size": {
+          "name": "selected_size",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "selected_color": {
+          "name": "selected_color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unit_price_minor": {
+          "name": "unit_price_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "line_total_minor": {
+          "name": "line_total_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unit_price": {
+          "name": "unit_price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "line_total": {
+          "name": "line_total",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "product_title": {
+          "name": "product_title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "product_slug": {
+          "name": "product_slug",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "product_sku": {
+          "name": "product_sku",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "order_items_order_id_idx": {
+          "name": "order_items_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "order_items_order_variant_uq": {
+          "name": "order_items_order_variant_uq",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "selected_size",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "selected_color",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "order_items_order_id_orders_id_fk": {
+          "name": "order_items_order_id_orders_id_fk",
+          "tableFrom": "order_items",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "order_items_product_id_products_id_fk": {
+          "name": "order_items_product_id_products_id_fk",
+          "tableFrom": "order_items",
+          "columnsFrom": [
+            "product_id"
+          ],
+          "tableTo": "products",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "order_items_quantity_positive": {
+          "name": "order_items_quantity_positive",
+          "value": "\"order_items\".\"quantity\" > 0"
+        },
+        "order_items_unit_price_minor_non_negative": {
+          "name": "order_items_unit_price_minor_non_negative",
+          "value": "\"order_items\".\"unit_price_minor\" >= 0"
+        },
+        "order_items_line_total_minor_non_negative": {
+          "name": "order_items_line_total_minor_non_negative",
+          "value": "\"order_items\".\"line_total_minor\" >= 0"
+        },
+        "order_items_line_total_consistent": {
+          "name": "order_items_line_total_consistent",
+          "value": "\"order_items\".\"line_total_minor\" = \"order_items\".\"unit_price_minor\" * \"order_items\".\"quantity\""
+        },
+        "order_items_unit_price_mirror_consistent": {
+          "name": "order_items_unit_price_mirror_consistent",
+          "value": "\"order_items\".\"unit_price\" = (\"order_items\".\"unit_price_minor\"::numeric / 100)"
+        },
+        "order_items_line_total_mirror_consistent": {
+          "name": "order_items_line_total_mirror_consistent",
+          "value": "\"order_items\".\"line_total\" = (\"order_items\".\"line_total_minor\"::numeric / 100)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.order_legal_consents": {
+      "name": "order_legal_consents",
+      "schema": "",
+      "columns": {
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "terms_accepted": {
+          "name": "terms_accepted",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "privacy_accepted": {
+          "name": "privacy_accepted",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "terms_version": {
+          "name": "terms_version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "privacy_version": {
+          "name": "privacy_version",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "consented_at": {
+          "name": "consented_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "source": {
+          "name": "source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'checkout'"
+        },
+        "locale": {
+          "name": "locale",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "country": {
+          "name": "country",
+          "type": "varchar(2)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "order_legal_consents_consented_idx": {
+          "name": "order_legal_consents_consented_idx",
+          "columns": [
+            {
+              "expression": "consented_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "order_legal_consents_order_id_orders_id_fk": {
+          "name": "order_legal_consents_order_id_orders_id_fk",
+          "tableFrom": "order_legal_consents",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "order_legal_consents_terms_accepted_chk": {
+          "name": "order_legal_consents_terms_accepted_chk",
+          "value": "\"order_legal_consents\".\"terms_accepted\" = true"
+        },
+        "order_legal_consents_privacy_accepted_chk": {
+          "name": "order_legal_consents_privacy_accepted_chk",
+          "value": "\"order_legal_consents\".\"privacy_accepted\" = true"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.order_shipping": {
+      "name": "order_shipping",
+      "schema": "",
+      "columns": {
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "shipping_address": {
+          "name": "shipping_address",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "order_shipping_updated_idx": {
+          "name": "order_shipping_updated_idx",
+          "columns": [
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "order_shipping_order_id_orders_id_fk": {
+          "name": "order_shipping_order_id_orders_id_fk",
+          "tableFrom": "order_shipping",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.orders": {
+      "name": "orders",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "total_amount_minor": {
+          "name": "total_amount_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "total_amount": {
+          "name": "total_amount",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'USD'"
+        },
+        "fulfillment_mode": {
+          "name": "fulfillment_mode",
+          "type": "fulfillment_mode",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'ua_np'"
+        },
+        "quote_status": {
+          "name": "quote_status",
+          "type": "quote_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        },
+        "quote_version": {
+          "name": "quote_version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_quote_minor": {
+          "name": "shipping_quote_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "items_subtotal_minor": {
+          "name": "items_subtotal_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "quote_accepted_at": {
+          "name": "quote_accepted_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quote_payment_deadline_at": {
+          "name": "quote_payment_deadline_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_required": {
+          "name": "shipping_required",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_payer": {
+          "name": "shipping_payer",
+          "type": "shipping_payer",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_provider": {
+          "name": "shipping_provider",
+          "type": "shipping_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_method_code": {
+          "name": "shipping_method_code",
+          "type": "shipping_method_code",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_amount_minor": {
+          "name": "shipping_amount_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_status": {
+          "name": "shipping_status",
+          "type": "shipping_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tracking_number": {
+          "name": "tracking_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "shipping_provider_ref": {
+          "name": "shipping_provider_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payment_status": {
+          "name": "payment_status",
+          "type": "payment_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'pending'"
+        },
+        "payment_provider": {
+          "name": "payment_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'stripe'"
+        },
+        "payment_intent_id": {
+          "name": "payment_intent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_charge_id": {
+          "name": "psp_charge_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_payment_method": {
+          "name": "psp_payment_method",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_status_reason": {
+          "name": "psp_status_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "psp_metadata": {
+          "name": "psp_metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "status": {
+          "name": "status",
+          "type": "order_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'CREATED'"
+        },
+        "inventory_status": {
+          "name": "inventory_status",
+          "type": "inventory_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        },
+        "failure_code": {
+          "name": "failure_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "failure_message": {
+          "name": "failure_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "idempotency_request_hash": {
+          "name": "idempotency_request_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "stock_restored": {
+          "name": "stock_restored",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "restocked_at": {
+          "name": "restocked_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "varchar(128)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "sweep_claimed_at": {
+          "name": "sweep_claimed_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sweep_claim_expires_at": {
+          "name": "sweep_claim_expires_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sweep_run_id": {
+          "name": "sweep_run_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "sweep_claimed_by": {
+          "name": "sweep_claimed_by",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "orders_sweep_claim_expires_idx": {
+          "name": "orders_sweep_claim_expires_idx",
+          "columns": [
+            {
+              "expression": "sweep_claim_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "idx_orders_user_id_created_at": {
+          "name": "idx_orders_user_id_created_at",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "orders_shipping_status_idx": {
+          "name": "orders_shipping_status_idx",
+          "columns": [
+            {
+              "expression": "shipping_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "orders_quote_status_deadline_idx": {
+          "name": "orders_quote_status_deadline_idx",
+          "columns": [
+            {
+              "expression": "fulfillment_mode",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "quote_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "quote_payment_deadline_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "orders_quote_status_updated_idx": {
+          "name": "orders_quote_status_updated_idx",
+          "columns": [
+            {
+              "expression": "quote_status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "orders_user_id_users_id_fk": {
+          "name": "orders_user_id_users_id_fk",
+          "tableFrom": "orders",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "orders_idempotency_key_unique": {
+          "name": "orders_idempotency_key_unique",
+          "columns": [
+            "idempotency_key"
+          ],
+          "nullsNotDistinct": false
+        }
+      },
+      "policies": {},
+      "checkConstraints": {
+        "orders_payment_provider_valid": {
+          "name": "orders_payment_provider_valid",
+          "value": "\"orders\".\"payment_provider\" in ('stripe', 'monobank', 'none')"
+        },
+        "orders_total_amount_minor_non_negative": {
+          "name": "orders_total_amount_minor_non_negative",
+          "value": "\"orders\".\"total_amount_minor\" >= 0"
+        },
+        "orders_items_subtotal_minor_non_negative": {
+          "name": "orders_items_subtotal_minor_non_negative",
+          "value": "\"orders\".\"items_subtotal_minor\" >= 0"
+        },
+        "orders_shipping_quote_minor_non_negative": {
+          "name": "orders_shipping_quote_minor_non_negative",
+          "value": "\"orders\".\"shipping_quote_minor\" is null or \"orders\".\"shipping_quote_minor\" >= 0"
+        },
+        "orders_payment_intent_id_null_when_none": {
+          "name": "orders_payment_intent_id_null_when_none",
+          "value": "\"orders\".\"payment_provider\" <> 'none' OR \"orders\".\"payment_intent_id\" IS NULL"
+        },
+        "orders_psp_fields_null_when_none": {
+          "name": "orders_psp_fields_null_when_none",
+          "value": "\"orders\".\"payment_provider\" <> 'none' OR (\n        \"orders\".\"psp_charge_id\" IS NULL AND\n        \"orders\".\"psp_payment_method\" IS NULL AND\n        \"orders\".\"psp_status_reason\" IS NULL\n      )"
+        },
+        "orders_total_amount_mirror_consistent": {
+          "name": "orders_total_amount_mirror_consistent",
+          "value": "\"orders\".\"total_amount\" = (\"orders\".\"total_amount_minor\"::numeric / 100)"
+        },
+        "orders_payment_status_valid_when_none": {
+          "name": "orders_payment_status_valid_when_none",
+          "value": "\"orders\".\"payment_provider\" <> 'none' OR \"orders\".\"payment_status\" in ('paid','failed')"
+        },
+        "orders_shipping_null_when_not_required_chk": {
+          "name": "orders_shipping_null_when_not_required_chk",
+          "value": "\n    \"orders\".\"shipping_required\" IS TRUE\n    OR (\n      \"orders\".\"shipping_provider\" IS NULL\n      AND \"orders\".\"shipping_method_code\" IS NULL\n      AND \"orders\".\"shipping_status\" IS NULL\n    )\n  "
+        },
+        "orders_shipping_present_when_required_chk": {
+          "name": "orders_shipping_present_when_required_chk",
+          "value": "\n    \"orders\".\"shipping_required\" IS DISTINCT FROM TRUE\n    OR (\n      \"orders\".\"shipping_provider\" IS NOT NULL\n      AND \"orders\".\"shipping_method_code\" IS NOT NULL\n      AND \"orders\".\"shipping_status\" IS NOT NULL\n    )\n  "
+        },
+        "orders_shipping_amount_minor_non_negative_chk": {
+          "name": "orders_shipping_amount_minor_non_negative_chk",
+          "value": "\"orders\".\"shipping_amount_minor\" IS NULL OR \"orders\".\"shipping_amount_minor\" >= 0"
+        },
+        "orders_shipping_payer_null_when_not_required_chk": {
+          "name": "orders_shipping_payer_null_when_not_required_chk",
+          "value": "\"orders\".\"shipping_required\" IS TRUE OR \"orders\".\"shipping_payer\" IS NULL"
+        },
+        "orders_shipping_payer_present_when_required_chk": {
+          "name": "orders_shipping_payer_present_when_required_chk",
+          "value": "\"orders\".\"shipping_required\" IS DISTINCT FROM TRUE OR \"orders\".\"shipping_payer\" IS NOT NULL"
+        },
+        "orders_intl_provider_restriction_chk": {
+          "name": "orders_intl_provider_restriction_chk",
+          "value": "\"orders\".\"fulfillment_mode\" <> 'intl' OR \"orders\".\"payment_provider\" in ('stripe', 'none')"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.payment_attempts": {
+      "name": "payment_attempts",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'active'"
+        },
+        "attempt_number": {
+          "name": "attempt_number",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expected_amount_minor": {
+          "name": "expected_amount_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider_payment_intent_id": {
+          "name": "provider_payment_intent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "checkout_url": {
+          "name": "checkout_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_created_at": {
+          "name": "provider_created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_modified_at": {
+          "name": "provider_modified_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "janitor_claimed_until": {
+          "name": "janitor_claimed_until",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "janitor_claimed_by": {
+          "name": "janitor_claimed_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_code": {
+          "name": "last_error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_message": {
+          "name": "last_error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "finalized_at": {
+          "name": "finalized_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {
+        "payment_attempts_order_provider_attempt_unique": {
+          "name": "payment_attempts_order_provider_attempt_unique",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "attempt_number",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "payment_attempts_idempotency_key_unique": {
+          "name": "payment_attempts_idempotency_key_unique",
+          "columns": [
+            {
+              "expression": "idempotency_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "payment_attempts_provider_pi_unique": {
+          "name": "payment_attempts_provider_pi_unique",
+          "columns": [
+            {
+              "expression": "provider_payment_intent_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "payment_attempts_order_provider_status_idx": {
+          "name": "payment_attempts_order_provider_status_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "payment_attempts_order_provider_active_unique": {
+          "name": "payment_attempts_order_provider_active_unique",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "where": "\"payment_attempts\".\"status\" in ('active','creating')",
+          "concurrently": false
+        },
+        "payment_attempts_provider_status_updated_idx": {
+          "name": "payment_attempts_provider_status_updated_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "payment_attempts_janitor_claim_idx": {
+          "name": "payment_attempts_janitor_claim_idx",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "janitor_claimed_until",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "payment_attempts_order_id_orders_id_fk": {
+          "name": "payment_attempts_order_id_orders_id_fk",
+          "tableFrom": "payment_attempts",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "payment_attempts_provider_check": {
+          "name": "payment_attempts_provider_check",
+          "value": "\"payment_attempts\".\"provider\" in ('stripe','monobank')"
+        },
+        "payment_attempts_status_check": {
+          "name": "payment_attempts_status_check",
+          "value": "\"payment_attempts\".\"status\" in ('creating','active','succeeded','failed','canceled')"
+        },
+        "payment_attempts_attempt_number_check": {
+          "name": "payment_attempts_attempt_number_check",
+          "value": "\"payment_attempts\".\"attempt_number\" >= 1"
+        },
+        "payment_attempts_expected_amount_minor_non_negative": {
+          "name": "payment_attempts_expected_amount_minor_non_negative",
+          "value": "\"payment_attempts\".\"expected_amount_minor\" is null or \"payment_attempts\".\"expected_amount_minor\" >= 0"
+        },
+        "payment_attempts_mono_currency_uah": {
+          "name": "payment_attempts_mono_currency_uah",
+          "value": "\"payment_attempts\".\"provider\" <> 'monobank' OR \"payment_attempts\".\"currency\" = 'UAH'"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.payment_events": {
+      "name": "payment_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_name": {
+          "name": "event_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_source": {
+          "name": "event_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_ref": {
+          "name": "event_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "attempt_id": {
+          "name": "attempt_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_payment_intent_id": {
+          "name": "provider_payment_intent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_charge_id": {
+          "name": "provider_charge_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "amount_minor": {
+          "name": "amount_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "dedupe_key": {
+          "name": "dedupe_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "occurred_at": {
+          "name": "occurred_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "payment_events_dedupe_key_uq": {
+          "name": "payment_events_dedupe_key_uq",
+          "columns": [
+            {
+              "expression": "dedupe_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "payment_events_order_id_idx": {
+          "name": "payment_events_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "payment_events_attempt_id_idx": {
+          "name": "payment_events_attempt_id_idx",
+          "columns": [
+            {
+              "expression": "attempt_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "payment_events_event_ref_idx": {
+          "name": "payment_events_event_ref_idx",
+          "columns": [
+            {
+              "expression": "event_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "payment_events_occurred_at_idx": {
+          "name": "payment_events_occurred_at_idx",
+          "columns": [
+            {
+              "expression": "occurred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "payment_events_order_id_orders_id_fk": {
+          "name": "payment_events_order_id_orders_id_fk",
+          "tableFrom": "payment_events",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "payment_events_attempt_id_payment_attempts_id_fk": {
+          "name": "payment_events_attempt_id_payment_attempts_id_fk",
+          "tableFrom": "payment_events",
+          "columnsFrom": [
+            "attempt_id"
+          ],
+          "tableTo": "payment_attempts",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.product_prices": {
+      "name": "product_prices",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "product_id": {
+          "name": "product_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "price_minor": {
+          "name": "price_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "original_price_minor": {
+          "name": "original_price_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "price": {
+          "name": "price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "original_price": {
+          "name": "original_price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "product_prices_product_id_idx": {
+          "name": "product_prices_product_id_idx",
+          "columns": [
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "product_prices_product_currency_uq": {
+          "name": "product_prices_product_currency_uq",
+          "columns": [
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "currency",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "product_prices_product_id_products_id_fk": {
+          "name": "product_prices_product_id_products_id_fk",
+          "tableFrom": "product_prices",
+          "columnsFrom": [
+            "product_id"
+          ],
+          "tableTo": "products",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "product_prices_price_positive": {
+          "name": "product_prices_price_positive",
+          "value": "\"product_prices\".\"price_minor\" > 0"
+        },
+        "product_prices_original_price_valid": {
+          "name": "product_prices_original_price_valid",
+          "value": "\"product_prices\".\"original_price_minor\" is null or \"product_prices\".\"original_price_minor\" > \"product_prices\".\"price_minor\""
+        },
+        "product_prices_price_mirror_consistent": {
+          "name": "product_prices_price_mirror_consistent",
+          "value": "\"product_prices\".\"price\" = (\"product_prices\".\"price_minor\"::numeric / 100)"
+        },
+        "product_prices_original_price_null_coupled": {
+          "name": "product_prices_original_price_null_coupled",
+          "value": "(\"product_prices\".\"original_price_minor\" is null) = (\"product_prices\".\"original_price\" is null)"
+        },
+        "product_prices_original_price_mirror_consistent": {
+          "name": "product_prices_original_price_mirror_consistent",
+          "value": "\"product_prices\".\"original_price_minor\" is null or \"product_prices\".\"original_price\" = (\"product_prices\".\"original_price_minor\"::numeric / 100)"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.products": {
+      "name": "products",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "slug": {
+          "name": "slug",
+          "type": "varchar(255)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image_public_id": {
+          "name": "image_public_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "price": {
+          "name": "price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "original_price": {
+          "name": "original_price",
+          "type": "numeric(10, 2)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'USD'"
+        },
+        "category": {
+          "name": "category",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "colors": {
+          "name": "colors",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "sizes": {
+          "name": "sizes",
+          "type": "text[]",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::text[]"
+        },
+        "badge": {
+          "name": "badge",
+          "type": "product_badge",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'NONE'"
+        },
+        "is_active": {
+          "name": "is_active",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "is_featured": {
+          "name": "is_featured",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "stock": {
+          "name": "stock",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "sku": {
+          "name": "sku",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "products_slug_unique": {
+          "name": "products_slug_unique",
+          "columns": [
+            {
+              "expression": "slug",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "products_stock_non_negative": {
+          "name": "products_stock_non_negative",
+          "value": "\"products\".\"stock\" >= 0"
+        },
+        "products_currency_usd_only": {
+          "name": "products_currency_usd_only",
+          "value": "\"products\".\"currency\" = 'USD'"
+        },
+        "products_price_positive": {
+          "name": "products_price_positive",
+          "value": "\"products\".\"price\" > 0"
+        },
+        "products_original_price_valid": {
+          "name": "products_original_price_valid",
+          "value": "\"products\".\"original_price\" is null or \"products\".\"original_price\" > \"products\".\"price\""
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.return_items": {
+      "name": "return_items",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "return_request_id": {
+          "name": "return_request_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "order_item_id": {
+          "name": "order_item_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "product_id": {
+          "name": "product_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "quantity": {
+          "name": "quantity",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "unit_price_minor": {
+          "name": "unit_price_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "line_total_minor": {
+          "name": "line_total_minor",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "varchar(200)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "return_items_idempotency_key_uq": {
+          "name": "return_items_idempotency_key_uq",
+          "columns": [
+            {
+              "expression": "idempotency_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "return_items_return_request_idx": {
+          "name": "return_items_return_request_idx",
+          "columns": [
+            {
+              "expression": "return_request_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "return_items_order_id_idx": {
+          "name": "return_items_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "return_items_product_id_idx": {
+          "name": "return_items_product_id_idx",
+          "columns": [
+            {
+              "expression": "product_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "return_items_return_request_id_return_requests_id_fk": {
+          "name": "return_items_return_request_id_return_requests_id_fk",
+          "tableFrom": "return_items",
+          "columnsFrom": [
+            "return_request_id"
+          ],
+          "tableTo": "return_requests",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "return_items_order_id_orders_id_fk": {
+          "name": "return_items_order_id_orders_id_fk",
+          "tableFrom": "return_items",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "return_items_order_item_id_order_items_id_fk": {
+          "name": "return_items_order_item_id_order_items_id_fk",
+          "tableFrom": "return_items",
+          "columnsFrom": [
+            "order_item_id"
+          ],
+          "tableTo": "order_items",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        },
+        "return_items_product_id_products_id_fk": {
+          "name": "return_items_product_id_products_id_fk",
+          "tableFrom": "return_items",
+          "columnsFrom": [
+            "product_id"
+          ],
+          "tableTo": "products",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        },
+        "return_items_return_request_order_fk": {
+          "name": "return_items_return_request_order_fk",
+          "tableFrom": "return_items",
+          "columnsFrom": [
+            "return_request_id",
+            "order_id"
+          ],
+          "tableTo": "return_requests",
+          "columnsTo": [
+            "id",
+            "order_id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "return_items_quantity_positive_chk": {
+          "name": "return_items_quantity_positive_chk",
+          "value": "\"return_items\".\"quantity\" > 0"
+        },
+        "return_items_unit_price_minor_non_negative_chk": {
+          "name": "return_items_unit_price_minor_non_negative_chk",
+          "value": "\"return_items\".\"unit_price_minor\" >= 0"
+        },
+        "return_items_line_total_minor_non_negative_chk": {
+          "name": "return_items_line_total_minor_non_negative_chk",
+          "value": "\"return_items\".\"line_total_minor\" >= 0"
+        },
+        "return_items_line_total_consistent_chk": {
+          "name": "return_items_line_total_consistent_chk",
+          "value": "\"return_items\".\"line_total_minor\" = (\"return_items\".\"unit_price_minor\" * \"return_items\".\"quantity\")"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.return_requests": {
+      "name": "return_requests",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status": {
+          "name": "status",
+          "type": "return_request_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'requested'"
+        },
+        "reason": {
+          "name": "reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "policy_restock": {
+          "name": "policy_restock",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "refund_amount_minor": {
+          "name": "refund_amount_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "idempotency_key": {
+          "name": "idempotency_key",
+          "type": "varchar(128)",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "approved_at": {
+          "name": "approved_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "approved_by": {
+          "name": "approved_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rejected_at": {
+          "name": "rejected_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "rejected_by": {
+          "name": "rejected_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "received_at": {
+          "name": "received_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "received_by": {
+          "name": "received_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refunded_at": {
+          "name": "refunded_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refunded_by": {
+          "name": "refunded_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "refund_provider_ref": {
+          "name": "refund_provider_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "return_requests_order_id_uq": {
+          "name": "return_requests_order_id_uq",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "return_requests_id_order_id_uq": {
+          "name": "return_requests_id_order_id_uq",
+          "columns": [
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "return_requests_idempotency_key_uq": {
+          "name": "return_requests_idempotency_key_uq",
+          "columns": [
+            {
+              "expression": "idempotency_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "return_requests_status_created_idx": {
+          "name": "return_requests_status_created_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "return_requests_user_id_created_idx": {
+          "name": "return_requests_user_id_created_idx",
+          "columns": [
+            {
+              "expression": "user_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "created_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "return_requests_order_id_orders_id_fk": {
+          "name": "return_requests_order_id_orders_id_fk",
+          "tableFrom": "return_requests",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "return_requests_user_id_users_id_fk": {
+          "name": "return_requests_user_id_users_id_fk",
+          "tableFrom": "return_requests",
+          "columnsFrom": [
+            "user_id"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        },
+        "return_requests_approved_by_users_id_fk": {
+          "name": "return_requests_approved_by_users_id_fk",
+          "tableFrom": "return_requests",
+          "columnsFrom": [
+            "approved_by"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        },
+        "return_requests_rejected_by_users_id_fk": {
+          "name": "return_requests_rejected_by_users_id_fk",
+          "tableFrom": "return_requests",
+          "columnsFrom": [
+            "rejected_by"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        },
+        "return_requests_received_by_users_id_fk": {
+          "name": "return_requests_received_by_users_id_fk",
+          "tableFrom": "return_requests",
+          "columnsFrom": [
+            "received_by"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        },
+        "return_requests_refunded_by_users_id_fk": {
+          "name": "return_requests_refunded_by_users_id_fk",
+          "tableFrom": "return_requests",
+          "columnsFrom": [
+            "refunded_by"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "return_requests_refund_amount_minor_non_negative_chk": {
+          "name": "return_requests_refund_amount_minor_non_negative_chk",
+          "value": "\"return_requests\".\"refund_amount_minor\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.shipping_events": {
+      "name": "shipping_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "shipment_id": {
+          "name": "shipment_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_name": {
+          "name": "event_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_source": {
+          "name": "event_source",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "event_ref": {
+          "name": "event_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_from": {
+          "name": "status_from",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "status_to": {
+          "name": "status_to",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tracking_number": {
+          "name": "tracking_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "dedupe_key": {
+          "name": "dedupe_key",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "occurred_at": {
+          "name": "occurred_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "shipping_events_dedupe_key_uq": {
+          "name": "shipping_events_dedupe_key_uq",
+          "columns": [
+            {
+              "expression": "dedupe_key",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "shipping_events_order_id_idx": {
+          "name": "shipping_events_order_id_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "shipping_events_shipment_id_idx": {
+          "name": "shipping_events_shipment_id_idx",
+          "columns": [
+            {
+              "expression": "shipment_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "shipping_events_occurred_at_idx": {
+          "name": "shipping_events_occurred_at_idx",
+          "columns": [
+            {
+              "expression": "occurred_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "shipping_events_order_id_orders_id_fk": {
+          "name": "shipping_events_order_id_orders_id_fk",
+          "tableFrom": "shipping_events",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "shipping_events_shipment_id_shipping_shipments_id_fk": {
+          "name": "shipping_events_shipment_id_shipping_shipments_id_fk",
+          "tableFrom": "shipping_events",
+          "columnsFrom": [
+            "shipment_id"
+          ],
+          "tableTo": "shipping_shipments",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.shipping_quotes": {
+      "name": "shipping_quotes",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "status": {
+          "name": "status",
+          "type": "quote_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "currency": {
+          "name": "currency",
+          "type": "currency",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "shipping_quote_minor": {
+          "name": "shipping_quote_minor",
+          "type": "bigint",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "offered_by": {
+          "name": "offered_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "offered_at": {
+          "name": "offered_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "accepted_at": {
+          "name": "accepted_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "declined_at": {
+          "name": "declined_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "payload": {
+          "name": "payload",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'{}'::jsonb"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "shipping_quotes_order_version_uq": {
+          "name": "shipping_quotes_order_version_uq",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "version",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "shipping_quotes_order_status_idx": {
+          "name": "shipping_quotes_order_status_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "shipping_quotes_status_expires_idx": {
+          "name": "shipping_quotes_status_expires_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "shipping_quotes_order_updated_idx": {
+          "name": "shipping_quotes_order_updated_idx",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "updated_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "shipping_quotes_order_id_orders_id_fk": {
+          "name": "shipping_quotes_order_id_orders_id_fk",
+          "tableFrom": "shipping_quotes",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        },
+        "shipping_quotes_offered_by_users_id_fk": {
+          "name": "shipping_quotes_offered_by_users_id_fk",
+          "tableFrom": "shipping_quotes",
+          "columnsFrom": [
+            "offered_by"
+          ],
+          "tableTo": "users",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "set null"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "shipping_quotes_version_positive_chk": {
+          "name": "shipping_quotes_version_positive_chk",
+          "value": "\"shipping_quotes\".\"version\" >= 1"
+        },
+        "shipping_quotes_quote_minor_non_negative_chk": {
+          "name": "shipping_quotes_quote_minor_non_negative_chk",
+          "value": "\"shipping_quotes\".\"shipping_quote_minor\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.shipping_shipments": {
+      "name": "shipping_shipments",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "shipping_provider",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'nova_poshta'"
+        },
+        "status": {
+          "name": "status",
+          "type": "shipping_shipment_status",
+          "typeSchema": "public",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'queued'"
+        },
+        "attempt_count": {
+          "name": "attempt_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "next_attempt_at": {
+          "name": "next_attempt_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_code": {
+          "name": "last_error_code",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "last_error_message": {
+          "name": "last_error_message",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider_ref": {
+          "name": "provider_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "tracking_number": {
+          "name": "tracking_number",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lease_owner": {
+          "name": "lease_owner",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "lease_expires_at": {
+          "name": "lease_expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "shipping_shipments_order_id_uq": {
+          "name": "shipping_shipments_order_id_uq",
+          "columns": [
+            {
+              "expression": "order_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "shipping_shipments_queue_idx": {
+          "name": "shipping_shipments_queue_idx",
+          "columns": [
+            {
+              "expression": "status",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "next_attempt_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "shipping_shipments_lease_idx": {
+          "name": "shipping_shipments_lease_idx",
+          "columns": [
+            {
+              "expression": "lease_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "shipping_shipments_provider_ref_idx": {
+          "name": "shipping_shipments_provider_ref_idx",
+          "columns": [
+            {
+              "expression": "provider_ref",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "shipping_shipments_order_id_orders_id_fk": {
+          "name": "shipping_shipments_order_id_orders_id_fk",
+          "tableFrom": "shipping_shipments",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {
+        "shipping_shipments_attempt_count_non_negative_chk": {
+          "name": "shipping_shipments_attempt_count_non_negative_chk",
+          "value": "\"shipping_shipments\".\"attempt_count\" >= 0"
+        }
+      },
+      "isRLSEnabled": false
+    },
+    "public.stripe_events": {
+      "name": "stripe_events",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "uuid",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'stripe'"
+        },
+        "event_id": {
+          "name": "event_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payment_intent_id": {
+          "name": "payment_intent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "order_id": {
+          "name": "order_id",
+          "type": "uuid",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "event_type": {
+          "name": "event_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "payment_status": {
+          "name": "payment_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_at": {
+          "name": "claimed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claim_expires_at": {
+          "name": "claim_expires_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "claimed_by": {
+          "name": "claimed_by",
+          "type": "varchar(64)",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "processed_at": {
+          "name": "processed_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "stripe_events_event_id_idx": {
+          "name": "stripe_events_event_id_idx",
+          "columns": [
+            {
+              "expression": "event_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        },
+        "stripe_events_claim_expires_idx": {
+          "name": "stripe_events_claim_expires_idx",
+          "columns": [
+            {
+              "expression": "claim_expires_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {
+        "stripe_events_order_id_orders_id_fk": {
+          "name": "stripe_events_order_id_orders_id_fk",
+          "tableFrom": "stripe_events",
+          "columnsFrom": [
+            "order_id"
+          ],
+          "tableTo": "orders",
+          "columnsTo": [
+            "id"
+          ],
+          "onUpdate": "no action",
+          "onDelete": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "public.users": {
+      "name": "users",
+      "schema": "",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "default": "gen_random_uuid()"
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "password_hash": {
+          "name": "password_hash",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'credentials'"
+        },
+        "provider_id": {
+          "name": "provider_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email_verified": {
+          "name": "email_verified",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'user'"
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {
+        "users_provider_provider_id_unique": {
+          "name": "users_provider_provider_id_unique",
+          "columns": [
+            {
+              "expression": "provider",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "provider_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": true,
+          "with": {},
+          "method": "btree",
+          "concurrently": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "users_email_unique": {
+          "name": "users_email_unique",
+          "columns": [
+            "email"
+          ],
+          "nullsNotDistinct": false
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {
+    "public.currency": {
+      "name": "currency",
+      "schema": "public",
+      "values": [
+        "USD",
+        "UAH"
+      ]
+    },
+    "public.fulfillment_mode": {
+      "name": "fulfillment_mode",
+      "schema": "public",
+      "values": [
+        "ua_np",
+        "intl"
+      ]
+    },
+    "public.inventory_move_type": {
+      "name": "inventory_move_type",
+      "schema": "public",
+      "values": [
+        "reserve",
+        "release"
+      ]
+    },
+    "public.inventory_status": {
+      "name": "inventory_status",
+      "schema": "public",
+      "values": [
+        "none",
+        "reserving",
+        "reserved",
+        "release_pending",
+        "released",
+        "failed"
+      ]
+    },
+    "public.notification_channel": {
+      "name": "notification_channel",
+      "schema": "public",
+      "values": [
+        "email",
+        "sms"
+      ]
+    },
+    "public.order_status": {
+      "name": "order_status",
+      "schema": "public",
+      "values": [
+        "CREATED",
+        "INVENTORY_RESERVED",
+        "INVENTORY_FAILED",
+        "PAID",
+        "CANCELED"
+      ]
+    },
+    "public.payment_status": {
+      "name": "payment_status",
+      "schema": "public",
+      "values": [
+        "pending",
+        "requires_payment",
+        "paid",
+        "failed",
+        "refunded",
+        "needs_review"
+      ]
+    },
+    "public.product_badge": {
+      "name": "product_badge",
+      "schema": "public",
+      "values": [
+        "NEW",
+        "SALE",
+        "NONE"
+      ]
+    },
+    "public.quote_status": {
+      "name": "quote_status",
+      "schema": "public",
+      "values": [
+        "none",
+        "requested",
+        "offered",
+        "accepted",
+        "declined",
+        "expired",
+        "requires_requote"
+      ]
+    },
+    "public.return_request_status": {
+      "name": "return_request_status",
+      "schema": "public",
+      "values": [
+        "requested",
+        "approved",
+        "rejected",
+        "received",
+        "refunded"
+      ]
+    },
+    "public.shipping_method_code": {
+      "name": "shipping_method_code",
+      "schema": "public",
+      "values": [
+        "NP_WAREHOUSE",
+        "NP_LOCKER",
+        "NP_COURIER"
+      ]
+    },
+    "public.shipping_payer": {
+      "name": "shipping_payer",
+      "schema": "public",
+      "values": [
+        "customer",
+        "merchant"
+      ]
+    },
+    "public.shipping_provider": {
+      "name": "shipping_provider",
+      "schema": "public",
+      "values": [
+        "nova_poshta",
+        "ukrposhta"
+      ]
+    },
+    "public.shipping_shipment_status": {
+      "name": "shipping_shipment_status",
+      "schema": "public",
+      "values": [
+        "queued",
+        "processing",
+        "succeeded",
+        "failed",
+        "needs_attention"
+      ]
+    },
+    "public.shipping_status": {
+      "name": "shipping_status",
+      "schema": "public",
+      "values": [
+        "pending",
+        "queued",
+        "creating_label",
+        "label_created",
+        "shipped",
+        "delivered",
+        "cancelled",
+        "needs_attention"
+      ]
+    }
+  },
+  "schemas": {},
+  "views": {},
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/frontend/drizzle/meta/_journal.json b/frontend/drizzle/meta/_journal.json
index b7674456..b20ddde7 100644
--- a/frontend/drizzle/meta/_journal.json
+++ b/frontend/drizzle/meta/_journal.json
@@ -204,6 +204,20 @@
       "when": 1772572818358,
       "tag": "0028_bitter_wrecking_crew",
       "breakpoints": true
+    },
+    {
+      "idx": 29,
+      "version": "7",
+      "when": 1772756436792,
+      "tag": "0029_shop_np_warehouses_city_ref_fk",
+      "breakpoints": true
+    },
+    {
+      "idx": 30,
+      "version": "7",
+      "when": 1772764398365,
+      "tag": "0030_shop_np_warehouses_city_ref_fk_backfill",
+      "breakpoints": true
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/frontend/lib/psp/monobank.ts b/frontend/lib/psp/monobank.ts
index 7a2686e5..89771b7c 100644
--- a/frontend/lib/psp/monobank.ts
+++ b/frontend/lib/psp/monobank.ts
@@ -18,6 +18,7 @@ export type PspErrorCode =
   | 'PSP_TIMEOUT'
   | 'PSP_BAD_REQUEST'
   | 'PSP_AUTH_FAILED'
+  | 'PSP_UPSTREAM'
   | 'PSP_UNKNOWN';
 
 export class PspError extends Error {
@@ -87,6 +88,23 @@ export type MonobankRemoveInvoiceResult = {
   raw?: Record<string, unknown>;
 };
 
+export type MonobankWalletPaymentInput = {
+  cardToken: string;
+  amountMinor: number;
+  ccy: number;
+  initiationKind?: 'client';
+  redirectUrl: string;
+  webHookUrl: string;
+};
+
+export type MonobankWalletPaymentResult = {
+  invoiceId: string;
+  status: string | null;
+  redirectUrl: string | null;
+  modifiedDate: Date | null;
+  raw: Record<string, unknown>;
+};
+
 export type MonobankWebhookPubKeyResult = {
   pubKeyPemBytes: Uint8Array;
 };
@@ -237,6 +255,31 @@ type MonobankRemoveInvoiceResponse = {
   removed?: boolean;
 };
 
+type MonobankWalletPaymentRequest = {
+  cardToken: string;
+  amount: number;
+  ccy: number;
+  initiationKind: 'client';
+  redirectUrl: string;
+  webHookUrl: string;
+};
+
+type MonobankWalletPaymentResponse = {
+  invoiceId?: string;
+  status?: string;
+  tdsUrl?: string;
+  redirectUrl?: string;
+  pageUrl?: string;
+  checkoutUrl?: string;
+  modifiedDate?: unknown;
+  modifiedAt?: unknown;
+  updatedAt?: unknown;
+  createdDate?: unknown;
+  createdAt?: unknown;
+  time?: unknown;
+  timestamp?: unknown;
+};
+
 export function buildMonobankInvoicePayload(
   args: MonobankInvoiceCreateArgs
 ): MonobankInvoiceCreateRequest {
@@ -293,6 +336,40 @@ export function buildMonobankInvoicePayload(
   return payload;
 }
 
+export function buildMonobankWalletPayload(
+  args: MonobankWalletPaymentInput
+): MonobankWalletPaymentRequest {
+  const cardToken =
+    typeof args.cardToken === 'string' ? args.cardToken.trim() : '';
+
+  if (!cardToken) {
+    throw new Error('wallet cardToken is required');
+  }
+
+  if (!Number.isSafeInteger(args.amountMinor) || args.amountMinor <= 0) {
+    throw new Error('Invalid wallet amount (minor units)');
+  }
+
+  if (args.ccy !== MONO_CCY) {
+    throw new Error(`Monobank wallet payments require ccy=${MONO_CCY}`);
+  }
+
+  const redirectUrl = args.redirectUrl.trim();
+  const webHookUrl = args.webHookUrl.trim();
+  if (!redirectUrl || !webHookUrl) {
+    throw new Error('wallet redirectUrl and webHookUrl are required');
+  }
+
+  return {
+    cardToken,
+    amount: args.amountMinor,
+    ccy: args.ccy,
+    initiationKind: 'client',
+    redirectUrl,
+    webHookUrl,
+  };
+}
+
 type MonoRequestArgs = {
   method: 'GET' | 'POST';
   path: string;
@@ -360,6 +437,39 @@ function parseErrorPayload(text: string): {
   return {};
 }
 
+function parseTimestampMs(value: unknown): number | null {
+  if (typeof value === 'number' && Number.isFinite(value)) {
+    const ms = value < 1e11 ? value * 1000 : value;
+    return Number.isFinite(ms) ? ms : null;
+  }
+  if (typeof value === 'string') {
+    const parsed = Date.parse(value);
+    if (!Number.isNaN(parsed)) return parsed;
+  }
+  return null;
+}
+
+function extractProviderModifiedAt(
+  raw: MonobankWalletPaymentResponse & Record<string, unknown>
+): Date | null {
+  const candidates = [
+    raw.modifiedDate,
+    raw.modifiedAt,
+    raw.updatedAt,
+    raw.createdDate,
+    raw.createdAt,
+    raw.time,
+    raw.timestamp,
+  ];
+
+  for (const candidate of candidates) {
+    const ms = parseTimestampMs(candidate);
+    if (ms !== null) return new Date(ms);
+  }
+
+  return null;
+}
+
 function isAbortError(error: unknown): boolean {
   if (!error || typeof error !== 'object') return false;
   const err = error as { name?: unknown; message?: unknown };
@@ -425,6 +535,20 @@ async function requestMono<T>(
         });
       }
 
+      if (status === 429) {
+        throw new PspError('PSP_UPSTREAM', 'Monobank upstream rate limit', {
+          endpoint,
+          method: args.method,
+          httpStatus: status,
+          durationMs,
+          ...(parsed.monoCode ? { monoCode: parsed.monoCode } : {}),
+          ...(parsed.monoMessage ? { monoMessage: parsed.monoMessage } : {}),
+          ...(parsed.responseSnippet
+            ? { responseSnippet: parsed.responseSnippet }
+            : {}),
+        });
+      }
+
       if (status >= 400 && status < 500) {
         throw new PspError('PSP_BAD_REQUEST', 'Monobank request rejected', {
           endpoint,
@@ -439,11 +563,16 @@ async function requestMono<T>(
         });
       }
 
-      throw new PspError('PSP_UNKNOWN', 'Monobank request failed', {
+      throw new PspError('PSP_UPSTREAM', 'Monobank upstream error', {
         endpoint,
         method: args.method,
         httpStatus: status,
         durationMs,
+        ...(parsed.monoCode ? { monoCode: parsed.monoCode } : {}),
+        ...(parsed.monoMessage ? { monoMessage: parsed.monoMessage } : {}),
+        ...(parsed.responseSnippet
+          ? { responseSnippet: parsed.responseSnippet }
+          : {}),
       });
     }
 
@@ -633,6 +762,61 @@ export async function createMonobankInvoice(
   return requestCreateInvoice(payload);
 }
 
+export async function walletPayment(
+  args: MonobankWalletPaymentInput
+): Promise<MonobankWalletPaymentResult> {
+  const env = getMonobankEnv();
+
+  if (!env.paymentsEnabled || !env.token) {
+    throw new Error('Monobank payments are disabled');
+  }
+
+  const payload = buildMonobankWalletPayload(args);
+  const res = await requestMono<
+    MonobankWalletPaymentResponse & Record<string, unknown>
+  >({
+    method: 'POST',
+    path: '/api/merchant/wallet/payment',
+    body: payload,
+    timeoutMs: env.invoiceTimeoutMs,
+    token: env.token,
+    baseUrl: env.apiBaseUrl,
+  });
+
+  if (!res.data || typeof res.data !== 'object') {
+    throw new Error('Monobank wallet payment returned invalid payload');
+  }
+
+  const raw = res.data as MonobankWalletPaymentResponse &
+    Record<string, unknown>;
+  const invoiceId =
+    typeof raw.invoiceId === 'string' && raw.invoiceId.trim()
+      ? raw.invoiceId.trim()
+      : '';
+
+  if (!invoiceId) {
+    throw new Error('Monobank wallet payment missing invoiceId');
+  }
+
+  const status =
+    typeof raw.status === 'string' && raw.status.trim()
+      ? raw.status.trim()
+      : null;
+  const redirectUrl =
+    parsePageUrl(raw.tdsUrl) ??
+    parsePageUrl(raw.redirectUrl) ??
+    parsePageUrl(raw.pageUrl) ??
+    parsePageUrl(raw.checkoutUrl);
+
+  return {
+    invoiceId,
+    status,
+    redirectUrl,
+    modifiedDate: extractProviderModifiedAt(raw),
+    raw,
+  };
+}
+
 export async function getInvoiceStatus(
   invoiceId: string
 ): Promise<MonobankInvoiceStatusResult> {
diff --git a/frontend/lib/psp/stripe.ts b/frontend/lib/psp/stripe.ts
index f471286d..1805a745 100644
--- a/frontend/lib/psp/stripe.ts
+++ b/frontend/lib/psp/stripe.ts
@@ -124,7 +124,7 @@ export async function createPaymentIntent({
         amount,
         currency: currency.toLowerCase(),
         metadata: { orderId, mode: mode ?? 'test' },
-        automatic_payment_methods: { enabled: true },
+        payment_method_types: ['card'],
       },
       idempotencyKey ? { idempotencyKey } : undefined
     );
diff --git a/frontend/lib/services/orders/_shared.ts b/frontend/lib/services/orders/_shared.ts
index c1d739d9..542304a9 100644
--- a/frontend/lib/services/orders/_shared.ts
+++ b/frontend/lib/services/orders/_shared.ts
@@ -3,7 +3,7 @@ import crypto from 'crypto';
 import { db } from '@/db';
 import { orders } from '@/db/schema/shop';
 import { type CurrencyCode } from '@/lib/shop/currency';
-import { type PaymentProvider } from '@/lib/shop/payments';
+import { type PaymentMethod, type PaymentProvider } from '@/lib/shop/payments';
 import {
   type CheckoutItem,
   type OrderSummaryWithMinor,
@@ -185,6 +185,7 @@ export function hashIdempotencyRequest(params: {
   currency: string;
   locale: string | null;
   paymentProvider: PaymentProvider;
+  paymentMethod: PaymentMethod | null;
   shipping: {
     provider: 'nova_poshta';
     methodCode: 'NP_WAREHOUSE' | 'NP_LOCKER' | 'NP_COURIER';
@@ -215,10 +216,11 @@ export function hashIdempotencyRequest(params: {
     });
 
   const payload = JSON.stringify({
-    v: 3,
+    v: 4,
     currency: params.currency,
     locale: normVariant(params.locale).toLowerCase(),
     paymentProvider: params.paymentProvider,
+    paymentMethod: params.paymentMethod,
     shipping: params.shipping,
     legalConsent: params.legalConsent,
     items: normalized,
diff --git a/frontend/lib/services/orders/checkout.ts b/frontend/lib/services/orders/checkout.ts
index 2f3c36e2..f3afa63e 100644
--- a/frontend/lib/services/orders/checkout.ts
+++ b/frontend/lib/services/orders/checkout.ts
@@ -25,7 +25,12 @@ import {
   sumLineTotals,
   toDbMoney,
 } from '@/lib/shop/money';
-import { type PaymentProvider, type PaymentStatus } from '@/lib/shop/payments';
+import {
+  type PaymentMethod,
+  type PaymentProvider,
+  type PaymentStatus,
+  resolveDefaultMethodForProvider,
+} from '@/lib/shop/payments';
 import {
   type CheckoutItem,
   type CheckoutLegalConsentInput,
@@ -423,9 +428,19 @@ async function prepareCheckoutShipping(args: {
   }
 
   if (!args.shipping) {
-    throw new InvalidPayloadError('Shipping payload is required.', {
-      code: 'MISSING_SHIPPING_ADDRESS',
-    });
+    return {
+      required: false,
+      hashRefs: null,
+      orderSummary: {
+        shippingRequired: false,
+        shippingPayer: null,
+        shippingProvider: null,
+        shippingMethodCode: null,
+        shippingAmountMinor: null,
+        shippingStatus: null,
+      },
+      snapshot: null,
+    };
   }
 
   const availability = resolveShippingAvailability({
@@ -498,7 +513,7 @@ async function prepareCheckoutShipping(args: {
         and(
           eq(npWarehouses.ref, warehouseRef),
           eq(npWarehouses.isActive, true),
-          eq(npWarehouses.settlementRef, cityRef)
+          eq(npWarehouses.cityRef, cityRef)
         )
       )
       .limit(1);
@@ -736,6 +751,101 @@ function priceItems(
   });
 }
 
+function isMonobankGooglePayEnabled(): boolean {
+  const raw = (process.env.SHOP_MONOBANK_GPAY_ENABLED ?? '')
+    .trim()
+    .toLowerCase();
+  return raw === 'true' || raw === '1' || raw === 'yes' || raw === 'on';
+}
+
+function normalizeStoredPaymentMethod(value: unknown): PaymentMethod | null {
+  const normalized = normVariant(typeof value === 'string' ? value : '');
+  if (normalized === 'stripe_card') return 'stripe_card';
+  if (normalized === 'monobank_invoice') return 'monobank_invoice';
+  if (normalized === 'monobank_google_pay') return 'monobank_google_pay';
+  return null;
+}
+
+function resolveCheckoutPaymentMethod(args: {
+  requestedMethod?: PaymentMethod | null;
+  paymentProvider: PaymentProvider;
+  currency: Currency;
+}): PaymentMethod | null {
+  if (args.paymentProvider === 'none') return null;
+
+  if (!args.requestedMethod) {
+    return resolveDefaultMethodForProvider(args.paymentProvider, args.currency);
+  }
+
+  if (args.requestedMethod === 'stripe_card') {
+    if (args.paymentProvider !== 'stripe') {
+      throw new InvalidPayloadError(
+        'paymentMethod is not allowed for selected provider.',
+        {
+          code: 'INVALID_PAYLOAD',
+        }
+      );
+    }
+    return args.requestedMethod;
+  }
+
+  if (
+    args.requestedMethod === 'monobank_invoice' ||
+    args.requestedMethod === 'monobank_google_pay'
+  ) {
+    if (args.paymentProvider !== 'monobank' || args.currency !== 'UAH') {
+      throw new InvalidPayloadError(
+        'paymentMethod is not allowed for selected provider/currency.',
+        {
+          code: 'INVALID_PAYLOAD',
+        }
+      );
+    }
+
+    if (
+      args.requestedMethod === 'monobank_google_pay' &&
+      !isMonobankGooglePayEnabled()
+    ) {
+      throw new InvalidPayloadError('Monobank Google Pay is disabled.', {
+        code: 'INVALID_PAYLOAD',
+      });
+    }
+
+    return args.requestedMethod;
+  }
+
+  throw new InvalidPayloadError('Invalid payment method.', {
+    code: 'INVALID_PAYLOAD',
+  });
+}
+
+function buildCheckoutMetadataPatch(
+  existingMeta: unknown,
+  paymentMethod: PaymentMethod | null
+): Record<string, unknown> {
+  const base =
+    existingMeta &&
+    typeof existingMeta === 'object' &&
+    !Array.isArray(existingMeta)
+      ? (existingMeta as Record<string, unknown>)
+      : {};
+
+  const checkoutMeta =
+    base.checkout &&
+    typeof base.checkout === 'object' &&
+    !Array.isArray(base.checkout)
+      ? (base.checkout as Record<string, unknown>)
+      : {};
+
+  return {
+    ...base,
+    checkout: {
+      ...checkoutMeta,
+      requestedMethod: paymentMethod,
+    },
+  };
+}
+
 export async function createOrderWithItems({
   items,
   idempotencyKey,
@@ -745,6 +855,7 @@ export async function createOrderWithItems({
   shipping,
   legalConsent,
   paymentProvider: requestedProvider,
+  paymentMethod: requestedMethod,
 }: {
   items: CheckoutItem[];
   idempotencyKey: string;
@@ -754,6 +865,7 @@ export async function createOrderWithItems({
   shipping?: CheckoutShippingInput | null;
   legalConsent?: CheckoutLegalConsentInput | null;
   paymentProvider?: PaymentProvider;
+  paymentMethod?: PaymentMethod | null;
 }): Promise<CheckoutResult> {
   const isMonobankRequested = requestedProvider === 'monobank';
   const currency: Currency = isMonobankRequested
@@ -761,16 +873,27 @@ export async function createOrderWithItems({
     : resolveCurrencyFromLocale(locale);
   const stripePaymentsEnabled = isPaymentsEnabled();
   const paymentProvider: PaymentProvider =
-    requestedProvider === 'monobank'
-      ? 'monobank'
-      : stripePaymentsEnabled
-        ? 'stripe'
-        : 'none';
+    requestedProvider === 'none'
+      ? 'none'
+      : requestedProvider === 'monobank'
+        ? 'monobank'
+        : requestedProvider === 'stripe'
+          ? 'stripe'
+          : stripePaymentsEnabled
+            ? 'stripe'
+            : 'none';
+
   const paymentsEnabled =
-    paymentProvider === 'monobank' ? true : stripePaymentsEnabled;
+    paymentProvider !== 'none' &&
+    (paymentProvider === 'monobank' || stripePaymentsEnabled);
 
   const initialPaymentStatus: PaymentStatus =
     paymentProvider === 'none' ? 'paid' : 'pending';
+  const resolvedPaymentMethod = resolveCheckoutPaymentMethod({
+    requestedMethod,
+    paymentProvider,
+    currency,
+  });
 
   const normalizedItems = mergeCheckoutItems(items).map(item =>
     normalizeCheckoutItem(item)
@@ -793,6 +916,7 @@ export async function createOrderWithItems({
     currency,
     locale: locale ?? null,
     paymentProvider,
+    paymentMethod: resolvedPaymentMethod,
     shipping: preparedShipping.hashRefs,
     legalConsent: preparedLegalConsent.hashRefs,
   });
@@ -804,6 +928,8 @@ export async function createOrderWithItems({
         currency: orders.currency,
         paymentStatus: orders.paymentStatus,
         paymentProvider: orders.paymentProvider,
+        pspPaymentMethod: orders.pspPaymentMethod,
+        pspMetadata: orders.pspMetadata,
         idempotencyRequestHash: orders.idempotencyRequestHash,
         failureMessage: orders.failureMessage,
         shippingProvider: orders.shippingProvider,
@@ -884,6 +1010,32 @@ export async function createOrderWithItems({
       );
     }
 
+    const existingProvider = resolvePaymentProvider({
+      paymentProvider: row.paymentProvider,
+      paymentIntentId: existing.paymentIntentId ?? null,
+      paymentStatus: row.paymentStatus,
+    });
+    const metadataMethod =
+      row.pspMetadata &&
+      typeof row.pspMetadata === 'object' &&
+      !Array.isArray(row.pspMetadata)
+        ? normalizeStoredPaymentMethod(
+            (
+              (row.pspMetadata as Record<string, unknown>).checkout as
+                | Record<string, unknown>
+                | undefined
+            )?.requestedMethod
+          )
+        : null;
+
+    const existingMethod =
+      normalizeStoredPaymentMethod(row.pspPaymentMethod) ??
+      metadataMethod ??
+      resolveDefaultMethodForProvider(
+        existingProvider,
+        row.currency as Currency
+      );
+
     const derivedExistingHash = hashIdempotencyRequest({
       items: (existing.items as any[]).map(i => ({
         productId: i.productId,
@@ -901,11 +1053,8 @@ export async function createOrderWithItems({
       })) as CheckoutItemWithVariant[],
       currency: row.currency,
       locale: locale ?? null,
-      paymentProvider: resolvePaymentProvider({
-        paymentProvider: row.paymentProvider,
-        paymentIntentId: existing.paymentIntentId ?? null,
-        paymentStatus: row.paymentStatus,
-      }),
+      paymentProvider: existingProvider,
+      paymentMethod: existingMethod,
       shipping:
         row.shippingProvider === 'nova_poshta' &&
         row.shippingMethodCode &&
@@ -930,13 +1079,11 @@ export async function createOrderWithItems({
           })
           .where(eq(orders.id, row.id));
       } catch (e) {
-        if (process.env.DEBUG) {
-          logWarn('checkout_rejected', {
-            phase: 'idempotency_request_hash_backfill',
-            orderId: row.id,
-            message: e instanceof Error ? e.message : String(e),
-          });
-        }
+        logWarn('checkout_rejected', {
+          phase: 'idempotency_request_hash_backfill',
+          orderId: row.id,
+          message: e instanceof Error ? e.message : String(e),
+        });
       }
     }
 
@@ -947,6 +1094,44 @@ export async function createOrderWithItems({
       });
     }
 
+    const nextMeta = buildCheckoutMetadataPatch(
+      row.pspMetadata,
+      existingMethod ?? resolvedPaymentMethod
+    );
+    const needsMethodBackfill =
+      row.pspPaymentMethod !== (existingMethod ?? resolvedPaymentMethod);
+    const currentStoredMethod =
+      row.pspMetadata &&
+      typeof row.pspMetadata === 'object' &&
+      !Array.isArray(row.pspMetadata)
+        ? (
+            ((row.pspMetadata as Record<string, unknown>).checkout as
+              | Record<string, unknown>
+              | undefined) ?? {}
+          ).requestedMethod
+        : undefined;
+    const needsMetadataBackfill =
+      currentStoredMethod !== (existingMethod ?? resolvedPaymentMethod);
+
+    if (needsMethodBackfill || needsMetadataBackfill) {
+      try {
+        await db
+          .update(orders)
+          .set({
+            pspPaymentMethod: existingMethod ?? resolvedPaymentMethod,
+            pspMetadata: nextMeta,
+            updatedAt: new Date(),
+          })
+          .where(eq(orders.id, row.id));
+      } catch (e) {
+        logWarn('checkout_rejected', {
+          phase: 'payment_method_backfill',
+          orderId: row.id,
+          message: e instanceof Error ? e.message : String(e),
+        });
+      }
+    }
+
     if (row.paymentStatus === 'failed') {
       try {
         await restockOrder(existing.id, { reason: 'failed' });
@@ -1061,6 +1246,8 @@ export async function createOrderWithItems({
         paymentStatus: initialPaymentStatus,
         paymentProvider,
         paymentIntentId: null,
+        pspPaymentMethod: resolvedPaymentMethod,
+        pspMetadata: buildCheckoutMetadataPatch({}, resolvedPaymentMethod),
         shippingRequired: preparedShipping.orderSummary.shippingRequired,
         shippingPayer: preparedShipping.orderSummary.shippingPayer,
         shippingProvider: preparedShipping.orderSummary.shippingProvider,
diff --git a/frontend/lib/services/orders/monobank-wallet.ts b/frontend/lib/services/orders/monobank-wallet.ts
new file mode 100644
index 00000000..f175d6b1
--- /dev/null
+++ b/frontend/lib/services/orders/monobank-wallet.ts
@@ -0,0 +1,620 @@
+import 'server-only';
+
+import { and, eq, inArray, sql } from 'drizzle-orm';
+
+import { db } from '@/db';
+import { orders, paymentAttempts } from '@/db/schema';
+import {
+  MONO_CCY,
+  MONO_CURRENCY,
+  type MonobankWalletPaymentResult,
+  PspError,
+  walletPayment,
+} from '@/lib/psp/monobank';
+import {
+  IdempotencyConflictError,
+  InvalidPayloadError,
+  OrderNotFoundError,
+  OrderStateInvalidError,
+} from '@/lib/services/errors';
+
+type PaymentAttemptRow = typeof paymentAttempts.$inferSelect;
+type WalletOrderRow = Pick<
+  typeof orders.$inferSelect,
+  'id' | 'paymentProvider' | 'paymentStatus' | 'currency' | 'totalAmountMinor'
+>;
+
+const DEFAULT_MAX_ATTEMPTS = 2;
+const ACTIVE_ATTEMPT_STATUSES = ['creating', 'active'] as const;
+
+type MonobankWalletSubmitOutcome = 'submitted' | 'unknown';
+
+export type MonobankWalletSubmitResult = {
+  attemptId: string;
+  attemptNumber: number;
+  invoiceId: string | null;
+  redirectUrl: string | null;
+  outcome: MonobankWalletSubmitOutcome;
+  syncStatus: string | null;
+  providerModifiedAt: Date | null;
+  reused: boolean;
+};
+
+export class MonobankWalletConflictError extends Error {
+  readonly code = 'MONOBANK_WALLET_CONFLICT' as const;
+  readonly orderId: string;
+  readonly attemptId: string;
+  readonly activeIdempotencyKey: string;
+  readonly requestedIdempotencyKey: string;
+
+  constructor(args: {
+    orderId: string;
+    attemptId: string;
+    activeIdempotencyKey: string;
+    requestedIdempotencyKey: string;
+  }) {
+    super(
+      'Monobank wallet submit already in progress for this order with another idempotency key.'
+    );
+    this.name = 'MonobankWalletConflictError';
+    this.orderId = args.orderId;
+    this.attemptId = args.attemptId;
+    this.activeIdempotencyKey = args.activeIdempotencyKey;
+    this.requestedIdempotencyKey = args.requestedIdempotencyKey;
+  }
+}
+
+function asRecord(value: unknown): Record<string, unknown> {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return {};
+  return value as Record<string, unknown>;
+}
+
+function readWalletMetadata(meta: Record<string, unknown>): Record<string, unknown> {
+  const monobank = asRecord(meta.monobank);
+  const monobankWallet = asRecord(monobank.wallet);
+  if (Object.keys(monobankWallet).length > 0) return monobankWallet;
+  return asRecord(meta.wallet);
+}
+
+function parseIsoDateOrNull(value: unknown): Date | null {
+  if (typeof value !== 'string' || !value.trim()) return null;
+  const ms = Date.parse(value);
+  if (Number.isNaN(ms)) return null;
+  return new Date(ms);
+}
+
+function readReplayResult(
+  attempt: PaymentAttemptRow,
+  reused: boolean
+): MonobankWalletSubmitResult {
+  const meta = asRecord(attempt.metadata);
+  const wallet = readWalletMetadata(meta);
+
+  const submitOutcome =
+    wallet.submitOutcome === 'unknown' ? 'unknown' : 'submitted';
+  const syncStatus =
+    typeof wallet.syncStatus === 'string' && wallet.syncStatus.trim()
+      ? wallet.syncStatus.trim()
+      : null;
+  const invoiceId =
+    typeof attempt.providerPaymentIntentId === 'string' &&
+    attempt.providerPaymentIntentId.trim()
+      ? attempt.providerPaymentIntentId.trim()
+      : typeof wallet.invoiceId === 'string' && wallet.invoiceId.trim()
+        ? wallet.invoiceId.trim()
+        : null;
+  const redirectUrl =
+    typeof wallet.redirectUrl === 'string' && wallet.redirectUrl.trim()
+      ? wallet.redirectUrl.trim()
+      : null;
+  const providerModifiedAt =
+    attempt.providerModifiedAt ??
+    parseIsoDateOrNull(wallet.providerModifiedAt ?? null);
+
+  return {
+    attemptId: attempt.id,
+    attemptNumber: attempt.attemptNumber,
+    invoiceId,
+    redirectUrl,
+    outcome: submitOutcome,
+    syncStatus,
+    providerModifiedAt,
+    reused,
+  };
+}
+
+function assertWalletOrderPayable(order: WalletOrderRow): void {
+  if (order.paymentProvider !== 'monobank') {
+    throw new OrderStateInvalidError(
+      'Order is not a Monobank payment for wallet submit.',
+      {
+        orderId: order.id,
+        field: 'paymentProvider',
+        rawValue: order.paymentProvider,
+      }
+    );
+  }
+
+  if (!['pending', 'requires_payment'].includes(order.paymentStatus)) {
+    throw new OrderStateInvalidError(
+      'Order is not payable; Monobank wallet submit is not allowed in the current state.',
+      {
+        orderId: order.id,
+        field: 'paymentStatus',
+        rawValue: order.paymentStatus,
+        details: { allowed: ['pending', 'requires_payment'] },
+      }
+    );
+  }
+
+  if (order.currency !== MONO_CURRENCY) {
+    throw new OrderStateInvalidError('Order currency is not UAH.', {
+      orderId: order.id,
+      field: 'currency',
+      rawValue: order.currency,
+    });
+  }
+
+  if (
+    !Number.isSafeInteger(order.totalAmountMinor) ||
+    order.totalAmountMinor <= 0
+  ) {
+    throw new OrderStateInvalidError(
+      'Invalid order total for Monobank wallet submit.',
+      {
+        orderId: order.id,
+        field: 'totalAmountMinor',
+        rawValue: order.totalAmountMinor,
+      }
+    );
+  }
+}
+
+function isUniqueViolation(error: unknown): boolean {
+  return (
+    !!error &&
+    typeof error === 'object' &&
+    (error as { code?: unknown }).code === '23505'
+  );
+}
+
+async function readWalletOrder(orderId: string): Promise<WalletOrderRow | null> {
+  const rows = await db
+    .select({
+      id: orders.id,
+      paymentProvider: orders.paymentProvider,
+      paymentStatus: orders.paymentStatus,
+      currency: orders.currency,
+      totalAmountMinor: orders.totalAmountMinor,
+    })
+    .from(orders)
+    .where(eq(orders.id, orderId))
+    .limit(1);
+
+  return rows[0] ?? null;
+}
+
+async function findAttemptByIdempotencyKey(
+  idempotencyKey: string
+): Promise<PaymentAttemptRow | null> {
+  const rows = await db
+    .select()
+    .from(paymentAttempts)
+    .where(
+      and(
+        eq(paymentAttempts.provider, 'monobank'),
+        eq(paymentAttempts.idempotencyKey, idempotencyKey)
+      )
+    )
+    .limit(1);
+
+  return rows[0] ?? null;
+}
+
+async function findActiveAttempt(orderId: string): Promise<PaymentAttemptRow | null> {
+  const rows = await db
+    .select()
+    .from(paymentAttempts)
+    .where(
+      and(
+        eq(paymentAttempts.orderId, orderId),
+        eq(paymentAttempts.provider, 'monobank'),
+        inArray(paymentAttempts.status, [...ACTIVE_ATTEMPT_STATUSES])
+      )
+    )
+    .limit(1);
+
+  return rows[0] ?? null;
+}
+
+async function readMaxAttemptNumber(orderId: string): Promise<number> {
+  const rows = await db
+    .select({
+      max: sql<number>`coalesce(max(${paymentAttempts.attemptNumber}), 0)`,
+    })
+    .from(paymentAttempts)
+    .where(
+      and(
+        eq(paymentAttempts.orderId, orderId),
+        eq(paymentAttempts.provider, 'monobank')
+      )
+    );
+
+  return rows[0]?.max ?? 0;
+}
+
+async function createCreatingAttempt(args: {
+  orderId: string;
+  idempotencyKey: string;
+  expectedAmountMinor: number;
+  maxAttempts: number;
+}): Promise<PaymentAttemptRow> {
+  const nextAttemptNumber = (await readMaxAttemptNumber(args.orderId)) + 1;
+  if (nextAttemptNumber > args.maxAttempts) {
+    throw new InvalidPayloadError('Payment attempts exhausted.', {
+      code: 'PAYMENT_ATTEMPTS_EXHAUSTED',
+    });
+  }
+
+  const now = new Date();
+  const walletMetadata = {
+    requested: 'google_pay',
+    submitOutcome: 'creating',
+    lastSubmitAt: now.toISOString(),
+  };
+  const inserted = await db
+    .insert(paymentAttempts)
+    .values({
+      orderId: args.orderId,
+      provider: 'monobank',
+      status: 'creating',
+      attemptNumber: nextAttemptNumber,
+      currency: MONO_CURRENCY,
+      expectedAmountMinor: args.expectedAmountMinor,
+      idempotencyKey: args.idempotencyKey,
+      metadata: {
+        monobank: {
+          wallet: walletMetadata,
+        },
+        wallet: walletMetadata,
+      },
+    })
+    .returning();
+
+  const row = inserted[0];
+  if (!row) throw new Error('Failed to create Monobank wallet attempt');
+  return row;
+}
+
+function mergeWalletMetadata(
+  current: unknown,
+  patch: Record<string, unknown>
+): Record<string, unknown> {
+  const meta = asRecord(current);
+  const wallet = asRecord(meta.wallet);
+  const monobank = asRecord(meta.monobank);
+  const monobankWallet = asRecord(monobank.wallet);
+  return {
+    ...meta,
+    monobank: {
+      ...monobank,
+      wallet: {
+        ...monobankWallet,
+        ...patch,
+      },
+    },
+    wallet: {
+      ...wallet,
+      ...patch,
+    },
+  };
+}
+
+async function persistAttemptSubmitted(args: {
+  attempt: PaymentAttemptRow;
+  pspResult: MonobankWalletPaymentResult;
+}): Promise<void> {
+  const now = new Date();
+  const invoiceId =
+    args.pspResult.invoiceId ??
+    (typeof args.attempt.providerPaymentIntentId === 'string' &&
+    args.attempt.providerPaymentIntentId.trim()
+      ? args.attempt.providerPaymentIntentId.trim()
+      : null);
+
+  const syncStatus =
+    args.pspResult.status ??
+    (args.pspResult.redirectUrl ? 'redirect_required' : 'submitted');
+
+  const nextMetadata = mergeWalletMetadata(args.attempt.metadata, {
+    requested: 'google_pay',
+    submitOutcome: 'submitted',
+    syncStatus,
+    invoiceId,
+    redirectUrl: args.pspResult.redirectUrl,
+    providerModifiedAt: args.pspResult.modifiedDate
+      ? args.pspResult.modifiedDate.toISOString()
+      : null,
+    tdsUrlPresent: !!args.pspResult.redirectUrl,
+    lastSubmitAt: now.toISOString(),
+  });
+
+  await db
+    .update(paymentAttempts)
+    .set({
+      status: 'active',
+      providerPaymentIntentId: invoiceId,
+      providerModifiedAt: args.pspResult.modifiedDate ?? null,
+      metadata: nextMetadata,
+      updatedAt: now,
+      lastErrorCode: null,
+      lastErrorMessage: null,
+    })
+    .where(eq(paymentAttempts.id, args.attempt.id));
+}
+
+async function persistAttemptUnknown(args: {
+  attempt: PaymentAttemptRow;
+  errorCode: string;
+  errorMessage: string;
+}): Promise<void> {
+  const now = new Date();
+  const nextMetadata = mergeWalletMetadata(args.attempt.metadata, {
+    requested: 'google_pay',
+    submitOutcome: 'unknown',
+    syncStatus: 'unknown',
+    unknownReason: args.errorCode,
+    lastSubmitAt: now.toISOString(),
+  });
+
+  await db
+    .update(paymentAttempts)
+    .set({
+      status: 'active',
+      metadata: nextMetadata,
+      updatedAt: now,
+      lastErrorCode: args.errorCode,
+      lastErrorMessage: args.errorMessage,
+    })
+    .where(eq(paymentAttempts.id, args.attempt.id));
+}
+
+async function persistAttemptRejected(args: {
+  attempt: PaymentAttemptRow;
+  errorCode: string;
+  errorMessage: string;
+}): Promise<void> {
+  const now = new Date();
+  const nextMetadata = mergeWalletMetadata(args.attempt.metadata, {
+    requested: 'google_pay',
+    submitOutcome: 'rejected',
+    syncStatus: 'rejected',
+    rejectCode: args.errorCode,
+    lastSubmitAt: now.toISOString(),
+  });
+
+  await db
+    .update(paymentAttempts)
+    .set({
+      status: 'failed',
+      finalizedAt: now,
+      updatedAt: now,
+      metadata: nextMetadata,
+      lastErrorCode: args.errorCode,
+      lastErrorMessage: args.errorMessage,
+    })
+    .where(eq(paymentAttempts.id, args.attempt.id));
+}
+
+type SubmitMonobankWalletDeps = {
+  readWalletOrder: typeof readWalletOrder;
+  findAttemptByIdempotencyKey: typeof findAttemptByIdempotencyKey;
+  findActiveAttempt: typeof findActiveAttempt;
+  createCreatingAttempt: typeof createCreatingAttempt;
+  persistAttemptSubmitted: typeof persistAttemptSubmitted;
+  persistAttemptUnknown: typeof persistAttemptUnknown;
+  persistAttemptRejected: typeof persistAttemptRejected;
+  walletPayment: typeof walletPayment;
+};
+
+async function submitMonobankWalletPaymentImpl(
+  deps: SubmitMonobankWalletDeps,
+  args: {
+    orderId: string;
+    idempotencyKey: string;
+    cardToken: string;
+    redirectUrl: string;
+    webHookUrl: string;
+    maxAttempts?: number;
+  }
+): Promise<MonobankWalletSubmitResult> {
+  const idempotencyKey = args.idempotencyKey.trim();
+  if (!idempotencyKey) {
+    throw new InvalidPayloadError('Idempotency-Key is required.', {
+      code: 'MISSING_IDEMPOTENCY_KEY',
+    });
+  }
+
+  const order = await deps.readWalletOrder(args.orderId);
+  if (!order) throw new OrderNotFoundError('Order not found');
+  assertWalletOrderPayable(order);
+
+  const byIdempotencyKey = await deps.findAttemptByIdempotencyKey(idempotencyKey);
+  if (byIdempotencyKey) {
+    if (byIdempotencyKey.orderId !== args.orderId) {
+      throw new IdempotencyConflictError(
+        'Idempotency key already used for a different order.',
+        {
+          orderId: args.orderId,
+          existingOrderId: byIdempotencyKey.orderId,
+        }
+      );
+    }
+
+    if (byIdempotencyKey.status === 'failed') {
+      throw new InvalidPayloadError(
+        'Payment attempt already failed for this idempotency key.',
+        {
+          code:
+            byIdempotencyKey.lastErrorCode && byIdempotencyKey.lastErrorCode.trim()
+              ? byIdempotencyKey.lastErrorCode
+              : 'WALLET_ATTEMPT_FAILED',
+        }
+      );
+    }
+
+    return readReplayResult(byIdempotencyKey, true);
+  }
+
+  const activeAttempt = await deps.findActiveAttempt(args.orderId);
+  if (activeAttempt) {
+    if (activeAttempt.idempotencyKey !== idempotencyKey) {
+      throw new MonobankWalletConflictError({
+        orderId: args.orderId,
+        attemptId: activeAttempt.id,
+        activeIdempotencyKey: activeAttempt.idempotencyKey,
+        requestedIdempotencyKey: idempotencyKey,
+      });
+    }
+
+    return readReplayResult(activeAttempt, true);
+  }
+
+  let attempt: PaymentAttemptRow;
+  try {
+    attempt = await deps.createCreatingAttempt({
+      orderId: args.orderId,
+      idempotencyKey,
+      expectedAmountMinor: order.totalAmountMinor,
+      maxAttempts: args.maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
+    });
+  } catch (error) {
+    if (!isUniqueViolation(error)) throw error;
+
+    const retryByKey = await deps.findAttemptByIdempotencyKey(idempotencyKey);
+    if (retryByKey && retryByKey.orderId === args.orderId) {
+      if (retryByKey.status === 'failed') {
+        throw new InvalidPayloadError(
+          'Payment attempt already failed for this idempotency key.',
+          {
+            code:
+              retryByKey.lastErrorCode && retryByKey.lastErrorCode.trim()
+                ? retryByKey.lastErrorCode
+                : 'WALLET_ATTEMPT_FAILED',
+          }
+        );
+      }
+      return readReplayResult(retryByKey, true);
+    }
+
+    const retryActive = await deps.findActiveAttempt(args.orderId);
+    if (retryActive) {
+      if (retryActive.idempotencyKey !== idempotencyKey) {
+        throw new MonobankWalletConflictError({
+          orderId: args.orderId,
+          attemptId: retryActive.id,
+          activeIdempotencyKey: retryActive.idempotencyKey,
+          requestedIdempotencyKey: idempotencyKey,
+        });
+      }
+      return readReplayResult(retryActive, true);
+    }
+
+    throw error;
+  }
+
+  try {
+    const pspResult = await deps.walletPayment({
+      cardToken: args.cardToken,
+      amountMinor: order.totalAmountMinor,
+      ccy: MONO_CCY,
+      initiationKind: 'client',
+      redirectUrl: args.redirectUrl,
+      webHookUrl: args.webHookUrl,
+    });
+
+    await deps.persistAttemptSubmitted({
+      attempt,
+      pspResult,
+    });
+
+    return {
+      attemptId: attempt.id,
+      attemptNumber: attempt.attemptNumber,
+      invoiceId: pspResult.invoiceId,
+      redirectUrl: pspResult.redirectUrl,
+      outcome: 'submitted',
+      syncStatus:
+        pspResult.status ??
+        (pspResult.redirectUrl ? 'redirect_required' : 'submitted'),
+      providerModifiedAt: pspResult.modifiedDate,
+      reused: false,
+    };
+  } catch (error) {
+    const errorCode =
+      error instanceof PspError && error.code
+        ? error.code
+        : 'PSP_UNKNOWN';
+    const errorMessage =
+      error instanceof Error && error.message ? error.message : 'PSP request failed';
+
+    if (
+      errorCode === 'PSP_TIMEOUT' ||
+      errorCode === 'PSP_UPSTREAM' ||
+      errorCode === 'PSP_UNKNOWN'
+    ) {
+      await deps.persistAttemptUnknown({
+        attempt,
+        errorCode,
+        errorMessage,
+      });
+
+      return {
+        attemptId: attempt.id,
+        attemptNumber: attempt.attemptNumber,
+        invoiceId: null,
+        redirectUrl: null,
+        outcome: 'unknown',
+        syncStatus: 'unknown',
+        providerModifiedAt: null,
+        reused: false,
+      };
+    }
+
+    await deps.persistAttemptRejected({
+      attempt,
+      errorCode,
+      errorMessage,
+    });
+
+    throw error;
+  }
+}
+
+export async function submitMonobankWalletPayment(args: {
+  orderId: string;
+  idempotencyKey: string;
+  cardToken: string;
+  redirectUrl: string;
+  webHookUrl: string;
+  maxAttempts?: number;
+}): Promise<MonobankWalletSubmitResult> {
+  return submitMonobankWalletPaymentImpl(
+    {
+      readWalletOrder,
+      findAttemptByIdempotencyKey,
+      findActiveAttempt,
+      createCreatingAttempt,
+      persistAttemptSubmitted,
+      persistAttemptUnknown,
+      persistAttemptRejected,
+      walletPayment,
+    },
+    args
+  );
+}
+
+export const __test__ = {
+  submitMonobankWalletPaymentImpl,
+  readReplayResult,
+};
diff --git a/frontend/lib/services/orders/monobank-webhook.ts b/frontend/lib/services/orders/monobank-webhook.ts
index d5ea4289..a89e41c4 100644
--- a/frontend/lib/services/orders/monobank-webhook.ts
+++ b/frontend/lib/services/orders/monobank-webhook.ts
@@ -67,6 +67,7 @@ type AttemptRow = Pick<
   | 'expectedAmountMinor'
   | 'providerPaymentIntentId'
   | 'providerModifiedAt'
+  | 'metadata'
 >;
 
 type OrderRow = Pick<
@@ -88,6 +89,12 @@ type PaymentStatusTarget = Parameters<
   typeof guardedPaymentStatusUpdate
 >[0]['to'];
 
+type WalletAttribution = {
+  provider: 'monobank';
+  type: 'google_pay';
+  source: 'attempt';
+};
+
 const CLAIM_TTL_MS = (() => {
   const raw = process.env.MONO_WEBHOOK_CLAIM_TTL_MS;
   const parsed = raw ? Number.parseInt(raw, 10) : Number.NaN;
@@ -102,6 +109,38 @@ const INSTANCE_ID = (() => {
   return value.length > 64 ? value.slice(0, 64) : value;
 })();
 
+function asRecord(value: unknown): Record<string, unknown> {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return {};
+  return value as Record<string, unknown>;
+}
+
+function resolveWalletAttributionFromAttempt(
+  attempt: AttemptRow
+): WalletAttribution | null {
+  const metadata = asRecord(attempt.metadata);
+  const monobank = asRecord(metadata.monobank);
+  const monobankWallet = asRecord(monobank.wallet);
+  const legacyWallet = asRecord(metadata.wallet);
+
+  const requestedRaw =
+    typeof monobankWallet.requested === 'string'
+      ? monobankWallet.requested
+      : typeof legacyWallet.requested === 'string'
+        ? legacyWallet.requested
+        : '';
+  const requested = requestedRaw.trim().toLowerCase();
+
+  if (requested === 'google_pay') {
+    return {
+      provider: 'monobank',
+      type: 'google_pay',
+      source: 'attempt',
+    };
+  }
+
+  return null;
+}
+
 function toIssueMessage(error: unknown): string {
   const msg =
     error instanceof Error
@@ -343,7 +382,8 @@ async function fetchAttemptForWebhook(args: {
       status as "status",
       expected_amount_minor as "expectedAmountMinor",
       provider_payment_intent_id as "providerPaymentIntentId",
-      provider_modified_at as "providerModifiedAt"
+      provider_modified_at as "providerModifiedAt",
+      metadata as "metadata"
     from payment_attempts
     where provider = 'monobank'
       and (
@@ -460,8 +500,11 @@ async function persistEventOutcome(args: {
     .where(eq(monobankEvents.id, args.eventId));
 }
 
-function buildMergedMetaSql(normalized: NormalizedWebhook) {
-  const metadataPatch = {
+function buildMergedMetaSql(
+  normalized: NormalizedWebhook,
+  walletAttribution: WalletAttribution | null
+) {
+  const metadataPatch: Record<string, unknown> = {
     monobank: {
       invoiceId: normalized.invoiceId,
       status: normalized.status,
@@ -471,7 +514,15 @@ function buildMergedMetaSql(normalized: NormalizedWebhook) {
     },
   };
 
-  return sql`coalesce(${orders.pspMetadata}, '{}'::jsonb) || ${JSON.stringify(
+  if (walletAttribution) {
+    metadataPatch.wallet = walletAttribution;
+
+    return sql`coalesce(${orders.pspMetadata}, '{}'::jsonb) || ${JSON.stringify(
+      metadataPatch
+    )}::jsonb`;
+  }
+
+  return sql`(coalesce(${orders.pspMetadata}, '{}'::jsonb) - 'wallet') || ${JSON.stringify(
     metadataPatch
   )}::jsonb`;
 }
@@ -487,7 +538,17 @@ async function atomicMarkPaidOrderAndSucceedAttempt(args: {
   enqueueShipment: boolean;
   canonicalDualWriteEnabled: boolean;
   canonicalEventDedupeKey: string;
+  walletAttribution: WalletAttribution | null;
 }): Promise<{ ok: boolean; shipmentQueued: boolean }> {
+  const paymentEventPayload: Record<string, unknown> = {
+    monobankEventId: args.eventId,
+    invoiceId: args.invoiceId,
+    status: 'success',
+  };
+  if (args.walletAttribution) {
+    paymentEventPayload.wallet = args.walletAttribution;
+  }
+
   const res = args.canonicalDualWriteEnabled
     ? await db.execute(sql`
         with updated_order as (
@@ -555,11 +616,7 @@ async function atomicMarkPaidOrderAndSucceedAttempt(args: {
             null,
             uo.total_amount_minor::bigint,
             uo.currency,
-            ${JSON.stringify({
-              monobankEventId: args.eventId,
-              invoiceId: args.invoiceId,
-              status: 'success',
-            })}::jsonb,
+            ${JSON.stringify(paymentEventPayload)}::jsonb,
             ${args.canonicalEventDedupeKey},
             ${args.now},
             ${args.now}
@@ -887,7 +944,8 @@ async function applyWebhookToMatchedOrderAttemptEvent(args: {
     providerModifiedAt,
     attemptProviderModifiedAt
   );
-  const mergedMetaSql = buildMergedMetaSql(normalized);
+  const walletAttribution = resolveWalletAttributionFromAttempt(attemptRow);
+  const mergedMetaSql = buildMergedMetaSql(normalized, walletAttribution);
 
   if (
     providerModifiedAt &&
@@ -1135,6 +1193,7 @@ async function applyWebhookToMatchedOrderAttemptEvent(args: {
         monobankEventId: eventId,
         invoiceId: normalized.invoiceId,
       }),
+      walletAttribution,
     });
 
     if (!atomicResult.ok) {
diff --git a/frontend/lib/services/shop/notifications/outbox-worker.ts b/frontend/lib/services/shop/notifications/outbox-worker.ts
index 5e34f381..27d9989c 100644
--- a/frontend/lib/services/shop/notifications/outbox-worker.ts
+++ b/frontend/lib/services/shop/notifications/outbox-worker.ts
@@ -3,7 +3,6 @@ import 'server-only';
 import { sql } from 'drizzle-orm';
 
 import { db } from '@/db';
-import { notificationOutbox } from '@/db/schema';
 import { logInfo, logWarn } from '@/lib/logging';
 import {
   renderShopNotificationTemplate,
diff --git a/frontend/lib/services/shop/quotes.ts b/frontend/lib/services/shop/quotes.ts
index 97f70a96..f94d5e42 100644
--- a/frontend/lib/services/shop/quotes.ts
+++ b/frontend/lib/services/shop/quotes.ts
@@ -10,16 +10,16 @@ import {
   getIntlAcceptedPaymentTtlMinutes,
   getIntlQuoteOfferTtlMinutes,
 } from '@/lib/env/shop-intl';
+import { InvalidPayloadError, OrderNotFoundError } from '@/lib/services/errors';
 import { applyReleaseMove, applyReserveMove } from '@/lib/services/inventory';
-import { aggregateReserveByProductId } from '@/lib/services/orders/_shared';
 import { restockOrder } from '@/lib/services/orders';
+import { aggregateReserveByProductId } from '@/lib/services/orders/_shared';
 import { buildShippingEventDedupeKey } from '@/lib/services/shop/events/dedupe-key';
 import {
   isOrderQuoteStatusTransitionAllowed,
-  orderQuoteTransitionWhereSql,
   type OrderQuoteStatus,
+  orderQuoteTransitionWhereSql,
 } from '@/lib/services/shop/transitions/order-state';
-import { InvalidPayloadError, OrderNotFoundError } from '@/lib/services/errors';
 
 type QuoteStatus = OrderQuoteStatus;
 
diff --git a/frontend/lib/services/shop/returns.ts b/frontend/lib/services/shop/returns.ts
index 1045895e..98f05fc6 100644
--- a/frontend/lib/services/shop/returns.ts
+++ b/frontend/lib/services/shop/returns.ts
@@ -1,6 +1,6 @@
 import 'server-only';
 
-import { and, asc, eq, inArray, sql } from 'drizzle-orm';
+import { asc, eq, inArray, sql } from 'drizzle-orm';
 
 import { db } from '@/db';
 import { orderItems, orders, returnItems, returnRequests } from '@/db/schema';
diff --git a/frontend/lib/services/shop/shipping/admin-actions.ts b/frontend/lib/services/shop/shipping/admin-actions.ts
index acfde69e..7434c118 100644
--- a/frontend/lib/services/shop/shipping/admin-actions.ts
+++ b/frontend/lib/services/shop/shipping/admin-actions.ts
@@ -5,11 +5,11 @@ import { sql } from 'drizzle-orm';
 import { db } from '@/db';
 import { isCanonicalEventsDualWriteEnabled } from '@/lib/env/shop-canonical-events';
 import { buildAdminAuditDedupeKey } from '@/lib/services/shop/events/dedupe-key';
+import { recordShippingMetric } from '@/lib/services/shop/shipping/metrics';
 import {
   isShippingStatusTransitionAllowed,
   shippingStatusTransitionWhereSql,
 } from '@/lib/services/shop/transitions/shipping-state';
-import { recordShippingMetric } from '@/lib/services/shop/shipping/metrics';
 
 export type ShippingAdminAction =
   | 'retry_label_creation'
diff --git a/frontend/lib/services/shop/shipping/inventory-eligibility.ts b/frontend/lib/services/shop/shipping/inventory-eligibility.ts
index 108542b2..d201956c 100644
--- a/frontend/lib/services/shop/shipping/inventory-eligibility.ts
+++ b/frontend/lib/services/shop/shipping/inventory-eligibility.ts
@@ -1,4 +1,4 @@
-import { inArray, type SQL, sql, type SQLWrapper } from 'drizzle-orm';
+import { inArray, type SQL, type SQLWrapper } from 'drizzle-orm';
 
 import { inventoryStatusEnum } from '@/db/schema/shop';
 
diff --git a/frontend/lib/services/shop/shipping/metrics.ts b/frontend/lib/services/shop/shipping/metrics.ts
index cfec9a8f..bf94b952 100644
--- a/frontend/lib/services/shop/shipping/metrics.ts
+++ b/frontend/lib/services/shop/shipping/metrics.ts
@@ -1,7 +1,6 @@
 import 'server-only';
 
 import { logInfo } from '@/lib/logging';
-
 import { sanitizeShippingLogMeta } from '@/lib/services/shop/shipping/log-sanitizer';
 
 export type ShippingMetricName =
diff --git a/frontend/lib/services/shop/shipping/nova-poshta-catalog.ts b/frontend/lib/services/shop/shipping/nova-poshta-catalog.ts
index a864802f..2825e9e6 100644
--- a/frontend/lib/services/shop/shipping/nova-poshta-catalog.ts
+++ b/frontend/lib/services/shop/shipping/nova-poshta-catalog.ts
@@ -6,7 +6,7 @@ import { db } from '@/db';
 import { logWarn } from '@/lib/logging';
 
 import {
-  getWarehousesBySettlementRef,
+  getWarehousesByCityRef,
   type NovaPoshtaSettlement,
   type NovaPoshtaWarehouse,
   searchSettlements,
@@ -128,7 +128,7 @@ export async function findCachedCities(args: {
 }
 
 export async function findCachedWarehouses(args: {
-  settlementRef: string;
+  cityRef: string;
   q?: string;
   limit: number;
 }): Promise<ShippingWarehouse[]> {
@@ -137,8 +137,8 @@ export async function findCachedWarehouses(args: {
   const res = await db.execute<WarehouseRow>(sql`
     SELECT ref, settlement_ref, city_ref, number, type, name, name_ru, address, address_ru, is_post_machine
     FROM np_warehouses
-    WHERE is_active = true
-      AND settlement_ref = ${args.settlementRef}
+WHERE is_active = true
+  AND city_ref = ${args.cityRef}
       AND (
         ${hasQ} = false
         OR name ILIKE ${like}
@@ -275,7 +275,7 @@ async function upsertWarehouses(rows: NovaPoshtaWarehouse[], runId: string) {
 }
 
 async function deactivateMissingWarehouses(args: {
-  settlementRef: string;
+  cityRef: string;
   keepRefs: string[];
   runId: string;
 }): Promise<number> {
@@ -288,7 +288,7 @@ async function deactivateMissingWarehouses(args: {
     is_active = false,
     last_sync_run_id = ${args.runId}::uuid,
     updated_at = now()
-  WHERE settlement_ref = ${args.settlementRef}
+  WHERE city_ref = ${args.cityRef}
     AND is_active = true
   RETURNING ref
 `);
@@ -303,7 +303,7 @@ async function deactivateMissingWarehouses(args: {
     is_active = false,
     last_sync_run_id = ${args.runId}::uuid,
     updated_at = now()
-  WHERE settlement_ref = ${args.settlementRef}
+  WHERE city_ref = ${args.cityRef}
     AND is_active = true
     AND ref NOT IN (${sql.join(refs, sql`, `)})
   RETURNING ref
@@ -326,15 +326,15 @@ export async function cacheSettlementsByQuery(args: {
   return { upserted: settlements.length };
 }
 
-export async function cacheWarehousesBySettlement(args: {
-  settlementRef: string;
+export async function cacheWarehousesByCityRef(args: {
+  cityRef: string;
   runId: string;
 }): Promise<{ upserted: number; deactivated: number }> {
-  const warehouses = await getWarehousesBySettlementRef(args.settlementRef);
+  const warehouses = await getWarehousesByCityRef(args.cityRef);
   await upsertWarehouses(warehouses, args.runId);
 
   const deactivated = await deactivateMissingWarehouses({
-    settlementRef: args.settlementRef,
+    cityRef: args.cityRef,
     keepRefs: warehouses.map(x => x.ref),
     runId: args.runId,
   });
@@ -377,13 +377,13 @@ export async function findCitiesWithCacheOnMiss(args: {
 }
 
 export async function findWarehousesWithCacheOnMiss(args: {
-  settlementRef: string;
+  cityRef: string;
   q?: string;
   limit: number;
   runId: string;
 }): Promise<ShippingWarehouse[]> {
   const localResults = await findCachedWarehouses({
-    settlementRef: args.settlementRef,
+    cityRef: args.cityRef,
     q: args.q,
     limit: args.limit,
   });
@@ -393,32 +393,32 @@ export async function findWarehousesWithCacheOnMiss(args: {
 
   const hasQ = !!args.q?.trim();
   if (hasQ) {
-    const anyCachedForSettlement = await findCachedWarehouses({
-      settlementRef: args.settlementRef,
+    const anyCachedForCity = await findCachedWarehouses({
+      cityRef: args.cityRef,
       limit: 1,
     });
 
-    if (anyCachedForSettlement.length > 0) {
+    if (anyCachedForCity.length > 0) {
       return [];
     }
   }
 
   try {
-    await cacheWarehousesBySettlement({
-      settlementRef: args.settlementRef,
+    await cacheWarehousesByCityRef({
+      cityRef: args.cityRef,
       runId: args.runId,
     });
   } catch (error) {
     logWarn('np_warehouses_cache_on_miss_failed', {
       code: 'NP_CACHE_REFRESH_FAILED',
       runId: args.runId,
-      settlementRef: args.settlementRef,
+      cityRef: args.cityRef,
     });
     throw error;
   }
 
   const refreshedLocalResults = await findCachedWarehouses({
-    settlementRef: args.settlementRef,
+    cityRef: args.cityRef,
     q: args.q,
     limit: args.limit,
   });
diff --git a/frontend/lib/services/shop/shipping/nova-poshta-client.ts b/frontend/lib/services/shop/shipping/nova-poshta-client.ts
index 41b85ed0..616141fa 100644
--- a/frontend/lib/services/shop/shipping/nova-poshta-client.ts
+++ b/frontend/lib/services/shop/shipping/nova-poshta-client.ts
@@ -4,6 +4,7 @@ import {
   getNovaPoshtaConfig,
   NovaPoshtaConfigError,
 } from '@/lib/env/nova-poshta';
+import { logWarn } from '@/lib/logging';
 
 type NovaPoshtaEnvelope<T> = {
   success: boolean;
@@ -19,6 +20,14 @@ type InternetDocumentSaveItem = {
   IntDocNumber?: string;
 };
 
+type GetCitiesItem = {
+  Ref?: string;
+  Description?: string;
+  DescriptionRu?: string;
+  AreaDescription?: string;
+  RegionDescription?: string;
+  SettlementTypeDescription?: string;
+};
 type SearchSettlementsAddress = {
   Ref?: string;
   Present?: string;
@@ -103,6 +112,8 @@ export type NovaPoshtaCreatedTtn = {
   trackingNumber: string;
 };
 
+const NP_SEARCH_SETTLEMENTS_FALLBACK_ERROR_CODE = '20000900746';
+
 export class NovaPoshtaApiError extends Error {
   status: number;
   code: string;
@@ -253,7 +264,7 @@ async function callNp<T>(params: {
     response = await fetch(config.apiBaseUrl, {
       method: 'POST',
       headers: {
-        'content-type': 'application/json',
+        'content-type': 'application/json; charset=utf-8',
         accept: 'application/json',
       },
       body: JSON.stringify({
@@ -320,18 +331,62 @@ async function callNp<T>(params: {
   return payload.data ?? [];
 }
 
-export async function searchSettlements(args: {
+async function getCitiesByFindByString(args: {
   q: string;
   page?: number;
   limit?: number;
 }): Promise<NovaPoshtaSettlement[]> {
+  const q = args.q.trim();
+  if (!q) return [];
+
+  const rows = await callNp<GetCitiesItem>({
+    modelName: 'Address',
+    calledMethod: 'getCities',
+    methodProperties: {
+      FindByString: q,
+      Page: String(Math.max(1, Math.floor(args.page ?? 1))),
+      Limit: String(Math.max(1, Math.min(50, Math.floor(args.limit ?? 20)))),
+      Language: 'ua',
+    },
+  });
+
+  const out: NovaPoshtaSettlement[] = [];
+  const seen = new Set<string>();
+
+  for (const item of rows) {
+    const ref = readString(item.Ref);
+    const nameUa = readString(item.Description);
+    if (!ref || !nameUa || seen.has(ref)) continue;
+    seen.add(ref);
+
+    out.push({
+      ref,
+      nameUa,
+      nameRu: readString(item.DescriptionRu),
+      area: readString(item.AreaDescription),
+      region: readString(item.RegionDescription),
+      settlementType: readString(item.SettlementTypeDescription),
+    });
+  }
+
+  return out;
+}
+
+async function searchSettlementsByCityName(args: {
+  q: string;
+  page?: number;
+  limit?: number;
+}): Promise<NovaPoshtaSettlement[]> {
+  const q = args.q.trim();
+  if (!q) return [];
+
   const rows = await callNp<SearchSettlementsItem>({
     modelName: 'Address',
     calledMethod: 'searchSettlements',
     methodProperties: {
-      CityName: args.q,
-      Page: Math.max(1, Math.floor(args.page ?? 1)),
-      Limit: Math.max(1, Math.min(50, Math.floor(args.limit ?? 20))),
+      CityName: q,
+      Page: String(Math.max(1, Math.floor(args.page ?? 1))),
+      Limit: String(Math.max(1, Math.min(50, Math.floor(args.limit ?? 20)))),
     },
   });
 
@@ -345,14 +400,15 @@ export async function searchSettlements(args: {
   for (const item of addresses) {
     const ref = readString(item.Ref);
     const present = readString(item.Present);
-    const mainDescription = readString(item.MainDescription);
-    const name = present ?? mainDescription;
-    if (!ref || !name || seen.has(ref)) continue;
+    const main = readString(item.MainDescription);
+    const nameUa = present ?? main;
+
+    if (!ref || !nameUa || seen.has(ref)) continue;
     seen.add(ref);
 
     out.push({
       ref,
-      nameUa: name,
+      nameUa,
       nameRu: null,
       area: readString(item.Area),
       region: readString(item.Region),
@@ -363,14 +419,44 @@ export async function searchSettlements(args: {
   return out;
 }
 
-export async function getWarehousesBySettlementRef(
-  settlementRef: string
+export async function searchSettlements(args: {
+  q: string;
+  page?: number;
+  limit?: number;
+}): Promise<NovaPoshtaSettlement[]> {
+  try {
+    return await getCitiesByFindByString(args);
+  } catch (err) {
+    if (
+      err instanceof NovaPoshtaApiError &&
+      err.code === NP_SEARCH_SETTLEMENTS_FALLBACK_ERROR_CODE
+    ) {
+      logWarn('nova_poshta_search_settlements_fallback', {
+        q: args.q,
+        page: args.page ?? 1,
+        limit: args.limit ?? 20,
+        errorCode: err.code,
+        status: err.status,
+        message: err.message,
+      });
+
+      return await searchSettlementsByCityName(args);
+    }
+
+    throw err;
+  }
+}
+export async function getWarehousesByCityRef(
+  cityRef: string
 ): Promise<NovaPoshtaWarehouse[]> {
-  const LIMIT = 500;
-  const MAX_PAGES = 20;
+  const MAX_PAGES = 50;
+  const LIMIT_PRIMARY = 500;
+  const LIMIT_FALLBACK = 200;
 
   const rows: WarehouseItem[] = [];
   let page = 1;
+  let limit = LIMIT_PRIMARY;
+  let firstPageAttempted = false;
 
   while (true) {
     if (page > MAX_PAGES) {
@@ -385,18 +471,31 @@ export async function getWarehousesBySettlementRef(
       modelName: 'Address',
       calledMethod: 'getWarehouses',
       methodProperties: {
-        SettlementRef: settlementRef,
-        Limit: LIMIT,
-        Page: page,
+        CityRef: cityRef,
+        Limit: String(limit),
+        Page: String(page),
         Language: 'ua',
       },
     });
 
+    if (!firstPageAttempted) {
+      firstPageAttempted = true;
+
+      // Some NP endpoints can return an empty first page with a larger limit.
+      // Retry once from page 1 with a smaller fallback limit before treating it
+      // as a real empty result.
+      if (batch.length === 0 && limit !== LIMIT_FALLBACK) {
+        limit = LIMIT_FALLBACK;
+        page = 1;
+        continue;
+      }
+    }
+
     if (batch.length === 0) break;
 
     rows.push(...batch);
 
-    if (batch.length < LIMIT) break;
+    if (batch.length < limit) break;
 
     page += 1;
   }
diff --git a/frontend/lib/services/shop/transitions/order-state.ts b/frontend/lib/services/shop/transitions/order-state.ts
index 9fc642cc..eeaa372c 100644
--- a/frontend/lib/services/shop/transitions/order-state.ts
+++ b/frontend/lib/services/shop/transitions/order-state.ts
@@ -1,4 +1,4 @@
-import { sql, type SQL } from 'drizzle-orm';
+import { type SQL,sql } from 'drizzle-orm';
 
 export const ORDER_NON_PAYMENT_STATUSES = [
   'CREATED',
diff --git a/frontend/lib/shop/payments.ts b/frontend/lib/shop/payments.ts
index 7c1a3c7a..789e14a5 100644
--- a/frontend/lib/shop/payments.ts
+++ b/frontend/lib/shop/payments.ts
@@ -1,3 +1,5 @@
+import type { CurrencyCode } from '@/lib/shop/currency';
+
 export const paymentStatusValues = [
   'pending',
   'requires_payment',
@@ -12,3 +14,52 @@ export type PaymentStatus = (typeof paymentStatusValues)[number];
 export const paymentProviderValues = ['stripe', 'monobank', 'none'] as const;
 
 export type PaymentProvider = (typeof paymentProviderValues)[number];
+
+export const paymentMethodValues = [
+  'stripe_card',
+  'monobank_invoice',
+  'monobank_google_pay',
+] as const;
+
+export type PaymentMethod = (typeof paymentMethodValues)[number];
+
+export function resolveDefaultMethodForProvider(
+  provider: PaymentProvider,
+  currency: CurrencyCode
+): PaymentMethod | null {
+  if (provider === 'stripe') return 'stripe_card';
+
+  if (provider === 'monobank') {
+    if (currency === 'UAH') return 'monobank_invoice';
+    return null;
+  }
+
+  return null;
+}
+
+export function isMethodAllowed(args: {
+  provider: PaymentProvider;
+  method: PaymentMethod;
+  currency: CurrencyCode;
+  flags?: {
+    monobankGooglePayEnabled?: boolean;
+  };
+}): boolean {
+  if (args.method === 'stripe_card') {
+    return args.provider === 'stripe';
+  }
+
+  if (args.method === 'monobank_invoice') {
+    return args.provider === 'monobank' && args.currency === 'UAH';
+  }
+
+  if (args.method === 'monobank_google_pay') {
+    return (
+      args.provider === 'monobank' &&
+      args.currency === 'UAH' &&
+      args.flags?.monobankGooglePayEnabled === true
+    );
+  }
+
+  return false;
+}
diff --git a/frontend/lib/tests/shop/checkout-currency-policy.test.ts b/frontend/lib/tests/shop/checkout-currency-policy.test.ts
index 5bf12991..52406275 100644
--- a/frontend/lib/tests/shop/checkout-currency-policy.test.ts
+++ b/frontend/lib/tests/shop/checkout-currency-policy.test.ts
@@ -116,6 +116,11 @@ function makeIdempotencyKey(): string {
   return crypto.randomUUID();
 }
 
+function makeTestClientIp(seed: string): string {
+  const digest = crypto.createHash('sha256').update(seed).digest();
+  return `${(digest[0] % 223) + 1}.${digest[1]}.${digest[2]}.${(digest[3] % 254) + 1}`;
+}
+
 function makeCheckoutRequest(
   payload: unknown,
   opts: { idempotencyKey: string; acceptLanguage: string }
@@ -124,6 +129,7 @@ function makeCheckoutRequest(
     'Content-Type': 'application/json',
     'Idempotency-Key': opts.idempotencyKey,
     'Accept-Language': opts.acceptLanguage,
+    'X-Forwarded-For': makeTestClientIp(opts.idempotencyKey),
     Origin: 'http://localhost:3000',
   });
 
diff --git a/frontend/lib/tests/shop/checkout-monobank-idempotency-contract.test.ts b/frontend/lib/tests/shop/checkout-monobank-idempotency-contract.test.ts
index 25f1651c..190bce58 100644
--- a/frontend/lib/tests/shop/checkout-monobank-idempotency-contract.test.ts
+++ b/frontend/lib/tests/shop/checkout-monobank-idempotency-contract.test.ts
@@ -59,6 +59,7 @@ const __prevMonoToken = process.env.MONO_MERCHANT_TOKEN;
 const __prevAppOrigin = process.env.APP_ORIGIN;
 const __prevShopBaseUrl = process.env.SHOP_BASE_URL;
 const __prevStatusSecret = process.env.SHOP_STATUS_TOKEN_SECRET;
+const __prevMonobankGpayEnabled = process.env.SHOP_MONOBANK_GPAY_ENABLED;
 
 beforeAll(() => {
   process.env.RATE_LIMIT_DISABLED = '1';
@@ -68,6 +69,7 @@ beforeAll(() => {
   process.env.SHOP_BASE_URL = 'http://localhost:3000';
   process.env.SHOP_STATUS_TOKEN_SECRET =
     'test_status_token_secret_test_status_token_secret';
+  process.env.SHOP_MONOBANK_GPAY_ENABLED = 'false';
 
   resetEnvCache();
 });
@@ -93,11 +95,16 @@ afterAll(() => {
     delete process.env.SHOP_STATUS_TOKEN_SECRET;
   else process.env.SHOP_STATUS_TOKEN_SECRET = __prevStatusSecret;
 
+  if (__prevMonobankGpayEnabled === undefined)
+    delete process.env.SHOP_MONOBANK_GPAY_ENABLED;
+  else process.env.SHOP_MONOBANK_GPAY_ENABLED = __prevMonobankGpayEnabled;
+
   resetEnvCache();
 });
 
 beforeEach(() => {
   vi.clearAllMocks();
+  process.env.SHOP_MONOBANK_GPAY_ENABLED = 'false';
 });
 
 async function createIsolatedProduct(args: {
@@ -165,7 +172,13 @@ afterAll(async () => {
   await cleanupSeededTemplateProduct();
 });
 
-async function postCheckout(idemKey: string, productId: string) {
+type MonobankCheckoutMethod = 'monobank_invoice' | 'monobank_google_pay';
+
+async function postCheckout(
+  idemKey: string,
+  productId: string,
+  options?: { paymentMethod?: MonobankCheckoutMethod }
+) {
   const mod = (await import('@/app/api/shop/checkout/route')) as unknown as {
     POST: (req: NextRequest) => Promise<Response>;
   };
@@ -184,6 +197,9 @@ async function postCheckout(idemKey: string, productId: string) {
     body: JSON.stringify({
       items: [{ productId, quantity: 1 }],
       paymentProvider: 'monobank',
+      ...(options?.paymentMethod
+        ? { paymentMethod: options.paymentMethod }
+        : {}),
     }),
   });
 
@@ -283,11 +299,21 @@ describe.sequential('checkout monobank contract', () => {
       expect(json1.totalAmountMinor).toBe(json2.totalAmountMinor);
 
       const [dbOrder] = await db
-        .select({ id: orders.id })
+        .select({
+          id: orders.id,
+          pspPaymentMethod: orders.pspPaymentMethod,
+          pspMetadata: orders.pspMetadata,
+        })
         .from(orders)
         .where(eq(orders.idempotencyKey, idemKey))
         .limit(1);
       expect(dbOrder?.id).toBe(orderId);
+      expect(dbOrder?.pspPaymentMethod).toBe('monobank_invoice');
+      expect(
+        ((dbOrder?.pspMetadata ?? {}) as Record<string, unknown>)?.checkout
+      ).toMatchObject({
+        requestedMethod: 'monobank_invoice',
+      });
 
       const attemptRows = await db
         .select({ id: paymentAttempts.id })
@@ -307,6 +333,58 @@ describe.sequential('checkout monobank contract', () => {
     }
   }, 20_000);
 
+  it('idempotency hash is method-aware for same key + different method', async () => {
+    process.env.SHOP_MONOBANK_GPAY_ENABLED = 'true';
+
+    const { productId } = await createIsolatedProduct({
+      stock: 3,
+      prices: [{ currency: 'UAH', priceMinor: 1000 }],
+    });
+    const idemKey = crypto.randomUUID();
+    let orderId: string | null = null;
+
+    try {
+      const first = await postCheckout(idemKey, productId, {
+        paymentMethod: 'monobank_invoice',
+      });
+      expect(first.status).toBe(201);
+      const firstJson: any = await first.json();
+      orderId = typeof firstJson.orderId === 'string' ? firstJson.orderId : null;
+
+      const second = await postCheckout(idemKey, productId, {
+        paymentMethod: 'monobank_google_pay',
+      });
+      expect(second.status).toBe(409);
+      const secondJson: any = await second.json();
+      expect(secondJson.code).toBe('CHECKOUT_IDEMPOTENCY_CONFLICT');
+
+      const [dbOrder] = await db
+        .select({
+          id: orders.id,
+          pspPaymentMethod: orders.pspPaymentMethod,
+        })
+        .from(orders)
+        .where(eq(orders.idempotencyKey, idemKey))
+        .limit(1);
+
+      if (!orderId) orderId = dbOrder?.id ?? null;
+      expect(dbOrder?.pspPaymentMethod).toBe('monobank_invoice');
+      expect(createMonobankInvoiceMock).toHaveBeenCalledTimes(1);
+    } finally {
+      if (!orderId) {
+        const [row] = await db
+          .select({ id: orders.id })
+          .from(orders)
+          .where(eq(orders.idempotencyKey, idemKey))
+          .limit(1);
+        orderId = row?.id ?? null;
+      }
+      if (orderId) await cleanupOrder(orderId).catch(() => {});
+      await cleanupProduct(productId).catch(() => {});
+      process.env.SHOP_MONOBANK_GPAY_ENABLED = 'false';
+    }
+  }, 20_000);
+
   it('missing UAH price -> 422 PRICE_CONFIG_ERROR for monobank checkout', async () => {
     const { productId } = await createIsolatedProduct({
       stock: 2,
diff --git a/frontend/lib/tests/shop/checkout-monobank-parse-validation.test.ts b/frontend/lib/tests/shop/checkout-monobank-parse-validation.test.ts
index a8661867..4bf8f5c4 100644
--- a/frontend/lib/tests/shop/checkout-monobank-parse-validation.test.ts
+++ b/frontend/lib/tests/shop/checkout-monobank-parse-validation.test.ts
@@ -34,11 +34,13 @@ type MockedFn = ReturnType<typeof vi.fn>;
 const __prevRateLimitDisabled = process.env.RATE_LIMIT_DISABLED;
 const __prevPaymentsEnabled = process.env.PAYMENTS_ENABLED;
 const __prevStripePaymentsEnabled = process.env.STRIPE_PAYMENTS_ENABLED;
+const __prevMonobankGpayEnabled = process.env.SHOP_MONOBANK_GPAY_ENABLED;
 
 beforeAll(() => {
   process.env.RATE_LIMIT_DISABLED = '1';
   process.env.PAYMENTS_ENABLED = 'true';
   process.env.STRIPE_PAYMENTS_ENABLED = 'true';
+  process.env.SHOP_MONOBANK_GPAY_ENABLED = 'false';
 });
 
 afterAll(() => {
@@ -52,10 +54,15 @@ afterAll(() => {
   if (__prevStripePaymentsEnabled === undefined)
     delete process.env.STRIPE_PAYMENTS_ENABLED;
   else process.env.STRIPE_PAYMENTS_ENABLED = __prevStripePaymentsEnabled;
+
+  if (__prevMonobankGpayEnabled === undefined)
+    delete process.env.SHOP_MONOBANK_GPAY_ENABLED;
+  else process.env.SHOP_MONOBANK_GPAY_ENABLED = __prevMonobankGpayEnabled;
 });
 
 beforeEach(() => {
   vi.clearAllMocks();
+  process.env.SHOP_MONOBANK_GPAY_ENABLED = 'false';
 });
 
 function makeMonobankCheckoutReq(params: {
@@ -81,6 +88,21 @@ function makeMonobankCheckoutReq(params: {
   );
 }
 
+function mockCreateOrderSuccess(mockFn: MockedFn, orderId: string) {
+  mockFn.mockResolvedValueOnce({
+    order: {
+      id: orderId,
+      currency: 'UAH',
+      totalAmount: 10,
+      paymentStatus: 'paid',
+      paymentProvider: 'none',
+      paymentIntentId: null,
+    },
+    isNew: true,
+    totalCents: 1000,
+  });
+}
+
 describe('checkout monobank parse/validation', () => {
   it('rejects monobank checkout without idempotency key', async () => {
     const res = await POST(
@@ -103,19 +125,7 @@ describe('checkout monobank parse/validation', () => {
   it('ignores client currency/amount fields for monobank payload validation', async () => {
     const createOrderWithItemsMock =
       createOrderWithItems as unknown as MockedFn;
-
-    createOrderWithItemsMock.mockResolvedValueOnce({
-      order: {
-        id: 'order_monobank_parse_1',
-        currency: 'UAH',
-        totalAmount: 10,
-        paymentStatus: 'paid',
-        paymentProvider: 'none',
-        paymentIntentId: null,
-      },
-      isNew: true,
-      totalCents: 1000,
-    });
+    mockCreateOrderSuccess(createOrderWithItemsMock, 'order_monobank_parse_1');
 
     const idem = 'mono_idem_validation_0001';
     const res = await POST(
@@ -142,7 +152,94 @@ describe('checkout monobank parse/validation', () => {
     expect(args).toMatchObject({
       idempotencyKey: idem,
       paymentProvider: 'monobank',
+      paymentMethod: 'monobank_invoice',
     });
     expect(Array.isArray(args?.items)).toBe(true);
   });
+
+  it('defaults stripe method to stripe_card when paymentMethod is omitted', async () => {
+    const createOrderWithItemsMock =
+      createOrderWithItems as unknown as MockedFn;
+    mockCreateOrderSuccess(createOrderWithItemsMock, 'order_stripe_default_1');
+
+    const res = await POST(
+      makeMonobankCheckoutReq({
+        idempotencyKey: 'stripe_idem_method_0001',
+        body: {
+          items: [
+            { productId: '11111111-1111-4111-8111-111111111111', quantity: 1 },
+          ],
+        },
+      })
+    );
+
+    expect(res.status).toBe(201);
+    const args = createOrderWithItemsMock.mock.calls[0]?.[0];
+    expect(args?.paymentProvider).toBeUndefined();
+    expect(args?.paymentMethod).toBe('stripe_card');
+  });
+
+  it('rejects incompatible provider/method pair', async () => {
+    const res = await POST(
+      makeMonobankCheckoutReq({
+        idempotencyKey: 'mono_idem_invalid_method_0001',
+        body: {
+          paymentProvider: 'monobank',
+          paymentMethod: 'stripe_card',
+          items: [
+            { productId: '11111111-1111-4111-8111-111111111111', quantity: 1 },
+          ],
+        },
+      })
+    );
+
+    expect(res.status).toBe(422);
+    const json = await res.json();
+    expect(json.code).toBe('INVALID_REQUEST');
+    expect(createOrderWithItems).not.toHaveBeenCalled();
+  });
+
+  it('enforces SHOP_MONOBANK_GPAY_ENABLED for monobank_google_pay', async () => {
+    const disabled = await POST(
+      makeMonobankCheckoutReq({
+        idempotencyKey: 'mono_gpay_disabled_0001',
+        body: {
+          paymentProvider: 'monobank',
+          paymentMethod: 'monobank_google_pay',
+          items: [
+            { productId: '11111111-1111-4111-8111-111111111111', quantity: 1 },
+          ],
+        },
+      })
+    );
+
+    expect(disabled.status).toBe(422);
+    const disabledJson = await disabled.json();
+    expect(disabledJson.code).toBe('INVALID_REQUEST');
+
+    process.env.SHOP_MONOBANK_GPAY_ENABLED = 'true';
+    const createOrderWithItemsMock =
+      createOrderWithItems as unknown as MockedFn;
+    mockCreateOrderSuccess(createOrderWithItemsMock, 'order_monobank_gpay_1');
+
+    const enabled = await POST(
+      makeMonobankCheckoutReq({
+        idempotencyKey: 'mono_gpay_enabled_0001',
+        body: {
+          paymentProvider: 'monobank',
+          paymentMethod: 'monobank_google_pay',
+          items: [
+            { productId: '11111111-1111-4111-8111-111111111111', quantity: 1 },
+          ],
+        },
+      })
+    );
+
+    expect(enabled.status).toBe(201);
+    const args = createOrderWithItemsMock.mock.calls[0]?.[0];
+    expect(args).toMatchObject({
+      paymentProvider: 'monobank',
+      paymentMethod: 'monobank_google_pay',
+    });
+  });
 });
diff --git a/frontend/lib/tests/shop/checkout-shipping-phase3.test.ts b/frontend/lib/tests/shop/checkout-shipping-phase3.test.ts
index ed70dcf4..58cd0711 100644
--- a/frontend/lib/tests/shop/checkout-shipping-phase3.test.ts
+++ b/frontend/lib/tests/shop/checkout-shipping-phase3.test.ts
@@ -6,17 +6,17 @@ import { db } from '@/db';
 import {
   npCities,
   npWarehouses,
-  orderShipping,
   orders,
+  orderShipping,
   productPrices,
   products,
 } from '@/db/schema/shop';
+import { resetEnvCache } from '@/lib/env';
 import {
   IdempotencyConflictError,
   InvalidPayloadError,
 } from '@/lib/services/errors';
 import { createOrderWithItems } from '@/lib/services/orders';
-import { resetEnvCache } from '@/lib/env';
 
 type SeedData = {
   productId: string;
@@ -139,30 +139,32 @@ describe('checkout shipping phase 3', () => {
 
     try {
       const idem = crypto.randomUUID();
-      await expect(
-        createOrderWithItems({
-          idempotencyKey: idem,
-          userId: null,
-          locale: 'en-US',
-          country: 'UA',
-          items: [{ productId: seed.productId, quantity: 1 }],
-          shipping: {
-            provider: 'nova_poshta',
-            methodCode: 'NP_WAREHOUSE',
-            selection: {
-              cityRef: seed.cityRef,
-              warehouseRef: seed.warehouseRefA,
-            },
-            recipient: {
-              fullName: 'Test User',
-              phone: '+380501112233',
-            },
+      const promise = createOrderWithItems({
+        idempotencyKey: idem,
+        userId: null,
+        locale: 'en-US',
+        country: 'UA',
+        items: [{ productId: seed.productId, quantity: 1 }],
+        shipping: {
+          provider: 'nova_poshta',
+          methodCode: 'NP_WAREHOUSE',
+          selection: {
+            cityRef: seed.cityRef,
+            warehouseRef: seed.warehouseRefA,
           },
-        })
-      ).rejects.toMatchObject<Partial<InvalidPayloadError>>({
-        code: 'SHIPPING_CURRENCY_UNSUPPORTED',
+          recipient: {
+            fullName: 'Test User',
+            phone: '+380501112233',
+          },
+        },
       });
 
+      await expect(promise).rejects.toBeInstanceOf(InvalidPayloadError);
+      await expect(promise).rejects.toHaveProperty(
+        'code',
+        'SHIPPING_CURRENCY_UNSUPPORTED'
+      );
+
       const rows = await db
         .select({ id: orders.id })
         .from(orders)
diff --git a/frontend/lib/tests/shop/monobank-api-methods.test.ts b/frontend/lib/tests/shop/monobank-api-methods.test.ts
index 96a46490..b8d8ec7c 100644
--- a/frontend/lib/tests/shop/monobank-api-methods.test.ts
+++ b/frontend/lib/tests/shop/monobank-api-methods.test.ts
@@ -130,12 +130,12 @@ describe('monobank api methods', () => {
     });
   });
 
-  it('createInvoice maps 500 to PSP_UNKNOWN', async () => {
+  it('createInvoice maps 500 to PSP_UPSTREAM', async () => {
     const fetchMock = vi.fn(async () => makeResponse(500, 'error'));
     globalThis.fetch = fetchMock as any;
 
     const { createInvoice } = await import('@/lib/psp/monobank');
-    await expectPspError(() => createInvoice(createArgs), 'PSP_UNKNOWN', {
+    await expectPspError(() => createInvoice(createArgs), 'PSP_UPSTREAM', {
       httpStatus: 500,
     });
   });
@@ -173,12 +173,12 @@ describe('monobank api methods', () => {
     });
   });
 
-  it('getInvoiceStatus maps 500 to PSP_UNKNOWN', async () => {
+  it('getInvoiceStatus maps 500 to PSP_UPSTREAM', async () => {
     const fetchMock = vi.fn(async () => makeResponse(500, 'error'));
     globalThis.fetch = fetchMock as any;
 
     const { getInvoiceStatus } = await import('@/lib/psp/monobank');
-    await expectPspError(() => getInvoiceStatus('inv_2'), 'PSP_UNKNOWN', {
+    await expectPspError(() => getInvoiceStatus('inv_2'), 'PSP_UPSTREAM', {
       httpStatus: 500,
     });
   });
@@ -232,7 +232,7 @@ describe('monobank api methods', () => {
     );
   });
 
-  it('cancelInvoicePayment maps 500 to PSP_UNKNOWN', async () => {
+  it('cancelInvoicePayment maps 500 to PSP_UPSTREAM', async () => {
     const fetchMock = vi.fn(async () => makeResponse(500, 'error'));
     globalThis.fetch = fetchMock as any;
 
@@ -243,7 +243,7 @@ describe('monobank api methods', () => {
           invoiceId: 'inv_3',
           extRef: 'ext_3',
         }),
-      'PSP_UNKNOWN',
+      'PSP_UPSTREAM',
       { httpStatus: 500 }
     );
   });
@@ -280,13 +280,157 @@ describe('monobank api methods', () => {
     });
   });
 
-  it('removeInvoice maps 500 to PSP_UNKNOWN', async () => {
+  it('removeInvoice maps 500 to PSP_UPSTREAM', async () => {
     const fetchMock = vi.fn(async () => makeResponse(500, 'error'));
     globalThis.fetch = fetchMock as any;
 
     const { removeInvoice } = await import('@/lib/psp/monobank');
-    await expectPspError(() => removeInvoice('inv_4'), 'PSP_UNKNOWN', {
+    await expectPspError(() => removeInvoice('inv_4'), 'PSP_UPSTREAM', {
       httpStatus: 500,
     });
   });
+
+  it('walletPayment sends required request shape', async () => {
+    const body = JSON.stringify({
+      invoiceId: 'wallet_inv_1',
+      status: 'created',
+      tdsUrl: 'https://pay.example.test/3ds',
+      modifiedDate: 1710000000,
+    });
+    const fetchMock = vi.fn(async () => makeResponse(200, body));
+    globalThis.fetch = fetchMock as any;
+
+    const { walletPayment } = await import('@/lib/psp/monobank');
+    const result = await walletPayment({
+      cardToken: 'token-value',
+      amountMinor: 1234,
+      ccy: 980,
+      redirectUrl: 'https://shop.test/return/monobank',
+      webHookUrl: 'https://shop.test/api/shop/webhooks/monobank',
+    });
+
+    expect(result.invoiceId).toBe('wallet_inv_1');
+    expect(result.status).toBe('created');
+    expect(result.redirectUrl).toBe('https://pay.example.test/3ds');
+    expect(result.modifiedDate).toBeInstanceOf(Date);
+
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    const [url, init] = fetchMock.mock.calls[0] as unknown as [
+      string,
+      RequestInit,
+    ];
+    expect(url).toBe('https://api.example.test/api/merchant/wallet/payment');
+    expect(init.method).toBe('POST');
+    expect((init.headers as Record<string, string>)['X-Token']).toBe(
+      'test_token'
+    );
+
+    const payload = JSON.parse(String(init.body));
+    expect(payload).toMatchObject({
+      cardToken: 'token-value',
+      amount: 1234,
+      ccy: 980,
+      initiationKind: 'client',
+      redirectUrl: 'https://shop.test/return/monobank',
+      webHookUrl: 'https://shop.test/api/shop/webhooks/monobank',
+    });
+  });
+
+  it('walletPayment maps 400, 429, and 500 deterministically', async () => {
+    const badRequestFetch = vi.fn(async () =>
+      makeResponse(400, JSON.stringify({ errorCode: 'X', message: 'bad' }))
+    );
+    globalThis.fetch = badRequestFetch as any;
+
+    const { walletPayment } = await import('@/lib/psp/monobank');
+    await expectPspError(
+      () =>
+        walletPayment({
+          cardToken: 'token',
+          amountMinor: 100,
+          ccy: 980,
+          redirectUrl: 'https://shop.test/return',
+          webHookUrl: 'https://shop.test/webhook',
+        }),
+      'PSP_BAD_REQUEST',
+      {
+        httpStatus: 400,
+        monoCode: 'X',
+      }
+    );
+
+    const rateLimitedFetch = vi.fn(async () =>
+      makeResponse(429, JSON.stringify({ errorCode: 'R', message: 'rate' }))
+    );
+    globalThis.fetch = rateLimitedFetch as any;
+
+    await expectPspError(
+      () =>
+        walletPayment({
+          cardToken: 'token',
+          amountMinor: 100,
+          ccy: 980,
+          redirectUrl: 'https://shop.test/return',
+          webHookUrl: 'https://shop.test/webhook',
+        }),
+      'PSP_UPSTREAM',
+      {
+        httpStatus: 429,
+        monoCode: 'R',
+      }
+    );
+
+    const upstreamFetch = vi.fn(async () => makeResponse(500, 'server error'));
+    globalThis.fetch = upstreamFetch as any;
+
+    await expectPspError(
+      () =>
+        walletPayment({
+          cardToken: 'token',
+          amountMinor: 100,
+          ccy: 980,
+          redirectUrl: 'https://shop.test/return',
+          webHookUrl: 'https://shop.test/webhook',
+        }),
+      'PSP_UPSTREAM',
+      {
+        httpStatus: 500,
+      }
+    );
+
+    expect(upstreamFetch).toHaveBeenCalledTimes(1);
+  });
+
+  it('walletPayment timeout returns PSP_TIMEOUT without retries', async () => {
+    vi.useFakeTimers();
+
+    try {
+      process.env.MONO_INVOICE_TIMEOUT_MS = '25';
+      resetEnvCache();
+
+      const fetchMock = vi.fn(() => new Promise<Response>(() => {}));
+      globalThis.fetch = fetchMock as any;
+
+      const { walletPayment } = await import('@/lib/psp/monobank');
+      const p = walletPayment({
+        cardToken: 'token',
+        amountMinor: 100,
+        ccy: 980,
+        redirectUrl: 'https://shop.test/return',
+        webHookUrl: 'https://shop.test/webhook',
+      }).then(
+        () => null,
+        e => e
+      );
+
+      await vi.advanceTimersByTimeAsync(25);
+      const error = await p;
+      const { PspError } = await import('@/lib/psp/monobank');
+      expect(error).toBeInstanceOf(PspError);
+      expect((error as InstanceType<typeof PspError>).code).toBe('PSP_TIMEOUT');
+      expect(fetchMock).toHaveBeenCalledTimes(1);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
 });
diff --git a/frontend/lib/tests/shop/monobank-google-pay-config-route.test.ts b/frontend/lib/tests/shop/monobank-google-pay-config-route.test.ts
new file mode 100644
index 00000000..d3233ab7
--- /dev/null
+++ b/frontend/lib/tests/shop/monobank-google-pay-config-route.test.ts
@@ -0,0 +1,199 @@
+import crypto from 'node:crypto';
+
+import { eq } from 'drizzle-orm';
+import { NextRequest } from 'next/server';
+import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { db } from '@/db';
+import { orders } from '@/db/schema';
+import { toDbMoney } from '@/lib/shop/money';
+
+vi.mock('@/lib/auth', () => ({
+  getCurrentUser: vi.fn().mockResolvedValue(null),
+}));
+
+vi.mock('@/lib/services/shop/order-access', () => ({
+  authorizeOrderMutationAccess: vi.fn(async () => ({
+    authorized: true,
+    actorUserId: null,
+    code: 'OK',
+    status: 200,
+  })),
+}));
+
+let getRoute: typeof import('@/app/api/shop/orders/[id]/payment/monobank/google-pay/config/route').GET;
+
+const prevFlag = process.env.SHOP_MONOBANK_GPAY_ENABLED;
+const prevGatewayMerchantId = process.env.MONO_GOOGLE_PAY_GATEWAY_MERCHANT_ID;
+const prevMerchantName = process.env.MONO_GOOGLE_PAY_MERCHANT_NAME;
+
+beforeAll(async () => {
+  process.env.SHOP_MONOBANK_GPAY_ENABLED = 'true';
+  process.env.MONO_GOOGLE_PAY_GATEWAY_MERCHANT_ID = 'mono-gateway-mid';
+  process.env.MONO_GOOGLE_PAY_MERCHANT_NAME = 'Devlovers Test Merchant';
+  ({ GET: getRoute } =
+    await import('@/app/api/shop/orders/[id]/payment/monobank/google-pay/config/route'));
+});
+
+afterAll(() => {
+  if (prevFlag === undefined) delete process.env.SHOP_MONOBANK_GPAY_ENABLED;
+  else process.env.SHOP_MONOBANK_GPAY_ENABLED = prevFlag;
+
+  if (prevGatewayMerchantId === undefined)
+    delete process.env.MONO_GOOGLE_PAY_GATEWAY_MERCHANT_ID;
+  else process.env.MONO_GOOGLE_PAY_GATEWAY_MERCHANT_ID = prevGatewayMerchantId;
+
+  if (prevMerchantName === undefined) delete process.env.MONO_GOOGLE_PAY_MERCHANT_NAME;
+  else process.env.MONO_GOOGLE_PAY_MERCHANT_NAME = prevMerchantName;
+});
+
+beforeEach(() => {
+  process.env.SHOP_MONOBANK_GPAY_ENABLED = 'true';
+  process.env.MONO_GOOGLE_PAY_GATEWAY_MERCHANT_ID = 'mono-gateway-mid';
+  process.env.MONO_GOOGLE_PAY_MERCHANT_NAME = 'Devlovers Test Merchant';
+});
+
+async function insertOrder(args: {
+  id: string;
+  paymentProvider?: 'monobank' | 'stripe';
+  paymentStatus?: 'pending' | 'requires_payment' | 'paid' | 'failed' | 'refunded';
+  currency?: 'UAH' | 'USD';
+  totalAmountMinor?: number;
+  paymentMethod?: 'monobank_google_pay' | 'monobank_invoice' | 'stripe_card' | null;
+}) {
+  await db.insert(orders).values({
+    id: args.id,
+    totalAmountMinor: args.totalAmountMinor ?? 12345,
+    totalAmount: toDbMoney(args.totalAmountMinor ?? 12345),
+    currency: args.currency ?? 'UAH',
+    paymentProvider: args.paymentProvider ?? 'monobank',
+    paymentStatus: args.paymentStatus ?? 'pending',
+    status: 'INVENTORY_RESERVED',
+    inventoryStatus: 'reserved',
+    idempotencyKey: `idem_${crypto.randomUUID()}`,
+    pspPaymentMethod: args.paymentMethod ?? 'monobank_google_pay',
+    pspMetadata: {
+      checkout: {
+        requestedMethod: args.paymentMethod ?? 'monobank_google_pay',
+      },
+    },
+  } as any);
+}
+
+async function cleanupOrder(orderId: string) {
+  await db.delete(orders).where(eq(orders.id, orderId));
+}
+
+function makeRequest(orderId: string) {
+  return new NextRequest(
+    `http://localhost/api/shop/orders/${orderId}/payment/monobank/google-pay/config?statusToken=tok_test`,
+    {
+      method: 'GET',
+      headers: {
+        origin: 'http://localhost:3000',
+      },
+    }
+  );
+}
+
+describe.sequential('monobank google pay config route', () => {
+  it('returns server-authoritative PaymentDataRequest with decimal totalPrice and UAH currencyCode', async () => {
+    const orderId = crypto.randomUUID();
+    await insertOrder({
+      id: orderId,
+      totalAmountMinor: 12345,
+      currency: 'UAH',
+      paymentProvider: 'monobank',
+      paymentMethod: 'monobank_google_pay',
+    });
+
+    try {
+      const res = await getRoute(makeRequest(orderId), {
+        params: Promise.resolve({ id: orderId }),
+      });
+
+      expect(res.status).toBe(200);
+      const json: any = await res.json();
+      expect(json.success).toBe(true);
+      expect(json.orderId).toBe(orderId);
+
+      expect(json.paymentDataRequest.transactionInfo.totalPrice).toBe('123.45');
+      expect(json.paymentDataRequest.transactionInfo.currencyCode).toBe('UAH');
+      expect(json.paymentDataRequest.allowedPaymentMethods[0].tokenizationSpecification).toEqual(
+        {
+          type: 'PAYMENT_GATEWAY',
+          parameters: {
+            gateway: 'monobank',
+            gatewayMerchantId: 'mono-gateway-mid',
+          },
+        }
+      );
+      expect(json.paymentDataRequest.merchantInfo.merchantName).toBe(
+        'Devlovers Test Merchant'
+      );
+    } finally {
+      await cleanupOrder(orderId);
+    }
+  });
+
+  it('enforces feature flag and order provider/currency/method guards', async () => {
+    const flagOrderId = crypto.randomUUID();
+    const providerOrderId = crypto.randomUUID();
+    const currencyOrderId = crypto.randomUUID();
+    const methodOrderId = crypto.randomUUID();
+
+    await insertOrder({ id: flagOrderId });
+    await insertOrder({
+      id: providerOrderId,
+      paymentProvider: 'stripe',
+      paymentMethod: 'stripe_card',
+      currency: 'USD',
+    });
+    await insertOrder({
+      id: currencyOrderId,
+      paymentProvider: 'monobank',
+      paymentMethod: 'monobank_google_pay',
+      currency: 'USD',
+    });
+    await insertOrder({
+      id: methodOrderId,
+      paymentProvider: 'monobank',
+      paymentMethod: 'monobank_invoice',
+      currency: 'UAH',
+    });
+
+    try {
+      process.env.SHOP_MONOBANK_GPAY_ENABLED = 'false';
+      const flagRes = await getRoute(makeRequest(flagOrderId), {
+        params: Promise.resolve({ id: flagOrderId }),
+      });
+      expect(flagRes.status).toBe(409);
+      expect((await flagRes.json()).code).toBe('MONOBANK_GPAY_DISABLED');
+
+      process.env.SHOP_MONOBANK_GPAY_ENABLED = 'true';
+
+      const providerRes = await getRoute(makeRequest(providerOrderId), {
+        params: Promise.resolve({ id: providerOrderId }),
+      });
+      expect(providerRes.status).toBe(409);
+      expect((await providerRes.json()).code).toBe('PAYMENT_PROVIDER_NOT_ALLOWED');
+
+      const currencyRes = await getRoute(makeRequest(currencyOrderId), {
+        params: Promise.resolve({ id: currencyOrderId }),
+      });
+      expect(currencyRes.status).toBe(409);
+      expect((await currencyRes.json()).code).toBe('ORDER_CURRENCY_NOT_SUPPORTED');
+
+      const methodRes = await getRoute(makeRequest(methodOrderId), {
+        params: Promise.resolve({ id: methodOrderId }),
+      });
+      expect(methodRes.status).toBe(409);
+      expect((await methodRes.json()).code).toBe('PAYMENT_METHOD_NOT_ALLOWED');
+    } finally {
+      await cleanupOrder(flagOrderId);
+      await cleanupOrder(providerOrderId);
+      await cleanupOrder(currencyOrderId);
+      await cleanupOrder(methodOrderId);
+    }
+  });
+});
diff --git a/frontend/lib/tests/shop/monobank-google-pay-submit-route.test.ts b/frontend/lib/tests/shop/monobank-google-pay-submit-route.test.ts
new file mode 100644
index 00000000..3ab3bb86
--- /dev/null
+++ b/frontend/lib/tests/shop/monobank-google-pay-submit-route.test.ts
@@ -0,0 +1,536 @@
+import crypto from 'node:crypto';
+
+import { and, eq, inArray, type InferInsertModel } from 'drizzle-orm';
+import { NextRequest } from 'next/server';
+import {
+  afterAll,
+  beforeAll,
+  beforeEach,
+  describe,
+  expect,
+  it,
+  vi,
+} from 'vitest';
+
+import { db } from '@/db';
+import { orders, paymentAttempts } from '@/db/schema';
+import { toDbMoney } from '@/lib/shop/money';
+
+vi.mock('@/lib/auth', () => ({
+  getCurrentUser: vi.fn().mockResolvedValue(null),
+}));
+
+vi.mock('@/lib/services/shop/order-access', () => ({
+  authorizeOrderMutationAccess: vi.fn(async () => ({
+    authorized: true,
+    actorUserId: null,
+    code: 'OK',
+    status: 200,
+  })),
+}));
+
+vi.mock('@/lib/logging', async () => {
+  const actual = await vi.importActual<any>('@/lib/logging');
+  return {
+    ...actual,
+    logError: vi.fn(),
+    logWarn: vi.fn(),
+    logInfo: vi.fn(),
+  };
+});
+
+const walletPaymentMock = vi.fn();
+
+type WalletResult = {
+  invoiceId: string | null;
+  status: string | null;
+  redirectUrl: string | null;
+  modifiedDate: string | null;
+  raw: unknown;
+};
+
+type OrderInsert = InferInsertModel<typeof orders>;
+
+vi.mock('@/lib/psp/monobank', async () => {
+  const actual = await vi.importActual<any>('@/lib/psp/monobank');
+  return {
+    ...actual,
+    walletPayment: (...args: any[]) => walletPaymentMock(...args),
+  };
+});
+
+let postRoute: typeof import('@/app/api/shop/orders/[id]/payment/monobank/google-pay/submit/route').POST;
+let PspErrorCtor: typeof import('@/lib/psp/monobank').PspError;
+
+const prevAppOrigin = process.env.APP_ORIGIN;
+const prevShopBaseUrl = process.env.SHOP_BASE_URL;
+const prevFlag = process.env.SHOP_MONOBANK_GPAY_ENABLED;
+const prevMaxBody = process.env.SHOP_MONOBANK_GPAY_MAX_BODY_BYTES;
+
+beforeAll(async () => {
+  process.env.APP_ORIGIN = 'http://localhost:3000';
+  delete process.env.SHOP_BASE_URL;
+  process.env.SHOP_MONOBANK_GPAY_ENABLED = 'true';
+  delete process.env.SHOP_MONOBANK_GPAY_MAX_BODY_BYTES;
+
+  ({ POST: postRoute } =
+    await import('@/app/api/shop/orders/[id]/payment/monobank/google-pay/submit/route'));
+  ({ PspError: PspErrorCtor } = await import('@/lib/psp/monobank'));
+});
+
+afterAll(() => {
+  if (prevAppOrigin === undefined) delete process.env.APP_ORIGIN;
+  else process.env.APP_ORIGIN = prevAppOrigin;
+
+  if (prevShopBaseUrl === undefined) delete process.env.SHOP_BASE_URL;
+  else process.env.SHOP_BASE_URL = prevShopBaseUrl;
+
+  if (prevFlag === undefined) delete process.env.SHOP_MONOBANK_GPAY_ENABLED;
+  else process.env.SHOP_MONOBANK_GPAY_ENABLED = prevFlag;
+
+  if (prevMaxBody === undefined)
+    delete process.env.SHOP_MONOBANK_GPAY_MAX_BODY_BYTES;
+  else process.env.SHOP_MONOBANK_GPAY_MAX_BODY_BYTES = prevMaxBody;
+});
+
+beforeEach(() => {
+  walletPaymentMock.mockReset();
+  process.env.SHOP_MONOBANK_GPAY_ENABLED = 'true';
+  delete process.env.SHOP_MONOBANK_GPAY_MAX_BODY_BYTES;
+});
+
+async function insertOrder(args: {
+  id: string;
+  paymentProvider?: 'monobank' | 'stripe';
+  paymentStatus?:
+    | 'pending'
+    | 'requires_payment'
+    | 'paid'
+    | 'failed'
+    | 'refunded';
+  currency?: 'UAH' | 'USD';
+  paymentMethod?: 'monobank_google_pay' | 'monobank_invoice' | 'stripe_card';
+}) {
+  const values: OrderInsert = {
+    id: args.id,
+    totalAmountMinor: 4321,
+    totalAmount: toDbMoney(4321),
+    currency: args.currency ?? 'UAH',
+    paymentProvider: args.paymentProvider ?? 'monobank',
+    paymentStatus: args.paymentStatus ?? 'pending',
+    status: 'INVENTORY_RESERVED',
+    inventoryStatus: 'reserved',
+    idempotencyKey: `idem_${crypto.randomUUID()}`,
+    pspPaymentMethod: args.paymentMethod ?? 'monobank_google_pay',
+    pspMetadata: {
+      checkout: {
+        requestedMethod: args.paymentMethod ?? 'monobank_google_pay',
+      },
+    },
+  };
+
+  await db.insert(orders).values(values);
+}
+
+async function cleanupOrder(orderId: string) {
+  await db.delete(paymentAttempts).where(eq(paymentAttempts.orderId, orderId));
+  await db.delete(orders).where(eq(orders.id, orderId));
+}
+
+function makeSubmitRequest(args: {
+  orderId: string;
+  idempotencyKey?: string;
+  body: string;
+}) {
+  const headers = new Headers({
+    origin: 'http://localhost:3000',
+    'content-type': 'application/json',
+  });
+  if (args.idempotencyKey) {
+    headers.set('idempotency-key', args.idempotencyKey);
+  }
+
+  return new NextRequest(
+    `http://localhost/api/shop/orders/${args.orderId}/payment/monobank/google-pay/submit?statusToken=tok_test`,
+    {
+      method: 'POST',
+      headers,
+      body: args.body,
+    }
+  );
+}
+
+async function waitForCreatingAttempt(orderId: string, timeoutMs = 3_000) {
+  const deadline = Date.now() + timeoutMs;
+  let lastAttempt:
+    | {
+        id: string;
+        status: string;
+      }
+    | undefined;
+
+  while (Date.now() < deadline) {
+    const [attempt] = await db
+      .select({
+        id: paymentAttempts.id,
+        status: paymentAttempts.status,
+      })
+      .from(paymentAttempts)
+      .where(
+        and(
+          eq(paymentAttempts.orderId, orderId),
+          eq(paymentAttempts.provider, 'monobank')
+        )
+      )
+      .limit(1);
+
+    lastAttempt = attempt;
+    if (attempt?.status === 'creating') return;
+
+    await new Promise(resolve => setTimeout(resolve, 25));
+  }
+
+  throw new Error(
+    `Timed out waiting for creating payment attempt. orderId=${orderId}; provider=monobank; timeoutMs=${timeoutMs}; lastAttempt=${JSON.stringify(lastAttempt ?? null)}`
+  );
+}
+
+describe.sequential('monobank google pay submit route', () => {
+  it('enforces payload cap before JSON.parse', async () => {
+    const orderId = crypto.randomUUID();
+    await insertOrder({ id: orderId });
+    process.env.SHOP_MONOBANK_GPAY_MAX_BODY_BYTES = '64';
+
+    const big = JSON.stringify({ gToken: `token_${'x'.repeat(200)}` });
+    try {
+      const res = await postRoute(
+        makeSubmitRequest({
+          orderId,
+          idempotencyKey: 'mono_submit_cap_test_key_0001',
+          body: big,
+        }),
+        { params: Promise.resolve({ id: orderId }) }
+      );
+
+      expect(res.status).toBe(413);
+      const json: any = await res.json();
+      expect(json.code).toBe('PAYLOAD_TOO_LARGE');
+      expect(walletPaymentMock).not.toHaveBeenCalled();
+    } finally {
+      await cleanupOrder(orderId);
+    }
+  });
+
+  it('formats token via parse/stringify fallback and never persists raw token', async () => {
+    const orderJsonToken = crypto.randomUUID();
+    const orderRawToken = crypto.randomUUID();
+    await insertOrder({ id: orderJsonToken });
+    await insertOrder({ id: orderRawToken });
+
+    walletPaymentMock
+      .mockResolvedValueOnce({
+        invoiceId: 'inv_json_1',
+        status: 'created',
+        redirectUrl: null,
+        modifiedDate: null,
+        raw: {},
+      })
+      .mockResolvedValueOnce({
+        invoiceId: 'inv_raw_1',
+        status: 'created',
+        redirectUrl: null,
+        modifiedDate: null,
+        raw: {},
+      });
+
+    try {
+      const jsonTokenMarker = `tok_json_${crypto.randomUUID()}`;
+      const resJson = await postRoute(
+        makeSubmitRequest({
+          orderId: orderJsonToken,
+          idempotencyKey: 'mono_submit_parse_json_key_0001',
+          body: JSON.stringify({
+            gToken: ` { "payload":"${jsonTokenMarker}", "v":1 } `,
+          }),
+        }),
+        { params: Promise.resolve({ id: orderJsonToken }) }
+      );
+      expect(resJson.status).toBe(200);
+
+      const firstCallArgs = walletPaymentMock.mock.calls[0]?.[0];
+      expect(firstCallArgs.cardToken).toBe(
+        JSON.stringify({ payload: jsonTokenMarker, v: 1 })
+      );
+      expect(firstCallArgs.ccy).toBe(980);
+
+      const rawTokenMarker = `tok_raw_${crypto.randomUUID()}`;
+      const resRaw = await postRoute(
+        makeSubmitRequest({
+          orderId: orderRawToken,
+          idempotencyKey: 'mono_submit_parse_raw_key_0001',
+          body: JSON.stringify({ gToken: rawTokenMarker }),
+        }),
+        { params: Promise.resolve({ id: orderRawToken }) }
+      );
+      expect(resRaw.status).toBe(200);
+
+      const secondCallArgs = walletPaymentMock.mock.calls[1]?.[0];
+      expect(secondCallArgs.cardToken).toBe(rawTokenMarker);
+
+      const attempts = await db
+        .select({
+          orderId: paymentAttempts.orderId,
+          metadata: paymentAttempts.metadata,
+        })
+        .from(paymentAttempts)
+        .where(
+          inArray(paymentAttempts.orderId, [orderJsonToken, orderRawToken])
+        );
+
+      for (const attempt of attempts) {
+        const metadata = (attempt.metadata ?? {}) as Record<string, any>;
+        const wallet = metadata.monobank?.wallet;
+        expect(wallet?.requested).toBe('google_pay');
+        expect(wallet?.submitOutcome).toBe('submitted');
+      }
+
+      const serializedMeta = JSON.stringify(attempts);
+      expect(serializedMeta).not.toContain(jsonTokenMarker);
+      expect(serializedMeta).not.toContain(rawTokenMarker);
+    } finally {
+      await cleanupOrder(orderJsonToken);
+      await cleanupOrder(orderRawToken);
+    }
+  });
+
+  it('same order + same idempotency key returns same result and no second PSP call', async () => {
+    const orderId = crypto.randomUUID();
+    await insertOrder({ id: orderId });
+
+    walletPaymentMock.mockResolvedValue({
+      invoiceId: 'inv_replay_1',
+      status: 'created',
+      redirectUrl: 'https://pay.example.test/3ds',
+      modifiedDate: null,
+      raw: {},
+    });
+
+    try {
+      const requestKey = 'mono_submit_replay_key_0001';
+      const req = () =>
+        makeSubmitRequest({
+          orderId,
+          idempotencyKey: requestKey,
+          body: JSON.stringify({ gToken: `token_${crypto.randomUUID()}` }),
+        });
+
+      const first = await postRoute(req(), {
+        params: Promise.resolve({ id: orderId }),
+      });
+      const second = await postRoute(req(), {
+        params: Promise.resolve({ id: orderId }),
+      });
+
+      expect(first.status).toBe(200);
+      expect(second.status).toBe(200);
+      expect(walletPaymentMock).toHaveBeenCalledTimes(1);
+
+      const secondJson: any = await second.json();
+      expect(secondJson.reused).toBe(true);
+      expect(secondJson.status).toBe('pending');
+    } finally {
+      await cleanupOrder(orderId);
+    }
+  });
+
+  it('concurrent different keys for same active attempt returns 409 conflict', async () => {
+    const orderId = crypto.randomUUID();
+    await insertOrder({ id: orderId });
+
+    let release!: (value: WalletResult) => void;
+    const hold = new Promise<WalletResult>(resolve => {
+      release = resolve;
+    });
+
+    walletPaymentMock.mockImplementationOnce(async () => {
+      return await hold;
+    });
+
+    try {
+      const leaderPromise = postRoute(
+        makeSubmitRequest({
+          orderId,
+          idempotencyKey: 'mono_submit_conflict_key_a_0001',
+          body: JSON.stringify({ gToken: 'token-a' }),
+        }),
+        { params: Promise.resolve({ id: orderId }) }
+      );
+
+      await waitForCreatingAttempt(orderId);
+
+      const follower = await postRoute(
+        makeSubmitRequest({
+          orderId,
+          idempotencyKey: 'mono_submit_conflict_key_b_0001',
+          body: JSON.stringify({ gToken: 'token-b' }),
+        }),
+        { params: Promise.resolve({ id: orderId }) }
+      );
+
+      expect(follower.status).toBe(409);
+      expect((await follower.json()).code).toBe('MONOBANK_WALLET_CONFLICT');
+
+      release({
+        invoiceId: 'inv_conflict_1',
+        status: 'created',
+        redirectUrl: null,
+        modifiedDate: null,
+        raw: {},
+      });
+
+      const leader = await leaderPromise;
+      expect(leader.status).toBe(200);
+      expect(walletPaymentMock).toHaveBeenCalledTimes(1);
+    } finally {
+      await cleanupOrder(orderId);
+    }
+  }, 15_000);
+
+  it('enforces flag/provider/currency/method compatibility guards', async () => {
+    const disabledOrderId = crypto.randomUUID();
+    const providerOrderId = crypto.randomUUID();
+    const currencyOrderId = crypto.randomUUID();
+    const methodOrderId = crypto.randomUUID();
+
+    await insertOrder({ id: disabledOrderId });
+    await insertOrder({
+      id: providerOrderId,
+      paymentProvider: 'stripe',
+      paymentMethod: 'stripe_card',
+      currency: 'USD',
+    });
+    await insertOrder({
+      id: currencyOrderId,
+      paymentProvider: 'monobank',
+      paymentMethod: 'monobank_google_pay',
+      currency: 'USD',
+    });
+    await insertOrder({
+      id: methodOrderId,
+      paymentProvider: 'monobank',
+      paymentMethod: 'monobank_invoice',
+      currency: 'UAH',
+    });
+
+    try {
+      process.env.SHOP_MONOBANK_GPAY_ENABLED = 'false';
+      const disabled = await postRoute(
+        makeSubmitRequest({
+          orderId: disabledOrderId,
+          idempotencyKey: 'mono_submit_flag_guard_0001',
+          body: JSON.stringify({ gToken: 'token-disabled' }),
+        }),
+        { params: Promise.resolve({ id: disabledOrderId }) }
+      );
+      expect(disabled.status).toBe(409);
+      expect((await disabled.json()).code).toBe('MONOBANK_GPAY_DISABLED');
+
+      process.env.SHOP_MONOBANK_GPAY_ENABLED = 'true';
+
+      const provider = await postRoute(
+        makeSubmitRequest({
+          orderId: providerOrderId,
+          idempotencyKey: 'mono_submit_provider_guard_0001',
+          body: JSON.stringify({ gToken: 'token-provider' }),
+        }),
+        { params: Promise.resolve({ id: providerOrderId }) }
+      );
+      expect(provider.status).toBe(409);
+      expect((await provider.json()).code).toBe('PAYMENT_PROVIDER_NOT_ALLOWED');
+
+      const currency = await postRoute(
+        makeSubmitRequest({
+          orderId: currencyOrderId,
+          idempotencyKey: 'mono_submit_currency_guard_0001',
+          body: JSON.stringify({ gToken: 'token-currency' }),
+        }),
+        { params: Promise.resolve({ id: currencyOrderId }) }
+      );
+      expect(currency.status).toBe(409);
+      expect((await currency.json()).code).toBe('ORDER_CURRENCY_NOT_SUPPORTED');
+
+      const method = await postRoute(
+        makeSubmitRequest({
+          orderId: methodOrderId,
+          idempotencyKey: 'mono_submit_method_guard_0001',
+          body: JSON.stringify({ gToken: 'token-method' }),
+        }),
+        { params: Promise.resolve({ id: methodOrderId }) }
+      );
+      expect(method.status).toBe(409);
+      expect((await method.json()).code).toBe('PAYMENT_METHOD_NOT_ALLOWED');
+      expect(walletPaymentMock).not.toHaveBeenCalled();
+    } finally {
+      await cleanupOrder(disabledOrderId);
+      await cleanupOrder(providerOrderId);
+      await cleanupOrder(currencyOrderId);
+      await cleanupOrder(methodOrderId);
+    }
+  });
+
+  it('returns pending/unknown on PSP timeout without retries', async () => {
+    const orderId = crypto.randomUUID();
+    await insertOrder({ id: orderId });
+
+    walletPaymentMock.mockRejectedValueOnce(
+      new PspErrorCtor('PSP_TIMEOUT', 'timeout')
+    );
+
+    try {
+      const res = await postRoute(
+        makeSubmitRequest({
+          orderId,
+          idempotencyKey: 'mono_submit_unknown_0001',
+          body: JSON.stringify({ gToken: 'token-timeout' }),
+        }),
+        { params: Promise.resolve({ id: orderId }) }
+      );
+
+      expect(res.status).toBe(202);
+      const json: any = await res.json();
+      expect(json.submitOutcome).toBe('unknown');
+      expect(json.status).toBe('pending');
+      expect(walletPaymentMock).toHaveBeenCalledTimes(1);
+    } finally {
+      await cleanupOrder(orderId);
+    }
+  });
+
+  it('returns pending/unknown on transient 429 upstream without retries', async () => {
+    const orderId = crypto.randomUUID();
+    await insertOrder({ id: orderId });
+
+    walletPaymentMock.mockRejectedValueOnce(
+      new PspErrorCtor('PSP_UPSTREAM', 'rate_limited', { httpStatus: 429 })
+    );
+
+    try {
+      const res = await postRoute(
+        makeSubmitRequest({
+          orderId,
+          idempotencyKey: 'mono_submit_unknown_429_0001',
+          body: JSON.stringify({ gToken: 'token-429' }),
+        }),
+        { params: Promise.resolve({ id: orderId }) }
+      );
+
+      expect(res.status).toBe(202);
+      const json: any = await res.json();
+      expect(json.submitOutcome).toBe('unknown');
+      expect(json.status).toBe('pending');
+      expect(walletPaymentMock).toHaveBeenCalledTimes(1);
+    } finally {
+      await cleanupOrder(orderId);
+    }
+  });
+});
diff --git a/frontend/lib/tests/shop/monobank-janitor-job1.test.ts b/frontend/lib/tests/shop/monobank-janitor-job1.test.ts
index 93b4c949..3d70ec78 100644
--- a/frontend/lib/tests/shop/monobank-janitor-job1.test.ts
+++ b/frontend/lib/tests/shop/monobank-janitor-job1.test.ts
@@ -133,12 +133,8 @@ describe.sequential('monobank janitor job1', () => {
 
     try {
       const res = await runMonobankJanitorJob1(makeArgs());
-      expect(res).toEqual({
-        processed: 1,
-        applied: 1,
-        noop: 0,
-        failed: 0,
-      });
+      expect(res.applied).toBeGreaterThanOrEqual(1);
+      expect(res.processed).toBeGreaterThanOrEqual(1);
 
       const [order] = await db
         .select({
@@ -190,12 +186,8 @@ describe.sequential('monobank janitor job1', () => {
 
     try {
       const res = await runMonobankJanitorJob1(makeArgs());
-      expect(res).toEqual({
-        processed: 1,
-        applied: 1,
-        noop: 0,
-        failed: 0,
-      });
+      expect(res.applied).toBeGreaterThanOrEqual(1);
+      expect(res.processed).toBeGreaterThanOrEqual(1);
 
       const [order] = await db
         .select({
@@ -256,7 +248,10 @@ describe.sequential('monobank janitor job1', () => {
 
     try {
       const first = await runMonobankJanitorJob1(makeArgs());
-      expect(first).toEqual({ processed: 1, applied: 0, noop: 1, failed: 0 });
+      expect(first.applied).toBe(0);
+      expect(first.failed).toBe(0);
+      expect(first.noop).toBeGreaterThanOrEqual(1);
+      expect(first.processed).toBeGreaterThanOrEqual(1);
 
       await db
         .update(paymentAttempts)
@@ -264,9 +259,29 @@ describe.sequential('monobank janitor job1', () => {
         .where(eq(paymentAttempts.id, attemptId));
 
       const second = await runMonobankJanitorJob1(makeArgs());
-      expect(second).toEqual({ processed: 1, applied: 0, noop: 1, failed: 0 });
+      expect(second.applied).toBe(0);
+      expect(second.failed).toBe(0);
+      expect(second.noop).toBeGreaterThanOrEqual(1);
+      expect(second.processed).toBeGreaterThanOrEqual(1);
 
-      expect(getInvoiceStatusMock).toHaveBeenCalledTimes(2);
+      const [attempt] = await db
+        .select({
+          status: paymentAttempts.status,
+          janitorClaimedUntil: paymentAttempts.janitorClaimedUntil,
+          janitorClaimedBy: paymentAttempts.janitorClaimedBy,
+        })
+        .from(paymentAttempts)
+        .where(eq(paymentAttempts.id, attemptId))
+        .limit(1);
+
+      expect(attempt?.status).toBe('active');
+      expect(attempt?.janitorClaimedUntil).toBeNull();
+      expect(attempt?.janitorClaimedBy).toBeNull();
+
+      const invoiceCalls = getInvoiceStatusMock.mock.calls.filter(
+        ([calledInvoiceId]) => calledInvoiceId === invoiceId
+      );
+      expect(invoiceCalls).toHaveLength(2);
     } finally {
       await cleanup(orderId, invoiceId);
     }
diff --git a/frontend/lib/tests/shop/monobank-janitor-job3.test.ts b/frontend/lib/tests/shop/monobank-janitor-job3.test.ts
index 7a3cf6e5..55a94d14 100644
--- a/frontend/lib/tests/shop/monobank-janitor-job3.test.ts
+++ b/frontend/lib/tests/shop/monobank-janitor-job3.test.ts
@@ -1,6 +1,6 @@
 import crypto from 'node:crypto';
 
-import { eq, sql } from 'drizzle-orm';
+import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { db } from '@/db';
diff --git a/frontend/lib/tests/shop/monobank-wallet-service.test.ts b/frontend/lib/tests/shop/monobank-wallet-service.test.ts
new file mode 100644
index 00000000..a20eedeb
--- /dev/null
+++ b/frontend/lib/tests/shop/monobank-wallet-service.test.ts
@@ -0,0 +1,176 @@
+import { describe, expect, it, vi } from 'vitest';
+
+vi.mock('@/db', () => ({
+  db: new Proxy(
+    {},
+    {
+      get() {
+        throw new Error('[unit-test] DB access is not allowed here');
+      },
+    }
+  ),
+}));
+
+import { PspError } from '@/lib/psp/monobank';
+import {
+  __test__,
+  MonobankWalletConflictError,
+} from '@/lib/services/orders/monobank-wallet';
+
+describe('monobank wallet orchestration (unit, no DB)', () => {
+  const baseOrder = {
+    id: 'order_1',
+    paymentProvider: 'monobank',
+    paymentStatus: 'pending',
+    currency: 'UAH',
+    totalAmountMinor: 1250,
+  };
+
+  const creatingAttempt = {
+    id: 'attempt_1',
+    orderId: 'order_1',
+    provider: 'monobank',
+    status: 'creating',
+    attemptNumber: 1,
+    idempotencyKey: 'idem-1',
+    providerPaymentIntentId: null,
+    providerModifiedAt: null,
+    metadata: {},
+    createdAt: new Date(),
+    updatedAt: new Date(),
+    finalizedAt: null,
+    currency: 'UAH',
+    expectedAmountMinor: 1250,
+    checkoutUrl: null,
+    providerCreatedAt: null,
+    janitorClaimedUntil: null,
+    janitorClaimedBy: null,
+    lastErrorCode: null,
+    lastErrorMessage: null,
+  };
+
+  it('same order + same idempotency key returns same result and skips PSP call', async () => {
+    const deps = {
+      readWalletOrder: vi.fn(async () => baseOrder),
+      findAttemptByIdempotencyKey: vi.fn(async () => ({
+        ...creatingAttempt,
+        status: 'active',
+        providerPaymentIntentId: 'invoice_1',
+        metadata: {
+          wallet: {
+            submitOutcome: 'submitted',
+            syncStatus: 'created',
+            redirectUrl: 'https://pay.test/3ds',
+          },
+        },
+      })),
+      findActiveAttempt: vi.fn(async () => null),
+      createCreatingAttempt: vi.fn(async () => creatingAttempt),
+      persistAttemptSubmitted: vi.fn(async () => undefined),
+      persistAttemptUnknown: vi.fn(async () => undefined),
+      persistAttemptRejected: vi.fn(async () => undefined),
+      walletPayment: vi.fn(async () => {
+        throw new Error('should not be called');
+      }),
+    };
+
+    const result = await __test__.submitMonobankWalletPaymentImpl(deps as any, {
+      orderId: 'order_1',
+      idempotencyKey: 'idem-1',
+      cardToken: 'token',
+      redirectUrl: 'https://shop.test/return',
+      webHookUrl: 'https://shop.test/webhook',
+    });
+
+    expect(result.reused).toBe(true);
+    expect(result.invoiceId).toBe('invoice_1');
+    expect(result.redirectUrl).toBe('https://pay.test/3ds');
+    expect(deps.walletPayment).not.toHaveBeenCalled();
+  });
+
+  it('concurrent different idempotency key for active attempt throws typed conflict', async () => {
+    const deps = {
+      readWalletOrder: vi.fn(async () => baseOrder),
+      findAttemptByIdempotencyKey: vi.fn(async () => null),
+      findActiveAttempt: vi.fn(async () => ({
+        ...creatingAttempt,
+        idempotencyKey: 'active-key',
+      })),
+      createCreatingAttempt: vi.fn(async () => creatingAttempt),
+      persistAttemptSubmitted: vi.fn(async () => undefined),
+      persistAttemptUnknown: vi.fn(async () => undefined),
+      persistAttemptRejected: vi.fn(async () => undefined),
+      walletPayment: vi.fn(async () => ({}) as any),
+    };
+
+    await expect(
+      __test__.submitMonobankWalletPaymentImpl(deps as any, {
+        orderId: 'order_1',
+        idempotencyKey: 'new-key',
+        cardToken: 'token',
+        redirectUrl: 'https://shop.test/return',
+        webHookUrl: 'https://shop.test/webhook',
+      })
+    ).rejects.toBeInstanceOf(MonobankWalletConflictError);
+
+    expect(deps.walletPayment).not.toHaveBeenCalled();
+  });
+
+  it('timeout/upstream path returns unknown and does not retry', async () => {
+    const deps = {
+      readWalletOrder: vi.fn(async () => baseOrder),
+      findAttemptByIdempotencyKey: vi.fn(async () => null),
+      findActiveAttempt: vi.fn(async () => null),
+      createCreatingAttempt: vi.fn(async () => creatingAttempt),
+      persistAttemptSubmitted: vi.fn(async () => undefined),
+      persistAttemptUnknown: vi.fn(async () => undefined),
+      persistAttemptRejected: vi.fn(async () => undefined),
+      walletPayment: vi.fn(async () => {
+        throw new PspError('PSP_TIMEOUT', 'timeout');
+      }),
+    };
+
+    const result = await __test__.submitMonobankWalletPaymentImpl(deps as any, {
+      orderId: 'order_1',
+      idempotencyKey: 'idem-1',
+      cardToken: 'token',
+      redirectUrl: 'https://shop.test/return',
+      webHookUrl: 'https://shop.test/webhook',
+    });
+
+    expect(result.outcome).toBe('unknown');
+    expect(result.reused).toBe(false);
+    expect(deps.walletPayment).toHaveBeenCalledTimes(1);
+    expect(deps.persistAttemptUnknown).toHaveBeenCalledTimes(1);
+    expect(deps.persistAttemptRejected).not.toHaveBeenCalled();
+  });
+
+  it('4xx PSP error is persisted as rejected and rethrown', async () => {
+    const deps = {
+      readWalletOrder: vi.fn(async () => baseOrder),
+      findAttemptByIdempotencyKey: vi.fn(async () => null),
+      findActiveAttempt: vi.fn(async () => null),
+      createCreatingAttempt: vi.fn(async () => creatingAttempt),
+      persistAttemptSubmitted: vi.fn(async () => undefined),
+      persistAttemptUnknown: vi.fn(async () => undefined),
+      persistAttemptRejected: vi.fn(async () => undefined),
+      walletPayment: vi.fn(async () => {
+        throw new PspError('PSP_BAD_REQUEST', 'bad request');
+      }),
+    };
+
+    await expect(
+      __test__.submitMonobankWalletPaymentImpl(deps as any, {
+        orderId: 'order_1',
+        idempotencyKey: 'idem-1',
+        cardToken: 'token',
+        redirectUrl: 'https://shop.test/return',
+        webHookUrl: 'https://shop.test/webhook',
+      })
+    ).rejects.toBeInstanceOf(PspError);
+
+    expect(deps.walletPayment).toHaveBeenCalledTimes(1);
+    expect(deps.persistAttemptRejected).toHaveBeenCalledTimes(1);
+    expect(deps.persistAttemptUnknown).not.toHaveBeenCalled();
+  });
+});
diff --git a/frontend/lib/tests/shop/monobank-webhook-apply.test.ts b/frontend/lib/tests/shop/monobank-webhook-apply.test.ts
index b1b496cb..7ba752a8 100644
--- a/frontend/lib/tests/shop/monobank-webhook-apply.test.ts
+++ b/frontend/lib/tests/shop/monobank-webhook-apply.test.ts
@@ -7,8 +7,8 @@ import { db } from '@/db';
 import {
   monobankEvents,
   orders,
-  paymentEvents,
   paymentAttempts,
+  paymentEvents,
   shippingShipments,
 } from '@/db/schema';
 import { buildMonobankAttemptIdempotencyKey } from '@/lib/services/orders/attempt-idempotency';
@@ -47,6 +47,7 @@ async function insertOrderAndAttempt(args: {
     | 'released'
     | 'failed';
   withShippingNp?: boolean;
+  attemptMetadata?: Record<string, unknown>;
 }) {
   const orderId = crypto.randomUUID();
   await db.insert(orders).values({
@@ -82,6 +83,7 @@ async function insertOrderAndAttempt(args: {
     expectedAmountMinor: args.amountMinor,
     idempotencyKey: buildMonobankAttemptIdempotencyKey(orderId, 1),
     providerPaymentIntentId: args.invoiceId,
+    metadata: args.attemptMetadata ?? {},
   } as any);
 
   return { orderId, attemptId };
@@ -227,6 +229,70 @@ describe.sequential('monobank webhook apply (persist-first)', () => {
     }
   });
 
+  it('copies wallet attribution from attempt metadata and performs no outbound network calls', async () => {
+    const invoiceId = `inv_${crypto.randomUUID()}`;
+    const { orderId } = await insertOrderAndAttempt({
+      invoiceId,
+      amountMinor: 1000,
+      attemptMetadata: {
+        monobank: {
+          wallet: {
+            requested: 'google_pay',
+          },
+        },
+      },
+    });
+
+    const rawBody = JSON.stringify({
+      invoiceId,
+      status: 'success',
+      amount: 1000,
+      ccy: 980,
+    });
+
+    const fetchSpy = vi.spyOn(globalThis, 'fetch');
+
+    try {
+      const res = await applyMonoWebhookEvent({
+        rawBody,
+        rawSha256: sha256HexUtf8(rawBody),
+        requestId: 'req_wallet_attr_1',
+        mode: 'apply',
+      });
+
+      expect(res.appliedResult).toBe('applied');
+
+      const [order] = await db
+        .select({ pspMetadata: orders.pspMetadata })
+        .from(orders)
+        .where(eq(orders.id, orderId))
+        .limit(1);
+
+      expect((order?.pspMetadata as any)?.wallet).toEqual({
+        provider: 'monobank',
+        type: 'google_pay',
+        source: 'attempt',
+      });
+
+      const [event] = await db
+        .select({ payload: paymentEvents.payload })
+        .from(paymentEvents)
+        .where(eq(paymentEvents.orderId, orderId))
+        .limit(1);
+
+      expect((event?.payload as any)?.wallet).toEqual({
+        provider: 'monobank',
+        type: 'google_pay',
+        source: 'attempt',
+      });
+
+      expect(fetchSpy).not.toHaveBeenCalled();
+    } finally {
+      fetchSpy.mockRestore();
+      await cleanup(orderId, invoiceId);
+    }
+  });
+
   it('does not enqueue shipment when inventory is not committed', async () => {
     const invoiceId = `inv_${crypto.randomUUID()}`;
     const { orderId } = await insertOrderAndAttempt({
diff --git a/frontend/lib/tests/shop/notifications-worker-transport-phase3.test.ts b/frontend/lib/tests/shop/notifications-worker-transport-phase3.test.ts
index d7f9e568..9800277e 100644
--- a/frontend/lib/tests/shop/notifications-worker-transport-phase3.test.ts
+++ b/frontend/lib/tests/shop/notifications-worker-transport-phase3.test.ts
@@ -22,7 +22,7 @@ vi.mock('@/lib/services/shop/notifications/transport', () => ({
 }));
 
 import { db } from '@/db';
-import { notificationOutbox, orderShipping, orders } from '@/db/schema';
+import { notificationOutbox, orders, orderShipping } from '@/db/schema';
 import { runNotificationOutboxWorker } from '@/lib/services/shop/notifications/outbox-worker';
 import { toDbMoney } from '@/lib/shop/money';
 
diff --git a/frontend/lib/tests/shop/nova-poshta-client-network-failure.test.ts b/frontend/lib/tests/shop/nova-poshta-client-network-failure.test.ts
index 6cb079b4..9ddae8c9 100644
--- a/frontend/lib/tests/shop/nova-poshta-client-network-failure.test.ts
+++ b/frontend/lib/tests/shop/nova-poshta-client-network-failure.test.ts
@@ -2,8 +2,8 @@ import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { resetEnvCache } from '@/lib/env';
 import {
+  getWarehousesByCityRef,
   NovaPoshtaApiError,
-  getWarehousesBySettlementRef,
   searchSettlements,
 } from '@/lib/services/shop/shipping/nova-poshta-client';
 
@@ -51,16 +51,16 @@ describe('nova poshta client network failure', () => {
     }
   });
 
-  it('wraps fetch throw in NovaPoshtaApiError for getWarehousesBySettlementRef', async () => {
+  it('wraps fetch throw in NovaPoshtaApiError for getWarehousesByCityRef', async () => {
     const fetchError = new TypeError('fetch failed');
     const fetchMock = vi.fn().mockRejectedValue(fetchError);
     vi.stubGlobal('fetch', fetchMock);
 
     try {
-      await getWarehousesBySettlementRef(
+      await getWarehousesByCityRef(
         'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee'
       );
-      throw new Error('expected getWarehousesBySettlementRef to throw');
+      throw new Error('expected getWarehousesByCityRef to throw');
     } catch (error) {
       expect(fetchMock).toHaveBeenCalledTimes(1);
       expect(error).toBeInstanceOf(NovaPoshtaApiError);
diff --git a/frontend/lib/tests/shop/order-items-snapshot-immutable.test.ts b/frontend/lib/tests/shop/order-items-snapshot-immutable.test.ts
index 6f92582d..66da3ecb 100644
--- a/frontend/lib/tests/shop/order-items-snapshot-immutable.test.ts
+++ b/frontend/lib/tests/shop/order-items-snapshot-immutable.test.ts
@@ -12,6 +12,7 @@ import {
   productPrices,
   products,
 } from '@/db/schema';
+import { deriveTestIpFromIdemKey } from '@/lib/tests/helpers/ip';
 
 vi.mock('@/lib/auth', async () => {
   const actual = await vi.importActual<Record<string, unknown>>('@/lib/auth');
@@ -110,6 +111,7 @@ describe('P0-6 snapshots: order_items immutability', () => {
         'Accept-Language': 'en-US,en;q=0.9',
         'Content-Type': 'application/json',
         'Idempotency-Key': idem,
+        'X-Forwarded-For': deriveTestIpFromIdemKey(idem),
         Origin: 'http://localhost:3000',
       }
     );
diff --git a/frontend/lib/tests/shop/order-payment-init-token-scope-phase7.test.ts b/frontend/lib/tests/shop/order-payment-init-token-scope-phase7.test.ts
index 78a594a5..ecb2548a 100644
--- a/frontend/lib/tests/shop/order-payment-init-token-scope-phase7.test.ts
+++ b/frontend/lib/tests/shop/order-payment-init-token-scope-phase7.test.ts
@@ -44,7 +44,7 @@ vi.mock('@/lib/services/orders/payment-attempts', () => ({
   PaymentAttemptsExhaustedError: class PaymentAttemptsExhaustedError extends Error {
     code = 'PAYMENT_ATTEMPTS_EXHAUSTED' as const;
     orderId: string | null = null;
-    provider: 'stripe' = 'stripe';
+    provider = 'stripe' as const;
   },
   ensureStripePaymentIntentForOrder: (...args: unknown[]) =>
     ensureStripePaymentIntentForOrderMock(...args),
diff --git a/frontend/lib/tests/shop/order-status-token.test.ts b/frontend/lib/tests/shop/order-status-token.test.ts
index 0df03938..e5904538 100644
--- a/frontend/lib/tests/shop/order-status-token.test.ts
+++ b/frontend/lib/tests/shop/order-status-token.test.ts
@@ -100,7 +100,7 @@ describe('order status token access control', () => {
       const token = createStatusToken({ orderId });
       const { GET } = await import('@/app/api/shop/orders/[id]/status/route');
       const req = new NextRequest(
-        `http://localhost/api/shop/orders/${orderId}/status?statusToken=${encodeURIComponent(
+        `http://localhost/api/shop/orders/${orderId}/status?view=lite&statusToken=${encodeURIComponent(
           token
         )}`
       );
@@ -112,6 +112,7 @@ describe('order status token access control', () => {
       expect(json.currency).toBe('UAH');
       expect(json.totalAmountMinor).toBe(1000);
       expect(json.paymentStatus).toBe('pending');
+      expect(json.itemsCount).toBe(0);
       expect(typeof json.updatedAt).toBe('string');
       expect(json.order).toBeUndefined();
       expect(json.attempt).toBeUndefined();
diff --git a/frontend/lib/tests/shop/product-prices-write-authority-phase8.test.ts b/frontend/lib/tests/shop/product-prices-write-authority-phase8.test.ts
index 346d354e..8954446f 100644
--- a/frontend/lib/tests/shop/product-prices-write-authority-phase8.test.ts
+++ b/frontend/lib/tests/shop/product-prices-write-authority-phase8.test.ts
@@ -1,5 +1,3 @@
-import crypto from 'node:crypto';
-
 import { and, eq } from 'drizzle-orm';
 import { afterEach, beforeAll, describe, expect, it, vi } from 'vitest';
 
diff --git a/frontend/lib/tests/shop/shipping-np-warehouses-route-p2.test.ts b/frontend/lib/tests/shop/shipping-np-warehouses-route-p2.test.ts
index cd9cf088..d16f18bd 100644
--- a/frontend/lib/tests/shop/shipping-np-warehouses-route-p2.test.ts
+++ b/frontend/lib/tests/shop/shipping-np-warehouses-route-p2.test.ts
@@ -10,7 +10,7 @@ import { resetEnvCache } from '@/lib/env';
 import { NovaPoshtaApiError } from '@/lib/services/shop/shipping/nova-poshta-client';
 
 const enforceRateLimitMock = vi.fn();
-const getWarehousesBySettlementRefMock = vi.fn();
+const getWarehousesByCityRefMock = vi.fn();
 
 vi.mock('@/lib/security/rate-limit', () => ({
   getRateLimitSubject: vi.fn(() => 'shipping_np_warehouses_subject'),
@@ -36,8 +36,8 @@ vi.mock('@/lib/services/shop/shipping/nova-poshta-client', async () => {
   >('@/lib/services/shop/shipping/nova-poshta-client');
   return {
     ...actual,
-    getWarehousesBySettlementRef: (...args: any[]) =>
-      getWarehousesBySettlementRefMock(...args),
+    getWarehousesByCityRef: (...args: any[]) =>
+      getWarehousesByCityRefMock(...args),
   };
 });
 
@@ -57,7 +57,7 @@ describe('shop shipping np warehouses route (phase 2)', () => {
     vi.stubEnv('SHOP_SHIPPING_NP_ENABLED', 'true');
     resetEnvCache();
     enforceRateLimitMock.mockResolvedValue({ ok: true, remaining: 99 });
-    getWarehousesBySettlementRefMock.mockResolvedValue([]);
+    getWarehousesByCityRefMock.mockResolvedValue([]);
   });
 
   it('returns 200 + available=false when shipping is disabled', async () => {
@@ -77,7 +77,7 @@ describe('shop shipping np warehouses route (phase 2)', () => {
       reasonCode: 'SHOP_SHIPPING_DISABLED',
       items: [],
     });
-    expect(getWarehousesBySettlementRefMock).not.toHaveBeenCalled();
+    expect(getWarehousesByCityRefMock).not.toHaveBeenCalled();
   });
 
   it('local hit does not call NP', async () => {
@@ -122,7 +122,7 @@ describe('shop shipping np warehouses route (phase 2)', () => {
       expect(Array.isArray(json.items)).toBe(true);
       expect(json.items.length).toBeGreaterThan(0);
       expect(json.items[0].ref).toBe(warehouseRef);
-      expect(getWarehousesBySettlementRefMock).toHaveBeenCalledTimes(0);
+      expect(getWarehousesByCityRefMock).toHaveBeenCalledTimes(0);
     } finally {
       await db.delete(npWarehouses).where(eq(npWarehouses.ref, warehouseRef));
       await db.delete(npCities).where(eq(npCities.ref, cityRef));
@@ -131,7 +131,7 @@ describe('shop shipping np warehouses route (phase 2)', () => {
 
   it('NP down returns 200 + available=false NP_UNAVAILABLE with empty items', async () => {
     const cityRef = crypto.randomUUID();
-    getWarehousesBySettlementRefMock.mockRejectedValue(
+    getWarehousesByCityRefMock.mockRejectedValue(
       new NovaPoshtaApiError('NP_HTTP_ERROR', 'temporary', 503)
     );
 
@@ -149,6 +149,6 @@ describe('shop shipping np warehouses route (phase 2)', () => {
       reasonCode: 'NP_UNAVAILABLE',
       items: [],
     });
-    expect(getWarehousesBySettlementRefMock).toHaveBeenCalledTimes(1);
+    expect(getWarehousesByCityRefMock).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/frontend/lib/tests/shop/shipping-retention-phase7.test.ts b/frontend/lib/tests/shop/shipping-retention-phase7.test.ts
index bac5df8a..15c81820 100644
--- a/frontend/lib/tests/shop/shipping-retention-phase7.test.ts
+++ b/frontend/lib/tests/shop/shipping-retention-phase7.test.ts
@@ -4,7 +4,7 @@ import { eq } from 'drizzle-orm';
 import { describe, expect, it } from 'vitest';
 
 import { db } from '@/db';
-import { orderShipping, orders } from '@/db/schema';
+import { orders, orderShipping } from '@/db/schema';
 import { anonymizeRetainedOrderShippingSnapshots } from '@/lib/services/shop/shipping/retention';
 import { toDbMoney } from '@/lib/shop/money';
 
@@ -88,7 +88,21 @@ describe.sequential('shipping retention (phase 7)', () => {
         .where(eq(orderShipping.orderId, seed.orderId))
         .limit(1);
 
-      const snapshot = (row?.shippingAddress ?? {}) as Record<string, any>;
+      const snapshot = (row?.shippingAddress ?? {}) as Record<
+        string,
+        unknown
+      > & {
+        piiRedacted?: boolean;
+        recipient?: {
+          fullName?: string;
+          phone?: string;
+          email?: string;
+        };
+        selection?: {
+          cityRef?: string;
+          warehouseRef?: string;
+        };
+      };
       expect(snapshot.piiRedacted).toBe(true);
       expect(snapshot?.recipient?.fullName).toBe('[REDACTED]');
       expect(snapshot?.recipient?.phone).toBe('[REDACTED]');
@@ -122,7 +136,21 @@ describe.sequential('shipping retention (phase 7)', () => {
         .where(eq(orderShipping.orderId, seed.orderId))
         .limit(1);
 
-      const snapshot = (row?.shippingAddress ?? {}) as Record<string, any>;
+      const snapshot = (row?.shippingAddress ?? {}) as Record<
+        string,
+        unknown
+      > & {
+        piiRedacted?: boolean;
+        recipient?: {
+          fullName?: string;
+          phone?: string;
+          email?: string;
+        };
+        selection?: {
+          cityRef?: string;
+          warehouseRef?: string;
+        };
+      };
       expect(snapshot?.recipient?.fullName).toBe('Ivan Petrenko');
       expect(snapshot?.recipient?.phone).toBe('+380501112233');
       expect(snapshot?.recipient?.email).toBe('ivan@example.com');
diff --git a/frontend/lib/tests/shop/stripe-webhook-psp-fields.test.ts b/frontend/lib/tests/shop/stripe-webhook-psp-fields.test.ts
index 7a3cd55e..1a422df0 100644
--- a/frontend/lib/tests/shop/stripe-webhook-psp-fields.test.ts
+++ b/frontend/lib/tests/shop/stripe-webhook-psp-fields.test.ts
@@ -20,11 +20,12 @@ vi.mock('@/lib/psp/stripe', async () => {
   return {
     ...actual,
     verifyWebhookSignature: vi.fn(),
+    retrieveCharge: vi.fn(),
   };
 });
 
 import { POST as webhookPOST } from '@/app/api/shop/webhooks/stripe/route';
-import { verifyWebhookSignature } from '@/lib/psp/stripe';
+import { retrieveCharge, verifyWebhookSignature } from '@/lib/psp/stripe';
 
 function logTestCleanupFailed(meta: Record<string, unknown>, error: unknown) {
   console.error('[test cleanup failed]', {
@@ -234,7 +235,11 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
                 payment_intent: paymentIntentId,
                 payment_method_details: {
                   type: 'card',
-                  card: { brand: 'visa', last4: '4242' },
+                  card: {
+                    brand: 'visa',
+                    last4: '4242',
+                    wallet: { type: 'apple_pay' },
+                  },
                 },
               },
             ],
@@ -244,6 +249,7 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
     };
 
     vi.mocked(verifyWebhookSignature).mockReturnValue(event as any);
+    const fetchSpy = vi.spyOn(globalThis, 'fetch');
 
     const rawBody = JSON.stringify({ any: 'payload' });
     const req = makeWebhookRequest(rawBody);
@@ -298,6 +304,11 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
         Object.keys((updated1[0].pspMetadata ?? {}) as Record<string, unknown>)
           .length
       ).toBeGreaterThan(0);
+      expect((updated1[0].pspMetadata as any)?.wallet).toEqual({
+        provider: 'stripe',
+        type: 'apple_pay',
+        source: 'event',
+      });
 
       const ev1 = await db
         .select({ eventId: stripeEvents.eventId })
@@ -310,12 +321,18 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
           id: paymentEvents.id,
           eventName: paymentEvents.eventName,
           eventRef: paymentEvents.eventRef,
+          payload: paymentEvents.payload,
         })
         .from(paymentEvents)
         .where(eq(paymentEvents.orderId, orderId));
       expect(canonical1.length).toBe(1);
       expect(canonical1[0]?.eventName).toBe('paid_applied');
       expect(canonical1[0]?.eventRef).toBe(eventId);
+      expect((canonical1[0]?.payload as any)?.wallet).toEqual({
+        provider: 'stripe',
+        type: 'apple_pay',
+        source: 'event',
+      });
 
       const queued1 = await db
         .select({ id: shippingShipments.id })
@@ -365,7 +382,176 @@ describe('P0-6 webhook: writes PSP fields on succeeded', () => {
         .from(shippingShipments)
         .where(eq(shippingShipments.orderId, orderId));
       expect(queued2.length).toBe(1);
+      expect(vi.mocked(retrieveCharge)).not.toHaveBeenCalled();
+      expect(fetchSpy).not.toHaveBeenCalled();
+    } finally {
+      fetchSpy.mockRestore();
+      await cleanup({ orderId, productId, eventId });
+    }
+  }, 30_000);
+
+  it('payment_intent.succeeded extracts google_pay wallet attribution into order and canonical event payload', async () => {
+    const productId = randomUUID();
+    const priceId = randomUUID();
+
+    const orderId = randomUUID();
+    const idemKey = `idem_${randomUUID()}`;
+
+    const paymentIntentId = `pi_test_${randomUUID()
+      .replace(/-/g, '')
+      .slice(0, 24)}`;
+    const eventId = `evt_test_${randomUUID().replace(/-/g, '').slice(0, 24)}`;
+    const chargeId = `ch_test_${randomUUID().replace(/-/g, '').slice(0, 24)}`;
+
+    const title = 'Webhook PSP Test Product GPay';
+    const slug = `webhook-psp-gpay-${productId.slice(0, 8)}`;
+    const sku = `SKU-GP-${productId.slice(0, 8)}`;
+
+    await db.insert(products).values({
+      id: productId,
+      slug,
+      title,
+      description: 'webhook test',
+      imageUrl: 'https://res.cloudinary.com/devlovers/image/upload/v1/test.png',
+      imagePublicId: null,
+      price: '9.00',
+      originalPrice: null,
+      currency: 'USD',
+      category: null,
+      type: null,
+      colors: [],
+      sizes: [],
+      badge: 'NONE',
+      isActive: true,
+      isFeatured: false,
+      stock: 10,
+      sku,
+    });
+
+    await db.insert(productPrices).values({
+      id: priceId,
+      productId,
+      currency: 'USD',
+      priceMinor: 900,
+      originalPriceMinor: null,
+      price: '9.00',
+      originalPrice: null,
+    });
+
+    await db.insert(orders).values({
+      id: orderId,
+      totalAmountMinor: 900,
+      totalAmount: '9.00',
+      currency: 'USD',
+      shippingRequired: true,
+      shippingPayer: 'customer',
+      shippingProvider: 'nova_poshta',
+      shippingMethodCode: 'NP_WAREHOUSE',
+      shippingAmountMinor: null,
+      shippingStatus: 'pending',
+      paymentStatus: 'requires_payment',
+      paymentProvider: 'stripe',
+      paymentIntentId,
+      idempotencyKey: idemKey,
+      status: 'INVENTORY_RESERVED',
+      inventoryStatus: 'reserved',
+    });
+
+    await db.insert(orderItems).values({
+      id: randomUUID(),
+      orderId,
+      productId,
+      quantity: 1,
+      unitPriceMinor: 900,
+      lineTotalMinor: 900,
+      unitPrice: '9.00',
+      lineTotal: '9.00',
+      productTitle: title,
+      productSlug: slug,
+      productSku: sku,
+    });
+
+    const event = {
+      id: eventId,
+      object: 'event',
+      type: 'payment_intent.succeeded',
+      data: {
+        object: {
+          id: paymentIntentId,
+          object: 'payment_intent',
+          amount: 900,
+          currency: 'usd',
+          status: 'succeeded',
+          metadata: { orderId },
+          charges: {
+            object: 'list',
+            data: [
+              {
+                id: chargeId,
+                object: 'charge',
+                payment_intent: paymentIntentId,
+                payment_method_details: {
+                  type: 'card',
+                  card: {
+                    brand: 'visa',
+                    last4: '4242',
+                    wallet: { type: 'google_pay' },
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+
+    vi.mocked(verifyWebhookSignature).mockReturnValue(event as any);
+    const fetchSpy = vi.spyOn(globalThis, 'fetch');
+
+    const rawBody = JSON.stringify({ any: 'payload_google_wallet' });
+    const req = makeWebhookRequest(rawBody);
+
+    try {
+      const res = await webhookPOST(req);
+      expect(res.status).toBeGreaterThanOrEqual(200);
+      expect(res.status).toBeLessThan(300);
+
+      const [updated] = await db
+        .select({
+          paymentStatus: orders.paymentStatus,
+          pspMetadata: orders.pspMetadata,
+        })
+        .from(orders)
+        .where(eq(orders.id, orderId))
+        .limit(1);
+
+      expect(updated?.paymentStatus).toBe('paid');
+      expect((updated?.pspMetadata as any)?.wallet).toEqual({
+        provider: 'stripe',
+        type: 'google_pay',
+        source: 'event',
+      });
+
+      const [canonical] = await db
+        .select({
+          eventName: paymentEvents.eventName,
+          payload: paymentEvents.payload,
+        })
+        .from(paymentEvents)
+        .where(eq(paymentEvents.orderId, orderId))
+        .limit(1);
+
+      expect(canonical?.eventName).toBe('paid_applied');
+      expect((canonical?.payload as any)?.wallet).toEqual({
+        provider: 'stripe',
+        type: 'google_pay',
+        source: 'event',
+      });
+
+      expect(vi.mocked(retrieveCharge)).not.toHaveBeenCalled();
+      expect(fetchSpy).not.toHaveBeenCalled();
     } finally {
+      fetchSpy.mockRestore();
       await cleanup({ orderId, productId, eventId });
     }
   }, 30_000);
diff --git a/frontend/lib/tests/shop/stripe-webhook-refund-full.test.ts b/frontend/lib/tests/shop/stripe-webhook-refund-full.test.ts
index 8ed5730e..1403feef 100644
--- a/frontend/lib/tests/shop/stripe-webhook-refund-full.test.ts
+++ b/frontend/lib/tests/shop/stripe-webhook-refund-full.test.ts
@@ -141,71 +141,145 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
     inserted = null;
   });
 
-  it('full refund (charge.refunded) WITHOUT metadata.orderId resolves by paymentIntentId, sets terminal status, calls restock once, and dedupes', async () => {
+  it('full refund (charge.refund.updated) WITHOUT metadata.orderId resolves by paymentIntentId, sets terminal status, calls restock once', async () => {
     inserted = await insertPaidOrder();
 
     const eventId = `evt_${crypto.randomUUID()}`;
-
     const chargeId = `ch_${crypto.randomUUID()}`;
     const refundId = `re_${crypto.randomUUID()}`;
+    const fetchSpy = vi.spyOn(globalThis, 'fetch');
 
-    const charge = makeCharge({
-      chargeId,
-      paymentIntentId: inserted.paymentIntentId,
-      amount: 2500,
-      amountRefunded: 2500,
-      refunds: [{ id: refundId, amount: 2500 }],
-    });
+    try {
+      const expandedCharge = makeCharge({
+        chargeId,
+        paymentIntentId: inserted.paymentIntentId,
+        amount: 2500,
+        amountRefunded: 2500,
+        refunds: [{ id: refundId, amount: 2500 }],
+      });
 
-    verifyWebhookSignatureMock.mockReturnValue({
-      id: eventId,
-      type: 'charge.refunded',
-      data: { object: charge },
-    } as unknown as Stripe.Event);
+      const refund = {
+        id: refundId,
+        object: 'refund',
+        amount: 2500,
+        status: 'succeeded',
+        reason: null,
+        charge: expandedCharge,
+        payment_intent: inserted.paymentIntentId,
+        metadata: {},
+      };
+
+      verifyWebhookSignatureMock.mockReturnValue({
+        id: eventId,
+        type: 'charge.refund.updated',
+        data: { object: refund },
+      } as unknown as Stripe.Event);
+
+      const res = await POST(makeRequest());
+      expect(res.status).toBe(200);
+
+      const [row] = await db
+        .select({
+          paymentStatus: orders.paymentStatus,
+          status: orders.status,
+          stockRestored: orders.stockRestored,
+          pspChargeId: orders.pspChargeId,
+        })
+        .from(orders)
+        .where(eq(orders.id, inserted.orderId))
+        .limit(1);
 
-    const res1 = await POST(makeRequest());
-    expect(res1.status).toBe(200);
-    const json1 = await res1.json();
-    expect(json1).toEqual({ received: true });
+      expect(row.paymentStatus).toBe('refunded');
+      expect(row.status).toBe('CANCELED');
+      expect(row.stockRestored).toBe(true);
+      expect(row.pspChargeId).toBe(chargeId);
 
-    const [row1] = await db
-      .select({
-        paymentStatus: orders.paymentStatus,
-        status: orders.status,
-        stockRestored: orders.stockRestored,
-      })
-      .from(orders)
-      .where(eq(orders.id, inserted.orderId))
-      .limit(1);
+      expect(retrieveChargeMock).not.toHaveBeenCalled();
+      expect(fetchSpy).not.toHaveBeenCalled();
 
-    expect(row1.paymentStatus).toBe('refunded');
-    expect(row1.status).toBe('CANCELED');
-    expect(row1.stockRestored).toBe(true);
+      expect(restockOrderMock).toHaveBeenCalledTimes(1);
+      expect(restockOrderMock).toHaveBeenCalledWith(inserted.orderId, {
+        reason: 'refunded',
+      });
+    } finally {
+      fetchSpy.mockRestore();
+    }
+  }, 30_000);
 
-    expect(restockOrderMock).toHaveBeenCalledTimes(1);
-    expect(restockOrderMock).toHaveBeenCalledWith(inserted.orderId, {
-      reason: 'refunded',
-    });
+  it('full refund (charge.refund.updated) must use cumulative refunded (not refund.amount) when full consists of multiple partial refunds', async () => {
+    inserted = await insertPaidOrder();
 
-    const res2 = await POST(makeRequest());
-    expect(res2.status).toBe(200);
+    const eventId = `evt_${crypto.randomUUID()}`;
+    const chargeId = `ch_${crypto.randomUUID()}`;
+    const fetchSpy = vi.spyOn(globalThis, 'fetch');
 
-    expect(restockOrderMock).toHaveBeenCalledTimes(1);
+    try {
+      const refund1Id = `re_${crypto.randomUUID()}`;
+      const refund2Id = `re_${crypto.randomUUID()}`;
+      const refund3Id = `re_${crypto.randomUUID()}`;
 
-    const events = await db
-      .select({ eventId: stripeEvents.eventId })
-      .from(stripeEvents)
-      .where(eq(stripeEvents.eventId, eventId));
+      const expandedCharge = makeCharge({
+        chargeId,
+        paymentIntentId: inserted.paymentIntentId,
+        amount: 2500,
+        amountRefunded: 2500,
+        refunds: [
+          { id: refund1Id, amount: 1000 },
+          { id: refund2Id, amount: 1000 },
+          { id: refund3Id, amount: 500 },
+        ],
+      });
+
+      const refund = {
+        id: refund3Id,
+        object: 'refund',
+        amount: 500,
+        status: 'succeeded',
+        reason: null,
+        charge: expandedCharge,
+        payment_intent: inserted.paymentIntentId,
+        metadata: {},
+      };
+
+      verifyWebhookSignatureMock.mockReturnValue({
+        id: eventId,
+        type: 'charge.refund.updated',
+        data: { object: refund },
+      } as unknown as Stripe.Event);
+
+      const res = await POST(makeRequest());
+      expect(res.status).toBe(200);
+
+      const [row] = await db
+        .select({
+          paymentStatus: orders.paymentStatus,
+          status: orders.status,
+          stockRestored: orders.stockRestored,
+        })
+        .from(orders)
+        .where(eq(orders.id, inserted.orderId))
+        .limit(1);
+
+      expect(row.paymentStatus).toBe('refunded');
+      expect(row.status).toBe('CANCELED');
+      expect(row.stockRestored).toBe(true);
 
-    expect(events.length).toBe(1);
+      expect(retrieveChargeMock).not.toHaveBeenCalled();
+      expect(fetchSpy).not.toHaveBeenCalled();
+
+      expect(restockOrderMock).toHaveBeenCalledTimes(1);
+    } finally {
+      fetchSpy.mockRestore();
+    }
   }, 30_000);
 
-  it('full refund (charge.refund.updated) WITHOUT metadata.orderId resolves by paymentIntentId (via retrieveCharge), sets terminal status, calls restock once', async () => {
+  it('charge.refund.updated with refund.charge as string id is gracefully ignored: ack 200, processedAt set, no retrieve/no fetch/no terminal refund/no restock', async () => {
     inserted = await insertPaidOrder();
 
     const eventId = `evt_${crypto.randomUUID()}`;
     const chargeId = `ch_${crypto.randomUUID()}`;
     const refundId = `re_${crypto.randomUUID()}`;
+    const fetchSpy = vi.spyOn(globalThis, 'fetch');
 
     const refund = {
       id: refundId,
@@ -218,48 +292,50 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
       metadata: {},
     };
 
-    retrieveChargeMock.mockResolvedValue(
-      makeCharge({
-        chargeId,
-        paymentIntentId: inserted.paymentIntentId,
-        amount: 2500,
-        amountRefunded: 2500,
-        refunds: [{ id: refundId, amount: 2500 }],
-      })
-    );
-
     verifyWebhookSignatureMock.mockReturnValue({
       id: eventId,
       type: 'charge.refund.updated',
       data: { object: refund },
     } as unknown as Stripe.Event);
 
-    const res = await POST(makeRequest());
-    expect(res.status).toBe(200);
-
-    const [row] = await db
-      .select({
-        paymentStatus: orders.paymentStatus,
-        status: orders.status,
-        stockRestored: orders.stockRestored,
-        pspChargeId: orders.pspChargeId,
-      })
-      .from(orders)
-      .where(eq(orders.id, inserted.orderId))
-      .limit(1);
-
-    expect(row.paymentStatus).toBe('refunded');
-    expect(row.status).toBe('CANCELED');
-    expect(row.stockRestored).toBe(true);
-    expect(row.pspChargeId).toBe(chargeId);
+    try {
+      const res = await POST(makeRequest());
+      expect(res.status).toBe(200);
+      expect(await res.json()).toEqual({ received: true });
 
-    expect(retrieveChargeMock).toHaveBeenCalledTimes(1);
-    expect(retrieveChargeMock).toHaveBeenCalledWith(chargeId);
-
-    expect(restockOrderMock).toHaveBeenCalledTimes(1);
-    expect(restockOrderMock).toHaveBeenCalledWith(inserted.orderId, {
-      reason: 'refunded',
-    });
+      const [evt] = await db
+        .select({
+          processedAt: stripeEvents.processedAt,
+          eventId: stripeEvents.eventId,
+          paymentIntentId: stripeEvents.paymentIntentId,
+        })
+        .from(stripeEvents)
+        .where(eq(stripeEvents.eventId, eventId))
+        .limit(1);
+
+      expect(evt).toBeTruthy();
+      expect(evt.processedAt).not.toBeNull();
+      expect(evt.paymentIntentId).toBe(inserted.paymentIntentId);
+
+      const [row] = await db
+        .select({
+          paymentStatus: orders.paymentStatus,
+          status: orders.status,
+          stockRestored: orders.stockRestored,
+        })
+        .from(orders)
+        .where(eq(orders.id, inserted.orderId))
+        .limit(1);
+
+      expect(row.paymentStatus).toBe('paid');
+      expect(row.status).toBe('PAID');
+      expect(row.stockRestored).toBe(false);
+      expect(retrieveChargeMock).not.toHaveBeenCalled();
+      expect(fetchSpy).not.toHaveBeenCalled();
+      expect(restockOrderMock).not.toHaveBeenCalled();
+    } finally {
+      fetchSpy.mockRestore();
+    }
   }, 30_000);
 
   it('partial refund is ignored (no paymentStatus/status change, no restock)', async () => {
@@ -370,69 +446,6 @@ describe('stripe webhook refund (full only): PI fallback + terminal status + ded
     expect(evt.processedAt).not.toBeNull();
   }, 30_000);
 
-  it('full refund (charge.refund.updated) must use cumulative refunded (not refund.amount) when full consists of multiple partial refunds', async () => {
-    inserted = await insertPaidOrder();
-
-    const eventId = `evt_${crypto.randomUUID()}`;
-    const chargeId = `ch_${crypto.randomUUID()}`;
-
-    const refund1Id = `re_${crypto.randomUUID()}`;
-    const refund2Id = `re_${crypto.randomUUID()}`;
-    const refund3Id = `re_${crypto.randomUUID()}`;
-
-    const refund = {
-      id: refund3Id,
-      object: 'refund',
-      amount: 500,
-      status: 'succeeded',
-      reason: null,
-      charge: chargeId,
-      payment_intent: inserted.paymentIntentId,
-      metadata: {},
-    };
-
-    retrieveChargeMock.mockResolvedValue(
-      makeCharge({
-        chargeId,
-        paymentIntentId: inserted.paymentIntentId,
-        amount: 2500,
-        amountRefunded: 2500,
-        refunds: [
-          { id: refund1Id, amount: 1000 },
-          { id: refund2Id, amount: 1000 },
-          { id: refund3Id, amount: 500 },
-        ],
-      })
-    );
-
-    verifyWebhookSignatureMock.mockReturnValue({
-      id: eventId,
-      type: 'charge.refund.updated',
-      data: { object: refund },
-    } as unknown as Stripe.Event);
-
-    const res = await POST(makeRequest());
-    expect(res.status).toBe(200);
-
-    const [row] = await db
-      .select({
-        paymentStatus: orders.paymentStatus,
-        status: orders.status,
-        stockRestored: orders.stockRestored,
-      })
-      .from(orders)
-      .where(eq(orders.id, inserted.orderId))
-      .limit(1);
-
-    expect(row.paymentStatus).toBe('refunded');
-    expect(row.status).toBe('CANCELED');
-    expect(row.stockRestored).toBe(true);
-
-    expect(retrieveChargeMock).toHaveBeenCalledTimes(1);
-    expect(retrieveChargeMock).toHaveBeenCalledWith(chargeId);
-
-    expect(restockOrderMock).toHaveBeenCalledTimes(1);
-  }, 30_000);
   it('charge.refunded: fallback to sum(refunds) when amount_refunded is missing (still detects full refund)', async () => {
     inserted = await insertPaidOrder();
 
diff --git a/frontend/lib/validation/shop.ts b/frontend/lib/validation/shop.ts
index 416a3cb2..5dd50ac6 100644
--- a/frontend/lib/validation/shop.ts
+++ b/frontend/lib/validation/shop.ts
@@ -10,10 +10,17 @@ import {
 } from '@/lib/config/catalog';
 import { currencyValues } from '@/lib/shop/currency';
 import {
+  paymentMethodValues,
   paymentProviderValues,
   paymentStatusValues,
 } from '@/lib/shop/payments';
-export type { PaymentProvider, PaymentStatus } from '@/lib/shop/payments';
+
+export type { CurrencyCode } from '@/lib/shop/currency';
+export type {
+  PaymentMethod,
+  PaymentProvider,
+  PaymentStatus,
+} from '@/lib/shop/payments';
 
 export const MAX_QUANTITY_PER_LINE = 20;
 
@@ -28,10 +35,9 @@ const sortEnum = z.enum(sortValues as [SortValue, ...SortValue[]]);
 export const badgeSchema = z.enum(productBadgeValues);
 export const paymentStatusSchema = z.enum(paymentStatusValues);
 export const paymentProviderSchema = z.enum(paymentProviderValues);
+export const paymentMethodSchema = z.enum(paymentMethodValues);
 export const currencySchema = z.enum(currencyValues);
 
-export type { CurrencyCode } from '@/lib/shop/currency';
-
 const searchParamString = z
   .union([z.string(), z.array(z.string())])
   .optional()
@@ -398,6 +404,8 @@ export const checkoutLegalConsentSchema = z
   })
   .strict();
 
+const checkoutRequestedProviderSchema = z.enum(['stripe', 'monobank']);
+
 export const checkoutPayloadSchema = z
   .object({
     items: z.array(checkoutItemSchema).min(1),
@@ -410,8 +418,57 @@ export const checkoutPayloadSchema = z
       .optional(),
     shipping: checkoutShippingSchema.optional(),
     legalConsent: checkoutLegalConsentSchema.optional(),
+    paymentProvider: checkoutRequestedProviderSchema.optional(),
+    paymentMethod: paymentMethodSchema.optional(),
+    paymentCurrency: currencySchema.optional(),
   })
-  .strict();
+  .strict()
+  .superRefine((value, ctx) => {
+    if (!value.paymentMethod) return;
+
+    if (!value.paymentProvider) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        path: ['paymentProvider'],
+        message: 'paymentProvider is required when paymentMethod is provided',
+      });
+      return;
+    }
+
+    const paymentCurrency =
+      value.paymentCurrency ??
+      (value.paymentProvider === 'monobank' ? 'UAH' : 'USD');
+
+    const provider = value.paymentProvider;
+    const method = value.paymentMethod;
+
+    const providerAllowed =
+      (method === 'stripe_card' && provider === 'stripe') ||
+      ((method === 'monobank_invoice' || method === 'monobank_google_pay') &&
+        provider === 'monobank');
+
+    if (!providerAllowed) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        path: ['paymentMethod'],
+        message:
+          'paymentMethod is not allowed for the selected paymentProvider',
+      });
+      return;
+    }
+
+    if (
+      (method === 'monobank_invoice' || method === 'monobank_google_pay') &&
+      paymentCurrency !== 'UAH'
+    ) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        path: ['paymentMethod'],
+        message:
+          'paymentMethod is not allowed for the selected provider and currency',
+      });
+    }
+  });
 
 export const cartRehydratePayloadSchema = z
   .object({
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 0bd62f53..3af30274 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -417,13 +417,16 @@
           "label": "City",
           "placeholder": "Start typing city name (min 2 chars)",
           "selected": "Selected city: {city}",
-          "searching": "Searching cities..."
+          "searching": "Searching cities...",
+          "noResults": "No cities found. Check the name or local Nova Poshta data."
         },
         "warehouse": {
           "label": "Warehouse / parcel locker",
           "placeholder": "Type warehouse name or number",
           "selected": "Selected warehouse: {warehouse}",
-          "searching": "Searching warehouses..."
+          "searching": "Searching warehouses...",
+          "selectCityFirst": "Select a city first",
+          "cityRequired": "To choose a branch, first select a city from the list"
         },
         "courierAddress": {
           "label": "Courier address",
@@ -461,6 +464,11 @@
           "label": "Payment method",
           "stripe": "Stripe",
           "monobank": "Monobank",
+          "monobankGooglePay": "Google Pay (Monobank)",
+          "monobankInvoice": "Card/Invoice (Monobank)",
+          "monobankGooglePayHint": "Google Pay is available on supported devices",
+          "monobankGooglePayFallbackHint": "If Google Pay is unavailable, use invoice payment",
+          "monobankGooglePayUnavailable": "Google Pay is currently unavailable for this order.",
           "monobankUahOnlyHint": "Monobank is available only for UAH checkout.",
           "monobankUnavailable": "Monobank is unavailable in this environment.",
           "noAvailable": "No payment methods are currently available."
@@ -718,6 +726,23 @@
           "completePayment": "Complete payment to finish your order"
         }
       },
+      "monobankGooglePay": {
+        "supportedDevices": "Google Pay available on supported devices",
+        "useInvoiceFallback": "If Google Pay not available, use invoice",
+        "loading": "Preparing Google Pay...",
+        "submitting": "Processing payment...",
+        "unableToInit": "Unable to initialize Google Pay. You can continue with invoice.",
+        "invoiceFallback": "Pay via invoice",
+        "invoiceLoading": "Opening invoice...",
+        "invoiceFallbackFailed": "Unable to start invoice payment right now.",
+        "cancelled": "Google Pay was canceled. You can try again or use invoice.",
+        "processingFallback": "We couldn't complete confirmation in the browser. Your order will be finalized automatically."
+      },
+      "monobankReturn": {
+        "processing": "Processing payment...",
+        "checking": "Waiting for webhook confirmation before finalizing your order.",
+        "refresh": "Refresh status"
+      },
       "actions": {
         "backToProducts": "Back to products",
         "goToCart": "Go to cart",
diff --git a/frontend/messages/pl.json b/frontend/messages/pl.json
index 9f270c06..1c5cb55a 100644
--- a/frontend/messages/pl.json
+++ b/frontend/messages/pl.json
@@ -417,13 +417,16 @@
           "label": "Miasto",
           "placeholder": "Zacznij wpisywać nazwę miasta (min. 2 znaki)",
           "selected": "Wybrane miasto: {city}",
-          "searching": "Wyszukiwanie miast..."
+          "searching": "Wyszukiwanie miast...",
+          "noResults": "Nie znaleziono miast. Sprawdź nazwę lub lokalne dane Nova Poshta."
         },
         "warehouse": {
-          "label": "Oddział / automat paczkowy",
+          "label": "Oddział / paczkomat",
           "placeholder": "Wpisz nazwę lub numer oddziału",
           "selected": "Wybrany oddział: {warehouse}",
-          "searching": "Wyszukiwanie oddziałów..."
+          "searching": "Wyszukiwanie oddziałów...",
+          "selectCityFirst": "Najpierw wybierz miasto",
+          "cityRequired": "Aby wybrać oddział, najpierw wybierz miasto z listy"
         },
         "courierAddress": {
           "label": "Adres kuriera",
@@ -461,9 +464,14 @@
           "label": "Metoda płatności",
           "stripe": "Stripe",
           "monobank": "Monobank",
-          "monobankUahOnlyHint": "Monobank jest dostępny tylko dla płatności w UAH.",
+          "monobankGooglePay": "Google Pay (Monobank)",
+          "monobankInvoice": "Karta / faktura (Monobank)",
+          "monobankGooglePayHint": "Google Pay jest dostępny na obsługiwanych urządzeniach",
+          "monobankGooglePayFallbackHint": "Jeśli Google Pay jest niedostępny, użyj płatności przez fakturę",
+          "monobankGooglePayUnavailable": "Google Pay jest obecnie niedostępny dla tego zamówienia.",
+          "monobankUahOnlyHint": "Monobank jest dostępny tylko dla zamówień w UAH.",
           "monobankUnavailable": "Monobank jest niedostępny w tym środowisku.",
-          "noAvailable": "Brak dostępnych metod płatności."
+          "noAvailable": "Obecnie brak dostępnych metod płatności."
         }
       },
       "actions": {
@@ -723,6 +731,23 @@
         "goToCart": "Przejdź do koszyka",
         "backToCart": "Wróć do koszyka",
         "continueShopping": "Kontynuuj zakupy"
+      },
+      "monobankGooglePay": {
+        "supportedDevices": "Google Pay jest dostępny na obsługiwanych urządzeniach",
+        "useInvoiceFallback": "Jeśli Google Pay jest niedostępny, użyj płatności przez fakturę",
+        "loading": "Przygotowywanie Google Pay...",
+        "submitting": "Przetwarzanie płatności...",
+        "unableToInit": "Nie udało się zainicjalizować Google Pay. Możesz kontynuować przez fakturę.",
+        "invoiceFallback": "Zapłać przez fakturę",
+        "invoiceLoading": "Otwieranie faktury...",
+        "invoiceFallbackFailed": "Nie można teraz uruchomić płatności przez fakturę.",
+        "cancelled": "Google Pay został anulowany. Możesz spróbować ponownie lub użyć faktury.",
+        "processingFallback": "Nie udało się dokończyć potwierdzenia w przeglądarce. Twoje zamówienie zostanie sfinalizowane automatycznie."
+      },
+      "monobankReturn": {
+        "processing": "Przetwarzanie płatności...",
+        "checking": "Oczekiwanie na potwierdzenie webhook przed finalizacją zamówienia.",
+        "refresh": "Odśwież status"
       }
     },
     "orders": {
diff --git a/frontend/messages/uk.json b/frontend/messages/uk.json
index dbf081fa..22b9ab7a 100644
--- a/frontend/messages/uk.json
+++ b/frontend/messages/uk.json
@@ -416,14 +416,17 @@
         "city": {
           "label": "Місто",
           "placeholder": "Почніть вводити назву міста (мін. 2 символи)",
-          "selected": "Вибране місто: {city}",
-          "searching": "Пошук міст..."
+          "selected": "Обране місто: {city}",
+          "searching": "Пошук міст...",
+          "noResults": "Міста не знайдено. Перевірте назву або локальні дані Nova Poshta."
         },
         "warehouse": {
           "label": "Відділення / поштомат",
           "placeholder": "Введіть назву або номер відділення",
-          "selected": "Вибране відділення: {warehouse}",
-          "searching": "Пошук відділень..."
+          "selected": "Обране відділення: {warehouse}",
+          "searching": "Пошук відділень...",
+          "selectCityFirst": "Спочатку оберіть місто",
+          "cityRequired": "Щоб вибрати відділення, спочатку оберіть місто зі списку"
         },
         "courierAddress": {
           "label": "Адреса кур’єра",
@@ -461,7 +464,12 @@
           "label": "Спосіб оплати",
           "stripe": "Stripe",
           "monobank": "Monobank",
-          "monobankUahOnlyHint": "Monobank доступний лише для оплати в UAH.",
+          "monobankGooglePay": "Google Pay (Monobank)",
+          "monobankInvoice": "Картка / інвойс (Monobank)",
+          "monobankGooglePayHint": "Google Pay доступний на підтримуваних пристроях",
+          "monobankGooglePayFallbackHint": "Якщо Google Pay недоступний, використайте оплату через інвойс",
+          "monobankGooglePayUnavailable": "Google Pay зараз недоступний для цього замовлення.",
+          "monobankUahOnlyHint": "Monobank доступний лише для оформлення в UAH.",
           "monobankUnavailable": "Monobank недоступний у цьому середовищі.",
           "noAvailable": "Наразі немає доступних способів оплати."
         }
@@ -723,6 +731,23 @@
         "goToCart": "Перейти до кошика",
         "backToCart": "Назад до кошика",
         "continueShopping": "Продовжити покупки"
+      },
+      "monobankGooglePay": {
+        "supportedDevices": "Google Pay доступний на підтримуваних пристроях",
+        "useInvoiceFallback": "Якщо Google Pay недоступний, скористайтеся оплатою через інвойс",
+        "loading": "Підготовка Google Pay...",
+        "submitting": "Обробка платежу...",
+        "unableToInit": "Не вдалося ініціалізувати Google Pay. Ви можете продовжити оплату через інвойс.",
+        "invoiceFallback": "Оплатити через інвойс",
+        "invoiceLoading": "Відкриття інвойсу...",
+        "invoiceFallbackFailed": "Зараз не вдалося запустити оплату через інвойс.",
+        "cancelled": "Google Pay було скасовано. Ви можете спробувати ще раз або скористатися інвойсом.",
+        "processingFallback": "Не вдалося завершити підтвердження в браузері. Ваше замовлення буде фіналізовано автоматично."
+      },
+      "monobankReturn": {
+        "processing": "Обробка платежу...",
+        "checking": "Очікуємо підтвердження webhook перед фінальним оформленням замовлення.",
+        "refresh": "Оновити статус"
       }
     },
     "orders": {
diff --git a/frontend/proxy.ts b/frontend/proxy.ts
index ab2d29c7..dae0ce43 100644
--- a/frontend/proxy.ts
+++ b/frontend/proxy.ts
@@ -85,6 +85,10 @@ function getScopeFromPathname(pathname: string): 'shop' | 'site' {
 }
 
 export function proxy(req: NextRequest) {
+  if (req.nextUrl.pathname.startsWith('/.well-known/')) {
+    return NextResponse.next();
+  }
+
   if (req.nextUrl.pathname === '/') {
     return NextResponse.redirect(new URL('/en', req.url));
   }
@@ -109,5 +113,9 @@ export function proxy(req: NextRequest) {
 }
 
 export const config = {
-  matcher: ['/', '/(uk|en|pl)/:path*', '/((?!api|_next|.*\\..*).*)'],
+  matcher: [
+    '/',
+    '/(uk|en|pl)/:path*',
+    '/((?!api|_next|\\.well-known(?:/|$)|.*\\..*).*)',
+  ],
 };
diff --git a/frontend/scripts/np-mock-server.mjs b/frontend/scripts/np-mock-server.mjs
index 8dedc8ca..70ce9685 100644
--- a/frontend/scripts/np-mock-server.mjs
+++ b/frontend/scripts/np-mock-server.mjs
@@ -120,13 +120,55 @@ const server = http.createServer(async (req, res) => {
     (modelName === 'Address' && calledMethod === 'getCities') ||
     calledMethod === 'searchSettlements'
   ) {
+    const cityRef = 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee';
+
+    // NP "searchSettlements" typically returns { data: [{ Addresses: [...] }] }
+    if (calledMethod === 'searchSettlements') {
+      return json(
+        res,
+        200,
+        okNp([
+          {
+            TotalCount: 1,
+            Addresses: [
+              {
+                Ref: cityRef,
+                DeliveryCity: cityRef,
+                CityRef: cityRef,
+
+                // These are commonly used by client mappers
+                MainDescription: 'Київ',
+                Present: 'м. Київ (mock)',
+                Description: 'Київ',
+                DescriptionRu: 'Киев',
+
+                AreaDescription: 'Київська',
+                RegionDescription: 'Київ',
+
+                SettlementTypeDescription: 'місто',
+                SettlementTypeDescriptionRu: 'город',
+
+                Warehouses: 2,
+              },
+            ],
+          },
+        ])
+      );
+    }
+
+    // getCities: return flat list
     return json(
       res,
       200,
       okNp([
         {
-          Ref: 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee',
-          Description: 'Kyiv (mock)',
+          Ref: cityRef,
+          Description: 'Київ',
+          DescriptionRu: 'Киев',
+          SettlementTypeDescription: 'місто',
+          SettlementTypeDescriptionRu: 'город',
+          AreaDescription: 'Київська',
+          RegionDescription: 'Київ',
         },
       ])
     );
@@ -137,13 +179,47 @@ const server = http.createServer(async (req, res) => {
     (calledMethod === 'getWarehouses' ||
       calledMethod === 'getWarehousesByCityRef')
   ) {
+    const cityRef = 'aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee';
+
     return json(
       res,
       200,
       okNp([
         {
           Ref: '11111111-1111-1111-1111-111111111111',
-          Description: 'Warehouse #1 (mock)',
+          CityRef: cityRef,
+          SettlementRef: cityRef,
+
+          Number: '1',
+          TypeOfWarehouse: 'Warehouse',
+
+          Description: 'Відділення №1 (mock)',
+          DescriptionRu: 'Отделение №1 (mock)',
+
+          Address: 'вул. Хрещатик, 1',
+          AddressRu: 'ул. Крещатик, 1',
+
+          PostMachine: '0',
+          IsPostMachine: false,
+          CategoryOfWarehouse: 'Branch',
+        },
+        {
+          Ref: '22222222-2222-2222-2222-222222222222',
+          CityRef: cityRef,
+          SettlementRef: cityRef,
+
+          Number: '2',
+          TypeOfWarehouse: 'Postomat',
+
+          Description: 'Поштомат №1 (mock)',
+          DescriptionRu: 'Почтомат №1 (mock)',
+
+          Address: 'вул. Хрещатик, 2',
+          AddressRu: 'ул. Крещатик, 2',
+
+          PostMachine: '1',
+          IsPostMachine: true,
+          CategoryOfWarehouse: 'Postomat',
         },
       ])
     );