diff --git a/frontend/app/[locale]/admin/shop/orders/[id]/ShippingEditForm.tsx b/frontend/app/[locale]/admin/shop/orders/[id]/ShippingEditForm.tsx
new file mode 100644
index 00000000..3fe9a83e
--- /dev/null
+++ b/frontend/app/[locale]/admin/shop/orders/[id]/ShippingEditForm.tsx
@@ -0,0 +1,395 @@
+'use client';
+
+import { useRouter } from 'next/navigation';
+import { useTranslations } from 'next-intl';
+import { type FormEvent, useId, useState, useTransition } from 'react';
+
+type ShippingMethodCode = 'NP_WAREHOUSE' | 'NP_LOCKER' | 'NP_COURIER';
+
+type Props = {
+  orderId: string;
+  csrfToken: string;
+  initialShipping: {
+    methodCode: ShippingMethodCode;
+    cityRef: string;
+    cityLabel: string | null;
+    warehouseRef: string | null;
+    warehouseLabel: string | null;
+    addressLine1: string | null;
+    addressLine2: string | null;
+    recipientFullName: string;
+    recipientPhone: string;
+    recipientEmail: string | null;
+    recipientComment: string | null;
+  };
+};
+
+function normalizeErrorCode(error: unknown): string {
+  if (error instanceof TypeError) return 'NETWORK_ERROR';
+  if (error instanceof Error && error.message.trim().length > 0) {
+    return error.message;
+  }
+  return 'NETWORK_ERROR';
+}
+
+function mapError(code: string, t: (key: string) => string): string {
+  switch (code) {
+    case 'NETWORK_ERROR':
+      return t('errors.network');
+    case 'CSRF_MISSING':
+    case 'CSRF_REJECTED':
+    case 'ORIGIN_BLOCKED':
+      return t('errors.security');
+    case 'INVALID_PAYLOAD':
+    case 'INVALID_SHIPPING_ADDRESS':
+      return t('errors.invalid');
+    case 'SHIPPING_EDIT_NOT_ALLOWED':
+    case 'ORDER_NOT_SHIPPABLE':
+    case 'SHIPPING_NOT_REQUIRED':
+    case 'SHIPPING_PROVIDER_UNSUPPORTED':
+      return t('errors.notAllowed');
+    case 'ADMIN_API_DISABLED':
+      return t('errors.adminDisabled');
+    default:
+      return t('errors.generic');
+  }
+}
+
+function methodLabel(
+  value: ShippingMethodCode,
+  t: (key: string) => string
+): string {
+  switch (value) {
+    case 'NP_WAREHOUSE':
+      return t('shippingMethods.novaPoshtaWarehouse');
+    case 'NP_LOCKER':
+      return t('shippingMethods.novaPoshtaLocker');
+    case 'NP_COURIER':
+      return t('shippingMethods.novaPoshtaCourier');
+  }
+}
+
+export function ShippingEditForm({
+  orderId,
+  csrfToken,
+  initialShipping,
+}: Props) {
+  const router = useRouter();
+  const t = useTranslations('shop.orders.detail');
+  const tEditor = useTranslations('shop.orders.detail.shippingEditor');
+  const [isPending, startTransition] = useTransition();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const [methodCode, setMethodCode] = useState<ShippingMethodCode>(
+    initialShipping.methodCode
+  );
+  const [cityRef, setCityRef] = useState(initialShipping.cityRef);
+  const [warehouseRef, setWarehouseRef] = useState(
+    initialShipping.warehouseRef ?? ''
+  );
+  const [addressLine1, setAddressLine1] = useState(
+    initialShipping.addressLine1 ?? ''
+  );
+  const [addressLine2, setAddressLine2] = useState(
+    initialShipping.addressLine2 ?? ''
+  );
+  const [recipientFullName, setRecipientFullName] = useState(
+    initialShipping.recipientFullName
+  );
+  const [recipientPhone, setRecipientPhone] = useState(
+    initialShipping.recipientPhone
+  );
+  const [recipientEmail, setRecipientEmail] = useState(
+    initialShipping.recipientEmail ?? ''
+  );
+  const [recipientComment, setRecipientComment] = useState(
+    initialShipping.recipientComment ?? ''
+  );
+  const errorAlertId = `${useId()}-error`;
+
+  const isWarehouseMethod =
+    methodCode === 'NP_WAREHOUSE' || methodCode === 'NP_LOCKER';
+  const isCourierMethod = methodCode === 'NP_COURIER';
+
+  async function onSubmit(event: FormEvent<HTMLFormElement>) {
+    event.preventDefault();
+    if (isSubmitting || isPending) return;
+
+    setError(null);
+
+    const trimmedCityRef = cityRef.trim();
+    const trimmedWarehouseRef = warehouseRef.trim();
+    const trimmedAddressLine1 = addressLine1.trim();
+    const trimmedAddressLine2 = addressLine2.trim();
+    const trimmedRecipientFullName = recipientFullName.trim();
+    const trimmedRecipientPhone = recipientPhone.trim();
+    const trimmedRecipientEmail = recipientEmail.trim();
+    const trimmedRecipientComment = recipientComment.trim();
+
+    const hasRequiredFields =
+      trimmedCityRef.length > 0 &&
+      trimmedRecipientFullName.length > 0 &&
+      trimmedRecipientPhone.length > 0 &&
+      (!isWarehouseMethod || trimmedWarehouseRef.length > 0) &&
+      (!isCourierMethod || trimmedAddressLine1.length > 0);
+
+    if (!hasRequiredFields) {
+      setError(tEditor('errors.invalid'));
+      return;
+    }
+
+    setIsSubmitting(true);
+
+    let response: Response;
+    try {
+      response = await fetch(`/api/shop/admin/orders/${orderId}/shipping`, {
+        method: 'PATCH',
+        credentials: 'same-origin',
+        headers: {
+          'Content-Type': 'application/json',
+          'x-csrf-token': csrfToken,
+        },
+        body: JSON.stringify({
+          provider: 'nova_poshta',
+          methodCode,
+          selection: {
+            cityRef: trimmedCityRef,
+            ...(isWarehouseMethod
+              ? { warehouseRef: trimmedWarehouseRef }
+              : {
+                  addressLine1: trimmedAddressLine1,
+                  addressLine2: trimmedAddressLine2,
+                }),
+          },
+          recipient: {
+            fullName: trimmedRecipientFullName,
+            phone: trimmedRecipientPhone,
+            ...(trimmedRecipientEmail.length > 0
+              ? { email: trimmedRecipientEmail }
+              : {}),
+            ...(trimmedRecipientComment.length > 0
+              ? { comment: trimmedRecipientComment }
+              : {}),
+          },
+        }),
+      });
+    } catch (requestError) {
+      setError(mapError(normalizeErrorCode(requestError), tEditor));
+      setIsSubmitting(false);
+      return;
+    }
+
+    let json: Record<string, unknown> | null = null;
+    try {
+      json = (await response.json()) as Record<string, unknown>;
+    } catch {
+      json = null;
+    }
+
+    if (!response.ok) {
+      const code =
+        typeof json?.code === 'string'
+          ? json.code
+          : typeof json?.message === 'string'
+            ? json.message
+            : `HTTP_${response.status}`;
+      setError(mapError(code, tEditor));
+      setIsSubmitting(false);
+      return;
+    }
+
+    setIsSubmitting(false);
+    startTransition(() => {
+      router.refresh();
+    });
+  }
+
+  return (
+    <form className="grid gap-3" onSubmit={onSubmit}>
+      <div>
+        <label
+          className="text-muted-foreground mb-1 block text-xs"
+          htmlFor="shipping-method-code"
+        >
+          {t('shippingMethod')}
+        </label>
+        <select
+          id="shipping-method-code"
+          value={methodCode}
+          onChange={event =>
+            setMethodCode(event.target.value as ShippingMethodCode)
+          }
+          className="border-border bg-background text-foreground w-full rounded-lg border px-3 py-2 text-sm"
+        >
+          <option value="NP_WAREHOUSE">{methodLabel('NP_WAREHOUSE', t)}</option>
+          <option value="NP_LOCKER">{methodLabel('NP_LOCKER', t)}</option>
+          <option value="NP_COURIER">{methodLabel('NP_COURIER', t)}</option>
+        </select>
+      </div>
+
+      <div>
+        <label
+          className="text-muted-foreground mb-1 block text-xs"
+          htmlFor="shipping-city-ref"
+        >
+          {tEditor('cityRef')}
+        </label>
+        <input
+          id="shipping-city-ref"
+          value={cityRef}
+          onChange={event => setCityRef(event.target.value)}
+          required
+          className="border-border bg-background text-foreground w-full rounded-lg border px-3 py-2 text-sm"
+        />
+        {initialShipping.cityLabel ? (
+          <p className="text-muted-foreground mt-1 text-[11px]">
+            {tEditor('currentCity', { city: initialShipping.cityLabel })}
+          </p>
+        ) : null}
+      </div>
+
+      {isWarehouseMethod ? (
+        <div>
+          <label
+            className="text-muted-foreground mb-1 block text-xs"
+            htmlFor="shipping-warehouse-ref"
+          >
+            {tEditor('pickupPointRef')}
+          </label>
+          <input
+            id="shipping-warehouse-ref"
+            value={warehouseRef}
+            onChange={event => setWarehouseRef(event.target.value)}
+            required
+            className="border-border bg-background text-foreground w-full rounded-lg border px-3 py-2 text-sm"
+          />
+          {initialShipping.warehouseLabel ? (
+            <p className="text-muted-foreground mt-1 text-[11px]">
+              {tEditor('currentPickupPoint', {
+                pickupPoint: initialShipping.warehouseLabel,
+              })}
+            </p>
+          ) : null}
+        </div>
+      ) : (
+        <>
+          <div>
+            <label
+              className="text-muted-foreground mb-1 block text-xs"
+              htmlFor="shipping-address-line-1"
+            >
+              {tEditor('addressLine1')}
+            </label>
+            <input
+              id="shipping-address-line-1"
+              value={addressLine1}
+              onChange={event => setAddressLine1(event.target.value)}
+              required={isCourierMethod}
+              className="border-border bg-background text-foreground w-full rounded-lg border px-3 py-2 text-sm"
+            />
+          </div>
+
+          <div>
+            <label
+              className="text-muted-foreground mb-1 block text-xs"
+              htmlFor="shipping-address-line-2"
+            >
+              {tEditor('addressLine2')}
+            </label>
+            <input
+              id="shipping-address-line-2"
+              value={addressLine2}
+              onChange={event => setAddressLine2(event.target.value)}
+              className="border-border bg-background text-foreground w-full rounded-lg border px-3 py-2 text-sm"
+            />
+          </div>
+        </>
+      )}
+
+      <div>
+        <label
+          className="text-muted-foreground mb-1 block text-xs"
+          htmlFor="shipping-recipient-full-name"
+        >
+          {t('recipientName')}
+        </label>
+        <input
+          id="shipping-recipient-full-name"
+          value={recipientFullName}
+          onChange={event => setRecipientFullName(event.target.value)}
+          required
+          className="border-border bg-background text-foreground w-full rounded-lg border px-3 py-2 text-sm"
+        />
+      </div>
+
+      <div>
+        <label
+          className="text-muted-foreground mb-1 block text-xs"
+          htmlFor="shipping-recipient-phone"
+        >
+          {t('recipientPhone')}
+        </label>
+        <input
+          id="shipping-recipient-phone"
+          value={recipientPhone}
+          onChange={event => setRecipientPhone(event.target.value)}
+          required
+          className="border-border bg-background text-foreground w-full rounded-lg border px-3 py-2 text-sm"
+        />
+      </div>
+
+      <div>
+        <label
+          className="text-muted-foreground mb-1 block text-xs"
+          htmlFor="shipping-recipient-email"
+        >
+          {t('recipientEmail')}
+        </label>
+        <input
+          id="shipping-recipient-email"
+          value={recipientEmail}
+          onChange={event => setRecipientEmail(event.target.value)}
+          className="border-border bg-background text-foreground w-full rounded-lg border px-3 py-2 text-sm"
+        />
+      </div>
+
+      <div>
+        <label
+          className="text-muted-foreground mb-1 block text-xs"
+          htmlFor="shipping-recipient-comment"
+        >
+          {t('comment')}
+        </label>
+        <textarea
+          id="shipping-recipient-comment"
+          value={recipientComment}
+          onChange={event => setRecipientComment(event.target.value)}
+          className="border-border bg-background text-foreground min-h-24 w-full rounded-lg border px-3 py-2 text-sm"
+        />
+      </div>
+
+      <div className="flex items-center justify-between gap-3">
+        <p className="text-muted-foreground text-xs">{tEditor('subtitle')}</p>
+        <button
+          type="submit"
+          disabled={isSubmitting || isPending}
+          aria-busy={isSubmitting || isPending}
+          aria-describedby={error ? errorAlertId : undefined}
+          className="rounded-lg border border-emerald-500/30 bg-emerald-500/5 px-3 py-2 text-sm font-medium text-emerald-700 transition-colors hover:bg-emerald-500/10 disabled:cursor-not-allowed disabled:opacity-50 dark:text-emerald-100"
+        >
+          {isSubmitting || isPending ? tEditor('saving') : tEditor('save')}
+        </button>
+      </div>
+
+      {error ? (
+        <p
+          id={errorAlertId}
+          role="alert"
+          className="rounded-md border border-amber-500/20 bg-amber-500/5 px-3 py-2 text-xs text-amber-700 dark:text-amber-100"
+        >
+          {error}
+        </p>
+      ) : null}
+    </form>
+  );
+}
diff --git a/frontend/app/[locale]/admin/shop/orders/[id]/page.tsx b/frontend/app/[locale]/admin/shop/orders/[id]/page.tsx
index c7ea2c2e..8cc3699e 100644
--- a/frontend/app/[locale]/admin/shop/orders/[id]/page.tsx
+++ b/frontend/app/[locale]/admin/shop/orders/[id]/page.tsx
@@ -15,6 +15,7 @@ import { getCurrentUser } from '@/lib/auth';
 import { logError } from '@/lib/logging';
 import { CSRF_FORM_FIELD, issueCsrfToken } from '@/lib/security/csrf';
 import { getAdminOrderLifecycleAvailability } from '@/lib/services/shop/admin-order-lifecycle';
+import { getAdminOrderShippingEditAvailability } from '@/lib/services/shop/shipping/admin-edit';
 import { evaluateOrderShippingEligibility } from '@/lib/services/shop/shipping/eligibility';
 import { type CurrencyCode, formatMoney } from '@/lib/shop/currency';
 import { fromDbMoney } from '@/lib/shop/money';
@@ -31,6 +32,7 @@ import { CancelPaymentButton } from './CancelPaymentButton';
 import { RefundButton } from './RefundButton';
 import { ShippingActions } from './ShippingActions';
 import { getAdminOrderShippingActionVisibility } from './shippingActionVisibility';
