cabloy 5.1.127 → 5.1.129

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (88) hide show
  1. package/.cabloy-version +1 -1
  2. package/CHANGELOG.md +23 -0
  3. package/cabloy-docs/backend/i18n-guide.md +86 -7
  4. package/e2e/specs/a-commerce/commerce.spec.ts +93 -8
  5. package/package.json +1 -1
  6. package/vona/env/.env +2 -0
  7. package/vona/env/.env.prod +6 -2
  8. package/vona/packages-cli/cabloy-cli/package.json +1 -1
  9. package/vona/packages-cli/cli/package.json +1 -1
  10. package/vona/packages-cli/cli-set-api/package.json +1 -1
  11. package/vona/packages-utils/module-glob/package.json +1 -1
  12. package/vona/packages-utils/utils/package.json +1 -1
  13. package/vona/packages-utils/utils/src/vona.ts +8 -1
  14. package/vona/packages-vona/vona/package.json +1 -1
  15. package/vona/packages-vona/vona-core/package.json +1 -1
  16. package/vona/packages-vona/vona-mock/package.json +1 -1
  17. package/vona/pnpm-lock.yaml +142 -21
  18. package/vona/pnpm-workspace.yaml +1 -1
  19. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/.metadata/index.ts +1 -1
  20. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productSelectResItem.tsx +3 -1
  21. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/dto/productView.tsx +3 -1
  22. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/entity/product.tsx +23 -3
  23. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/model/product.ts +1 -0
  24. package/vona/src/suite/a-commerce/modules/commerce-catalog/src/service/product.ts +7 -2
  25. package/vona/src/suite/a-commerce/modules/commerce-catalog/test/productPresentation.test.ts +214 -0
  26. package/vona/src/suite/a-commerce/modules/commerce-payment/src/bean/payScene.commerceOrder.ts +39 -3
  27. package/vona/src/suite/a-commerce/modules/commerce-payment/src/service/commercePayScene.ts +14 -1
  28. package/vona/src/suite/a-commerce/modules/commerce-payment/src/service/paymentAttempt.ts +5 -1
  29. package/vona/src/suite/a-commerce/modules/commerce-trade/src/.metadata/index.ts +17 -0
  30. package/vona/src/suite/a-commerce/modules/commerce-trade/src/controller/checkout.ts +18 -0
  31. package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/checkoutCreate.tsx +3 -0
  32. package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/checkoutPaymentMethod.tsx +19 -0
  33. package/vona/src/suite/a-commerce/modules/commerce-trade/src/dto/checkoutPaymentMethods.tsx +17 -0
  34. package/vona/src/suite/a-commerce/modules/commerce-trade/src/service/order.ts +51 -0
  35. package/vona/src/suite/a-commerce/modules/commerce-trade/test/paymentOutcome.test.ts +2 -1
  36. package/vona/src/suite-vendor/a-pay/modules/a-pay/package.json +1 -1
  37. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/.metadata/index.ts +94 -55
  38. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/bean/bean.payScene.ts +65 -1
  39. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/bean/meta.redlock.ts +2 -0
  40. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/controller/paymentCallback.ts +32 -0
  41. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/controller/paymentSession.ts +26 -8
  42. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/service/paymentCallback.ts +99 -0
  43. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/service/paymentSession.ts +26 -3
  44. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/service/providerOperation.ts +214 -82
  45. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/service/refundOperation.ts +27 -2
  46. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/types/payScene.ts +9 -0
  47. package/vona/src/suite-vendor/a-pay/modules/a-pay/src/types/payment.ts +5 -0
  48. package/vona/src/suite-vendor/a-pay/modules/pay-mock/package.json +1 -1
  49. package/vona/src/suite-vendor/a-pay/modules/pay-mock/src/bean/payProvider.mock.ts +7 -0
  50. package/vona/src/suite-vendor/a-pay/modules/pay-paypal/package.json +1 -1
  51. package/vona/src/suite-vendor/a-pay/modules/pay-paypal/src/bean/payProvider.paypal.ts +395 -84
  52. package/vona/src/suite-vendor/a-pay/modules/pay-paypal/src/lib/index.ts +1 -1
  53. package/vona/src/suite-vendor/a-pay/modules/pay-paypal/src/lib/paypalGateway.ts +129 -0
  54. package/vona/src/suite-vendor/a-pay/modules/pay-paypal/src/types/index.ts +2 -0
  55. package/vona/src/suite-vendor/a-pay/modules/pay-stripe/package.json +1 -1
  56. package/vona/src/suite-vendor/a-pay/modules/pay-stripe/src/bean/payProvider.stripe.ts +7 -0
  57. package/vona/src/suite-vendor/a-pay/package.json +5 -5
  58. package/vona/src/suite-vendor/a-vona/modules/a-core/package.json +1 -1
  59. package/vona/src/suite-vendor/a-vona/package.json +1 -1
  60. package/zova/packages-cli/cli/package.json +3 -3
  61. package/zova/packages-cli/cli-set-front/package.json +4 -4
  62. package/zova/packages-utils/zova-jsx/package.json +3 -3
  63. package/zova/packages-utils/zova-vite/package.json +2 -2
  64. package/zova/packages-zova/zova/package.json +3 -3
  65. package/zova/packages-zova/zova-core/package.json +2 -2
  66. package/zova/pnpm-lock.yaml +41 -41
  67. package/zova/src/suite/a-commerce/modules/commerce-member/src/api/openapi/schemas.ts +8 -0
  68. package/zova/src/suite/a-commerce/modules/commerce-member/src/api/openapi/types.ts +175 -0
  69. package/zova/src/suite/a-commerce/modules/commerce-trade/cli/openapi.config.ts +1 -0
  70. package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/commerceTradeCheckout.ts +16 -0
  71. package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/openapi/schemas.ts +8 -0
  72. package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/openapi/types.ts +177 -2
  73. package/zova/src/suite/a-commerce/modules/commerce-trade/src/apiSchema/commerceTradeCheckout.ts +12 -1
  74. package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/cart.ts +11 -0
  75. package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/checkout/controller.tsx +25 -1
  76. package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/payment/controller.tsx +27 -4
  77. package/zova/src/suite-vendor/a-pay/modules/a-pay/cli/openapi.config.ts +1 -1
  78. package/zova/src/suite-vendor/a-pay/modules/a-pay/package.json +1 -1
  79. package/zova/src/suite-vendor/a-pay/modules/a-pay/src/api/openapi/schemas.ts +20 -8
  80. package/zova/src/suite-vendor/a-pay/modules/a-pay/src/api/openapi/types.ts +292 -32
  81. package/zova/src/suite-vendor/a-pay/modules/a-pay/src/api/paymentSession.ts +26 -4
  82. package/zova/src/suite-vendor/a-pay/modules/a-pay/src/apiSchema/paymentSession.ts +5 -0
  83. package/zova/src/suite-vendor/a-pay/modules/a-pay/src/component/paymentNextAction/controller.tsx +2 -1
  84. package/zova/src/suite-vendor/a-pay/modules/a-pay/src/model/paymentSession.ts +12 -0
  85. package/zova/src/suite-vendor/a-pay/package.json +2 -2
  86. package/zova/src/suite-vendor/a-zova/modules/a-zova/package.json +4 -4
  87. package/zova/src/suite-vendor/a-zova/package.json +2 -2
  88. /package/vona/patches/{zova-core@5.1.81.patch → zova-core@5.1.82.patch} +0 -0
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "zova-module-a-pay",
3
- "version": "5.0.2",
3
+ "version": "5.0.3",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "Zova Module"
@@ -95,10 +95,10 @@ export type ApiSchemaCommercePromotionDtoCouponTemplateSelectResItem =
95
95
  components['schemas']['commerce-promotion.dto.couponTemplateSelectResItem'];
