cabloy 5.1.124 → 5.1.126

package/vona/src/suite/a-commerce/modules/commerce-member/src/service/address.ts

@@ -1,5 +1,5 @@
 import type { TableIdentity } from 'table-identity';
-import type { IQueryParams, TypeModelColumns } from 'vona-module-a-orm';
+import type { IQueryParams } from 'vona-module-a-orm';
 
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
@@ -10,22 +10,9 @@ import type { DtoAddressMineUpdate } from '../dto/addressMineUpdate.tsx';
 import type { DtoAddressMineView } from '../dto/addressMineView.tsx';
 import type { DtoAddressSelectRes } from '../dto/addressSelectRes.tsx';
 import type { DtoAddressView } from '../dto/addressView.tsx';
-import type { EntityAddress } from '../entity/address.tsx';
 import type { ModelAddress } from '../model/address.ts';
 
-const addressColumns: TypeModelColumns<EntityAddress> = [
-  'id',
-  'recipientName',
-  'phone',
-  'countryCode',
-  'region',
-  'city',
-  'postalCode',
-  'addressLine1',
-  'addressLine2',
-  'createdAt',
-  'updatedAt',
-];
+import { addressMineReadColumns } from '../lib/addressMine.ts';
 
 @Service()
 export class ServiceAddress extends BeanBase {
@@ -43,7 +30,7 @@ export class ServiceAddress extends BeanBase {
   async mine(params?: IQueryParams<ModelAddress>): Promise<DtoAddressMineRes> {
     return await this.scope.model.address.selectAndCount({
       ...params,
-      columns: addressColumns,
+      columns: addressMineReadColumns,
       where: { ...params?.where, userId: this._getCurrentUserId() },
       orders: params?.orders ?? [['id', 'asc']],
     });
@@ -79,7 +66,7 @@ export class ServiceAddress extends BeanBase {
   private async _getOwnedAddress(id: TableIdentity) {
     return await this.scope.model.address.get(
       { id, userId: this._getCurrentUserId() },
-      { columns: addressColumns },
+      { columns: addressMineReadColumns },
     );
   }
 }

package/vona/src/suite/a-commerce/modules/commerce-member/test/addressOwnership.test.ts

@@ -1,14 +1,14 @@
-import type {
-  DtoAddressMineCreate,
-  DtoAddressMineUpdate,
-  EntityAddress,
-} from 'vona-module-commerce-member';
-
 import { catchError } from '@cabloy/utils';
 import assert from 'node:assert';
 import { randomUUID } from 'node:crypto';
 import { describe, it } from 'node:test';
 import { app } from 'vona-mock';
+import {
+  DtoAddressMineCreate,
+  DtoAddressMineItem,
+  DtoAddressMineUpdate,
+  DtoAddressMineView,
+} from 'vona-module-commerce-member';
 
 const actionPath = '/commerce/member/address';
 const minePath = `${actionPath}/mine`;
@@ -16,6 +16,7 @@ const viewMinePath = `${actionPath}/viewMine/:id`;
 const createMinePath = `${actionPath}/createMine`;
 const updateMinePath = `${actionPath}/updateMine/:id`;
 const deleteMinePath = `${actionPath}/deleteMine/:id`;
+const addressMineExcludedFields = ['userId', 'iid', 'deleted', 'createdAt', 'updatedAt'] as const;
 
 function createTestId() {
   return randomUUID().slice(0, 12);
@@ -57,6 +58,38 @@ async function deleteOwnedAddresses(ids: Array<number | string | undefined>) {
 }
 
 describe('addressOwnership.test.ts', () => {
+  it('emits aligned Mine DTO schemas', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const expectedWriteFields = [
+        'recipientName',
+        'phone',
+        'countryCode',
+        'region',
+        'city',
+        'postalCode',
+        'addressLine1',
+        'addressLine2',
+      ].sort();
+      const expectedRequiredFields = expectedWriteFields.filter(name => name !== 'addressLine2');
+      for (const DtoClass of [DtoAddressMineCreate, DtoAddressMineUpdate]) {
+        const apiJson = await app.bean.openapi.generateJsonOfClass(DtoClass);
+        const component = Object.values(apiJson.components!.schemas as any).find(item => {
+          return (item as any).properties?.recipientName && (item as any).properties?.addressLine1;
+        }) as any;
+        assert.deepEqual(Object.keys(component.properties).sort(), expectedWriteFields);
+        assert.deepEqual(component.required?.sort(), expectedRequiredFields);
+      }
+      const expectedReadFields = ['id', ...expectedWriteFields].sort();
+      for (const DtoClass of [DtoAddressMineItem, DtoAddressMineView]) {
+        const apiJson = await app.bean.openapi.generateJsonOfClass(DtoClass);
+        const component = Object.values(apiJson.components!.schemas as any).find(item => {
+          return (item as any).properties?.id && (item as any).properties?.recipientName;
+        }) as any;
+        assert.deepEqual(Object.keys(component.properties).sort(), expectedReadFields);
+      }
+    });
+  });
+
   it('denies anonymous Admin and Web Address actions', async () => {
     await app.bean.executor.mockCtx(async () => {
       for (const [method, path, options] of [
@@ -97,14 +130,12 @@ describe('addressOwnership.test.ts', () => {
           ownList.list.some(item => String(item.id) === String(addressId)),
           true,
         );
-        assert.equal(
-          ownList.list.every(item => !Object.hasOwn(item, 'userId')),
-          true,
-        );
-        assert.equal(
-          ownList.list.every(item => !Object.hasOwn(item, 'iid')),
-          true,
-        );
+        for (const field of addressMineExcludedFields) {
+          assert.equal(
+            ownList.list.every(item => !Object.hasOwn(item, field)),
+            true,
+          );
+        }
 
         const { addressLine2: _, ...update } = {
           ...addressData,
@@ -117,13 +148,26 @@ describe('addressOwnership.test.ts', () => {
           }),
           null,
         );
-        const ownAddress: EntityAddress = await performAs(customerA.token, 'get', viewMinePath, {
-          params: { id: addressId },
-        });
+        const ownAddress: DtoAddressMineView = await performAs(
+          customerA.token,
+          'get',
+          viewMinePath,
+          {
+            params: { id: addressId },
+          },
+        );
         assert.equal(ownAddress.city, update.city);
         assert.equal(ownAddress.addressLine2, addressData.addressLine2);
-        assert.equal(Object.hasOwn(ownAddress, 'userId'), false);
-        assert.equal(Object.hasOwn(ownAddress, 'iid'), false);
+        for (const field of addressMineExcludedFields) {
+          assert.equal(Object.hasOwn(ownAddress, field), false);
+        }
+        const [, incompleteUpdateError] = await catchError(() =>
+          performAs(customerA.token, 'patch', updateMinePath, {
+            params: { id: addressId },
+            body: { city: 'Berkeley' },
+          }),
+        );
+        assert.equal(incompleteUpdateError?.code, 422);
 
         const foreignList = await performAs(customerB.token, 'get', minePath);
         assert.equal(

package/vona/src/suite/a-commerce/modules/commerce-payment/package.json

@@ -31,7 +31,8 @@
     "postpack": "clean-package restore"
   },
   "dependencies": {
-    "vona-module-a-pay": "workspace:*"
+    "vona-module-a-pay": "workspace:*",
+    "vona-module-pay-paypal": "workspace:*"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",

package/vona/src/suite/a-commerce/modules/commerce-payment/src/bean/payScene.commerceOrder.ts

@@ -1,10 +1,15 @@
-import type { IPaymentOutcomeEvent } from 'vona-module-a-pay';
+import type { IPaymentOutcomeEvent, IRefundOutcomeEvent } from 'vona-module-a-pay';
 
 import { BeanBase } from 'vona';
 import { PayScene } from 'vona-module-a-pay';
 
 @PayScene({
-  providers: [{ key: 'mock', providerName: 'pay-mock:mock', clientName: 'default' }],
+  providers: [
+    { key: 'mock', providerName: 'pay-mock:mock', clientName: 'default' },
+    { key: 'paypal', providerName: 'pay-paypal:paypal', clientName: 'default' },
+  ],
+  resolveProvider: (_ctx, input) =>
+    input.providers.find(item => item.key === 'mock')?.key ?? input.providers[0]!.key,
   currencies: ['USD'],
   captureMode: 'automatic',
   sessionExpiresIn: 30 * 60 * 1000,
@@ -17,4 +22,8 @@ export class PaySceneCommerceOrder extends BeanBase {
   async onPaymentOutcome(event: IPaymentOutcomeEvent): Promise<void> {
     await this.$scope.commerceTrade.service.order.settlePaymentFromProvider(event);
   }
+
+  async onRefundOutcome(event: IRefundOutcomeEvent): Promise<void> {
+    await this.$scope.commerceTrade.service.order.settleRefundFromProvider(event);
+  }
 }

package/vona/src/suite/a-commerce/modules/commerce-payment/src/service/commercePayScene.ts

@@ -29,10 +29,36 @@ export class ServiceCommercePayScene extends BeanBase {
   async linkRefundOperation(refundAttemptId: TableIdentity, refundOperationId: TableIdentity) {
     const refundAttempt = await this.scope.model.refundAttempt.getByIdForUpdate(refundAttemptId);
     if (!refundAttempt) this.app.throw(404, 'commerce refund attempt not found');
+    if (
+      refundAttempt.refundOperationId &&
+      String(refundAttempt.refundOperationId) !== String(refundOperationId)
+    ) {
+      this.app.throw(409, 'commerce refund attempt is linked to another refund operation');
+    }
     await this.scope.model.refundAttempt.updateById(refundAttempt.id, { refundOperationId });
     return { ...refundAttempt, refundOperationId };
   }
 
+  async createRefundOperation(refundAttemptId: TableIdentity) {
+    const refundAttempt = await this.scope.model.refundAttempt.getById(refundAttemptId);
+    if (!refundAttempt) this.app.throw(404, 'commerce refund attempt not found');
+    const paymentAttempt = await this.scope.model.paymentAttempt.get({
+      orderId: refundAttempt.orderId,
+    });
+    if (!paymentAttempt?.paymentSessionId)
+      this.app.throw(409, 'commerce payment session is unavailable');
+    const refund = await this.$scope.pay.service.refundOperation.create({
+      paymentSessionId: paymentAttempt.paymentSessionId,
+      businessReference: String(refundAttempt.id),
+      amountMinor: refundAttempt.amountCents,
+      currency: refundAttempt.currency,
+      idempotencyKey: `${refundAttempt.correlationId}:refund`,
+      correlationId: refundAttempt.correlationId,
+    });
+    await this.linkRefundOperation(refundAttempt.id, refund.id);
+    return refund;
+  }
+
   @Core.transaction({ isolationLevel: 'SERIALIZABLE' })
   async acceptRefundOutcome(event: IRefundOutcomeEvent) {
     const refundAttempt = await this.scope.model.refundAttempt.getForUpdate({

package/vona/src/suite/a-commerce/modules/commerce-payment/test/paymentAttempt.test.ts

@@ -1,9 +1,26 @@
 import assert from 'node:assert';
 import { randomUUID } from 'node:crypto';
-import { describe, it } from 'node:test';
-import { app } from 'vona-mock';
+import { after, before, describe, it } from 'node:test';
+import { acquireTestLock, app } from 'vona-mock';
 
 describe('paymentAttempt.test.ts', { concurrency: false }, () => {
+  const releaseTestLocks: Array<() => void> = [];
+
+  before(async () => {
+    try {
+      for (const scene of ['a-commerce', 'a-pay']) {
+        releaseTestLocks.push(await acquireTestLock(scene));
+      }
+    } catch (error) {
+      for (const release of releaseTestLocks.reverse()) release();
+      throw error;
+    }
+  });
+
+  after(() => {
+    for (const release of releaseTestLocks.reverse()) release();
+  });
+
   it('creates and internally cancels an attempt exactly once', async () => {
     await app.bean.executor.mockCtx(async () => {
       const scope = app.scope('commerce-payment');

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

@@ -10,14 +10,17 @@ export default {
   CouponTemplate: 'Coupon Template',
   CouponTemplateId: 'Coupon Template ID',
   CouponTemplateState: 'Template State',
+  CouponTemplateStateActive: 'Active',
+  CouponTemplateStateDisabled: 'Disabled',
+  CouponTemplateStateDraft: 'Draft',
   CorrelationId: 'Correlation ID',
   Currency: 'Currency',
   Description: 'Description',
-  DiscountCents: 'Fixed Discount (Cents)',
+  DiscountCents: 'Fixed Discount',
   DiscountPolicy: 'Discount Policy',
   FromState: 'Previous State',
   IssuedCount: 'Issued Count',
-  MinSpendCents: 'Minimum Spend (Cents)',
+  MinSpendCents: 'Minimum Spend',
   Name: 'Name',
   Operations: 'Operations',
   OrderId: 'Order ID',

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

@@ -10,14 +10,17 @@ export default {
   CouponTemplate: '优惠券模板',
   CouponTemplateId: '优惠券模板 ID',
   CouponTemplateState: '模板状态',
+  CouponTemplateStateActive: '已启用',
+  CouponTemplateStateDisabled: '已停用',
+  CouponTemplateStateDraft: '草稿',
   CorrelationId: '关联 ID',
   Currency: '币种',
   Description: '描述',
-  DiscountCents: '固定优惠（分）',
+  DiscountCents: '固定优惠',
   DiscountPolicy: '优惠策略',
   FromState: '原状态',
   IssuedCount: '已发放数',
-  MinSpendCents: '最低消费（分）',
+  MinSpendCents: '最低消费',
   Name: '名称',
   Operations: '操作',
   OrderId: '订单 ID',

package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponTemplateCreate.tsx

@@ -1,11 +1,14 @@
 import type { IDecoratorDtoOptions } from 'vona-module-a-web';
 
-import { Api, v } from 'vona-module-a-openapiutils';
+import { $makeSchema, v } from 'vona-module-a-openapiutils';
+import { $Dto } from 'vona-module-a-orm';
 import { Dto } from 'vona-module-a-web';
 import { z } from 'zod';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
+import { couponTemplateStateItemsCreate } from '../entity/couponTemplate.tsx';
+import { ModelCouponTemplate } from '../model/couponTemplate.ts';
 
 export interface IDtoOptionsCouponTemplateCreate extends IDecoratorDtoOptions {}
 
@@ -93,38 +96,26 @@ export interface IDtoOptionsCouponTemplateCreate extends IDecoratorDtoOptions {}
       ],
     }),
   ],
+  fields: {
+    state: $makeSchema(
+      v.required(),
+      ZovaRender.field('basic-select:formFieldSelect', { items: couponTemplateStateItemsCreate }),
+      z.enum(['draft', 'active']),
+    ),
+  },
 })
-export class DtoCouponTemplateCreate {
-  @Api.field(v.required(), v.min(2), v.max(100))
-  name: string;
-
-  @Api.field(v.required(), z.enum(['draft', 'active']))
-  state: 'draft' | 'active';
-
-  @Api.field(v.required(), z.literal('USD'))
-  currency: 'USD';
-
-  @Api.field(v.required(), z.number().int().positive())
-  discountCents: number;
-
-  @Api.field(v.required(), z.number().int().nonnegative())
-  minSpendCents: number;
-
-  @Api.field(v.required())
-  validFrom: Date;
-
-  @Api.field(v.required())
-  validUntil: Date;
-
-  @Api.field(v.optional(), z.number().int().positive())
-  totalIssueLimit?: number;
-
-  @Api.field(v.optional(), z.number().int().positive())
-  totalUsageLimit?: number;
-
-  @Api.field(v.optional(), z.number().int().positive())
-  perCustomerIssueLimit?: number;
-
-  @Api.field(v.optional(), v.max(255))
-  description?: string;
-}
+export class DtoCouponTemplateCreate extends $Dto.create(() => ModelCouponTemplate, {
+  columns: [
+    'name',
+    'state',
+    'currency',
+    'discountCents',
+    'minSpendCents',
+    'validFrom',
+    'validUntil',
+    'totalIssueLimit',
+    'totalUsageLimit',
+    'perCustomerIssueLimit',
+    'description',
+  ],
+}) {}

package/vona/src/suite/a-commerce/modules/commerce-promotion/src/dto/couponTemplateUpdate.tsx

@@ -6,6 +6,7 @@ import { z } from 'zod';
 import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
 
 import { $locale } from '../.metadata/locales.ts';
+import { couponTemplateStateItems } from '../entity/couponTemplate.tsx';
 
 export interface IDtoOptionsCouponTemplateUpdate extends IDecoratorDtoOptions {}
 
@@ -54,7 +55,11 @@ export class DtoCouponTemplateUpdate {
   @Api.field(v.optional(), v.min(2), v.max(100))
   name?: string;
 
-  @Api.field(v.optional(), z.enum(['draft', 'active', 'disabled']))
+  @Api.field(
+    v.optional(),
+    ZovaRender.field('basic-select:formFieldSelect', { items: couponTemplateStateItems }),
+    z.enum(['draft', 'active', 'disabled']),
+  )
   state?: 'draft' | 'active' | 'disabled';
 
   @Api.field(v.optional(), v.max(255))

package/vona/src/suite/a-commerce/modules/commerce-promotion/src/entity/couponTemplate.tsx

@@ -9,6 +9,18 @@ import { $locale } from '../.metadata/locales.ts';
 
 export type TypeCouponTemplateState = 'draft' | 'active' | 'disabled';
 
+export const couponTemplateStateItems = [
+  { value: 'draft', title: $locale('CouponTemplateStateDraft') },
+  { value: 'active', title: $locale('CouponTemplateStateActive') },
+  { value: 'disabled', title: $locale('CouponTemplateStateDisabled') },
+];
+
+export const couponTemplateStateItemsCreate = couponTemplateStateItems.slice(0, 2);
+
+const currencyRendererOptions = { fixed: 2, exp: 2, zero: 2 };
+const dateFieldRendererOptions = { inputType: 'date' as const, preset: 'DATE_SHORT' as const };
+const dateCellRendererOptions = { preset: 'DATE_SHORT' as const };
+
 export interface IEntityOptionsCouponTemplate extends IDecoratorEntityOptions {}
 
 @Entity<IEntityOptionsCouponTemplate>('commercePromotionCouponTemplate', {
@@ -43,6 +55,8 @@ export class EntityCouponTemplate extends EntityBase {
   @Api.field(
     v.title($locale('CouponTemplateState')),
     v.required(),
+    ZovaRender.field('basic-select:formFieldSelect', { items: couponTemplateStateItems }),
+    ZovaRender.cell('basic-select:select', { items: couponTemplateStateItems }),
     z.enum(['draft', 'active', 'disabled']),
   )
   state: TypeCouponTemplateState;
@@ -50,16 +64,38 @@ export class EntityCouponTemplate extends EntityBase {
   @Api.field(v.title($locale('Currency')), v.required(), z.literal('USD'))
   currency: 'USD';
 
-  @Api.field(v.title($locale('DiscountCents')), v.required(), z.number().int().positive())
+  @Api.field(
+    v.title($locale('DiscountCents')),
+    v.required(),
+    ZovaRender.field('basic-currency:formFieldCurrency', currencyRendererOptions),
+    ZovaRender.cell('basic-currency:currency', currencyRendererOptions),
+    z.number().int().positive(),
+  )
   discountCents: number;
 
-  @Api.field(v.title($locale('MinSpendCents')), v.required(), z.number().int().nonnegative())
+  @Api.field(
+    v.title($locale('MinSpendCents')),
+    v.required(),
+    ZovaRender.field('basic-currency:formFieldCurrency', currencyRendererOptions),
+    ZovaRender.cell('basic-currency:currency', currencyRendererOptions),
+    z.number().int().nonnegative(),
+  )
   minSpendCents: number;
 
-  @Api.field(v.title($locale('ValidFrom')), v.required())
+  @Api.field(
+    v.title($locale('ValidFrom')),
+    v.required(),
+    ZovaRender.field('basic-date:formFieldDate', dateFieldRendererOptions),
+    ZovaRender.cell('basic-date:date', dateCellRendererOptions),
+  )
   validFrom: Date;
 
-  @Api.field(v.title($locale('ValidUntil')), v.required())
+  @Api.field(
+    v.title($locale('ValidUntil')),
+    v.required(),
+    ZovaRender.field('basic-date:formFieldDate', dateFieldRendererOptions),
+    ZovaRender.cell('basic-date:date', dateCellRendererOptions),
+  )
   validUntil: Date;
 
   @Api.field(v.title($locale('TotalIssueLimit')), v.optional(), z.number().int().positive())

package/vona/src/suite/a-commerce/modules/commerce-promotion/test/couponTemplateFormLayout.test.ts

@@ -52,6 +52,23 @@ describe('couponTemplateFormLayout.test.ts', () => {
         ],
       );
       assert.deepEqual(getGroupFields(createLayout?.children[0])?.[2]?.span, { default: 1, md: 2 });
+      assert.deepEqual(
+        Object.keys((createComponent as any).properties).sort(),
+        [
+          'name',
+          'state',
+          'currency',
+          'discountCents',
+          'minSpendCents',
+          'validFrom',
+          'validUntil',
+          'totalIssueLimit',
+          'totalUsageLimit',
+          'perCustomerIssueLimit',
+          'description',
+        ].sort(),
+      );
+      assert.deepEqual((createComponent as any).properties.state.enum, ['draft', 'active']);
 
       const updateJson = await app.bean.openapi.generateJsonOfClass(DtoCouponTemplateUpdate);
       const updateComponent = findComponent(updateJson, properties => {
@@ -66,6 +83,7 @@ describe('couponTemplateFormLayout.test.ts', () => {
         ['name', 'state', 'description'],
       );
       assert.deepEqual(getGroupFields(updateLayout?.children[0])?.[2]?.span, { default: 1, md: 2 });
+      assert.deepEqual((updateComponent as any).required ?? [], []);
 
       const viewJson = await app.bean.openapi.generateJsonOfClass(DtoCouponTemplateView);
       const viewComponent = findComponent(viewJson, properties => {
@@ -92,6 +110,73 @@ describe('couponTemplateFormLayout.test.ts', () => {
     });
   });
 
+  it('action:couponTemplate:fieldRenderMetadata', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const createJson = await app.bean.openapi.generateJsonOfClass(DtoCouponTemplateCreate);
+      const createComponent = findComponent(createJson, properties => {
+        return properties?.discountCents && properties?.totalIssueLimit;
+      }) as any;
+      const createProperties = createComponent.properties;
+      const expectedCurrencyOptions = { fixed: 2, exp: 2, zero: 2 };
+      const expectedCreateStateValues = ['draft', 'active'];
+      const expectedStateValues = ['draft', 'active', 'disabled'];
+      const stateItems = createProperties.state.rest.form.options.items;
+
+      assert.equal(createProperties.state.rest.form.render, 'basic-select:formFieldSelect');
+      assert.deepEqual(
+        stateItems.map((item: any) => item.value),
+        expectedCreateStateValues,
+      );
+      assert.ok(stateItems.every((item: any) => item.title?.toJSON && item.title?.toString));
+      assert.equal(createProperties.state.rest.table.render, 'basic-select:select');
+      assert.deepEqual(
+        createProperties.state.rest.table.columnProps.items.map((item: any) => item.value),
+        expectedStateValues,
+      );
+
+      for (const fieldName of ['discountCents', 'minSpendCents']) {
+        const field = createProperties[fieldName];
+        assert.equal(field.rest.form.render, 'basic-currency:formFieldCurrency');
+        assert.deepEqual(field.rest.form.options, expectedCurrencyOptions);
+        assert.equal(field.rest.table.render, 'basic-currency:currency');
+        assert.deepEqual(field.rest.table.columnProps, expectedCurrencyOptions);
+      }
+
+      for (const fieldName of ['validFrom', 'validUntil']) {
+        const field = createProperties[fieldName];
+        assert.equal(field.rest.form.render, 'basic-date:formFieldDate');
+        assert.deepEqual(field.rest.form.options, { inputType: 'date', preset: 'DATE_SHORT' });
+        assert.equal(field.rest.table.render, 'basic-date:date');
+        assert.deepEqual(field.rest.table.columnProps, { preset: 'DATE_SHORT' });
+      }
+
+      const viewJson = await app.bean.openapi.generateJsonOfClass(DtoCouponTemplateView);
+      const viewComponent = findComponent(viewJson, properties => {
+        return properties?.issuedCount && properties?.redeemedCount;
+      }) as any;
+      assert.equal(
+        viewComponent.properties.discountCents.rest.form.render,
+        'basic-currency:formFieldCurrency',
+      );
+      assert.equal(
+        viewComponent.properties.validUntil.rest.form.render,
+        'basic-date:formFieldDate',
+      );
+
+      const updateJson = await app.bean.openapi.generateJsonOfClass(DtoCouponTemplateUpdate);
+      const updateComponent = findComponent(updateJson, properties => {
+        return (
+          properties?.name && properties?.state && properties?.description && !properties?.currency
+        );
+      }) as any;
+      assert.equal(
+        updateComponent.properties.state.rest.form.render,
+        'basic-select:formFieldSelect',
+      );
+      assert.equal(updateComponent.properties.discountCents, undefined);
+    });
+  });
+
   it('action:couponTemplate:filterFormLayoutMetadata', async () => {
     await app.bean.executor.mockCtx(async () => {
       const apiJson = await app.bean.openapi.generateJsonOfClass(DtoCouponTemplateSelectResItem);

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

@@ -1282,7 +1282,7 @@ export interface IApiPathPostRecord{
 '/commerce/trade/order/:id/requestRefund': undefined;
 '/commerce/trade/order/:id/approveRefund': undefined;
 '/commerce/trade/order/:id/rejectRefund': undefined;
-'/commerce/trade/order/:id/refundOutcome': undefined;
+'/commerce/trade/order/:id/executeRefund': undefined;
 '/commerce/trade/order/:id/ship': undefined;
 '/commerce/trade/stockBalance/adjustStock': undefined;
     }

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

@@ -16,7 +16,6 @@ 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 { DtoRefundOutcomeCreate } from '../dto/refundOutcomeCreate.tsx';
 import { DtoRefundRequestCreate } from '../dto/refundRequestCreate.tsx';
 import { DtoRefundResult } from '../dto/refundResult.tsx';
 import { DtoRefundReview } from '../dto/refundReview.tsx';
@@ -72,14 +71,13 @@ export class ControllerOrder extends BeanBase {
     return await this.scope.service.order.rejectRefund(id, command);
   }
 
-  @Web.post(':id/refundOutcome')
+  @Web.post(':id/executeRefund')
   @Api.body(DtoRefundResult)
   @Passport.systemAdmin()
-  async refundOutcome(
+  async executeRefund(
     @Arg.param('id', v.tableIdentity()) id: TableIdentity,
-    @Arg.body() command: DtoRefundOutcomeCreate,
   ): Promise<DtoRefundResult> {
-    return await this.scope.service.order.applyRefundOutcome(id, command);
+    return await this.scope.service.order.executeRefund(id);
   }
 
   @Web.post(':id/ship')