cabloy 5.1.122 → 5.1.124

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

@@ -1 +1,3 @@
+export * from './types/index.ts';
+export * from './lib/index.ts';
 export * from './.metadata/index.ts';

package/vona/src/suite/a-commerce/modules/commerce-payment/src/lib/index.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,54 @@
+import type { TableIdentity } from 'table-identity';
+import type { IRefundOutcomeEvent } from 'vona-module-a-pay';
+
+import { BeanBase } from 'vona';
+import { Service } from 'vona-module-a-bean';
+import { Core } from 'vona-module-a-core';
+
+import type { EntityPaymentAttempt } from '../entity/paymentAttempt.tsx';
+
+@Service()
+export class ServiceCommercePayScene extends BeanBase {
+  async createSession(attempt: EntityPaymentAttempt) {
+    const session = await this.$scope.pay.service.paymentSession.create({
+      userId: attempt.userId,
+      payScene: 'commerce-payment:commerceOrder',
+      businessReference: String(attempt.id),
+      amountMinor: attempt.amountCents,
+      currency: attempt.currency,
+      correlationId: `${attempt.correlationId}:session`,
+    });
+    await this.scope.model.paymentAttempt.updateById(attempt.id, {
+      paymentSessionId: session.id,
+      providerName: session.providerName,
+    });
+    return session;
+  }
+
+  @Core.transaction({ isolationLevel: 'SERIALIZABLE' })
+  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');
+    await this.scope.model.refundAttempt.updateById(refundAttempt.id, { refundOperationId });
+    return { ...refundAttempt, refundOperationId };
+  }
+
+  @Core.transaction({ isolationLevel: 'SERIALIZABLE' })
+  async acceptRefundOutcome(event: IRefundOutcomeEvent) {
+    const refundAttempt = await this.scope.model.refundAttempt.getForUpdate({
+      refundOperationId: event.refundOperationId,
+    });
+    if (!refundAttempt) this.app.throw(404, 'commerce refund attempt not found');
+    if (
+      refundAttempt.amountCents !== event.amountMinor ||
+      refundAttempt.currency !== event.currency
+    ) {
+      this.app.throw(409, 'commerce refund amount conflicts with the refund operation');
+    }
+    if (refundAttempt.state !== 'created') return refundAttempt;
+    await this.scope.model.refundAttempt.updateById(refundAttempt.id, {
+      providerRefundId: event.providerRefundId,
+    });
+    return { ...refundAttempt, providerRefundId: event.providerRefundId };
+  }
+}

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

