cabloy 5.1.141 → 5.1.142

package/zova/src/suite/a-commerce/modules/commerce-trade/src/config/locale/en-us.ts

@@ -4,21 +4,97 @@ export default {
   CartEmpty: 'Your cart is empty.',
   Quantity: 'Quantity',
   ClearCart: 'Clear cart',
+  Checkout: 'Checkout',
+  DeliveryAddress: 'Delivery address',
+  AddAddressBeforeCheckout: 'Add an address before checking out.',
+  PaymentMethod: 'Payment method',
+  Coupon: 'Coupon',
+  NoCoupon: 'No coupon',
+  CreateOrder: 'Create order',
+  Payment: 'Payment',
+  LoadingOrder: 'Loading order…',
+  OrderTitle: 'Order #{id}',
+  OrderStateAwaitingPayment: 'Awaiting payment',
+  OrderStatePaid: 'Paid',
+  OrderStateRefundRequested: 'Refund requested',
+  OrderStateRefundApproved: 'Refund approved',
+  OrderStateRefundRejected: 'Refund rejected',
+  OrderStateShipped: 'Shipped',
+  OrderStateRefunded: 'Refunded',
+  OrderStateCancelled: 'Cancelled',
+  OrderStateExpired: 'Expired',
+  DiscountAmount: 'Discount: {amount}',
+  Shipment: 'Shipment',
+  OrderLineSummary: '{quantity} × {unitPrice} = {lineTotal}',
+  PaymentStatusVerification: 'Payment status is verified before Commerce updates the order.',
+  StartPayment: 'Start payment',
+  PaymentSessionUnavailable: 'Payment session is unavailable. You can open your order.',
+  PaymentPreparationVerification: 'Payment preparation is being verified safely in the background.',
+  CheckPaymentStatus: 'Check payment status',
+  OpenOrder: 'Open order',
+  PaymentProviderReturnCanResume:
+    'You returned from the payment provider without completing payment. Your payment status has been refreshed. You can continue to payment or open your order.',
+  PaymentProviderReturn:
+    'You returned from the payment provider without completing payment. Your payment status has been refreshed. You can open your order.',
+  MockPaymentSimulator: 'Mock payment simulator',
+  MockPaymentSimulatorHelp:
+    'Available only when the server enables the development/test mock provider.',
+  PaymentSucceeded: 'Payment succeeded',
+  PaymentFailed: 'Payment failed',
+  CancelPayment: 'Cancel payment',
+  WaitingForPaymentSettlement: 'Waiting for verified provider confirmation and order settlement…',
+  PaymentSessionState: 'Payment session state: {state}',
+  PaymentSessionAndOrderState: 'Payment session: {paymentSessionState}; order: {orderState}.',
+  Unknown: 'unknown',
+  RefreshOrderStatus: 'Refresh order status',
+  PaymentCancelledByProvider:
+    'You returned from PayPal without completing payment. The order is still awaiting payment.',
+  PaymentApprovalRequired: 'Payment still needs your approval.',
+  PaymentProcessing:
+    'Your payment is still being processed. We will continue to verify it with the provider.',
+  PaymentOutcomeVerified: 'Payment outcome is verified. Commerce is still updating the order.',
+  PaymentConfirmationPending:
+    'Payment confirmation is still pending. We will continue to verify it with the provider.',
+  ContinueToPaymentHelp: 'Continue to the payment provider to complete payment.',
+  ContinueToPayment: 'Continue to payment',
+  PaymentPreparing: 'Payment is being prepared.',
+  PaymentPreparingRetry:
+    'Payment is being prepared; retrying in about {retryAfterSeconds} seconds.',
+  RefreshPaymentStatus: 'Refresh payment status',
+  PaymentCompleted: 'Payment is complete. Confirming the order…',
+  EmbeddedCheckoutUnavailable:
+    'Embedded checkout will be available when this payment provider is configured.',
   RemoveCartItem: 'Remove',
   Confirm: 'Confirm',
+  Cancel: 'Cancel',
   ShipOrder: 'Ship order',
   RequestRefund: 'Request refund',
   RefundRequestHelp: 'Refunds are for the whole unshipped order only.',
   RefundReason: 'Reason for refund',
   RefundDecisionReason: 'Decision reason',
+  RefundDecision: 'Refund decision',
+  RefundExecution: 'Refund execution',
+  ReviewRefund: 'Review refund',
   ApproveRefund: 'Approve refund',
   RejectRefund: 'Reject refund',
   ExecuteRefund: 'Execute refund',
   InspectRefundRecovery: 'Inspect refund recovery',
+  LoadingRefundRecovery: 'Loading refund recovery…',
+  RefundRecoveryUnavailable:
+    'Refund recovery is not available yet. Execute the refund first to create a provider refund submission.',
+  RefundRecoveryLoadFailed: 'Unable to load refund recovery details.',
+  RetryInspectRefundRecovery: 'Retry inspection',
   ReconcileProviderRefund: 'Reconcile provider refund',
   RetryRefund: 'Retry refund',
   RefundRecoveryReason: 'Recovery reason',
   AcknowledgeRefundRetryRisk: 'I understand this retry reuses the original provider request.',
   RefundRecoveryState: 'Provider operation: {state}; attempts: {attemptCount}',
   RefundRecoveryProviderRefundId: 'Provider refund ID: {providerRefundId}',
+  RefundAwaitingProviderConfirmation:
+    'The refund is waiting for a verified provider confirmation. Do not resubmit it.',
+  MockRefundSimulatorHelp:
+    'Development/test mock only. This sends the signed provider webhook used to settle the refund.',
+  CompleteMockRefund: 'Complete mock refund',
+  MockRefundCompletionFailed: 'Unable to complete the mock refund. Try again.',
+  MockRefundCompleted: 'The mock refund was completed. The order is being settled.',
 };

