cabloy 5.1.148 → 5.1.150

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

@@ -0,0 +1,17 @@
+import type { IApiSchemaOptions } from 'zova-module-a-api';
+
+import { BeanBase } from 'zova';
+import { ApiSchema } from 'zova-module-a-api';
+
+import { ApiApiCommerceTradeStockBalanceadjustStockPath } from '../api/commerceTradeStockBalance.js';
+
+@ApiSchema()
+export class ApiSchemaCommerceTradeStockBalance extends BeanBase {
+  adjustStock(options?: IApiSchemaOptions) {
+    return this.$sdk.createApiSchemas(
+      ApiApiCommerceTradeStockBalanceadjustStockPath,
+      'post',
+      options,
+    );
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/bean/tableCell.actionAdjustStock.tsx

@@ -0,0 +1,35 @@
+import type { IResourceTableActionRowOptionsBase } from 'zova-module-a-openapi';
+import type {
+  IJsxRenderContextTableCell,
+  ITableCellRender,
+  NextTableCellRender,
+} from 'zova-module-a-table';
+
+import { BeanBase } from 'zova';
+import { TableCell } from 'zova-module-a-table';
+
+declare module 'zova-module-a-openapi' {
+  export interface IResourceTableActionRowRecord {
+    'commerce-trade:actionAdjustStock'?: ITableCellOptionsActionAdjustStock;
+  }
+}
+
+export interface ITableCellOptionsActionAdjustStock extends IResourceTableActionRowOptionsBase {}
+
+@TableCell<ITableCellOptionsActionAdjustStock>({
+  class: 'btn btn-outline btn-secondary join-item',
+})
+export class TableCellActionAdjustStock extends BeanBase implements ITableCellRender {
+  render(
+    options: ITableCellOptionsActionAdjustStock,
+    renderContext: IJsxRenderContextTableCell,
+    _next: NextTableCellRender,
+  ) {
+    return renderContext.$jsx.render(
+      'commerce-trade:tableCellActionAdjustStock',
+      options,
+      renderContext.$celScope,
+      renderContext,
+    );
+  }
+}

package/zova/src/suite/a-commerce/modules/commerce-trade/src/component/tableCellActionAdjustStock/controller.tsx

@@ -0,0 +1,138 @@
+import type { SchemaObject } from 'openapi3-ts/oas31';
+import type { TableIdentity } from 'table-identity';
+import type { TypeFormOnSubmitData } from 'zova-module-a-form';
+import type { IJsxRenderContextTableCell } from 'zova-module-a-table';
+
+import { BeanControllerBase, 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 type { ApiApiCommerceTradeStockBalanceadjustStockRequestBody } from '../../api/commerceTradeStockBalance.js';
+import type { ITableCellOptionsActionAdjustStock } from '../../bean/tableCell.actionAdjustStock.js';
+import type { ModelStockBalance } from '../../model/stockBalance.js';
+
+export interface ControllerTableCellActionAdjustStockProps extends ITableCellOptionsActionAdjustStock {}
+
+type StockAdjustmentDraft = Omit<
+  ApiApiCommerceTradeStockBalanceadjustStockRequestBody,
+  'correlationId' | 'skuId'
+>;
+
+const emptyDraft = (): StockAdjustmentDraft => ({ delta: 0, reason: '' });
+
+@Controller()
+export class ControllerTableCellActionAdjustStock extends BeanControllerBase {
+  static $propsDefault = {};
+
+  @Use({ injectionScope: 'host' })
+  $$renderContext: IJsxRenderContextTableCell;
+
+  @Use({ beanFullName: 'commerce-trade.model.stockBalance' })
+  $$modelStockBalance: ModelStockBalance;
+
+  draft: StockAdjustmentDraft = emptyDraft();
+  schema?: SchemaObject;
+
+  get apiSchemasStockAdjust() {
+    return this.scope.apiSchema.commerceTradeStockBalance.adjustStock();
+  }
+
+  private get _sku() {
+    return this.$$renderContext.cellContext.row.original as {
+      available: number;
+      code: string;
+      id: TableIdentity;
+    };
+  }
+
+  private get _mutation() {
+    return this.$$modelStockBalance.adjustStock(this._sku.id);
+  }
+
+  private async _ensureSchema() {
+    if (this.schema) return;
+    await $QueryEnsureLoaded(() => this.apiSchemasStockAdjust.sdk);
+    this.schema = this.$computed(() => this.apiSchemasStockAdjust.requestBody);
+  }
+
+  private async _submit(data: TypeFormOnSubmitData<StockAdjustmentDraft>, close: () => void) {
+    const mutation = this._mutation;
+    if (mutation.isPending) return;
+    const delta = Number(data.value.delta);
+    const reason = data.value.reason.trim();
+    if (!Number.isInteger(delta) || delta === 0 || !reason) return;
+    await mutation.mutateAsync({
+      skuId: this._sku.id,
+      delta,
+      reason,
+      correlationId: crypto.randomUUID(),
+    });
+    close();
+  }
+
+  private async _openDialog() {
+    await this._ensureSchema();
+    this.draft = emptyDraft();
+    const dialog = this.$appModal.dialog(
+      {
+        title: this.scope.locale.AdjustStock(),
+        slotDefault: () => {
+          return (
+            <div class="space-y-4">
+              <dl class="grid grid-cols-2 gap-x-4 gap-y-2 text-sm">
+                <dt class="text-base-content/70">{this.scope.locale.SkuId()}</dt>
+                <dd>{this._sku.code}</dd>
+                <dt class="text-base-content/70">{this.scope.locale.Available()}</dt>
+                <dd>{this._sku.available}</dd>
+              </dl>
+              <ZForm
+                data={this.draft}
+                schema={this.schema}
+                onSubmitData={data => this._submit(data, () => dialog.close())}
+                onShowError={async ({ error }) => {
+                  await this.$performCommand('basic-commands:alert', {
+                    type: 'error',
+                    text: error.message,
+                  });
+                }}
+                slotFooter={$$form => (
+                  <div class="flex justify-end gap-2">
+                    {this._mutation.isPending && (
+                      <span class="loading loading-spinner text-primary"></span>
+                    )}
+                    <button class="btn btn-ghost" type="button" onClick={() => dialog.close()}>
+                      {this.scope.locale.Cancel()}
+                    </button>
+                    <button
+                      class="btn btn-secondary"
+                      disabled={$$form.formState.isSubmitting || this._mutation.isPending}
+                      type="submit"
+                    >
+                      {this.scope.locale.AdjustStock()}
+                    </button>
+                  </div>
+                )}
+              ></ZForm>
+            </div>
+          );
+        },
+      },
+      {
+        closeOnBackdrop: false,
+        closeOnEscape: false,
+        maxWidth: 480,
+        showCloseButton: true,
+      },
+    );
+  }
+
+  protected render() {
+    const props = this.$props as ControllerTableCellActionAdjustStockProps;
+    return (
+      <button class={props.class} type="button" onClick={() => this._openDialog()}>
+        {this.scope.locale.AdjustStock()}
+      </button>
+    );
+  }
+}

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

@@ -97,4 +97,7 @@ export default {
   CompleteMockRefund: 'Complete mock refund',
   MockRefundCompletionFailed: 'Unable to complete the mock refund. Try again.',
   MockRefundCompleted: 'The mock refund was completed. The order is being settled.',
+  AdjustStock: 'Adjust stock',
+  SkuId: 'SKU',
+  Available: 'Available',
 };

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

@@ -88,4 +88,7 @@ export default {
   CompleteMockRefund: '完成模拟退款',
   MockRefundCompletionFailed: '无法完成模拟退款，请重试。',
   MockRefundCompleted: '模拟退款已完成，订单正在结算。',
+  AdjustStock: '调整库存',
+  SkuId: 'SKU',
+  Available: '可用库存',
 };

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

@@ -0,0 +1,36 @@
+import type { TableIdentity } from 'table-identity';
+import type { IDecoratorModelOptions } from 'zova-module-a-model';
+import type { ModelResource } from 'zova-module-rest-resource';
+
+import { Use, usePrepareArg } from 'zova';
+import { BeanModelBase, Model } from 'zova-module-a-model';
+
+import type {
+  ApiApiCommerceTradeStockBalanceadjustStockRequestBody,
+  ApiApiCommerceTradeStockBalanceadjustStockResponseBody,
+} from '../api/commerceTradeStockBalance.js';
+
+export interface IModelOptionsStockBalance extends IDecoratorModelOptions {}
+
+const SkuResource = 'commerce-catalog:sku';
+
+@Model<IModelOptionsStockBalance>()
+export class ModelStockBalance extends BeanModelBase {
+  @Use({ beanFullName: 'rest-resource.model.resource' })
+  protected get $$modelResource(): ModelResource {
+    return usePrepareArg(SkuResource, true);
+  }
+
+  adjustStock(id: TableIdentity) {
+    return this.$$modelResource.mutationItem<
+      ApiApiCommerceTradeStockBalanceadjustStockResponseBody,
+      ApiApiCommerceTradeStockBalanceadjustStockRequestBody
+    >({
+      id,
+      action: 'adjustStock',
+      mutationFn: async payload => {
+        return await this.scope.api.commerceTradeStockBalance.adjustStock(payload);
+      },
+    });
+  }
+}

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

@@ -159,9 +159,8 @@ export class ControllerPagePayment extends BeanControllerPageBase {
       for (const [attempt, delay] of SettlementPollDelaysMilliseconds.entries()) {
         if (delay > 0) await new Promise(resolve => setTimeout(resolve, delay));
         if (!this._isCurrentSettlementPoll(pollVersion)) return;
-        let session;
         try {
-          session = await this.queryPaymentSession?.refetch();
+          await this.queryPaymentSession?.refetch({ bypassPersister: true });
         } catch (error) {
           if (isNotFoundError(error)) {
             this.paymentSessionUnavailable = true;
@@ -171,9 +170,10 @@ export class ControllerPagePayment extends BeanControllerPageBase {
           throw error;
         }
         if (!this._isCurrentSettlementPoll(pollVersion)) return;
-        const sessionState = session?.data?.state;
+        const session = this.queryPaymentSession?.data;
+        const sessionState = session?.state;
         this.pendingSessionState = sessionState;
-        this.pendingNextAction = session?.data?.nextAction;
+        this.pendingNextAction = session?.nextAction;
         const isSessionTerminal = ['succeeded', 'failed', 'cancelled', 'expired'].includes(
           sessionState ?? '',
         );

package/zova/src/suite/a-training/modules/training-student/package.json

@@ -33,7 +33,9 @@
     "prepack": "clean-package",
     "postpack": "clean-package restore"
   },
-  "dependencies": {},
+  "dependencies": {
+    "zova-module-basic-markdown": "^5.0.0"
+  },
   "devDependencies": {
     "clean-package": "^2.2.0",
     "rimraf": "^6.1.3"

package/zova/src/suite/a-training/modules/training-student/src/api/openapi/schemas.ts

@@ -6,6 +6,42 @@ export type ApiSchemaTestVonaDtoUserCreate = components['schemas']['test-vona.dt
 export type ApiSchemaTestVonaDtoUserCreatePartial = Partial<ApiSchemaTestVonaDtoUserCreate>;
 export type ApiSchemaTestVonaEntityProduct = components['schemas']['test-vona.entity.product'];
 export type ApiSchemaTestVonaEntityProductPartial = Partial<ApiSchemaTestVonaEntityProduct>;
+export type ApiSchemaAImageDtoImageUploadPolicyResponse =
+  components['schemas']['a-image.dto.imageUploadPolicyResponse'];
+export type ApiSchemaAImageDtoImageUploadPolicyResponsePartial =
+  Partial<ApiSchemaAImageDtoImageUploadPolicyResponse>;
+export type ApiSchemaAImageDtoImageUploadPolicyRequest =
+  components['schemas']['a-image.dto.imageUploadPolicyRequest'];
+export type ApiSchemaAImageDtoImageUploadPolicyRequestPartial =
+  Partial<ApiSchemaAImageDtoImageUploadPolicyRequest>;
+export type ApiSchemaAImageDtoImageUploadResponse =
+  components['schemas']['a-image.dto.imageUploadResponse'];
+export type ApiSchemaAImageDtoImageUploadResponsePartial =
+  Partial<ApiSchemaAImageDtoImageUploadResponse>;
+export type ApiSchemaAImageDtoImageDirectUploadResponse =
+  components['schemas']['a-image.dto.imageDirectUploadResponse'];
+export type ApiSchemaAImageDtoImageDirectUploadResponsePartial =
+  Partial<ApiSchemaAImageDtoImageDirectUploadResponse>;
+export type ApiSchemaAImageDtoImageDirectUploadRequest =
+  components['schemas']['a-image.dto.imageDirectUploadRequest'];
+export type ApiSchemaAImageDtoImageDirectUploadRequestPartial =
+  Partial<ApiSchemaAImageDtoImageDirectUploadRequest>;
+export type ApiSchemaAImageDtoImageDirectUploadFinalizeResponse =
+  components['schemas']['a-image.dto.imageDirectUploadFinalizeResponse'];
+export type ApiSchemaAImageDtoImageDirectUploadFinalizeResponsePartial =
+  Partial<ApiSchemaAImageDtoImageDirectUploadFinalizeResponse>;
+export type ApiSchemaAImageDtoImageDirectUploadFinalizeRequest =
+  components['schemas']['a-image.dto.imageDirectUploadFinalizeRequest'];
+export type ApiSchemaAImageDtoImageDirectUploadFinalizeRequestPartial =
+  Partial<ApiSchemaAImageDtoImageDirectUploadFinalizeRequest>;
+export type ApiSchemaAImageDtoImageUploadUrlRequest =
+  components['schemas']['a-image.dto.imageUploadUrlRequest'];
+export type ApiSchemaAImageDtoImageUploadUrlRequestPartial =
+  Partial<ApiSchemaAImageDtoImageUploadUrlRequest>;
+export type ApiSchemaAImageDtoImageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305b =
+  components['schemas']['a-image.dto.imageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305b'];
+export type ApiSchemaAImageDtoImageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305bPartial =
+  Partial<ApiSchemaAImageDtoImageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305b>;
 export type ApiSchemaACaptchaDtoCaptchaData = components['schemas']['a-captcha.dto.captchaData'];
 export type ApiSchemaACaptchaDtoCaptchaDataPartial = Partial<ApiSchemaACaptchaDtoCaptchaData>;
 export type ApiSchemaAPayDtoPaymentSessionView =
@@ -43,42 +79,6 @@ export type ApiSchemaCommerceMemberDtoAddressView_2d063d28bc7243bed02ebd8bddf121
   components['schemas']['commerce-member.dto.addressView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875'];
 export type ApiSchemaCommerceMemberDtoAddressView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875Partial =
   Partial<ApiSchemaCommerceMemberDtoAddressView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_425dbecccd52e19e24888f99e1b1670233afa875>;
-export type ApiSchemaAImageDtoImageUploadPolicyResponse =
-  components['schemas']['a-image.dto.imageUploadPolicyResponse'];
-export type ApiSchemaAImageDtoImageUploadPolicyResponsePartial =
-  Partial<ApiSchemaAImageDtoImageUploadPolicyResponse>;
-export type ApiSchemaAImageDtoImageUploadPolicyRequest =
-  components['schemas']['a-image.dto.imageUploadPolicyRequest'];
-export type ApiSchemaAImageDtoImageUploadPolicyRequestPartial =
-  Partial<ApiSchemaAImageDtoImageUploadPolicyRequest>;
-export type ApiSchemaAImageDtoImageUploadResponse =
-  components['schemas']['a-image.dto.imageUploadResponse'];
-export type ApiSchemaAImageDtoImageUploadResponsePartial =
-  Partial<ApiSchemaAImageDtoImageUploadResponse>;
-export type ApiSchemaAImageDtoImageDirectUploadResponse =
-  components['schemas']['a-image.dto.imageDirectUploadResponse'];
-export type ApiSchemaAImageDtoImageDirectUploadResponsePartial =
-  Partial<ApiSchemaAImageDtoImageDirectUploadResponse>;
-export type ApiSchemaAImageDtoImageDirectUploadRequest =
-  components['schemas']['a-image.dto.imageDirectUploadRequest'];
-export type ApiSchemaAImageDtoImageDirectUploadRequestPartial =
-  Partial<ApiSchemaAImageDtoImageDirectUploadRequest>;
-export type ApiSchemaAImageDtoImageDirectUploadFinalizeResponse =
-  components['schemas']['a-image.dto.imageDirectUploadFinalizeResponse'];
-export type ApiSchemaAImageDtoImageDirectUploadFinalizeResponsePartial =
-  Partial<ApiSchemaAImageDtoImageDirectUploadFinalizeResponse>;
-export type ApiSchemaAImageDtoImageDirectUploadFinalizeRequest =
-  components['schemas']['a-image.dto.imageDirectUploadFinalizeRequest'];
-export type ApiSchemaAImageDtoImageDirectUploadFinalizeRequestPartial =
-  Partial<ApiSchemaAImageDtoImageDirectUploadFinalizeRequest>;
-export type ApiSchemaAImageDtoImageUploadUrlRequest =
-  components['schemas']['a-image.dto.imageUploadUrlRequest'];
-export type ApiSchemaAImageDtoImageUploadUrlRequestPartial =
-  Partial<ApiSchemaAImageDtoImageUploadUrlRequest>;
-export type ApiSchemaAImageDtoImageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305b =
-  components['schemas']['a-image.dto.imageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305b'];
-export type ApiSchemaAImageDtoImageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305bPartial =
-  Partial<ApiSchemaAImageDtoImageTransformOptions_2d063d28bc7243bed02ebd8bddf1212a93c6305b>;
 export type ApiSchemaHomeUserDtoAccountCurrent =
   components['schemas']['home-user.dto.accountCurrent'];
 export type ApiSchemaHomeUserDtoAccountCurrentPartial = Partial<ApiSchemaHomeUserDtoAccountCurrent>;
@@ -302,10 +302,10 @@ export type ApiSchemaCommerceTradeEntityStockBalance =
   components['schemas']['commerce-trade.entity.stockBalance'];
 export type ApiSchemaCommerceTradeEntityStockBalancePartial =
   Partial<ApiSchemaCommerceTradeEntityStockBalance>;
-export type ApiSchemaCommerceTradeDtoStockAdjust_0aab216abd3467dd07f61c69172266c2441af477 =
-  components['schemas']['commerce-trade.dto.stockAdjust_0aab216abd3467dd07f61c69172266c2441af477'];
-export type ApiSchemaCommerceTradeDtoStockAdjust_0aab216abd3467dd07f61c69172266c2441af477Partial =
-  Partial<ApiSchemaCommerceTradeDtoStockAdjust_0aab216abd3467dd07f61c69172266c2441af477>;
+export type ApiSchemaCommerceTradeDtoStockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750e =
+  components['schemas']['commerce-trade.dto.stockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750e'];
+export type ApiSchemaCommerceTradeDtoStockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750ePartial =
+  Partial<ApiSchemaCommerceTradeDtoStockAdjust_6a7c2f0bb21a25da3048650f263577ae4467750e>;
 export type ApiSchemaCommerceTradeDtoStockBalanceSelectRes =
   components['schemas']['commerce-trade.dto.stockBalanceSelectRes'];
 export type ApiSchemaCommerceTradeDtoStockBalanceSelectResPartial =
@@ -463,10 +463,10 @@ export type ApiSchemaAImageDtoImageView_a83c3e638bca4b30ec8675860cdc52d66f6a16d1
   components['schemas']['a-image.dto.imageView_a83c3e638bca4b30ec8675860cdc52d66f6a16d1_2d063d28bc7243bed02ebd8bddf1212a93c6305b_efb37794d7c03c65122279f90d79919f009c34e5_1816ff740d81c738ec055c7038bbd93beb9405a7_537cd6552a384183a9457fb6a920bbae337277f6'];
 export type ApiSchemaAImageDtoImageView_a83c3e638bca4b30ec8675860cdc52d66f6a16d1_2d063d28bc7243bed02ebd8bddf1212a93c6305b_efb37794d7c03c65122279f90d79919f009c34e5_1816ff740d81c738ec055c7038bbd93beb9405a7_537cd6552a384183a9457fb6a920bbae337277f6Partial =
   Partial<ApiSchemaAImageDtoImageView_a83c3e638bca4b30ec8675860cdc52d66f6a16d1_2d063d28bc7243bed02ebd8bddf1212a93c6305b_efb37794d7c03c65122279f90d79919f009c34e5_1816ff740d81c738ec055c7038bbd93beb9405a7_537cd6552a384183a9457fb6a920bbae337277f6>;
-export type ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_4e7e5941f704425ce1be04de1885c36427ccc436 =
-  components['schemas']['training-student.dto.studentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_4e7e5941f704425ce1be04de1885c36427ccc436'];
-export type ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_4e7e5941f704425ce1be04de1885c36427ccc436Partial =
-  Partial<ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_4e7e5941f704425ce1be04de1885c36427ccc436>;
+export type ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48ac =
+  components['schemas']['training-student.dto.studentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48ac'];
+export type ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48acPartial =
+  Partial<ApiSchemaTrainingStudentDtoStudentView_2d063d28bc7243bed02ebd8bddf1212a93c6305b_93b863fbe913f9389386c3f524075f08b39f48ac>;
 export type ApiSchemaTrainingStudentDtoStudentUpdate =
   components['schemas']['training-student.dto.studentUpdate'];
 export type ApiSchemaTrainingStudentDtoStudentUpdatePartial =