cabloy 5.1.131 → 5.1.133

package/vona/src/suite/a-commerce/modules/commerce-trade/src/.metadata/index.ts

@@ -323,8 +323,8 @@ declare module 'vona-module-commerce-trade' {
       }
 export interface IModelOptionsOrder {
         relations: {
-          lines: IModelRelationHasMany<'commerce-trade:orderLine', 'orderId', false, '*', undefined, undefined, undefined>;
-shipment: IModelRelationHasOne<'commerce-trade:shipment', 'orderId', false, '*'>;
+          lines: IModelRelationHasMany<'commerce-trade:orderLine', 'orderId', false, 'id'|'skuCodeSnapshot'|'titleSnapshot'|'skuAttributesSnapshot'|'unitPriceCents'|'quantity'|'eligibleSubtotalCents'|'lineTotalCents', undefined, undefined, undefined>;
+shipment: IModelRelationHasOne<'commerce-trade:shipment', 'orderId', false, 'id'|'carrier'|'trackingNumber'|'shippedAt'>;
         };
       }
   export interface ModelCart {
@@ -838,6 +838,9 @@ export * from '../dto/checkoutPaymentMethod.tsx';
 export * from '../dto/checkoutPaymentMethods.tsx';
 export * from '../dto/checkoutResult.tsx';
 export * from '../dto/orderAddressSnapshot.tsx';
+export * from '../dto/orderAdminLineBase.tsx';
+export * from '../dto/orderAdminLineResItem.tsx';
+export * from '../dto/orderAdminLineView.tsx';
 export * from '../dto/orderCouponSnapshot.tsx';
 export * from '../dto/orderDetail.tsx';
 export * from '../dto/orderLineSkuAttributeSnapshot.tsx';
@@ -852,6 +855,8 @@ export * from '../dto/orderView.tsx';
 export * from '../dto/paymentOutcomeCreate.tsx';
 export * from '../dto/paymentOutcomeResult.tsx';
 export * from '../dto/refundOutcomeCreate.tsx';
+export * from '../dto/refundRecoveryAction.tsx';
+export * from '../dto/refundRecoveryView.tsx';
 export * from '../dto/refundRequestCreate.tsx';
 export * from '../dto/refundResult.tsx';
 export * from '../dto/refundReview.tsx';
@@ -878,6 +883,9 @@ import type { IDtoOptionsCheckoutPaymentMethod } from '../dto/checkoutPaymentMet
 import type { IDtoOptionsCheckoutPaymentMethods } from '../dto/checkoutPaymentMethods.tsx';
 import type { IDtoOptionsCheckoutResult } from '../dto/checkoutResult.tsx';
 import type { IDtoOptionsOrderAddressSnapshot } from '../dto/orderAddressSnapshot.tsx';
+import type { IDtoOptionsOrderAdminLineBase } from '../dto/orderAdminLineBase.tsx';
+import type { IDtoOptionsOrderAdminLineResItem } from '../dto/orderAdminLineResItem.tsx';
+import type { IDtoOptionsOrderAdminLineView } from '../dto/orderAdminLineView.tsx';
 import type { IDtoOptionsOrderCouponSnapshot } from '../dto/orderCouponSnapshot.tsx';
 import type { IDtoOptionsOrderDetail } from '../dto/orderDetail.tsx';
 import type { IDtoOptionsOrderLineSkuAttributeSnapshot } from '../dto/orderLineSkuAttributeSnapshot.tsx';
@@ -892,6 +900,8 @@ import type { IDtoOptionsOrderView } from '../dto/orderView.tsx';
 import type { IDtoOptionsPaymentOutcomeCreate } from '../dto/paymentOutcomeCreate.tsx';
 import type { IDtoOptionsPaymentOutcomeResult } from '../dto/paymentOutcomeResult.tsx';
 import type { IDtoOptionsRefundOutcomeCreate } from '../dto/refundOutcomeCreate.tsx';
+import type { IDtoOptionsRefundRecoveryAction } from '../dto/refundRecoveryAction.tsx';
+import type { IDtoOptionsRefundRecoveryView } from '../dto/refundRecoveryView.tsx';
 import type { IDtoOptionsRefundRequestCreate } from '../dto/refundRequestCreate.tsx';
 import type { IDtoOptionsRefundResult } from '../dto/refundResult.tsx';
 import type { IDtoOptionsRefundReview } from '../dto/refundReview.tsx';
@@ -922,6 +932,9 @@ declare module 'vona-module-a-web' {
 'commerce-trade:checkoutPaymentMethods': IDtoOptionsCheckoutPaymentMethods;
 'commerce-trade:checkoutResult': IDtoOptionsCheckoutResult;
 'commerce-trade:orderAddressSnapshot': IDtoOptionsOrderAddressSnapshot;
+'commerce-trade:orderAdminLineBase': IDtoOptionsOrderAdminLineBase;
+'commerce-trade:orderAdminLineResItem': IDtoOptionsOrderAdminLineResItem;
+'commerce-trade:orderAdminLineView': IDtoOptionsOrderAdminLineView;
 'commerce-trade:orderCouponSnapshot': IDtoOptionsOrderCouponSnapshot;
 'commerce-trade:orderDetail': IDtoOptionsOrderDetail;
 'commerce-trade:orderLineSkuAttributeSnapshot': IDtoOptionsOrderLineSkuAttributeSnapshot;
@@ -936,6 +949,8 @@ declare module 'vona-module-a-web' {
 'commerce-trade:paymentOutcomeCreate': IDtoOptionsPaymentOutcomeCreate;
 'commerce-trade:paymentOutcomeResult': IDtoOptionsPaymentOutcomeResult;
 'commerce-trade:refundOutcomeCreate': IDtoOptionsRefundOutcomeCreate;
+'commerce-trade:refundRecoveryAction': IDtoOptionsRefundRecoveryAction;
+'commerce-trade:refundRecoveryView': IDtoOptionsRefundRecoveryView;
 'commerce-trade:refundRequestCreate': IDtoOptionsRefundRequestCreate;
 'commerce-trade:refundResult': IDtoOptionsRefundResult;
 'commerce-trade:refundReview': IDtoOptionsRefundReview;
@@ -971,6 +986,9 @@ import type { DtoCheckoutPaymentMethod } from '../dto/checkoutPaymentMethod.tsx'
 import type { DtoCheckoutPaymentMethods } from '../dto/checkoutPaymentMethods.tsx';
 import type { DtoCheckoutResult } from '../dto/checkoutResult.tsx';
 import type { DtoOrderAddressSnapshot } from '../dto/orderAddressSnapshot.tsx';
+import type { DtoOrderAdminLineBase } from '../dto/orderAdminLineBase.tsx';
+import type { DtoOrderAdminLineResItem } from '../dto/orderAdminLineResItem.tsx';
+import type { DtoOrderAdminLineView } from '../dto/orderAdminLineView.tsx';
 import type { DtoOrderCouponSnapshot } from '../dto/orderCouponSnapshot.tsx';
 import type { DtoOrderDetail } from '../dto/orderDetail.tsx';
 import type { DtoOrderLineSkuAttributeSnapshot } from '../dto/orderLineSkuAttributeSnapshot.tsx';
@@ -985,6 +1003,8 @@ import type { DtoOrderView } from '../dto/orderView.tsx';
 import type { DtoPaymentOutcomeCreate } from '../dto/paymentOutcomeCreate.tsx';
 import type { DtoPaymentOutcomeResult } from '../dto/paymentOutcomeResult.tsx';
 import type { DtoRefundOutcomeCreate } from '../dto/refundOutcomeCreate.tsx';
+import type { DtoRefundRecoveryAction } from '../dto/refundRecoveryAction.tsx';
+import type { DtoRefundRecoveryView } from '../dto/refundRecoveryView.tsx';
 import type { DtoRefundRequestCreate } from '../dto/refundRequestCreate.tsx';
 import type { DtoRefundResult } from '../dto/refundResult.tsx';
 import type { DtoRefundReview } from '../dto/refundReview.tsx';
@@ -1040,6 +1060,18 @@ declare module 'vona-module-commerce-trade' {
       fields?: TypeEntityOptionsFields<DtoOrderAddressSnapshot, IDtoOptionsOrderAddressSnapshot[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsOrderAdminLineBase {
+      fields?: TypeEntityOptionsFields<DtoOrderAdminLineBase, IDtoOptionsOrderAdminLineBase[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsOrderAdminLineResItem {
+      fields?: TypeEntityOptionsFields<DtoOrderAdminLineResItem, IDtoOptionsOrderAdminLineResItem[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsOrderAdminLineView {
+      fields?: TypeEntityOptionsFields<DtoOrderAdminLineView, IDtoOptionsOrderAdminLineView[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsOrderCouponSnapshot {
       fields?: TypeEntityOptionsFields<DtoOrderCouponSnapshot, IDtoOptionsOrderCouponSnapshot[TypeSymbolKeyFieldsMore]>;
     }
@@ -1096,6 +1128,14 @@ declare module 'vona-module-commerce-trade' {
       fields?: TypeEntityOptionsFields<DtoRefundOutcomeCreate, IDtoOptionsRefundOutcomeCreate[TypeSymbolKeyFieldsMore]>;
     }
 
+    export interface IDtoOptionsRefundRecoveryAction {
+      fields?: TypeEntityOptionsFields<DtoRefundRecoveryAction, IDtoOptionsRefundRecoveryAction[TypeSymbolKeyFieldsMore]>;
+    }
+
+    export interface IDtoOptionsRefundRecoveryView {
+      fields?: TypeEntityOptionsFields<DtoRefundRecoveryView, IDtoOptionsRefundRecoveryView[TypeSymbolKeyFieldsMore]>;
+    }
+
     export interface IDtoOptionsRefundRequestCreate {
       fields?: TypeEntityOptionsFields<DtoRefundRequestCreate, IDtoOptionsRefundRequestCreate[TypeSymbolKeyFieldsMore]>;
     }
@@ -1286,6 +1326,7 @@ declare module 'vona-module-a-web' {
 '/commerce/trade/checkout/payment-methods': undefined;
 '/commerce/trade/order/mine': undefined;
 '/commerce/trade/order/viewMine/:id': undefined;
+'/commerce/trade/order/:id/refundRecovery': undefined;
 '/commerce/trade/order': undefined;
 '/commerce/trade/order/:id': undefined;
 '/commerce/trade/stockAudit': undefined;
@@ -1300,6 +1341,8 @@ export interface IApiPathPostRecord{
 '/commerce/trade/order/:id/approveRefund': undefined;
 '/commerce/trade/order/:id/rejectRefund': undefined;
 '/commerce/trade/order/:id/executeRefund': undefined;
+'/commerce/trade/order/:id/reconcileRefund': undefined;
+'/commerce/trade/order/:id/retryRefund': undefined;
 '/commerce/trade/order/:id/ship': undefined;
 '/commerce/trade/stockBalance/adjustStock': undefined;
     }

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

@@ -17,14 +17,32 @@ export default {
   OnHand: 'On Hand',
   Operations: 'Operations',
   Order: 'Order',
+  OrderAddress: 'Delivery address',
+  OrderCoupon: 'Coupon snapshot',
+  OrderDates: 'Record dates',
+  OrderFulfillment: 'Fulfillment',
   OrderLine: 'Order line',
   OrderLineId: 'Order line ID',
+  OrderLines: 'Purchased lines',
+  OrderMoney: 'Money summary',
+  OrderReservation: 'Reservation',
+  OrderState: 'Order state',
+  OrderStateAwaitingPayment: 'Awaiting payment',
+  OrderStateCancelled: 'Cancelled',
+  OrderStateExpired: 'Expired',
+  OrderStatePaid: 'Paid',
+  OrderStateRefundApproved: 'Refund approved',
+  OrderStateRefundRejected: 'Refund rejected',
+  OrderStateRefundRequested: 'Refund requested',
+  OrderStateRefunded: 'Refunded',
+  OrderStateShipped: 'Shipped',
   PayableTotalCents: 'Payable total (cents)',
   PriorAvailable: 'Prior Available',
   PriorOnHand: 'Prior On Hand',
   PriorReserved: 'Prior Reserved',
   Quantity: 'Quantity',
   Reason: 'Reason',
+  ReservationExpiresAt: 'Reservation deadline',
   ReservationState: 'Reservation State',
   Reserved: 'Reserved',
   SkuId: 'SKU ID',
@@ -34,5 +52,10 @@ export default {
   StockOperation: 'Stock Operation',
   StockReservation: 'Stock Reservation',
   StockReservationId: 'Stock Reservation ID',
+  SkuAttributesSnapshot: 'SKU attributes',
+  SkuCodeSnapshot: 'SKU code',
+  TitleSnapshot: 'Product title',
+  UnitPriceCents: 'Unit price (cents)',
+  LineTotalCents: 'Line total (cents)',
   UpdateCartItem: 'Update Cart Item',
 };

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

@@ -17,14 +17,32 @@ export default {
   OnHand: '现货库存',
   Operations: '操作',
   Order: '订单',
+  OrderAddress: '收货地址',
+  OrderCoupon: '优惠券快照',
+  OrderDates: '记录时间',
+  OrderFulfillment: '履约信息',
   OrderLine: '订单行',
   OrderLineId: '订单行 ID',
+  OrderLines: '购买商品',
+  OrderMoney: '金额汇总',
+  OrderReservation: '库存预留',
+  OrderState: '订单状态',
+  OrderStateAwaitingPayment: '待支付',
+  OrderStateCancelled: '已取消',
+  OrderStateExpired: '已过期',
+  OrderStatePaid: '已支付',
+  OrderStateRefundApproved: '退款已批准',
+  OrderStateRefundRejected: '退款被拒绝',
+  OrderStateRefundRequested: '申请退款',
+  OrderStateRefunded: '已退款',
+  OrderStateShipped: '已发货',
   PayableTotalCents: '应付总额（分）',
   PriorAvailable: '变更前可用库存',
   PriorOnHand: '变更前现货库存',
   PriorReserved: '变更前预留库存',
   Quantity: '数量',
   Reason: '原因',
+  ReservationExpiresAt: '预留截止时间',
   ReservationState: '预留状态',
   Reserved: '预留库存',
   SkuId: 'SKU ID',
@@ -34,5 +52,10 @@ export default {
   StockOperation: '库存操作',
   StockReservation: '库存预留',
   StockReservationId: '库存预留 ID',
+  SkuAttributesSnapshot: 'SKU 属性',
+  SkuCodeSnapshot: 'SKU 编码',
+  TitleSnapshot: '商品标题',
+  UnitPriceCents: '单价（分）',
+  LineTotalCents: '行金额（分）',
   UpdateCartItem: '更新购物车商品',
 };

package/vona/src/suite/a-commerce/modules/commerce-trade/src/controller/order.ts

@@ -16,6 +16,8 @@ import { DtoOrderSelectReq } from '../dto/orderSelectReq.tsx';
 import { DtoOrderSelectRes } from '../dto/orderSelectRes.tsx';
 import { DtoOrderShip } from '../dto/orderShip.tsx';
 import { DtoOrderView } from '../dto/orderView.tsx';
+import { DtoRefundRecoveryAction } from '../dto/refundRecoveryAction.tsx';
+import { DtoRefundRecoveryView } from '../dto/refundRecoveryView.tsx';
 import { DtoRefundRequestCreate } from '../dto/refundRequestCreate.tsx';
 import { DtoRefundResult } from '../dto/refundResult.tsx';
 import { DtoRefundReview } from '../dto/refundReview.tsx';
@@ -80,6 +82,35 @@ export class ControllerOrder extends BeanBase {
     return await this.scope.service.order.executeRefund(id);
   }
 
+  @Web.get(':id/refundRecovery')
+  @Api.body(DtoRefundRecoveryView)
+  @Passport.systemAdmin()
+  async refundRecovery(
+    @Arg.param('id', v.tableIdentity()) id: TableIdentity,
+  ): Promise<DtoRefundRecoveryView> {
+    return await this.scope.service.order.refundRecovery(id);
+  }
+
+  @Web.post(':id/reconcileRefund')
+  @Api.body(DtoRefundRecoveryView)
+  @Passport.systemAdmin()
+  async reconcileRefund(
+    @Arg.param('id', v.tableIdentity()) id: TableIdentity,
+    @Arg.body(DtoRefundRecoveryAction) command: DtoRefundRecoveryAction,
+  ): Promise<DtoRefundRecoveryView> {
+    return await this.scope.service.order.reconcileRefund(id, command);
+  }
+
+  @Web.post(':id/retryRefund')
+  @Api.body(DtoRefundRecoveryView)
+  @Passport.systemAdmin()
+  async retryRefund(
+    @Arg.param('id', v.tableIdentity()) id: TableIdentity,
+    @Arg.body(DtoRefundRecoveryAction) command: DtoRefundRecoveryAction,
+  ): Promise<DtoRefundRecoveryView> {
+    return await this.scope.service.order.retryRefund(id, command);
+  }
+
   @Web.post(':id/ship')
   @Api.body(DtoShipmentView)
   @Passport.systemAdmin()

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/orderAdminLineBase.tsx

@@ -0,0 +1,56 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { $makeMetadata, v } from 'vona-module-a-openapiutils';
+import { $Dto } from 'vona-module-a-orm';
+import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
+import { ModelOrderLine } from '../model/orderLine.ts';
+
+const currencyRendererOptions = { fixed: 2, exp: 2, zero: 2 };
+
+export interface IDtoOptionsOrderAdminLineBase extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderAdminLineBase>({
+  fields: {
+    id: $makeMetadata(ZovaRender.visible(false)),
+    skuCodeSnapshot: $makeMetadata(v.title($locale('SkuCodeSnapshot')), ZovaRender.order(2)),
+    titleSnapshot: $makeMetadata(v.title($locale('TitleSnapshot')), ZovaRender.order(3)),
+    skuAttributesSnapshot: $makeMetadata(
+      v.title($locale('SkuAttributesSnapshot')),
+      ZovaRender.order(4),
+    ),
+    unitPriceCents: $makeMetadata(
+      v.title($locale('UnitPriceCents')),
+      ZovaRender.order(5),
+      ZovaRender.field('basic-currency:formFieldCurrency', currencyRendererOptions),
+      ZovaRender.cell('basic-currency:currency', currencyRendererOptions),
+    ),
+    quantity: $makeMetadata(v.title($locale('Quantity')), ZovaRender.order(6)),
+    eligibleSubtotalCents: $makeMetadata(
+      v.title($locale('EligibleSubtotalCents')),
+      ZovaRender.order(7),
+      ZovaRender.field('basic-currency:formFieldCurrency', currencyRendererOptions),
+      ZovaRender.cell('basic-currency:currency', currencyRendererOptions),
+    ),
+    lineTotalCents: $makeMetadata(
+      v.title($locale('LineTotalCents')),
+      ZovaRender.order(8),
+      ZovaRender.field('basic-currency:formFieldCurrency', currencyRendererOptions),
+      ZovaRender.cell('basic-currency:currency', currencyRendererOptions),
+    ),
+  },
+})
+export class DtoOrderAdminLineBase extends $Dto.get(() => ModelOrderLine, {
+  columns: [
+    'id',
+    'skuCodeSnapshot',
+    'titleSnapshot',
+    'skuAttributesSnapshot',
+    'unitPriceCents',
+    'quantity',
+    'eligibleSubtotalCents',
+    'lineTotalCents',
+  ],
+}) {}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/orderAdminLineResItem.tsx

@@ -0,0 +1,17 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { DtoOrderAdminLineBase } from './orderAdminLineBase.tsx';
+
+export interface IDtoOptionsOrderAdminLineResItem extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderAdminLineResItem>({
+  blocks: [
+    ZovaRender.block('basic-details:blockDetails', {
+      blocks: [ZovaRender.block('basic-details:blockTable')],
+    }),
+  ],
+})
+export class DtoOrderAdminLineResItem extends DtoOrderAdminLineBase {}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/orderAdminLineView.tsx

@@ -0,0 +1,13 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Dto } from 'vona-module-a-web';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { DtoOrderAdminLineBase } from './orderAdminLineBase.tsx';
+
+export interface IDtoOptionsOrderAdminLineView extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderAdminLineView>({
+  blocks: [ZovaRender.block('basic-details:blockForm')],
+})
+export class DtoOrderAdminLineView extends DtoOrderAdminLineBase {}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/orderSelectResItem.tsx

@@ -1,13 +1,16 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { Api, v } from 'vona-module-a-openapiutils';
+import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
+import { orderStateItems } from '../entity/order.tsx';
 import { ModelOrder } from '../model/order.ts';
 
+const currencyRendererOptions = { fixed: 2, exp: 2, zero: 2 };
+
 export interface IDtoOptionsOrderSelectResItem extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsOrderSelectResItem>({
@@ -42,8 +45,29 @@ export interface IDtoOptionsOrderSelectResItem extends IDecoratorDtoOptions {}
       ],
     }),
   ],
+  fields: {
+    id: $makeMetadata(ZovaRender.order(1, 'core'), ZovaRender.cell('basic-table:actionView')),
+    state: $makeMetadata(
+      v.title($locale('OrderState')),
+      ZovaRender.order(2),
+      ZovaRender.cell('basic-select:select', { items: orderStateItems }),
+    ),
+    payableTotalCents: $makeMetadata(
+      v.title($locale('PayableTotalCents')),
+      ZovaRender.order(3),
+      ZovaRender.cell('basic-currency:currency', currencyRendererOptions),
+    ),
+    reservationExpiresAt: $makeMetadata(
+      v.title($locale('ReservationExpiresAt')),
+      ZovaRender.order(4),
+      ZovaRender.cell('basic-date:date'),
+    ),
+    createdAt: $makeMetadata(ZovaRender.order(5), ZovaRender.cell('basic-date:date')),
+  },
 })
-export class DtoOrderSelectResItem extends $Dto.get(() => ModelOrder) {
+export class DtoOrderSelectResItem extends $Dto.get(() => ModelOrder, {
+  columns: ['id', 'state', 'payableTotalCents', 'reservationExpiresAt', 'createdAt'],
+}) {
   @Api.field(
     v.title($locale('Operations')),
     ZovaRender.order(1, 'max'),

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/orderView.tsx

@@ -1,10 +1,18 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
+import { Api, v } from 'vona-module-a-openapiutils';
 import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
+import type { EntityOrder } from '../entity/order.tsx';
+
+import { $locale } from '../.metadata/locales.ts';
+import { orderStateItems } from '../entity/order.tsx';
 import { ModelOrder } from '../model/order.ts';
+import { DtoOrderAdminLineResItem } from './orderAdminLineResItem.tsx';
+
+const currencyRendererOptions = { fixed: 2, exp: 2, zero: 2 };
 
 export interface IDtoOptionsOrderView extends IDecoratorDtoOptions {}
 
@@ -12,7 +20,110 @@ export interface IDtoOptionsOrderView extends IDecoratorDtoOptions {}
   blocks: [
     ZovaRender.block('basic-pageentry:blockPageEntry', {
       blocks: [
-        ZovaRender.block('basic-pageentry:blockForm'),
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'group',
+                    title: $locale('Order'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'id' },
+                          { type: 'field', name: 'state' },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('OrderMoney'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'currency' },
+                          { type: 'field', name: 'eligibleSubtotalCents' },
+                          { type: 'field', name: 'discountCents' },
+                          { type: 'field', name: 'payableTotalCents' },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('OrderReservation'),
+                    children: [
+                      {
+                        type: 'section',
+                        children: [{ type: 'field', name: 'reservationExpiresAt' }],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('OrderAddress'),
+                    children: [
+                      {
+                        type: 'section',
+                        children: [{ type: 'field', name: 'addressSnapshot' }],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('OrderCoupon'),
+                    children: [
+                      {
+                        type: 'section',
+                        children: [{ type: 'field', name: 'couponSnapshot' }],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('OrderLines'),
+                    children: [
+                      {
+                        type: 'section',
+                        children: [{ type: 'field', name: 'lines' }],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('OrderFulfillment'),
+                    children: [
+                      {
+                        type: 'section',
+                        children: [{ type: 'field', name: 'shipment' }],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('OrderDates'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'createdAt' },
+                          { type: 'field', name: 'updatedAt' },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
         ZovaRender.block('basic-pageentry:blockToolbarRow', {
           actions: [
             ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
@@ -23,5 +134,88 @@ export interface IDtoOptionsOrderView extends IDecoratorDtoOptions {}
   ],
 })
 export class DtoOrderView extends $Dto.get(() => ModelOrder, {
-  include: { shipment: true },
-}) {}
+  columns: [
+    'id',
+    'state',
+    'currency',
+    'eligibleSubtotalCents',
+    'discountCents',
+    'payableTotalCents',
+    'reservationExpiresAt',
+    'addressSnapshot',
+    'couponSnapshot',
+    'createdAt',
+    'updatedAt',
+  ],
+  include: {
+    shipment: true,
+    lines: true,
+  },
+}) {
+  @Api.field(
+    v.title($locale('OrderState')),
+    ZovaRender.order(2),
+    ZovaRender.field('basic-select:formFieldSelect', { items: orderStateItems }),
+    ZovaRender.cell('basic-select:select', { items: orderStateItems }),
+  )
+  declare state: EntityOrder['state'];
+
+  @Api.field(v.title($locale('Currency')), ZovaRender.order(3))
+  declare currency: EntityOrder['currency'];
+
+  @Api.field(
+    v.title($locale('EligibleSubtotalCents')),
+    ZovaRender.order(4),
+    ZovaRender.field('basic-currency:formFieldCurrency', currencyRendererOptions),
+    ZovaRender.cell('basic-currency:currency', currencyRendererOptions),
+  )
+  declare eligibleSubtotalCents: number;
+
+  @Api.field(
+    v.title($locale('DiscountCents')),
+    ZovaRender.order(5),
+    ZovaRender.field('basic-currency:formFieldCurrency', currencyRendererOptions),
+    ZovaRender.cell('basic-currency:currency', currencyRendererOptions),
+  )
+  declare discountCents: number;
+
+  @Api.field(
+    v.title($locale('PayableTotalCents')),
+    ZovaRender.order(6),
+    ZovaRender.field('basic-currency:formFieldCurrency', currencyRendererOptions),
+    ZovaRender.cell('basic-currency:currency', currencyRendererOptions),
+  )
+  declare payableTotalCents: number;
+
+  @Api.field(
+    v.title($locale('ReservationExpiresAt')),
+    ZovaRender.order(7),
+    ZovaRender.field('basic-date:formFieldDate'),
+    ZovaRender.cell('basic-date:date'),
+  )
+  declare reservationExpiresAt: Date;
+
+  @Api.field(
+    v.title($locale('OrderLines')),
+    ZovaRender.order(8),
+    ZovaRender.field('basic-details:formFieldDetails'),
+  )
+  declare lines: DtoOrderAdminLineResItem[];
+
+  @Api.field(
+    ZovaRender.order(9),
+    ZovaRender.field('basic-date:formFieldDate'),
+    ZovaRender.cell('basic-date:date'),
+  )
+  declare createdAt: Date;
+
+  @Api.field(
+    ZovaRender.order(10),
+    ZovaRender.field('basic-date:formFieldDate'),
+    ZovaRender.cell('basic-date:date'),
+  )
+  declare updatedAt: Date;
+
+  @Api.field(ZovaRender.visible(false), v.optional(), v.array(DtoOrderAdminLineResItem))
+  _lines?: DtoOrderAdminLineResItem[];
+}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/refundRecoveryAction.tsx

@@ -0,0 +1,19 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+import { z } from 'zod';
+
+export interface IDtoOptionsRefundRecoveryAction extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsRefundRecoveryAction>()
+export class DtoRefundRecoveryAction {
+  @Api.field(v.required(), v.min(1), v.max(255))
+  reason: string;
+
+  @Api.field(v.required(), v.min(1), v.max(100))
+  actionIdempotencyKey: string;
+
+  @Api.field(v.optional(), z.boolean())
+  acknowledgeRetryRisk?: boolean;
+}