96
96
  export type ApiSchemaCommercePromotionDtoCouponTemplateSelectResItemPartial =
97
97
  Partial<ApiSchemaCommercePromotionDtoCouponTemplateSelectResItem>;
98
- export type ApiSchemaCommercePromotionDtoCouponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875 =
99
- components['schemas']['commerce-promotion.dto.couponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875'];
100
- export type ApiSchemaCommercePromotionDtoCouponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875Partial =
101
- Partial<ApiSchemaCommercePromotionDtoCouponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875>;
98
+ export type ApiSchemaCommercePromotionDtoCouponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_91abd8df366c0c4d47021b38af2a356349ee178b =
99
+ components['schemas']['commerce-promotion.dto.couponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_91abd8df366c0c4d47021b38af2a356349ee178b'];
100
+ export type ApiSchemaCommercePromotionDtoCouponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_91abd8df366c0c4d47021b38af2a356349ee178bPartial =
101
+ Partial<ApiSchemaCommercePromotionDtoCouponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_91abd8df366c0c4d47021b38af2a356349ee178b>;
102
102
  export type ApiSchemaCommercePromotionDtoCouponTemplateUpdate =
103
103
  components['schemas']['commerce-promotion.dto.couponTemplateUpdate'];
104
104
  export type ApiSchemaCommercePromotionDtoCouponTemplateUpdatePartial =
@@ -117,6 +117,14 @@ export type ApiSchemaCommerceTradeDtoCartUpdateItem =
117
117
  components['schemas']['commerce-trade.dto.cartUpdateItem'];
118
118
  export type ApiSchemaCommerceTradeDtoCartUpdateItemPartial =
119
119
  Partial<ApiSchemaCommerceTradeDtoCartUpdateItem>;