package/zova/src/suite/a-commerce/modules/commerce-trade/src/config/locale/zh-cn.ts

@@ -4,21 +4,88 @@ export default {
   CartEmpty: '购物车为空。',
   Quantity: '数量',
   ClearCart: '清空购物车',
+  Checkout: '结算',
+  DeliveryAddress: '收货地址',
+  AddAddressBeforeCheckout: '请先添加收货地址再结算。',
+  PaymentMethod: '支付方式',
+  Coupon: '优惠券',
+  NoCoupon: '不使用优惠券',
+  CreateOrder: '创建订单',
+  Payment: '支付',
+  LoadingOrder: '正在加载订单……',
+  OrderTitle: '订单 #{id}',
+  OrderStateAwaitingPayment: '待支付',
+  OrderStatePaid: '已支付',
+  OrderStateRefundRequested: '申请退款',
+  OrderStateRefundApproved: '退款已批准',
+  OrderStateRefundRejected: '退款被拒绝',
+  OrderStateShipped: '已发货',
+  OrderStateRefunded: '已退款',
+  OrderStateCancelled: '已取消',
+  OrderStateExpired: '已过期',
+  DiscountAmount: '折扣：{amount}',
+  Shipment: '发货信息',
+  OrderLineSummary: '{quantity} × {unitPrice} = {lineTotal}',
+  PaymentStatusVerification: '在商城更新订单前，会先验证支付状态。',
+  StartPayment: '开始支付',
+  PaymentSessionUnavailable: '支付会话不可用。你可以打开订单。',
+  PaymentPreparationVerification: '正在后台安全地验证支付准备状态。',
+  CheckPaymentStatus: '检查支付状态',
+  OpenOrder: '打开订单',
+  PaymentProviderReturnCanResume:
+    '你在未完成支付的情况下从支付服务商返回。支付状态已刷新，你可以继续支付或打开订单。',
+  PaymentProviderReturn: '你在未完成支付的情况下从支付服务商返回。支付状态已刷新，你可以打开订单。',
+  MockPaymentSimulator: '模拟支付工具',
+  MockPaymentSimulatorHelp: '仅当服务端启用开发/测试模拟支付服务商时可用。',
+  PaymentSucceeded: '支付成功',
+  PaymentFailed: '支付失败',
+  CancelPayment: '取消支付',
+  WaitingForPaymentSettlement: '正在等待验证后的服务商确认和订单结算……',
+  PaymentSessionState: '支付会话状态：{state}',
+  PaymentSessionAndOrderState: '支付会话：{paymentSessionState}；订单：{orderState}。',
+  Unknown: '未知',
+  RefreshOrderStatus: '刷新订单状态',
+  PaymentCancelledByProvider: '你在未完成支付的情况下从 PayPal 返回。订单仍在等待支付。',
+  PaymentApprovalRequired: '支付仍需要你的确认。',
+  PaymentProcessing: '支付仍在处理中，我们会继续向服务商核实支付状态。',
+  PaymentOutcomeVerified: '支付结果已验证，商城仍在更新订单。',
+  PaymentConfirmationPending: '支付确认仍在等待中，我们会继续向服务商核实支付状态。',
+  ContinueToPaymentHelp: '请前往支付服务商完成支付。',
+  ContinueToPayment: '继续支付',
+  PaymentPreparing: '正在准备支付。',
+  PaymentPreparingRetry: '正在准备支付；约 {retryAfterSeconds} 秒后重试。',
+  RefreshPaymentStatus: '刷新支付状态',
+  PaymentCompleted: '支付已完成，正在确认订单……',
+  EmbeddedCheckoutUnavailable: '配置此支付服务商后，即可使用嵌入式结算。',
   RemoveCartItem: '移除',
   Confirm: '确认',
+  Cancel: '取消',
   ShipOrder: '发货',
   RequestRefund: '申请退款',
   RefundRequestHelp: '退款仅适用于整单且尚未发货的订单。',
   RefundReason: '退款原因',
   RefundDecisionReason: '审批原因',
+  RefundDecision: '退款审批',
+  RefundExecution: '退款执行',
+  ReviewRefund: '审核退款',
   ApproveRefund: '批准退款',
   RejectRefund: '拒绝退款',
   ExecuteRefund: '执行退款',
   InspectRefundRecovery: '查看退款恢复',
+  LoadingRefundRecovery: '正在加载退款恢复信息……',
+  RefundRecoveryUnavailable: '退款恢复暂不可用。请先执行退款，以创建服务商退款提交记录。',
+  RefundRecoveryLoadFailed: '无法加载退款恢复信息。',
+  RetryInspectRefundRecovery: '重试查看恢复',
   ReconcileProviderRefund: '对账支付服务商退款',
   RetryRefund: '重试退款',
   RefundRecoveryReason: '恢复原因',
   AcknowledgeRefundRetryRisk: '我了解本次重试会复用原支付服务商请求。',
   RefundRecoveryState: '服务商操作：{state}；尝试次数：{attemptCount}',
   RefundRecoveryProviderRefundId: '服务商退款 ID：{providerRefundId}',
+  RefundAwaitingProviderConfirmation: '退款正在等待已验证的支付服务商确认，请勿重复提交。',
+  MockRefundSimulatorHelp:
+    '仅用于开发/测试模拟支付服务商，会发送用于结算退款的已签名服务商 Webhook。',
+  CompleteMockRefund: '完成模拟退款',
+  MockRefundCompletionFailed: '无法完成模拟退款，请重试。',
+  MockRefundCompleted: '模拟退款已完成，订单正在结算。',
 };