+import { ShippingEditForm } from './ShippingEditForm';
 
 export const metadata: Metadata = {
   title: 'Order Details | DevLovers',
@@ -54,6 +56,20 @@ type NormalizedCustomerSummary = {
   address: string | null;
 };
 
+type ShippingEditInitialData = {
+  methodCode: 'NP_WAREHOUSE' | 'NP_LOCKER' | 'NP_COURIER';
+  cityRef: string;
+  cityLabel: string | null;
+  warehouseRef: string | null;
+  warehouseLabel: string | null;
+  addressLine1: string | null;
+  addressLine2: string | null;
+  recipientFullName: string;
+  recipientPhone: string;
+  recipientEmail: string | null;
+  recipientComment: string | null;
+};
+
 function safeFormatMoneyMajor(
   major: string,
   currency: CurrencyCode,
@@ -157,6 +173,43 @@ function normalizeCustomerSummary(
   };
 }
 
+function normalizeShippingEditInitialData(
+  order: AdminOrderDetail
+): ShippingEditInitialData | null {
+  const root = isRecord(order.shippingAddress) ? order.shippingAddress : {};
+  const selection = isRecord(root.selection) ? root.selection : {};
+  const recipient = isRecord(root.recipient) ? root.recipient : {};
+  const methodCode = firstNonEmpty(
+    order.shippingMethodCode,
+    toStringOrNull(root.methodCode)
+  );
+
+  if (
+    methodCode !== 'NP_WAREHOUSE' &&
+    methodCode !== 'NP_LOCKER' &&
+    methodCode !== 'NP_COURIER'
+  ) {
+    return null;
+  }
+
+  return {
+    methodCode,
+    cityRef: toStringOrNull(selection.cityRef) ?? '',
+    cityLabel: firstNonEmpty(
+      toStringOrNull(selection.cityNameUa),
+      toStringOrNull(selection.cityNameRu)
+    ),
+    warehouseRef: toStringOrNull(selection.warehouseRef),
+    warehouseLabel: toStringOrNull(selection.warehouseName),
+    addressLine1: toStringOrNull(selection.addressLine1),
+    addressLine2: toStringOrNull(selection.addressLine2),
+    recipientFullName: toStringOrNull(recipient.fullName) ?? '',
+    recipientPhone: toStringOrNull(recipient.phone) ?? '',
+    recipientEmail: toStringOrNull(recipient.email),
+    recipientComment: toStringOrNull(recipient.comment),
+  };
+}
+
 function detailValue(value: string | null | undefined): string {
   return value && value.trim().length > 0 ? value : DASH;
 }
@@ -288,6 +341,10 @@ function historyActionLabel(
       return t('history.actions.cancel');
     case 'complete':
       return t('history.actions.complete');
+    case 'refund':
+      return t('history.actions.refund');
+    case 'cancel_payment':
+      return t('history.actions.cancelPayment');
     case 'recover_initial_shipment':
       return t('history.actions.recoverInitialShipment');
     case 'retry_label_creation':
@@ -296,6 +353,8 @@ function historyActionLabel(
       return t('history.actions.markShipped');
     case 'mark_delivered':
       return t('history.actions.markDelivered');
+    case 'edit_shipping':
+      return t('history.actions.editShipping');
     default:
       return action;
   }
@@ -387,6 +446,7 @@ export default async function OrderDetailPage({
   const paymentStatusT = await getTranslations('shop.orders.paymentStatus');
   const lifecycleCsrfToken = issueCsrfToken('admin:orders:lifecycle');
   const shippingCsrfToken = issueCsrfToken('admin:orders:shipping:action');
+  const shippingEditCsrfToken = issueCsrfToken('admin:orders:shipping:edit');
   const refundCsrfToken = issueCsrfToken('admin:orders:refund');
   const cancelPaymentCsrfToken = issueCsrfToken('admin:orders:cancel-payment');
 
@@ -468,6 +528,12 @@ export default async function OrderDetailPage({
     shippingStatus: order.shippingStatus,
     shipmentStatus: order.shipmentStatus,
   });
+  const shippingEditEnabled = getAdminOrderShippingEditAvailability({
+    shippingReady,
+    shippingStatus: order.shippingStatus,
+    shipmentStatus: order.shipmentStatus,
+  });
+  const shippingEditInitialData = normalizeShippingEditInitialData(order);
   const paymentEnabled = paymentControlsEnabled(order);
   const lifecycleErrorCode = Array.isArray(sp.lifecycleError)
     ? (sp.lifecycleError[0] ?? null)
@@ -914,6 +980,21 @@ export default async function OrderDetailPage({
               </dd>
             </div>
           </dl>
+
+          {shippingEditEnabled && shippingEditInitialData ? (
+            <section className="mt-6 border-t pt-4">
+              <div className="mb-3">
+                <h3 className="text-foreground text-sm font-semibold">
+                  {t('shippingEditor.heading')}
+                </h3>
+              </div>
+              <ShippingEditForm
+                orderId={order.id}
+                csrfToken={shippingEditCsrfToken}
+                initialShipping={shippingEditInitialData}
+              />
+            </section>
+          ) : null}
         </section>
       </div>
 
diff --git a/frontend/app/[locale]/shop/cart/capabilities.ts b/frontend/app/[locale]/shop/cart/capabilities.ts
index 4bdd5414..6afc488f 100644
--- a/frontend/app/[locale]/shop/cart/capabilities.ts
+++ b/frontend/app/[locale]/shop/cart/capabilities.ts
@@ -1,4 +1,5 @@
 import { isMonobankEnabled } from '@/lib/env/monobank';
+import { readServerEnv } from '@/lib/env/server-env';
 import { isPaymentsEnabled as isStripePaymentsEnabled } from '@/lib/env/stripe';
 
 function isFlagEnabled(value: string | undefined): boolean {
@@ -16,7 +17,7 @@ export function resolveStripeCheckoutEnabled(): boolean {
 }
 
 export function resolveMonobankCheckoutEnabled(): boolean {
-  const paymentsEnabled = isFlagEnabled(process.env.PAYMENTS_ENABLED);
+  const paymentsEnabled = isFlagEnabled(readServerEnv('PAYMENTS_ENABLED'));
   if (!paymentsEnabled) return false;
 
   try {
@@ -29,7 +30,7 @@ export function resolveMonobankCheckoutEnabled(): boolean {
 export function resolveMonobankGooglePayEnabled(): boolean {
   if (!resolveMonobankCheckoutEnabled()) return false;
 
-  const raw = (process.env.SHOP_MONOBANK_GPAY_ENABLED ?? '')
+  const raw = (readServerEnv('SHOP_MONOBANK_GPAY_ENABLED') ?? '')
     .trim()
     .toLowerCase();
   return raw === 'true' || raw === '1' || raw === 'yes' || raw === 'on';
diff --git a/frontend/app/[locale]/shop/cart/page.tsx b/frontend/app/[locale]/shop/cart/page.tsx
index d5e2456c..48d7127d 100644
--- a/frontend/app/[locale]/shop/cart/page.tsx
+++ b/frontend/app/[locale]/shop/cart/page.tsx
@@ -14,6 +14,9 @@ export const metadata: Metadata = {
   description: 'Review items in your cart and proceed to checkout.',
 };
 
+export const runtime = 'nodejs';
+export const dynamic = 'force-dynamic';
+
 export default function CartPage() {
   const legalVersions = getShopLegalVersions();
 
diff --git a/frontend/app/[locale]/shop/checkout/success/MonobankRedirectStatus.tsx b/frontend/app/[locale]/shop/checkout/success/MonobankRedirectStatus.tsx
index 238503f1..0b779ebe 100644
--- a/frontend/app/[locale]/shop/checkout/success/MonobankRedirectStatus.tsx
+++ b/frontend/app/[locale]/shop/checkout/success/MonobankRedirectStatus.tsx
@@ -6,6 +6,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { Link } from '@/i18n/routing';
 import { formatMoneyCode } from '@/lib/shop/currency';
+import { formatGuestShipmentStatus } from '@/lib/shop/guest-shipment-status';
 import { type PaymentStatus } from '@/lib/shop/payments';
 import {
   SHOP_CTA_BASE,
@@ -32,6 +33,8 @@ type OrderStatusModel = {
   totalAmountMinor: number;
   paymentStatus: string;
   itemsCount: number;
+  shipmentStatus: string | null;
+  trackingNumber: string | null;
 };
 
 type StatusResult =
@@ -133,6 +136,14 @@ function normalizeToken(value: string | null | undefined): string | null {
 function parseOrderStatusPayload(payload: unknown): OrderStatusModel | null {
   if (!payload || typeof payload !== 'object') return null;
   const root = payload as Record<string, unknown>;
+  const shipmentStatus =
+    typeof root.shipmentStatus === 'string' && root.shipmentStatus.trim()
+      ? root.shipmentStatus
+      : null;
+  const trackingNumber =
+    typeof root.trackingNumber === 'string' && root.trackingNumber.trim()
+      ? root.trackingNumber
+      : null;
 
   if (
     typeof root.id === 'string' &&
@@ -151,6 +162,8 @@ function parseOrderStatusPayload(payload: unknown): OrderStatusModel | null {
       totalAmountMinor: root.totalAmountMinor,
       paymentStatus: root.paymentStatus,
       itemsCount: root.itemsCount,
+      shipmentStatus,
+      trackingNumber,
     };
   }
 
@@ -160,6 +173,14 @@ function parseOrderStatusPayload(payload: unknown): OrderStatusModel | null {
   if (!orderRaw || typeof orderRaw !== 'object') return null;
 
   const order = orderRaw as Record<string, unknown>;
+  const fullShipmentStatus =
+    typeof order.shipmentStatus === 'string' && order.shipmentStatus.trim()
+      ? order.shipmentStatus
+      : null;
+  const fullTrackingNumber =
+    typeof order.trackingNumber === 'string' && order.trackingNumber.trim()
+      ? order.trackingNumber
+      : null;
 
   if (typeof order.id !== 'string' || !order.id.trim()) return null;
   if (order.currency !== 'UAH') return null;
@@ -186,6 +207,8 @@ function parseOrderStatusPayload(payload: unknown): OrderStatusModel | null {
     totalAmountMinor: order.totalAmountMinor,
     paymentStatus: order.paymentStatus,
     itemsCount,
+    shipmentStatus: fullShipmentStatus,
+    trackingNumber: fullTrackingNumber,
   };
 }
 
@@ -350,6 +373,7 @@ export default function MonobankRedirectStatus({
 }: Props) {
   const router = useRouter();
   const t = useTranslations('shop.checkout');
+  const tOrder = useTranslations('shop.orders.detail');
   const [order, setOrder] = useState<OrderStatusModel | null>(null);
   const [isLoading, setIsLoading] = useState(true);
   const [statusCode, setStatusCode] = useState<string | null>(null);
@@ -550,6 +574,9 @@ export default function MonobankRedirectStatus({
   const localizedPaymentStatus = isLoading
     ? t('paymentStatus.confirming')
     : t(getPaymentStatusKey(statusVm.uiState));
+  const localizedShipmentStatus = order
+    ? formatGuestShipmentStatus(order.shipmentStatus, tOrder)
+    : null;
 
   const errorText = useMemo(() => {
     if (!statusCode) return null;
@@ -635,6 +662,28 @@ export default function MonobankRedirectStatus({
                 {localizedPaymentStatus}
               </dd>
             </div>
+
+            {localizedShipmentStatus ? (
+              <div className="flex items-center justify-between gap-4">
+                <dt className="text-muted-foreground">
+                  {tOrder('shippingStatus')}
+                </dt>
+                <dd className="text-foreground text-right font-medium">
+                  {localizedShipmentStatus}
+                </dd>
+              </div>
+            ) : null}
+
+            {order?.trackingNumber ? (
+              <div className="flex items-center justify-between gap-4">
+                <dt className="text-muted-foreground">
+                  {tOrder('trackingNumber')}
+                </dt>
+                <dd className="text-foreground text-right font-medium [overflow-wrap:anywhere] break-words">
+                  {order.trackingNumber}
+                </dd>
+              </div>
+            ) : null}
           </dl>
         </div>
       </section>
diff --git a/frontend/app/[locale]/shop/checkout/success/page.tsx b/frontend/app/[locale]/shop/checkout/success/page.tsx
index 0ffc7a07..eb7fb4e4 100644
--- a/frontend/app/[locale]/shop/checkout/success/page.tsx
+++ b/frontend/app/[locale]/shop/checkout/success/page.tsx
@@ -5,6 +5,7 @@ import { ClearCartOnMount } from '@/components/shop/ClearCartOnMount';
 import { Link } from '@/i18n/routing';
 import { getCheckoutSuccessOrderSummary } from '@/lib/services/orders';
 import { formatMoney } from '@/lib/shop/currency';
+import { formatGuestShipmentStatus } from '@/lib/shop/guest-shipment-status';
 import {
   SHOP_CTA_BASE,
   SHOP_CTA_INSET,
@@ -148,6 +149,7 @@ export default async function CheckoutSuccessPage({
 
   const clearCart = shouldClearCart(resolvedParams);
   const t = await getTranslations('shop.checkout');
+  const tOrder = await getTranslations('shop.orders.detail');
 
   const orderId = parseOrderId(resolvedParams);
   if (!orderId) {
@@ -224,6 +226,10 @@ export default async function CheckoutSuccessPage({
 
   const totalMinor = order.totalAmountMinor;
   const itemsCount = order.items.reduce((sum, item) => sum + item.quantity, 0);
+  const shipmentStatusLabel = formatGuestShipmentStatus(
+    order.shipmentStatus,
+    tOrder
+  );
 
   return (
     <main
@@ -289,6 +295,28 @@ export default async function CheckoutSuccessPage({
                   {order.paymentStatus}
                 </dd>
               </div>
+
+              {shipmentStatusLabel ? (
+                <div className="flex items-center justify-between gap-4">
+                  <dt className="text-muted-foreground">
+                    {tOrder('shippingStatus')}
+                  </dt>
+                  <dd className="text-foreground text-right font-medium">
+                    {shipmentStatusLabel}
+                  </dd>
+                </div>
+              ) : null}
+
+              {order.trackingNumber ? (
+                <div className="flex items-center justify-between gap-4">
+                  <dt className="text-muted-foreground">
+                    {tOrder('trackingNumber')}
+                  </dt>
+                  <dd className="text-foreground text-right font-medium [overflow-wrap:anywhere] break-words">
+                    {order.trackingNumber}
+                  </dd>
+                </div>
+              ) : null}
             </dl>
           </div>
         </section>
diff --git a/frontend/app/[locale]/shop/orders/[id]/page.tsx b/frontend/app/[locale]/shop/orders/[id]/page.tsx
index e16f83b6..ffec5061 100644
--- a/frontend/app/[locale]/shop/orders/[id]/page.tsx
+++ b/frontend/app/[locale]/shop/orders/[id]/page.tsx
@@ -66,6 +66,12 @@ type OrderDetail = {
   }>;
 };
 
+function shortOrderId(id: string) {
+  if (!id) return '';
+  if (id.length <= 14) return id;
+  return `${id.slice(0, 8)}...${id.slice(-4)}`;
+}
+
 function safeFormatMoneyMajor(
   major: string,
   currency: CurrencyCode,
@@ -88,6 +94,74 @@ function fulfillmentStageLabelKey(stage: CanonicalFulfillmentStage): string {
   return `fulfillmentStages.${stage}`;
 }
 
+function fulfillmentStageClassName(stage: CanonicalFulfillmentStage) {
+  switch (stage) {
+    case 'canceled':
+      return 'border border-border bg-destructive/10 text-destructive';
+    default:
+      return 'border border-border bg-muted/40 text-foreground';
+  }
+}
+
+function paymentStatusLabel(
+  status: OrderPaymentStatus,
+  t: Awaited<ReturnType<typeof getTranslations<'shop.orders.detail'>>>
+) {
+  switch (status) {
+    case 'paid':
+      return t('paymentStatuses.paid');
+    case 'pending':
+      return t('paymentStatuses.pending');
+    case 'requires_payment':
+      return t('paymentStatuses.requiresPayment');
+    case 'failed':
+      return t('paymentStatuses.failed');
+    case 'refunded':
+      return t('paymentStatuses.refunded');
+    case 'needs_review':
+      return t('paymentStatuses.needsReview');
+    default:
+      return String(status);
+  }
+}
+
+function paymentStatusClassName(status: OrderPaymentStatus) {
+  switch (status) {
+    case 'failed':
+      return 'border border-border bg-destructive/10 text-destructive';
+    default:
+      return 'border border-border bg-muted/40 text-foreground';
+  }
+}
+
+function shippingStatusLabel(
+  status: string | null,
+  t: Awaited<ReturnType<typeof getTranslations<'shop.orders.detail'>>>
+) {
+  switch (status) {
+    case null:
+      return t('deliveryPending');
+    case 'pending':
+      return t('shippingStatuses.pending');
+    case 'queued':
+      return t('shippingStatuses.queued');
+    case 'creating_label':
+      return t('shippingStatuses.creatingLabel');
+    case 'label_created':
+      return t('shippingStatuses.labelCreated');
+    case 'shipped':
+      return t('shippingStatuses.shipped');
+    case 'delivered':
+      return t('shippingStatuses.delivered');
+    case 'cancelled':
+      return t('shippingStatuses.cancelled');
+    case 'needs_attention':
+      return t('shippingStatuses.needsAttention');
+    default:
+      return status;
+  }
+}
+
 function toOrderItem(
   item: {
     id: string | null;
@@ -251,16 +325,21 @@ export default async function OrderDetailPage({
     locale
   );
   const createdFormatted = safeFormatDateTime(order.createdAt, dtf);
+  const paymentStatusFormatted = paymentStatusLabel(order.paymentStatus, t);
+  const fulfillmentStageFormatted = t(
+    fulfillmentStageLabelKey(order.fulfillmentStage)
+  );
+  const shippingStatusFormatted = shippingStatusLabel(order.shippingStatus, t);
   const restockedFormatted = order.restockedAt
     ? safeFormatDateTime(order.restockedAt, dtf)
-    : '—';
+    : '-';
   const NAV_LINK = cn(SHOP_NAV_LINK_BASE, 'text-lg', SHOP_FOCUS);
 
   const PRODUCT_LINK = cn(
     SHOP_LINK_BASE,
     SHOP_LINK_MD,
     SHOP_FOCUS,
-    'truncate',
+    'block min-w-0 [overflow-wrap:anywhere] whitespace-normal',
     '!underline !decoration-2 !underline-offset-4'
   );
 
@@ -269,18 +348,24 @@ export default async function OrderDetailPage({
       className="mx-auto w-full max-w-3xl px-4 py-8"
       aria-labelledby="order-heading"
     >
-      <header className="mb-6 flex items-start justify-between gap-3">
+      <header className="mb-6 flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
         <div className="min-w-0">
-          <h1 id="order-heading" className="truncate text-2xl font-semibold">
-            {t('title')}
+          <p className="text-muted-foreground text-xs font-medium tracking-[0.16em] uppercase">
+            {t('orderReference')}
+          </p>
+          <h1
+            id="order-heading"
+            className="mt-2 truncate text-2xl font-semibold"
+          >
+            {t('orderNumber', { id: shortOrderId(order.id) })}
           </h1>
-          <div className="text-muted-foreground mt-1 truncate text-xs">
-            {order.id}
-          </div>
+          <p className="text-muted-foreground mt-2 text-sm">
+            {t('placedOn', { date: createdFormatted })}
+          </p>
         </div>
 
         <nav
-          className="flex flex-wrap items-center justify-end gap-3"
+          className="flex w-full flex-wrap items-center gap-2 sm:w-auto sm:justify-end sm:gap-3"
           aria-label="Order navigation"
         >
           <Link className={NAV_LINK} href="/shop/orders">
@@ -293,60 +378,96 @@ export default async function OrderDetailPage({
       </header>
 
       <section
-        className="border-border mb-6 rounded-md border p-4"
+        className="border-border mb-6 rounded-xl border p-4 sm:p-5"
         aria-labelledby="order-summary-heading"
       >
-        <h2 id="order-summary-heading" className="sr-only">
-          {t('orderSummary')}
-        </h2>
+        <div className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
+          <div className="min-w-0">
+            <p className="text-muted-foreground text-xs font-medium tracking-[0.16em] uppercase">
+              {t('customerSummary')}
+            </p>
+            <h2
+              id="order-summary-heading"
+              className="mt-2 text-xl font-semibold"
+            >
+              {t('orderSummary')}
+            </h2>
+            <p className="text-muted-foreground mt-2 text-sm">
+              {t('orderNumberLabel', { id: shortOrderId(order.id) })}
+            </p>
+          </div>
+
+          <div className="flex flex-wrap gap-2">
+            <span
+              className={cn(
+                'inline-flex items-center rounded-full px-3 py-1 text-xs font-medium whitespace-nowrap',
+                fulfillmentStageClassName(order.fulfillmentStage)
+              )}
+            >
+              {fulfillmentStageFormatted}
+            </span>
+            <span
+              className={cn(
+                'inline-flex items-center rounded-full px-3 py-1 text-xs font-medium whitespace-nowrap',
+                paymentStatusClassName(order.paymentStatus)
+              )}
+            >
+              {paymentStatusFormatted}
+            </span>
+          </div>
+        </div>
 
-        <dl className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+        <dl className="mt-5 grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
           <div>
-            <dt className="text-muted-foreground text-xs">{t('total')}</dt>
-            <dd className="text-sm font-medium">{totalFormatted}</dd>
+            <dt className="text-muted-foreground text-xs tracking-[0.16em] uppercase">
+              {t('total')}
+            </dt>
+            <dd className="mt-1 text-base font-semibold">{totalFormatted}</dd>
           </div>
 
           <div>
-            <dt className="text-muted-foreground text-xs">
+            <dt className="text-muted-foreground text-xs tracking-[0.16em] uppercase">
               {t('paymentStatus')}
             </dt>
-            <dd className="text-sm font-medium">
-              {String(order.paymentStatus)}
+            <dd className="mt-1 text-sm font-medium">
+              {paymentStatusFormatted}
             </dd>
           </div>
 
           <div>
-            <dt className="text-muted-foreground text-xs">
+            <dt className="text-muted-foreground text-xs tracking-[0.16em] uppercase">
               {t('fulfillmentStage')}
             </dt>
-            <dd className="text-sm font-medium">
-              {t(fulfillmentStageLabelKey(order.fulfillmentStage))}
+            <dd className="mt-1 text-sm font-medium">
+              {fulfillmentStageFormatted}
             </dd>
           </div>
 
           <div>
-            <dt className="text-muted-foreground text-xs">
-              {t('shippingStatus')}
+            <dt className="text-muted-foreground text-xs tracking-[0.16em] uppercase">
+              {t('delivery')}
             </dt>
-            <dd className="text-sm font-medium">
-              {order.shippingStatus ?? '-'}
+            <dd className="mt-1 text-sm font-medium">
+              {shippingStatusFormatted}
             </dd>
           </div>
 
-          <div>
-            <dt className="text-muted-foreground text-xs">
+          <div className="sm:col-span-2 lg:col-span-2">
+            <dt className="text-muted-foreground text-xs tracking-[0.16em] uppercase">
               {t('trackingNumber')}
             </dt>
-            <dd className="text-sm font-medium break-all">
-              {order.trackingNumber ?? '-'}
+            <dd
+              className={cn(
+                'mt-1 text-sm font-medium',
+                order.trackingNumber
+                  ? '[overflow-wrap:anywhere] break-words'
+                  : 'text-muted-foreground'
+              )}
+            >
+              {order.trackingNumber ?? t('trackingPending')}
             </dd>
           </div>
 
-          <div>
-            <dt className="text-muted-foreground text-xs">{t('created')}</dt>
-            <dd className="text-sm">{createdFormatted}</dd>
-          </div>
-
           {isAdmin && (
             <div>
               <dt className="text-muted-foreground text-xs">{t('provider')}</dt>
@@ -362,7 +483,7 @@ export default async function OrderDetailPage({
                 {t('paymentReference')}
               </dt>
               <dd className="text-sm break-all">
-                {order.paymentIntentId ?? '—'}
+                {order.paymentIntentId ?? '-'}
               </dd>
             </div>
             <div>
@@ -395,7 +516,7 @@ export default async function OrderDetailPage({
       </section>
 
       <section
-        className="border-border rounded-md border"
+        className="border-border rounded-xl border"
         aria-labelledby="order-items-heading"
       >
         <div className="border-border border-b p-4">
@@ -407,12 +528,12 @@ export default async function OrderDetailPage({
         <ul className="divide-border divide-y" aria-label={t('items')}>
           {order.items.map(it => (
             <li key={it.id} className="p-4">
-              <div className="flex flex-col gap-2 sm:flex-row sm:items-start sm:justify-between">
+              <div className="flex flex-col gap-3 sm:flex-row sm:items-start sm:justify-between">
                 <div className="min-w-0">
                   {it.productSlug ? (
                     <Link
                       href={`/shop/products/${it.productSlug}`}
-                      className={PRODUCT_LINK}
+                      className={cn(PRODUCT_LINK, 'line-clamp-2 leading-snug')}
                     >
                       {it.productTitle ??
                         it.productSlug ??
@@ -420,12 +541,12 @@ export default async function OrderDetailPage({
                         it.productId}
                     </Link>
                   ) : (
-                    <div className="truncate font-medium">
+                    <div className="line-clamp-2 leading-snug font-medium [overflow-wrap:anywhere]">
                       {it.productTitle ?? it.productSku ?? it.productId}
                     </div>
                   )}
 
-                  <div className="text-muted-foreground mt-1 text-xs break-all">
+                  <div className="text-muted-foreground mt-1 text-xs [overflow-wrap:anywhere]">
                     {it.productSku
                       ? t('sku', { sku: it.productSku })
                       : t('product', { productId: it.productId })}
diff --git a/frontend/app/[locale]/shop/orders/page.tsx b/frontend/app/[locale]/shop/orders/page.tsx
index 0330386d..9c5e485f 100644
--- a/frontend/app/[locale]/shop/orders/page.tsx
+++ b/frontend/app/[locale]/shop/orders/page.tsx
@@ -11,6 +11,8 @@ import { orderItems, orders } from '@/db/schema';
 import { Link } from '@/i18n/routing';
 import { getCurrentUser } from '@/lib/auth';
 import { logError } from '@/lib/logging';
+import { type CurrencyCode, formatMoney } from '@/lib/shop/currency';
+import { fromDbMoney } from '@/lib/shop/money';
 import {
   SHOP_FOCUS,
   SHOP_LINK_BASE,
@@ -32,7 +34,7 @@ type OrderCurrency = (typeof orders.$inferSelect)['currency'];
 function shortOrderId(id: string) {
   if (!id) return '';
   if (id.length <= 14) return id;
-  return `${id.slice(0, 8)}…${id.slice(-4)}`;
+  return `${id.slice(0, 8)}...${id.slice(-4)}`;
 }
 
 function formatDateTime(d: Date, locale: string) {
@@ -46,6 +48,19 @@ function formatDateTime(d: Date, locale: string) {
   }
 }
 
+function formatOrderTotal(
+  major: string,
+  currency: OrderCurrency,
+  locale: string
+): string {
+  try {
+    const currencyCode: CurrencyCode = currency === 'UAH' ? 'UAH' : 'USD';
+    return formatMoney(fromDbMoney(major), currencyCode, locale);
+  } catch {
+    return `${major} ${currency}`;
+  }
+}
+
 function statusLabel(
   status: PaymentStatus,
   t: Awaited<ReturnType<typeof getTranslations<'shop.orders'>>>
@@ -61,6 +76,8 @@ function statusLabel(
       return t('paymentStatus.failed');
     case 'refunded':
       return t('paymentStatus.refunded');
+    case 'needs_review':
+      return t('paymentStatus.needsReview');
     default:
       return String(status);
   }
@@ -74,6 +91,7 @@ function statusClassName(status: PaymentStatus) {
     case 'requires_payment':
     case 'refunded':
     case 'pending':
+    case 'needs_review':
     default:
       return 'border border-border bg-muted/40 text-foreground';
   }
@@ -187,10 +205,11 @@ export default async function MyOrdersPage({
     logError('My orders page failed', error);
     throw new Error('MY_ORDERS_LOAD_FAILED');
   }
+
   const NAV_LINK = cn(SHOP_NAV_LINK_BASE, 'text-lg', SHOP_FOCUS);
 
   const ORDER_HEADLINE_LINK = cn(
-    'block max-w-[24rem] truncate',
+    'block max-w-full',
     SHOP_LINK_BASE,
     SHOP_LINK_MD,
     SHOP_FOCUS
@@ -226,105 +245,77 @@ export default async function MyOrdersPage({
           </div>
         </section>
       ) : (
-        <section className="rounded-md border" aria-label="Orders list">
-          <div className="overflow-x-auto">
-            <table className="w-full border-collapse">
-              <caption className="sr-only">{t('table.caption')}</caption>
-
-              <thead className="border-border border-b">
-                <tr>
-                  <th
-                    scope="col"
-                    className="text-muted-foreground px-4 py-3 text-left text-xs font-semibold"
-                  >
-                    {t('table.items')}
-                  </th>
-                  <th
-                    scope="col"
-                    className="text-muted-foreground px-4 py-3 text-left text-xs font-semibold"
-                  >
-                    {t('table.date')}
-                  </th>
-                  <th
-                    scope="col"
-                    className="text-muted-foreground px-4 py-3 text-left text-xs font-semibold"
-                  >
-                    {t('table.status')}
-                  </th>
-                  <th
-                    scope="col"
-                    className="text-muted-foreground px-4 py-3 text-right text-xs font-semibold"
-                  >
-                    {t('table.total')}
-                  </th>
-                </tr>
-              </thead>
-
-              <tbody>
-                {rows.map(o => {
-                  const href = `/shop/orders/${o.id}`;
-                  const dt = o.createdAt.toISOString();
-
-                  const count = toCount(o.itemCount);
-
-                  const rawPrimary = o.primaryItemLabel?.trim() || null;
-                  const primary =
-                    rawPrimary && !looksLikeUuid(rawPrimary)
-                      ? rawPrimary
-                      : null;
-
-                  const headline = buildOrderHeadline(primary, count, o.id, t);
-
-                  return (
-                    <tr
-                      key={o.id}
-                      className="border-border hover:bg-muted/20 border-b last:border-b-0"
+        <section className="space-y-3" aria-label={t('table.caption')}>
+          {rows.map(o => {
+            const href = `/shop/orders/${o.id}`;
+            const dateTime = o.createdAt.toISOString();
+            const count = toCount(o.itemCount);
+            const rawPrimary = o.primaryItemLabel?.trim() || null;
+            const primary =
+              rawPrimary && !looksLikeUuid(rawPrimary) ? rawPrimary : null;
+            const headline = buildOrderHeadline(primary, count, o.id, t);
+            const totalLabel = formatOrderTotal(
+              o.totalAmount,
+              o.currency,
+              locale
+            );
+
+            return (
+              <article
+                key={o.id}
+                className="border-border bg-background hover:bg-muted/10 rounded-xl border p-4 shadow-sm transition-colors sm:p-5"
+              >
+                <div className="flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between">
+                  <div className="min-w-0 flex-1">
+                    <p className="text-muted-foreground text-xs font-medium tracking-[0.16em] uppercase">
+                      {t('card.orderNumber', { id: shortOrderId(o.id) })}
+                    </p>
+
+                    <Link
+                      href={href}
+                      className={cn(
+                        ORDER_HEADLINE_LINK,
+                        'mt-2 text-base leading-tight font-semibold sm:text-lg'
+                      )}
+                      title={headline}
+                      aria-label={t('table.openOrder', { id: o.id })}
                     >
-                      <th scope="row" className="px-4 py-3 text-left align-top">
-                        <Link
-                          href={href}
-                          className={ORDER_HEADLINE_LINK}
-                          title={headline}
-                          aria-label={t('table.openOrder', { id: o.id })}
-                        >
-                          {headline}
-                        </Link>
-
-                        <div className="text-muted-foreground mt-1 text-xs">
-                          <span className="sr-only">
-                            {t('table.orderId')}:{' '}
-                          </span>
-                          <span className="break-all">
-                            {shortOrderId(o.id)}
-                          </span>
-                        </div>
-                      </th>
-
-                      <td className="px-4 py-3 align-top text-sm">
-                        <time dateTime={dt}>
-                          {formatDateTime(o.createdAt, locale)}
-                        </time>
-                      </td>
-
-                      <td className="px-4 py-3 align-top">
-                        <span
-                          className={`inline-flex items-center rounded-full px-2.5 py-1 text-xs font-medium ${statusClassName(
-                            o.paymentStatus
-                          )}`}
-                        >
-                          {statusLabel(o.paymentStatus, t)}
-                        </span>
-                      </td>
-
-                      <td className="px-4 py-3 text-right align-top text-sm font-medium">
-                        {String(o.totalAmount)} {String(o.currency)}
-                      </td>
-                    </tr>
-                  );
-                })}
-              </tbody>
-            </table>
-          </div>
+                      <span className="line-clamp-2">{headline}</span>
+                    </Link>
+
+                    <div className="text-muted-foreground mt-3 flex flex-wrap items-center gap-x-4 gap-y-1 text-sm">
+                      <span>{t('card.itemsCount', { count })}</span>
+                      <time dateTime={dateTime}>
+                        {t('card.placedOn', {
+                          date: formatDateTime(o.createdAt, locale),
+                        })}
+                      </time>
+                    </div>
+                  </div>
+
+                  <div className="flex flex-col items-start gap-3 sm:items-end sm:text-right">
+                    <span
+                      className={cn(
+                        'inline-flex items-center rounded-full px-3 py-1 text-xs font-medium whitespace-nowrap',
+                        statusClassName(o.paymentStatus)
+                      )}
+                    >
+                      {statusLabel(o.paymentStatus, t)}
+                    </span>
+
+                    <div>
+                      <div className="text-muted-foreground text-xs tracking-[0.16em] uppercase">
+                        {t('table.total')}
+                      </div>
+                      <div className="mt-1 text-base font-semibold">
+                        {totalLabel}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </article>
+            );
+          })}
         </section>
       )}
     </main>
diff --git a/frontend/app/[locale]/shop/page.tsx b/frontend/app/[locale]/shop/page.tsx
index 4f923a1d..dc4bae0e 100644
--- a/frontend/app/[locale]/shop/page.tsx
+++ b/frontend/app/[locale]/shop/page.tsx
@@ -20,6 +20,9 @@ export const metadata: Metadata = {
     'DevLovers merch shop — browse products, add to cart, and checkout.',
 };
 
+export const runtime = 'nodejs';
+export const dynamic = 'force-dynamic';
+
 export default async function HomePage({
   params,
 }: {
@@ -52,7 +55,7 @@ export default async function HomePage({
             </h2>
 
             <Link
-              href="/shop/products?filter=newest"
+              href="/shop/products?sort=newest"
               className="group border-border text-muted-foreground hover:text-foreground focus-visible:ring-offset-background inline-flex items-center gap-2 rounded-md border bg-transparent px-4 py-2 text-xs font-semibold tracking-[0.25em] uppercase shadow-none transition-[transform,box-shadow,color,filter] duration-500 ease-out hover:-translate-y-0.5 hover:shadow-[var(--shop-card-shadow-hover)] hover:brightness-110 focus-visible:ring-2 focus-visible:ring-[color:var(--color-ring)] focus-visible:ring-offset-2 focus-visible:outline-none sm:text-sm"
               aria-label={t('viewAll')}
             >
diff --git a/frontend/app/[locale]/shop/products/[slug]/page.tsx b/frontend/app/[locale]/shop/products/[slug]/page.tsx
index 44113b8e..bfdf008d 100644
--- a/frontend/app/[locale]/shop/products/[slug]/page.tsx
+++ b/frontend/app/[locale]/shop/products/[slug]/page.tsx
@@ -17,6 +17,7 @@ export const metadata: Metadata = {
   title: 'Product name | DevLovers',
   description: 'Details, price, and availability for product.',
 };
+export const runtime = 'nodejs';
 export const dynamic = 'force-dynamic';
 
 export default async function ProductPage({
diff --git a/frontend/app/[locale]/shop/products/page.tsx b/frontend/app/[locale]/shop/products/page.tsx
index 96d90944..00121485 100644
--- a/frontend/app/[locale]/shop/products/page.tsx
+++ b/frontend/app/[locale]/shop/products/page.tsx
@@ -7,6 +7,7 @@ import { ProductFilters } from '@/components/shop/ProductFilters';
 import { ProductsToolbar } from '@/components/shop/ProductsToolbar';
 import { redirect } from '@/i18n/routing';
 import { CATALOG_PAGE_SIZE } from '@/lib/config/catalog';
+import { canonicalizePublicCatalogQuery } from '@/lib/shop/catalog-query';
 import { getCatalogProducts } from '@/lib/shop/data';
 import { catalogQuerySchema } from '@/lib/validation/shop';
 
@@ -15,6 +16,9 @@ export const metadata: Metadata = {
   description: 'Browse all DevLovers products, available sizes, and prices',
 };
 
+export const runtime = 'nodejs';
+export const dynamic = 'force-dynamic';
+
 type RawSearchParams = {
   category?: string;
   type?: string;
@@ -36,30 +40,16 @@ export default async function ProductsPage({
   const { locale } = await params;
   const resolvedSearchParams = (await searchParams) ?? {};
   const t = await getTranslations('shop.products');
+  const canonical = canonicalizePublicCatalogQuery(resolvedSearchParams);
 
-  const hasLegacyFilter = resolvedSearchParams.filter === 'new';
-  const needsCanonical = hasLegacyFilter;
-
-  if (needsCanonical) {
-    const qsParams = new URLSearchParams();
-
-    for (const [k, v] of Object.entries(resolvedSearchParams)) {
-      if (!v) continue;
-      if (k === 'filter') continue;
-      qsParams.set(k, v);
-    }
-
-    if (hasLegacyFilter && !resolvedSearchParams.sort) {
-      qsParams.set('sort', 'newest');
-    }
-
-    const qs = qsParams.toString();
+  if (canonical.needsCanonical) {
+    const qs = canonical.params.toString();
     const basePath = `/shop/products`;
 
     redirect({ href: qs ? `${basePath}?${qs}` : basePath, locale });
   }
 
-  const parsedParams = catalogQuerySchema.safeParse(resolvedSearchParams);
+  const parsedParams = catalogQuerySchema.safeParse(canonical.normalized);
 
   const parsed = parsedParams.success
     ? parsedParams.data
diff --git a/frontend/app/api/shop/admin/orders/[id]/cancel-payment/route.ts b/frontend/app/api/shop/admin/orders/[id]/cancel-payment/route.ts
index b76ca561..4799d623 100644
--- a/frontend/app/api/shop/admin/orders/[id]/cancel-payment/route.ts
+++ b/frontend/app/api/shop/admin/orders/[id]/cancel-payment/route.ts
@@ -17,6 +17,7 @@ import {
   PspUnavailableError,
 } from '@/lib/services/errors';
 import { cancelMonobankUnpaidPayment } from '@/lib/services/orders/monobank-cancel-payment';
+import { writeAdminAudit } from '@/lib/services/shop/events/write-admin-audit';
 import { orderIdParamSchema, orderSummarySchema } from '@/lib/validation/shop';
 
 function noStoreJson(body: unknown, init?: { status?: number }) {
@@ -69,7 +70,7 @@ export async function POST(
   let orderIdForLog: string | null = null;
 
   try {
-    await requireAdminApi(request);
+    const adminUser = await requireAdminApi(request);
 
     const csrfRes = requireAdminCsrf(request, 'admin:orders:cancel-payment');
     if (csrfRes) {
@@ -106,6 +107,42 @@ export async function POST(
 
     const orderSummary = orderSummarySchema.parse(result.order);
 
+    try {
+      await writeAdminAudit({
+        orderId: orderIdForLog,
+        actorUserId:
+          typeof adminUser?.id === 'string' && adminUser.id.trim().length > 0
+            ? adminUser.id
+            : null,
+        action: 'order_admin_action.cancel_payment',
+        targetType: 'order',
+        targetId: orderIdForLog,
+        requestId,
+        payload: {
+          action: 'cancel_payment',
+          paymentProvider: orderSummary.paymentProvider,
+          paymentStatus: orderSummary.paymentStatus,
+          fulfillmentStage: orderSummary.fulfillmentStage,
+          cancelStatus: result.cancel.status,
+          cancelExtRef: result.cancel.extRef,
+          deduped: result.cancel.deduped,
+        },
+        dedupeSeed: {
+          domain: 'order_admin_action',
+          action: 'cancel_payment',
+          orderId: orderIdForLog,
+        },
+      });
+    } catch (auditError) {
+      logError('admin_orders_cancel_payment_audit_failed', auditError, {
+        ...baseMeta,
+        code: 'ADMIN_AUDIT_FAILED',
+        orderId: orderIdForLog,
+        action: 'cancel_payment',
+        durationMs: Date.now() - startedAtMs,
+      });
+    }
+
     return noStoreJson({
       success: true,
       order: {
diff --git a/frontend/app/api/shop/admin/orders/[id]/refund/route.ts b/frontend/app/api/shop/admin/orders/[id]/refund/route.ts
index 15c26ea5..70952088 100644
--- a/frontend/app/api/shop/admin/orders/[id]/refund/route.ts
+++ b/frontend/app/api/shop/admin/orders/[id]/refund/route.ts
@@ -27,6 +27,7 @@ import {
   PspUnavailableError,
 } from '@/lib/services/errors';
 import { refundOrder } from '@/lib/services/orders';
+import { writeAdminAudit } from '@/lib/services/shop/events/write-admin-audit';
 import { orderIdParamSchema, orderSummarySchema } from '@/lib/validation/shop';
 
 function noStoreJson(body: unknown, init?: { status?: number }) {
@@ -149,16 +150,52 @@ export async function POST(
         durationMs: Date.now() - startedAtMs,
       });
 
-      return noStoreJson({
-        code: 'REFUND_DISABLED',
-        message: 'Refunds are disabled.',
-      }, { status: 409 });
+      return noStoreJson(
+        {
+          code: 'REFUND_DISABLED',
+          message: 'Refunds are disabled.',
+        },
+        { status: 409 }
+      );
     }
 
     const order = await refundOrder(orderIdForLog, { requestedBy: 'admin' });
 
     const orderSummary = orderSummarySchema.parse(order);
 
+    try {
+      await writeAdminAudit({
+        orderId: orderIdForLog,
+        actorUserId:
+          typeof adminUser?.id === 'string' && adminUser.id.trim().length > 0
+            ? adminUser.id
+            : null,
+        action: 'order_admin_action.refund',
+        targetType: 'order',
+        targetId: orderIdForLog,
+        requestId,
+        payload: {
+          action: 'refund',
+          paymentProvider: orderSummary.paymentProvider,
+          paymentStatus: orderSummary.paymentStatus,
+          fulfillmentStage: orderSummary.fulfillmentStage,
+        },
+        dedupeSeed: {
+          domain: 'order_admin_action',
+          action: 'refund',
+          orderId: orderIdForLog,
+        },
+      });
+    } catch (auditError) {
+      logError('admin_orders_refund_audit_failed', auditError, {
+        ...baseMeta,
+        code: 'ADMIN_AUDIT_FAILED',
+        orderId: orderIdForLog,
+        action: 'refund',
+        durationMs: Date.now() - startedAtMs,
+      });
+    }
+
     return noStoreJson({
       success: true,
       order: {
diff --git a/frontend/app/api/shop/admin/orders/[id]/shipping/route.ts b/frontend/app/api/shop/admin/orders/[id]/shipping/route.ts
index f062f564..8209330b 100644
--- a/frontend/app/api/shop/admin/orders/[id]/shipping/route.ts
+++ b/frontend/app/api/shop/admin/orders/[id]/shipping/route.ts
@@ -16,11 +16,16 @@ import {
   applyShippingAdminAction,
   ShippingAdminActionError,
 } from '@/lib/services/shop/shipping/admin-actions';
+import {
+  AdminOrderShippingEditError,
+  applyAdminOrderShippingEdit,
+} from '@/lib/services/shop/shipping/admin-edit';
 import {
   sanitizeShippingErrorForLog,
   sanitizeShippingLogMeta,
 } from '@/lib/services/shop/shipping/log-sanitizer';
 import { orderIdParamSchema } from '@/lib/validation/shop';
+import { adminOrderShippingEditSchema } from '@/lib/validation/shop-admin-shipping';
 
 export const runtime = 'nodejs';
 
@@ -198,3 +203,158 @@ export async function POST(
     );
   }
 }
+
+export async function PATCH(
+  request: NextRequest,
+  context: { params: Promise<{ id: string }> }
+) {
+  const startedAtMs = Date.now();
+  const requestId =
+    request.headers.get('x-request-id')?.trim() || crypto.randomUUID();
+  const baseMeta = {
+    requestId,
+    route: request.nextUrl.pathname,
+    method: request.method,
+  };
+  let orderIdForLog: string | null = null;
+
+  const blocked = guardBrowserSameOrigin(request);
+  if (blocked) {
+    logWarn('admin_orders_shipping_edit_origin_blocked', {
+      ...baseMeta,
+      code: 'ORIGIN_BLOCKED',
+      durationMs: Date.now() - startedAtMs,
+    });
+    blocked.headers.set('Cache-Control', 'no-store');
+    return blocked;
+  }
+
+  try {
+    const adminUser = await requireAdminApi(request);
+    const csrfRes = requireAdminCsrf(request, 'admin:orders:shipping:edit');
+    if (csrfRes) {
+      logWarn('admin_orders_shipping_edit_csrf_rejected', {
+        ...baseMeta,
+        code: 'CSRF_REJECTED',
+        durationMs: Date.now() - startedAtMs,
+      });
+      csrfRes.headers.set('Cache-Control', 'no-store');
+      return csrfRes;
+    }
+
+    const parsedParams = orderIdParamSchema.safeParse(await context.params);
+    if (!parsedParams.success) {
+      return noStoreJson(
+        {
+          code: 'INVALID_ORDER_ID',
+          message: 'Invalid order id.',
+        },
+        { status: 400 }
+      );
+    }
+
+    orderIdForLog = parsedParams.data.id;
+
+    let rawBody: unknown;
+    try {
+      rawBody = await request.json();
+    } catch {
+      return noStoreJson(
+        {
+          code: 'INVALID_PAYLOAD',
+          message: 'Invalid JSON body.',
+        },
+        { status: 400 }
+      );
+    }
+
+    const parsedPayload = adminOrderShippingEditSchema.safeParse(rawBody);
+    if (!parsedPayload.success) {
+      return noStoreJson(
+        {
+          code: 'INVALID_PAYLOAD',
+          message: 'Invalid payload.',
+        },
+        { status: 400 }
+      );
+    }
+
+    const result = await applyAdminOrderShippingEdit({
+      orderId: orderIdForLog,
+      shipping: parsedPayload.data,
+      actorUserId:
+        typeof adminUser?.id === 'string' && adminUser.id.trim().length > 0
+          ? adminUser.id
+          : null,
+      requestId,
+    });
+
+    return noStoreJson(
+      {
+        success: true,
+        changed: result.changed,
+        order: {
+          id: result.orderId,
+          shippingMethodCode: result.shippingMethodCode,
+        },
+      },
+      { status: 200 }
+    );
+  } catch (error) {
+    if (error instanceof AdminApiDisabledError) {
+      return noStoreJson(
+        { code: 'ADMIN_API_DISABLED', message: 'Admin API is disabled.' },
+        { status: 403 }
+      );
+    }
+
+    if (error instanceof AdminUnauthorizedError) {
+      return noStoreJson(
+        { code: error.code, message: 'Unauthorized.' },
+        { status: 401 }
+      );
+    }
+
+    if (error instanceof AdminForbiddenError) {
+      return noStoreJson(
+        { code: error.code, message: 'Forbidden.' },
+        { status: 403 }
+      );
+    }
+
+    if (error instanceof AdminOrderShippingEditError) {
+      logWarn('admin_orders_shipping_edit_rejected', {
+        ...baseMeta,
+        orderId: orderIdForLog,
+        code: error.code,
+        durationMs: Date.now() - startedAtMs,
+      });
+      return noStoreJson(
+        {
+          code: error.code,
+          message: error.message,
+        },
+        { status: error.status }
+      );
+    }
+
+    logError(
+      'admin_orders_shipping_edit_failed',
+      sanitizeShippingErrorForLog(error, 'Admin shipping edit failed.'),
+      sanitizeShippingLogMeta({
+        ...baseMeta,
+        orderId: orderIdForLog,
+        code: 'ADMIN_SHIPPING_EDIT_FAILED',
+        durationMs: Date.now() - startedAtMs,
+      })
+    );
+
+    return noStoreJson(
+      {
+        code: 'INTERNAL_ERROR',
+        message: 'Unable to update shipping details.',
+      },
+      { status: 500 }
+    );
+  }
+}
diff --git a/frontend/app/api/shop/catalog/route.ts b/frontend/app/api/shop/catalog/route.ts
index 35a5f8b9..ec5a99e6 100644
--- a/frontend/app/api/shop/catalog/route.ts
+++ b/frontend/app/api/shop/catalog/route.ts
@@ -4,6 +4,7 @@ import { NextRequest, NextResponse } from 'next/server';
 
 import { CATALOG_PAGE_SIZE } from '@/lib/config/catalog';
 import { logError, logWarn } from '@/lib/logging';
+import { canonicalizePublicCatalogQuery } from '@/lib/shop/catalog-query';
 import { getCatalogProducts } from '@/lib/shop/data';
 import { catalogQuerySchema } from '@/lib/validation/shop';
 
@@ -51,15 +52,10 @@ export async function GET(request: NextRequest) {
     request.nextUrl.searchParams.entries()
   ) as RawSearchParams;
 
-  const { locale, filter, ...rest } = raw;
+  const { locale, ...rest } = raw;
   const effectiveLocale = normalizeLocale(locale);
-
-  const normalizedRest: Record<string, string | undefined> = { ...rest };
-  if (filter === 'new' && !normalizedRest.sort) {
-    normalizedRest.sort = 'newest';
-  }
-
-  const parsed = catalogQuerySchema.safeParse(normalizedRest);
+  const canonical = canonicalizePublicCatalogQuery(rest);
+  const parsed = catalogQuerySchema.safeParse(canonical.normalized);
 
   if (!parsed.success) {
     logWarn('shop_catalog_invalid_query', {
diff --git a/frontend/components/shop/ProductFilters.tsx b/frontend/components/shop/ProductFilters.tsx
index 1d538a74..9ed9d988 100644
--- a/frontend/components/shop/ProductFilters.tsx
+++ b/frontend/components/shop/ProductFilters.tsx
@@ -5,7 +5,12 @@ import { useTranslations } from 'next-intl';
 import { useId } from 'react';
 
 import { usePathname, useRouter } from '@/i18n/routing';
-import { CATEGORIES, COLORS, PRODUCT_TYPES, SIZES } from '@/lib/config/catalog';
+import {
+  COLORS,
+  PRODUCT_TYPES,
+  SIZES,
+  STOREFRONT_CATEGORIES,
+} from '@/lib/config/catalog';
 import {
   SHOP_CHIP_BORDER_HOVER,
   SHOP_CHIP_HOVER,
@@ -59,7 +64,7 @@ export function ProductFilters() {
         </h3>
 
         <ul className="mt-4 space-y-2" role="list">
-          {CATEGORIES.map(cat => (
+          {STOREFRONT_CATEGORIES.map(cat => (
             <li key={cat.slug}>
               <button
                 type="button"
@@ -73,13 +78,7 @@ export function ProductFilters() {
                     : 'text-muted-foreground hover:text-accent active:text-accent'
                 )}
               >
-                {tCategories(
-                  cat.slug === 'new-arrivals'
-                    ? 'newArrivals'
-                    : cat.slug === 'best-sellers'
-                      ? 'bestSellers'
-                      : cat.slug
-                )}
+                {tCategories(cat.slug)}
               </button>
             </li>
           ))}
diff --git a/frontend/db/queries/shop/products.ts b/frontend/db/queries/shop/products.ts
index 7efda973..6ae8adb5 100644
--- a/frontend/db/queries/shop/products.ts
+++ b/frontend/db/queries/shop/products.ts
@@ -1,14 +1,4 @@
-import {
-  and,
-  asc,
-  count,
-  desc,
-  eq,
-  inArray,
-  or,
-  type SQL,
-  sql,
-} from 'drizzle-orm';
+import { and, asc, count, desc, eq, inArray, type SQL, sql } from 'drizzle-orm';
 
 import { db } from '@/db';
 import { productPrices, products } from '@/db/schema';
@@ -195,13 +185,7 @@ function buildWhereClause(options: {
   const conditions: SQL[] = [eq(products.isActive, true)];
 
   if (options.category && options.category !== 'all') {
-    if (options.category === 'new-arrivals') {
-      const clause = or(
-        eq(products.badge, 'NEW'),
-        eq(products.category, 'new-arrivals')
-      );
-      if (clause) conditions.push(clause);
-    } else if (options.category === 'sale') {
+    if (options.category === 'sale') {
       conditions.push(sql`${productPrices.originalPriceMinor} IS NOT NULL`);
     } else {
       conditions.push(eq(products.category, options.category));
@@ -227,16 +211,21 @@ function buildWhereClause(options: {
   return (and(...conditions) ?? conditions[0]) as SQL;
 }
 
-function applySorting(sort?: CatalogSort): SQL {
+function applySorting(sort?: CatalogSort): SQL[] {
   switch (sort) {
     case 'price-asc':
-      return asc(productPrices.price);
+      return [asc(productPrices.price), asc(products.id)];
     case 'price-desc':
-      return desc(productPrices.price);
+      return [desc(productPrices.price), asc(products.id)];
     case 'newest':
-      return desc(products.createdAt);
+      return [desc(products.createdAt), asc(products.id)];
+    case 'featured':
     default:
-      return desc(products.createdAt);
+      return [
+        desc(products.isFeatured),
+        desc(products.createdAt),
+        asc(products.id),
+      ];
   }
 }
 
@@ -279,7 +268,7 @@ export async function getActiveProductsPage(options: {
     .from(products)
     .innerJoin(productPrices, priceJoin(options.currency))
     .where(whereClause)
-    .orderBy(applySorting(options.sort))
+    .orderBy(...applySorting(options.sort))
     .limit(options.limit)
     .offset(options.offset);
 
diff --git a/frontend/lib/config/catalog.ts b/frontend/lib/config/catalog.ts
index a979c810..daa5cc13 100644
--- a/frontend/lib/config/catalog.ts
+++ b/frontend/lib/config/catalog.ts
@@ -8,6 +8,11 @@ export const CATEGORIES = [
   { slug: 'sale', label: 'Sale' },
 ] as const;
 
+export const STOREFRONT_CATEGORIES = CATEGORIES.filter(
+  category =>
+    category.slug !== 'best-sellers' && category.slug !== 'new-arrivals'
+);
+
 export const PRODUCT_TYPES = [
   { slug: 'accessories', label: 'Accessories' },
   { slug: 'shirts', label: 'Shirts' },
diff --git a/frontend/lib/env/server-env.ts b/frontend/lib/env/server-env.ts
index eb5d779e..6bd6c6e9 100644
--- a/frontend/lib/env/server-env.ts
+++ b/frontend/lib/env/server-env.ts
@@ -43,7 +43,10 @@ const GENERATED_FALLBACK_KEYS = new Set([
   'GITHUB_CLIENT_REDIRECT_URI_DEVELOP',
   'ENABLE_ADMIN_API',
   'NEXT_PUBLIC_ENABLE_ADMIN',
+  'PAYMENTS_ENABLED',
   'SHOP_STATUS_TOKEN_SECRET',
+  'SHOP_TERMS_VERSION',
+  'SHOP_PRIVACY_VERSION',
   'SHOP_MONOBANK_GPAY_ENABLED',
   'APP_ORIGIN',
   'APP_ADDITIONAL_ORIGINS',
diff --git a/frontend/lib/env/shop-legal.ts b/frontend/lib/env/shop-legal.ts
index 094d85d3..1f314c49 100644
--- a/frontend/lib/env/shop-legal.ts
+++ b/frontend/lib/env/shop-legal.ts
@@ -1,5 +1,7 @@
 import 'server-only';
 
+import { readServerEnv } from './server-env';
+
 const DEFAULT_TERMS_VERSION = 'terms-v1';
 const DEFAULT_PRIVACY_VERSION = 'privacy-v1';
 
@@ -16,11 +18,11 @@ export type ShopLegalVersions = {
 export function getShopLegalVersions(): ShopLegalVersions {
   return {
     termsVersion: readVersion(
-      process.env.SHOP_TERMS_VERSION,
+      readServerEnv('SHOP_TERMS_VERSION'),
       DEFAULT_TERMS_VERSION
     ),
     privacyVersion: readVersion(
-      process.env.SHOP_PRIVACY_VERSION,
+      readServerEnv('SHOP_PRIVACY_VERSION'),
       DEFAULT_PRIVACY_VERSION
     ),
   };
diff --git a/frontend/lib/services/orders/payment-intent.ts b/frontend/lib/services/orders/payment-intent.ts
index 7e6f2462..e183e596 100644
--- a/frontend/lib/services/orders/payment-intent.ts
+++ b/frontend/lib/services/orders/payment-intent.ts
@@ -70,7 +70,11 @@ export async function setOrderPaymentIntent({
         shippingStatus: existing.shippingStatus,
         shipmentStatus: fulfillmentSignals.shipmentStatus,
         returnStatus: fulfillmentSignals.returnStatus,
-      })
+      }),
+      {
+        shipmentStatus: fulfillmentSignals.shipmentStatus,
+        trackingNumber: existing.trackingNumber,
+      }
     );
   }
 
@@ -110,7 +114,11 @@ export async function setOrderPaymentIntent({
       shippingStatus: updated.shippingStatus,
       shipmentStatus: fulfillmentSignals.shipmentStatus,
       returnStatus: fulfillmentSignals.returnStatus,
-    })
+    }),
+    {
+      shipmentStatus: fulfillmentSignals.shipmentStatus,
+      trackingNumber: updated.trackingNumber,
+    }
   );
 }
 
diff --git a/frontend/lib/services/orders/summary.ts b/frontend/lib/services/orders/summary.ts
index 846fbeb8..db7caf62 100644
--- a/frontend/lib/services/orders/summary.ts
+++ b/frontend/lib/services/orders/summary.ts
@@ -64,13 +64,18 @@ type OrderSummaryRow = Pick<
   | 'paymentStatus'
   | 'paymentProvider'
   | 'paymentIntentId'
+  | 'trackingNumber'
   | 'createdAt'
 >;
 
 export function parseOrderSummary(
   order: OrderSummaryRow,
   items: OrderItemForSummary[],
-  fulfillmentStage: OrderSummaryWithMinor['fulfillmentStage']
+  fulfillmentStage: OrderSummaryWithMinor['fulfillmentStage'],
+  shipment: {
+    shipmentStatus?: string | null;
+    trackingNumber?: string | null;
+  } = {}
 ): OrderSummaryWithMinor {
   function readLegacyMoneyCentsOrThrow(
     value: unknown,
@@ -154,6 +159,8 @@ export function parseOrderSummary(
     fulfillmentStage,
     paymentProvider,
     paymentIntentId: order.paymentIntentId ?? undefined,
+    shipmentStatus: shipment.shipmentStatus ?? null,
+    trackingNumber: shipment.trackingNumber ?? order.trackingNumber ?? null,
     createdAt: order.createdAt,
     items: normalizedItems,
   };
@@ -177,6 +184,7 @@ export async function getOrderById(id: string): Promise<OrderDetail> {
       paymentStatus: orders.paymentStatus,
       paymentProvider: orders.paymentProvider,
       paymentIntentId: orders.paymentIntentId,
+      trackingNumber: orders.trackingNumber,
       createdAt: orders.createdAt,
       orderStatus: orders.status,
       shippingStatus: orders.shippingStatus,
@@ -196,7 +204,11 @@ export async function getOrderById(id: string): Promise<OrderDetail> {
       shippingStatus: order.shippingStatus,
       shipmentStatus: fulfillmentSignals.shipmentStatus,
       returnStatus: fulfillmentSignals.returnStatus,
-    })
+    }),
+    {
+      shipmentStatus: fulfillmentSignals.shipmentStatus,
+      trackingNumber: order.trackingNumber,
+    }
   );
 }
 
@@ -295,10 +307,12 @@ export async function getCheckoutPaymentPageOrderSummary(args: {
 
 export type OrderStatusLiteSummary = {
   id: string;
-  paymentStatus: string;
+  paymentStatus: OrderSummaryWithMinor['paymentStatus'];
   fulfillmentStage: OrderSummaryWithMinor['fulfillmentStage'];
+  shipmentStatus: string | null;
+  trackingNumber: string | null;
   totalAmountMinor: number;
-  currency: string;
+  currency: OrderSummaryWithMinor['currency'];
   itemsCount: number;
   updatedAt: Date;
 };
@@ -315,6 +329,7 @@ export async function getOrderStatusLiteSummary(
       totalAmountMinor: orders.totalAmountMinor,
       totalAmount: orders.totalAmount,
       currency: orders.currency,
+      trackingNumber: orders.trackingNumber,
       updatedAt: orders.updatedAt,
       shipmentStatus: latestShipmentStatusSql(orders.id),
       returnStatus: latestReturnStatusSql(orders.id),
@@ -331,6 +346,7 @@ export async function getOrderStatusLiteSummary(
       orders.totalAmountMinor,
       orders.totalAmount,
       orders.currency,
+      orders.trackingNumber,
       orders.updatedAt
     )
     .limit(1);
@@ -357,6 +373,12 @@ export async function getOrderStatusLiteSummary(
       returnStatus:
         typeof row.returnStatus === 'string' ? row.returnStatus : null,
     }),
+    shipmentStatus:
+      typeof row.shipmentStatus === 'string' ? row.shipmentStatus : null,
+    trackingNumber:
+      typeof row.trackingNumber === 'string' && row.trackingNumber.trim()
+        ? row.trackingNumber
+        : null,
     totalAmountMinor,
     currency: row.currency,
     itemsCount: Number.isFinite(row.itemsCount) ? row.itemsCount : 0,
diff --git a/frontend/lib/services/shop/shipping/admin-edit.ts b/frontend/lib/services/shop/shipping/admin-edit.ts
new file mode 100644
index 00000000..3bc74b71
--- /dev/null
+++ b/frontend/lib/services/shop/shipping/admin-edit.ts
@@ -0,0 +1,553 @@
+import 'server-only';
+
+import { and, eq, sql } from 'drizzle-orm';
+
+import { db } from '@/db';
+import { npCities, npWarehouses, orders, orderShipping } from '@/db/schema';
+import { writeAdminAudit } from '@/lib/services/shop/events/write-admin-audit';
+import { evaluateOrderShippingEligibility } from '@/lib/services/shop/shipping/eligibility';
+import type { AdminOrderShippingEditInput } from '@/lib/validation/shop-admin-shipping';
+
+type EditableShippingStateRow = {
+  order_id: string;
+  payment_status: string | null;
+  order_status: string | null;
+  inventory_status: string | null;
+  psp_status_reason: string | null;
+  shipping_required: boolean | null;
+  shipping_provider: string | null;
+  shipping_method_code: string | null;
+  shipping_status: string | null;
+  shipping_address: unknown;
+  shipment_id: string | null;
+  shipment_status: string | null;
+};
+
+type DbTx = Parameters<Parameters<typeof db.transaction>[0]>[0];
+
+type ShippingEditComparable = {
+  provider: 'nova_poshta';
+  methodCode: 'NP_WAREHOUSE' | 'NP_LOCKER' | 'NP_COURIER';
+  selection: {
+    cityRef: string | null;
+    warehouseRef: string | null;
+    addressLine1: string | null;
+    addressLine2: string | null;
+  };
+  recipient: {
+    fullName: string | null;
+    phone: string | null;
+    email: string | null;
+    comment: string | null;
+  };
+};
+
+export class AdminOrderShippingEditError extends Error {
+  code: string;
+  status: number;
+
+  constructor(code: string, message: string, status: number) {
+    super(message);
+    this.name = 'AdminOrderShippingEditError';
+    this.code = code;
+    this.status = status;
+  }
+}
+
+function invalid(code: string, message: string, status = 409) {
+  return new AdminOrderShippingEditError(code, message, status);
+}
+
+function readRows<T>(value: unknown): T[] {
+  if (Array.isArray(value)) return value as T[];
+  const maybe = value as { rows?: unknown };
+  if (Array.isArray(maybe.rows)) return maybe.rows as T[];
+  return [];
+}
+
+function first<T>(value: unknown): T | null {
+  return readRows<T>(value)[0] ?? null;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+
+function readString(value: unknown): string | null {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+
+function readQuoteSnapshot(raw: unknown): Record<string, unknown> | undefined {
+  if (!isRecord(raw) || !isRecord(raw.quote)) return undefined;
+  return raw.quote;
+}
+
+function toComparableSnapshot(
+  raw: unknown,
+  fallbackMethodCode: string | null
+): ShippingEditComparable | null {
+  const root = isRecord(raw) ? raw : {};
+  const selection = isRecord(root.selection) ? root.selection : {};
+  const recipient = isRecord(root.recipient) ? root.recipient : {};
+  const methodCode = readString(root.methodCode) ?? fallbackMethodCode;
+
+  if (
+    methodCode !== 'NP_WAREHOUSE' &&
+    methodCode !== 'NP_LOCKER' &&
+    methodCode !== 'NP_COURIER'
+  ) {
+    return null;
+  }
+
+  return {
+    provider: 'nova_poshta',
+    methodCode,
+    selection: {
+      cityRef: readString(selection.cityRef),
+      warehouseRef: readString(selection.warehouseRef),
+      addressLine1: readString(selection.addressLine1),
+      addressLine2: readString(selection.addressLine2),
+    },
+    recipient: {
+      fullName: readString(recipient.fullName),
+      phone: readString(recipient.phone),
+      email: readString(recipient.email),
+      comment: readString(recipient.comment),
+    },
+  };
+}
+
+function buildNextComparable(
+  input: AdminOrderShippingEditInput
+): ShippingEditComparable {
+  return {
+    provider: 'nova_poshta',
+    methodCode: input.methodCode,
+    selection: {
+      cityRef: input.selection.cityRef,
+      warehouseRef: input.selection.warehouseRef ?? null,
+      addressLine1: input.selection.addressLine1 ?? null,
+      addressLine2: input.selection.addressLine2 ?? null,
+    },
+    recipient: {
+      fullName: input.recipient.fullName,
+      phone: input.recipient.phone,
+      email: input.recipient.email ?? null,
+      comment: input.recipient.comment ?? null,
+    },
+  };
+}
+
+function snapshotsEqual(
+  left: ShippingEditComparable | null,
+  right: ShippingEditComparable
+): boolean {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
+
+function hasQuoteAffectingChange(
+  current: ShippingEditComparable | null,
+  next: ShippingEditComparable
+): boolean {
+  if (!current) return true;
+
+  return (
+    current.methodCode !== next.methodCode ||
+    current.selection.cityRef !== next.selection.cityRef ||
+    current.selection.warehouseRef !== next.selection.warehouseRef ||
+    current.selection.addressLine1 !== next.selection.addressLine1 ||
+    current.selection.addressLine2 !== next.selection.addressLine2
+  );
+}
+
+export function getAdminOrderShippingEditAvailability(args: {
+  shippingReady: boolean;
+  shippingStatus: string | null;
+  shipmentStatus: string | null;
+}): boolean {
+  // The persisted shipping_shipment_status enum does not include legacy/UI-only
+  // aliases such as "created", so eligibility is intentionally limited to the
+  // actual shipment states that can still be edited safely.
+  if (!args.shippingReady) return false;
+
+  if (
+    args.shippingStatus !== 'pending' &&
+    args.shippingStatus !== 'queued' &&
+    args.shippingStatus !== 'needs_attention'
+  ) {
+    return false;
+  }
+
+  return (
+    args.shipmentStatus === null ||
+    args.shipmentStatus === 'queued' ||
+    args.shipmentStatus === 'failed' ||
+    args.shipmentStatus === 'needs_attention'
+  );
+}
+
+async function loadEditableState(
+  executor: Pick<DbTx, 'execute'>,
+  orderId: string
+): Promise<EditableShippingStateRow | null> {
+  const result = await executor.execute<EditableShippingStateRow>(sql`
+    select
+      o.id as order_id,
+      o.payment_status,
+      o.status as order_status,
+      o.inventory_status,
+      o.psp_status_reason,
+      o.shipping_required,
+      o.shipping_provider,
+      o.shipping_method_code,
+      o.shipping_status,
+      os.shipping_address,
+      s.id as shipment_id,
+      s.status as shipment_status
+    from orders o
+    left join order_shipping os on os.order_id = o.id
+    left join shipping_shipments s on s.order_id = o.id
+    where o.id = ${orderId}::uuid
+    order by s.created_at desc nulls last
+    limit 1
+    for update of o
+  `);
+
+  const state = first<EditableShippingStateRow>(result);
+  if (!state?.shipment_id) {
+    return state;
+  }
+
+  const shipmentResult = await executor.execute<{
+    status: string | null;
+  }>(sql`
+    select status
+    from shipping_shipments
+    where id = ${state.shipment_id}::uuid
+    for update
+  `);
+  const lockedShipment = first<{ status: string | null }>(shipmentResult);
+
+  return {
+    ...state,
+    shipment_status: lockedShipment?.status ?? state.shipment_status,
+  };
+}
+
+function assertEditableState(
+  state: EditableShippingStateRow | null
+): asserts state is EditableShippingStateRow {
+  if (!state) {
+    throw new AdminOrderShippingEditError(
+      'ORDER_NOT_FOUND',
+      'Order not found.',
+      404
+    );
+  }
+
+  if (state.shipping_required !== true) {
+    throw invalid('SHIPPING_NOT_REQUIRED', 'Order does not require shipping.');
+  }
+
+  if (state.shipping_provider !== 'nova_poshta') {
+    throw invalid(
+      'SHIPPING_PROVIDER_UNSUPPORTED',
+      'Only Nova Poshta shipping can be edited.'
+    );
+  }
+
+  const shippingReady = evaluateOrderShippingEligibility({
+    paymentStatus: state.payment_status,
+    orderStatus: state.order_status,
+    inventoryStatus: state.inventory_status,
+    pspStatusReason: state.psp_status_reason,
+  }).ok;
+
+  if (
+    !getAdminOrderShippingEditAvailability({
+      shippingReady,
+      shippingStatus: state.shipping_status,
+      shipmentStatus: state.shipment_status,
+    })
+  ) {
+    throw invalid(
+      'SHIPPING_EDIT_NOT_ALLOWED',
+      'Shipping details cannot be edited in the current fulfillment state.'
+    );
+  }
+}
+
+async function resolveSnapshotData(args: {
+  executor: Pick<DbTx, 'select'>;
+  input: AdminOrderShippingEditInput;
+  existingSnapshot: unknown;
+  preserveQuote: boolean;
+}) {
+  const [city] = await args.executor
+    .select({
+      ref: npCities.ref,
+      nameUa: npCities.nameUa,
+      nameRu: npCities.nameRu,
+      area: npCities.area,
+      region: npCities.region,
+    })
+    .from(npCities)
+    .where(
+      and(
+        eq(npCities.ref, args.input.selection.cityRef),
+        eq(npCities.isActive, true)
+      )
+    )
+    .limit(1);
+
+  if (!city) {
+    throw invalid(
+      'INVALID_SHIPPING_ADDRESS',
+      'Selected city reference is invalid.',
+      400
+    );
+  }
+
+  let warehouse:
+    | {
+        ref: string;
+        name: string;
+        address: string | null;
+        isPostMachine: boolean;
+      }
+    | undefined;
+
+  if (
+    args.input.methodCode === 'NP_WAREHOUSE' ||
+    args.input.methodCode === 'NP_LOCKER'
+  ) {
+    const warehouseRef = args.input.selection.warehouseRef ?? null;
+    if (!warehouseRef) {
+      throw invalid(
+        'INVALID_SHIPPING_ADDRESS',
+        'Pickup point reference is required for the selected delivery method.',
+        400
+      );
+    }
+
+    [warehouse] = await args.executor
+      .select({
+        ref: npWarehouses.ref,
+        name: npWarehouses.name,
+        address: npWarehouses.address,
+        isPostMachine: npWarehouses.isPostMachine,
+      })
+      .from(npWarehouses)
+      .where(
+        and(
+          eq(npWarehouses.ref, warehouseRef),
+          eq(npWarehouses.cityRef, city.ref),
+          eq(npWarehouses.isActive, true)
+        )
+      )
+      .limit(1);
+
+    if (!warehouse) {
+      throw invalid(
+        'INVALID_SHIPPING_ADDRESS',
+        'Selected pickup point does not belong to the selected city.',
+        400
+      );
+    }
+
+    if (args.input.methodCode === 'NP_LOCKER' && !warehouse.isPostMachine) {
+      throw invalid(
+        'INVALID_SHIPPING_ADDRESS',
+        'Selected pickup point is not a parcel locker.',
+        400
+      );
+    }
+  }
+
+  const quote = args.preserveQuote
+    ? readQuoteSnapshot(args.existingSnapshot)
+    : undefined;
+
+  const snapshot: Record<string, unknown> = {
+    provider: 'nova_poshta',
+    methodCode: args.input.methodCode,
+    ...(quote ? { quote } : {}),
+    selection: {
+      cityRef: city.ref,
+      cityNameUa: city.nameUa,
+      cityNameRu: city.nameRu ?? null,
+      area: city.area ?? null,
+      region: city.region ?? null,
+      warehouseRef: warehouse?.ref ?? null,
+      warehouseName: warehouse?.name ?? null,
+      warehouseAddress: warehouse?.address ?? null,
+      addressLine1: args.input.selection.addressLine1 ?? null,
+      addressLine2: args.input.selection.addressLine2 ?? null,
+    },
+    recipient: {
+      fullName: args.input.recipient.fullName,
+      phone: args.input.recipient.phone,
+      email: args.input.recipient.email ?? null,
+      comment: args.input.recipient.comment ?? null,
+    },
+  };
+
+  return {
+    snapshot,
+    methodCode: args.input.methodCode,
+  };
+}
+
+export type AdminOrderShippingEditResult = {
+  orderId: string;
+  shippingMethodCode: 'NP_WAREHOUSE' | 'NP_LOCKER' | 'NP_COURIER';
+  changed: boolean;
+};
+
+export async function applyAdminOrderShippingEdit(args: {
+  orderId: string;
+  shipping: AdminOrderShippingEditInput;
+  actorUserId: string | null;
+  requestId: string;
+}): Promise<AdminOrderShippingEditResult> {
+  return db.transaction(async tx => {
+    const state = await loadEditableState(tx, args.orderId);
+    assertEditableState(state);
+
+    const currentComparable = toComparableSnapshot(
+      state.shipping_address,
+      state.shipping_method_code
+    );
+    const nextComparable = buildNextComparable(args.shipping);
+    const preserveQuote = !hasQuoteAffectingChange(
+      currentComparable,
+      nextComparable
+    );
+
+    if (snapshotsEqual(currentComparable, nextComparable)) {
+      return {
+        orderId: state.order_id,
+        shippingMethodCode: args.shipping.methodCode,
+        changed: false,
+      };
+    }
+
+    const resolved = await resolveSnapshotData({
+      executor: tx,
+      input: args.shipping,
+      existingSnapshot: state.shipping_address,
+      preserveQuote,
+    });
+
+    const now = new Date();
+    const [updatedOrder] = await tx
+      .update(orders)
+      .set({
+        shippingProvider: 'nova_poshta',
+        shippingMethodCode: resolved.methodCode,
+        updatedAt: now,
+      })
+      .where(
+        and(
+          eq(orders.id, args.orderId),
+          eq(orders.shippingRequired, true),
+          eq(orders.shippingProvider, 'nova_poshta'),
+          sql`${orders.shippingStatus} is not distinct from ${state.shipping_status}`
+        )
+      )
+      .returning({ id: orders.id });
+
+    if (!updatedOrder) {
+      throw invalid(
+        'SHIPPING_EDIT_NOT_ALLOWED',
+        'Shipping details cannot be edited in the current fulfillment state.'
+      );
+    }
+
+    await tx
+      .insert(orderShipping)
+      .values({
+        orderId: args.orderId,
+        shippingAddress: resolved.snapshot,
+        updatedAt: now,
+      })
+      .onConflictDoUpdate({
+        target: orderShipping.orderId,
+        set: {
+          shippingAddress: resolved.snapshot,
+          updatedAt: now,
+        },
+      });
+
+    const fromMethodCode =
+      currentComparable?.methodCode ?? state.shipping_method_code ?? null;
+    const fromCityRef = currentComparable?.selection.cityRef ?? null;
+    const toCityRef = nextComparable.selection.cityRef;
+    const fromWarehouseRef = currentComparable?.selection.warehouseRef ?? null;
+    const toWarehouseRef = nextComparable.selection.warehouseRef;
+    const addressChanged =
+      (currentComparable?.selection.addressLine1 ?? null) !==
+        nextComparable.selection.addressLine1 ||
+      (currentComparable?.selection.addressLine2 ?? null) !==
+        nextComparable.selection.addressLine2;
+    const recipientChanged = {
+      fullName:
+        (currentComparable?.recipient.fullName ?? null) !==
+        nextComparable.recipient.fullName,
+      phone:
+        (currentComparable?.recipient.phone ?? null) !==
+        nextComparable.recipient.phone,
+      email:
+        (currentComparable?.recipient.email ?? null) !==
+        nextComparable.recipient.email,
+      comment:
+        (currentComparable?.recipient.comment ?? null) !==
+        nextComparable.recipient.comment,
+    };
+
+    await writeAdminAudit(
+      {
+        orderId: args.orderId,
+        actorUserId: args.actorUserId,
+        action: 'order_admin_action.edit_shipping',
+        targetType: 'order',
+        targetId: args.orderId,
+        requestId: args.requestId,
+        payload: {
+          action: 'edit_shipping',
+          shippingProvider: 'nova_poshta',
+          fromMethodCode,
+          toMethodCode: nextComparable.methodCode,
+          fromCityRef,
+          toCityRef,
+          fromWarehouseRef,
+          toWarehouseRef,
+          addressChanged,
+          recipientChanged,
+        },
+        dedupeSeed: {
+          domain: 'order_admin_action',
+          action: 'edit_shipping',
+          orderId: args.orderId,
+          requestId: args.requestId,
+          fromMethodCode,
+          toMethodCode: nextComparable.methodCode,
+          fromCityRef,
+          toCityRef,
+          fromWarehouseRef,
+          toWarehouseRef,
+        },
+        occurredAt: now,
+      },
+      { db: tx }
+    );
+
+    return {
+      orderId: args.orderId,
+      shippingMethodCode: resolved.methodCode,
+      changed: true,
+    };
+  });
+}
diff --git a/frontend/lib/shop/catalog-query.ts b/frontend/lib/shop/catalog-query.ts
new file mode 100644
index 00000000..45e441b1
--- /dev/null
+++ b/frontend/lib/shop/catalog-query.ts
@@ -0,0 +1,34 @@
+export type PublicCatalogQuery = {
+  category?: string;
+  type?: string;
+  color?: string;
+  size?: string;
+  sort?: string;
+  page?: string;
+  limit?: string;
+  filter?: string;
+};
+
+export function canonicalizePublicCatalogQuery(raw: PublicCatalogQuery) {
+  const params = new URLSearchParams();
+  const hasLegacyNewestFilter = raw.filter === 'new';
+  const hasLegacyNewArrivalsCategory = raw.category === 'new-arrivals';
+  const needsCanonical = hasLegacyNewestFilter || hasLegacyNewArrivalsCategory;
+
+  for (const [key, value] of Object.entries(raw)) {
+    if (!value) continue;
+    if (key === 'filter') continue;
+    if (key === 'category' && value === 'new-arrivals') continue;
+    params.set(key, value);
+  }
+
+  if (hasLegacyNewArrivalsCategory || (hasLegacyNewestFilter && !raw.sort)) {
+    params.set('sort', 'newest');
+  }
+
+  return {
+    needsCanonical,
+    params,
+    normalized: Object.fromEntries(params.entries()) as Record<string, string>,
+  };
+}
diff --git a/frontend/lib/shop/data.ts b/frontend/lib/shop/data.ts
index 7d8d5e73..c3fa742a 100644
--- a/frontend/lib/shop/data.ts
+++ b/frontend/lib/shop/data.ts
@@ -2,10 +2,9 @@ import 'server-only';
 
 import {
   getActiveProductsPage,
-  getFeaturedProducts,
+  getPublicProductBaseBySlug,
   getPublicProductBySlug,
 } from '@/db/queries/shop/products';
-import { getPublicProductBaseBySlug } from '@/db/queries/shop/products';
 import {
   CATALOG_PAGE_SIZE,
   type CatalogSort,
@@ -412,32 +411,6 @@ export async function getProductDetail(
 export async function getHomepageContent(
   locale: string = 'en'
 ): Promise<HomepageContent> {
-  const currency = resolveCurrencyFromLocale(locale);
-
-  const featured: DbProduct[] = await getFeaturedProducts(currency, 4);
-
-  const featuredProducts = featured
-    .map(mapToShopProduct)
-    .filter((product): product is ShopProduct => product !== null);
-
-  const fillTo = (
-    primary: ShopProduct[],
-    fallback: ShopProduct[],
-    count: number
-  ) => {
-    const used = new Set(primary.map(p => p.id));
-    const merged = [...primary];
-
-    for (const p of fallback) {
-      if (merged.length >= count) break;
-      if (used.has(p.id)) continue;
-      used.add(p.id);
-      merged.push(p);
-    }
-
-    return merged.slice(0, count);
-  };
-
   const newestCatalog = await getCatalogProducts(
     {
       category: 'all',
@@ -448,7 +421,7 @@ export async function getHomepageContent(
     locale
   );
 
-  const newArrivals = fillTo(featuredProducts, newestCatalog.products, 4);
+  const newArrivals = newestCatalog.products.slice(0, 4);
 
   return {
     newArrivals,
diff --git a/frontend/lib/shop/guest-shipment-status.ts b/frontend/lib/shop/guest-shipment-status.ts
new file mode 100644
index 00000000..c31512db
--- /dev/null
+++ b/frontend/lib/shop/guest-shipment-status.ts
@@ -0,0 +1,29 @@
+type TranslationFn = (key: string) => string;
+
+export function formatGuestShipmentStatus(
+  value: string | null | undefined,
+  t: TranslationFn
+): string | null {
+  const resolve = (key: string, fallback: string) => {
+    try {
+      return t(key);
+    } catch {
+      return fallback;
+    }
+  };
+
+  switch (value) {
+    case 'queued':
+      return resolve('shipmentStatuses.queued', 'Queued');
+    case 'processing':
+      return resolve('shipmentStatuses.processing', 'Processing');
+    case 'succeeded':
+      return resolve('shipmentStatuses.succeeded', 'Succeeded');
+    case 'failed':
+      return resolve('shipmentStatuses.failed', 'Failed');
+    case 'needs_attention':
+      return resolve('shipmentStatuses.needsAttention', 'Needs attention');
+    default:
+      return null;
+  }
+}
diff --git a/frontend/lib/tests/shop/admin-csrf-contract.test.ts b/frontend/lib/tests/shop/admin-csrf-contract.test.ts
index 177941cf..48373352 100644
--- a/frontend/lib/tests/shop/admin-csrf-contract.test.ts
+++ b/frontend/lib/tests/shop/admin-csrf-contract.test.ts
@@ -1,8 +1,15 @@
 import { NextRequest } from 'next/server';
 import { describe, expect, it, vi } from 'vitest';
 
+process.env.AUTH_SECRET ??= 'test_auth_secret_for_admin_csrf_contract';
+
+vi.mock('@/lib/auth', () => ({}));
+
 import { POST as postCancelPayment } from '@/app/api/shop/admin/orders/[id]/cancel-payment/route';
-import { POST as postShippingAction } from '@/app/api/shop/admin/orders/[id]/shipping/route';
+import {
+  PATCH as patchShippingEdit,
+  POST as postShippingAction,
+} from '@/app/api/shop/admin/orders/[id]/shipping/route';
 import { PATCH as patchStatus } from '@/app/api/shop/admin/products/[id]/status/route';
 
 vi.mock('@/lib/auth/admin', () => {
@@ -108,4 +115,44 @@ describe('P0-SEC: admin CSRF required for mutating endpoints', () => {
       else process.env.CSRF_SECRET = prev;
     }
   });
+
+  it('admin shipping edit: missing CSRF => 403 CSRF_MISSING', async () => {
+    const prev = process.env.CSRF_SECRET;
+    try {
+      process.env.CSRF_SECRET = 'test_csrf_secret';
+
+      const req = new NextRequest(
+        new Request('http://localhost/api/shop/admin/orders/x/shipping', {
+          method: 'PATCH',
+          headers: {
+            origin: 'http://localhost:3000',
+            'content-type': 'application/json',
+          },
+          body: JSON.stringify({
+            provider: 'nova_poshta',
+            methodCode: 'NP_WAREHOUSE',
+            selection: {
+              cityRef: 'city-ref-1',
+              warehouseRef: 'wh-ref-1',
+            },
+            recipient: {
+              fullName: 'Test User',
+              phone: '+380501112233',
+            },
+          }),
+        })
+      );
+
+      const res = await patchShippingEdit(req, {
+        params: Promise.resolve({ id: '11111111-1111-1111-1111-111111111111' }),
+      });
+
+      expect(res.status).toBe(403);
+      const body = await res.json();
+      expect(body.code).toBe('CSRF_MISSING');
+    } finally {
+      if (prev === undefined) delete process.env.CSRF_SECRET;
+      else process.env.CSRF_SECRET = prev;
+    }
+  });
 });
diff --git a/frontend/lib/tests/shop/admin-order-detail-customer-summary.test.ts b/frontend/lib/tests/shop/admin-order-detail-customer-summary.test.ts
index de2662b8..6e4b44c3 100644
--- a/frontend/lib/tests/shop/admin-order-detail-customer-summary.test.ts
+++ b/frontend/lib/tests/shop/admin-order-detail-customer-summary.test.ts
@@ -125,6 +125,26 @@ vi.mock('@/app/[locale]/admin/shop/orders/[id]/ShippingActions', () => ({
     ),
 }));
 
+vi.mock('@/app/[locale]/admin/shop/orders/[id]/ShippingEditForm', () => ({
+  ShippingEditForm: ({
+    orderId,
+    initialShipping,
+  }: {
+    orderId: string;
+    initialShipping: { methodCode: string; cityRef: string };
+  }) =>
+    createElement(
+      'div',
+      {
+        'data-testid': 'shipping-edit-form',
+        'data-order-id': orderId,
+        'data-method-code': initialShipping.methodCode,
+        'data-city-ref': initialShipping.cityRef,
+      },
+      'shipping-edit-form'
+    ),
+}));
+
 vi.mock('@/app/[locale]/admin/shop/orders/[id]/RefundButton', () => ({
   RefundButton: ({ orderId }: { orderId: string }) =>
     createElement(
@@ -171,7 +191,7 @@ function baseOrderDetail(
     shippingStatus: 'label_created',
     trackingNumber: 'TRACK-123',
     shippingProviderRef: 'ref-123',
-    shipmentStatus: 'created',
+    shipmentStatus: 'queued',
     shipmentAttemptCount: 1,
     shipmentLastErrorCode: null,
     shipmentLastErrorMessage: null,
@@ -272,6 +292,7 @@ describe('admin order detail customer summary', () => {
     expect(html).toContain('Customer summary');
     expect(html).toContain('Admin actions');
     expect(html).toContain('shipping-actions');
+    expect(html).not.toContain('shipping-edit-form');
     expect(html).toContain('refund-button');
     expect(html).not.toContain('cancel-payment-button');
     expect(html).toContain('Admin Customer');
@@ -301,6 +322,7 @@ describe('admin order detail customer summary', () => {
         customerAccountName: null,
         customerAccountEmail: null,
         shippingStatus: null,
+        shipmentStatus: 'processing',
         trackingNumber: null,
         paymentIntentId: null,
         shippingAddress: {
@@ -364,6 +386,46 @@ describe('admin order detail customer summary', () => {
     expect(html).not.toContain('customer@example.com');
   });
 
+  it('renders the shipping editor when the order is still in an editable shipping state', async () => {
+    getAdminOrderDetailMock.mockResolvedValue(
+      baseOrderDetail({
+        shippingStatus: 'pending',
+        shipmentStatus: null,
+        shippingAddress: {
+          provider: 'nova_poshta',
+          methodCode: 'NP_WAREHOUSE',
+          selection: {
+            cityRef: 'city-ref-1',
+            cityNameUa: 'Kyiv',
+            warehouseRef: 'wh-ref-1',
+            warehouseName: 'Warehouse 12',
+          },
+          recipient: {
+            fullName: 'Ivan Petrenko',
+            phone: '+380501112233',
+          },
+        },
+      })
+    );
+
+    const html = renderToStaticMarkup(
+      await OrderDetailPage({
+        params: Promise.resolve({
+          locale: 'en',
+          id: '550e8400-e29b-41d4-a716-446655440000',
+        }),
+      })
+    );
+
+    expect(html).toContain('Edit shipping details');
+    expect(html).toContain('shipping-edit-form');
+    expect(html).toContain(
+      'data-order-id="550e8400-e29b-41d4-a716-446655440000"'
+    );
+    expect(html).toContain('data-method-code="NP_WAREHOUSE"');
+    expect(html).toContain('data-city-ref="city-ref-1"');
+  });
+
   it('renders account-email-only registered snapshots once without duplicate secondary line', async () => {
     getAdminOrderDetailMock.mockResolvedValue(
       baseOrderDetail({
diff --git a/frontend/lib/tests/shop/admin-order-detail-history.test.ts b/frontend/lib/tests/shop/admin-order-detail-history.test.ts
index 2d5766da..cf0354f2 100644
--- a/frontend/lib/tests/shop/admin-order-detail-history.test.ts
+++ b/frontend/lib/tests/shop/admin-order-detail-history.test.ts
@@ -106,6 +106,10 @@ vi.mock('@/app/[locale]/admin/shop/orders/[id]/ShippingActions', () => ({
   ShippingActions: () => createElement('div', {}, 'shipping-actions'),
 }));
 
+vi.mock('@/app/[locale]/admin/shop/orders/[id]/ShippingEditForm', () => ({
+  ShippingEditForm: () => createElement('div', {}, 'shipping-edit-form'),
+}));
+
 vi.mock('@/app/[locale]/admin/shop/orders/[id]/RefundButton', () => ({
   RefundButton: () => createElement('div', {}, 'refund-button'),
 }));
@@ -142,7 +146,7 @@ function baseOrderDetail(
     shippingStatus: 'label_created',
     trackingNumber: 'TRACK-123',
     shippingProviderRef: 'ref-123',
-    shipmentStatus: 'created',
+    shipmentStatus: 'queued',
     shipmentAttemptCount: 1,
     shipmentLastErrorCode: null,
     shipmentLastErrorMessage: null,
@@ -222,19 +226,49 @@ describe('admin order detail history', () => {
         requestId: null,
         fromShippingStatus: 'shipped',
         toShippingStatus: 'delivered',
-        fromShipmentStatus: 'created',
+        fromShipmentStatus: 'queued',
+      }),
+      baseHistoryEntry({
+        id: 'history-3',
+        action: 'refund',
+        requestId: 'req-refund',
+        fromShippingStatus: null,
+        toShippingStatus: null,
+        fromShipmentStatus: null,
+      }),
+      baseHistoryEntry({
+        id: 'history-4',
+        action: 'cancel_payment',
+        requestId: 'req-cancel-payment',
+        fromShippingStatus: null,
+        toShippingStatus: null,
+        fromShipmentStatus: null,
+      }),
+      baseHistoryEntry({
+        id: 'history-5',
+        action: 'edit_shipping',
+        requestId: 'req-edit-shipping',
+        fromShippingStatus: null,
+        toShippingStatus: null,
+        fromShipmentStatus: null,
       }),
     ]);
 
     expect(html).toContain('History');
     expect(html).toContain('Marked as shipped');
     expect(html).toContain('Completed order');
+    expect(html).toContain('Requested refund');
+    expect(html).toContain('Canceled unpaid payment');
+    expect(html).toContain('Edited shipping details');
     expect(html).toContain('Shipping: Pending -&gt; Label created');
     expect(html).toContain('Shipment state: Succeeded');
     expect(html).toContain('Request: req-1');
+    expect(html).toContain('Request: req-refund');
+    expect(html).toContain('Request: req-cancel-payment');
+    expect(html).toContain('Request: req-edit-shipping');
     expect(html).toContain('Legacy history');
     expect(html).toContain('Shipping: Shipped -&gt; Delivered');
-    expect(html).toContain('Shipment state: Created');
+    expect(html).toContain('Shipment state: Queued');
   });
 
   it('renders empty history safely', async () => {
diff --git a/frontend/lib/tests/shop/admin-order-detail-operational-actions.test.ts b/frontend/lib/tests/shop/admin-order-detail-operational-actions.test.ts
index 7387ca23..798a6dd8 100644
--- a/frontend/lib/tests/shop/admin-order-detail-operational-actions.test.ts
+++ b/frontend/lib/tests/shop/admin-order-detail-operational-actions.test.ts
@@ -125,6 +125,10 @@ vi.mock('@/app/[locale]/admin/shop/orders/[id]/ShippingActions', () => ({
     ),
 }));
 
+vi.mock('@/app/[locale]/admin/shop/orders/[id]/ShippingEditForm', () => ({
+  ShippingEditForm: () => createElement('div', {}, 'shipping-edit-form'),
+}));
+
 vi.mock('@/app/[locale]/admin/shop/orders/[id]/RefundButton', () => ({
   RefundButton: ({ orderId }: { orderId: string }) =>
     createElement(
@@ -171,7 +175,7 @@ function baseOrderDetail(
     shippingStatus: 'label_created',
     trackingNumber: 'TRACK-123',
     shippingProviderRef: 'ref-123',
-    shipmentStatus: 'created',
+    shipmentStatus: 'queued',
     shipmentAttemptCount: 1,
     shipmentLastErrorCode: null,
     shipmentLastErrorMessage: null,
@@ -230,7 +234,7 @@ describe('admin order detail operational actions', () => {
       getAdminOrderShippingActionVisibility({
         shippingReady: true,
         shippingStatus: 'label_created',
-        shipmentStatus: 'created',
+        shipmentStatus: 'queued',
       })
     ).toEqual({
       recoverInitialShipment: false,
@@ -251,7 +255,7 @@ describe('admin order detail operational actions', () => {
     expect(html).not.toContain('>Complete<');
   });
 
-  it('renders cancel-payment control and suppresses duplicate generic cancel for Monobank unpaid orders', async () => {
+  it('renders cancel-payment control for Monobank unpaid orders', async () => {
     const html = await renderOrder({
       status: 'CREATED',
       inventoryStatus: 'none',
@@ -269,7 +273,6 @@ describe('admin order detail operational actions', () => {
     expect(html).toContain('cancel-payment-button');
     expect(html).not.toContain('refund-button');
     expect(html).not.toContain('shipping-actions');
-    expect(html).not.toContain('>Cancel<');
   });
 
   it('renders confirm as a lifecycle action when it is the only eligible operational action', async () => {
diff --git a/frontend/lib/tests/shop/admin-order-payment-audit-routes.test.ts b/frontend/lib/tests/shop/admin-order-payment-audit-routes.test.ts
new file mode 100644
index 00000000..8d884fb7
--- /dev/null
+++ b/frontend/lib/tests/shop/admin-order-payment-audit-routes.test.ts
@@ -0,0 +1,321 @@
+import { NextRequest } from 'next/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import type { WriteAdminAuditArgs } from '@/lib/services/shop/events/write-admin-audit';
+
+const adminUser = {
+  id: 'admin_order_audit_1',
+  role: 'admin',
+};
+
+const refundOrderMock = vi.hoisted(() => vi.fn());
+const cancelMonobankUnpaidPaymentMock = vi.hoisted(() => vi.fn());
+const logErrorMock = vi.hoisted(() => vi.fn());
+const writeAdminAuditMock = vi.hoisted(() =>
+  vi.fn(async (..._call: [WriteAdminAuditArgs, { db?: unknown }?]) => {
+    void _call;
+    return {
+      inserted: true,
+      dedupeKey: 'admin_audit:v1:test',
+      id: 'audit_row_1',
+    };
+  })
+);
+
+vi.mock('@/lib/auth/admin', () => {
+  class AdminApiDisabledError extends Error {
+    code = 'ADMIN_API_DISABLED' as const;
+  }
+  class AdminUnauthorizedError extends Error {
+    code = 'ADMIN_UNAUTHORIZED' as const;
+  }
+  class AdminForbiddenError extends Error {
+    code = 'ADMIN_FORBIDDEN' as const;
+  }
+
+  return {
+    AdminApiDisabledError,
+    AdminUnauthorizedError,
+    AdminForbiddenError,
+    requireAdminApi: vi.fn(async () => adminUser),
+  };
+});
+
+vi.mock('@/lib/security/admin-csrf', () => ({
+  requireAdminCsrf: vi.fn(() => null),
+}));
+
+vi.mock('@/lib/security/rate-limit', async () => {
+  const actual = await vi.importActual<any>('@/lib/security/rate-limit');
+  return {
+    ...actual,
+    getRateLimitSubject: vi.fn(() => 'rl_admin_order_audit_test'),
+    enforceRateLimit: vi.fn(async () => ({ ok: true, retryAfterSeconds: 0 })),
+  };
+});
+
+vi.mock('@/lib/logging', async () => {
+  const actual = await vi.importActual<any>('@/lib/logging');
+  return {
+    ...actual,
+    logWarn: () => {},
+    logError: (...args: unknown[]) => logErrorMock(...args),
+  };
+});
+
+vi.mock('@/lib/services/orders', () => ({
+  refundOrder: refundOrderMock,
+}));
+
+vi.mock('@/lib/services/orders/monobank-cancel-payment', () => ({
+  cancelMonobankUnpaidPayment: cancelMonobankUnpaidPaymentMock,
+}));
+
+vi.mock('@/lib/services/shop/events/write-admin-audit', () => ({
+  writeAdminAudit: writeAdminAuditMock,
+}));
+
+describe('admin order payment audit routes', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('refund route writes canonical order audit after successful refund request', async () => {
+    const orderId = '550e8400-e29b-41d4-a716-446655440000';
+    const requestId = 'req_refund_route_audit';
+
+    refundOrderMock.mockResolvedValue({
+      id: orderId,
+      totalAmountMinor: 2500,
+      totalAmount: 25,
+      currency: 'USD',
+      paymentStatus: 'paid',
+      fulfillmentStage: 'processing',
+      paymentProvider: 'stripe',
+      paymentIntentId: 'pi_test_123',
+      createdAt: new Date('2026-03-31T12:00:00.000Z'),
+      items: [],
+      pspStatusReason: 'REFUND_REQUESTED',
+    });
+
+    const { POST } =
+      await import('@/app/api/shop/admin/orders/[id]/refund/route');
+    const request = new NextRequest(
+      `http://localhost/api/shop/admin/orders/${orderId}/refund`,
+      {
+        method: 'POST',
+        headers: {
+          origin: 'http://localhost:3000',
+          'x-request-id': requestId,
+        },
+      }
+    );
+
+    const response = await POST(request, {
+      params: Promise.resolve({ id: orderId }),
+    });
+
+    expect(response.status).toBe(200);
+    expect(writeAdminAuditMock).toHaveBeenCalledTimes(1);
+    expect(writeAdminAuditMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        orderId,
+        actorUserId: adminUser.id,
+        action: 'order_admin_action.refund',
+        targetType: 'order',
+        targetId: orderId,
+        requestId,
+        payload: expect.objectContaining({
+          action: 'refund',
+          paymentProvider: 'stripe',
+          paymentStatus: 'paid',
+          fulfillmentStage: 'processing',
+        }),
+        dedupeSeed: {
+          domain: 'order_admin_action',
+          action: 'refund',
+          orderId,
+        },
+      })
+    );
+  });
+
+  it('refund route keeps 200 success when audit persistence fails after refund succeeds', async () => {
+    const orderId = '550e8400-e29b-41d4-a716-446655440010';
+    const requestId = 'req_refund_route_audit_nonfatal';
+    const auditError = new Error('audit write failed after refund');
+
+    refundOrderMock.mockResolvedValue({
+      id: orderId,
+      totalAmountMinor: 2500,
+      totalAmount: 25,
+      currency: 'USD',
+      paymentStatus: 'paid',
+      fulfillmentStage: 'processing',
+      paymentProvider: 'stripe',
+      paymentIntentId: 'pi_test_456',
+      createdAt: new Date('2026-03-31T12:00:00.000Z'),
+      items: [],
+      pspStatusReason: 'REFUND_REQUESTED',
+    });
+    writeAdminAuditMock.mockRejectedValueOnce(auditError);
+
+    const { POST } =
+      await import('@/app/api/shop/admin/orders/[id]/refund/route');
+    const request = new NextRequest(
+      `http://localhost/api/shop/admin/orders/${orderId}/refund`,
+      {
+        method: 'POST',
+        headers: {
+          origin: 'http://localhost:3000',
+          'x-request-id': requestId,
+        },
+      }
+    );
+
+    const response = await POST(request, {
+      params: Promise.resolve({ id: orderId }),
+    });
+
+    expect(response.status).toBe(200);
+    expect(logErrorMock).toHaveBeenCalledWith(
+      'admin_orders_refund_audit_failed',
+      auditError,
+      expect.objectContaining({
+        requestId,
+        orderId,
+        action: 'refund',
+        code: 'ADMIN_AUDIT_FAILED',
+        durationMs: expect.any(Number),
+      })
+    );
+  });
+
+  it('cancel-payment route writes canonical order audit after successful unpaid cancel', async () => {
+    const orderId = '550e8400-e29b-41d4-a716-446655440001';
+    const requestId = 'req_cancel_payment_route_audit';
+
+    cancelMonobankUnpaidPaymentMock.mockResolvedValue({
+      order: {
+        id: orderId,
+        totalAmountMinor: 2500,
+        totalAmount: 25,
+        currency: 'UAH',
+        paymentStatus: 'failed',
+        fulfillmentStage: 'canceled',
+        paymentProvider: 'monobank',
+        paymentIntentId: null,
+        createdAt: new Date('2026-03-31T12:00:00.000Z'),
+        items: [],
+      },
+      cancel: {
+        id: 'cancel_row_1',
+        extRef: `mono_cancel:${orderId}`,
+        status: 'success',
+        deduped: false,
+      },
+    });
+
+    const { POST } =
+      await import('@/app/api/shop/admin/orders/[id]/cancel-payment/route');
+    const request = new NextRequest(
+      `http://localhost/api/shop/admin/orders/${orderId}/cancel-payment`,
+      {
+        method: 'POST',
+        headers: {
+          origin: 'http://localhost:3000',
+          'x-request-id': requestId,
+        },
+      }
+    );
+
+    const response = await POST(request, {
+      params: Promise.resolve({ id: orderId }),
+    });
+
+    expect(response.status).toBe(200);
+    expect(writeAdminAuditMock).toHaveBeenCalledTimes(1);
+    expect(writeAdminAuditMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        orderId,
+        actorUserId: adminUser.id,
+        action: 'order_admin_action.cancel_payment',
+        targetType: 'order',
+        targetId: orderId,
+        requestId,
+        payload: expect.objectContaining({
+          action: 'cancel_payment',
+          paymentProvider: 'monobank',
+          paymentStatus: 'failed',
+          fulfillmentStage: 'canceled',
+          cancelStatus: 'success',
+          cancelExtRef: `mono_cancel:${orderId}`,
+          deduped: false,
+        }),
+        dedupeSeed: {
+          domain: 'order_admin_action',
+          action: 'cancel_payment',
+          orderId,
+        },
+      })
+    );
+  });
+
+  it('cancel-payment route keeps 200 success when audit persistence fails after cancel succeeds', async () => {
+    const orderId = '550e8400-e29b-41d4-a716-446655440011';
+    const requestId = 'req_cancel_payment_route_audit_nonfatal';
+    const auditError = new Error('audit write failed after cancel');
+
+    cancelMonobankUnpaidPaymentMock.mockResolvedValue({
+      order: {
+        id: orderId,
+        totalAmountMinor: 2500,
+        totalAmount: 25,
+        currency: 'UAH',
+        paymentStatus: 'failed',
+        fulfillmentStage: 'canceled',
+        paymentProvider: 'monobank',
+        paymentIntentId: null,
+        createdAt: new Date('2026-03-31T12:00:00.000Z'),
+        items: [],
+      },
+      cancel: {
+        id: 'cancel_row_2',
+        extRef: `mono_cancel:${orderId}`,
+        status: 'success',
+        deduped: false,
+      },
+    });
+    writeAdminAuditMock.mockRejectedValueOnce(auditError);
+
+    const { POST } =
+      await import('@/app/api/shop/admin/orders/[id]/cancel-payment/route');
+    const request = new NextRequest(
+      `http://localhost/api/shop/admin/orders/${orderId}/cancel-payment`,
+      {
+        method: 'POST',
+        headers: {
+          origin: 'http://localhost:3000',
+          'x-request-id': requestId,
+        },
+      }
+    );
+
+    const response = await POST(request, {
+      params: Promise.resolve({ id: orderId }),
+    });
+
+    expect(response.status).toBe(200);
+    expect(logErrorMock).toHaveBeenCalledWith(
+      'admin_orders_cancel_payment_audit_failed',
+      auditError,
+      expect.objectContaining({
+        requestId,
+        orderId,
+        action: 'cancel_payment',
+        code: 'ADMIN_AUDIT_FAILED',
+        durationMs: expect.any(Number),
+      })
+    );
+  });
+});
diff --git a/frontend/lib/tests/shop/admin-order-timeline-query.test.ts b/frontend/lib/tests/shop/admin-order-timeline-query.test.ts
index dc009193..2176ea8f 100644
--- a/frontend/lib/tests/shop/admin-order-timeline-query.test.ts
+++ b/frontend/lib/tests/shop/admin-order-timeline-query.test.ts
@@ -119,6 +119,63 @@ describe.sequential('admin order timeline query', () => {
     }
   });
 
+  it('normalizes canonical refund and cancel-payment admin actions', async () => {
+    const orderId = crypto.randomUUID();
+
+    await insertOrder({ orderId });
+
+    try {
+      await db.insert(adminAuditLog).values([
+        {
+          id: crypto.randomUUID(),
+          orderId,
+          actorUserId: null,
+          action: 'order_admin_action.refund',
+          targetType: 'order',
+          targetId: orderId,
+          requestId: 'req-refund',
+          payload: {
+            action: 'refund',
+            paymentStatus: 'paid',
+          },
+          dedupeKey: `audit-${crypto.randomUUID()}`,
+          occurredAt: new Date('2026-03-12T10:00:00.000Z'),
+          createdAt: new Date('2026-03-12T10:00:00.000Z'),
+        },
+        {
+          id: crypto.randomUUID(),
+          orderId,
+          actorUserId: null,
+          action: 'order_admin_action.cancel_payment',
+          targetType: 'order',
+          targetId: orderId,
+          requestId: 'req-cancel-payment',
+          payload: {
+            action: 'cancel_payment',
+            paymentStatus: 'failed',
+          },
+          dedupeKey: `audit-${crypto.randomUUID()}`,
+          occurredAt: new Date('2026-03-12T11:00:00.000Z'),
+          createdAt: new Date('2026-03-12T11:00:00.000Z'),
+        },
+      ] as any);
+
+      const history = await getAdminOrderTimeline(orderId);
+
+      expect(history.map(entry => entry.action)).toEqual([
+        'cancel_payment',
+        'refund',
+      ]);
+      expect(history.map(entry => entry.requestId)).toEqual([
+        'req-cancel-payment',
+        'req-refund',
+      ]);
+      expect(history.every(entry => entry.source === 'audit')).toBe(true);
+    } finally {
+      await cleanup(orderId);
+    }
+  });
+
   it('falls back to legacy shipping audit when canonical audit rows are absent', async () => {
     const orderId = crypto.randomUUID();
 
diff --git a/frontend/lib/tests/shop/admin-shipping-edit-form.test.ts b/frontend/lib/tests/shop/admin-shipping-edit-form.test.ts
new file mode 100644
index 00000000..3c232b0b
--- /dev/null
+++ b/frontend/lib/tests/shop/admin-shipping-edit-form.test.ts
@@ -0,0 +1,151 @@
+// @vitest-environment jsdom
+
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { createElement } from 'react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const refreshMock = vi.hoisted(() => vi.fn());
+
+vi.mock('next/navigation', () => ({
+  useRouter: () => ({
+    refresh: refreshMock,
+  }),
+}));
+
+vi.mock('next-intl', () => ({
+  useTranslations: (namespace: string) => (key: string) =>
+    `${namespace}.${key}`,
+}));
+
+describe('admin shipping edit form', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.unstubAllGlobals();
+  });
+
+  it('blocks submit locally when required fields are missing and links the submit button to the error alert', async () => {
+    const fetchMock = vi.fn();
+    vi.stubGlobal('fetch', fetchMock);
+
+    const { ShippingEditForm } =
+      await import('@/app/[locale]/admin/shop/orders/[id]/ShippingEditForm');
+
+    const { container } = render(
+      createElement(ShippingEditForm, {
+        orderId: '550e8400-e29b-41d4-a716-446655440100',
+        csrfToken: 'csrf-token',
+        initialShipping: {
+          methodCode: 'NP_COURIER',
+          cityRef: '',
+          cityLabel: null,
+          warehouseRef: null,
+          warehouseLabel: null,
+          addressLine1: 'Khreshchatyk 1',
+          addressLine2: '',
+          recipientFullName: '',
+          recipientPhone: '',
+          recipientEmail: null,
+          recipientComment: null,
+        },
+      })
+    );
+
+    const submitButton = screen.getByRole('button', {
+      name: 'shop.orders.detail.shippingEditor.save',
+    });
+
+    const form = container.querySelector('form');
+    if (!form) throw new Error('ShippingEditForm form not rendered');
+
+    fireEvent.submit(form);
+
+    const alert = await screen.findByRole('alert');
+
+    expect(alert).toHaveTextContent(
+      'shop.orders.detail.shippingEditor.errors.invalid'
+    );
+    expect(fetchMock).not.toHaveBeenCalled();
+    expect(submitButton).toHaveAttribute('aria-describedby', alert.id);
+    expect(refreshMock).not.toHaveBeenCalled();
+  });
+
+  it('requires warehouseRef locally for warehouse methods before sending PATCH', async () => {
+    const fetchMock = vi.fn();
+    vi.stubGlobal('fetch', fetchMock);
+
+    const { ShippingEditForm } =
+      await import('@/app/[locale]/admin/shop/orders/[id]/ShippingEditForm');
+
+    const { container } = render(
+      createElement(ShippingEditForm, {
+        orderId: '550e8400-e29b-41d4-a716-446655440101',
+        csrfToken: 'csrf-token',
+        initialShipping: {
+          methodCode: 'NP_WAREHOUSE',
+          cityRef: 'city-ref',
+          cityLabel: null,
+          warehouseRef: null,
+          warehouseLabel: null,
+          addressLine1: null,
+          addressLine2: null,
+          recipientFullName: 'Test User',
+          recipientPhone: '+380501112233',
+          recipientEmail: null,
+          recipientComment: null,
+        },
+      })
+    );
+
+    const form = container.querySelector('form');
+    if (!form) throw new Error('ShippingEditForm form not rendered');
+
+    fireEvent.submit(form);
+
+    await waitFor(() => {
+      expect(screen.getByRole('alert')).toHaveTextContent(
+        'shop.orders.detail.shippingEditor.errors.invalid'
+      );
+    });
+    expect(fetchMock).not.toHaveBeenCalled();
+  });
+
+  it('requires addressLine1 locally for courier methods before sending PATCH', async () => {
+    const fetchMock = vi.fn();
+    vi.stubGlobal('fetch', fetchMock);
+
+    const { ShippingEditForm } =
+      await import('@/app/[locale]/admin/shop/orders/[id]/ShippingEditForm');
+
+    const { container } = render(
+      createElement(ShippingEditForm, {
+        orderId: '550e8400-e29b-41d4-a716-446655440102',
+        csrfToken: 'csrf-token',
+        initialShipping: {
+          methodCode: 'NP_COURIER',
+          cityRef: 'city-ref',
+          cityLabel: null,
+          warehouseRef: null,
+          warehouseLabel: null,
+          addressLine1: '',
+          addressLine2: 'Apartment 5',
+          recipientFullName: 'Test User',
+          recipientPhone: '+380501112233',
+          recipientEmail: null,
+          recipientComment: null,
+        },
+      })
+    );
+
+    const form = container.querySelector('form');
+    if (!form) throw new Error('ShippingEditForm form not rendered');
+
+    fireEvent.submit(form);
+
+    await waitFor(() => {
+      expect(screen.getByRole('alert')).toHaveTextContent(
+        'shop.orders.detail.shippingEditor.errors.invalid'
+      );
+    });
+    expect(fetchMock).not.toHaveBeenCalled();
+  });
+});
diff --git a/frontend/lib/tests/shop/admin-shipping-edit-route.test.ts b/frontend/lib/tests/shop/admin-shipping-edit-route.test.ts
new file mode 100644
index 00000000..5bd16115
--- /dev/null
+++ b/frontend/lib/tests/shop/admin-shipping-edit-route.test.ts
@@ -0,0 +1,250 @@
+import { NextRequest } from 'next/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const requireAdminApiMock = vi.hoisted(() =>
+  vi.fn(async () => ({ id: 'admin-route-1' }))
+);
+const requireAdminCsrfMock = vi.hoisted(() => vi.fn(() => null));
+const guardBrowserSameOriginMock = vi.hoisted(() => vi.fn(() => null));
+const applyAdminOrderShippingEditMock = vi.hoisted(() =>
+  vi.fn(async () => ({
+    orderId: '550e8400-e29b-41d4-a716-446655440000',
+    shippingMethodCode: 'NP_COURIER',
+    changed: true,
+  }))
+);
+const logWarnMock = vi.hoisted(() => vi.fn());
+const logErrorMock = vi.hoisted(() => vi.fn());
+
+const adminAuthErrors = vi.hoisted(() => {
+  class AdminApiDisabledError extends Error {
+    code = 'ADMIN_API_DISABLED';
+  }
+
+  class AdminUnauthorizedError extends Error {
+    code = 'UNAUTHORIZED';
+  }
+
+  class AdminForbiddenError extends Error {
+    code = 'FORBIDDEN';
+  }
+
+  return {
+    AdminApiDisabledError,
+    AdminUnauthorizedError,
+    AdminForbiddenError,
+  };
+});
+
+const shippingEditErrors = vi.hoisted(() => {
+  class AdminOrderShippingEditError extends Error {
+    code: string;
+    status: number;
+
+    constructor(code: string, message: string, status: number) {
+      super(message);
+      this.code = code;
+      this.status = status;
+    }
+  }
+
+  return {
+    AdminOrderShippingEditError,
+  };
+});
+
+vi.mock('@/lib/auth/admin', () => ({
+  ...adminAuthErrors,
+  requireAdminApi: (request: unknown) => (requireAdminApiMock as any)(request),
+}));
+
+vi.mock('@/lib/security/admin-csrf', () => ({
+  requireAdminCsrf: (...args: unknown[]) =>
+    (requireAdminCsrfMock as any)(...args),
+}));
+
+vi.mock('@/lib/security/origin', () => ({
+  guardBrowserSameOrigin: (request: unknown) =>
+    (guardBrowserSameOriginMock as any)(request),
+}));
+
+vi.mock('@/lib/services/shop/shipping/admin-edit', () => ({
+  ...shippingEditErrors,
+  applyAdminOrderShippingEdit: (args: unknown) =>
+    (applyAdminOrderShippingEditMock as any)(args),
+}));
+
+vi.mock('@/lib/logging', () => ({
+  logWarn: (...args: unknown[]) => logWarnMock(...args),
+  logError: (...args: unknown[]) => logErrorMock(...args),
+}));
+
+import { PATCH } from '@/app/api/shop/admin/orders/[id]/shipping/route';
+
+describe('admin shipping edit route', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+  });
+
+  it('accepts a valid courier payload and delegates to the shipping edit service', async () => {
+    const orderId = '550e8400-e29b-41d4-a716-446655440000';
+    const requestId = 'req_admin_shipping_edit_route';
+    const request = new NextRequest(
+      `http://localhost/api/shop/admin/orders/${orderId}/shipping`,
+      {
+        method: 'PATCH',
+        headers: {
+          origin: 'http://localhost:3000',
+          'content-type': 'application/json',
+          'x-csrf-token': 'csrf-token',
+          'x-request-id': requestId,
+        },
+        body: JSON.stringify({
+          provider: 'nova_poshta',
+          methodCode: 'NP_COURIER',
+          selection: {
+            cityRef: '12345678901234567890',
+            addressLine1: 'Khreshchatyk 1',
+            addressLine2: 'Apartment 10',
+          },
+          recipient: {
+            fullName: 'Test User',
+            phone: '+380501112233',
+            email: 'test@example.com',
+            comment: 'Ring the bell',
+          },
+        }),
+      }
+    );
+
+    const response = await PATCH(request, {
+      params: Promise.resolve({ id: orderId }),
+    });
+
+    expect(response.status).toBe(200);
+    expect(requireAdminCsrfMock).toHaveBeenCalledWith(
+      expect.any(NextRequest),
+      'admin:orders:shipping:edit'
+    );
+    expect(applyAdminOrderShippingEditMock).toHaveBeenCalledWith({
+      orderId,
+      actorUserId: 'admin-route-1',
+      requestId,
+      shipping: {
+        provider: 'nova_poshta',
+        methodCode: 'NP_COURIER',
+        selection: {
+          cityRef: '12345678901234567890',
+          addressLine1: 'Khreshchatyk 1',
+          addressLine2: 'Apartment 10',
+        },
+        recipient: {
+          fullName: 'Test User',
+          phone: '+380501112233',
+          email: 'test@example.com',
+          comment: 'Ring the bell',
+        },
+      },
+    });
+
+    await expect(response.json()).resolves.toEqual({
+      success: true,
+      changed: true,
+      order: {
+        id: orderId,
+        shippingMethodCode: 'NP_COURIER',
+      },
+    });
+  });
+
+  it('rejects invalid warehouse payloads before the service runs', async () => {
+    const request = new NextRequest(
+      'http://localhost/api/shop/admin/orders/550e8400-e29b-41d4-a716-446655440000/shipping',
+      {
+        method: 'PATCH',
+        headers: {
+          origin: 'http://localhost:3000',
+          'content-type': 'application/json',
+          'x-csrf-token': 'csrf-token',
+        },
+        body: JSON.stringify({
+          provider: 'nova_poshta',
+          methodCode: 'NP_WAREHOUSE',
+          selection: {
+            cityRef: '12345678901234567890',
+          },
+          recipient: {
+            fullName: 'Test User',
+            phone: '+380501112233',
+          },
+        }),
+      }
+    );
+
+    const response = await PATCH(request, {
+      params: Promise.resolve({
+        id: '550e8400-e29b-41d4-a716-446655440000',
+      }),
+    });
+
+    expect(response.status).toBe(400);
+    await expect(response.json()).resolves.toEqual({
+      code: 'INVALID_PAYLOAD',
+      message: 'Invalid payload.',
+    });
+    expect(applyAdminOrderShippingEditMock).not.toHaveBeenCalled();
+  });
+
+  it('returns controlled service errors for blocked shipping edits', async () => {
+    applyAdminOrderShippingEditMock.mockRejectedValueOnce(
+      new shippingEditErrors.AdminOrderShippingEditError(
+        'SHIPPING_EDIT_NOT_ALLOWED',
+        'Shipping details cannot be edited in the current fulfillment state.',
+        409
+      )
+    );
+
+    const request = new NextRequest(
+      'http://localhost/api/shop/admin/orders/550e8400-e29b-41d4-a716-446655440000/shipping',
+      {
+        method: 'PATCH',
+        headers: {
+          origin: 'http://localhost:3000',
+          'content-type': 'application/json',
+          'x-csrf-token': 'csrf-token',
+        },
+        body: JSON.stringify({
+          provider: 'nova_poshta',
+          methodCode: 'NP_COURIER',
+          selection: {
+            cityRef: '12345678901234567890',
+            addressLine1: 'Khreshchatyk 1',
+          },
+          recipient: {
+            fullName: 'Test User',
+            phone: '+380501112233',
+          },
+        }),
+      }
+    );
+
+    const response = await PATCH(request, {
+      params: Promise.resolve({
+        id: '550e8400-e29b-41d4-a716-446655440000',
+      }),
+    });
+
+    expect(response.status).toBe(409);
+    await expect(response.json()).resolves.toEqual({
+      code: 'SHIPPING_EDIT_NOT_ALLOWED',
+      message:
+        'Shipping details cannot be edited in the current fulfillment state.',
+    });
+    expect(logWarnMock).toHaveBeenCalledWith(
+      'admin_orders_shipping_edit_rejected',
+      expect.objectContaining({
+        code: 'SHIPPING_EDIT_NOT_ALLOWED',
+      })
+    );
+  });
+});
diff --git a/frontend/lib/tests/shop/admin-shipping-edit.test.ts b/frontend/lib/tests/shop/admin-shipping-edit.test.ts
new file mode 100644
index 00000000..00dde316
--- /dev/null
+++ b/frontend/lib/tests/shop/admin-shipping-edit.test.ts
@@ -0,0 +1,365 @@
+import crypto from 'node:crypto';
+
+import { eq } from 'drizzle-orm';
+import { describe, expect, it } from 'vitest';
+
+import { db } from '@/db';
+import {
+  adminAuditLog,
+  npCities,
+  npWarehouses,
+  orders,
+  orderShipping,
+  shippingShipments,
+} from '@/db/schema';
+import { applyAdminOrderShippingEdit } from '@/lib/services/shop/shipping/admin-edit';
+import { toDbMoney } from '@/lib/shop/money';
+
+type SeededOrder = {
+  orderId: string;
+  cityRef: string;
+  warehouseRef: string;
+  shipmentId: string | null;
+};
+
+async function cleanup(seed: SeededOrder) {
+  await db.delete(adminAuditLog).where(eq(adminAuditLog.orderId, seed.orderId));
+  await db.delete(orderShipping).where(eq(orderShipping.orderId, seed.orderId));
+  if (seed.shipmentId) {
+    await db
+      .delete(shippingShipments)
+      .where(eq(shippingShipments.id, seed.shipmentId));
+  }
+  await db.delete(orders).where(eq(orders.id, seed.orderId));
+  await db.delete(npWarehouses).where(eq(npWarehouses.ref, seed.warehouseRef));
+  await db.delete(npCities).where(eq(npCities.ref, seed.cityRef));
+}
+
+async function seedEditableOrder(args?: {
+  shippingStatus?: 'pending' | 'label_created';
+  shipmentStatus?: 'succeeded' | null;
+}): Promise<SeededOrder> {
+  const orderId = crypto.randomUUID();
+  const cityRef = `city_${crypto.randomUUID()}`;
+  const warehouseRef = `wh_${crypto.randomUUID()}`;
+  const shipmentId = args?.shipmentStatus ? crypto.randomUUID() : null;
+
+  await db.insert(npCities).values({
+    ref: cityRef,
+    nameUa: 'Kyiv',
+    nameRu: 'Киев',
+    area: 'Kyivska',
+    region: 'Kyiv',
+    settlementType: 'місто',
+    isActive: true,
+  } as any);
+
+  await db.insert(npWarehouses).values({
+    ref: warehouseRef,
+    cityRef,
+    settlementRef: cityRef,
+    number: '12',
+    type: 'Branch',
+    name: 'Warehouse 12',
+    address: 'Khreshchatyk 1',
+    isPostMachine: false,
+    isActive: true,
+  } as any);
+
+  await db.insert(orders).values({
+    id: orderId,
+    totalAmountMinor: 1000,
+    totalAmount: toDbMoney(1000),
+    currency: 'UAH',
+    paymentProvider: 'stripe',
+    paymentStatus: 'paid',
+    status: 'PAID',
+    inventoryStatus: 'reserved',
+    shippingRequired: true,
+    shippingPayer: 'customer',
+    shippingProvider: 'nova_poshta',
+    shippingMethodCode: 'NP_WAREHOUSE',
+    shippingAmountMinor: null,
+    shippingStatus: args?.shippingStatus ?? 'pending',
+    idempotencyKey: `admin-shipping-edit-${orderId}`,
+  } as any);
+
+  await db.insert(orderShipping).values({
+    orderId,
+    shippingAddress: {
+      provider: 'nova_poshta',
+      methodCode: 'NP_WAREHOUSE',
+      quote: {
+        currency: 'UAH',
+        amountMinor: 100,
+        quoteFingerprint: `quote_${orderId}`,
+      },
+      selection: {
+        cityRef,
+        cityNameUa: 'Kyiv',
+        cityNameRu: 'Киев',
+        area: 'Kyivska',
+        region: 'Kyiv',
+        warehouseRef,
+        warehouseName: 'Warehouse 12',
+        warehouseAddress: 'Khreshchatyk 1',
+        addressLine1: null,
+        addressLine2: null,
+      },
+      recipient: {
+        fullName: 'Ivan Petrenko',
+        phone: '+380501112233',
+        email: 'ivan@example.com',
+        comment: 'Call me before delivery',
+      },
+    },
+  } as any);
+
+  if (shipmentId && args?.shipmentStatus) {
+    await db.insert(shippingShipments).values({
+      id: shipmentId,
+      orderId,
+      provider: 'nova_poshta',
+      status: args.shipmentStatus,
+      attemptCount: 1,
+      nextAttemptAt: null,
+      leaseOwner: null,
+      leaseExpiresAt: null,
+    } as any);
+  }
+
+  return {
+    orderId,
+    cityRef,
+    warehouseRef,
+    shipmentId,
+  };
+}
+
+describe.sequential('admin shipping edit service', () => {
+  it('preserves the existing quote when the edit changes recipient-only data', async () => {
+    const seed = await seedEditableOrder();
+    const requestId = `req_${crypto.randomUUID()}`;
+
+    try {
+      const result = await applyAdminOrderShippingEdit({
+        orderId: seed.orderId,
+        actorUserId: null,
+        requestId,
+        shipping: {
+          provider: 'nova_poshta',
+          methodCode: 'NP_WAREHOUSE',
+          selection: {
+            cityRef: seed.cityRef,
+            warehouseRef: seed.warehouseRef,
+          },
+          recipient: {
+            fullName: 'Olena Petrenko',
+            phone: '+380671112233',
+            email: 'olena@example.com',
+            comment: 'Call before delivery',
+          },
+        },
+      });
+
+      expect(result).toEqual({
+        orderId: seed.orderId,
+        shippingMethodCode: 'NP_WAREHOUSE',
+        changed: true,
+      });
+
+      const [shippingRow] = await db
+        .select({
+          shippingAddress: orderShipping.shippingAddress,
+        })
+        .from(orderShipping)
+        .where(eq(orderShipping.orderId, seed.orderId))
+        .limit(1);
+
+      expect(shippingRow?.shippingAddress).toMatchObject({
+        provider: 'nova_poshta',
+        methodCode: 'NP_WAREHOUSE',
+        quote: {
+          currency: 'UAH',
+          amountMinor: 100,
+          quoteFingerprint: `quote_${seed.orderId}`,
+        },
+        selection: {
+          cityRef: seed.cityRef,
+          warehouseRef: seed.warehouseRef,
+          addressLine1: null,
+          addressLine2: null,
+        },
+        recipient: {
+          fullName: 'Olena Petrenko',
+          phone: '+380671112233',
+          email: 'olena@example.com',
+          comment: 'Call before delivery',
+        },
+      });
+    } finally {
+      await cleanup(seed);
+    }
+  });
+
+  it('drops the existing quote when quote-affecting shipping selection changes', async () => {
+    const seed = await seedEditableOrder();
+    const requestId = `req_${crypto.randomUUID()}`;
+
+    try {
+      const result = await applyAdminOrderShippingEdit({
+        orderId: seed.orderId,
+        actorUserId: null,
+        requestId,
+        shipping: {
+          provider: 'nova_poshta',
+          methodCode: 'NP_COURIER',
+          selection: {
+            cityRef: seed.cityRef,
+            addressLine1: 'Khreshchatyk 7',
+            addressLine2: 'Apartment 21',
+          },
+          recipient: {
+            fullName: 'Olena Petrenko',
+            phone: '+380671112233',
+            email: 'olena@example.com',
+            comment: 'Call before delivery',
+          },
+        },
+      });
+
+      expect(result).toEqual({
+        orderId: seed.orderId,
+        shippingMethodCode: 'NP_COURIER',
+        changed: true,
+      });
+
+      const [orderRow] = await db
+        .select({
+          shippingMethodCode: orders.shippingMethodCode,
+          shippingProvider: orders.shippingProvider,
+        })
+        .from(orders)
+        .where(eq(orders.id, seed.orderId))
+        .limit(1);
+
+      expect(orderRow).toEqual({
+        shippingMethodCode: 'NP_COURIER',
+        shippingProvider: 'nova_poshta',
+      });
+
+      const [shippingRow] = await db
+        .select({
+          shippingAddress: orderShipping.shippingAddress,
+        })
+        .from(orderShipping)
+        .where(eq(orderShipping.orderId, seed.orderId))
+        .limit(1);
+
+      expect(shippingRow?.shippingAddress).toMatchObject({
+        provider: 'nova_poshta',
+        methodCode: 'NP_COURIER',
+        selection: {
+          cityRef: seed.cityRef,
+          warehouseRef: null,
+          warehouseName: null,
+          warehouseAddress: null,
+          addressLine1: 'Khreshchatyk 7',
+          addressLine2: 'Apartment 21',
+        },
+        recipient: {
+          fullName: 'Olena Petrenko',
+          phone: '+380671112233',
+          email: 'olena@example.com',
+          comment: 'Call before delivery',
+        },
+      });
+      expect(shippingRow?.shippingAddress).not.toHaveProperty('quote');
+
+      const [auditRow] = await db
+        .select({
+          action: adminAuditLog.action,
+          requestId: adminAuditLog.requestId,
+          payload: adminAuditLog.payload,
+        })
+        .from(adminAuditLog)
+        .where(eq(adminAuditLog.orderId, seed.orderId))
+        .limit(1);
+
+      expect(auditRow?.action).toBe('order_admin_action.edit_shipping');
+      expect(auditRow?.requestId).toBe(requestId);
+      expect(auditRow?.payload).toMatchObject({
+        action: 'edit_shipping',
+        shippingProvider: 'nova_poshta',
+        fromMethodCode: 'NP_WAREHOUSE',
+        toMethodCode: 'NP_COURIER',
+        fromCityRef: seed.cityRef,
+        toCityRef: seed.cityRef,
+        fromWarehouseRef: seed.warehouseRef,
+        toWarehouseRef: null,
+        addressChanged: true,
+        recipientChanged: {
+          fullName: true,
+          phone: true,
+          email: true,
+          comment: true,
+        },
+      });
+      expect(auditRow?.payload).not.toHaveProperty('fullName');
+      expect(auditRow?.payload).not.toHaveProperty('phone');
+      expect(auditRow?.payload).not.toHaveProperty('email');
+    } finally {
+      await cleanup(seed);
+    }
+  });
+
+  it('rejects shipping edits once the order is beyond the editable fulfillment window', async () => {
+    const seed = await seedEditableOrder({
+      shippingStatus: 'label_created',
+      shipmentStatus: 'succeeded',
+    });
+
+    try {
+      await expect(
+        applyAdminOrderShippingEdit({
+          orderId: seed.orderId,
+          actorUserId: null,
+          requestId: `req_${crypto.randomUUID()}`,
+          shipping: {
+            provider: 'nova_poshta',
+            methodCode: 'NP_COURIER',
+            selection: {
+              cityRef: seed.cityRef,
+              addressLine1: 'Khreshchatyk 7',
+            },
+            recipient: {
+              fullName: 'Olena Petrenko',
+              phone: '+380671112233',
+            },
+          },
+        })
+      ).rejects.toMatchObject({
+        name: 'AdminOrderShippingEditError',
+        code: 'SHIPPING_EDIT_NOT_ALLOWED',
+        status: 409,
+      });
+
+      const [orderRow] = await db
+        .select({
+          shippingMethodCode: orders.shippingMethodCode,
+        })
+        .from(orders)
+        .where(eq(orders.id, seed.orderId))
+        .limit(1);
+      expect(orderRow?.shippingMethodCode).toBe('NP_WAREHOUSE');
+
+      const logs = await db
+        .select({ id: adminAuditLog.id })
+        .from(adminAuditLog)
+        .where(eq(adminAuditLog.orderId, seed.orderId));
+      expect(logs).toHaveLength(0);
+    } finally {
+      await cleanup(seed);
+    }
+  });
+});
diff --git a/frontend/lib/tests/shop/catalog-merchandising-cleanup.test.ts b/frontend/lib/tests/shop/catalog-merchandising-cleanup.test.ts
new file mode 100644
index 00000000..3a54bc21
--- /dev/null
+++ b/frontend/lib/tests/shop/catalog-merchandising-cleanup.test.ts
@@ -0,0 +1,158 @@
+import { describe, expect, it, vi } from 'vitest';
+
+const shopQueryMocks = vi.hoisted(() => ({
+  getPublicProductBySlug: vi.fn(),
+  getPublicProductBaseBySlug: vi.fn(),
+  getActiveProductsPage: vi.fn(),
+}));
+
+vi.mock('@/db/queries/shop/products', () => shopQueryMocks);
+
+import { STOREFRONT_CATEGORIES } from '@/lib/config/catalog';
+import { canonicalizePublicCatalogQuery } from '@/lib/shop/catalog-query';
+import { getHomepageContent } from '@/lib/shop/data';
+import { catalogQuerySchema } from '@/lib/validation/shop';
+
+function makeDbProduct(input: {
+  id: string;
+  slug: string;
+  title: string;
+  createdAt: Date;
+}) {
+  return {
+    id: input.id,
+    slug: input.slug,
+    title: input.title,
+    description: null,
+    imageUrl: '/placeholder.svg',
+    imagePublicId: null,
+    price: '19.99',
+    originalPrice: null,
+    currency: 'USD' as const,
+    isActive: true,
+    isFeatured: false,
+    stock: 5,
+    sku: null,
+    category: 'apparel' as const,
+    type: 'shirts' as const,
+    colors: ['black'] as const,
+    sizes: ['M'] as const,
+    badge: 'NONE' as const,
+    images: [],
+    primaryImage: undefined,
+    createdAt: input.createdAt,
+    updatedAt: input.createdAt,
+  };
+}
+
+describe('catalog merchandising cleanup', () => {
+  it('removes pseudo categories from customer-facing category surfaces', () => {
+    expect(STOREFRONT_CATEGORIES.map(category => category.slug)).not.toContain(
+      'best-sellers'
+    );
+    expect(STOREFRONT_CATEGORIES.map(category => category.slug)).not.toContain(
+      'new-arrivals'
+    );
+
+    expect(
+      catalogQuerySchema.safeParse({ category: 'best-sellers' }).success
+    ).toBe(false);
+    expect(
+      catalogQuerySchema.safeParse({ category: 'new-arrivals' }).success
+    ).toBe(false);
+    expect(catalogQuerySchema.safeParse({ category: 'apparel' }).success).toBe(
+      true
+    );
+  });
+
+  it('canonicalizes legacy new-arrivals links to the newest sort', () => {
+    expect(
+      canonicalizePublicCatalogQuery({ category: 'new-arrivals' })
+    ).toEqual({
+      needsCanonical: true,
+      params: expect.any(URLSearchParams),
+      normalized: { sort: 'newest' },
+    });
+
+    expect(canonicalizePublicCatalogQuery({ filter: 'new' })).toEqual({
+      needsCanonical: true,
+      params: expect.any(URLSearchParams),
+      normalized: { sort: 'newest' },
+    });
+
+    expect(
+      canonicalizePublicCatalogQuery({
+        category: 'new-arrivals',
+        sort: 'price-asc',
+        page: '2',
+      })
+    ).toEqual({
+      needsCanonical: true,
+      params: expect.any(URLSearchParams),
+      normalized: {
+        sort: 'newest',
+        page: '2',
+      },
+    });
+  });
+
+  it('builds homepage new arrivals from newest catalog results', async () => {
+    const newestRows = [
+      makeDbProduct({
+        id: 'product-5',
+        slug: 'product-5',
+        title: 'Product 5',
+        createdAt: new Date('2026-03-05T00:00:00.000Z'),
+      }),
+      makeDbProduct({
+        id: 'product-4',
+        slug: 'product-4',
+        title: 'Product 4',
+        createdAt: new Date('2026-03-04T00:00:00.000Z'),
+      }),
+      makeDbProduct({
+        id: 'product-3',
+        slug: 'product-3',
+        title: 'Product 3',
+        createdAt: new Date('2026-03-03T00:00:00.000Z'),
+      }),
+      makeDbProduct({
+        id: 'product-2',
+        slug: 'product-2',
+        title: 'Product 2',
+        createdAt: new Date('2026-03-02T00:00:00.000Z'),
+      }),
+      makeDbProduct({
+        id: 'product-1',
+        slug: 'product-1',
+        title: 'Product 1',
+        createdAt: new Date('2026-03-01T00:00:00.000Z'),
+      }),
+    ];
+
+    shopQueryMocks.getActiveProductsPage.mockResolvedValueOnce({
+      items: newestRows,
+      total: newestRows.length,
+    });
+
+    const content = await getHomepageContent('en');
+
+    expect(shopQueryMocks.getActiveProductsPage).toHaveBeenCalledWith({
+      currency: 'USD',
+      limit: 12,
+      offset: 0,
+      category: undefined,
+      type: undefined,
+      color: undefined,
+      size: undefined,
+      sort: 'newest',
+    });
+
+    expect(content.newArrivals.map(product => product.slug)).toEqual([
+      'product-5',
+      'product-4',
+      'product-3',
+      'product-2',
+    ]);
+  });
+});
diff --git a/frontend/lib/tests/shop/catalog-query-sorting.test.ts b/frontend/lib/tests/shop/catalog-query-sorting.test.ts
new file mode 100644
index 00000000..b5680ef8
--- /dev/null
+++ b/frontend/lib/tests/shop/catalog-query-sorting.test.ts
@@ -0,0 +1,145 @@
+import { randomUUID } from 'node:crypto';
+
+import { inArray } from 'drizzle-orm';
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { db } from '@/db';
+import { getActiveProductsPage } from '@/db/queries/shop/products';
+import { productPrices, products } from '@/db/schema';
+
+const createdProductIds: string[] = [];
+
+async function insertCatalogProduct(input: {
+  slug: string;
+  title: string;
+  createdAt: Date;
+  isFeatured: boolean;
+  priceMinor: number;
+}) {
+  const productId = randomUUID();
+  createdProductIds.push(productId);
+
+  await db.insert(products).values({
+    id: productId,
+    slug: input.slug,
+    title: input.title,
+    description: null,
+    imageUrl: 'https://placehold.co/600x600',
+    imagePublicId: null,
+    category: 'apparel',
+    type: 'shirts',
+    colors: ['black'],
+    sizes: ['M'],
+    badge: 'NONE',
+    isActive: true,
+    isFeatured: input.isFeatured,
+    stock: 10,
+    sku: null,
+    price: (input.priceMinor / 100).toFixed(2),
+    originalPrice: null,
+    currency: 'USD',
+    createdAt: input.createdAt,
+    updatedAt: input.createdAt,
+  });
+
+  await db.insert(productPrices).values({
+    id: randomUUID(),
+    productId,
+    currency: 'USD',
+    priceMinor: input.priceMinor,
+    originalPriceMinor: null,
+    price: (input.priceMinor / 100).toFixed(2),
+    originalPrice: null,
+  });
+
+  return productId;
+}
+
+afterEach(async () => {
+  if (createdProductIds.length === 0) return;
+
+  const ids = [...createdProductIds];
+  createdProductIds.length = 0;
+
+  await db.delete(productPrices).where(inArray(productPrices.productId, ids));
+  await db.delete(products).where(inArray(products.id, ids));
+});
+
+describe.sequential('catalog query sorting', () => {
+  it('defaults to featured-first ordering with deterministic recency fallback', async () => {
+    const suffix = randomUUID().slice(0, 8);
+
+    await insertCatalogProduct({
+      slug: `catalog-featured-old-${suffix}`,
+      title: 'Featured old',
+      createdAt: new Date('2026-03-01T00:00:00.000Z'),
+      isFeatured: true,
+      priceMinor: 2000,
+    });
+    await insertCatalogProduct({
+      slug: `catalog-regular-new-${suffix}`,
+      title: 'Regular new',
+      createdAt: new Date('2026-03-03T00:00:00.000Z'),
+      isFeatured: false,
+      priceMinor: 1500,
+    });
+    await insertCatalogProduct({
+      slug: `catalog-featured-new-${suffix}`,
+      title: 'Featured new',
+      createdAt: new Date('2026-03-02T00:00:00.000Z'),
+      isFeatured: true,
+      priceMinor: 1800,
+    });
+
+    const result = await getActiveProductsPage({
+      currency: 'USD',
+      limit: 20,
+      offset: 0,
+    });
+
+    const relevant = result.items
+      .filter(item => item.slug.endsWith(suffix))
+      .map(item => item.slug);
+
+    expect(relevant).toEqual([
+      `catalog-featured-new-${suffix}`,
+      `catalog-featured-old-${suffix}`,
+      `catalog-regular-new-${suffix}`,
+    ]);
+  });
+
+  it('keeps newest sorting authoritative when explicitly requested', async () => {
+    const suffix = randomUUID().slice(0, 8);
+
+    await insertCatalogProduct({
+      slug: `catalog-newest-featured-old-${suffix}`,
+      title: 'Newest featured old',
+      createdAt: new Date('2026-03-01T00:00:00.000Z'),
+      isFeatured: true,
+      priceMinor: 2000,
+    });
+    await insertCatalogProduct({
+      slug: `catalog-newest-regular-new-${suffix}`,
+      title: 'Newest regular new',
+      createdAt: new Date('2026-03-03T00:00:00.000Z'),
+      isFeatured: false,
+      priceMinor: 1500,
+    });
+
+    const result = await getActiveProductsPage({
+      currency: 'USD',
+      limit: 20,
+      offset: 0,
+      sort: 'newest',
+    });
+
+    const relevant = result.items
+      .filter(item => item.slug.endsWith(suffix))
+      .map(item => item.slug);
+
+    expect(relevant).toEqual([
+      `catalog-newest-regular-new-${suffix}`,
+      `catalog-newest-featured-old-${suffix}`,
+    ]);
+  });
+});
diff --git a/frontend/lib/tests/shop/checkout-success-monobank-shipment.test.ts b/frontend/lib/tests/shop/checkout-success-monobank-shipment.test.ts
new file mode 100644
index 00000000..27b1ddd1
--- /dev/null
+++ b/frontend/lib/tests/shop/checkout-success-monobank-shipment.test.ts
@@ -0,0 +1,102 @@
+// @vitest-environment jsdom
+
+import { render, screen, waitFor } from '@testing-library/react';
+import { createElement, type ReactNode } from 'react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+import MonobankRedirectStatus from '@/app/[locale]/shop/checkout/success/MonobankRedirectStatus';
+
+const replaceMock = vi.hoisted(() => vi.fn());
+
+vi.mock('next/navigation', () => ({
+  useRouter: () => ({
+    replace: replaceMock,
+    refresh: vi.fn(),
+  }),
+}));
+
+vi.mock('next-intl', () => ({
+  useTranslations: () => (key: string) => key,
+}));
+
+vi.mock('@/i18n/routing', () => ({
+  Link: ({
+    href,
+    children,
+    ...props
+  }: {
+    href: string;
+    children: ReactNode;
+    [key: string]: unknown;
+  }) => createElement('a', { href, ...props }, children),
+}));
+
+describe('checkout monobank guest shipment visibility', () => {
+  beforeEach(() => {
+    vi.restoreAllMocks();
+    replaceMock.mockReset();
+    sessionStorage.clear();
+  });
+
+  it('renders shipment status and tracking from token-scoped lite status response', async () => {
+    vi.spyOn(global, 'fetch').mockResolvedValue({
+      ok: true,
+      json: async () => ({
+        id: '11111111-1111-4111-8111-111111111111',
+        currency: 'UAH',
+        totalAmountMinor: 1000,
+        paymentStatus: 'paid',
+        itemsCount: 1,
+        shipmentStatus: 'needs_attention',
+        trackingNumber: 'TRACK-123',
+      }),
+    } as Response);
+
+    render(
+      createElement(MonobankRedirectStatus, {
+        orderId: '11111111-1111-4111-8111-111111111111',
+        locale: 'en',
+        initialStatusToken: 'token_test',
+        paymentsDisabled: false,
+      })
+    );
+
+    await screen.findByText('TRACK-123');
+
+    expect(screen.getByText('shipmentStatuses.needsAttention')).toBeTruthy();
+    expect(screen.getByText('shippingStatus')).toBeTruthy();
+    expect(screen.getByText('trackingNumber')).toBeTruthy();
+    expect(screen.queryByText('needs_attention')).toBeNull();
+  });
+
+  it('omits shipment rows when lite status response has no shipment data', async () => {
+    vi.spyOn(global, 'fetch').mockResolvedValue({
+      ok: true,
+      json: async () => ({
+        id: '11111111-1111-4111-8111-111111111111',
+        currency: 'UAH',
+        totalAmountMinor: 1000,
+        paymentStatus: 'paid',
+        itemsCount: 1,
+        shipmentStatus: null,
+        trackingNumber: null,
+      }),
+    } as Response);
+
+    render(
+      createElement(MonobankRedirectStatus, {
+        orderId: '11111111-1111-4111-8111-111111111111',
+        locale: 'en',
+        initialStatusToken: 'token_test',
+        paymentsDisabled: false,
+      })
+    );
+
+    await waitFor(() =>
+      expect(screen.getByText('paymentStatus.paid')).toBeTruthy()
+    );
+
+    expect(screen.queryByText('shippingStatus')).toBeNull();
+    expect(screen.queryByText('trackingNumber')).toBeNull();
+  });
+});
diff --git a/frontend/lib/tests/shop/checkout-success-page-access.test.ts b/frontend/lib/tests/shop/checkout-success-page-access.test.ts
index be32b493..a4c4a02a 100644
--- a/frontend/lib/tests/shop/checkout-success-page-access.test.ts
+++ b/frontend/lib/tests/shop/checkout-success-page-access.test.ts
@@ -1,3 +1,4 @@
+import { renderToStaticMarkup } from 'react-dom/server';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
 const getCheckoutSuccessOrderSummaryMock = vi.hoisted(() => vi.fn());
@@ -65,6 +66,8 @@ describe('checkout success page access gating', () => {
         totalAmountMinor: 1000,
         currency: 'UAH',
         paymentStatus: 'paid',
+        shipmentStatus: null,
+        trackingNumber: null,
         items: [],
       },
     });
@@ -80,6 +83,57 @@ describe('checkout success page access gating', () => {
     });
   });
 
+  it('renders shipment status and tracking only when present', async () => {
+    getCheckoutSuccessOrderSummaryMock.mockResolvedValue({
+      ok: true,
+      order: {
+        id: ORDER_ID,
+        totalAmountMinor: 1000,
+        currency: 'UAH',
+        paymentStatus: 'paid',
+        shipmentStatus: 'processing',
+        trackingNumber: 'TRACK-123',
+        items: [],
+      },
+    });
+
+    const mod = await import('@/app/[locale]/shop/checkout/success/page');
+    const html = renderToStaticMarkup(
+      await mod.default(
+        makePageArgs({ orderId: ORDER_ID, statusToken: 'token_test' })
+      )
+    );
+
+    expect(html).toContain('shippingStatus');
+    expect(html).toContain('shipmentStatuses.processing');
+    expect(html).toContain('TRACK-123');
+  });
+
+  it('omits shipment and tracking rows when guest summary has no shipment data', async () => {
+    getCheckoutSuccessOrderSummaryMock.mockResolvedValue({
+      ok: true,
+      order: {
+        id: ORDER_ID,
+        totalAmountMinor: 1000,
+        currency: 'UAH',
+        paymentStatus: 'paid',
+        shipmentStatus: null,
+        trackingNumber: null,
+        items: [],
+      },
+    });
+
+    const mod = await import('@/app/[locale]/shop/checkout/success/page');
+    const html = renderToStaticMarkup(
+      await mod.default(
+        makePageArgs({ orderId: ORDER_ID, statusToken: 'token_test' })
+      )
+    );
+
+    expect(html).not.toContain('shipmentStatuses.');
+    expect(html).not.toContain('TRACK-123');
+  });
+
   it('keeps monobank flow on redirect status component path', async () => {
     getCheckoutSuccessOrderSummaryMock.mockResolvedValue({
       ok: true,
diff --git a/frontend/lib/tests/shop/order-status-token.test.ts b/frontend/lib/tests/shop/order-status-token.test.ts
index c55ddf13..0b49745c 100644
--- a/frontend/lib/tests/shop/order-status-token.test.ts
+++ b/frontend/lib/tests/shop/order-status-token.test.ts
@@ -4,7 +4,12 @@ import { NextRequest } from 'next/server';
 import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest';
 
 import { db } from '@/db';
-import { adminAuditLog, orders, paymentAttempts } from '@/db/schema';
+import {
+  adminAuditLog,
+  orders,
+  paymentAttempts,
+  shippingShipments,
+} from '@/db/schema';
 import { toDbMoney } from '@/lib/shop/money';
 import { createStatusToken } from '@/lib/shop/status-token';
 
@@ -25,16 +30,34 @@ afterAll(() => {
   else process.env.SHOP_STATUS_TOKEN_SECRET = __prevStatusSecret;
 });
 
-async function insertOrder(orderId: string) {
+async function insertOrder(
+  orderId: string,
+  overrides?: {
+    trackingNumber?: string | null;
+    paymentStatus?: 'pending' | 'paid';
+    status?: 'INVENTORY_RESERVED' | 'PAID';
+    shippingRequired?: boolean;
+    shippingPayer?: 'customer';
+    shippingProvider?: 'nova_poshta';
+    shippingMethodCode?: 'NP_WAREHOUSE';
+    shippingStatus?: string | null;
+  }
+) {
   await db.insert(orders).values({
     id: orderId,
     totalAmountMinor: 1000,
     totalAmount: toDbMoney(1000),
     currency: 'UAH',
     paymentProvider: 'monobank',
-    paymentStatus: 'pending',
-    status: 'INVENTORY_RESERVED',
+    paymentStatus: overrides?.paymentStatus ?? 'pending',
+    status: overrides?.status ?? 'INVENTORY_RESERVED',
     inventoryStatus: 'reserved',
+    shippingRequired: overrides?.shippingRequired ?? null,
+    shippingPayer: overrides?.shippingPayer ?? null,
+    shippingProvider: overrides?.shippingProvider ?? null,
+    shippingMethodCode: overrides?.shippingMethodCode ?? null,
+    shippingStatus: overrides?.shippingStatus ?? null,
+    trackingNumber: overrides?.trackingNumber ?? null,
     idempotencyKey: crypto.randomUUID(),
   } as any);
 }
@@ -42,9 +65,26 @@ async function insertOrder(orderId: string) {
 async function deleteOrder(orderId: string) {
   await db.delete(adminAuditLog).where(eq(adminAuditLog.orderId, orderId));
   await db.delete(paymentAttempts).where(eq(paymentAttempts.orderId, orderId));
+  await db
+    .delete(shippingShipments)
+    .where(eq(shippingShipments.orderId, orderId));
   await db.delete(orders).where(eq(orders.id, orderId));
 }
 
+async function insertShipment(args: {
+  orderId: string;
+  status: 'queued' | 'processing' | 'succeeded' | 'failed' | 'needs_attention';
+  trackingNumber?: string | null;
+}) {
+  await db.insert(shippingShipments).values({
+    id: crypto.randomUUID(),
+    orderId: args.orderId,
+    provider: 'nova_poshta',
+    status: args.status,
+    trackingNumber: args.trackingNumber ?? null,
+  } as any);
+}
+
 async function insertAttempt(args: {
   orderId: string;
   status: 'creating' | 'active' | 'succeeded' | 'failed' | 'canceled';
@@ -113,6 +153,8 @@ describe('order status token access control', () => {
       expect(json.totalAmountMinor).toBe(1000);
       expect(json.paymentStatus).toBe('pending');
       expect(json.fulfillmentStage).toBe('processing');
+      expect(json.shipmentStatus).toBeNull();
+      expect(json.trackingNumber).toBeNull();
       expect(json.itemsCount).toBe(0);
       expect(typeof json.updatedAt).toBe('string');
       expect(json.order).toBeUndefined();
@@ -129,6 +171,72 @@ describe('order status token access control', () => {
     }
   });
 
+  it('includes shipment status and tracking number when they already exist', async () => {
+    const orderId = crypto.randomUUID();
+    await insertOrder(orderId, { trackingNumber: 'TRACK-123' });
+    await insertShipment({
+      orderId,
+      status: 'succeeded',
+      trackingNumber: 'TRACK-123',
+    });
+
+    try {
+      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?view=lite&statusToken=${encodeURIComponent(
+          token
+        )}`
+      );
+      const res = await GET(req, { params: Promise.resolve({ id: orderId }) });
+      expect(res.status).toBe(200);
+
+      const json: any = await res.json();
+      expect(json.id).toBe(orderId);
+      expect(json.shipmentStatus).toBe('succeeded');
+      expect(json.trackingNumber).toBe('TRACK-123');
+    } finally {
+      await deleteOrder(orderId);
+    }
+  });
+
+  it('includes real in-flight shipment status in lite guest payload', async () => {
+    const orderId = crypto.randomUUID();
+    await insertOrder(orderId, {
+      paymentStatus: 'paid',
+      status: 'PAID',
+      shippingRequired: true,
+      shippingPayer: 'customer',
+      shippingProvider: 'nova_poshta',
+      shippingMethodCode: 'NP_WAREHOUSE',
+      shippingStatus: 'queued',
+    });
+    await insertShipment({
+      orderId,
+      status: 'processing',
+      trackingNumber: null,
+    });
+
+    try {
+      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?view=lite&statusToken=${encodeURIComponent(
+          token
+        )}`
+      );
+      const res = await GET(req, { params: Promise.resolve({ id: orderId }) });
+      expect(res.status).toBe(200);
+
+      const json: any = await res.json();
+      expect(json.id).toBe(orderId);
+      expect(json.shipmentStatus).toBe('processing');
+      expect(json.trackingNumber).toBeNull();
+    } finally {
+      await deleteOrder(orderId);
+    }
+  });
+
   it('enforces status-only scope for token users even when view=full is requested', async () => {
     const orderId = crypto.randomUUID();
     await insertOrder(orderId);
diff --git a/frontend/lib/tests/shop/public-cart-env-contract.test.ts b/frontend/lib/tests/shop/public-cart-env-contract.test.ts
new file mode 100644
index 00000000..175ac251
--- /dev/null
+++ b/frontend/lib/tests/shop/public-cart-env-contract.test.ts
@@ -0,0 +1,85 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const readServerEnvMock = vi.hoisted(() => vi.fn());
+const isMonobankEnabledMock = vi.hoisted(() => vi.fn());
+const isStripePaymentsEnabledMock = vi.hoisted(() => vi.fn());
+
+vi.mock('@/lib/env/server-env', () => ({
+  readServerEnv: (key: string) => readServerEnvMock(key),
+}));
+
+vi.mock('@/lib/env/monobank', () => ({
+  isMonobankEnabled: () => isMonobankEnabledMock(),
+}));
+
+vi.mock('@/lib/env/stripe', () => ({
+  isPaymentsEnabled: (args?: unknown) => isStripePaymentsEnabledMock(args),
+}));
+
+describe('public cart env contract', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.resetModules();
+  });
+
+  it('resolves monobank checkout from readServerEnv PAYMENTS_ENABLED before checking provider capability', async () => {
+    readServerEnvMock.mockImplementation((key: string) =>
+      key === 'PAYMENTS_ENABLED' ? 'true' : undefined
+    );
+    isMonobankEnabledMock.mockReturnValue(true);
+
+    const mod = await import('@/app/[locale]/shop/cart/capabilities');
+    const enabled = mod.resolveMonobankCheckoutEnabled();
+
+    expect(enabled).toBe(true);
+    expect(readServerEnvMock).toHaveBeenCalledWith('PAYMENTS_ENABLED');
+    expect(isMonobankEnabledMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not check monobank provider capability when readServerEnv PAYMENTS_ENABLED is disabled', async () => {
+    readServerEnvMock.mockImplementation(() => 'false');
+
+    const mod = await import('@/app/[locale]/shop/cart/capabilities');
+    const enabled = mod.resolveMonobankCheckoutEnabled();
+
+    expect(enabled).toBe(false);
+    expect(readServerEnvMock).toHaveBeenCalledWith('PAYMENTS_ENABLED');
+    expect(isMonobankEnabledMock).not.toHaveBeenCalled();
+  });
+
+  it('resolves monobank google pay from readServerEnv SHOP_MONOBANK_GPAY_ENABLED', async () => {
+    readServerEnvMock.mockImplementation((key: string) => {
+      if (key === 'PAYMENTS_ENABLED') return 'true';
+      if (key === 'SHOP_MONOBANK_GPAY_ENABLED') return 'on';
+      return undefined;
+    });
+    isMonobankEnabledMock.mockReturnValue(true);
+
+    const mod = await import('@/app/[locale]/shop/cart/capabilities');
+    const enabled = mod.resolveMonobankGooglePayEnabled();
+
+    expect(enabled).toBe(true);
+    expect(readServerEnvMock).toHaveBeenCalledWith('PAYMENTS_ENABLED');
+    expect(readServerEnvMock).toHaveBeenCalledWith(
+      'SHOP_MONOBANK_GPAY_ENABLED'
+    );
+  });
+
+  it('reads legal versions through readServerEnv and keeps existing defaults', async () => {
+    readServerEnvMock.mockImplementation((key: string) => {
+      if (key === 'SHOP_TERMS_VERSION') return 'terms-v7';
+      if (key === 'SHOP_PRIVACY_VERSION') return undefined;
+      return undefined;
+    });
+
+    const mod = await import('@/lib/env/shop-legal');
+    const versions = mod.getShopLegalVersions();
+
+    expect(versions).toEqual({
+      termsVersion: 'terms-v7',
+      privacyVersion: 'privacy-v1',
+    });
+    expect(readServerEnvMock).toHaveBeenCalledWith('SHOP_TERMS_VERSION');
+    expect(readServerEnvMock).toHaveBeenCalledWith('SHOP_PRIVACY_VERSION');
+  });
+});
diff --git a/frontend/lib/tests/shop/public-shop-runtime-cache-smoke.test.ts b/frontend/lib/tests/shop/public-shop-runtime-cache-smoke.test.ts
new file mode 100644
index 00000000..76e197ff
--- /dev/null
+++ b/frontend/lib/tests/shop/public-shop-runtime-cache-smoke.test.ts
@@ -0,0 +1,306 @@
+import { createElement, type ReactNode } from 'react';
+import { renderToStaticMarkup } from 'react-dom/server';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+
+const getHomepageContentMock = vi.hoisted(() => vi.fn());
+const getCatalogProductsMock = vi.hoisted(() => vi.fn());
+const getProductPageDataMock = vi.hoisted(() => vi.fn());
+const redirectMock = vi.hoisted(() => vi.fn());
+const notFoundMock = vi.hoisted(() => vi.fn());
+const getMessagesMock = vi.hoisted(() => vi.fn(async () => ({ shop: {} })));
+const resolveStripeCheckoutEnabledMock = vi.hoisted(() => vi.fn(() => true));
+const resolveMonobankCheckoutEnabledMock = vi.hoisted(() => vi.fn(() => false));
+const resolveMonobankGooglePayEnabledMock = vi.hoisted(() =>
+  vi.fn(() => false)
+);
+const getShopLegalVersionsMock = vi.hoisted(() =>
+  vi.fn(() => ({
+    termsVersion: 'terms-v1',
+    privacyVersion: 'privacy-v1',
+  }))
+);
+const cartPageClientMock = vi.hoisted(() =>
+  vi.fn(() => createElement('div', null, 'cart-page-client'))
+);
+
+vi.mock('next-intl/server', () => ({
+  getMessages: getMessagesMock,
+  getTranslations: vi.fn(async () => (key: string) => key),
+}));
+
+vi.mock('next/navigation', () => ({
+  notFound: notFoundMock,
+}));
+
+vi.mock('@/i18n/routing', () => ({
+  Link: ({ children, href }: { children: ReactNode; href?: string }) =>
+    createElement('a', { href }, children),
+  redirect: redirectMock,
+}));
+
+vi.mock('@/lib/shop/data', () => ({
+  getHomepageContent: getHomepageContentMock,
+  getCatalogProducts: getCatalogProductsMock,
+  getProductGalleryImages: vi.fn(
+    (product: { images?: Array<unknown> }) => product.images ?? []
+  ),
+  getProductPageData: getProductPageDataMock,
+}));
+
+vi.mock('@/lib/shop/availability', () => ({
+  getStorefrontAvailabilityState: vi.fn(() => 'available_to_order'),
+}));
+
+vi.mock('@/lib/shop/currency', async importOriginal => {
+  const actual = await importOriginal<typeof import('@/lib/shop/currency')>();
+
+  return {
+    ...actual,
+    formatMoney: vi.fn(() => '$49.99'),
+  };
+});
+
+vi.mock('@/lib/shop/size-guide', () => ({
+  getApparelSizeGuideForProduct: vi.fn(() => null),
+}));
+
+vi.mock('@/components/shop/CategoryTile', () => ({
+  CategoryTile: ({
+    category,
+  }: {
+    category: {
+      name: string;
+    };
+  }) => createElement('div', null, category.name),
+}));
+
+vi.mock('@/components/shop/ProductCard', () => ({
+  ProductCard: ({
+    product,
+  }: {
+    product: {
+      name: string;
+    };
+  }) => createElement('div', null, product.name),
+}));
+
+vi.mock('@/components/shop/ShopHero', () => ({
+  Hero: ({
+    headline,
+    subheadline,
+    ctaText,
+  }: {
+    headline: string;
+    subheadline: string;
+    ctaText: string;
+  }) =>
+    createElement(
+      'section',
+      null,
+      createElement('h1', null, headline),
+      createElement('p', null, subheadline),
+      createElement('span', null, ctaText)
+    ),
+}));
+
+vi.mock('@/components/shop/CatalogProductsClient', () => ({
+  CatalogProductsClient: ({
+    initialCatalog,
+  }: {
+    initialCatalog: {
+      products: Array<{ name: string }>;
+    };
+  }) =>
+    createElement(
+      'div',
+      null,
+      ...initialCatalog.products.map(product =>
+        createElement('span', { key: product.name }, product.name)
+      )
+    ),
+}));
+
+vi.mock('@/components/shop/ProductFilters', () => ({
+  ProductFilters: () => createElement('div', null, 'filters'),
+}));
+
+vi.mock('@/components/shop/ProductsToolbar', () => ({
+  ProductsToolbar: () => createElement('div', null, 'toolbar'),
+}));
+
+vi.mock('@/components/shop/AddToCartButton', () => ({
+  AddToCartButton: () =>
+    createElement('button', { type: 'button' }, 'add to cart'),
+}));
+
+vi.mock('@/components/shop/ProductGallery', () => ({
+  ProductGallery: ({ productName }: { productName: string }) =>
+    createElement('div', null, productName),
+}));
+
+vi.mock('@/lib/env/shop-legal', () => ({
+  getShopLegalVersions: getShopLegalVersionsMock,
+}));
+
+vi.mock('@/app/[locale]/shop/cart/capabilities', () => ({
+  resolveMonobankCheckoutEnabled: resolveMonobankCheckoutEnabledMock,
+  resolveMonobankGooglePayEnabled: resolveMonobankGooglePayEnabledMock,
+  resolveStripeCheckoutEnabled: resolveStripeCheckoutEnabledMock,
+}));
+
+vi.mock('@/app/[locale]/shop/cart/CartPageClient', () => ({
+  default: cartPageClientMock,
+}));
+
+describe('public shop runtime/cache smoke', () => {
+  beforeEach(() => {
+    vi.clearAllMocks();
+    vi.resetModules();
+
+    getMessagesMock.mockResolvedValue({ shop: {} });
+    getHomepageContentMock.mockResolvedValue({
+      newArrivals: [
+        {
+          id: 'prod-home-1',
+          name: 'DevLovers Hoodie',
+        },
+      ],
+      categories: [
+        {
+          id: 'cat-home-1',
+          name: 'Hoodies',
+          slug: 'hoodies',
+          image: '/hoodies.jpg',
+        },
+      ],
+    });
+    getCatalogProductsMock.mockResolvedValue({
+      products: [
+        {
+          id: 'prod-catalog-1',
+          name: 'DevLovers Mug',
+        },
+      ],
+      total: 1,
+      page: 1,
+      pageSize: 24,
+      hasMore: false,
+    });
+    getProductPageDataMock.mockResolvedValue({
+      kind: 'available',
+      product: {
+        id: 'prod-pdp-1',
+        slug: 'devlovers-mug',
+        name: 'DevLovers Mug',
+        image: '/mug.jpg',
+        images: [
+          {
+            id: 'img-pdp-1',
+            url: '/mug.jpg',
+            publicId: null,
+            sortOrder: 0,
+            isPrimary: true,
+          },
+        ],
+        badge: 'NONE',
+        description: 'A mug for engineers.',
+      },
+      commerceProduct: {
+        id: 'prod-pdp-1',
+        slug: 'devlovers-mug',
+        name: 'DevLovers Mug',
+        price: 4999,
+        currency: 'USD',
+        image: '/mug.jpg',
+        images: [
+          {
+            id: 'img-pdp-1',
+            url: '/mug.jpg',
+            publicId: null,
+            sortOrder: 0,
+            isPrimary: true,
+          },
+        ],
+        badge: 'NONE',
+        inStock: true,
+      },
+    });
+  });
+
+  it('keeps the shop landing page on explicit node runtime and dynamic cache posture while rendering storefront data', async () => {
+    const mod = await import('@/app/[locale]/shop/page');
+    const html = renderToStaticMarkup(
+      await mod.default({
+        params: Promise.resolve({ locale: 'en' }),
+      })
+    );
+
+    expect(mod.runtime).toBe('nodejs');
+    expect(mod.dynamic).toBe('force-dynamic');
+    expect(getHomepageContentMock).toHaveBeenCalledWith('en');
+    expect(html).toContain('DevLovers Hoodie');
+    expect(html).toContain('Hoodies');
+  });
+
+  it('keeps the products listing on explicit node runtime and dynamic cache posture while resolving catalog filters', async () => {
+    const mod = await import('@/app/[locale]/shop/products/page');
+    const html = renderToStaticMarkup(
+      await mod.default({
+        params: Promise.resolve({ locale: 'en' }),
+        searchParams: Promise.resolve({ page: '1', sort: 'newest' }),
+      })
+    );
+
+    expect(mod.runtime).toBe('nodejs');
+    expect(mod.dynamic).toBe('force-dynamic');
+    expect(redirectMock).not.toHaveBeenCalled();
+    expect(getCatalogProductsMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        page: 1,
+        limit: expect.any(Number),
+        sort: 'newest',
+      }),
+      'en'
+    );
+    expect(html).toContain('DevLovers Mug');
+  });
+
+  it('keeps the product detail page on explicit node runtime and dynamic cache posture while resolving the requested slug', async () => {
+    const mod = await import('@/app/[locale]/shop/products/[slug]/page');
+    const html = renderToStaticMarkup(
+      await mod.default({
+        params: Promise.resolve({ locale: 'en', slug: 'devlovers-mug' }),
+      })
+    );
+
+    expect(mod.runtime).toBe('nodejs');
+    expect(mod.dynamic).toBe('force-dynamic');
+    expect(getProductPageDataMock).toHaveBeenCalledWith('devlovers-mug', 'en');
+    expect(notFoundMock).not.toHaveBeenCalled();
+    expect(html).toContain('DevLovers Mug');
+    expect(html).toContain('add to cart');
+  });
+
+  it('keeps the cart page on explicit node runtime and dynamic cache posture while resolving server-side checkout capabilities', async () => {
+    const mod = await import('@/app/[locale]/shop/cart/page');
+    const html = renderToStaticMarkup(mod.default());
+
+    expect(mod.runtime).toBe('nodejs');
+    expect(mod.dynamic).toBe('force-dynamic');
+    expect(html).toContain('cart-page-client');
+    expect(getShopLegalVersionsMock).toHaveBeenCalledTimes(1);
+    expect(resolveStripeCheckoutEnabledMock).toHaveBeenCalledTimes(1);
+    expect(resolveMonobankCheckoutEnabledMock).toHaveBeenCalledTimes(1);
+    expect(resolveMonobankGooglePayEnabledMock).toHaveBeenCalledTimes(1);
+    expect(cartPageClientMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        stripeEnabled: true,
+        monobankEnabled: false,
+        monobankGooglePayEnabled: false,
+        termsVersion: 'terms-v1',
+        privacyVersion: 'privacy-v1',
+      }),
+      undefined
+    );
+  });
+});
diff --git a/frontend/lib/types/shop.ts b/frontend/lib/types/shop.ts
index 845f07e3..5d9076be 100644
--- a/frontend/lib/types/shop.ts
+++ b/frontend/lib/types/shop.ts
@@ -46,6 +46,8 @@ export type CheckoutLegalConsentInput = z.infer<
 
 export type OrderSummary = z.infer<typeof orderSummarySchema> & {
   totalCents?: number;
+  shipmentStatus?: string | null;
+  trackingNumber?: string | null;
 };
 
 export type OrderDetail = OrderSummary;
diff --git a/frontend/lib/validation/shop-admin-shipping.ts b/frontend/lib/validation/shop-admin-shipping.ts
new file mode 100644
index 00000000..2520f39e
--- /dev/null
+++ b/frontend/lib/validation/shop-admin-shipping.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+
+import { checkoutShippingSchema } from '@/lib/validation/shop';
+
+export const adminOrderShippingEditSchema = checkoutShippingSchema;
+
+export type AdminOrderShippingEditInput = z.infer<
+  typeof adminOrderShippingEditSchema
+>;
diff --git a/frontend/lib/validation/shop.ts b/frontend/lib/validation/shop.ts
index 9a87186c..0b432acc 100644
--- a/frontend/lib/validation/shop.ts
+++ b/frontend/lib/validation/shop.ts
@@ -7,6 +7,7 @@ import {
   PRODUCT_TYPES,
   SIZES,
   SORT_OPTIONS,
+  STOREFRONT_CATEGORIES,
 } from '@/lib/config/catalog';
 import { currencyValues } from '@/lib/shop/currency';
 import {
@@ -62,6 +63,7 @@ const searchParamString = z
   });
 
 const categoryValues = CATEGORIES.map(c => c.slug);
+const storefrontCategoryValues = STOREFRONT_CATEGORIES.map(c => c.slug);
 const productCategoryValues = categoryValues.filter(slug => slug !== 'all');
 const typeValues = PRODUCT_TYPES.map(t => t.slug);
 const colorValues = COLORS.map(c => c.slug);
@@ -71,7 +73,7 @@ const enumSearchParam = <T extends readonly [string, ...string[]]>(values: T) =>
   searchParamString.pipe(z.enum(values).optional());
 
 const categoryParam = enumSearchParam(
-  categoryValues as [string, ...string[]]
+  storefrontCategoryValues as [string, ...string[]]
 ).transform(value => (value === 'all' ? undefined : value));
 const typeParam = enumSearchParam(typeValues as [string, ...string[]]);
 const colorParam = enumSearchParam(colorValues as [string, ...string[]]);
@@ -92,7 +94,7 @@ export const catalogQuerySchema = z
 export const catalogFilterSchema = z
   .object({
     category: z
-      .enum(categoryValues as [string, ...string[]])
+      .enum(storefrontCategoryValues as [string, ...string[]])
       .optional()
       .transform(value => (value === 'all' ? undefined : value)),
     type: z.enum(typeValues as [string, ...string[]]).optional(),
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index a075c799..5c7d5e60 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -822,6 +822,11 @@
         "openOrder": "Open order {id}",
         "orderId": "Order ID"
       },
+      "card": {
+        "orderNumber": "Order {id}",
+        "placedOn": "Placed on {date}",
+        "itemsCount": "{count, plural, one {# item} other {# items}}"
+      },
       "orderHeadline": {
         "incomplete": "Order {id} (incomplete)",
         "withMore": "{item} +{count} more",
@@ -839,81 +844,106 @@
         "title": "Order",
         "myOrders": "My orders",
         "shop": "Shop",
+        "orderReference": "Order details",
+        "orderNumber": "Order {id}",
+        "orderNumberLabel": "Reference: {id}",
+        "placedOn": "Placed on {date}",
         "orderSummary": "Order summary",
         "customerSummary": "Customer summary",
         "lifecycle": {
-            "eyebrow": "Order state",
-            "heading": "Status updates",
-            "subtitle": "Use these when you need to move the order to its next safe state.",
-            "confirm": "Confirm",
-            "cancel": "Cancel",
-            "complete": "Complete",
-            "errors": {
-              "confirmRequiresPaid": "Only paid orders can be confirmed.",
-              "confirmNotAllowed": "This order cannot be confirmed in its current state.",
-              "cancelRequiresRefund": "Paid orders must use refund flow instead of cancel.",
-              "completeRequiresShipping": "Only shippable orders can be completed.",
-              "completeNotAllowed": "This order cannot be completed in its current state.",
-              "csrfRejected": "Security validation failed. Refresh and try again.",
-              "invalidPayload": "Invalid lifecycle action request.",
-              "internalError": "Lifecycle action failed. Please try again.",
-              "generic": "Lifecycle action is not available in the current state."
-            }
-          },
+          "eyebrow": "Order state",
+          "heading": "Status updates",
+          "subtitle": "Use these when you need to move the order to its next safe state.",
+          "confirm": "Confirm",
+          "cancel": "Cancel",
+          "complete": "Complete",
+          "errors": {
+            "confirmRequiresPaid": "Only paid orders can be confirmed.",
+            "confirmNotAllowed": "This order cannot be confirmed in its current state.",
+            "cancelRequiresRefund": "Paid orders must use refund flow instead of cancel.",
+            "completeRequiresShipping": "Only shippable orders can be completed.",
+            "completeNotAllowed": "This order cannot be completed in its current state.",
+            "csrfRejected": "Security validation failed. Refresh and try again.",
+            "invalidPayload": "Invalid lifecycle action request.",
+            "internalError": "Lifecycle action failed. Please try again.",
+            "generic": "Lifecycle action is not available in the current state."
+          }
+        },
         "actions": {
-            "heading": "Admin actions",
-            "subtitle": "Choose the next safe step for this order. Only actions that fit the current state are shown.",
-            "empty": "No admin actions are available for the current state."
-          },
+          "heading": "Admin actions",
+          "subtitle": "Choose the next safe step for this order. Only actions that fit the current state are shown.",
+          "empty": "No admin actions are available for the current state."
+        },
         "shippingControls": {
-            "eyebrow": "Shipping",
-            "heading": "Shipment handling",
-            "subtitle": "Recover or advance delivery only when the shipment is ready for it.",
-            "recoverInitialShipment": "Recover shipment",
-            "retryLabelCreation": "Retry label",
-            "markShipped": "Mark shipped",
-            "markDelivered": "Mark delivered",
-            "errors": {
-              "network": "Shipping action failed to send. Try again.",
-              "security": "Security check failed. Refresh the page and try again.",
-              "recoverNotAvailable": "Shipment recovery is no longer available for this order.",
-              "shipmentMissing": "There is no shipment record to update yet.",
-              "retryNotAvailable": "Label retry is not available in the current shipment state.",
-              "transitionNotAvailable": "This shipping step is no longer available for the current order state.",
-              "adminDisabled": "Admin shipping actions are currently unavailable.",
-              "generic": "Shipping action could not be completed. Refresh the order and try again."
-            }
-          },
+          "eyebrow": "Shipping",
+          "heading": "Shipment handling",
+          "subtitle": "Recover or advance delivery only when the shipment is ready for it.",
+          "recoverInitialShipment": "Recover shipment",
+          "retryLabelCreation": "Retry label",
+          "markShipped": "Mark shipped",
+          "markDelivered": "Mark delivered",
+          "errors": {
+            "network": "Shipping action failed to send. Try again.",
+            "security": "Security check failed. Refresh the page and try again.",
+            "recoverNotAvailable": "Shipment recovery is no longer available for this order.",
+            "shipmentMissing": "There is no shipment record to update yet.",
+            "retryNotAvailable": "Label retry is not available in the current shipment state.",
+            "transitionNotAvailable": "This shipping step is no longer available for the current order state.",
+            "adminDisabled": "Admin shipping actions are currently unavailable.",
+            "generic": "Shipping action could not be completed. Refresh the order and try again."
+          }
+        },
+        "shippingEditor": {
+          "heading": "Edit shipping details",
+          "subtitle": "Save only validated Nova Poshta refs and recipient details for this order.",
+          "cityRef": "City ref",
+          "pickupPointRef": "Pickup point ref",
+          "addressLine1": "Courier address",
+          "addressLine2": "Address details",
+          "currentCity": "Current city: {city}",
+          "currentPickupPoint": "Current pickup point: {pickupPoint}",
+          "save": "Save shipping details",
+          "saving": "Saving...",
+          "errors": {
+            "network": "Shipping edit failed to send. Try again.",
+            "security": "Security check failed. Refresh the page and try again.",
+            "invalid": "Shipping details are invalid. Check the form and try again.",
+            "notAllowed": "Shipping details can no longer be edited for this order.",
+            "adminDisabled": "Admin shipping edits are currently unavailable.",
+            "generic": "Shipping details could not be updated. Refresh the order and try again."
+          }
+        },
         "paymentControls": {
-            "eyebrow": "Payment",
-            "heading": "Payment handling",
-            "subtitle": "Use the payment tools below only when this order needs financial follow-up.",
-            "refund": "Refund payment",
-            "refunding": "Refunding…",
-            "onlyForPaidStripe": "Refund is only available for paid Stripe orders",
-            "cancelUnpaidPayment": "Cancel unpaid payment",
-            "cancelingPayment": "Canceling payment…",
-            "onlyForUnpaidMonobank": "This action is only available for unpaid Monobank orders",
-            "errors": {
-              "network": "Payment action failed to send. Try again.",
-              "security": "Security check failed. Refresh the page and try again.",
-              "refundNotAvailable": "Refund is no longer available for this order.",
-              "cancelPaymentDisabled": "Payment cancel is currently unavailable.",
-              "cancelPaymentNotAvailable": "Unpaid cancel is no longer available for this order.",
-              "cancelPaymentInProgress": "Payment cancel is already being processed. Refresh in a moment.",
-              "missingPaymentReference": "The payment provider reference is missing, so this action cannot run automatically.",
-              "invalidAmount": "Order amount data is incomplete, so refund cannot start automatically.",
-              "providerUnavailable": "The payment provider is temporarily unavailable. Try again later.",
-              "adminDisabled": "Admin payment actions are currently unavailable.",
-              "generic": "Payment action could not be completed. Refresh the order and try again."
-            }
-          },
+          "eyebrow": "Payment",
+          "heading": "Payment handling",
+          "subtitle": "Use the payment tools below only when this order needs financial follow-up.",
+          "refund": "Refund payment",
+          "refunding": "Refunding…",
+          "onlyForPaidStripe": "Refund is only available for paid Stripe orders",
+          "cancelUnpaidPayment": "Cancel unpaid payment",
+          "cancelingPayment": "Canceling payment…",
+          "onlyForUnpaidMonobank": "This action is only available for unpaid Monobank orders",
+          "errors": {
+            "network": "Payment action failed to send. Try again.",
+            "security": "Security check failed. Refresh the page and try again.",
+            "refundNotAvailable": "Refund is no longer available for this order.",
+            "cancelPaymentDisabled": "Payment cancel is currently unavailable.",
+            "cancelPaymentNotAvailable": "Unpaid cancel is no longer available for this order.",
+            "cancelPaymentInProgress": "Payment cancel is already being processed. Refresh in a moment.",
+            "missingPaymentReference": "The payment provider reference is missing, so this action cannot run automatically.",
+            "invalidAmount": "Order amount data is incomplete, so refund cannot start automatically.",
+            "providerUnavailable": "The payment provider is temporarily unavailable. Try again later.",
+            "adminDisabled": "Admin payment actions are currently unavailable.",
+            "generic": "Payment action could not be completed. Refresh the order and try again."
+          }
+        },
         "customerAccount": "Customer account",
         "accountUnavailable": "Registered account",
         "guest": "Guest checkout",
         "total": "Total",
         "paymentStatus": "Payment status",
         "fulfillmentStage": "Fulfillment stage",
+        "delivery": "Delivery",
         "created": "Created",
         "provider": "Provider",
         "shippingProviderLabel": "Shipping provider",
@@ -939,6 +969,8 @@
         "no": "No",
         "shippingStatus": "Shipping status",
         "trackingNumber": "Tracking number",
+        "trackingPending": "Tracking details will appear after shipment",
+        "deliveryPending": "Preparing shipment",
         "shippingProviders": {
           "novaPoshta": "Nova Poshta"
         },
@@ -946,6 +978,14 @@
           "stripe": "Stripe",
           "monobank": "Monobank"
         },
+        "paymentStatuses": {
+          "paid": "Paid",
+          "pending": "Pending",
+          "requiresPayment": "Payment required",
+          "failed": "Failed",
+          "refunded": "Refunded",
+          "needsReview": "Needs review"
+        },
         "shippingMethods": {
           "novaPoshtaWarehouse": "Nova Poshta warehouse",
           "novaPoshtaLocker": "Nova Poshta parcel locker",
@@ -982,16 +1022,19 @@
             "confirm": "Confirmed order",
             "cancel": "Canceled order",
             "complete": "Completed order",
+            "refund": "Requested refund",
+            "cancelPayment": "Canceled unpaid payment",
             "recoverInitialShipment": "Recovered initial shipment",
             "retryLabelCreation": "Retried label creation",
             "markShipped": "Marked as shipped",
-            "markDelivered": "Marked as delivered"
+            "markDelivered": "Marked as delivered",
+            "editShipping": "Edited shipping details"
           }
         },
         "fulfillmentStages": {
-            "processing": "Processing",
-            "packed": "Packed",
-            "shipped": "Shipped",
+          "processing": "Processing",
+          "packed": "Packed",
+          "shipped": "Shipped",
           "delivered": "Delivered",
           "canceled": "Canceled",
           "returned": "Returned"
diff --git a/frontend/messages/pl.json b/frontend/messages/pl.json
index 9a25352d..7a9111e0 100644
--- a/frontend/messages/pl.json
+++ b/frontend/messages/pl.json
@@ -482,13 +482,13 @@
         "message": "Zostaniesz przekierowany do bezpiecznej płatności lub zobaczysz potwierdzenie, jeśli płatność nie jest wymagana w tym środowisku",
         "notRedirected": "Jeśli nie zostałeś automatycznie przekierowany, otwórz swoje zamówienie",
         "goToOrder": "Przejdź do zamówienia",
-      "consent": {
-        "prefix": "Potwierdzam akceptację",
-        "termsLink": "Warunki świadczenia usług",
-        "and": "oraz",
-        "privacyLink": "Politykę prywatności",
-        "suffix": " dla tego zamówienia.",
-        "required": "Potwierdź akceptację Warunków świadczenia usług i Polityki prywatności przed złożeniem zamówienia."
+        "consent": {
+          "prefix": "Potwierdzam akceptację",
+          "termsLink": "Warunki świadczenia usług",
+          "and": "oraz",
+          "privacyLink": "Politykę prywatności",
+          "suffix": " dla tego zamówienia.",
+          "required": "Potwierdź akceptację Warunków świadczenia usług i Polityki prywatności przed złożeniem zamówienia."
         },
         "errors": {
           "unexpectedResponse": "Nieoczekiwana odpowiedź checkout.",
@@ -822,6 +822,11 @@
         "openOrder": "Otwórz zamówienie {id}",
         "orderId": "ID zamówienia"
       },
+      "card": {
+        "orderNumber": "Zamówienie {id}",
+        "placedOn": "Złożono {date}",
+        "itemsCount": "{count, plural, one {# produkt} few {# produkty} many {# produktów} other {# produktu}}"
+      },
       "orderHeadline": {
         "incomplete": "Zamówienie {id} (niekompletne)",
         "withMore": "{item} +{count} więcej",
@@ -839,81 +844,106 @@
         "title": "Zamówienie",
         "myOrders": "Moje zamówienia",
         "shop": "Sklep",
+        "orderReference": "Szczegóły zamówienia",
+        "orderNumber": "Zamówienie {id}",
+        "orderNumberLabel": "Numer do kontaktu: {id}",
+        "placedOn": "Złożono {date}",
         "orderSummary": "Podsumowanie zamówienia",
-          "customerSummary": "Podsumowanie klienta",
-          "lifecycle": {
-            "eyebrow": "Stan zamówienia",
-            "heading": "Aktualizacja statusu",
-            "subtitle": "Używaj tych akcji, gdy trzeba bezpiecznie przesunąć zamówienie do następnego etapu.",
-            "confirm": "Potwierdź",
-            "cancel": "Anuluj",
-            "complete": "Zakończ",
-            "errors": {
-              "confirmRequiresPaid": "Potwierdzić można tylko opłacone zamówienia.",
-              "confirmNotAllowed": "Nie można potwierdzić tego zamówienia w bieżącym stanie.",
-              "cancelRequiresRefund": "Dla opłaconych zamówień należy użyć zwrotu, a nie anulowania.",
-              "completeRequiresShipping": "Zakończyć można tylko zamówienia z wysyłką.",
-              "completeNotAllowed": "Nie można zakończyć tego zamówienia w bieżącym stanie.",
-              "csrfRejected": "Weryfikacja bezpieczeństwa nie powiodła się. Odśwież stronę i spróbuj ponownie.",
-              "invalidPayload": "Nieprawidłowe żądanie lifecycle.",
-              "internalError": "Nie udało się wykonać akcji lifecycle. Spróbuj ponownie.",
-              "generic": "Akcja lifecycle nie jest dostępna w bieżącym stanie."
-            }
-          },
-          "actions": {
-            "heading": "Akcje administratora",
-            "subtitle": "Wybierz następny bezpieczny krok dla tego zamówienia. Pokazujemy tylko działania pasujące do bieżącego stanu.",
-            "empty": "Brak dostępnych akcji administratora dla bieżącego stanu."
-          },
-          "shippingControls": {
-            "eyebrow": "Wysyłka",
-            "heading": "Obsługa przesyłki",
-            "subtitle": "Odzyskuj lub przesuwaj dostawę tylko wtedy, gdy przesyłka jest już do tego gotowa.",
-            "recoverInitialShipment": "Odzyskaj przesyłkę",
-            "retryLabelCreation": "Ponów etykietę",
-            "markShipped": "Oznacz jako wysłane",
-            "markDelivered": "Oznacz jako dostarczone",
-            "errors": {
-              "network": "Nie udało się wysłać akcji wysyłki. Spróbuj ponownie.",
-              "security": "Weryfikacja bezpieczeństwa nie powiodła się. Odśwież stronę i spróbuj ponownie.",
-              "recoverNotAvailable": "Odzyskanie przesyłki nie jest już dostępne dla tego zamówienia.",
-              "shipmentMissing": "Nie ma jeszcze rekordu przesyłki, który można zaktualizować.",
-              "retryNotAvailable": "Ponowienie etykiety nie jest teraz dostępne dla tego stanu przesyłki.",
-              "transitionNotAvailable": "Ten krok wysyłki nie jest już dostępny dla bieżącego stanu zamówienia.",
-              "adminDisabled": "Akcje wysyłki administratora są obecnie niedostępne.",
-              "generic": "Nie udało się wykonać akcji wysyłki. Odśwież zamówienie i spróbuj ponownie."
-            }
-          },
-          "paymentControls": {
-            "eyebrow": "Płatność",
-            "heading": "Obsługa płatności",
-            "subtitle": "Używaj narzędzi płatniczych tylko wtedy, gdy zamówienie wymaga finansowej obsługi.",
-            "refund": "Zwróć płatność",
-            "refunding": "Zwrot płatności…",
-            "onlyForPaidStripe": "Zwrot jest dostępny tylko dla opłaconych zamówień Stripe",
-            "cancelUnpaidPayment": "Anuluj nieopłaconą płatność",
-            "cancelingPayment": "Anulowanie płatności…",
-            "onlyForUnpaidMonobank": "Ta akcja jest dostępna tylko dla nieopłaconych zamówień Monobank",
-            "errors": {
-              "network": "Nie udało się wysłać akcji płatności. Spróbuj ponownie.",
-              "security": "Weryfikacja bezpieczeństwa nie powiodła się. Odśwież stronę i spróbuj ponownie.",
-              "refundNotAvailable": "Zwrot nie jest już dostępny dla tego zamówienia.",
-              "cancelPaymentDisabled": "Anulowanie płatności jest obecnie niedostępne.",
-              "cancelPaymentNotAvailable": "Anulowanie nieopłaconej płatności nie jest już dostępne dla tego zamówienia.",
-              "cancelPaymentInProgress": "Anulowanie płatności jest już przetwarzane. Odśwież stronę za chwilę.",
-              "missingPaymentReference": "Brakuje identyfikatora płatności u dostawcy, więc tej akcji nie da się wykonać automatycznie.",
-              "invalidAmount": "Dane kwoty zamówienia są niepełne, więc automatyczny zwrot nie może wystartować.",
-              "providerUnavailable": "Dostawca płatności jest chwilowo niedostępny. Spróbuj później.",
-              "adminDisabled": "Akcje płatności administratora są obecnie niedostępne.",
-              "generic": "Nie udało się wykonać akcji płatności. Odśwież zamówienie i spróbuj ponownie."
-            }
-          },
-          "customerAccount": "Konto klienta",
+        "customerSummary": "Podsumowanie klienta",
+        "lifecycle": {
+          "eyebrow": "Stan zamówienia",
+          "heading": "Aktualizacja statusu",
+          "subtitle": "Używaj tych akcji, gdy trzeba bezpiecznie przesunąć zamówienie do następnego etapu.",
+          "confirm": "Potwierdź",
+          "cancel": "Anuluj",
+          "complete": "Zakończ",
+          "errors": {
+            "confirmRequiresPaid": "Potwierdzić można tylko opłacone zamówienia.",
+            "confirmNotAllowed": "Nie można potwierdzić tego zamówienia w bieżącym stanie.",
+            "cancelRequiresRefund": "Dla opłaconych zamówień należy użyć zwrotu, a nie anulowania.",
+            "completeRequiresShipping": "Zakończyć można tylko zamówienia z wysyłką.",
+            "completeNotAllowed": "Nie można zakończyć tego zamówienia w bieżącym stanie.",
+            "csrfRejected": "Weryfikacja bezpieczeństwa nie powiodła się. Odśwież stronę i spróbuj ponownie.",
+            "invalidPayload": "Nieprawidłowe żądanie lifecycle.",
+            "internalError": "Nie udało się wykonać akcji lifecycle. Spróbuj ponownie.",
+            "generic": "Akcja lifecycle nie jest dostępna w bieżącym stanie."
+          }
+        },
+        "actions": {
+          "heading": "Akcje administratora",
+          "subtitle": "Wybierz następny bezpieczny krok dla tego zamówienia. Pokazujemy tylko działania pasujące do bieżącego stanu.",
+          "empty": "Brak dostępnych akcji administratora dla bieżącego stanu."
+        },
+        "shippingControls": {
+          "eyebrow": "Wysyłka",
+          "heading": "Obsługa przesyłki",
+          "subtitle": "Odzyskuj lub przesuwaj dostawę tylko wtedy, gdy przesyłka jest już do tego gotowa.",
+          "recoverInitialShipment": "Odzyskaj przesyłkę",
+          "retryLabelCreation": "Ponów etykietę",
+          "markShipped": "Oznacz jako wysłane",
+          "markDelivered": "Oznacz jako dostarczone",
+          "errors": {
+            "network": "Nie udało się wysłać akcji wysyłki. Spróbuj ponownie.",
+            "security": "Weryfikacja bezpieczeństwa nie powiodła się. Odśwież stronę i spróbuj ponownie.",
+            "recoverNotAvailable": "Odzyskanie przesyłki nie jest już dostępne dla tego zamówienia.",
+            "shipmentMissing": "Nie ma jeszcze rekordu przesyłki, który można zaktualizować.",
+            "retryNotAvailable": "Ponowienie etykiety nie jest teraz dostępne dla tego stanu przesyłki.",
+            "transitionNotAvailable": "Ten krok wysyłki nie jest już dostępny dla bieżącego stanu zamówienia.",
+            "adminDisabled": "Akcje wysyłki administratora są obecnie niedostępne.",
+            "generic": "Nie udało się wykonać akcji wysyłki. Odśwież zamówienie i spróbuj ponownie."
+          }
+        },
+        "shippingEditor": {
+          "heading": "Edytuj dane dostawy",
+          "subtitle": "Zapisuj tylko zweryfikowane referencje Nova Poshta i dane odbiorcy dla tego zam\u00f3wienia.",
+          "cityRef": "Referencja miasta",
+          "pickupPointRef": "Referencja punktu odbioru",
+          "addressLine1": "Adres kuriera",
+          "addressLine2": "Szczeg\u00f3\u0142y adresu",
+          "currentCity": "Obecne miasto: {city}",
+          "currentPickupPoint": "Obecny punkt odbioru: {pickupPoint}",
+          "save": "Zapisz dane dostawy",
+          "saving": "Zapisywanie...",
+          "errors": {
+            "network": "Nie uda\u0142o si\u0119 wys\u0142a\u0107 edycji dostawy. Spr\u00f3buj ponownie.",
+            "security": "Weryfikacja bezpiecze\u0144stwa nie powiod\u0142a si\u0119. Od\u015bwie\u017c stron\u0119 i spr\u00f3buj ponownie.",
+            "invalid": "Dane dostawy s\u0105 nieprawid\u0142owe. Sprawd\u017a formularz i spr\u00f3buj ponownie.",
+            "notAllowed": "Danych dostawy nie mo\u017cna ju\u017c edytowa\u0107 dla tego zam\u00f3wienia.",
+            "adminDisabled": "Edycja dostawy administratora jest obecnie niedost\u0119pna.",
+            "generic": "Nie uda\u0142o si\u0119 zapisa\u0107 danych dostawy. Od\u015bwie\u017c zam\u00f3wienie i spr\u00f3buj ponownie."
+          }
+        },
+        "paymentControls": {
+          "eyebrow": "Płatność",
+          "heading": "Obsługa płatności",
+          "subtitle": "Używaj narzędzi płatniczych tylko wtedy, gdy zamówienie wymaga finansowej obsługi.",
+          "refund": "Zwróć płatność",
+          "refunding": "Zwrot płatności…",
+          "onlyForPaidStripe": "Zwrot jest dostępny tylko dla opłaconych zamówień Stripe",
+          "cancelUnpaidPayment": "Anuluj nieopłaconą płatność",
+          "cancelingPayment": "Anulowanie płatności…",
+          "onlyForUnpaidMonobank": "Ta akcja jest dostępna tylko dla nieopłaconych zamówień Monobank",
+          "errors": {
+            "network": "Nie udało się wysłać akcji płatności. Spróbuj ponownie.",
+            "security": "Weryfikacja bezpieczeństwa nie powiodła się. Odśwież stronę i spróbuj ponownie.",
+            "refundNotAvailable": "Zwrot nie jest już dostępny dla tego zamówienia.",
+            "cancelPaymentDisabled": "Anulowanie płatności jest obecnie niedostępne.",
+            "cancelPaymentNotAvailable": "Anulowanie nieopłaconej płatności nie jest już dostępne dla tego zamówienia.",
+            "cancelPaymentInProgress": "Anulowanie płatności jest już przetwarzane. Odśwież stronę za chwilę.",
+            "missingPaymentReference": "Brakuje identyfikatora płatności u dostawcy, więc tej akcji nie da się wykonać automatycznie.",
+            "invalidAmount": "Dane kwoty zamówienia są niepełne, więc automatyczny zwrot nie może wystartować.",
+            "providerUnavailable": "Dostawca płatności jest chwilowo niedostępny. Spróbuj później.",
+            "adminDisabled": "Akcje płatności administratora są obecnie niedostępne.",
+            "generic": "Nie udało się wykonać akcji płatności. Odśwież zamówienie i spróbuj ponownie."
+          }
+        },
+        "customerAccount": "Konto klienta",
         "accountUnavailable": "Zarejestrowane konto",
         "guest": "Zamówienie gościa",
         "total": "Razem",
         "paymentStatus": "Status płatności",
         "fulfillmentStage": "Etap realizacji",
+        "delivery": "Dostawa",
         "created": "Utworzono",
         "provider": "Dostawca",
         "shippingProviderLabel": "Przewoźnik",
@@ -939,6 +969,8 @@
         "no": "Nie",
         "shippingStatus": "Status dostawy",
         "trackingNumber": "Numer śledzenia",
+        "trackingPending": "Numer śledzenia pojawi się po wysyłce",
+        "deliveryPending": "Przygotowujemy wysyłkę",
         "shippingProviders": {
           "novaPoshta": "Nova Poshta"
         },
@@ -946,6 +978,14 @@
           "stripe": "Stripe",
           "monobank": "Monobank"
         },
+        "paymentStatuses": {
+          "paid": "Opłacone",
+          "pending": "Oczekuje na potwierdzenie",
+          "requiresPayment": "Wymaga płatności",
+          "failed": "Płatność nieudana",
+          "refunded": "Zwrócone",
+          "needsReview": "Wymaga weryfikacji"
+        },
         "shippingStatuses": {
           "pending": "Oczekuje",
           "queued": "W kolejce",
@@ -957,41 +997,45 @@
           "needsAttention": "Wymaga uwagi"
         },
         "shipmentStatuses": {
+          "processing": "Przetwarzanie",
           "queued": "W kolejce",
           "created": "Utworzono",
           "succeeded": "Zakończono powodzeniem",
           "failed": "Błąd",
           "needsAttention": "Wymaga uwagi"
         },
-          "shippingMethods": {
-            "novaPoshtaWarehouse": "Oddział Nova Poshta",
-            "novaPoshtaLocker": "Automat Nova Poshta",
-            "novaPoshtaCourier": "Kurier Nova Poshta"
-          },
-          "history": {
-            "heading": "Historia",
-            "subtitle": "Działania administratora i przejścia statusów dla tego zamówienia.",
-            "empty": "Brak historii zamówienia.",
-            "adminUser": "Administrator",
-            "system": "System",
-            "legacySource": "Historia legacy",
-            "shippingTransition": "Dostawa: {from} -> {to}",
-            "shipmentState": "Status przesyłki: {status}",
-            "requestId": "Żądanie: {requestId}",
-            "actions": {
-              "confirm": "Potwierdzono zamówienie",
-              "cancel": "Anulowano zamówienie",
-              "complete": "Zakończono zamówienie",
-              "recoverInitialShipment": "Odzyskano początkową przesyłkę",
-              "retryLabelCreation": "Ponowiono utworzenie etykiety",
-              "markShipped": "Oznaczono jako wysłane",
-              "markDelivered": "Oznaczono jako dostarczone"
-            }
-          },
-          "fulfillmentStages": {
-            "processing": "Przetwarzanie",
-            "packed": "Spakowane",
-            "shipped": "Wysłane",
+        "shippingMethods": {
+          "novaPoshtaWarehouse": "Oddział Nova Poshta",
+          "novaPoshtaLocker": "Automat Nova Poshta",
+          "novaPoshtaCourier": "Kurier Nova Poshta"
+        },
+        "history": {
+          "heading": "Historia",
+          "subtitle": "Działania administratora i przejścia statusów dla tego zamówienia.",
+          "empty": "Brak historii zamówienia.",
+          "adminUser": "Administrator",
+          "system": "System",
+          "legacySource": "Historia legacy",
+          "shippingTransition": "Dostawa: {from} -> {to}",
+          "shipmentState": "Status przesyłki: {status}",
+          "requestId": "Żądanie: {requestId}",
+          "actions": {
+            "confirm": "Potwierdzono zamówienie",
+            "cancel": "Anulowano zamówienie",
+            "complete": "Zakończono zamówienie",
+            "refund": "Zlecono zwrot",
+            "cancelPayment": "Anulowano nieopłaconą płatność",
+            "recoverInitialShipment": "Odzyskano początkową przesyłkę",
+            "retryLabelCreation": "Ponowiono utworzenie etykiety",
+            "markShipped": "Oznaczono jako wysłane",
+            "markDelivered": "Oznaczono jako dostarczone",
+            "editShipping": "Edytowano dane dostawy"
+          }
+        },
+        "fulfillmentStages": {
+          "processing": "Przetwarzanie",
+          "packed": "Spakowane",
+          "shipped": "Wysłane",
           "delivered": "Dostarczone",
           "canceled": "Anulowane",
           "returned": "Zwrócone"
diff --git a/frontend/messages/uk.json b/frontend/messages/uk.json
index 48d4f159..5cf74714 100644
--- a/frontend/messages/uk.json
+++ b/frontend/messages/uk.json
@@ -822,6 +822,11 @@
         "openOrder": "Відкрити замовлення {id}",
         "orderId": "ID замовлення"
       },
+      "card": {
+        "orderNumber": "Замовлення {id}",
+        "placedOn": "Оформлено {date}",
+        "itemsCount": "{count, plural, one {# товар} few {# товари} many {# товарів} other {# товару}}"
+      },
       "orderHeadline": {
         "incomplete": "Замовлення {id} (незавершене)",
         "withMore": "{item} +ще {count}",
@@ -839,81 +844,106 @@
         "title": "Замовлення",
         "myOrders": "Мої замовлення",
         "shop": "Магазин",
+        "orderReference": "Деталі замовлення",
+        "orderNumber": "Замовлення {id}",
+        "orderNumberLabel": "Номер для підтримки: {id}",
+        "placedOn": "Оформлено {date}",
         "orderSummary": "Підсумок замовлення",
         "customerSummary": "Підсумок клієнта",
         "lifecycle": {
-            "eyebrow": "Стан замовлення",
-            "heading": "Оновлення статусу",
-            "subtitle": "Використовуйте ці дії, коли потрібно безпечно перевести замовлення на наступний етап.",
-            "confirm": "Підтвердити",
-            "cancel": "Скасувати",
-            "complete": "Завершити",
-            "errors": {
-              "confirmRequiresPaid": "Підтверджувати можна лише оплачені замовлення.",
-              "confirmNotAllowed": "Це замовлення не можна підтвердити в поточному стані.",
-              "cancelRequiresRefund": "Для оплачених замовлень потрібно використовувати повернення, а не скасування.",
-              "completeRequiresShipping": "Завершити можна лише замовлення з доставкою.",
-              "completeNotAllowed": "Це замовлення не можна завершити в поточному стані.",
-              "csrfRejected": "Перевірка безпеки не пройдена. Оновіть сторінку й спробуйте ще раз.",
-              "invalidPayload": "Некоректний lifecycle-запит.",
-              "internalError": "Не вдалося виконати lifecycle-дію. Спробуйте ще раз.",
-              "generic": "Lifecycle-дія недоступна в поточному стані."
-            }
-          },
+          "eyebrow": "Стан замовлення",
+          "heading": "Оновлення статусу",
+          "subtitle": "Використовуйте ці дії, коли потрібно безпечно перевести замовлення на наступний етап.",
+          "confirm": "Підтвердити",
+          "cancel": "Скасувати",
+          "complete": "Завершити",
+          "errors": {
+            "confirmRequiresPaid": "Підтверджувати можна лише оплачені замовлення.",
+            "confirmNotAllowed": "Це замовлення не можна підтвердити в поточному стані.",
+            "cancelRequiresRefund": "Для оплачених замовлень потрібно використовувати повернення, а не скасування.",
+            "completeRequiresShipping": "Завершити можна лише замовлення з доставкою.",
+            "completeNotAllowed": "Це замовлення не можна завершити в поточному стані.",
+            "csrfRejected": "Перевірка безпеки не пройдена. Оновіть сторінку й спробуйте ще раз.",
+            "invalidPayload": "Некоректний lifecycle-запит.",
+            "internalError": "Не вдалося виконати lifecycle-дію. Спробуйте ще раз.",
+            "generic": "Lifecycle-дія недоступна в поточному стані."
+          }
+        },
         "actions": {
-            "heading": "Дії адміністратора",
-            "subtitle": "Оберіть наступний безпечний крок для цього замовлення. Показуються лише дії, що підходять до поточного стану.",
-            "empty": "Для поточного стану немає доступних адмін-дій."
-          },
+          "heading": "Дії адміністратора",
+          "subtitle": "Оберіть наступний безпечний крок для цього замовлення. Показуються лише дії, що підходять до поточного стану.",
+          "empty": "Для поточного стану немає доступних адмін-дій."
+        },
         "shippingControls": {
-            "eyebrow": "Доставка",
-            "heading": "Робота з відправленням",
-            "subtitle": "Відновлюйте або просувайте доставку лише тоді, коли відправлення вже до цього готове.",
-            "recoverInitialShipment": "Відновити відправлення",
-            "retryLabelCreation": "Повторити ярлик",
-            "markShipped": "Позначити відправленим",
-            "markDelivered": "Позначити доставленим",
-            "errors": {
-              "network": "Не вдалося надіслати дію доставки. Спробуйте ще раз.",
-              "security": "Перевірка безпеки не пройдена. Оновіть сторінку й спробуйте ще раз.",
-              "recoverNotAvailable": "Відновлення відправлення для цього замовлення вже недоступне.",
-              "shipmentMissing": "Ще немає запису про відправлення, який можна оновити.",
-              "retryNotAvailable": "Повтор ярлика зараз недоступний для цього стану відправлення.",
-              "transitionNotAvailable": "Цей крок доставки вже недоступний для поточного стану замовлення.",
-              "adminDisabled": "Адмін-дії доставки зараз недоступні.",
-              "generic": "Не вдалося виконати дію доставки. Оновіть замовлення й спробуйте ще раз."
-            }
-          },
+          "eyebrow": "Доставка",
+          "heading": "Робота з відправленням",
+          "subtitle": "Відновлюйте або просувайте доставку лише тоді, коли відправлення вже до цього готове.",
+          "recoverInitialShipment": "Відновити відправлення",
+          "retryLabelCreation": "Повторити ярлик",
+          "markShipped": "Позначити відправленим",
+          "markDelivered": "Позначити доставленим",
+          "errors": {
+            "network": "Не вдалося надіслати дію доставки. Спробуйте ще раз.",
+            "security": "Перевірка безпеки не пройдена. Оновіть сторінку й спробуйте ще раз.",
+            "recoverNotAvailable": "Відновлення відправлення для цього замовлення вже недоступне.",
+            "shipmentMissing": "Ще немає запису про відправлення, який можна оновити.",
+            "retryNotAvailable": "Повтор ярлика зараз недоступний для цього стану відправлення.",
+            "transitionNotAvailable": "Цей крок доставки вже недоступний для поточного стану замовлення.",
+            "adminDisabled": "Адмін-дії доставки зараз недоступні.",
+            "generic": "Не вдалося виконати дію доставки. Оновіть замовлення й спробуйте ще раз."
+          }
+        },
+        "shippingEditor": {
+          "heading": "\u0420\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u0434\u0430\u043d\u0456 \u0434\u043e\u0441\u0442\u0430\u0432\u043a\u0438",
+          "subtitle": "\u0417\u0431\u0435\u0440\u0456\u0433\u0430\u0439\u0442\u0435 \u043b\u0438\u0448\u0435 \u043f\u0435\u0440\u0435\u0432\u0456\u0440\u0435\u043d\u0456 Nova Poshta \u0440\u0435\u0444\u0435\u0440\u0435\u043d\u0441\u0438 \u0442\u0430 \u0434\u0430\u043d\u0456 \u043e\u0442\u0440\u0438\u043c\u0443\u0432\u0430\u0447\u0430 \u0434\u043b\u044f \u0446\u044c\u043e\u0433\u043e \u0437\u0430\u043c\u043e\u0432\u043b\u0435\u043d\u043d\u044f.",
+          "cityRef": "\u0420\u0435\u0444 \u043c\u0456\u0441\u0442\u0430",
+          "pickupPointRef": "\u0420\u0435\u0444 \u0442\u043e\u0447\u043a\u0438 \u0432\u0438\u0434\u0430\u0447\u0456",
+          "addressLine1": "\u0410\u0434\u0440\u0435\u0441\u0430 \u043a\u0443\u0440'\u0454\u0440\u0430",
+          "addressLine2": "\u0414\u0435\u0442\u0430\u043b\u0456 \u0430\u0434\u0440\u0435\u0441\u0438",
+          "currentCity": "\u041f\u043e\u0442\u043e\u0447\u043d\u0435 \u043c\u0456\u0441\u0442\u043e: {city}",
+          "currentPickupPoint": "\u041f\u043e\u0442\u043e\u0447\u043d\u0430 \u0442\u043e\u0447\u043a\u0430 \u0432\u0438\u0434\u0430\u0447\u0456: {pickupPoint}",
+          "save": "\u0417\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0434\u0430\u043d\u0456 \u0434\u043e\u0441\u0442\u0430\u0432\u043a\u0438",
+          "saving": "\u0417\u0431\u0435\u0440\u0435\u0436\u0435\u043d\u043d\u044f...",
+          "errors": {
+            "network": "\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u043d\u0430\u0434\u0456\u0441\u043b\u0430\u0442\u0438 \u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0434\u043e\u0441\u0442\u0430\u0432\u043a\u0438. \u0421\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0449\u0435 \u0440\u0430\u0437.",
+            "security": "\u041f\u0435\u0440\u0435\u0432\u0456\u0440\u043a\u0430 \u0431\u0435\u0437\u043f\u0435\u043a\u0438 \u043d\u0435 \u043f\u0440\u043e\u0439\u0434\u0435\u043d\u0430. \u041e\u043d\u043e\u0432\u0456\u0442\u044c \u0441\u0442\u043e\u0440\u0456\u043d\u043a\u0443 \u0439 \u0441\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0449\u0435 \u0440\u0430\u0437.",
+            "invalid": "\u0414\u0430\u043d\u0456 \u0434\u043e\u0441\u0442\u0430\u0432\u043a\u0438 \u043d\u0435\u043a\u043e\u0440\u0435\u043a\u0442\u043d\u0456. \u041f\u0435\u0440\u0435\u0432\u0456\u0440\u0442\u0435 \u0444\u043e\u0440\u043c\u0443 \u0456 \u0441\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0449\u0435 \u0440\u0430\u0437.",
+            "notAllowed": "\u0414\u0430\u043d\u0456 \u0434\u043e\u0441\u0442\u0430\u0432\u043a\u0438 \u0434\u043b\u044f \u0446\u044c\u043e\u0433\u043e \u0437\u0430\u043c\u043e\u0432\u043b\u0435\u043d\u043d\u044f \u0432\u0436\u0435 \u043d\u0435 \u043c\u043e\u0436\u043d\u0430 \u0437\u043c\u0456\u043d\u044e\u0432\u0430\u0442\u0438.",
+            "adminDisabled": "\u0410\u0434\u043c\u0456\u043d-\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u043d\u043d\u044f \u0434\u043e\u0441\u0442\u0430\u0432\u043a\u0438 \u0437\u0430\u0440\u0430\u0437 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0435.",
+            "generic": "\u041d\u0435 \u0432\u0434\u0430\u043b\u043e\u0441\u044f \u0437\u0431\u0435\u0440\u0435\u0433\u0442\u0438 \u0434\u0430\u043d\u0456 \u0434\u043e\u0441\u0442\u0430\u0432\u043a\u0438. \u041e\u043d\u043e\u0432\u0456\u0442\u044c \u0437\u0430\u043c\u043e\u0432\u043b\u0435\u043d\u043d\u044f \u0439 \u0441\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u0449\u0435 \u0440\u0430\u0437."
+          }
+        },
         "paymentControls": {
-            "eyebrow": "Оплата",
-            "heading": "Робота з оплатою",
-            "subtitle": "Використовуйте інструменти оплати лише тоді, коли замовлення потребує фінансової обробки.",
-            "refund": "Повернути оплату",
-            "refunding": "Повертаємо оплату…",
-            "onlyForPaidStripe": "Повернення доступне лише для оплачених Stripe-замовлень",
-            "cancelUnpaidPayment": "Скасувати неоплачену оплату",
-            "cancelingPayment": "Скасовуємо оплату…",
-            "onlyForUnpaidMonobank": "Ця дія доступна лише для неоплачених замовлень Monobank",
-            "errors": {
-              "network": "Не вдалося надіслати дію оплати. Спробуйте ще раз.",
-              "security": "Перевірка безпеки не пройдена. Оновіть сторінку й спробуйте ще раз.",
-              "refundNotAvailable": "Повернення для цього замовлення вже недоступне.",
-              "cancelPaymentDisabled": "Скасування оплати зараз недоступне.",
-              "cancelPaymentNotAvailable": "Скасування неоплаченої оплати для цього замовлення вже недоступне.",
-              "cancelPaymentInProgress": "Скасування оплати вже виконується. Оновіть сторінку трохи пізніше.",
-              "missingPaymentReference": "Немає посилання на платіж у провайдера, тому цю дію не можна виконати автоматично.",
-              "invalidAmount": "Дані суми замовлення неповні, тому автоматичне повернення не може стартувати.",
-              "providerUnavailable": "Платіжний провайдер тимчасово недоступний. Спробуйте пізніше.",
-              "adminDisabled": "Адмін-дії оплати зараз недоступні.",
-              "generic": "Не вдалося виконати дію оплати. Оновіть замовлення й спробуйте ще раз."
-            }
-          },
+          "eyebrow": "Оплата",
+          "heading": "Робота з оплатою",
+          "subtitle": "Використовуйте інструменти оплати лише тоді, коли замовлення потребує фінансової обробки.",
+          "refund": "Повернути оплату",
+          "refunding": "Повертаємо оплату…",
+          "onlyForPaidStripe": "Повернення доступне лише для оплачених Stripe-замовлень",
+          "cancelUnpaidPayment": "Скасувати неоплачену оплату",
+          "cancelingPayment": "Скасовуємо оплату…",
+          "onlyForUnpaidMonobank": "Ця дія доступна лише для неоплачених замовлень Monobank",
+          "errors": {
+            "network": "Не вдалося надіслати дію оплати. Спробуйте ще раз.",
+            "security": "Перевірка безпеки не пройдена. Оновіть сторінку й спробуйте ще раз.",
+            "refundNotAvailable": "Повернення для цього замовлення вже недоступне.",
+            "cancelPaymentDisabled": "Скасування оплати зараз недоступне.",
+            "cancelPaymentNotAvailable": "Скасування неоплаченої оплати для цього замовлення вже недоступне.",
+            "cancelPaymentInProgress": "Скасування оплати вже виконується. Оновіть сторінку трохи пізніше.",
+            "missingPaymentReference": "Немає посилання на платіж у провайдера, тому цю дію не можна виконати автоматично.",
+            "invalidAmount": "Дані суми замовлення неповні, тому автоматичне повернення не може стартувати.",
+            "providerUnavailable": "Платіжний провайдер тимчасово недоступний. Спробуйте пізніше.",
+            "adminDisabled": "Адмін-дії оплати зараз недоступні.",
+            "generic": "Не вдалося виконати дію оплати. Оновіть замовлення й спробуйте ще раз."
+          }
+        },
         "customerAccount": "Акаунт клієнта",
         "accountUnavailable": "Зареєстрований акаунт",
         "guest": "Гостьове замовлення",
         "total": "Всього",
         "paymentStatus": "Статус оплати",
         "fulfillmentStage": "Етап виконання",
+        "delivery": "Доставка",
         "created": "Створено",
         "provider": "Провайдер",
         "shippingProviderLabel": "Провайдер доставки",
@@ -939,6 +969,8 @@
         "no": "Ні",
         "shippingStatus": "Статус доставки",
         "trackingNumber": "Номер відстеження",
+        "trackingPending": "Номер відстеження з'явиться після відправлення",
+        "deliveryPending": "Готуємо відправлення",
         "shippingProviders": {
           "novaPoshta": "Нова пошта"
         },
@@ -946,6 +978,14 @@
           "stripe": "Stripe",
           "monobank": "Monobank"
         },
+        "paymentStatuses": {
+          "paid": "Оплачено",
+          "pending": "Очікується підтвердження",
+          "requiresPayment": "Потрібна оплата",
+          "failed": "Помилка оплати",
+          "refunded": "Оплату повернуто",
+          "needsReview": "Потребує перевірки"
+        },
         "shippingMethods": {
           "novaPoshtaWarehouse": "Відділення Нової пошти",
           "novaPoshtaLocker": "Поштомат Нової пошти",
@@ -962,6 +1002,7 @@
           "needsAttention": "Потребує уваги"
         },
         "shipmentStatuses": {
+          "processing": "Опрацювання",
           "queued": "У черзі",
           "created": "Створено",
           "succeeded": "Успішно",
@@ -982,16 +1023,19 @@
             "confirm": "Підтверджено замовлення",
             "cancel": "Скасовано замовлення",
             "complete": "Завершено замовлення",
+            "refund": "Запитано повернення",
+            "cancelPayment": "Скасовано неоплачену оплату",
             "recoverInitialShipment": "Відновлено початкове відправлення",
             "retryLabelCreation": "Повторено створення етикетки",
             "markShipped": "Позначено як відправлене",
-            "markDelivered": "Позначено як доставлене"
+            "markDelivered": "Позначено як доставлене",
+            "editShipping": "Відредаговано дані доставки"
           }
         },
         "fulfillmentStages": {
-            "processing": "Опрацювання",
-            "packed": "Упаковано",
-            "shipped": "Відправлено",
+          "processing": "Опрацювання",
+          "packed": "Упаковано",
+          "shipped": "Відправлено",
           "delivered": "Доставлено",
           "canceled": "Скасовано",
           "returned": "Повернено"