cabloy 5.1.113 → 5.1.115

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

@@ -1,16 +1,25 @@
 export default {
+  ActorId: 'Actor ID',
+  AddCartItem: 'Add Cart Item',
   AdjustStock: 'Adjust Stock',
+  AddressId: 'Address ID',
+  AddressSnapshot: 'Address snapshot',
   Available: 'Available',
-  AddCartItem: 'Add Cart Item',
-  ActorId: 'Actor ID',
   Cart: 'Cart',
   CartItem: 'Cart Item',
   CorrelationId: 'Correlation ID',
+  Currency: 'Currency',
   Delta: 'Delta',
+  DiscountCents: 'Discount (cents)',
+  EligibleSubtotalCents: 'Eligible subtotal (cents)',
   Description: 'Description',
   Name: 'Name',
   OnHand: 'On Hand',
   Operations: 'Operations',
+  Order: 'Order',
+  OrderLine: 'Order line',
+  OrderLineId: 'Order line ID',
+  PayableTotalCents: 'Payable total (cents)',
   PriorAvailable: 'Prior Available',
   PriorOnHand: 'Prior On Hand',
   PriorReserved: 'Prior Reserved',

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

@@ -1,16 +1,25 @@
 export default {
+  ActorId: '操作人 ID',
+  AddCartItem: '添加购物车商品',
   AdjustStock: '调整库存',
+  AddressId: '地址 ID',
+  AddressSnapshot: '地址快照',
   Available: '可用库存',
-  AddCartItem: '添加购物车商品',
-  ActorId: '操作人 ID',
   Cart: '购物车',
   CartItem: '购物车商品',
   CorrelationId: '关联 ID',
+  Currency: '货币',
   Delta: '调整数量',
+  DiscountCents: '优惠金额（分）',
+  EligibleSubtotalCents: '优惠适用小计（分）',
   Description: '描述',
   Name: '名称',
   OnHand: '现货库存',
   Operations: '操作',
+  Order: '订单',
+  OrderLine: '订单行',
+  OrderLineId: '订单行 ID',
+  PayableTotalCents: '应付总额（分）',
   PriorAvailable: '变更前可用库存',
   PriorOnHand: '变更前现货库存',
   PriorReserved: '变更前预留库存',

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

@@ -0,0 +1,19 @@
+import type { IDecoratorControllerOptions } from 'vona-module-a-web';
+
+import { BeanBase } from 'vona';
+import { Api } from 'vona-module-a-openapiutils';
+import { Arg, Controller, Web } from 'vona-module-a-web';
+
+import { DtoCheckoutCreate } from '../dto/checkoutCreate.tsx';
+import { DtoCheckoutResult } from '../dto/checkoutResult.tsx';
+
+export interface IControllerOptionsCheckout extends IDecoratorControllerOptions {}
+
+@Controller<IControllerOptionsCheckout>('checkout')
+export class ControllerCheckout extends BeanBase {
+  @Web.post()
+  @Api.body(DtoCheckoutResult)
+  async create(@Arg.body() command: DtoCheckoutCreate): Promise<DtoCheckoutResult> {
+    return await this.scope.service.order.checkout(command);
+  }
+}

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

@@ -0,0 +1,19 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+
+export interface IDtoOptionsCheckoutCreate extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsCheckoutCreate>()
+export class DtoCheckoutCreate {
+  @Api.field(v.required(), v.tableIdentity())
+  addressId: TableIdentity;
+
+  @Api.field(v.optional(), v.tableIdentity())
+  couponGrantId?: TableIdentity;
+
+  @Api.field(v.required(), v.min(1), v.max(80))
+  correlationId: string;
+}

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

@@ -0,0 +1,32 @@
+import type { TableIdentity } from 'table-identity';
+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 IDtoOptionsCheckoutResult extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsCheckoutResult>()
+export class DtoCheckoutResult {
+  @Api.field(v.tableIdentity())
+  orderId: TableIdentity;
+
+  @Api.field(v.tableIdentity())
+  paymentAttemptId: TableIdentity;
+
+  @Api.field(z.literal('awaiting_payment'))
+  state: 'awaiting_payment';
+
+  @Api.field(z.literal('created'))
+  paymentAttemptState: 'created';
+
+  @Api.field(z.literal('USD'))
+  currency: 'USD';
+
+  @Api.field(z.number().int().nonnegative())
+  payableTotalCents: number;
+
+  @Api.field(v.required())
+  reservationExpiresAt: Date;
+}

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

@@ -0,0 +1,33 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+
+export interface IDtoOptionsOrderAddressSnapshot extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderAddressSnapshot>()
+export class DtoOrderAddressSnapshot {
+  @Api.field(v.required())
+  recipientName: string;
+
+  @Api.field(v.required())
+  phone: string;
+
+  @Api.field(v.required())
+  countryCode: string;
+
+  @Api.field(v.required())
+  region: string;
+
+  @Api.field(v.required())
+  city: string;
+
+  @Api.field(v.required())
+  postalCode: string;
+
+  @Api.field(v.required())
+  addressLine1: string;
+
+  @Api.field(v.optional())
+  addressLine2?: string;
+}

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

@@ -0,0 +1,35 @@
+import type { TableIdentity } from 'table-identity';
+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 IDtoOptionsOrderCouponSnapshot extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderCouponSnapshot>()
+export class DtoOrderCouponSnapshot {
+  @Api.field(v.required(), v.tableIdentity())
+  couponGrantId: TableIdentity;
+
+  @Api.field(v.required(), v.tableIdentity())
+  couponTemplateId: TableIdentity;
+
+  @Api.field(v.required(), v.min(1), v.max(80))
+  couponCode: string;
+
+  @Api.field(v.required(), v.min(1), v.max(100))
+  templateName: string;
+
+  @Api.field(v.required(), z.literal('USD'))
+  currency: 'USD';
+
+  @Api.field(v.required(), z.number().int().positive())
+  fixedDiscountCents: number;
+
+  @Api.field(v.required(), z.number().int().nonnegative())
+  minSpendCents: number;
+
+  @Api.field(v.required(), z.number().int().nonnegative())
+  appliedDiscountCents: number;
+}

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

@@ -0,0 +1,15 @@
+import type { IDecoratorDtoOptions } from 'vona-module-a-web';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Dto } from 'vona-module-a-web';
+
+export interface IDtoOptionsOrderLineSkuAttributeSnapshot extends IDecoratorDtoOptions {}
+
+@Dto<IDtoOptionsOrderLineSkuAttributeSnapshot>()
+export class DtoOrderLineSkuAttributeSnapshot {
+  @Api.field(v.required())
+  name: string;
+
+  @Api.field(v.required())
+  value: string;
+}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/entity/order.tsx

@@ -0,0 +1,90 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+
+import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
+import { Entity, EntityBase } from 'vona-module-a-orm';
+import { z } from 'zod';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
+import { DtoOrderAddressSnapshot } from '../dto/orderAddressSnapshot.tsx';
+import { DtoOrderCouponSnapshot } from '../dto/orderCouponSnapshot.tsx';
+
+export type TypeOrderState =
+  | 'awaiting_payment'
+  | 'paid'
+  | 'refund_requested'
+  | 'refund_approved'
+  | 'refund_rejected'
+  | 'shipped'
+  | 'refunded'
+  | 'cancelled'
+  | 'expired';
+
+export interface IEntityOptionsOrder extends IDecoratorEntityOptions {}
+
+@Entity<IEntityOptionsOrder>('commerceTradeOrder', {
+  openapi: { title: $locale('Order') },
+  fields: {
+    id: $makeMetadata(ZovaRender.order(1, 'core')),
+    iid: $makeMetadata(ZovaRender.visible(false)),
+    userId: $makeMetadata(ZovaRender.visible(false)),
+    deleted: $makeMetadata(ZovaRender.visible(false)),
+    createdAt: $makeMetadata(
+      ZovaRender.order(-2, 'max'),
+      ZovaRender.field('basic-date:formFieldDate'),
+      ZovaRender.cell('basic-date:date'),
+    ),
+    updatedAt: $makeMetadata(
+      ZovaRender.order(-1, 'max'),
+      ZovaRender.field('basic-date:formFieldDate'),
+      ZovaRender.cell('basic-date:date'),
+    ),
+  },
+})
+export class EntityOrder extends EntityBase {
+  @Api.field(v.tableIdentity())
+  userId: TableIdentity;
+
+  @Api.field(v.tableIdentity())
+  addressId: TableIdentity;
+
+  @Api.field(v.required(), v.min(1), v.max(80))
+  correlationId: string;
+
+  @Api.field(v.object(DtoOrderAddressSnapshot))
+  addressSnapshot: DtoOrderAddressSnapshot;
+
+  @Api.field(v.optional(), v.object(DtoOrderCouponSnapshot))
+  couponSnapshot?: DtoOrderCouponSnapshot;
+
+  @Api.field(
+    z.enum([
+      'awaiting_payment',
+      'paid',
+      'refund_requested',
+      'refund_approved',
+      'refund_rejected',
+      'shipped',
+      'refunded',
+      'cancelled',
+      'expired',
+    ]),
+  )
+  state: TypeOrderState;
+
+  @Api.field(v.required(), z.literal('USD'))
+  currency: 'USD';
+
+  @Api.field(v.required(), z.number().int().nonnegative())
+  eligibleSubtotalCents: number;
+
+  @Api.field(v.required(), z.number().int().nonnegative())
+  discountCents: number;
+
+  @Api.field(v.required(), z.number().int().nonnegative())
+  payableTotalCents: number;
+
+  @Api.field(v.required())
+  reservationExpiresAt: Date;
+}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/entity/orderAudit.tsx

@@ -0,0 +1,36 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+
+import { Api, v } from 'vona-module-a-openapiutils';
+import { Entity, EntityBase } from 'vona-module-a-orm';
+import { z } from 'zod';
+
+import type { TypeOrderState } from './order.tsx';
+
+export type TypeOrderAuditOperation = 'created' | 'expired';
+
+export interface IEntityOptionsOrderAudit extends IDecoratorEntityOptions {}
+
+@Entity<IEntityOptionsOrderAudit>('commerceTradeOrderAudit')
+export class EntityOrderAudit extends EntityBase {
+  @Api.field(v.tableIdentity())
+  orderId: TableIdentity;
+
+  @Api.field(z.enum(['created', 'expired']))
+  operation: TypeOrderAuditOperation;
+
+  @Api.field(v.optional(), z.enum(['awaiting_payment', 'expired']))
+  fromState?: Extract<TypeOrderState, 'awaiting_payment' | 'expired'>;
+
+  @Api.field(z.enum(['awaiting_payment', 'expired']))
+  toState: Extract<TypeOrderState, 'awaiting_payment' | 'expired'>;
+
+  @Api.field(v.optional(), v.tableIdentity())
+  actorId?: TableIdentity;
+
+  @Api.field(v.required(), v.min(1), v.max(100))
+  correlationId: string;
+
+  @Api.field(v.required(), v.min(1), v.max(255))
+  reason: string;
+}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/entity/orderLine.tsx

@@ -0,0 +1,52 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorEntityOptions } from 'vona-module-a-orm';
+
+import { $makeMetadata, Api, v } from 'vona-module-a-openapiutils';
+import { Entity, EntityBase } from 'vona-module-a-orm';
+import { z } from 'zod';
+import { ZovaRender } from 'zova-rest-cabloy-basic-admin';
+
+import { $locale } from '../.metadata/locales.ts';
+import { DtoOrderLineSkuAttributeSnapshot } from '../dto/orderLineSkuAttributeSnapshot.tsx';
+
+export interface IEntityOptionsOrderLine extends IDecoratorEntityOptions {}
+
+@Entity<IEntityOptionsOrderLine>('commerceTradeOrderLine', {
+  openapi: { title: $locale('OrderLine') },
+  fields: {
+    id: $makeMetadata(ZovaRender.order(1, 'core')),
+    iid: $makeMetadata(ZovaRender.visible(false)),
+    deleted: $makeMetadata(ZovaRender.visible(false)),
+  },
+})
+export class EntityOrderLine extends EntityBase {
+  @Api.field(v.tableIdentity())
+  orderId: TableIdentity;
+
+  @Api.field(v.tableIdentity())
+  skuId: TableIdentity;
+
+  @Api.field(v.tableIdentity())
+  productId: TableIdentity;
+
+  @Api.field(v.required())
+  skuCodeSnapshot: string;
+
+  @Api.field(v.required())
+  titleSnapshot: string;
+
+  @Api.field(v.array(v.object(DtoOrderLineSkuAttributeSnapshot)))
+  skuAttributesSnapshot: DtoOrderLineSkuAttributeSnapshot[];
+
+  @Api.field(v.required(), z.number().int().nonnegative())
+  unitPriceCents: number;
+
+  @Api.field(v.required(), z.number().int().positive())
+  quantity: number;
+
+  @Api.field(v.required(), z.number().int().nonnegative())
+  eligibleSubtotalCents: number;
+
+  @Api.field(v.required(), z.number().int().nonnegative())
+  lineTotalCents: number;
+}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/entity/stockReservation.tsx