package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/order.ts

@@ -88,6 +88,7 @@ export class ModelOrder extends BeanModelBase {
       },
       meta: {
         disableSuspenseOnInit: true,
+        disableErrorEffect: true,
       },
     });
   }

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/cart/controller.tsx

@@ -60,7 +60,7 @@ export class ControllerPageCart extends BeanControllerPageBase {
               {items.length > 0 && (
                 <>
                   <RouterLink class="btn btn-primary btn-sm" to={this._getCheckoutPagePath()}>
-                    Checkout
+                    {this.scope.locale.Checkout()}
                   </RouterLink>
                   <button class="btn btn-outline btn-sm" onClick={() => this.clear()}>
                     {this.scope.locale.ClearCart()}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/checkout/controller.tsx

@@ -84,10 +84,10 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
     return (
       <ZPage>
         <section class="mx-auto max-w-3xl p-6">
-          <h1 class="text-3xl font-semibold">Checkout</h1>
+          <h1 class="text-3xl font-semibold">{this.scope.locale.Checkout()}</h1>
           <div class="mt-6 space-y-6">
             <fieldset class="space-y-2">
-              <legend class="font-semibold">Delivery address</legend>
+              <legend class="font-semibold">{this.scope.locale.DeliveryAddress()}</legend>
               {addresses.map(address => (
                 <label class="flex cursor-pointer gap-3 rounded border border-base-300 p-3">
                   <input
@@ -102,11 +102,11 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
                 </label>
               ))}
               {addresses.length === 0 && (
-                <p class="text-base-content/70">Add an address before checking out.</p>
+                <p class="text-base-content/70">{this.scope.locale.AddAddressBeforeCheckout()}</p>
               )}
             </fieldset>
             <fieldset class="space-y-2">
-              <legend class="font-semibold">Payment method</legend>
+              <legend class="font-semibold">{this.scope.locale.PaymentMethod()}</legend>
               {paymentMethods?.items.map(method => (
                 <label class="flex cursor-pointer gap-3 rounded border border-base-300 p-3">
                   <input
@@ -120,10 +120,10 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
               ))}
             </fieldset>
             <fieldset class="space-y-2">
-              <legend class="font-semibold">Coupon</legend>
+              <legend class="font-semibold">{this.scope.locale.Coupon()}</legend>
               <label class="flex cursor-pointer gap-3 rounded border border-base-300 p-3">
                 <input type="radio" name="coupon" value="" v-model={this.couponGrantId} />
-                <span>No coupon</span>
+                <span>{this.scope.locale.NoCoupon()}</span>
               </label>
               {coupons.map(coupon => (
                 <label class="flex cursor-pointer gap-3 rounded border border-base-300 p-3">
@@ -144,7 +144,7 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
               disabled={!this.addressId || !this.providerCandidateKey || this.submitting}
               onClick={() => this.checkout()}
             >
-              Create order
+              {this.scope.locale.CreateOrder()}
             </button>
           </div>
         </section>

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/order/controller.tsx

@@ -32,6 +32,31 @@ export class ControllerPageOrder extends BeanControllerPageBase {
     return this.$$modelOrderMine.requestRefund(this.orderId);
   }
 
+  getOrderStateText(state: string) {
+    switch (state) {
+      case 'awaiting_payment':
+        return this.scope.locale.OrderStateAwaitingPayment();
+      case 'paid':
+        return this.scope.locale.OrderStatePaid();
+      case 'refund_requested':
+        return this.scope.locale.OrderStateRefundRequested();
+      case 'refund_approved':
+        return this.scope.locale.OrderStateRefundApproved();
+      case 'refund_rejected':
+        return this.scope.locale.OrderStateRefundRejected();
+      case 'shipped':
+        return this.scope.locale.OrderStateShipped();
+      case 'refunded':
+        return this.scope.locale.OrderStateRefunded();
+      case 'cancelled':
+        return this.scope.locale.OrderStateCancelled();
+      case 'expired':
+        return this.scope.locale.OrderStateExpired();
+      default:
+        return state;
+    }
+  }
+
   refundReason = '';
   refundRequestIdempotencyKey?: string;
 
@@ -51,12 +76,17 @@ export class ControllerPageOrder extends BeanControllerPageBase {
     return (
       <ZPage>
         <section class="mx-auto max-w-4xl p-6">
-          {!order && !query?.error && <p class="text-base-content/70">Loading order…</p>}
+          {!order && !query?.error && (
+            <p class="text-base-content/70">{this.scope.locale.LoadingOrder()}</p>
+          )}
           {order && (
             <>
-              <h1 class="text-3xl font-semibold">Order #{order.id}</h1>
+              <h1 class="text-3xl font-semibold">
+                {this.scope.locale.OrderTitle({ id: order.id })}
+              </h1>
               <p class="mt-2 text-base-content/70">
-                {order.state} · ${(order.payableTotalCents / 100).toFixed(2)}
+                {this.getOrderStateText(order.state)} · $
+                {(order.payableTotalCents / 100).toFixed(2)}
               </p>
               {order.state === 'paid' && !order.shipment && (
                 <article class="card mt-6 border border-base-300 bg-base-100 shadow-sm">
@@ -85,7 +115,7 @@ export class ControllerPageOrder extends BeanControllerPageBase {
               <div class="mt-6 grid gap-6 md:grid-cols-2">
                 <article class="card border border-base-300 bg-base-100 shadow-sm">
                   <div class="card-body">
-                    <h2 class="card-title">Delivery address</h2>
+                    <h2 class="card-title">{this.scope.locale.DeliveryAddress()}</h2>
                     <p>{order.addressSnapshot.recipientName}</p>
                     <p>{order.addressSnapshot.addressLine1}</p>
                     <p>
@@ -96,15 +126,19 @@ export class ControllerPageOrder extends BeanControllerPageBase {
                 </article>
                 <article class="card border border-base-300 bg-base-100 shadow-sm">
                   <div class="card-body">
-                    <h2 class="card-title">Payment</h2>
+                    <h2 class="card-title">{this.scope.locale.Payment()}</h2>
                     <p>{order.currency}</p>
-                    <p>Discount: ${(order.discountCents / 100).toFixed(2)}</p>
+                    <p>
+                      {this.scope.locale.DiscountAmount({
+                        amount: `$${(order.discountCents / 100).toFixed(2)}`,
+                      })}
+                    </p>
                   </div>
                 </article>
                 {order.shipment && (
                   <article class="card border border-base-300 bg-base-100 shadow-sm">
                     <div class="card-body">
-                      <h2 class="card-title">Shipment</h2>
+                      <h2 class="card-title">{this.scope.locale.Shipment()}</h2>
                       <p>{order.shipment.carrier}</p>
                       <p>{order.shipment.trackingNumber}</p>
                       <p class="text-sm text-base-content/70">
@@ -121,8 +155,11 @@ export class ControllerPageOrder extends BeanControllerPageBase {
                       <h2 class="card-title">{line.titleSnapshot}</h2>
                       <p class="text-sm text-base-content/70">{line.skuCodeSnapshot}</p>
                       <p>
-                        {line.quantity} × ${(line.unitPriceCents / 100).toFixed(2)} = $
-                        {(line.lineTotalCents / 100).toFixed(2)}
+                        {this.scope.locale.OrderLineSummary({
+                          quantity: line.quantity,
+                          unitPrice: `$${(line.unitPriceCents / 100).toFixed(2)}`,
+                          lineTotal: `$${(line.lineTotalCents / 100).toFixed(2)}`,
+                        })}
                       </p>
                     </div>
                   </article>

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/payment/controller.tsx

@@ -165,7 +165,7 @@ export class ControllerPagePayment extends BeanControllerPageBase {
         } catch (error) {
           if (isNotFoundError(error)) {
             this.paymentSessionUnavailable = true;
-            this.message = 'Payment session is unavailable. You can open your order.';
+            this.message = this.scope.locale.PaymentSessionUnavailable();
             return;
           }
           throw error;
@@ -218,16 +218,16 @@ export class ControllerPagePayment extends BeanControllerPageBase {
   private _pendingMessage() {
     if (this.pendingSessionState === 'requires_action') {
       return this.$query.providerResult === 'cancel'
-        ? 'You returned from PayPal without completing payment. The order is still awaiting payment.'
-        : 'Payment still needs your approval.';
+        ? this.scope.locale.PaymentCancelledByProvider()
+        : this.scope.locale.PaymentApprovalRequired();
     }
     if (this.pendingSessionState === 'processing') {
-      return 'Your payment is still being processed. We will continue to verify it with the provider.';
+      return this.scope.locale.PaymentProcessing();
     }
     if (['succeeded', 'failed', 'cancelled', 'expired'].includes(this.pendingSessionState ?? '')) {
-      return 'Payment outcome is verified. Commerce is still updating the order.';
+      return this.scope.locale.PaymentOutcomeVerified();
     }
-    return 'Payment confirmation is still pending. We will continue to verify it with the provider.';
+    return this.scope.locale.PaymentConfirmationPending();
   }
 
   protected render() {
@@ -250,25 +250,23 @@ export class ControllerPagePayment extends BeanControllerPageBase {
     return (
       <ZPage>
         <section class="mx-auto max-w-xl p-6">
-          <h1 class="text-3xl font-semibold">Payment</h1>
-          <p class="mt-3 text-base-content/70">
-            Payment status is verified before Commerce updates the order.
-          </p>
+          <h1 class="text-3xl font-semibold">{this.scope.locale.Payment()}</h1>
+          <p class="mt-3 text-base-content/70">{this.scope.locale.PaymentStatusVerification()}</p>
           {isCreated && (
             <button
               class="btn btn-primary mt-6"
               disabled={this.submitting}
               onClick={() => this.start()}
             >
-              Start payment
+              {this.scope.locale.StartPayment()}
             </button>
           )}
           {(isStarting || this.paymentSessionUnavailable) && (
             <section class="mt-6 rounded border border-base-300 p-4" aria-live="polite">
               <p class="text-base-content/70">
                 {this.paymentSessionUnavailable
-                  ? 'Payment session is unavailable. You can open your order.'
-                  : 'Payment preparation is being verified safely in the background.'}
+                  ? this.scope.locale.PaymentSessionUnavailable()
+                  : this.scope.locale.PaymentPreparationVerification()}
               </p>
               <div class="mt-3 flex flex-wrap gap-3">
                 {!this.paymentSessionUnavailable && (
@@ -278,11 +276,11 @@ export class ControllerPagePayment extends BeanControllerPageBase {
                     disabled={this.submitting || this.waitingForOrder}
                     onClick={() => this.reconcile()}
                   >
-                    Check payment status
+                    {this.scope.locale.CheckPaymentStatus()}
                   </button>
                 )}
                 <button class="btn btn-outline" type="button" onClick={() => this.openOrder()}>
-                  Open order
+                  {this.scope.locale.OpenOrder()}
                 </button>
               </div>
             </section>
@@ -291,8 +289,8 @@ export class ControllerPagePayment extends BeanControllerPageBase {
             <section class="mt-6 rounded border border-base-300 p-4" aria-live="polite">
               <p class="text-base-content/70">
                 {hasResumableCancelRedirect
-                  ? 'You returned from the payment provider without completing payment. Your payment status has been refreshed. You can continue to payment or open your order.'
-                  : 'You returned from the payment provider without completing payment. Your payment status has been refreshed. You can open your order.'}
+                  ? this.scope.locale.PaymentProviderReturnCanResume()
+                  : this.scope.locale.PaymentProviderReturn()}
               </p>
             </section>
           )}
@@ -300,6 +298,15 @@ export class ControllerPagePayment extends BeanControllerPageBase {
             <ZPaymentNextAction
               action={session?.nextAction}
               disabled={this.submitting}
+              continueToPaymentHelpText={this.scope.locale.ContinueToPaymentHelp()}
+              continueToPaymentText={this.scope.locale.ContinueToPayment()}
+              embeddedCheckoutUnavailableText={this.scope.locale.EmbeddedCheckoutUnavailable()}
+              paymentCompletedText={this.scope.locale.PaymentCompleted()}
+              paymentPreparingText={this.scope.locale.PaymentPreparing()}
+              paymentPreparingRetryText={retryAfterSeconds =>
+                this.scope.locale.PaymentPreparingRetry({ retryAfterSeconds })
+              }
+              refreshPaymentStatusText={this.scope.locale.RefreshPaymentStatus()}
               onRefresh={async () => {
                 await this.queryPaymentSession?.refetch();
               }}
@@ -307,14 +314,14 @@ export class ControllerPagePayment extends BeanControllerPageBase {
           )}
           {isActionableCancelReturn && (
             <button class="btn btn-outline mt-3" type="button" onClick={() => this.openOrder()}>
-              Open order
+              {this.scope.locale.OpenOrder()}
             </button>
           )}
           {isMockSession && isActionable && (
             <section class="mt-6 rounded border border-dashed border-base-300 p-4">
-              <h2 class="font-semibold">Mock payment simulator</h2>
+              <h2 class="font-semibold">{this.scope.locale.MockPaymentSimulator()}</h2>
               <p class="mt-1 text-sm text-base-content/70">
-                Available only when the server enables the development/test mock provider.
+                {this.scope.locale.MockPaymentSimulatorHelp()}
               </p>
               <div class="mt-3 flex flex-wrap gap-3">
                 <button
@@ -322,32 +329,34 @@ export class ControllerPagePayment extends BeanControllerPageBase {
                   disabled={this.submitting || this.waitingForOrder}
                   onClick={() => this.settle('succeeded')}
                 >
-                  Payment succeeded
+                  {this.scope.locale.PaymentSucceeded()}
                 </button>
                 <button
                   class="btn btn-outline"
                   disabled={this.submitting || this.waitingForOrder}
                   onClick={() => this.settle('failed')}
                 >
-                  Payment failed
+                  {this.scope.locale.PaymentFailed()}
                 </button>
                 <button
                   class="btn btn-error btn-outline"
                   disabled={this.submitting || this.waitingForOrder}
                   onClick={() => this.settle('cancelled')}
                 >
-                  Cancel payment
+                  {this.scope.locale.CancelPayment()}
                 </button>
               </div>
             </section>
           )}
           {this.waitingForOrder && (
             <p class="mt-6 text-base-content/70" aria-live="polite">
-              Waiting for verified provider confirmation and order settlement…
+              {this.scope.locale.WaitingForPaymentSettlement()}
             </p>
           )}
           {session && !isCreated && !isActionable && !this.waitingForOrder && (
-            <p class="mt-6 text-base-content/70">Payment session state: {session.state}</p>
+            <p class="mt-6 text-base-content/70">
+              {this.scope.locale.PaymentSessionState({ state: session.state })}
+            </p>
           )}
           {this.message && (
             <div
@@ -360,8 +369,10 @@ export class ControllerPagePayment extends BeanControllerPageBase {
                 <span>{this.message}</span>
                 {this.pendingConfirmation && (
                   <p class="mt-1 text-sm">
-                    Payment session: {this.pendingSessionState ?? 'unknown'}; order:{' '}
-                    {this.pendingOrderState ?? 'unknown'}.
+                    {this.scope.locale.PaymentSessionAndOrderState({
+                      paymentSessionState: this.pendingSessionState ?? this.scope.locale.Unknown(),
+                      orderState: this.pendingOrderState ?? this.scope.locale.Unknown(),
+                    })}
                   </p>
                 )}
               </div>
@@ -371,6 +382,15 @@ export class ControllerPagePayment extends BeanControllerPageBase {
                     <ZPaymentNextAction
                       action={this.pendingNextAction}
                       disabled={this.submitting || this.waitingForOrder}
+                      continueToPaymentHelpText={this.scope.locale.ContinueToPaymentHelp()}
+                      continueToPaymentText={this.scope.locale.ContinueToPayment()}
+                      embeddedCheckoutUnavailableText={this.scope.locale.EmbeddedCheckoutUnavailable()}
+                      paymentCompletedText={this.scope.locale.PaymentCompleted()}
+                      paymentPreparingText={this.scope.locale.PaymentPreparing()}
+                      paymentPreparingRetryText={retryAfterSeconds =>
+                        this.scope.locale.PaymentPreparingRetry({ retryAfterSeconds })
+                      }
+                      refreshPaymentStatusText={this.scope.locale.RefreshPaymentStatus()}
                     />
                   ) : isPendingTerminalState ? (
                     <button
@@ -379,7 +399,7 @@ export class ControllerPagePayment extends BeanControllerPageBase {
                       disabled={this.waitingForOrder}
                       onClick={() => this.refreshOrderStatus()}
                     >
-                      Refresh order status
+                      {this.scope.locale.RefreshOrderStatus()}
                     </button>
                   ) : (
                     <button
@@ -388,11 +408,11 @@ export class ControllerPagePayment extends BeanControllerPageBase {
                       disabled={this.submitting || this.waitingForOrder}
                       onClick={() => this.reconcile()}
                     >
-                      Check payment status
+                      {this.scope.locale.CheckPaymentStatus()}
                     </button>
                   )}
                   <button class="btn btn-sm" type="button" onClick={() => this.openOrder()}>
-                    Open order
+                    {this.scope.locale.OpenOrder()}
                   </button>
                 </div>
               )}

package/zova/src/suite/cabloy-basic/modules/basic-captcha/src/component/formFieldCaptcha/controller.tsx

@@ -94,9 +94,10 @@ export class ControllerFormFieldCaptcha extends BeanControllerBase {
   }
 
   private setFieldCaptchaData() {
+    if (!this.captchaData) return;
     this.$$form.setFieldValue(this.$props.name!, {
-      id: this.captchaData?.id,
-      token: this.captchaData?.token,
+      id: this.captchaData.id,
+      token: this.captchaData.token,
     });
   }
 
@@ -105,6 +106,9 @@ export class ControllerFormFieldCaptcha extends BeanControllerBase {
       <>
         <ZFormField
           {...this.$props}
+          onFieldStateReady={() => {
+            this.setFieldCaptchaData();
+          }}
           slotDefault={({ propsBucket, props }, $$formField) => {
             const className = !propsBucket.needHandleBorder
               ? props.class

package/zova/src/suite/cabloy-basic/modules/basic-image/src/component/formFieldImage/controller.tsx

@@ -9,14 +9,7 @@ import { classes } from 'typestyle';
 import { BeanControllerBase, ClientOnly, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
 import { ZFormField } from 'zova-module-a-form';
-import {
-  buildImagePreviewTitle,
-  inferImageRelationName,
-  openImagePreviewDialog,
-  resolveImagePreviewUrl,
-} from 'zova-module-basic-image';
 
-import type { IImageTransformOptions } from '../../types/image.js';
 import type {
   IImageUploaderRenderState,
   IImageUploaderResult,
@@ -25,20 +18,21 @@ import type {
 import { ZImageUploader } from '../../.metadata/component/imageUploader.js';
 import 'vue-advanced-cropper/dist/style.css';
 
+import { IImageResizeOptions } from '../../lib/imageTransform.jsx';
+import {
+  buildImagePreviewTitle,
+  inferImageRelationName,
+  resolveImagePreviewUrl,
+} from '../../lib/preview.js';
+import { openImagePreviewDialog } from '../../lib/previewDialog.jsx';
+
 declare module 'zova-module-a-openapi' {
   export interface IResourceFormFieldRecord {
     'basic-image:formFieldImage'?: IResourceFormFieldImageOptions;
   }
 }
 
-export interface IResourceFormFieldImageResizeOptions {
-  width?: number;
-  height?: number;
-  fit?: 'scale-down' | 'contain' | 'cover' | 'crop' | 'pad';
-  background?: string;
-  quality?: number;
-  format?: IImageTransformOptions['format'];
-}
+export interface IResourceFormFieldImageResizeOptions extends IImageResizeOptions {}
 
 export interface IResourceFormFieldImageOptions extends IResourceFormFieldOptionsBase {
   imageScene?: keyof IImageSceneRecord | string;