120
+ export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethods =
121
+ components['schemas']['commerce-trade.dto.checkoutPaymentMethods'];
122
+ export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethodsPartial =
123
+ Partial<ApiSchemaCommerceTradeDtoCheckoutPaymentMethods>;
124
+ export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethod =
125
+ components['schemas']['commerce-trade.dto.checkoutPaymentMethod'];
126
+ export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethodPartial =
127
+ Partial<ApiSchemaCommerceTradeDtoCheckoutPaymentMethod>;
120
128
  export type ApiSchemaCommerceTradeDtoCheckoutResult =
121
129
  components['schemas']['commerce-trade.dto.checkoutResult'];
122
130
  export type ApiSchemaCommerceTradeDtoCheckoutResultPartial =
@@ -165,10 +173,6 @@ export type ApiSchemaCommerceTradeDtoRefundReview =
165
173
  components['schemas']['commerce-trade.dto.refundReview'];
166
174
  export type ApiSchemaCommerceTradeDtoRefundReviewPartial =
167
175
  Partial<ApiSchemaCommerceTradeDtoRefundReview>;
168
- export type ApiSchemaCommerceTradeDtoRefundOutcomeCreate =
169
- components['schemas']['commerce-trade.dto.refundOutcomeCreate'];
170
- export type ApiSchemaCommerceTradeDtoRefundOutcomeCreatePartial =
171
- Partial<ApiSchemaCommerceTradeDtoRefundOutcomeCreate>;
172
176
  export type ApiSchemaCommerceTradeDtoShipmentView =
173
177
  components['schemas']['commerce-trade.dto.shipmentView'];
174
178
  export type ApiSchemaCommerceTradeDtoShipmentViewPartial =
@@ -461,6 +465,14 @@ export type ApiSchemaPayMockDtoMockPaymentComplete =
461
465
  components['schemas']['pay-mock.dto.mockPaymentComplete'];
462
466
  export type ApiSchemaPayMockDtoMockPaymentCompletePartial =
463
467
  Partial<ApiSchemaPayMockDtoMockPaymentComplete>;
468
+ export type ApiSchemaPayMockDtoMockRefundReceipt =
469
+ components['schemas']['pay-mock.dto.mockRefundReceipt'];
470
+ export type ApiSchemaPayMockDtoMockRefundReceiptPartial =
471
+ Partial<ApiSchemaPayMockDtoMockRefundReceipt>;
472
+ export type ApiSchemaPayMockDtoMockRefundComplete =
473
+ components['schemas']['pay-mock.dto.mockRefundComplete'];
474
+ export type ApiSchemaPayMockDtoMockRefundCompletePartial =
475
+ Partial<ApiSchemaPayMockDtoMockRefundComplete>;
464
476
  export type ApiSchemaAPaypalEntityPaypalRecord =
465
477
  components['schemas']['a-paypal.entity.paypalRecord'];
466
478
  export type ApiSchemaAPaypalEntityPaypalRecordPartial = Partial<ApiSchemaAPaypalEntityPaypalRecord>;
@@ -95,7 +95,39 @@ export interface paths {
95
95
  patch?: never;
96
96
  trace?: never;
97
97
  };