@@ -22,7 +22,7 @@ export type TypePaymentAttemptFinalState = Extract<
 @Service()
 export class ServicePaymentAttempt extends BeanBase {
   async create(command: IPaymentAttemptCreateCommand): Promise<EntityPaymentAttempt> {
-    return await this.scope.model.paymentAttempt.insert({
+    const attempt = await this.scope.model.paymentAttempt.insert({
       orderId: command.orderId,
       userId: command.userId,
       state: 'created',
@@ -30,6 +30,12 @@ export class ServicePaymentAttempt extends BeanBase {
       amountCents: command.amountCents,
       correlationId: command.correlationId,
     });
+    const session = await this.scope.service.commercePayScene.createSession(attempt);
+    return {
+      ...attempt,
+      paymentSessionId: session.id,
+      providerName: session.providerName,
+    };
   }
 
   async finalize(

package/vona/src/suite/a-commerce/modules/commerce-payment/src/types/index.ts

@@ -0,0 +1 @@
+export {};

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

@@ -9,8 +9,11 @@ describe('paymentAttempt.test.ts', { concurrency: false }, () => {
       const scope = app.scope('commerce-payment');
       const suffix = randomUUID().slice(0, 12);
       let attemptId: number | undefined;
+      let paymentSessionId: number | undefined;
+      let userId: number | undefined;
       try {
         const user = await app.bean.user.register({ name: `payment-${suffix}` }, true);
+        userId = user.id as number;
         const created = await scope.service.paymentAttempt.create({
           orderId: 900_001,
           userId: user.id,
@@ -19,14 +22,32 @@ describe('paymentAttempt.test.ts', { concurrency: false }, () => {
           correlationId: `payment-${suffix}`,
         });
         attemptId = created.id as number;
+        paymentSessionId = created.paymentSessionId as number;
         assert.equal(created.state, 'created');
+        const session = await app.scope('a-pay').model.paymentSession.getById(paymentSessionId);
+        assert.equal(session?.payScene, 'commerce-payment:commerceOrder');
+        assert.equal(session?.providerName, 'pay-mock:mock');
+        assert.equal(session?.clientName, 'default');
+        assert.equal(session?.environment, 'sandbox');
+        assert.ok((session?.expiresAt.getTime() ?? 0) > Date.now() + 29 * 60 * 1000);
         const cancelled = await scope.service.paymentAttempt.cancel(created.orderId);
         assert.equal(cancelled?.state, 'cancelled');
         const replay = await scope.service.paymentAttempt.cancel(created.orderId);
         assert.equal(replay?.id, created.id);
         assert.equal(replay?.state, 'cancelled');
       } finally {
+        if (paymentSessionId !== undefined) {
+          const pay = app.scope('a-pay');
+          await pay.model.outboxEvent.delete({ paymentSessionId });
+          await pay.model.paymentAudit.delete({ paymentSessionId });
+          await pay.model.webhookInbox.delete({ paymentSessionId });
+          await pay.model.paymentSession.delete({ id: paymentSessionId });
+        }
         if (attemptId !== undefined) await scope.model.paymentAttempt.delete({ id: attemptId });
+        if (userId !== undefined) {
+          await app.scope('home-user').model.roleUser.delete({ userId });
+          await app.bean.user.removeById(userId);
+        }
       }
     });
   });

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

@@ -148,7 +148,17 @@ declare module 'vona-module-commerce-promotion' {
       [SymbolKeyEntityMeta]: EntityCouponAuditMeta;
       [SymbolKeyModelOptions]: IModelOptionsCouponAudit;
       get<T extends IModelGetOptions<EntityCouponAudit,ModelCouponAudit>>(where: TypeModelWhere<EntityCouponAudit>, options?: T): Promise<TypeModelRelationResult<EntityCouponAudit, ModelCouponAudit, T> | undefined>;
+      /**
+       * Retrieves one matching primary row with a pessimistic FOR UPDATE lock.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getForUpdate<T extends IModelGetOptions<EntityCouponAudit,ModelCouponAudit>>(where: TypeModelWhere<EntityCouponAudit>, options?: T): Promise<TypeModelRelationResult<EntityCouponAudit, ModelCouponAudit, T> | undefined>;
+      /**
+       * Retrieves a primary row by ID with the same pessimistic FOR UPDATE lock semantics.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getByIdForUpdate<T extends IModelGetOptions<EntityCouponAudit,ModelCouponAudit>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityCouponAudit, ModelCouponAudit, T> | undefined>;
       mget<T extends IModelGetOptions<EntityCouponAudit,ModelCouponAudit>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityCouponAudit, ModelCouponAudit, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityCouponAudit,ModelCouponAudit,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityCouponAudit, ModelCouponAudit, T>>;
@@ -175,7 +185,17 @@ export interface ModelCouponGrant {
       [SymbolKeyEntityMeta]: EntityCouponGrantMeta;
       [SymbolKeyModelOptions]: IModelOptionsCouponGrant;
       get<T extends IModelGetOptions<EntityCouponGrant,ModelCouponGrant>>(where: TypeModelWhere<EntityCouponGrant>, options?: T): Promise<TypeModelRelationResult<EntityCouponGrant, ModelCouponGrant, T> | undefined>;
+      /**
+       * Retrieves one matching primary row with a pessimistic FOR UPDATE lock.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getForUpdate<T extends IModelGetOptions<EntityCouponGrant,ModelCouponGrant>>(where: TypeModelWhere<EntityCouponGrant>, options?: T): Promise<TypeModelRelationResult<EntityCouponGrant, ModelCouponGrant, T> | undefined>;
+      /**
+       * Retrieves a primary row by ID with the same pessimistic FOR UPDATE lock semantics.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getByIdForUpdate<T extends IModelGetOptions<EntityCouponGrant,ModelCouponGrant>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityCouponGrant, ModelCouponGrant, T> | undefined>;
       mget<T extends IModelGetOptions<EntityCouponGrant,ModelCouponGrant>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityCouponGrant, ModelCouponGrant, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityCouponGrant,ModelCouponGrant,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityCouponGrant, ModelCouponGrant, T>>;
@@ -202,7 +222,17 @@ export interface ModelCouponTemplate {
       [SymbolKeyEntityMeta]: EntityCouponTemplateMeta;
       [SymbolKeyModelOptions]: IModelOptionsCouponTemplate;
       get<T extends IModelGetOptions<EntityCouponTemplate,ModelCouponTemplate>>(where: TypeModelWhere<EntityCouponTemplate>, options?: T): Promise<TypeModelRelationResult<EntityCouponTemplate, ModelCouponTemplate, T> | undefined>;
+      /**
+       * Retrieves one matching primary row with a pessimistic FOR UPDATE lock.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getForUpdate<T extends IModelGetOptions<EntityCouponTemplate,ModelCouponTemplate>>(where: TypeModelWhere<EntityCouponTemplate>, options?: T): Promise<TypeModelRelationResult<EntityCouponTemplate, ModelCouponTemplate, T> | undefined>;
+      /**
+       * Retrieves a primary row by ID with the same pessimistic FOR UPDATE lock semantics.
+       * Requires an active transaction. The lock is released when that transaction completes.
+       * Entity and query caches are bypassed.
+       */
       getByIdForUpdate<T extends IModelGetOptions<EntityCouponTemplate,ModelCouponTemplate>>(id: TableIdentity, options?: T): Promise<TypeModelRelationResult<EntityCouponTemplate, ModelCouponTemplate, T> | undefined>;
       mget<T extends IModelGetOptions<EntityCouponTemplate,ModelCouponTemplate>>(ids: TableIdentity[], options?: T): Promise<TypeModelRelationResult<EntityCouponTemplate, ModelCouponTemplate, T>[]>;
       selectAndCount<T extends IModelSelectParams<EntityCouponTemplate,ModelCouponTemplate,ModelJoins>, ModelJoins extends TypeModelsClassLikeGeneral | undefined = undefined>(params?: T, options?: IModelMethodOptions, modelJoins?: ModelJoins): Promise<TypeModelSelectAndCount<EntityCouponTemplate, ModelCouponTemplate, T>>;

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

@@ -1,5 +1,6 @@
 export default {
   ActorId: 'Actor ID',
+  BasicInformation: 'Basic Information',
   CouponAudit: 'Coupon Audit',
   CouponCode: 'Coupon Code',
   CouponGrant: 'Coupon Grant',
@@ -13,6 +14,7 @@ export default {
   Currency: 'Currency',
   Description: 'Description',
   DiscountCents: 'Fixed Discount (Cents)',
+  DiscountPolicy: 'Discount Policy',
   FromState: 'Previous State',
   IssuedCount: 'Issued Count',
   MinSpendCents: 'Minimum Spend (Cents)',
@@ -31,7 +33,9 @@ export default {
   ToState: 'New State',
   TotalIssueLimit: 'Total Issue Limit',
   TotalUsageLimit: 'Total Usage Limit',
+  UsageLimits: 'Usage Limits',
   UserId: 'User ID',
   ValidFrom: 'Valid From',
+  ValidityWindow: 'Validity Window',
   ValidUntil: 'Valid Until',
 };

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

@@ -1,5 +1,6 @@
 export default {
   ActorId: '操作人 ID',
+  BasicInformation: '基本信息',
   CouponAudit: '优惠券审计',
   CouponCode: '优惠券代码',
   CouponGrant: '优惠券发放',
@@ -13,6 +14,7 @@ export default {
   Currency: '币种',
   Description: '描述',
   DiscountCents: '固定优惠（分）',
+  DiscountPolicy: '优惠策略',
   FromState: '原状态',
   IssuedCount: '已发放数',
   MinSpendCents: '最低消费（分）',
@@ -31,7 +33,9 @@ export default {
   ToState: '新状态',
   TotalIssueLimit: '总发放上限',
   TotalUsageLimit: '总使用上限',
+  UsageLimits: '使用限制',
   UserId: '用户 ID',
   ValidFrom: '开始时间',
+  ValidityWindow: '有效期',
   ValidUntil: '结束时间',
 };

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

@@ -3,10 +3,97 @@ 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';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IDtoOptionsCouponTemplateCreate extends IDecoratorDtoOptions {}
 
-@Dto<IDtoOptionsCouponTemplateCreate>()
+@Dto<IDtoOptionsCouponTemplateCreate>({
+  blocks: [
+    ZovaRender.block('basic-pageentry:blockPageEntry', {
+      blocks: [
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'group',
+                    title: $locale('BasicInformation'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'name' },
+                          { type: 'field', name: 'state' },
+                          { type: 'field', name: 'description', span: { default: 1, md: 2 } },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('DiscountPolicy'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'currency' },
+                          { type: 'field', name: 'discountCents' },
+                          { type: 'field', name: 'minSpendCents' },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('ValidityWindow'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'validFrom' },
+                          { type: 'field', name: 'validUntil' },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('UsageLimits'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'totalIssueLimit' },
+                          { type: 'field', name: 'totalUsageLimit' },
+                          { type: 'field', name: 'perCustomerIssueLimit' },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
+        ZovaRender.block('basic-pageentry:blockToolbarRow', {
+          actions: [
+            ZovaRender.formActionRow('basic-form:actionSubmit', {
+              permission: { actionInherit: 'update', formScene: ['create', 'edit'] },
+            }),
+            ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
+          ],
+        }),
+      ],
+    }),
+  ],
+})
 export class DtoCouponTemplateCreate {
   @Api.field(v.required(), v.min(2), v.max(100))
   name: string;

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

@@ -3,10 +3,53 @@ 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';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
 
 export interface IDtoOptionsCouponTemplateUpdate extends IDecoratorDtoOptions {}
 
-@Dto<IDtoOptionsCouponTemplateUpdate>()
+@Dto<IDtoOptionsCouponTemplateUpdate>({
+  blocks: [
+    ZovaRender.block('basic-pageentry:blockPageEntry', {
+      blocks: [
+        ZovaRender.block('basic-pageentry:blockForm', {
+          blocks: [
+            ZovaRender.block('basic-form:blockFormLayout', {
+              formLayout: {
+                children: [
+                  {
+                    type: 'group',
+                    title: $locale('BasicInformation'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'name' },
+                          { type: 'field', name: 'state' },
+                          { type: 'field', name: 'description', span: { default: 1, md: 2 } },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
+        ZovaRender.block('basic-pageentry:blockToolbarRow', {
+          actions: [
+            ZovaRender.formActionRow('basic-form:actionSubmit', {
+              permission: { actionInherit: 'update', formScene: ['create', 'edit'] },
+            }),
+            ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),
+          ],
+        }),
+      ],
+    }),
+  ],
+})
 export class DtoCouponTemplateUpdate {
   @Api.field(v.optional(), v.min(2), v.max(100))
   name?: string;

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

@@ -4,6 +4,7 @@ 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 { ModelCouponTemplate } from '../model/couponTemplate.ts';
 
 export interface IDtoOptionsCouponTemplateView extends IDecoratorDtoOptions {}
@@ -12,7 +13,77 @@ export interface IDtoOptionsCouponTemplateView 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('BasicInformation'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'name' },
+                          { type: 'field', name: 'state' },
+                          { type: 'field', name: 'description', span: { default: 1, md: 2 } },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('DiscountPolicy'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'currency' },
+                          { type: 'field', name: 'discountCents' },
+                          { type: 'field', name: 'minSpendCents' },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('ValidityWindow'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'validFrom' },
+                          { type: 'field', name: 'validUntil' },
+                        ],
+                      },
+                    ],
+                  },
+                  {
+                    type: 'group',
+                    title: $locale('UsageLimits'),
+                    children: [
+                      {
+                        type: 'section',
+                        columns: { default: 1, md: 2 },
+                        children: [
+                          { type: 'field', name: 'totalIssueLimit' },
+                          { type: 'field', name: 'totalUsageLimit' },
+                          { type: 'field', name: 'perCustomerIssueLimit' },
+                          { type: 'field', name: 'issuedCount' },
+                          { type: 'field', name: 'redeemedCount' },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            }),
+          ],
+        }),
         ZovaRender.block('basic-pageentry:blockToolbarRow', {
           actions: [
             ZovaRender.formActionRow('basic-form:actionBack', { permission: { public: true } }),

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

@@ -0,0 +1,121 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+import { app } from 'vona-mock';
+import {
+  DtoCouponTemplateCreate,
+  DtoCouponTemplateSelectResItem,
+  DtoCouponTemplateUpdate,
+  DtoCouponTemplateView,
+} from 'vona-module-commerce-promotion';
+
+function getEntryFormLayout(component: any) {
+  const pageEntry = component?.rest?.blocks?.[0];
+  const formBlock = pageEntry?.options?.blocks?.[0];
+  const layoutBlock = formBlock?.options?.blocks?.[0];
+  assert.equal(pageEntry?.render, 'basic-pageentry:blockPageEntry');
+  assert.equal(formBlock?.render, 'basic-pageentry:blockForm');
+  assert.equal(layoutBlock?.render, 'basic-form:blockFormLayout');
+  return layoutBlock?.options?.formLayout;
+}
+
+function getGroupFields(group: any) {
+  const section = group?.children?.[0];
+  assert.equal(group?.type, 'group');
+  assert.equal(section?.type, 'section');
+  assert.deepEqual(section?.columns, { default: 1, md: 2 });
+  return section?.children;
+}
+
+function findComponent(apiJson: any, predicate: (properties: any) => boolean) {
+  return Object.values(apiJson.components!.schemas as any).find(item => {
+    return predicate((item as any).properties);
+  });
+}
+
+describe('couponTemplateFormLayout.test.ts', () => {
+  it('action:couponTemplate:formLayoutMetadata', 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;
+      });
+      const createLayout = getEntryFormLayout(createComponent);
+      assert.deepEqual(
+        createLayout?.children.map((group: any) =>
+          getGroupFields(group).map((field: any) => field.name),
+        ),
+        [
+          ['name', 'state', 'description'],
+          ['currency', 'discountCents', 'minSpendCents'],
+          ['validFrom', 'validUntil'],
+          ['totalIssueLimit', 'totalUsageLimit', 'perCustomerIssueLimit'],
+        ],
+      );
+      assert.deepEqual(getGroupFields(createLayout?.children[0])?.[2]?.span, { default: 1, md: 2 });
+
+      const updateJson = await app.bean.openapi.generateJsonOfClass(DtoCouponTemplateUpdate);
+      const updateComponent = findComponent(updateJson, properties => {
+        return (
+          properties?.name && properties?.state && properties?.description && !properties?.currency
+        );
+      });
+      const updateLayout = getEntryFormLayout(updateComponent);
+      assert.equal(updateLayout?.children.length, 1);
+      assert.deepEqual(
+        getGroupFields(updateLayout?.children[0]).map((field: any) => field.name),
+        ['name', 'state', 'description'],
+      );
+      assert.deepEqual(getGroupFields(updateLayout?.children[0])?.[2]?.span, { default: 1, md: 2 });
+
+      const viewJson = await app.bean.openapi.generateJsonOfClass(DtoCouponTemplateView);
+      const viewComponent = findComponent(viewJson, properties => {
+        return properties?.issuedCount && properties?.redeemedCount;
+      });
+      const viewLayout = getEntryFormLayout(viewComponent);
+      assert.deepEqual(
+        viewLayout?.children.map((group: any) =>
+          getGroupFields(group).map((field: any) => field.name),
+        ),
+        [
+          ['name', 'state', 'description'],
+          ['currency', 'discountCents', 'minSpendCents'],
+          ['validFrom', 'validUntil'],
+          [
+            'totalIssueLimit',
+            'totalUsageLimit',
+            'perCustomerIssueLimit',
+            'issuedCount',
+            'redeemedCount',
+          ],
+        ],
+      );
+    });
+  });
+
+  it('action:couponTemplate:filterFormLayoutMetadata', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const apiJson = await app.bean.openapi.generateJsonOfClass(DtoCouponTemplateSelectResItem);
+      const component = findComponent(apiJson, properties => properties?._operationsRow);
+      const filterBlock = (component as any)?.rest?.blocks?.[0]?.options?.blocks?.[0];
+      assert.equal(filterBlock?.render, 'basic-page:blockFilter');
+      assert.equal(filterBlock?.options?.formFieldLayout?.inline, true);
+      assert.deepEqual(
+        filterBlock?.options?.blocks?.map((block: any) => block.render),
+        ['basic-form:blockFormLayout'],
+      );
+      const filterLayout = filterBlock?.options?.blocks?.[0]?.options?.formLayout;
+      const section = filterLayout?.children?.[0];
+      assert.equal(section?.type, 'section');
+      assert.equal(section?.layout, 'flow');
+      assert.deepEqual(
+        section?.children?.map((child: any) => child.type),
+        ['field', 'field', 'block'],
+      );
+      assert.deepEqual(
+        section?.children?.slice(0, 2).map((field: any) => field.name),
+        ['name', 'createdAt'],
+      );
+      assert.equal(section?.children?.[2]?.block?.render, 'basic-page:blockFilterActions');
+    });
+  });
+});

package/vona/src/suite/a-commerce/modules/commerce-siteweb/src/bean/ssrMenu.home.ts

@@ -13,7 +13,10 @@ export interface ISsrMenuOptionsHome extends IDecoratorSsrMenuOptions<ISsrSiteOp
     title: 'Commerce',
     order: $order(1),
     icon: undefined,
-    link: '/',
+    link: '/:locale' as never,
+    meta: {
+      params: { locale: true },
+    },
   },
   site: ['commerce-siteweb:commerce'],
 })

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

@@ -30,7 +30,9 @@
     "prepack": "clean-package",
     "postpack": "clean-package restore"
   },
-  "dependencies": {},
+  "dependencies": {
+    "vona-module-a-pay": "workspace:*"
+  },
   "devDependencies": {
     "clean-package": "^2.2.0",
     "rimraf": "^6.1.3"
@@ -46,6 +48,7 @@
   "title": "commerce-trade",
   "vonaModule": {
     "dependencies": {
+      "a-pay": "5.0.0",
       "a-vona": "5.0.0",
       "commerce-member": "5.0.0",
       "commerce-payment": "5.0.0",