ts-glitter 21.3.8 → 21.3.9

package/lowcode/cms-plugin/module/order-excel.ts

@@ -63,6 +63,7 @@ export class OrderExcel {
         '訂單使用購物金',
         '分銷連結代碼',
         '分銷連結名稱',
+        'FB廣告追蹤碼',
       ],
       商品: ['商品名稱', '商品規格', '商品SKU', '商品購買數量', '商品價格', '商品折扣'],
       顧客: [
@@ -216,9 +217,22 @@ export class OrderExcel {
 
     // 訂單欄位物件
     const getOrderJSON = (order: any, orderData: any) => {
+      const formatOrderSource = (() => {
+        if (orderData.fbp) return 'FB廣告';
+        if (!orderData.orderSource) return '線上';
+
+        const source: Record<string, string> = {
+          pos: 'POS',
+          combine: '合併訂單',
+          split: '拆分訂單',
+          manual: '手動新增',
+        };
+        return source[orderData.orderSource] ?? '線上';
+      })();
+
       return formatJSON({
         訂單編號: order.cart_token,
-        訂單來源: orderData.orderSource === 'POS' ? 'POS' : '手動',
+        訂單來源: formatOrderSource,
         訂單建立時間: formatDate(order.created_time),
         會員信箱: order.email ?? 'no-email',
         訂單處理狀態: getStatusLabel(orderData.orderStatus, { '-1': '已取消', '1': '已完成', '0': '處理中' }, '處理中'),
@@ -247,6 +261,7 @@ export class OrderExcel {
         訂單總計: orderData.total,
         分銷連結代碼: orderData.distribution_info?.code ?? '',
         分銷連結名稱: orderData.distribution_info?.title ?? '',
+        FB廣告追蹤碼: orderData.fbp,
       });
     };
 
@@ -410,7 +425,8 @@ export class OrderExcel {
 
   // 取得客製化資訊
   static getCustomizeMap = async (order?: any) => {
-    const [cashflowConfigObj, shipmentConfigObj, registerConfig, memberConfig ,receipt] = await OrderExcel.customizePromise();
+    const [cashflowConfigObj, shipmentConfigObj, registerConfig, memberConfig, receipt] =
+      await OrderExcel.customizePromise();
     const customizeMap = new Map();
 
     const getUserValue = (key: string) => {
@@ -468,7 +484,7 @@ export class OrderExcel {
       ) {
         customizeMap.set(`收件人資訊 - ${d1.title}`, order ? (order.orderData.user_info[d1.key] ?? '-') : '-');
       }
-    })
+    });
     return customizeMap;
   };
 
@@ -1024,12 +1040,7 @@ export class OrderExcel {
         return Array.isArray(r.response.value.list) ? r.response.value.list : [];
       }),
       //收件人資料
-      (
-        await ApiUser.getPublicConfig(
-          'custom_form_checkout_recipient',
-          'manager'
-        )
-      ).response.value
+      (await ApiUser.getPublicConfig('custom_form_checkout_recipient', 'manager')).response.value,
     ]);
 
     return dataArray;

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

@@ -298,12 +298,13 @@ export class ProductSetting {
                                                                 }
                                                             })}"
                                                       onchange="${gvc.event(e => {
-                                                                data['stockList'][item.id].count = e.value;
+                                                                data['stockList'][item.id].count = Number(e.value);
                                                                 let count = 0;
                                                                 Object.values(data['stockList']).map((stock) => {
                                                                     count += parseInt(stock.count, 10);
                                                                 });
                                                                 data['stock'] = count;
+                                                                console.log("data -- ", data);
                                                                 gvc.notifyDataChange(vm.id);
                                                             })}"
                                                     />

package/lowcode/cms-plugin/module/product-setting.ts

@@ -328,13 +328,14 @@ export class ProductSetting {
                                                         }
                                                       })}"
                                                       onchange="${gvc.event(e => {