@@ -42,11 +42,14 @@ export class EntityStockReservation extends EntityBase {
   @Api.field(v.title($locale('SkuId')), v.required(), v.tableIdentity(), ZovaRender.order(2))
   skuId: TableIdentity;
 
+  @Api.field(v.title($locale('OrderLineId')), v.optional(), v.tableIdentity(), ZovaRender.order(3))
+  orderLineId?: TableIdentity;
+
   @Api.field(
     v.title($locale('Quantity')),
     v.required(),
     z.number().int().positive(),
-    ZovaRender.order(3),
+    ZovaRender.order(4),
   )
   quantity: number;
 

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

@@ -0,0 +1,15 @@
+import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+
+import { $relation, BeanModelBase, Model } from 'vona-module-a-orm';
+
+import { EntityOrder } from '../entity/order.tsx';
+
+export interface IModelOptionsOrder extends IDecoratorModelOptions<EntityOrder> {}
+
+@Model<IModelOptionsOrder>({
+  entity: EntityOrder,
+  relations: {
+    lines: $relation.hasMany('commerce-trade:orderLine', 'orderId'),
+  },
+})
+export class ModelOrder extends BeanModelBase<EntityOrder> {}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/model/orderAudit.ts

@@ -0,0 +1,10 @@
+import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+
+import { BeanModelBase, Model } from 'vona-module-a-orm';
+
+import { EntityOrderAudit } from '../entity/orderAudit.tsx';
+
+export interface IModelOptionsOrderAudit extends IDecoratorModelOptions<EntityOrderAudit> {}
+
+@Model<IModelOptionsOrderAudit>({ entity: EntityOrderAudit })
+export class ModelOrderAudit extends BeanModelBase<EntityOrderAudit> {}

package/vona/src/suite/a-commerce/modules/commerce-trade/src/model/orderLine.ts

@@ -0,0 +1,10 @@
+import type { IDecoratorModelOptions } from 'vona-module-a-orm';
+
+import { BeanModelBase, Model } from 'vona-module-a-orm';
+
+import { EntityOrderLine } from '../entity/orderLine.tsx';
+
+export interface IModelOptionsOrderLine extends IDecoratorModelOptions<EntityOrderLine> {}
+
+@Model<IModelOptionsOrderLine>({ entity: EntityOrderLine })
+export class ModelOrderLine extends BeanModelBase<EntityOrderLine> {}