cabloy 5.1.140 → 5.1.142

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

@@ -1504,54 +1504,6 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
-  '/api/paypal/getRecord/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get: operations['Paypal_getRecord'];
-    put?: never;
-    post?: never;
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/captureOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_captureOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/cancelOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_cancelOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
   '/api/test/auth/passport/isAuthenticated': {
     parameters: {
       query?: never;
@@ -3954,7 +3906,29 @@ export interface components {
     'a-permission.dto.permissions': {
       roleIds?: (number | string)[] | undefined;
       roleNames?: string[] | undefined;
-      actions?: unknown;
+      actions?:
+        | {
+            [key: string]:
+              | boolean
+              | {
+                  key: string;
+                  allowed: boolean;
+                  matcher:
+                    | {
+                        /** @enum {string} */
+                        mode: 'all';
+                      }
+                    | {
+                        /** @enum {string} */
+                        mode: 'any';
+                        rules: {
+                          field: string;
+                          values: string[];
+                        }[];
+                      };
+                };
+          }
+        | undefined;
     };
     'home-base.dto.siteCatalogSelectRes': {
       list: components['schemas']['home-base.dto.siteCatalogSelectResItem'][];
@@ -4771,49 +4745,6 @@ export interface components {
       /** @enum {string} */
       outcome: 'succeeded' | 'failed' | 'cancelled';
     };
-    'a-paypal.entity.paypalRecord': {
-      /**
-       * Format: date-time
-       * @description Created At
-       */
-      createdAt: Date;
-      /**
-       * Format: date-time
-       * @description Updated At
-       */
-      updatedAt: Date;
-      /**
-       * @description Deleted
-       * @default false
-       */
-      deleted?: boolean;
-      /**
-       * @description Instance ID
-       * @default 0
-       */
-      iid?: number;
-      /** @description ID */
-      id: number | string;
-      userId: number | string;
-      /** @default 0 */
-      status?: number;
-      prepayId: string;
-      payload: components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-      options: components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-    };
-    'a-paypal.dto.paypalOrderRecordPayload': {
-      remark: string;
-      total: string;
-      currencyCode: string;
-    };
-    'a-paypal.dto.paypalOrderRecordOptions': {
-      brandName: string;
-      returnUrl: string;
-      cancelUrl: string;
-      returnTo: string;
-      scene: string;
-      orderId: number | string;
-    };
     'test-captcha.dto.signin': {
       username: string;
       password: string;
@@ -8544,84 +8475,6 @@ export interface operations {
     };
     authToken: true;
   };
-  Paypal_getRecord: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data: components['schemas']['a-paypal.entity.paypalRecord'];
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_captureOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_cancelOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
   TestAuthPassport_isAuthenticated: {
     parameters: {
       query?: never;

package/zova/src/suite/a-commerce/modules/commerce-member/src/page/address/controller.tsx

@@ -1,8 +1,11 @@
+import type { SchemaObject } from 'openapi3-ts/oas31';
 import type { TableIdentity } from 'table-identity';
+import type { TypeFormOnSubmitData } from 'zova-module-a-form';
 
 import { z } from 'zod';
 import { BeanControllerPageBase, Use } from 'zova';
 import { Controller } from 'zova-module-a-bean';
+import { ZForm } from 'zova-module-a-form';
 import { $QueryEnsureLoaded } from 'zova-module-a-model';
 import { ZPage } from 'zova-module-home-base';
 
@@ -37,9 +40,27 @@ export class ControllerPageAddress extends BeanControllerPageBase {
 
   editingId?: TableIdentity;
   draft: AddressDraft = emptyDraft();
+  schemaAddress?: SchemaObject;
+
+  get apiSchemasAddressCreate() {
+    return this.scope.apiSchema.commerceMemberAddress.createMine();
+  }
+
+  get apiSchemasAddressUpdate() {
+    return this.scope.apiSchema.commerceMemberAddress.updateMine();
+  }
 
   protected async __init__() {
-    await $QueryEnsureLoaded(() => this.queryAddresses);
+    await Promise.all([
+      $QueryEnsureLoaded(() => this.queryAddresses),
+      $QueryEnsureLoaded(() => this.apiSchemasAddressCreate.sdk),
+      $QueryEnsureLoaded(() => this.apiSchemasAddressUpdate.sdk),
+    ]);
+    this.schemaAddress = this.$computed(() => {
+      return this.editingId === undefined
+        ? this.apiSchemasAddressCreate.requestBody
+        : this.apiSchemasAddressUpdate.requestBody;
+    });
   }
 
   get queryAddresses() {
@@ -65,13 +86,13 @@ export class ControllerPageAddress extends BeanControllerPageBase {
     this.draft = emptyDraft();
   }
 
-  async submit() {
+  async submit(data: TypeFormOnSubmitData<AddressDraft>) {
     if (this.editingId === undefined) {
-      await this.$$modelAddressMine.createMine().mutateAsync(this.draft);
+      await this.$$modelAddressMine.createMine().mutateAsync(data.value);
     } else {
       await this.$$modelAddressMine.updateMine().mutateAsync({
         id: this.editingId,
-        body: this.draft,
+        body: data.value,
       });
     }
     this.resetDraft();
@@ -124,68 +145,48 @@ export class ControllerPageAddress extends BeanControllerPageBase {
                 </article>
               ))}
             </div>
-            <form
-              class="card bg-base-100 border border-base-300 shadow-sm"
-              onSubmit={event => event.preventDefault()}
-            >
+            <div class="card bg-base-100 border border-base-300 shadow-sm">
               <div class="card-body gap-3">
-                <h2 class="card-title">
-                  {this.editingId === undefined
-                    ? this.scope.locale.AddAddress()
-                    : this.scope.locale.EditAddress()}
-                </h2>
-                <input
-                  class="input input-bordered"
-                  placeholder={this.scope.locale.RecipientName()}
-                  v-model={this.draft.recipientName}
-                />
-                <input
-                  class="input input-bordered"
-                  placeholder={this.scope.locale.Phone()}
-                  v-model={this.draft.phone}
-                />
-                <input
-                  class="input input-bordered"
-                  placeholder={this.scope.locale.CountryCode()}
-                  v-model={this.draft.countryCode}
-                />
-                <input
-                  class="input input-bordered"
-                  placeholder={this.scope.locale.Region()}
-                  v-model={this.draft.region}
-                />
-                <input
-                  class="input input-bordered"
-                  placeholder={this.scope.locale.City()}
-                  v-model={this.draft.city}
-                />
-                <input
-                  class="input input-bordered"
-                  placeholder={this.scope.locale.PostalCode()}
-                  v-model={this.draft.postalCode}
-                />
-                <input
-                  class="input input-bordered"
-                  placeholder={this.scope.locale.AddressLine1()}
-                  v-model={this.draft.addressLine1}
-                />
-                <input
-                  class="input input-bordered"
-                  placeholder={this.scope.locale.AddressLine2()}
-                  v-model={this.draft.addressLine2}
-                />
-                <div class="flex gap-2">
-                  <button class="btn btn-primary" type="submit" onClick={() => this.submit()}>
-                    {this.scope.locale.SaveAddress()}
-                  </button>
-                  {this.editingId !== undefined && (
-                    <button class="btn btn-outline" type="button" onClick={() => this.resetDraft()}>
-                      {this.scope.locale.CancelAddressEdit()}
-                    </button>
+                <ZForm
+                  data={this.draft}
+                  schema={this.schemaAddress}
+                  onSubmitData={data => this.submit(data)}
+                  onShowError={async ({ error }) => {
+                    await this.$performCommand('basic-commands:alert', {
+                      type: 'error',
+                      text: error.message,
+                    });
+                  }}
+                  slotHeader={() => (
+                    <h2 class="card-title">
+                      {this.editingId === undefined
+                        ? this.scope.locale.AddAddress()
+                        : this.scope.locale.EditAddress()}
+                    </h2>
+                  )}
+                  slotFooter={$$form => (
+                    <div class="flex gap-2">
+                      <button
+                        class="btn btn-primary"
+                        disabled={$$form.formState.isSubmitting}
+                        type="submit"
+                      >
+                        {this.scope.locale.SaveAddress()}
+                      </button>
+                      {this.editingId !== undefined && (
+                        <button
+                          class="btn btn-outline"
+                          type="button"
+                          onClick={() => this.resetDraft()}
+                        >
+                          {this.scope.locale.CancelAddressEdit()}
+                        </button>
+                      )}
+                    </div>
                   )}
-                </div>
+                ></ZForm>
               </div>
-            </form>
+            </div>
           </div>
           {query?.error && (
             <div role="alert" class="alert alert-error mt-6">

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

@@ -535,17 +535,6 @@ export type ApiSchemaPayMockDtoMockRefundComplete =
   components['schemas']['pay-mock.dto.mockRefundComplete'];
 export type ApiSchemaPayMockDtoMockRefundCompletePartial =
   Partial<ApiSchemaPayMockDtoMockRefundComplete>;
-export type ApiSchemaAPaypalEntityPaypalRecord =
-  components['schemas']['a-paypal.entity.paypalRecord'];
-export type ApiSchemaAPaypalEntityPaypalRecordPartial = Partial<ApiSchemaAPaypalEntityPaypalRecord>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayload =
-  components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayloadPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordPayload>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptions =
-  components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptionsPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordOptions>;
 export type ApiSchemaTestCaptchaDtoSignin = components['schemas']['test-captcha.dto.signin'];
 export type ApiSchemaTestCaptchaDtoSigninPartial = Partial<ApiSchemaTestCaptchaDtoSignin>;
 export type ApiSchemaTestRestDtoProductCreate =

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

@@ -1504,54 +1504,6 @@ export interface paths {
     patch?: never;
     trace?: never;
   };
-  '/api/paypal/getRecord/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get: operations['Paypal_getRecord'];
-    put?: never;
-    post?: never;
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/captureOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_captureOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
-  '/api/paypal/cancelOrder/{recordId}': {
-    parameters: {
-      query?: never;
-      header?: never;
-      path?: never;
-      cookie?: never;
-    };
-    get?: never;
-    put?: never;
-    post: operations['Paypal_cancelOrder'];
-    delete?: never;
-    options?: never;
-    head?: never;
-    patch?: never;
-    trace?: never;
-  };
   '/api/test/auth/passport/isAuthenticated': {
     parameters: {
       query?: never;
@@ -3954,7 +3906,29 @@ export interface components {
     'a-permission.dto.permissions': {
       roleIds?: (number | string)[] | undefined;
       roleNames?: string[] | undefined;
-      actions?: unknown;
+      actions?:
+        | {
+            [key: string]:
+              | boolean
+              | {
+                  key: string;
+                  allowed: boolean;
+                  matcher:
+                    | {
+                        /** @enum {string} */
+                        mode: 'all';
+                      }
+                    | {
+                        /** @enum {string} */
+                        mode: 'any';
+                        rules: {
+                          field: string;
+                          values: string[];
+                        }[];
+                      };
+                };
+          }
+        | undefined;
     };
     'home-base.dto.siteCatalogSelectRes': {
       list: components['schemas']['home-base.dto.siteCatalogSelectResItem'][];
@@ -4771,49 +4745,6 @@ export interface components {
       /** @enum {string} */
       outcome: 'succeeded' | 'failed' | 'cancelled';
     };
-    'a-paypal.entity.paypalRecord': {
-      /**
-       * Format: date-time
-       * @description Created At
-       */
-      createdAt: Date;
-      /**
-       * Format: date-time
-       * @description Updated At
-       */
-      updatedAt: Date;
-      /**
-       * @description Deleted
-       * @default false
-       */
-      deleted?: boolean;
-      /**
-       * @description Instance ID
-       * @default 0
-       */
-      iid?: number;
-      /** @description ID */
-      id: number | string;
-      userId: number | string;
-      /** @default 0 */
-      status?: number;
-      prepayId: string;
-      payload: components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-      options: components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-    };
-    'a-paypal.dto.paypalOrderRecordPayload': {
-      remark: string;
-      total: string;
-      currencyCode: string;
-    };
-    'a-paypal.dto.paypalOrderRecordOptions': {
-      brandName: string;
-      returnUrl: string;
-      cancelUrl: string;
-      returnTo: string;
-      scene: string;
-      orderId: number | string;
-    };
     'test-captcha.dto.signin': {
       username: string;
       password: string;
@@ -8544,84 +8475,6 @@ export interface operations {
     };
     authToken: true;
   };
-  Paypal_getRecord: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data: components['schemas']['a-paypal.entity.paypalRecord'];
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_captureOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
-  Paypal_cancelOrder: {
-    parameters: {
-      query?: never;
-      header?: never;
-      path: {
-        recordId: number | string;
-      };
-      cookie?: never;
-    };
-    requestBody?: never;
-    responses: {
-      200: {
-        headers: {
-          [name: string]: unknown;
-        };
-        content: {
-          'application/json': {
-            code: string;
-            message: string;
-            data?: unknown;
-          };
-        };
-      };
-    };
-    authToken: true;
-  };
   TestAuthPassport_isAuthenticated: {
     parameters: {
       query?: never;

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

@@ -535,17 +535,6 @@ export type ApiSchemaPayMockDtoMockRefundComplete =
   components['schemas']['pay-mock.dto.mockRefundComplete'];
 export type ApiSchemaPayMockDtoMockRefundCompletePartial =
   Partial<ApiSchemaPayMockDtoMockRefundComplete>;
-export type ApiSchemaAPaypalEntityPaypalRecord =
-  components['schemas']['a-paypal.entity.paypalRecord'];
-export type ApiSchemaAPaypalEntityPaypalRecordPartial = Partial<ApiSchemaAPaypalEntityPaypalRecord>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayload =
-  components['schemas']['a-paypal.dto.paypalOrderRecordPayload'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordPayloadPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordPayload>;
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptions =
-  components['schemas']['a-paypal.dto.paypalOrderRecordOptions'];
-export type ApiSchemaAPaypalDtoPaypalOrderRecordOptionsPartial =
-  Partial<ApiSchemaAPaypalDtoPaypalOrderRecordOptions>;
 export type ApiSchemaTestCaptchaDtoSignin = components['schemas']['test-captcha.dto.signin'];
 export type ApiSchemaTestCaptchaDtoSigninPartial = Partial<ApiSchemaTestCaptchaDtoSignin>;
 export type ApiSchemaTestRestDtoProductCreate =