cabloy 5.1.227 → 5.1.228

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

@@ -1,10 +1,15 @@
+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 { ZButton } from 'zova-module-basic-button';
 
+import type { ApiApiCommerceTradeOrdershipRequestBody } from '../../api/commerceTradeOrder.js';
 import type { ITableCellOptionsActionShip } from '../../bean/tableCell.actionShip.js';
 import type { ModelOrder } from '../../model/order.js';
 
@@ -20,48 +25,91 @@ export class ControllerTableCellActionShip extends BeanControllerBase {
   @Use({ beanFullName: 'commerce-trade.model.order' })
   $$modelOrder: ModelOrder;
 
-  carrier = '';
-  trackingNumber = '';
-  confirmed = false;
+  draft: ApiApiCommerceTradeOrdershipRequestBody = { carrier: '', trackingNumber: '' };
+  schema?: SchemaObject;
 
-  private async _ship() {
-    const carrier = this.carrier.trim();
-    const trackingNumber = this.trackingNumber.trim();
-    if (!carrier || !trackingNumber || !this.confirmed) return;
+  get apiSchemasShip() {
+    return this.scope.apiSchema.commerceTradeOrder.ship();
+  }
 
+  private get _mutation() {
     const orderId = this.$$renderContext.cellContext.row.id as TableIdentity;
-    await this.$$modelOrder.ship(orderId).mutateAsync({ carrier, trackingNumber });
+    return this.$$modelOrder.ship(orderId);
+  }
+
+  private async _submit(
+    data: TypeFormOnSubmitData<ApiApiCommerceTradeOrdershipRequestBody>,
+    close: () => void,
+  ) {
+    const mutation = this._mutation;
+    if (mutation.isPending) return;
+    const confirmed = await this.$performCommand('basic-commands:confirm', {
+      text: this.scope.locale.ShipOrderConfirm(),
+    });
+    if (!confirmed) return;
+    await mutation.mutateAsync(data.value);
+    close();
+  }
+
+  private async _ensureSchema() {
+    await $QueryEnsureLoaded(() => this.apiSchemasShip.sdk);
+    if (!this.schema) {
+      this.schema = this.$computed(() => this.apiSchemasShip.requestBody);
+    }
+  }
+
+  private async _openDialog() {
+    await this._ensureSchema();
+    this.draft = { carrier: '', trackingNumber: '' };
+    this.$appModal.dialog(
+      {
+        title: this.scope.locale.ShipOrder(),
+        slotDefault: dialog => (
+          <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">
+                {$$form.formState.isSubmitting && (
+                  <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-primary"
+                  disabled={$$form.formState.isSubmitting || this._mutation.isPending}
+                  type="submit"
+                >
+                  {this.scope.locale.ShipOrder()}
+                </button>
+              </div>
+            )}
+          ></ZForm>
+        ),
+      },
+      {
+        closeOnBackdrop: false,
+        closeOnEscape: false,
+        maxWidth: 480,
+        showCloseButton: true,
+      },
+    );
   }
 
   protected render() {
     const props = this.$props as ControllerTableCellActionShipProps;
     return (
-      <div class="join">
-        <input
-          class="input input-bordered input-sm join-item w-32"
-          name="carrier"
-          placeholder="Carrier"
-          v-model={this.carrier}
-        />
-        <input
-          class="input input-bordered input-sm join-item w-36"
-          name="trackingNumber"
-          placeholder="Tracking number"
-          v-model={this.trackingNumber}
-        />
-        <label class="label cursor-pointer join-item gap-1 px-2">
-          <input
-            class="checkbox checkbox-sm"
-            name="confirmed"
-            type="checkbox"
-            v-model={this.confirmed}
-          />
-          <span class="label-text text-xs">{this.scope.locale.Confirm()}</span>
-        </label>
-        <ZButton class={props.class} onPerform={() => this._ship()}>
-          {this.scope.locale.ShipOrder()}
-        </ZButton>
-      </div>
+      <ZButton class={props.class} onPerform={() => this._openDialog()}>
+        {this.scope.locale.ShipOrder()}
+      </ZButton>
     );
   }
 }

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

@@ -68,6 +68,7 @@ export default {
   Confirm: 'Confirm',
   Cancel: 'Cancel',
   ShipOrder: 'Ship order',
+  ShipOrderConfirm: 'Ship this order with the entered shipment details?',
   RequestRefund: 'Request refund',
   RefundRequestHelp: 'Refunds are for the whole unshipped order only.',
   RefundReason: 'Reason for refund',

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

@@ -61,6 +61,7 @@ export default {
   Confirm: '确认',
   Cancel: '取消',
   ShipOrder: '发货',
+  ShipOrderConfirm: '确定使用填写的物流信息发货吗？',
   RequestRefund: '申请退款',
   RefundRequestHelp: '退款仅适用于整单且尚未发货的订单。',
   RefundReason: '退款原因',