ts-glitter 20.6.8 → 20.6.9

package/lowcode/cms-plugin/shopping-finance-setting.ts

@@ -12,6 +12,7 @@ import { Language } from '../glitter-base/global/language.js';
 import { ShoppingShipmentSetting } from './shopping-shipment-setting.js';
 import { ShipmentConfig } from '../glitter-base/global/shipment-config.js';
 import { ApiUser } from '../glitter-base/route/user.js';
+import { PaymentConfig } from '../glitter-base/global/payment-config.js';
 
 type CustomFinance = {
   name: string;
@@ -260,9 +261,12 @@ export class ShoppingFinanceSetting {
 
               // 線上金流
               if (vm.page === 'online') {
-                h = html` <div class="my-2">${BgWidget.blueNote('透過線上金流，消費者可於線上進行結帳付款')}</div>
+                h = html` <div class="px-md-0 px-2 mb-2">
+                    ${BgWidget.normalInsignia('透過線上金流，消費者可於線上進行結帳付款')}
+                  </div>
                   <div class="row">
-                    ${this.onlinePayArray()
+                    ${PaymentConfig.onlinePay
+                      .filter(item => item.type !== 'pos')
                       .map(dd => {
                         keyData[dd.key] = keyData[dd.key] ?? {};
                         return html` <div class="col-12 col-lg-3 col-md-4 p-0 p-md-2">
@@ -515,7 +519,7 @@ export class ShoppingFinanceSetting {
                                                           key_d.STORE_ID = text;
                                                         },
                                                         placeHolder: '請輸入STORE_ID',
-                                                      })
+                                                      }),
                                                     ].join('');
                                                   case 'paynow':
                                                     return [
@@ -647,7 +651,7 @@ export class ShoppingFinanceSetting {
               if (vm.page === 'offline') {
                 const offlinePayArray = [
                   // 系統線下金流
-                  ...this.offlinePayArray(),
+                  ...PaymentConfig.defalutOfflinePay,
                   // 自訂線下金流
                   ...keyData.payment_info_custom.map((dd: any) => {
                     return {
@@ -658,8 +662,8 @@ export class ShoppingFinanceSetting {
                   }),
                 ];
 
-                h = html` <div class="my-2">
-                    ${BgWidget.blueNote('透過設定線下金流，結帳後訂單將進入手動核款的流程，亦可使用超商取貨付款')}
+                h = html` <div class="px-md-0 px-2 mb-2">
+                    ${BgWidget.normalInsignia('透過設定線下金流，結帳後訂單將進入手動核款的流程，亦可使用超商取貨付款')}
                   </div>
                   <div class="row">
                     ${offlinePayArray
@@ -786,9 +790,12 @@ export class ShoppingFinanceSetting {
 
               // POS
               if (vm.page === 'pos') {
-                h = html`<div class="my-2">${BgWidget.blueNote('設定實體店面所需串接的付款方式')}</div>
+                h = html` <div class="px-md-0 px-2 mb-2">
+                    ${BgWidget.normalInsignia('設定實體店面所需串接的付款方式')}
+                  </div>
                   <div class="row">
-                    ${this.posPayArray()
+                    ${PaymentConfig.onlinePay
+                      .filter(item => item.type === 'pos')
                       .map(dd => {
                         return html` <div class="col-12 col-lg-3 col-md-4 p-0 p-md-2">
                           <div
@@ -898,8 +905,7 @@ export class ShoppingFinanceSetting {
                   (key: any) => {
                     vm.page = key;
                     gvc.notifyDataChange(vm.id);
-                  },
-                  'margin-top: 0px; margin-bottom: 0px;'
+                  }
                 ),
                 h,
               ].join('');
@@ -932,7 +938,7 @@ export class ShoppingFinanceSetting {
             }
           },
         }),
-      ].join(BgWidget.mbContainer(24))}
+      ].join('')}
       ${BgWidget.mbContainer(240)}
     `);
   }
@@ -1224,80 +1230,6 @@ export class ShoppingFinanceSetting {
     });
   }
 
-  // 金流種類 (線上)
-  static onlinePayArray = () => {
-    return [
-      {
-        key: 'newWebPay',
-        name: '藍新金流',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/logo.jpg',
-      },
-      {
-        key: 'ecPay',
-        name: '綠界金流',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/52415944_122858408.428215.png',
-      },
-      {
-        key: 'paynow',
-        name: 'PayNow 立吉富',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/download.png',
-      },
-      {
-        key: 'paypal',
-        name: 'PayPal',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/174861.png',
-      },
-      {
-        key: 'line_pay',
-        name: 'Line Pay',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/tw-11134207-7r98t-ltrond04grjj74.jpeg',
-      },
-      {
-        key: 'jkopay',
-        name: '街口支付',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/1200x630waw.png',
-      },
-    ];
-  };
-
-  // 金流種類 (線下)
-  static offlinePayArray = () => {
-    return [
-      {
-        key: 'atm',
-        name: 'ATM銀行轉帳',
-        customerClass: 'guide2-3',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/20200804163522idfs9.jpg',
-      },
-      {
-        key: 'line',
-        name: 'LINE 轉帳',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/unnamed.webp',
-      },
-      {
-        key: 'cash_on_delivery',
-        name: '貨到付款',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/images.png',
-      },
-    ];
-  };
-
-  // 金流種類 (POS)
-  static posPayArray = () => {
-    return [
-      {
-        key: 'line_pay_scan',
-        name: 'Line Pay',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/tw-11134207-7r98t-ltrond04grjj74.jpeg',
-      },
-      {
-        key: 'ut_credit_card',
-        name: '聯合信用卡',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/unnamed (1) copy.jpg',
-      },
-    ];
-  };
-
   // 彈窗: 貨到付款 (線下)
   static cashOnDelivery(gvc: GVC, keyData: any) {
     keyData.cash_on_delivery = keyData.cash_on_delivery ?? { shipmentSupport: [] };
@@ -1737,7 +1669,7 @@ export class ShoppingFinanceSetting {
           ];
           if (vm.page === 'delivery_setting') {
             view = view.concat([
-              html`<div class="mx-2 mx-sm-0 mt-3 mb-0">
+              html`<div class="px-md-0 px-2">
                 ${BgWidget.normalInsignia(
                   '設定支援的配送方式，供消費者於前臺自行選擇合適的物流，另外可於商品頁面設定特定商品支援的配送'
                 )}
@@ -2471,7 +2403,7 @@ export class ShoppingFinanceSetting {
             );
           } else if (vm.page === 'delivery_track') {
             view = view.concat([
-              html` <div class="mx-2 mx-sm-0 mt-3 mb-0">
+              html` <div class="px-md-0 px-2">
                 ${BgWidget.normalInsignia('透過設定物流追蹤，可直接列印托運單進行出貨，並自動追蹤貨態')}
               </div>`,
               gvc.bindView(() => {

package/lowcode/cms-plugin/shopping-order-manager.js

@@ -34,6 +34,7 @@ import { ListHeaderOption } from './list-header-option.js';
 import { ShoppingInvoiceManager } from './shopping-invoice-manager.js';
 import { OrderModule } from './order/order-module.js';
 const html = String.raw;
+const css = String.raw;
 class OrderDetail {
     constructor(subtotal, shipment, newVoucher) {
         this.subtotal = subtotal;
@@ -208,8 +209,7 @@ export class ShoppingOrderManager {
         </div>
       </div>
       <div class="${query.isShipment ? '' : 'd-none'} mb-3"></div>
-      <div class="${query.isShipment ? 'd-none' : ''}">
-        ${BgWidget.tab(query.isPOS
+      ${BgWidget.tab(query.isPOS
             ? [
                 { title: '所有訂單', key: 'all' },
                 { title: 'POS訂單', key: 'pos' },
@@ -222,8 +222,7 @@ export class ShoppingOrderManager {
             ], gvc, vm.filter_type, text => {
             vm.filter_type = text;
             gvc.notifyDataChange(vm.id);
-        })}
-      </div>
+        }, query.isShipment ? 'display: none;' : '')}
       ${BgWidget.mainCard([
             gvc.bindView({
                 bind: glitter.getUUID(),
@@ -289,7 +288,7 @@ export class ShoppingOrderManager {
                                 }),
                             }),
                     ];
-                    const filterTags = ListComp.getFilterTags(yield FilterOptions.getOrderFunnel());
+                    const filterTags = ListComp.getFilterTags(orderFunnel);
                     return BgListComponent.listBarRWD(filterList, filterTags);
                 }),
             }),
@@ -866,6 +865,9 @@ export class ShoppingOrderManager {
                                                     }
                                                     gvc.closeDialog();
                                                     orders.forEach(order => {
+                                                        if (['wait', 'returns', undefined].includes(progress)) {
+                                                            order.orderData.user_info.shipment_number = '';
+                                                        }
                                                         order.orderData.progress = progress;
                                                     });
                                                     updateOrders(orders);
@@ -1024,7 +1026,6 @@ export class ShoppingOrderManager {
                         });
                         orderData = structuredClone(orderDataNew.response.data[0]);
                         originData = structuredClone(orderData);
-                        console.log('orderDataNew.response.data -- ', orderDataNew.response.data);
                     }
                     orderData.orderData.progress = (_b = orderData.orderData.progress) !== null && _b !== void 0 ? _b : 'wait';
                     if (orderData.orderData.shipment_selector &&
@@ -1086,9 +1087,19 @@ export class ShoppingOrderManager {
                         });
                     }
                     const funBTN = () => {
-                        gvc.addStyle(html `
-            .funInsignia{ border-radius: 10px; background: #EAEAEA; display: flex; padding: 6px 18px; justify-content:
-            center; align-items: center; gap: 8px; font-size: 16px; font-weight: 700; cursor: pointer; }
+                        gvc.addStyle(css `
+            .funInsignia {
+              border-radius: 10px;
+              background: #eaeaea;
+              display: flex;
+              padding: 6px 18px;
+              justify-content: center;
+              align-items: center;
+              gap: 8px;
+              font-size: 16px;
+              font-weight: 700;
+              cursor: pointer;
+            }
           `);
                         return {
                             splitOrder: () => {
@@ -1096,7 +1107,9 @@ export class ShoppingOrderManager {
                 class="funInsignia"
                 style=""
                 onclick="${gvc.event(() => {
-                                    console.log('orderData -- ', orderData);
+                                    if (orderData.orderData.orderSource == 'split') {
+                                        return;
+                                    }
                                     OrderSetting.splitOrder(gvc, orderData.orderData, () => gvc.notifyDataChange(vm.id));
                                 })}"
               >
@@ -1190,27 +1203,41 @@ export class ShoppingOrderManager {
                           </div>
                           ${BgWidget.mbContainer(12)}
                           <div class="ms-auto w-100">
-                            ${EditorElem.select({
-                                                    title: '',
-                                                    gvc: gvc,
-                                                    def: `${orderData.orderData.progress}`,
-                                                    array: ApiShop.getProgressArray(orderData.orderData.user_info.shipment_number),
-                                                    readonly: orderData.orderData.user_info.shipment_refer === 'paynow' || is_archive,
-                                                    callback: text => {
+                            ${BgWidget.select({
+                                                    gvc,
+                                                    default: (() => {
+                                                        if (!orderData.orderData.progress) {
+                                                            return 'wait';
+                                                        }
+                                                        if (orderData.orderData.progress === 'wait' &&
+                                                            orderData.orderData.user_info.shipment_number) {
+                                                            return 'in_stock';
+                                                        }
+                                                        return orderData.orderData.progress;
+                                                    })(),
+                                                    options: OrderSetting.getShippmentOpt(),
+                                                    callback: (text) => {
+                                                        const emptyStatus = ['wait', 'returns', undefined, ''];
+                                                        const addNumberStatus = ['arrived', 'finish', 'shipping', 'in_stock'];
                                                         function next() {
                                                             if (text && text !== `${orderData.orderData.progress}`) {
                                                                 orderData.orderData.progress = text;
                                                             }
                                                         }
-                                                        if (['', 'wait'].includes(orderData.orderData.progress) &&
-                                                            !orderData.orderData.user_info.shipment_number &&
-                                                            text !== 'pre_order') {
+                                                        if (emptyStatus.includes(orderData.orderData.progress) &&
+                                                            addNumberStatus.includes(text) &&
+                                                            !orderData.orderData.user_info.shipment_number) {
                                                             dialog.checkYesOrNot({
                                                                 text: '尚未新增出貨單，是否隨機取號並變更出貨狀態?',
                                                                 callback: response => {
                                                                     if (response) {
-                                                                        orderData.orderData.user_info.shipment_number = new Date().getTime();
                                                                         next();
+                                                                        orderData.orderData.user_info.shipment_number = emptyStatus.includes(text)
+                                                                            ? ''
+                                                                            : `${new Date().getTime()}`;
+                                                                        if (orderData.orderData.progress === 'in_stock') {
+                                                                            orderData.orderData.progress = 'wait';
+                                                                        }
                                                                         saveEvent();
                                                                     }
                                                                     gvc.notifyDataChange('Edit');
@@ -1221,6 +1248,7 @@ export class ShoppingOrderManager {
                                                             next();
                                                         }
                                                     },
+                                                    readonly: orderData.orderData.user_info.shipment_refer === 'paynow' || is_archive,
                                                 })}
                           </div>`,
                                                 html ` <div class="tx_700">配送方式</div>
@@ -1444,8 +1472,9 @@ export class ShoppingOrderManager {
                                                     'FAMIC2C',
                                                     'OKMARTC2C',
                                                     'HILIFEC2C',
-                                                    'normal',
                                                     'UNIMARTFREEZE',
+                                                    'FAMIC2CFREEZE',
+                                                    'normal',
                                                     'black_cat',
                                                     'black_cat_freezing',
                                                 ].includes(orderData.orderData.user_info.shipment)
@@ -1508,7 +1537,14 @@ export class ShoppingOrderManager {
                                                     const formData = (orderData.orderData.shipment_selector || OrderModule.supportShipmentMethod()).find(dd => {
                                                         return dd.value === orderData.orderData.user_info.shipment;
                                                     });
-                                                    if (['UNIMARTC2C', 'FAMIC2C', 'OKMARTC2C', 'HILIFEC2C', 'UNIMARTFREEZE'].includes(orderData.orderData.user_info.shipment)) {
+                                                    if ([
+                                                        'UNIMARTC2C',
+                                                        'FAMIC2C',
+                                                        'OKMARTC2C',
+                                                        'HILIFEC2C',
+                                                        'UNIMARTFREEZE',
+                                                        'FAMIC2CFREEZE',
+                                                    ].includes(orderData.orderData.user_info.shipment)) {
                                                         return html `
                                   <div class="d-flex flex-wrap">
                                     <span class="me-2">門市名稱:</span>
@@ -1769,7 +1805,7 @@ export class ShoppingOrderManager {
                     ${document.body.clientWidth > 768 ? getBadgeList() : ''}
                   </div>
                   ${document.body.clientWidth > 768 ? '' : html ` <div class="mt-1 mb-3">${getBadgeList()}</div>`}
-                  <div class="d-none justify-content-end">${funBTN().splitOrder()}</div>
+                  <div class="d-flex justify-content-end">${funBTN().splitOrder()}</div>
                   ${BgWidget.container1x2({
                                     html: [
                                         !is_shipment ? '' : shipment_card,
@@ -1791,16 +1827,23 @@ export class ShoppingOrderManager {
                                                 var _a;
                                                 return dd.value == ((_a = orderData.orderData.orderStatus) !== null && _a !== void 0 ? _a : '0');
                                             })) === null || _a === void 0 ? void 0 : _a.title
-                                            : EditorElem.select({
+                                            : BgWidget.select({
                                                 title: '',
                                                 gvc: gvc,
-                                                def: (_b = orderData.orderData.orderStatus) !== null && _b !== void 0 ? _b : '0',
-                                                array: [
+                                                default: (_b = orderData.orderData.orderStatus) !== null && _b !== void 0 ? _b : '0',
+                                                options: [
                                                     {
                                                         title: '變更訂單狀態',
                                                         value: '',
                                                     },
-                                                ].concat(ApiShop.getOrderStatusArray()),
+                                                ]
+                                                    .concat(ApiShop.getOrderStatusArray())
+                                                    .map(item => {
+                                                    return {
+                                                        key: item.value,
+                                                        value: item.title,
+                                                    };
+                                                }),
                                                 callback: text => {
                                                     orderData.orderData.orderStatus = orderData.orderData.orderStatus || '0';
                                                     if (text && text !== orderData.orderData.orderStatus) {
@@ -1880,10 +1923,8 @@ export class ShoppingOrderManager {
                                         <div>$${dd.sale_price.toLocaleString()} × ${dd.count}</div>
                                       </div>
                                       <div
-                                        class="tx_normal d-sm-none d-flex flex-column"
-                                        style="display: flex;justify-content: end;${document.body.clientWidth > 800
-                                                        ? 'width: 110px'
-                                                        : 'width: 140px'}"
+                                        class="tx_normal d-sm-none d-flex flex-column align-items-end justify-content-end"
+                                        style="min-width: 110px"
                                       >
                                         ${dd.origin_price && dd.origin_price > dd.sale_price
                                                         ? html ` <div style="margin-right: 6px; text-decoration: line-through;">
@@ -1892,7 +1933,6 @@ export class ShoppingOrderManager {
                                                         : ''}
                                         <div>$${dd.sale_price.toLocaleString()} × ${dd.count}</div>
                                       </div>
-
                                       <div
                                         class="tx_normal d-none d-sm-flex"
                                         style="display: flex;justify-content: end;${document.body.clientWidth > 800
@@ -2149,16 +2189,23 @@ export class ShoppingOrderManager {
                                                         .find(dd => {
                                                         return dd.value === `${orderData.status}`;
                                                     })) === null || _d === void 0 ? void 0 : _d.title
-                                                    : EditorElem.select({
+                                                    : BgWidget.select({
                                                         title: '',
                                                         gvc: gvc,
-                                                        def: `${orderData.status}`,
-                                                        array: [
+                                                        default: `${orderData.status}`,
+                                                        options: [
                                                             {
                                                                 title: '變更付款狀態',
                                                                 value: '',
                                                             },
-                                                        ].concat(ApiShop.getStatusArray(orderData.orderData.proof_purchase)),
+                                                        ]
+                                                            .concat(ApiShop.getStatusArray(orderData.orderData.proof_purchase))
+                                                            .map(item => {
+                                                            return {
+                                                                key: item.value,
+                                                                value: item.title,
+                                                            };
+                                                        }),
                                                         callback: text => {
                                                             dialog.checkYesOrNot({
                                                                 text: '是否確認變更付款狀態?',
@@ -2317,6 +2364,41 @@ export class ShoppingOrderManager {
                                                 .filter(Boolean)
                                                 .join(BgWidget.mbContainer(18))),
                                         is_shipment ? '' : shipment_card,
+                                        BgWidget.mainCard(gvc.bindView((() => {
+                                            const id = gvc.glitter.getUUID();
+                                            return {
+                                                bind: id,
+                                                view: () => {
+                                                    var _a;
+                                                    return html `
+                                    <div class="d-flex align-items-center justify-content-between">
+                                      <div>
+                                        <div style="color: #393939; font-weight: 700;">訂單標籤</div>
+                                        ${BgWidget.grayNote('操作後台人員登記與分類用，不會顯示於前台')}
+                                        ${BgWidget.mbContainer(4)}
+                                      </div>
+                                      ${BgWidget.blueNote('使用現有標籤', gvc.event(() => {
+                                                        var _a;
+                                                        OrderModule.useOrderTags({
+                                                            gvc,
+                                                            config_key: 'order_manager_tags',
+                                                            def: (_a = orderData.orderData.tags) !== null && _a !== void 0 ? _a : [],
+                                                            callback: tags => {
+                                                                orderData.orderData.tags = tags;
+                                                                gvc.notifyDataChange(id);
+                                                            },
+                                                        });
+                                                    }))}
+                                    </div>
+                                    ${BgWidget.multipleInput(gvc, (_a = orderData.orderData.tags) !== null && _a !== void 0 ? _a : [], {
+                                                        save: def => {
+                                                            orderData.orderData.tags = [...new Set(def)];
+                                                        },
+                                                    }, true)}
+                                  `;
+                                                },
+                                            };
+                                        })())),
                                         BgWidget.mainCard(gvc.bindView(() => {
                                             const vm = {
                                                 edit_mode: false,
@@ -2652,7 +2734,7 @@ export class ShoppingOrderManager {
                                                                         return viewModel
                                                                             .map(item => {
                                                                             return html `
-                                                        <div>
+                                                        <div style="word-break: break-all;">
                                                           ${item[0]} :
                                                           ${orderData.orderData.user_info[item[1]] || '未填寫'}
                                                         </div>
@@ -2684,6 +2766,7 @@ export class ShoppingOrderManager {
                                                             case 'OKMARTC2C':
                                                             case 'UNIMARTC2C':
                                                             case 'UNIMARTFREEZE':
+                                                            case 'FAMIC2CFREEZE':
                                                                 return [
                                                                     html ` <div class="d-flex flex-wrap w-100">
                                                   <span class="me-2 fw-normal fs-6">門市名稱:</span>
@@ -3331,6 +3414,7 @@ export class ShoppingOrderManager {
                             count: (_b = variant.qty) !== null && _b !== void 0 ? _b : '1',
                             sale_price: variant.sale_price,
                             sku: variant.sku,
+                            deduction_log: {},
                         });
                         orderDetail.subtotal +=
                             Number(orderDetail.lineItems[index].count) * orderDetail.lineItems[index].sale_price;