cabloy 5.1.127 → 5.1.129

package/zova/src/suite/a-commerce/modules/commerce-member/src/api/openapi/types.ts

@@ -95,6 +95,38 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
+  '/api/payment-callback/return': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get: operations['PaymentCallback_returned'];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
+  '/api/payment-callback/cancel': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get: operations['PaymentCallback_cancelled'];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
   '/api/payment-session/{id}/start': {
     parameters: {
       query?: never;
@@ -111,6 +143,22 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
+  '/api/payment-session/{id}/reconcile': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get?: never;
+    put?: never;
+    post: operations['PaymentSession_reconcile'];
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
   '/api/payment-session/{id}': {
     parameters: {
       query?: never;
@@ -527,6 +575,22 @@ export interface paths {
     patch: operations['CommerceTradeCart_updateItem'];
     trace?: never;
   };
+  '/api/commerce/trade/checkout/payment-methods': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get: operations['CommerceTradeCheckout_paymentMethods'];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
   '/api/commerce/trade/checkout': {
     parameters: {
       query?: never;
@@ -2652,6 +2716,16 @@ export interface components {
       /** @description Quantity */
       quantity: number;
     };
+    'commerce-trade.dto.checkoutPaymentMethods': {
+      items: components['schemas']['commerce-trade.dto.checkoutPaymentMethod'][];
+      defaultKey: string;
+    };
+    'commerce-trade.dto.checkoutPaymentMethod': {
+      key: string;
+      label: string;
+      /** @enum {string} */
+      interaction: 'redirect' | 'embedded';
+    };
     'commerce-trade.dto.checkoutResult': {
       orderId: number | string;
       paymentAttemptId: number | string;
@@ -2670,6 +2744,7 @@ export interface components {
       addressId: number | string;
       couponGrantId?: number | string | undefined;
       correlationId: string;
+      providerCandidateKey?: string | undefined;
     };
     'commerce-trade.dto.orderMineRes': {
       list: components['schemas']['commerce-trade.dto.orderSummary'][];
@@ -5219,6 +5294,56 @@ export interface operations {
       };
     };
   };
+  PaymentCallback_returned: {
+    parameters: {
+      query: {
+        state: string;
+      };
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data?: unknown;
+          };
+        };
+      };
+    };
+  };
+  PaymentCallback_cancelled: {
+    parameters: {
+      query: {
+        state: string;
+      };
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data?: unknown;
+          };
+        };
+      };
+    };
+  };
   PaymentSession_start: {
     parameters: {
       query?: never;
@@ -5245,6 +5370,32 @@ export interface operations {
     };
     authToken: true;
   };
+  PaymentSession_reconcile: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path: {
+        id: number | string;
+      };
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data: components['schemas']['a-pay.dto.paymentSessionView'];
+          };
+        };
+      };
+    };
+    authToken: true;
+  };
   PaymentSession_view: {
     parameters: {
       query?: never;
@@ -6106,6 +6257,30 @@ export interface operations {
     };
     authToken: true;
   };
+  CommerceTradeCheckout_paymentMethods: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data: components['schemas']['commerce-trade.dto.checkoutPaymentMethods'];
+          };
+        };
+      };
+    };
+    authToken: true;
+  };
   CommerceTradeCheckout_create: {
     parameters: {
       query?: never;

package/zova/src/suite/a-commerce/modules/commerce-trade/cli/openapi.config.ts

@@ -9,6 +9,7 @@ export default function (): ZovaOpenapiConfigModule {
         'CommerceTradeCart_updateItem',
         'CommerceTradeCart_deleteItem',
         'CommerceTradeCart_clear',
+        'CommerceTradeCheckout_paymentMethods',
         'CommerceTradeCheckout_create',
         'CommerceTradeOrder_select',
         'CommerceTradeOrder_view',

package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/commerceTradeCheckout.ts

@@ -6,6 +6,15 @@ import type { components, paths } from './openapi/index.js';
 
 import { OpenApiBaseURL } from './openapi/index.js';
 
+/** CommerceTradeCheckout_paymentMethods */
+export const ApiApiCommerceTradeCheckoutpaymentMethodsPath =
+  '/api/commerce/trade/checkout/payment-methods';
+export type ApiApiCommerceTradeCheckoutpaymentMethodsPath =
+  '/api/commerce/trade/checkout/payment-methods';
+export type ApiApiCommerceTradeCheckoutpaymentMethodsMethod = 'get';
+export type ApiApiCommerceTradeCheckoutpaymentMethodsResponseBody =
+  paths[ApiApiCommerceTradeCheckoutpaymentMethodsPath][ApiApiCommerceTradeCheckoutpaymentMethodsMethod]['responses']['200']['content']['application/json']['data'];
+
 /** CommerceTradeCheckout_create */
 export const ApiApiCommerceTradeCheckoutcreatePath = '/api/commerce/trade/checkout';
 export type ApiApiCommerceTradeCheckoutcreatePath = '/api/commerce/trade/checkout';
@@ -17,6 +26,13 @@ export type ApiApiCommerceTradeCheckoutcreateResponseBody =
 
 @Api()
 export class ApiCommerceTradeCheckout extends BeanApiBase {
+  paymentMethods(options?: IApiActionOptions) {
+    return this.$fetch.get<any, ApiApiCommerceTradeCheckoutpaymentMethodsResponseBody>(
+      ApiApiCommerceTradeCheckoutpaymentMethodsPath,
+      this.$configPrepare(OpenApiBaseURL(this.sys), options, true),
+    );
+  }
+
   create(body: ApiApiCommerceTradeCheckoutcreateRequestBody, options?: IApiActionOptions) {
     return this.$fetch.post<any, ApiApiCommerceTradeCheckoutcreateResponseBody>(
       ApiApiCommerceTradeCheckoutcreatePath,

package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/openapi/schemas.ts

@@ -117,6 +117,14 @@ export type ApiSchemaCommerceTradeDtoCartUpdateItem =
   components['schemas']['commerce-trade.dto.cartUpdateItem'];
 export type ApiSchemaCommerceTradeDtoCartUpdateItemPartial =
   Partial<ApiSchemaCommerceTradeDtoCartUpdateItem>;
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethods =
+  components['schemas']['commerce-trade.dto.checkoutPaymentMethods'];
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethodsPartial =
+  Partial<ApiSchemaCommerceTradeDtoCheckoutPaymentMethods>;
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethod =
+  components['schemas']['commerce-trade.dto.checkoutPaymentMethod'];
+export type ApiSchemaCommerceTradeDtoCheckoutPaymentMethodPartial =
+  Partial<ApiSchemaCommerceTradeDtoCheckoutPaymentMethod>;
 export type ApiSchemaCommerceTradeDtoCheckoutResult =
   components['schemas']['commerce-trade.dto.checkoutResult'];
 export type ApiSchemaCommerceTradeDtoCheckoutResultPartial =

package/zova/src/suite/a-commerce/modules/commerce-trade/src/api/openapi/types.ts

@@ -95,7 +95,39 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
-  '/api/payment-session/{id}/start': {
+  '/api/payment-callback/return': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get: operations['PaymentCallback_returned'];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
+  '/api/payment-callback/cancel': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get: operations['PaymentCallback_cancelled'];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
+  '/api/pay/payment-session/{id}/start': {
     parameters: {
       query?: never;
       header?: never;
@@ -111,7 +143,23 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
-  '/api/payment-session/{id}': {
+  '/api/pay/payment-session/{id}/reconcile': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get?: never;
+    put?: never;
+    post: operations['PaymentSession_reconcile'];
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
+  '/api/pay/payment-session/{id}': {
     parameters: {
       query?: never;
       header?: never;
@@ -527,6 +575,22 @@ export interface paths {
     patch: operations['CommerceTradeCart_updateItem'];
     trace?: never;
   };
+  '/api/commerce/trade/checkout/payment-methods': {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    get: operations['CommerceTradeCheckout_paymentMethods'];
+    put?: never;
+    post?: never;
+    delete?: never;
+    options?: never;
+    head?: never;
+    patch?: never;
+    trace?: never;
+  };
   '/api/commerce/trade/checkout': {
     parameters: {
       query?: never;
@@ -2652,6 +2716,16 @@ export interface components {
       /** @description Quantity */
       quantity: number;
     };
+    'commerce-trade.dto.checkoutPaymentMethods': {
+      items: components['schemas']['commerce-trade.dto.checkoutPaymentMethod'][];
+      defaultKey: string;
+    };
+    'commerce-trade.dto.checkoutPaymentMethod': {
+      key: string;
+      label: string;
+      /** @enum {string} */
+      interaction: 'redirect' | 'embedded';
+    };
     'commerce-trade.dto.checkoutResult': {
       orderId: number | string;
       paymentAttemptId: number | string;
@@ -2670,6 +2744,7 @@ export interface components {
       addressId: number | string;
       couponGrantId?: number | string | undefined;
       correlationId: string;
+      providerCandidateKey?: string | undefined;
     };
     'commerce-trade.dto.orderMineRes': {
       list: components['schemas']['commerce-trade.dto.orderSummary'][];
@@ -5219,6 +5294,56 @@ export interface operations {
       };
     };
   };
+  PaymentCallback_returned: {
+    parameters: {
+      query: {
+        state: string;
+      };
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data?: unknown;
+          };
+        };
+      };
+    };
+  };
+  PaymentCallback_cancelled: {
+    parameters: {
+      query: {
+        state: string;
+      };
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data?: unknown;
+          };
+        };
+      };
+    };
+  };
   PaymentSession_start: {
     parameters: {
       query?: never;
@@ -5245,6 +5370,32 @@ export interface operations {
     };
     authToken: true;
   };
+  PaymentSession_reconcile: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path: {
+        id: number | string;
+      };
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data: components['schemas']['a-pay.dto.paymentSessionView'];
+          };
+        };
+      };
+    };
+    authToken: true;
+  };
   PaymentSession_view: {
     parameters: {
       query?: never;
@@ -6106,6 +6257,30 @@ export interface operations {
     };
     authToken: true;
   };
+  CommerceTradeCheckout_paymentMethods: {
+    parameters: {
+      query?: never;
+      header?: never;
+      path?: never;
+      cookie?: never;
+    };
+    requestBody?: never;
+    responses: {
+      200: {
+        headers: {
+          [name: string]: unknown;
+        };
+        content: {
+          'application/json': {
+            code: string;
+            message: string;
+            data: components['schemas']['commerce-trade.dto.checkoutPaymentMethods'];
+          };
+        };
+      };
+    };
+    authToken: true;
+  };
   CommerceTradeCheckout_create: {
     parameters: {
       query?: never;

package/zova/src/suite/a-commerce/modules/commerce-trade/src/apiSchema/commerceTradeCheckout.ts

@@ -3,10 +3,21 @@ import type { IApiSchemaOptions } from 'zova-module-a-api';
 import { BeanBase } from 'zova';
 import { ApiSchema } from 'zova-module-a-api';
 
-import { ApiApiCommerceTradeCheckoutcreatePath } from '../api/commerceTradeCheckout.js';
+import {
+  ApiApiCommerceTradeCheckoutpaymentMethodsPath,
+  ApiApiCommerceTradeCheckoutcreatePath,
+} from '../api/commerceTradeCheckout.js';
 
 @ApiSchema()
 export class ApiSchemaCommerceTradeCheckout extends BeanBase {
+  paymentMethods(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(
+      ApiApiCommerceTradeCheckoutpaymentMethodsPath,
+      'get',
+      options,
+    );
+  }
+
   create(options?: IApiSchemaOptions) {
     return this.$sdk.createApiSchemas(ApiApiCommerceTradeCheckoutcreatePath, 'post', options);
   }

package/zova/src/suite/a-commerce/modules/commerce-trade/src/model/cart.ts

@@ -65,6 +65,17 @@ export class ModelCart extends BeanModelBase {
     });
   }
 
+  paymentMethods() {
+    if (!process.env.CLIENT || !this.$passport.isAuthenticated) return;
+    return this.$useStateData({
+      queryKey: ['paymentMethods'],
+      queryFn: async () => {
+        return await this.scope.api.commerceTradeCheckout.paymentMethods();
+      },
+      meta: { disableSuspenseOnInit: true },
+    });
+  }
+
   checkout() {
     return this.$useMutationData({
       mutationKey: ['checkout'],

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/checkout/controller.tsx

@@ -25,6 +25,7 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
 
   addressId?: string;
   couponGrantId?: string;
+  providerCandidateKey?: string;
   submitting = false;
 
   get queryAddresses() {
@@ -37,6 +38,10 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
     return this.$$modelCoupon.mine();
   }
 
+  get queryPaymentMethods() {
+    return this.$$modelCart.paymentMethods();
+  }
+
   async checkout() {
     if (!this.addressId || this.submitting) return;
     this.submitting = true;
@@ -45,6 +50,7 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
         addressId: this.addressId,
         couponGrantId: this.couponGrantId,
         correlationId: `${Date.now()}-${Math.random().toString(36).slice(2, 12)}`,
+        providerCandidateKey: this.providerCandidateKey,
       });
       this.$router.push({
         name: 'commerce-trade:payment',
@@ -69,6 +75,10 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
     }
     const addresses = this.queryAddresses?.data?.list ?? [];
     const coupons = this.queryCoupons?.data ?? [];
+    const paymentMethods = this.queryPaymentMethods?.data;
+    if (!this.providerCandidateKey && paymentMethods?.defaultKey) {
+      this.providerCandidateKey = paymentMethods.defaultKey;
+    }
     return (
       <ZPage>
         <section class="mx-auto max-w-3xl p-6">
@@ -93,6 +103,20 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
                 <p class="text-base-content/70">Add an address before checking out.</p>
               )}
             </fieldset>
+            <fieldset class="space-y-2">
+              <legend class="font-semibold">Payment method</legend>
+              {paymentMethods?.items.map(method => (
+                <label class="flex cursor-pointer gap-3 rounded border border-base-300 p-3">
+                  <input
+                    type="radio"
+                    name="paymentMethod"
+                    value={method.key}
+                    v-model={this.providerCandidateKey}
+                  />
+                  <span>{method.label}</span>
+                </label>
+              ))}
+            </fieldset>
             <fieldset class="space-y-2">
               <legend class="font-semibold">Coupon</legend>
               <label class="flex cursor-pointer gap-3 rounded border border-base-300 p-3">
@@ -115,7 +139,7 @@ export class ControllerPageCheckout extends BeanControllerPageBase {
             </fieldset>
             <button
               class="btn btn-primary"
-              disabled={!this.addressId || this.submitting}
+              disabled={!this.addressId || !this.providerCandidateKey || this.submitting}
               onClick={() => this.checkout()}
             >
               Create order

package/zova/src/suite/a-commerce/modules/commerce-trade/src/page/payment/controller.tsx

@@ -15,7 +15,9 @@ export const ControllerPagePaymentSchemaParams = z.object({
   orderId: z.string(),
   locale: z.string().optional(),
 });
-export const ControllerPagePaymentSchemaQuery = z.object({});
+export const ControllerPagePaymentSchemaQuery = z.object({
+  providerResult: z.enum(['return', 'cancel']).optional(),
+});
 
 type TypeMockPaymentOutcome = 'succeeded' | 'failed' | 'cancelled';
 
@@ -42,6 +44,7 @@ export class ControllerPagePayment extends BeanControllerPageBase {
     if (this.$ssr.isRuntimeSsrHydrated) {
       await $QueryEnsureLoaded(() => this.queryPaymentSession);
       await $QueryEnsureLoaded(() => this.queryOrder);
+      if (this.$query.providerResult) await this.reconcile();
     }
   }
 
@@ -53,6 +56,20 @@ export class ControllerPagePayment extends BeanControllerPageBase {
     return this.$$modelOrderMine.viewMine(this.orderId!);
   }
 
+  async reconcile() {
+    if (!this.paymentSessionId || this.submitting) return;
+    this.submitting = true;
+    this.message = undefined;
+    try {
+      await this.$$modelPaymentSession.reconcile(this.paymentSessionId).mutateAsync();
+      await this._waitForSettlement();
+    } catch (error: any) {
+      this.message = error.message;
+    } finally {
+      this.submitting = false;
+    }
+  }
+
   async start() {
     if (!this.paymentSessionId || this.submitting) return;
     this.submitting = true;
@@ -81,17 +98,23 @@ export class ControllerPagePayment extends BeanControllerPageBase {
     }
   }
 
-  private async _waitForSettlement(outcome: TypeMockPaymentOutcome) {
+  private async _waitForSettlement(outcome?: TypeMockPaymentOutcome) {
     this.waitingForOrder = true;
     const terminalSessionState = outcome;
-    const terminalOrderState = outcome === 'succeeded' ? 'paid' : 'cancelled';
+    const terminalOrderState = outcome === 'succeeded' ? 'paid' : outcome ? 'cancelled' : undefined;
     try {
       for (let attempt = 0; attempt < 60; attempt++) {
         const session = await this.queryPaymentSession?.refetch();
         const order = await this.scope.api.commerceTradeOrder.viewMine({
           params: { id: this.orderId! },
         });
-        if (session?.data?.state === terminalSessionState && order?.state === terminalOrderState) {
+        const settled =
+          terminalSessionState && terminalOrderState
+            ? session?.data?.state === terminalSessionState && order?.state === terminalOrderState
+            : ['succeeded', 'failed', 'cancelled', 'expired'].includes(
+                session?.data?.state ?? '',
+              ) && ['paid', 'cancelled', 'expired'].includes(order?.state ?? '');
+        if (settled) {
           await this.queryOrder?.refetch();
           await this.$router.push({
             name: 'commerce-trade:order',

package/zova/src/suite-vendor/a-pay/modules/a-pay/cli/openapi.config.ts

@@ -3,7 +3,7 @@ import type { ZovaOpenapiConfigModule } from 'zova-openapi';
 export default function (): ZovaOpenapiConfigModule {
   return {
     operations: {
-      match: ['PaymentSession_start', 'PaymentSession_view'],
+      match: ['PaymentSession_start', 'PaymentSession_reconcile', 'PaymentSession_view'],
     },
   };
 }