-                                                        (data as any)['stockList'][item.id].count = e.value;
+                                                        (data as any)['stockList'][item.id].count = Number(e.value);
                                                         let count = 0;
                                                         Object.values((data as any)['stockList']).map((stock: any) => {
                                                           count += parseInt(stock.count, 10);
                                                         });
 
                                                         data['stock'] = count;
+                                                        console.log("data -- " , data);
                                                         gvc.notifyDataChange(vm.id);
                                                       })}"
                                                     />

package/lowcode/cms-plugin/module/user-excel.js

@@ -124,7 +124,7 @@ export class UserExcel {
                 return formatJSON({
                     最後購買日期: formatDate(user.latest_order_date),
                     最後消費金額: user.latest_order_total,
-                    最後出貨日期: user.firstShipment ? formatDate(user.firstShipment.orderData.user_info.shipment_date) : '無',
+                    最後出貨日期: user.last_has_shipment_number_date ? formatDate(user.last_has_shipment_number_date) : '無',
                     累積消費金額: user.checkout_total,
                     累積消費次數: user.checkout_count,
                 });

package/lowcode/cms-plugin/module/user-excel.ts

@@ -50,7 +50,7 @@ interface User {
   latest_order_total: number;
   rebate: number;
   member_deadline: string;
-  firstShipment: any;
+  last_has_shipment_number_date: string;
 }
 
 export class UserExcel {
@@ -233,7 +233,7 @@ export class UserExcel {
       return formatJSON({
         最後購買日期: formatDate(user.latest_order_date),
         最後消費金額: user.latest_order_total,
-        最後出貨日期: user.firstShipment ? formatDate(user.firstShipment.orderData.user_info.shipment_date) : '無',
+        最後出貨日期: user.last_has_shipment_number_date ? formatDate(user.last_has_shipment_number_date) : '無',
         累積消費金額: user.checkout_total,
         累積消費次數: user.checkout_count,
       });

package/lowcode/cms-plugin/pos-pages/payment-page.js

@@ -460,8 +460,9 @@ export class PaymentPage {
                                                                     return new Promise(resolve => {
                                                                         ApiUser.getUserList({
                                                                             page: 0,
-                                                                            limit: 50,
+                                                                            limit: 99999,
                                                                             search: data.query,
+                                                                            only_id: true,
                                                                         }).then(dd => {
                                                                             if (dd.response.data) {
                                                                                 resolve(dd.response.data.map((item) => {
@@ -2201,7 +2202,7 @@ export class PaymentPage {
                         placeholder="請輸入統一編號"
                         value="${c_vm.value}"
                         onclick="${gvc.event(() => {
-                                PosFunction.setMoney(gvc, c_vm.value || '0', (text) => {
+                                PosFunction.setMoney(gvc, c_vm.value || '0', text => {
                                     c_vm.value = `${text}`;
                                     gvc.recreateView();
                                 }, '統一編號');

package/lowcode/cms-plugin/pos-pages/payment-page.ts

@@ -520,8 +520,9 @@ export class PaymentPage {
                                               return new Promise(resolve => {
                                                 ApiUser.getUserList({
                                                   page: 0,
-                                                  limit: 50,
+                                                  limit: 99999,
                                                   search: data.query,
+                                                  only_id: true,
                                                 }).then(dd => {
                                                   if (dd.response.data) {
                                                     resolve(
@@ -2394,10 +2395,15 @@ export class PaymentPage {
                         placeholder="請輸入統一編號"
                         value="${c_vm.value}"
                         onclick="${gvc.event(() => {
-                          PosFunction.setMoney(gvc,c_vm.value || '0',(text)=>{
-                            c_vm.value=`${text}`
-                            gvc.recreateView()
-                          },'統一編號')
+                          PosFunction.setMoney(
+                            gvc,
+                            c_vm.value || '0',
+                            text => {
+                              c_vm.value = `${text}`;
+                              gvc.recreateView();
+                            },
+                            '統一編號'
+                          );
                         })}"
                         readonly
                       />

package/lowcode/cms-plugin/pos-pages/products-page.ts

@@ -6,7 +6,6 @@ import { POSSetting } from '../POS-setting.js';
 import { Swal } from '../../modules/sweetAlert.js';
 import { PaymentPage } from './payment-page.js';
 import { PayConfig } from './pay-config.js';
-import { fa } from '@faker-js/faker';
 
 const html = String.raw;
 

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

@@ -83,15 +83,16 @@ export class ShoppingAllowanceManager {
               <div class="flex-fill"></div>
               <div style="display: flex; gap: 14px;">
                 ${BgWidget.grayButton('匯出', gvc.event(() => {
+                        const limit = 1000;
                         let dialog = new ShareDialog(glitter);
                         dialog.warningMessage({
-                            text: `系統將以目前列表搜尋的訂單結果匯出<br />最多匯出1000筆資料，是否匯出？`,
+                            text: `系統將以目前列表搜尋的訂單結果匯出<br />最多匯出${limit}筆資料，是否匯出？`,
                             callback: bool => {
                                 if (bool) {
                                     dialog.dataLoading({ visible: true });
                                     ApiShop.getInvoice({
                                         page: 0,
-                                        limit: 1000,
+                                        limit: limit,
                                         search: vm.query || undefined,
                                         searchType: vm.queryType || 'cart_token',
                                         orderString: vm.orderString,

package/lowcode/cms-plugin/shopping-allowance-manager.ts

@@ -126,15 +126,16 @@ export class ShoppingAllowanceManager {
                 ${BgWidget.grayButton(
                   '匯出',
                   gvc.event(() => {
+                    const limit = 1000;
                     let dialog = new ShareDialog(glitter);
                     dialog.warningMessage({
-                      text: `系統將以目前列表搜尋的訂單結果匯出<br />最多匯出1000筆資料，是否匯出？`,
+                      text: `系統將以目前列表搜尋的訂單結果匯出<br />最多匯出${limit}筆資料，是否匯出？`,
                       callback: bool => {
                         if (bool) {
                           dialog.dataLoading({ visible: true });
                           ApiShop.getInvoice({
                             page: 0,
-                            limit: 1000,
+                            limit: limit,
                             search: vm.query || undefined,
                             searchType: vm.queryType || 'cart_token',
                             orderString: vm.orderString,

package/lowcode/cms-plugin/shopping-discount-setting.js

@@ -429,6 +429,7 @@ export class ShoppingDiscountSetting {
                                                                     limit: 99999,
                                                                     search: data.query,
                                                                     orderString: data.orderString,
+                                                                    only_id: true,
                                                                 }).then(dd => {
                                                                     if (dd.response.data) {
                                                                         resolve(dd.response.data.map((item) => {
@@ -470,6 +471,7 @@ export class ShoppingDiscountSetting {
                                                             page: 0,
                                                             limit: 99999,
                                                             id: voucherData.targetList.join(','),
+                                                            only_id: true,
                                                         }).then(dd => {
                                                             if (dd.response.data) {
                                                                 customVM.dataList = dd.response.data.map((item) => {

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

@@ -556,6 +556,7 @@ export class ShoppingDiscountSetting {
                                                   limit: 99999,
                                                   search: data.query,
                                                   orderString: data.orderString,
+                                                  only_id: true,
                                                 }).then(dd => {
                                                   if (dd.response.data) {
                                                     resolve(
@@ -609,6 +610,7 @@ export class ShoppingDiscountSetting {
                                       page: 0,
                                       limit: 99999,
                                       id: voucherData.targetList.join(','),
+                                      only_id: true,
                                     }).then(dd => {
                                       if (dd.response.data) {
                                         customVM.dataList = dd.response.data.map(

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

@@ -129,14 +129,15 @@ export class ShoppingInvoiceManager {
               <div class="flex-fill"></div>
               <div style="display: flex; gap: 14px;">
                 ${BgWidget.grayButton('匯出', gvc.event(() => {
+                        const limit = 1000;
                         dialog.warningMessage({
-                            text: `系統將以目前列表搜尋的訂單結果匯出<br />最多匯出1000筆資料，是否匯出？`,
+                            text: `系統將以目前列表搜尋的訂單結果匯出<br />最多匯出${limit}筆資料，是否匯出？`,
                             callback: bool => {
                                 if (bool) {
                                     dialog.dataLoading({ visible: true });
                                     ApiShop.getInvoice({
                                         page: 0,
-                                        limit: 1000,
+                                        limit: limit,
                                         search: vm.query || undefined,
                                         searchType: vm.queryType || 'order_number',
                                         orderString: vm.orderString,
@@ -444,7 +445,7 @@ export class ShoppingInvoiceManager {
         }).then((response) => {
             orderData_ = response.response;
             orderData_.orderData.user_info = invoiceData.invoice_data.original_data;
-            orderData_.orderData.user_info.print_invoice = (invoiceData.invoice_data.original_data.Print);
+            orderData_.orderData.user_info.print_invoice = invoiceData.invoice_data.original_data.Print;
             dataLoading = false;
             gvc.notifyDataChange([mainViewID, 'invoiceContent']);
         });
@@ -505,7 +506,9 @@ export class ShoppingInvoiceManager {
                                 const orderData = invoiceData.invoice_data.orderData || orderData_.orderData;
                                 console.log(`orderData_.orderData===>`, orderData_.orderData);
                                 console.log(`invoiceData.invoice_data.orderData=>`, invoiceData.invoice_data);
-                                orderData.user_info.invoice_type = invoiceData.invoice_data.original_data.CustomerIdentifier ? `company` : `customer`;
+                                orderData.user_info.invoice_type = invoiceData.invoice_data.original_data.CustomerIdentifier
+                                    ? `company`
+                                    : `customer`;
                                 orderData.user_info.company = invoiceData.invoice_data.original_data.CustomerName;
                                 orderData.user_info.print_invoice = invoiceData.invoice_data.original_data.Print;
                                 let tax_total = (() => {

package/lowcode/cms-plugin/shopping-invoice-manager.ts

@@ -173,14 +173,15 @@ export class ShoppingInvoiceManager {
                 ${BgWidget.grayButton(
                   '匯出',
                   gvc.event(() => {
+                    const limit = 1000;
                     dialog.warningMessage({
-                      text: `系統將以目前列表搜尋的訂單結果匯出<br />最多匯出1000筆資料，是否匯出？`,
+                      text: `系統將以目前列表搜尋的訂單結果匯出<br />最多匯出${limit}筆資料，是否匯出？`,
                       callback: bool => {
                         if (bool) {
                           dialog.dataLoading({ visible: true });
                           ApiShop.getInvoice({
                             page: 0,
-                            limit: 1000,
+                            limit: limit,
                             search: vm.query || undefined,
                             searchType: vm.queryType || 'order_number',
                             orderString: vm.orderString,
@@ -494,7 +495,6 @@ export class ShoppingInvoiceManager {
   public static replaceOrder(gvc: GVC, vm: any, searchOrder?: any) {
     const glitter = gvc.glitter;
 
-
     let orderData_: {
       id: number;
       cart_token: string;
@@ -537,7 +537,7 @@ export class ShoppingInvoiceManager {
           MerchantTradeNo: string;
           CVSAddress: string;
           note?: string;
-          print_invoice?:string;
+          print_invoice?: string;
           code_note?: string;
           gui_number?: string;
         };
@@ -583,7 +583,7 @@ export class ShoppingInvoiceManager {
     };
     const mainViewID = gvc.glitter.getUUID();
     let dataLoading = true;
-const invoiceData=vm.invoiceData;
+    const invoiceData = vm.invoiceData;
     ApiShop.getOrder({
       page: 0,
       limit: 100,
@@ -593,8 +593,8 @@ const invoiceData=vm.invoiceData;
     }).then((response: any) => {
       orderData_ = response.response;
 
-      orderData_.orderData.user_info=invoiceData.invoice_data.original_data;
-      orderData_.orderData.user_info.print_invoice=(invoiceData.invoice_data.original_data.Print)
+      orderData_.orderData.user_info = invoiceData.invoice_data.original_data;
+      orderData_.orderData.user_info.print_invoice = invoiceData.invoice_data.original_data.Print;
       dataLoading = false;
       gvc.notifyDataChange([mainViewID, 'invoiceContent']);
     });
@@ -663,9 +663,11 @@ const invoiceData=vm.invoiceData;
                   const orderData = invoiceData.invoice_data.orderData || orderData_.orderData;
                   console.log(`orderData_.orderData===>`, orderData_.orderData);
                   console.log(`invoiceData.invoice_data.orderData=>`, invoiceData.invoice_data);
-                  orderData.user_info.invoice_type=invoiceData.invoice_data.original_data.CustomerIdentifier ? `company`:`customer`
-                  orderData.user_info.company=invoiceData.invoice_data.original_data.CustomerName
-                  orderData.user_info.print_invoice=invoiceData.invoice_data.original_data.Print;
+                  orderData.user_info.invoice_type = invoiceData.invoice_data.original_data.CustomerIdentifier
+                    ? `company`
+                    : `customer`;
+                  orderData.user_info.company = invoiceData.invoice_data.original_data.CustomerName;
+                  orderData.user_info.print_invoice = invoiceData.invoice_data.original_data.Print;
                   let tax_total = (() => {
                     let total = 0;
                     orderData.lineItems
@@ -1588,7 +1590,6 @@ ${reason}</textarea
                             ),
                           ];
 
-                          
                           if (
                             invoiceData.invoice_data.original_data.Print === '1' &&
                             (window.parent as any).glitter.share.PayConfig.posType === 'SUNMI'

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

@@ -336,6 +336,7 @@ export class ShoppingOrderManager {
                                         page: 0,
                                         limit: 99999,
                                         filter_type: 'watch',
+                                        only_id: true,
                                     }),
                                 ]).then(dataArray => {
                                     return [dataArray[0], dataArray[1].response.data];
@@ -2603,16 +2604,31 @@ export class ShoppingOrderManager {
                         ${[
                                         BgWidget.mainCard(html `
                             <div style="font-size: 16px;font-weight: 700;">訂單來源</div>
-                            <div>
+                            <div class="d-flex flex-column gap-1 mt-1">
                               ${(() => {
                                             var _a;
+                                            if (orderData.orderData.fbp) {
+                                                return html `
+                                    <div>FB廣告</div>
+                                    ${BgWidget.blueNote(html `複製追蹤碼<i class="fa-regular fa-copy ms-1"></i>`, gvc.event(() => {
+                                                    navigator.clipboard.writeText(`${orderData.orderData.fbp}`);
+                                                    BgWidget.jumpAlert({
+                                                        gvc,
+                                                        text: '複製成功',
+                                                        justify: 'top',
+                                                        align: 'center',
+                                                    });
+                                                }), 'font-weight: 500;')}
+                                  `;
+                                            }
                                             if (!orderData.orderData.orderSource) {
                                                 return '線上';
                                             }
                                             const source = {
                                                 pos: 'POS',
                                                 combine: '合併訂單',
-                                                split: '拆分',
+                                                split: '拆分訂單',
+                                                manual: '手動新增',
                                             };
                                             return (_a = source[orderData.orderData.orderSource]) !== null && _a !== void 0 ? _a : '線上';
                                         })()}
@@ -2923,7 +2939,7 @@ export class ShoppingOrderManager {
                       </div>`,
                                     ratio: 25,
                                 })}
-                <div style="height:240px;"></div>
+                  <div style="height:240px;"></div>
                   <div class="update-bar-container">
                     <div>
                       ${gvc.bindView(() => {
@@ -4056,8 +4072,9 @@ export class ShoppingOrderManager {
                                         return new Promise(resolve => {
                                             ApiUser.getUserList({
                                                 page: 0,
-                                                limit: 50,
+                                                limit: 99999,
                                                 search: data.query,
+                                                only_id: true,
                                             }).then(dd => {
                                                 if (dd.response.data) {
                                                     resolve(dd.response.data.map((item) => {

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

@@ -28,7 +28,6 @@ import { LineItem } from './module/data.js';
 import { OrderModule } from './order/order-module.js';
 import { TableStorage } from './module/table-storage.js';
 
-
 const html = String.raw;
 const css = String.raw;
 
@@ -196,11 +195,10 @@ export class ShoppingOrderManager {
           };
 
           return viewMap[vm.type]() ?? '';
-        }catch (e) {
-          console.error(e)
-          return `${e}`
+        } catch (e) {
+          console.error(e);
+          return `${e}`;
         }
-
       },
       onCreate: () => {
         if (vm.loading) {
@@ -405,6 +403,7 @@ export class ShoppingOrderManager {
                       page: 0,
                       limit: 99999,
                       filter_type: 'watch',
+                      only_id: true,
                     }),
                   ]).then(dataArray => {
                     return [dataArray[0], dataArray[1].response.data];
@@ -1066,7 +1065,7 @@ export class ShoppingOrderManager {
         let userData: any = {};
         let invoiceDataList: any = [];
         let storeList: any = [];
-        let mainViewId=gvc.glitter.getUUID();
+        let mainViewId = gvc.glitter.getUUID();
         let productData: any = [];
         let is_shipment = ['shipment_list_archive', 'shipment_list'].includes(
           (window as any).glitter.getUrlParameter('page')
@@ -1965,7 +1964,7 @@ export class ShoppingOrderManager {
                           return;
                         }
                         (window.parent as any).glitter.setUrlParameter('orderID', undefined);
-                        
+
                         if (backCallback) {
                           backCallback();
                         } else {
@@ -2873,15 +2872,34 @@ export class ShoppingOrderManager {
                         ${[
                           BgWidget.mainCard(html`
                             <div style="font-size: 16px;font-weight: 700;">訂單來源</div>
-                            <div>
+                            <div class="d-flex flex-column gap-1 mt-1">
                               ${(() => {
+                                if (orderData.orderData.fbp) {
+                                  return html`
+                                    <div>FB廣告</div>
+                                    ${BgWidget.blueNote(
+                                      html`複製追蹤碼<i class="fa-regular fa-copy ms-1"></i>`,
+                                      gvc.event(() => {
+                                        navigator.clipboard.writeText(`${orderData.orderData.fbp}`);
+                                        BgWidget.jumpAlert({
+                                          gvc,
+                                          text: '複製成功',
+                                          justify: 'top',
+                                          align: 'center',
+                                        });
+                                      }),
+                                      'font-weight: 500;'
+                                    )}
+                                  `;
+                                }
                                 if (!orderData.orderData.orderSource) {
                                   return '線上';
                                 }
                                 const source: Record<string, string> = {
                                   pos: 'POS',
                                   combine: '合併訂單',
-                                  split: '拆分',
+                                  split: '拆分訂單',
+                                  manual: '手動新增',
                                 };
                                 return source[orderData.orderData.orderSource] ?? '線上';
                               })()}
@@ -3219,7 +3237,7 @@ export class ShoppingOrderManager {
                       ratio: 25,
                     }
                   )}
-                <div style="height:240px;"></div>
+                  <div style="height:240px;"></div>
                   <div class="update-bar-container">
                     <div>
                       ${gvc.bindView(() => {
@@ -4426,8 +4444,9 @@ export class ShoppingOrderManager {
                                           return new Promise(resolve => {
                                             ApiUser.getUserList({
                                               page: 0,
-                                              limit: 50,
+                                              limit: 99999,
                                               search: data.query,
+                                              only_id: true,
                                             }).then(dd => {
                                               if (dd.response.data) {
                                                 resolve(