ts-glitter 21.9.0 → 21.9.1

package/lowcode/Entry.js

@@ -146,7 +146,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_21.9.0';
+            glitter.share.editerVersion = 'V_21.9.1';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -150,7 +150,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_21.9.0';
+      glitter.share.editerVersion = 'V_21.9.1';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

package/lowcode/cms-plugin/filter-options.js

@@ -390,7 +390,7 @@ FilterOptions.reconciliationOptions = [
 FilterOptions.payloadStatusOptions = [
     { key: '1', name: '已付款' },
     { key: '3', name: '部分付款' },
-    { key: '0', name: '未付款' },
+    { key: '0', name: '待核款 / 貨到付款 / 未付款' },
     { key: '-1', name: '付款失敗' },
     { key: '-2', name: '已退款' },
 ];

package/lowcode/cms-plugin/filter-options.ts

@@ -226,7 +226,7 @@ export class FilterOptions {
   static payloadStatusOptions = [
     { key: '1', name: '已付款' },
     { key: '3', name: '部分付款' },
-    { key: '0', name: '未付款' },
+    { key: '0', name: '待核款 / 貨到付款 / 未付款' },
     { key: '-1', name: '付款失敗' },
     { key: '-2', name: '已退款' },
   ];

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

@@ -1,11 +1,10 @@
 type Status = 0 | 1 | -1;
 type VoucherMethod = 'percent' | 'fixed';
-type ReBackType = 'rebate' | 'discount' | 'shipment_free';
-type TriggerType = 'auto' | 'code';
 type VoucherFor = 'collection' | 'product' | 'all';
 type VoucherRule = 'min_price' | 'min_count';
+type ReBackType = 'rebate' | 'discount' | 'shipment_free';
+type TriggerType = 'auto' | 'code';
 type FilterType = 'normal' | 'block' | 'pos' | 'all';
-type PaymentMethod = 'ATM' | 'CreditCard' | 'ConvenienceStore';
 type ShipmentMethod =
   | 'normal'
   | 'FAMIC2C'
@@ -17,9 +16,12 @@ type ShipmentMethod =
   | 'global_express'
   | 'UNIMARTFREEZE'
   | 'black_cat_freezing'
-  | 'black_cat';
-
+  | 'black_cat'
+  | 'FAMIC2CFREEZE';
+type PaymentMethod = 'ATM' | 'CreditCard' | 'ConvenienceStore';
 type ViewModelType = 'list' | 'add' | 'replace' | 'select' | 'createInvoice' | 'viewInvoice' | 'recommend';
+type POSPayment = 'cash' | 'credit' | 'line_pay';
+type TradeStatus = '0' | '1' | '10200095';
 
 interface EditRecord {
   time: string;
@@ -88,13 +90,34 @@ interface CartData {
 }
 
 interface OrderData {
-  cash_flow: PaymentFlow;
-  editRecord: EditRecord[];
-  distribution_info?: DistributionInfo;
+  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: UserInfo;
+  customer_info: any;
+  editRecord: any;
   method: string;
-  shipment_selector: ShipmentSelector[];
+  shipment_selector: {
+    name: string;
+    value: string;
+    form: any;
+  }[];
   orderStatus: string;
   use_wallet: number;
   email: string;
@@ -105,16 +128,17 @@ interface OrderData {
   use_rebate: number;
   lineItems: LineItem[];
   user_info: UserInfo;
+  custom_receipt_form?: any;
+  custom_form_format?: any;
+  custom_form_data?: any;
   proof_purchase: any;
   progress: string;
   order_note: string;
   voucherList: VoucherData[];
   orderSource?: string;
   deliveryData: Record<string, string>;
+  cash_flow: PaymentFlow;
   pos_info: POSInfo;
-  custom_receipt_form?: any;
-  custom_form_format?: any;
-  custom_form_data?: any;
   tags?: string[];
   fbp?: string;
   fbc?:string;
@@ -125,7 +149,7 @@ interface PaymentFlow {
   HandlingCharge?: string;
   PaymentType: PaymentMethod;
   PaymentDate?: string;
-  TradeStatus?: '0' | '1' | '10200095';
+  TradeStatus?: TradeStatus;
   TradeAmt: string;
   TradeNo: string;
   credit_receipt?: any;
@@ -148,22 +172,32 @@ interface UserInfo {
   name: string;
   email: string;
   phone: string;
+  address: string;
+  shipment: ShipmentMethod;
+  CVSStoreName: string;
+  CVSStoreID: string;
+  CVSTelephone: string;
+  MerchantTradeNo: string;
+  CVSAddress: string;
+  note: string;
   city?: string;
   area?: string;
   shipment_date: string;
   shipment_refer: string;
-  address: string;
   shipment_number?: string;
   state: string;
   company: string;
   country: string;
   postal_code: string;
   invoice_type: string;
+  custom_form_delivery?: any;
+  shipment_detail?: any;
+  code_note?: string;
   [key: string]: any;
 }
 
 interface POSInfo {
-  payment: 'cash' | 'credit' | 'line_pay';
+  payment: POSPayment;
   who: {
     id: number;
     user: string;
@@ -185,18 +219,18 @@ interface POSConfig {
 
 interface LineItem {
   id: number;
-  sku: string;
   spec: string[];
   count: number;
-  stock: number;
-  title: string;
+  sale_price: number;
+  sku: string;
   rebate: number;
   weight: number;
   is_gift: boolean;
-  sale_price: number;
   origin_price: number;
   discount_price: number;
-  deduction_log: any;
+  title?: string;
+  preview_image?: string;
+  deduction_log?: any;
 }
 
 interface OrderQuery {
@@ -205,6 +239,13 @@ interface OrderQuery {
   isShipment?: boolean;
 }
 
+interface CustomerInfo {
+  name: string;
+  email: string;
+  phone: string;
+  payment_select?: string;
+}
+
 interface ViewModel {
   id: string;
   loading: boolean;

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

@@ -22,6 +22,13 @@ export class OrderDetail {
     }
     initUserInfo() {
         return {
+            country: '',
+            postal_code: '',
+            invoice_type: '',
+            shipment_date: '',
+            shipment_refer: '',
+            state: '',
+            company: '',
             CVSAddress: '',
             CVSStoreID: '',
             CVSStoreName: '',

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

@@ -1,192 +1,3 @@
-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;
-  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'
-      | '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;
-    shipment_number?: 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;
-}
-
-interface DeductionLogEntry {
-  [key: string]: number; // 物件，鍵是字串，值是數字
-}
-
-export interface LineItem {
-  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;
-}
-
-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;
@@ -249,6 +60,13 @@ export class OrderDetail {
 
   private initUserInfo(): UserInfo {
     return {
+      country: '',
+      postal_code: '',
+      invoice_type: '',
+      shipment_date: '',
+      shipment_refer: '',
+      state: '',
+      company: '',
       CVSAddress: '',
       CVSStoreID: '',
       CVSStoreName: '',

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

@@ -2,14 +2,13 @@ import { GVC } from '../../glitterBundle/GVController.js';
 import { Tool } from '../../modules/tool.js';
 import { BgWidget } from '../../backend-manager/bg-widget.js';
 import { ApiUser } from '../../glitter-base/route/user.js';
-import { CartData, OrderData } from './data.js';
 import { ShipmentConfig } from '../../glitter-base/global/shipment-config.js';
 import { PaymentConfig } from '../../glitter-base/global/payment-config.js';
 import { OrderExcel } from './order-excel.js';
 
 const html = String.raw;
 
-type PrintType = 'shipment' | 'pick' | 'address' | 'shipAddr';
+export type PrintType = 'shipment' | 'pick' | 'address' | 'shipAddr';
 
 type InfoObject = {
   title: string;

package/lowcode/cms-plugin/module/order-setting.js

@@ -47,6 +47,7 @@ export class OrderSetting {
             { title: '部分付款', value: '3' },
             { title: '待核款 / 貨到付款 / 未付款', value: '0' },
             { title: '已退款', value: '-2' },
+            { title: '付款失敗', value: '-1' },
         ].map(item => {
             return {
                 key: item.value,
@@ -1132,6 +1133,43 @@ export class OrderSetting {
             });
         }, 'combineOrders');
     }
+    static allEditDialog(data) {
+        const gvc = data.gvc;
+        const dialog = new ShareDialog(gvc.glitter);
+        const defaultValue = '';
+        let temp = '';
+        BgWidget.settingDialog({
+            gvc: gvc,
+            title: data.title,
+            innerHTML: (innerGVC) => {
+                return html ` <div>
+          <div class="tx_700 mb-2">更改為</div>
+          ${BgWidget.select({
+                    gvc: innerGVC,
+                    callback: (value) => {
+                        temp = value;
+                    },
+                    default: defaultValue,
+                    options: [{ key: '', value: '請選擇狀態' }, ...data.options],
+                })}
+        </div>`;
+            },
+            footer_html: (footerGVC) => {
+                return [
+                    BgWidget.cancel(footerGVC.event(() => footerGVC.closeDialog()), '取消'),
+                    BgWidget.save(footerGVC.event(() => {
+                        if (temp === defaultValue) {
+                            dialog.infoMessage({ text: '請選擇欲更改的選項' });
+                            return;
+                        }
+                        footerGVC.closeDialog();
+                        data.callback(temp);
+                    }), '儲存'),
+                ].join('');
+            },
+            width: 350,
+        });
+    }
     static batchEditOrders(obj) {
         const wp = window.parent;
         const topGVC = wp.glitter.pageConfig[wp.glitter.pageConfig.length - 1].gvc;
@@ -1241,8 +1279,23 @@ export class OrderSetting {
                                     dd.status = value;
                                 },
                                 default: `${dd.status || 0}`,
-                                options: OrderSetting.getPaymentStatusOpt(),
-                                style: 'min-width: 220px;',
+                                options: (() => {
+                                    const paymentOptions = OrderSetting.getPaymentStatusOpt();
+                                    const unpayOption = paymentOptions.find(item => item.key === '0');
+                                    if (unpayOption) {
+                                        if (dd.orderData.proof_purchase) {
+                                            unpayOption.value = '待核款';
+                                        }
+                                        else if (dd.orderData.customer_info.payment_select == 'cash_on_delivery') {
+                                            unpayOption.value = '貨到付款';
+                                        }
+                                        else {
+                                            unpayOption.value = '未付款';
+                                        }
+                                    }
+                                    return paymentOptions;
+                                })(),
+                                style: 'min-width: 150px;',
                             }),
                         },
                         {
@@ -1319,7 +1372,7 @@ export class OrderSetting {
                                         return html ` <div class="d-flex align-items-center gap-2">${htmlArray.join('')}</div>`;
                                     },
                                     divCreate: {
-                                        style: 'min-width: 580px;',
+                                        style: 'min-width: 620px;',
                                     },
                                 };
                             })()),
@@ -1327,42 +1380,6 @@ export class OrderSetting {
                     ];
                 });
             }
-            function allEditDialog(data) {
-                const defaultValue = '';
-                let temp = '';
-                BgWidget.settingDialog({
-                    gvc: gvc,
-                    title: data.title,
-                    innerHTML: (innerGVC) => {
-                        return html ` <div>
-              <div class="tx_700 mb-2">更改為</div>
-              ${BgWidget.select({
-                            gvc: innerGVC,
-                            callback: (value) => {
-                                temp = value;
-                            },
-                            default: defaultValue,
-                            options: [{ key: '', value: '請選擇狀態' }, ...data.options],
-                        })}
-            </div>`;
-                    },
-                    footer_html: (footerGVC) => {
-                        return [
-                            BgWidget.cancel(footerGVC.event(() => footerGVC.closeDialog()), '取消'),
-                            BgWidget.save(footerGVC.event(() => {
-                                if (temp === defaultValue) {
-                                    dialog.infoMessage({ text: '請選擇欲更改的選項' });
-                                    return;
-                                }
-                                footerGVC.closeDialog();
-                                data.callback(temp);
-                                gvc.notifyDataChange(vm.id);
-                            }), '儲存'),
-                        ].join('');
-                    },
-                    width: 350,
-                });
-            }
             function editOrderView() {
                 return BgWidget.tableV3({
                     gvc,
@@ -1370,13 +1387,15 @@ export class OrderSetting {
                         {
                             name: '更改付款狀態',
                             event: (checkArray) => {
-                                allEditDialog({
+                                OrderSetting.allEditDialog({
+                                    gvc,
                                     title: '批量更改付款狀態',
                                     options: OrderSetting.getPaymentStatusOpt(),
                                     callback: (value) => {
                                         checkArray.forEach((order) => {
                                             order.status = Number(value);
                                         });
+                                        gvc.notifyDataChange(vm.id);
                                     },
                                 });
                             },
@@ -1384,7 +1403,8 @@ export class OrderSetting {
                         {
                             name: '更改出貨狀態',
                             event: (checkArray) => {
-                                allEditDialog({
+                                OrderSetting.allEditDialog({
+                                    gvc,
                                     title: '批量更改出貨狀態',
                                     options: OrderSetting.getShippmentOpt(),
                                     callback: (value) => {
@@ -1394,6 +1414,7 @@ export class OrderSetting {
                                                 order.orderData.user_info.shipment_number = '';
                                             }
                                         });
+                                        gvc.notifyDataChange(vm.id);
                                     },
                                 });
                             },
@@ -1401,13 +1422,15 @@ export class OrderSetting {
                         {
                             name: '更改訂單狀態',
                             event: (checkArray) => {
-                                allEditDialog({
+                                OrderSetting.allEditDialog({
+                                    gvc,
                                     title: '批量更改訂單狀態',
                                     options: OrderSetting.getOrderStatusOpt(),
                                     callback: (value) => {
                                         checkArray.forEach((order) => {
                                             order.orderData.orderStatus = value;
                                         });
+                                        gvc.notifyDataChange(vm.id);
                                     },
                                 });
                             },
@@ -1467,25 +1490,11 @@ export class OrderSetting {
               <div class="w-100 d-flex justify-content-end" style="padding: 14px 16px; gap: 14px;">
                 ${BgWidget.cancel(gvc.event(() => closeEvent()))}
                 ${BgWidget.save(gvc.event(() => {
-                        for (let i = 0; i < vm.orders.length; i++) {
-                            const order = vm.orders[i];
-                            const cloneOrder = cloneOrders[i];
-                            if (['wait', 'returns', undefined].includes(cloneOrder.orderData.progress) &&
-                                ['arrived', 'finish', 'shipping', 'in_stock'].includes(order.orderData.progress) &&
-                                !order.orderData.user_info.shipment_number) {
-                                dialog.errorMessage({
-                                    text: `訂單編號 #${order.cart_token} 未輸入出貨單號碼`,
-                                });
-                                return;
-                            }
+                        const verify = this.batchUpdateOrderVerify(gvc, cloneOrders, vm.orders);
+                        if (verify) {
+                            obj.callback(vm.orders);
+                            topGVC.glitter.closeDiaLog();
                         }
-                        vm.orders.forEach((order) => {
-                            if (order.orderData.progress === 'in_stock') {
-                                order.orderData.progress = 'wait';
-                            }
-                        });
-                        obj.callback(vm.orders);
-                        topGVC.glitter.closeDiaLog();
                     }))}
               </div>
             </div>
@@ -1494,6 +1503,27 @@ export class OrderSetting {
             });
         }, 'batchEditOrders');
     }
+    static batchUpdateOrderVerify(gvc, cloneOrders, updateOrders) {
+        const dialog = new ShareDialog(gvc.glitter);
+        for (let i = 0; i < updateOrders.length; i++) {
+            const order = updateOrders[i];
+            const cloneOrder = cloneOrders[i];
+            if (['wait', 'returns', undefined].includes(cloneOrder.orderData.progress) &&
+                ['arrived', 'finish', 'shipping', 'in_stock'].includes(order.orderData.progress) &&
+                !order.orderData.user_info.shipment_number) {
+                dialog.errorMessage({
+                    text: `訂單編號 #${order.cart_token} 未輸入出貨單號碼`,
+                });
+                return false;
+            }
+        }
+        updateOrders.forEach((order) => {
+            if (order.orderData.progress === 'in_stock') {
+                order.orderData.progress = 'wait';
+            }
+        });
+        return true;
+    }
     static splitOrder(topGVC, origOrderData, callback) {
         var _a, _b;
         const orderData = structuredClone(origOrderData);