ts-glitter 20.6.8 → 20.6.9

package/lowcode/cms-plugin/model/order.d.ts

@@ -115,6 +115,7 @@ interface OrderData {
   custom_receipt_form?: any;
   custom_form_format?: any;
   custom_form_data?: any;
+  tags?: string[];
 }
 
 interface PaymentFlow {

package/lowcode/cms-plugin/module/data.js

@@ -10,7 +10,7 @@ export class OrderDetail {
         this.customer_info = this.initCustomerInfo();
         this.user_info = this.initUserInfo();
         this.total = 0;
-        this.pay_status = "0";
+        this.pay_status = '0';
         this.voucher = this.initVoucher();
     }
     initCustomerInfo() {
@@ -40,13 +40,13 @@ export class OrderDetail {
             id: 0,
             discount_total: 0,
             end_ISO_Date: '',
-            for: "product",
+            for: 'product',
             forKey: [],
-            method: "fixed",
+            method: 'fixed',
             overlay: false,
-            reBackType: "rebate",
+            reBackType: 'rebate',
             rebate_total: 0,
-            rule: "min_count",
+            rule: 'min_count',
             ruleValue: 0,
             startDate: '',
             startTime: '',
@@ -55,9 +55,9 @@ export class OrderDetail {
             target: '',
             targetList: [],
             title: '',
-            trigger: "auto",
+            trigger: 'auto',
             type: 'voucher',
-            value: "0"
+            value: '0',
         };
     }
 }

package/lowcode/cms-plugin/module/data.ts

@@ -1,261 +1,290 @@
 export interface OrderData {
-    distribution_info?: {
-        code: string;
-        condition: number;
-        link: string;
-        recommend_medium: any;
-        recommend_status: string;
-        recommend_user: any;
-        redirect: string;
-        relative: string;
-        relative_data: any;
-        share_type: string;
-        share_value: number;
-        startDate: string;
-        startTime: string;
-        status: boolean;
-        title: string;
-        voucher: number;
-        voucher_status: string;
-    };
-    archived: 'true' | 'false';
-    customer_info: any;
-    editRecord: any;
-    method: string;
-    shipment_selector: {
-        name: string;
-        value: string;
-        form: any;
-    }[];
-    orderStatus: string;
-    use_wallet: number;
+  distribution_info?: {
+    code: string;
+    condition: number;
+    link: string;
+    recommend_medium: any;
+    recommend_status: string;
+    recommend_user: any;
+    redirect: string;
+    relative: string;
+    relative_data: any;
+    share_type: string;
+    share_value: number;
+    startDate: string;
+    startTime: string;
+    status: boolean;
+    title: string;
+    voucher: number;
+    voucher_status: string;
+  };
+  archived: 'true' | 'false';
+  customer_info: any;
+  editRecord: any;
+  method: string;
+  shipment_selector: {
+    name: string;
+    value: string;
+    form: any;
+  }[];
+  orderStatus: string;
+  use_wallet: number;
+  email: string;
+  total: number;
+  discount: number;
+  expectDate: string;
+  shipment_fee: number;
+  use_rebate: number;
+  lineItems: LineItem[];
+  user_info: {
+    name: string;
     email: string;
-    total: number;
-    discount: number;
-    expectDate: string;
-    shipment_fee: number;
-    use_rebate: number;
-    lineItems: LineItem[];
-    user_info: {
-        name: string;
-        email: string;
-        city?:string;
-        area?:string;
-        phone: string;
-        address: string;
-        custom_form_delivery?: any;
-        shipment: 'normal' | 'FAMIC2C' | 'black_cat_freezing' |'UNIMARTC2C' | 'HILIFEC2C' | 'OKMARTC2C' | 'now' | 'shop' | 'global_express' | 'black_cat' | 'UNIMARTFREEZE';
-        CVSStoreName: string;
-        CVSStoreID: string;
-        CVSTelephone: string;
-        MerchantTradeNo: string;
-        CVSAddress: string;
-        note?: string;
-        code_note?: string;
-    };
-    custom_receipt_form?: any;
-    custom_form_format?: any;
-    custom_form_data?: any;
-    proof_purchase: any;
-    progress: string;
-    // progress: 'finish' | 'wait' | 'shipping' | "returns";
-    order_note: string;
-    voucherList: [
-        {
-            title: string;
-            method: 'percent' | 'fixed';
-            trigger: 'auto' | 'code';
-            value: string;
-            for: 'collection' | 'product';
-            rule: 'min_price' | 'min_count';
-            forKey: string[];
-            ruleValue: number;
-            startDate: string;
-            startTime: string;
-            endDate?: string;
-            endTime?: string;
-            status: 0 | 1 | -1;
-            type: 'voucher';
-            code?: string;
-            overlay: boolean;
-            bind?: {
-                id: string;
-                spec: string[];
-                count: number;
-                sale_price: number;
-                collection: string[];
-                discount_price: number;
-            }[];
-            start_ISO_Date: string;
-            end_ISO_Date: string;
-        },
-    ];
-    orderSource?: string;
-    deliveryData: Record<string, string>;
+    city?: string;
+    area?: string;
+    phone: string;
+    address: string;
+    custom_form_delivery?: any;
+    shipment:
+      | 'normal'
+      | 'black_cat_freezing'
+      | 'now'
+      | 'shop'
+      | 'global_express'
+      | 'black_cat'
+      | 'UNIMARTC2C'
+      | 'FAMIC2C'
+      | 'HILIFEC2C'
+      | 'OKMARTC2C'
+      | 'UNIMARTFREEZE'
+      | 'FAMIC2CFREEZE';
+    CVSStoreName: string;
+    CVSStoreID: string;
+    CVSTelephone: string;
+    MerchantTradeNo: string;
+    CVSAddress: string;
+    note?: string;
+    code_note?: string;
+  };
+  custom_receipt_form?: any;
+  custom_form_format?: any;
+  custom_form_data?: any;
+  proof_purchase: any;
+  progress: string;
+  // progress: 'finish' | 'wait' | 'shipping' | "returns";
+  order_note: string;
+  voucherList: [
+    {
+      title: string;
+      method: 'percent' | 'fixed';
+      trigger: 'auto' | 'code';
+      value: string;
+      for: 'collection' | 'product';
+      rule: 'min_price' | 'min_count';
+      forKey: string[];
+      ruleValue: number;
+      startDate: string;
+      startTime: string;
+      endDate?: string;
+      endTime?: string;
+      status: 0 | 1 | -1;
+      type: 'voucher';
+      code?: string;
+      overlay: boolean;
+      bind?: {
+        id: string;
+        spec: string[];
+        count: number;
+        sale_price: number;
+        collection: string[];
+        discount_price: number;
+      }[];
+      start_ISO_Date: string;
+      end_ISO_Date: string;
+    },
+  ];
+  orderSource?: string;
+  deliveryData: Record<string, string>;
 }
 
 export interface CartData {
-    id: number;
-    cart_token: string;
-    status: number;
-    email: string;
-    orderData: OrderData;
-    created_time: string;
+  id: number;
+  cart_token: string;
+  status: number;
+  email: string;
+  orderData: OrderData;
+  created_time: string;
+}
+
+interface DeductionLogEntry {
+  [key: string]: number; // 物件，鍵是字串，值是數字
 }
 
 export interface LineItem {
-    id: number;
-    spec: string[];
-    count: number;
-    sale_price: number;
-    title?: string;
-    sku: string;
-    preview_image?:string;
+  id: number;
+  spec: string[];
+  count: number;
+  sale_price: number;
+  title?: string;
+  sku: string;
+  preview_image?: string;
+  deduction_log?: any;
 }
 
 interface CustomerInfo {
-    name: string;
-    email: string;
-    phone: string;
-    payment_select?: string;
+  name: string;
+  email: string;
+  phone: string;
+  payment_select?: string;
 }
 
 interface UserInfo {
+  name: string;
+  email: string;
+  phone: string;
+  address: string;
+  shipment: 'normal' | 'FAMIC2C' | 'UNIMARTC2C' | 'HILIFEC2C' | 'OKMARTC2C';
+  CVSStoreName: string;
+  CVSStoreID: string;
+  CVSTelephone: string;
+  MerchantTradeNo: string;
+  CVSAddress: string;
+  note: string;
+}
+
+interface VoucherData {
+  id: number;
+  discount_total: number;
+  title: string;
+  method: 'percent' | 'fixed';
+  trigger: 'auto' | 'code';
+  value: string;
+  for: 'collection' | 'product';
+  rule: 'min_price' | 'min_count';
+  forKey: string[];
+  ruleValue: number;
+  startDate: string;
+  startTime: string;
+  endDate?: string;
+  endTime?: string;
+  status: 0 | 1 | -1;
+  type: 'voucher';
+  code?: string;
+  overlay: boolean;
+  bind?: {
+    id: string;
+    spec: string[];
+    count: number;
+    sale_price: number;
+    collection: string[];
+    discount_price: number;
+  }[];
+  start_ISO_Date: string;
+  end_ISO_Date: string;
+  reBackType: string;
+  rebate_total: number;
+  target: string;
+  targetList: string[];
+}
+
+export class OrderDetail {
+  subtotal: number;
+  shipment: number;
+  total: number;
+  discount: number = 0;
+  rebate: number = 0;
+  cart_token: string = '';
+  tag: 'manual' = 'manual';
+  voucher: VoucherData;
+  lineItems: LineItem[] = [];
+  customer_info: CustomerInfo;
+  user_info: {
     name: string;
     email: string;
+    city?: string;
+    area?: string;
     phone: string;
     address: string;
-    shipment: 'normal' | 'FAMIC2C' | 'UNIMARTC2C' | 'HILIFEC2C' | 'OKMARTC2C';
+    custom_form_delivery?: any;
+    shipment:
+      | 'normal'
+      | 'black_cat_freezing'
+      | 'now'
+      | 'shop'
+      | 'global_express'
+      | 'black_cat'
+      | 'UNIMARTC2C'
+      | 'FAMIC2C'
+      | 'HILIFEC2C'
+      | 'OKMARTC2C'
+      | 'UNIMARTFREEZE'
+      | 'FAMIC2CFREEZE';
     CVSStoreName: string;
     CVSStoreID: string;
     CVSTelephone: string;
     MerchantTradeNo: string;
     CVSAddress: string;
-    note: string;
-}
+    note?: string;
+    code_note?: string;
+  };
+  pay_status: string;
 
-interface VoucherData {
-    id:number;
-    discount_total:number;
-    title: string;
-    method: 'percent' | 'fixed';
-    trigger: 'auto' | 'code';
-    value: string;
-    for: 'collection' | 'product';
-    rule: 'min_price' | 'min_count';
-    forKey: string[];
-    ruleValue: number;
-    startDate: string;
-    startTime: string;
-    endDate?: string;
-    endTime?: string;
-    status: 0 | 1 | -1;
-    type: 'voucher';
-    code?: string;
-    overlay: boolean;
-    bind?: {
-        id: string;
-        spec: string[];
-        count: number;
-        sale_price: number;
-        collection: string[];
-        discount_price: number;
-    }[];
-    start_ISO_Date: string;
-    end_ISO_Date: string;
-    reBackType:string;
-    rebate_total:number;
-    target:string;
-    targetList:string[];
-}
+  constructor(subtotal: number, shipment: number) {
+    this.subtotal = subtotal;
+    this.shipment = shipment;
+    this.customer_info = this.initCustomerInfo();
+    this.user_info = this.initUserInfo();
+    this.total = 0;
+    this.pay_status = '0';
+    this.voucher = this.initVoucher();
+  }
 
-export class OrderDetail {
-    subtotal: number;
-    shipment: number;
-    total: number;
-    discount: number = 0;
-    rebate: number = 0;
-    cart_token: string = '';
-    tag: 'manual' = 'manual';
-    voucher: VoucherData;
-    lineItems: LineItem[] = [];
-    customer_info: CustomerInfo;
-    user_info: {
-        name: string;
-        email: string;
-        city?: string;
-        area?: string;
-        phone: string;
-        address: string;
-        custom_form_delivery?: any;
-        shipment: "normal" | "FAMIC2C" | "black_cat_freezing" | "UNIMARTC2C" | "HILIFEC2C" | "OKMARTC2C" | "now" | "shop" | "global_express" | "black_cat" | "UNIMARTFREEZE";
-        CVSStoreName: string;
-        CVSStoreID: string;
-        CVSTelephone: string;
-        MerchantTradeNo: string;
-        CVSAddress: string;
-        note?: string;
-        code_note?: string
+  private initCustomerInfo(): CustomerInfo {
+    return {
+      name: '',
+      phone: '',
+      email: '',
     };
-    pay_status: string;
-
-    constructor(subtotal: number, shipment: number) {
-        this.subtotal = subtotal;
-        this.shipment = shipment;
-        this.customer_info = this.initCustomerInfo();
-        this.user_info = this.initUserInfo();
-        this.total = 0;
-        this.pay_status = "0";
-        this.voucher = this.initVoucher();
-    }
-
-    private initCustomerInfo(): CustomerInfo {
-        return {
-            name: '',
-            phone: '',
-            email: '',
-        };
-    }
+  }
 
-    private initUserInfo(): UserInfo {
-        return {
-            CVSAddress: '',
-            CVSStoreID: '',
-            CVSStoreName: '',
-            CVSTelephone: '',
-            MerchantTradeNo: '',
-            address: '',
-            email: '',
-            name: '',
-            note: '',
-            phone: '',
-            shipment: 'normal',
-        };
-    }
+  private initUserInfo(): UserInfo {
+    return {
+      CVSAddress: '',
+      CVSStoreID: '',
+      CVSStoreName: '',
+      CVSTelephone: '',
+      MerchantTradeNo: '',
+      address: '',
+      email: '',
+      name: '',
+      note: '',
+      phone: '',
+      shipment: 'normal',
+    };
+  }
 
-    private initVoucher(): VoucherData {
-        return  {
-            id: 0,
-            discount_total: 0,
-            end_ISO_Date: '',
-            for: "product",
-            forKey: [],
-            method: "fixed",
-            overlay: false,
-            reBackType: "rebate",
-            rebate_total: 0,
-            rule: "min_count",
-            ruleValue: 0,
-            startDate: '',
-            startTime: '',
-            start_ISO_Date: '',
-            status: 1,
-            target: '',
-            targetList: [],
-            title: '',
-            trigger: "auto",
-            type: 'voucher',
-            value: "0"
-        };
-    }
-}
+  private initVoucher(): VoucherData {
+    return {
+      id: 0,
+      discount_total: 0,
+      end_ISO_Date: '',
+      for: 'product',
+      forKey: [],
+      method: 'fixed',
+      overlay: false,
+      reBackType: 'rebate',
+      rebate_total: 0,
+      rule: 'min_count',
+      ruleValue: 0,
+      startDate: '',
+      startTime: '',
+      start_ISO_Date: '',
+      status: 1,
+      target: '',
+      targetList: [],
+      title: '',
+      trigger: 'auto',
+      type: 'voucher',
+      value: '0',
+    };
+  }
+}

package/lowcode/cms-plugin/module/delivery-html.js

@@ -1,7 +1,8 @@
 import { Tool } from '../../modules/tool.js';
 import { BgWidget } from '../../backend-manager/bg-widget.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
-import { OrderSetting } from '../module/order-setting.js';
+import { ShipmentConfig } from '../../glitter-base/global/shipment-config.js';
+import { PaymentConfig } from '../../glitter-base/global/payment-config.js';
 const html = String.raw;
 export class DeliveryHTML {
     static print(ogvc, dataArray, type) {
@@ -29,6 +30,8 @@ export class DeliveryHTML {
             store: {},
             twZipcode: [],
             info: infoMap[type],
+            shippingMethod: [],
+            paymentMethod: [],
         };
         return BgWidget.fullDialog({
             gvc: ogvc,
@@ -65,9 +68,13 @@ export class DeliveryHTML {
                                 ApiUser.getPublicConfig('store-information', 'manager').then(r => {
                                     return r.result && r.response ? r.response.value : {};
                                 }),
+                                ShipmentConfig.shipmentMethod({ type: 'all' }),
+                                PaymentConfig.getSupportPayment(true),
                             ]).then(dataArray => {
                                 vm.twZipcode = dataArray[0];
                                 vm.store = dataArray[1];
+                                vm.shippingMethod = dataArray[2];
+                                vm.paymentMethod = dataArray[3];
                                 loading = false;
                                 gvc.notifyDataChange(id);
                             });
@@ -299,7 +306,7 @@ export class DeliveryHTML {
       <h1 class="subtitle">${vm.info.subtitle}時間：${glitter.ut.dateFormat(new Date(), 'yyyy-MM-dd hh:mm')}</h1>
     </div>`;
     }
-    static shipmentDetail(glitter, data) {
+    static shipmentDetail(vm, glitter, data) {
         const orderData = data.orderData;
         function paymentStatus(cart) {
             const statusMessages = {
@@ -310,26 +317,27 @@ export class DeliveryHTML {
             };
             return statusMessages[`${cart.status}`] || '付款失敗';
         }
+        const shippingMethod = vm.shippingMethod.find((ship) => ship.key === orderData.user_info.shipment);
+        const paymentMethod = vm.paymentMethod.find((pay) => pay.key === orderData.customer_info.payment_select);
+        const shippingAddr = ['UNIMARTC2C', 'UNIMARTFREEZE', 'FAMIC2C', 'FAMIC2CFREEZE', 'OKMARTC2C', 'HILIFEC2C'].includes(orderData.user_info.shipment)
+            ? `${orderData.user_info.CVSStoreName} (${orderData.user_info.CVSAddress})`
+            : [orderData.user_info.city, orderData.user_info.area, orderData.user_info.address].filter(Boolean).join('');
         return html `<div class="details">
       <table>
         <tr>
           <td>訂單編號：${data.cart_token}</td>
-          <td>送貨方式：${OrderSetting.getShippingMethodText(orderData)}</td>
+          <td>送貨方式：${shippingMethod ? shippingMethod.name : '立即取貨'}</td>
         </tr>
         <tr>
           <td>訂購日期：${glitter.ut.dateFormat(new Date(data.created_time), 'yyyy-MM-dd hh:mm')}</td>
-          <td>
-            送貨地址：${[orderData.user_info.city, orderData.user_info.area, orderData.user_info.address]
-            .filter(Boolean)
-            .join('')}
-          </td>
+          <td>送貨地址：${shippingAddr}</td>
         </tr>
         <tr>
           <td>訂購人帳號：${orderData.email}</td>
           <td>收件人姓名：${orderData.user_info.name}</td>
         </tr>
         <tr>
-          <td>付款方式：${OrderSetting.getPaymentMethodText(orderData)}</td>
+          <td>付款方式：${paymentMethod ? paymentMethod.name : '線下付款'}</td>
           <td>收件人電話：${orderData.user_info.phone}</td>
         </tr>
         <tr>
@@ -415,7 +423,7 @@ export class DeliveryHTML {
         const orderData = data.orderData;
         return [
             this.shipmentHeader(vm, glitter),
-            this.shipmentDetail(glitter, data),
+            this.shipmentDetail(vm, glitter, data),
             this.shipmentItems(gvc, orderData),
             this.shipmentSummary(orderData),
             this.shipmentNote(orderData),