98
- '/api/payment-session/{id}/start': {
98
+ '/api/payment-callback/return': {
99
+ parameters: {
100
+ query?: never;
101
+ header?: never;
102
+ path?: never;
103
+ cookie?: never;
104
+ };
105
+ get: operations['PaymentCallback_returned'];
106
+ put?: never;
107
+ post?: never;
108
+ delete?: never;
109
+ options?: never;
110
+ head?: never;
111
+ patch?: never;
112
+ trace?: never;
113
+ };
114
+ '/api/payment-callback/cancel': {
115
+ parameters: {
116
+ query?: never;
117
+ header?: never;
118
+ path?: never;
119
+ cookie?: never;
120
+ };
121
+ get: operations['PaymentCallback_cancelled'];
122
+ put?: never;
123
+ post?: never;
124
+ delete?: never;
125
+ options?: never;
126
+ head?: never;
127
+ patch?: never;
128
+ trace?: never;
129
+ };
130
+ '/api/pay/payment-session/{id}/start': {
99
131
  parameters: {
100
132
  query?: never;
101
133
  header?: never;
@@ -111,7 +143,23 @@ export interface paths {
111
143
  patch?: never;
112
144
  trace?: never;
113
145
  };
114
- '/api/payment-session/{id}': {
146
+ '/api/pay/payment-session/{id}/reconcile': {
147
+ parameters: {
148
+ query?: never;
149
+ header?: never;
150
+ path?: never;
151
+ cookie?: never;
152
+ };
153
+ get?: never;
154
+ put?: never;
155
+ post: operations['PaymentSession_reconcile'];
156
+ delete?: never;
157
+ options?: never;
158
+ head?: never;
159
+ patch?: never;
160
+ trace?: never;
161
+ };
162
+ '/api/pay/payment-session/{id}': {
115
163
  parameters: {
116
164
  query?: never;
117
165
  header?: never;
@@ -527,6 +575,22 @@ export interface paths {
527
575
  patch: operations['CommerceTradeCart_updateItem'];
528
576
  trace?: never;
529
577
  };
578
+ '/api/commerce/trade/checkout/payment-methods': {
579
+ parameters: {
580
+ query?: never;
581
+ header?: never;
582
+ path?: never;
583
+ cookie?: never;
584
+ };
585
+ get: operations['CommerceTradeCheckout_paymentMethods'];
586
+ put?: never;
587
+ post?: never;
588
+ delete?: never;
589
+ options?: never;
590
+ head?: never;
591
+ patch?: never;
592
+ trace?: never;
593
+ };
530
594
  '/api/commerce/trade/checkout': {
531
595
  parameters: {
532
596
  query?: never;
@@ -623,7 +687,7 @@ export interface paths {
623
687
  patch?: never;
624
688
  trace?: never;
625
689
  };
626
- '/api/commerce/trade/order/{id}/refundOutcome': {
690
+ '/api/commerce/trade/order/{id}/executeRefund': {
627
691
  parameters: {
628
692
  query?: never;
629
693
  header?: never;
@@ -632,7 +696,7 @@ export interface paths {
632
696
  };
633
697
  get?: never;
634
698
  put?: never;
635
- post: operations['CommerceTradeOrder_refundOutcome'];
699
+ post: operations['CommerceTradeOrder_executeRefund'];
636
700
  delete?: never;
637
701
  options?: never;
638
702
  head?: never;
@@ -1264,6 +1328,22 @@ export interface paths {
1264
1328
  patch?: never;
1265
1329
  trace?: never;
1266
1330
  };
1331
+ '/api/pay/mock/payment-session/refund-operation/{id}/complete': {
1332
+ parameters: {
1333
+ query?: never;
1334
+ header?: never;
1335
+ path?: never;
1336
+ cookie?: never;
1337
+ };
1338
+ get?: never;
1339
+ put?: never;
1340
+ post: operations['PayMockPayment_completeRefund'];
1341
+ delete?: never;
1342
+ options?: never;
1343
+ head?: never;
1344
+ patch?: never;
1345
+ trace?: never;
1346
+ };
1267
1347
  '/api/paypal/getRecord/{recordId}': {
1268
1348
  parameters: {
1269
1349
  query?: never;
@@ -2133,6 +2213,7 @@ export interface components {
2133
2213
  pageNo: number;
2134
2214
  };
2135
2215
  'commerce-member.dto.addressMineItem': {
2216
+ /** @description ID */
2136
2217
  id: number | string;
2137
2218
  /** @description Recipient Name */
2138
2219
  recipientName: string;
@@ -2153,6 +2234,7 @@ export interface components {
2153
2234
  };
2154
2235
  'commerce-member.dto.addressMineView_2d063d28bc7243bed02ebd8bddf1212a93c6305b':
2155
2236
  | {
2237
+ /** @description ID */
2156
2238
  id: number | string;
2157
2239
  /** @description Recipient Name */
2158
2240
  recipientName: string;
@@ -2432,20 +2514,39 @@ export interface components {
2432
2514
  reason: string;
2433
2515
  };
2434
2516
  'commerce-promotion.dto.couponTemplateCreate': {
2517
+ /** @description Name */
2435
2518
  name: string;
2436
- /** @enum {string} */
2519
+ /**
2520
+ * @description Template State
2521
+ * @enum {string}
2522
+ */
2437
2523
  state: 'draft' | 'active';
2438
- /** @enum {string} */
2524
+ /**
2525
+ * @description Currency
2526
+ * @enum {string}
2527
+ */
2439
2528
  currency: 'USD';
2529
+ /** @description Fixed Discount */
2440
2530
  discountCents: number;
2531
+ /** @description Minimum Spend */
2441
2532
  minSpendCents: number;
2442
- /** Format: date-time */
2533
+ /**
2534
+ * Format: date-time
2535
+ * @description Valid From
2536
+ */
2443
2537
  validFrom: Date;
2444
- /** Format: date-time */
2538
+ /**
2539
+ * Format: date-time
2540
+ * @description Valid Until
2541
+ */
2445
2542
  validUntil: Date;
2543
+ /** @description Total Issue Limit */
2446
2544
  totalIssueLimit?: number | undefined;
2545
+ /** @description Total Usage Limit */
2447
2546
  totalUsageLimit?: number | undefined;
2547
+ /** @description Per-customer Issue Limit */
2448
2548
  perCustomerIssueLimit?: number | undefined;
2549
+ /** @description Description */
2449
2550
  description?: string | undefined;
2450
2551
  };
2451
2552
  'commerce-promotion.dto.couponTemplateSelectRes': {
@@ -2490,9 +2591,9 @@ export interface components {
2490
2591
  * @enum {string}
2491
2592
  */
2492
2593
  currency: 'USD';
2493
- /** @description Fixed Discount (Cents) */
2594
+ /** @description Fixed Discount */
2494
2595
  discountCents: number;
2495
- /** @description Minimum Spend (Cents) */
2596
+ /** @description Minimum Spend */
2496
2597
  minSpendCents: number;
2497
2598
  /**
2498
2599
  * Format: date-time
@@ -2519,7 +2620,7 @@ export interface components {
2519
2620
  /** @description Operations */
2520
2621
  _operationsRow?: unknown;
2521
2622
  };
2522
- 'commerce-promotion.dto.couponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875':
2623
+ 'commerce-promotion.dto.couponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_91abd8df366c0c4d47021b38af2a356349ee178b':
2523
2624
  | {
2524
2625
  /**
2525
2626
  * Format: date-time
@@ -2555,9 +2656,9 @@ export interface components {
2555
2656
  * @enum {string}
2556
2657
  */
2557
2658
  currency: 'USD';
2558
- /** @description Fixed Discount (Cents) */
2659
+ /** @description Fixed Discount */
2559
2660
  discountCents: number;
2560
- /** @description Minimum Spend (Cents) */
2661
+ /** @description Minimum Spend */
2561
2662
  minSpendCents: number;
2562
2663
  /**
2563
2664
  * Format: date-time
@@ -2615,6 +2716,16 @@ export interface components {
2615
2716
  /** @description Quantity */
2616
2717
  quantity: number;
2617
2718
  };
2719
+ 'commerce-trade.dto.checkoutPaymentMethods': {
2720
+ items: components['schemas']['commerce-trade.dto.checkoutPaymentMethod'][];
2721
+ defaultKey: string;
2722
+ };
2723
+ 'commerce-trade.dto.checkoutPaymentMethod': {
2724
+ key: string;
2725
+ label: string;
2726
+ /** @enum {string} */
2727
+ interaction: 'redirect' | 'embedded';
2728
+ };
2618
2729
  'commerce-trade.dto.checkoutResult': {
2619
2730
  orderId: number | string;
2620
2731
  paymentAttemptId: number | string;
@@ -2633,6 +2744,7 @@ export interface components {
2633
2744
  addressId: number | string;
2634
2745
  couponGrantId?: number | string | undefined;
2635
2746
  correlationId: string;
2747
+ providerCandidateKey?: string | undefined;
2636
2748
  };
2637
2749
  'commerce-trade.dto.orderMineRes': {
2638
2750
  list: components['schemas']['commerce-trade.dto.orderSummary'][];
@@ -2642,6 +2754,12 @@ export interface components {
2642
2754
  pageNo: number;
2643
2755
  };
2644
2756
  'commerce-trade.dto.orderSummary': {
2757
+ /**
2758
+ * Format: date-time
2759
+ * @description Created At
2760
+ */
2761
+ createdAt: Date;
2762
+ /** @description ID */
2645
2763
  id: number | string;
2646
2764
  /** @enum {string} */
2647
2765
  state:
@@ -2657,8 +2775,6 @@ export interface components {
2657
2775
  /** @enum {string} */
2658
2776
  currency: 'USD';
2659
2777
  payableTotalCents: number;
2660
- /** Format: date-time */
2661
- createdAt: Date;
2662
2778
  };
2663
2779
  'commerce-trade.dto.orderDetail_2d063d28bc7243bed02ebd8bddf1212a93c6305b':
2664
2780
  | {
@@ -2720,6 +2836,7 @@ export interface components {
2720
2836
  | undefined;
2721
2837
  'commerce-trade.dto.shipmentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b':
2722
2838
  | {
2839
+ /** @description ID */
2723
2840
  id: number | string;
2724
2841
  carrier: string;
2725
2842
  trackingNumber: string;
@@ -2753,12 +2870,8 @@ export interface components {
2753
2870
  reason: string;
2754
2871
  idempotencyKey: string;
2755
2872
  };
2756
- 'commerce-trade.dto.refundOutcomeCreate': {
2757
- /** @enum {string} */
2758
- outcome: 'succeeded' | 'failed';
2759
- idempotencyKey: string;
2760
- };
2761
2873
  'commerce-trade.dto.shipmentView': {
2874
+ /** @description ID */
2762
2875
  id: number | string;
2763
2876
  carrier: string;
2764
2877
  trackingNumber: string;
@@ -3634,7 +3747,7 @@ export interface components {
3634
3747
  /** @description Description */
3635
3748
  description?: string | undefined;
3636
3749
  /** @description # */
3637
- _lineNumber: number;
3750
+ _lineNumber?: number | undefined;
3638
3751
  /** @description Operations */
3639
3752
  _operationsRow?: unknown;
3640
3753
  };
@@ -3689,6 +3802,12 @@ export interface components {
3689
3802
  dossierFileIds?: (number | string)[] | undefined;
3690
3803
  /** @description Description */
3691
3804
  description?: string | undefined;
3805
+ student?: {
3806
+ /** @description ID */
3807
+ id: number | string;
3808
+ /** @description Student Name */
3809
+ name: string;
3810
+ };
3692
3811
  sceneImages?: components['schemas']['a-image.dto.imageView'][] | undefined;
3693
3812
  /** @description Dossier Files */
3694
3813
  dossierFiles?: components['schemas']['a-file.dto.fileView'][] | undefined;
@@ -3762,6 +3881,12 @@ export interface components {
3762
3881
  dossierFileIds?: (number | string)[] | undefined;
3763
3882
  /** @description Description */
3764
3883
  description?: string | undefined;
3884
+ student?: {
3885
+ /** @description ID */
3886
+ id: number | string;
3887
+ /** @description Student Name */
3888
+ name: string;
3889
+ };
3765
3890
  /** @description Student Training Record Details */
3766
3891
  trainingRecordSubjects: {
3767
3892
  /**
@@ -3974,7 +4099,7 @@ export interface components {
3974
4099
  }[]
3975
4100
  | undefined;
3976
4101
  /** @description # */
3977
- _lineNumber: number;
4102
+ _lineNumber?: number | undefined;
3978
4103
  /** @description Operations */
3979
4104
  _operationsRow?: unknown;
3980
4105
  };
@@ -4245,17 +4370,18 @@ export interface components {
4245
4370
  };
4246
4371
  'training-student.dto.studentSummary_2d063d28bc7243bed02ebd8bddf1212a93c6305b':
4247
4372
  | {
4373
+ /** @description ID */
4248
4374
  id: number | string;
4249
4375
  /** @description Student Name */
4250
4376
  name: string;
4377
+ /** @description Description */
4378
+ description?: string | undefined;
4251
4379
  /** @description Mobile */
4252
4380
  mobile: string;
4253
4381
  /** @description Training Stage */
4254
- level: number;
4382
+ level: 1 | 2 | 3;
4255
4383
  /** @description Level Title */
4256
4384
  levelTitle: string;
4257
- /** @description Description */
4258
- description?: string | undefined;
4259
4385
  /** @description Description Length */
4260
4386
  descriptionLength: number;
4261
4387
  /** @description Summary */
@@ -4443,6 +4569,14 @@ export interface components {
4443
4569
  /** @enum {string} */
4444
4570
  outcome: 'succeeded' | 'failed' | 'cancelled';
4445
4571
  };
4572
+ 'pay-mock.dto.mockRefundReceipt': {
4573
+ refundOperationId: number | string;
4574
+ accepted: boolean;
4575
+ };
4576
+ 'pay-mock.dto.mockRefundComplete': {
4577
+ /** @enum {string} */
4578
+ outcome: 'succeeded' | 'failed' | 'cancelled';
4579
+ };
4446
4580
  'a-paypal.entity.paypalRecord': {
4447
4581
  /**
4448
4582
  * Format: date-time
@@ -5159,6 +5293,56 @@ export interface operations {
5159
5293
  };
5160
5294
  };
5161
5295
  };
5296
+ PaymentCallback_returned: {
5297
+ parameters: {
5298
+ query: {
5299
+ state: string;
5300
+ };
5301
+ header?: never;
5302
+ path?: never;
5303
+ cookie?: never;
5304
+ };
5305
+ requestBody?: never;
5306
+ responses: {
5307
+ 200: {
5308
+ headers: {
5309
+ [name: string]: unknown;
5310
+ };
5311
+ content: {
5312
+ 'application/json': {
5313
+ code: string;
5314
+ message: string;
5315
+ data?: unknown;
5316
+ };
5317
+ };
5318
+ };
5319
+ };
5320
+ };
5321
+ PaymentCallback_cancelled: {
5322
+ parameters: {
5323
+ query: {
5324
+ state: string;
5325
+ };
5326
+ header?: never;
5327
+ path?: never;
5328
+ cookie?: never;
5329
+ };
5330
+ requestBody?: never;
5331
+ responses: {
5332
+ 200: {
5333
+ headers: {
5334
+ [name: string]: unknown;
5335
+ };
5336
+ content: {
5337
+ 'application/json': {
5338
+ code: string;
5339
+ message: string;
5340
+ data?: unknown;
5341
+ };
5342
+ };
5343
+ };
5344
+ };
5345
+ };
5162
5346
  PaymentSession_start: {
5163
5347
  parameters: {
5164
5348
  query?: never;
@@ -5185,6 +5369,32 @@ export interface operations {
5185
5369
  };
5186
5370
  authToken: true;
5187
5371
  };
5372
+ PaymentSession_reconcile: {
5373
+ parameters: {
5374
+ query?: never;
5375
+ header?: never;
5376
+ path: {
5377
+ id: number | string;
5378
+ };
5379
+ cookie?: never;
5380
+ };
5381
+ requestBody?: never;
5382
+ responses: {
5383
+ 200: {
5384
+ headers: {
5385
+ [name: string]: unknown;
5386
+ };
5387
+ content: {
5388
+ 'application/json': {
5389
+ code: string;
5390
+ message: string;
5391
+ data: components['schemas']['a-pay.dto.paymentSessionView'];
5392
+ };
5393
+ };
5394
+ };
5395
+ };
5396
+ authToken: true;
5397
+ };
5188
5398
  PaymentSession_view: {
5189
5399
  parameters: {
5190
5400
  query?: never;
@@ -5851,7 +6061,7 @@ export interface operations {
5851
6061
  'application/json': {
5852
6062
  code: string;
5853
6063
  message: string;
5854
- data?: components['schemas']['commerce-promotion.dto.couponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875'];
6064
+ data?: components['schemas']['commerce-promotion.dto.couponTemplateView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_91abd8df366c0c4d47021b38af2a356349ee178b'];
5855
6065
  };
5856
6066
  };
5857
6067
  };
@@ -6046,6 +6256,30 @@ export interface operations {
6046
6256
  };
6047
6257
  authToken: true;
6048
6258
  };
6259
+ CommerceTradeCheckout_paymentMethods: {
6260
+ parameters: {
6261
+ query?: never;
6262
+ header?: never;
6263
+ path?: never;
6264
+ cookie?: never;
6265
+ };
6266
+ requestBody?: never;
6267
+ responses: {
6268
+ 200: {
6269
+ headers: {
6270
+ [name: string]: unknown;
6271
+ };
6272
+ content: {
6273
+ 'application/json': {
6274
+ code: string;
6275
+ message: string;
6276
+ data: components['schemas']['commerce-trade.dto.checkoutPaymentMethods'];
6277
+ };
6278
+ };
6279
+ };
6280
+ };
6281
+ authToken: true;
6282
+ };
6049
6283
  CommerceTradeCheckout_create: {
6050
6284
  parameters: {
6051
6285
  query?: never;
@@ -6233,7 +6467,7 @@ export interface operations {
6233
6467
  };
6234
6468
  authToken: true;
6235
6469
  };
6236
- CommerceTradeOrder_refundOutcome: {
6470
+ CommerceTradeOrder_executeRefund: {
6237
6471
  parameters: {
6238
6472
  query?: never;
6239
6473
  header?: never;
@@ -6242,11 +6476,7 @@ export interface operations {
6242
6476
  };
6243
6477
  cookie?: never;
6244
6478
  };
6245
- requestBody: {
6246
- content: {
6247
- 'application/json': components['schemas']['commerce-trade.dto.refundOutcomeCreate'];
6248
- };
6249
- };
6479
+ requestBody?: never;
6250
6480
  responses: {
6251
6481
  200: {
6252
6482
  headers: {
@@ -7814,6 +8044,36 @@ export interface operations {
7814
8044
  };
7815
8045
  authToken: true;
7816
8046
  };
8047
+ PayMockPayment_completeRefund: {
8048
+ parameters: {
8049
+ query?: never;
8050
+ header?: never;
8051
+ path: {
8052
+ id: number | string;
8053
+ };
8054
+ cookie?: never;
8055
+ };
8056
+ requestBody: {
8057
+ content: {
8058
+ 'application/json': components['schemas']['pay-mock.dto.mockRefundComplete'];
8059
+ };
8060
+ };
8061
+ responses: {
8062
+ 200: {
8063
+ headers: {
8064
+ [name: string]: unknown;
8065
+ };
8066
+ content: {
8067
+ 'application/json': {
8068
+ code: string;
8069
+ message: string;
8070
+ data: components['schemas']['pay-mock.dto.mockRefundReceipt'];
8071
+ };
8072
+ };
8073
+ };
8074
+ };
8075
+ authToken: true;
8076
+ };
7817
8077
  Paypal_getRecord: {
7818
8078
  parameters: {
7819
8079
  query?: never;
@@ -7,17 +7,26 @@ import type { paths } from './openapi/index.js';
7
7
  import { OpenApiBaseURL } from './openapi/index.js';
8
8
 
9
9
  /** PaymentSession_start */
10
- export const ApiApiPaymentSessionstartPath = '/api/payment-session/{id}/start';
11
- export type ApiApiPaymentSessionstartPath = '/api/payment-session/{id}/start';
10
+ export const ApiApiPaymentSessionstartPath = '/api/pay/payment-session/{id}/start';
11
+ export type ApiApiPaymentSessionstartPath = '/api/pay/payment-session/{id}/start';
12
12
  export type ApiApiPaymentSessionstartMethod = 'post';
13
13
  export type ApiApiPaymentSessionstartRequestParams =
14
14
  paths[ApiApiPaymentSessionstartPath][ApiApiPaymentSessionstartMethod]['parameters']['path'];
15
15
  export type ApiApiPaymentSessionstartResponseBody =
16
16
  paths[ApiApiPaymentSessionstartPath][ApiApiPaymentSessionstartMethod]['responses']['200']['content']['application/json']['data'];
17
17
 
18
+ /** PaymentSession_reconcile */
19
+ export const ApiApiPaymentSessionreconcilePath = '/api/pay/payment-session/{id}/reconcile';
20
+ export type ApiApiPaymentSessionreconcilePath = '/api/pay/payment-session/{id}/reconcile';
21
+ export type ApiApiPaymentSessionreconcileMethod = 'post';
22
+ export type ApiApiPaymentSessionreconcileRequestParams =
23
+ paths[ApiApiPaymentSessionreconcilePath][ApiApiPaymentSessionreconcileMethod]['parameters']['path'];
24
+ export type ApiApiPaymentSessionreconcileResponseBody =
25
+ paths[ApiApiPaymentSessionreconcilePath][ApiApiPaymentSessionreconcileMethod]['responses']['200']['content']['application/json']['data'];
26
+
18
27
  /** PaymentSession_view */
19
- export const ApiApiPaymentSessionviewPath = '/api/payment-session/{id}';
20
- export type ApiApiPaymentSessionviewPath = '/api/payment-session/{id}';
28
+ export const ApiApiPaymentSessionviewPath = '/api/pay/payment-session/{id}';
29
+ export type ApiApiPaymentSessionviewPath = '/api/pay/payment-session/{id}';
21
30
  export type ApiApiPaymentSessionviewMethod = 'get';
22
31
  export type ApiApiPaymentSessionviewRequestParams =
23
32
  paths[ApiApiPaymentSessionviewPath][ApiApiPaymentSessionviewMethod]['parameters']['path'];
@@ -39,6 +48,19 @@ export class ApiPaymentSession extends BeanApiBase {
39
48
  );
40
49
  }
41
50
 
51
+ reconcile(
52
+ body: undefined,
53
+ options: {
54
+ params: ApiApiPaymentSessionreconcileRequestParams;
55
+ } & IApiActionOptions,
56
+ ) {
57
+ return this.$fetch.post<any, ApiApiPaymentSessionreconcileResponseBody>(
58
+ this.$pathTranslate(ApiApiPaymentSessionreconcilePath, options.params),
59
+ body,
60
+ this.$configPrepare(OpenApiBaseURL(this.sys), options, true),
61
+ );
62
+ }
63
+
42
64
  view(
43
65
  options: {
44
66
  params: ApiApiPaymentSessionviewRequestParams;
@@ -5,6 +5,7 @@ import { ApiSchema } from 'zova-module-a-api';
5
5
 
6
6
  import {
7
7
  ApiApiPaymentSessionstartPath,
8
+ ApiApiPaymentSessionreconcilePath,
8
9
  ApiApiPaymentSessionviewPath,
9
10
  } from '../api/paymentSession.js';
10
11
 
@@ -14,6 +15,10 @@ export class ApiSchemaPaymentSession extends BeanBase {
14
15
  return this.$sdk.createApiSchemas(ApiApiPaymentSessionstartPath, 'post', options);
15
16
  }
16
17
 
18
+ reconcile(options?: IApiSchemaOptions) {
19
+ return this.$sdk.createApiSchemas(ApiApiPaymentSessionreconcilePath, 'post', options);
20
+ }
21
+
17
22
  view(options?: IApiSchemaOptions) {
18
23
  return this.$sdk.createApiSchemas(ApiApiPaymentSessionviewPath, 'get', options);
19
24
  }
@@ -1,9 +1,10 @@
1
1
  import { BeanControllerBase, Use } from 'zova';
2
2
  import { Controller } from 'zova-module-a-bean';
3
3
 
4
- import type { ServicePaymentCoordinator } from '../../service/paymentCoordinator.js';
5
4
  import type { TypePaymentNextAction } from '../../types/payment.js';
6
5
 
6
+ import { ServicePaymentCoordinator } from '../../service/paymentCoordinator.js';
7
+
7
8
  export interface ControllerPaymentNextActionProps {
8
9
  action?: TypePaymentNextAction;
9
10
  disabled?: boolean;