ts-glitter 21.3.7 → 21.3.9

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(

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

@@ -24,6 +24,7 @@ import { LanguageBackend } from './language-backend.js';
 import { ProductConfig } from './product-config.js';
 import { ShoppingSettingBasic } from './shopping-setting-basic.js';
 import { ShoppingSettingAdvance } from './shopping-setting-advance.js';
+import { ShoppingSettingStockLog } from './shopping-setting-stock-log.js';
 import { ProductInitial } from '../public-models/product.js';
 import { IminModule } from './pos-pages/imin-module.js';
 import { TableStorage } from './module/table-storage.js';
@@ -648,12 +649,7 @@ export class ShoppingProductSetting {
                                 const language_data = postMD.language_data[ShoppingProductSetting.select_language];
                                 imageLibrary.selectImageFromArray(language_data.preview_image, {
                                     gvc: gvc,
-                                    title: html ` <div
-                                      class="d-flex flex-column"
-                                      style="border-radius: 10px 10px 0px 0px;background: #F2F2F2;"
-                                    >
-                                      圖片庫
-                                    </div>`,
+                                    title: html ` <div class="d-flex flex-column" style="">圖片庫</div>`,
                                     getSelect: imageUrl => {
                                         variant[`preview_image_${ShoppingProductSetting.select_language}`] = imageUrl;
                                         gvc.notifyDataChange(id);
@@ -1292,6 +1288,34 @@ export class ShoppingProductSetting {
                             course: '課程',
                         };
                         const categoryTitle = categoryTitleMap[postMD.product_category] || '商品';
+                        const tabJsonData = {
+                            gvc: gvc,
+                            vm2: vm,
+                            vm: obj.vm,
+                            reload: () => {
+                                refreshProductPage();
+                            },
+                            language_data: languageData,
+                            postMD: postMD,
+                            shipment_config: shipment_config,
+                        };
+                        const tabMaps = {
+                            normal: {
+                                title: '基本設定',
+                                page: () => ShoppingSettingBasic.main(tabJsonData),
+                                visible: true,
+                            },
+                            advance: {
+                                title: '進階設定',
+                                page: () => ShoppingSettingAdvance.main(tabJsonData),
+                                visible: true,
+                            },
+                            stock_changed_logs: {
+                                title: '庫存異動',
+                                page: () => ShoppingSettingStockLog.main(tabJsonData),
+                                visible: false,
+                            },
+                        };
                         return [
                             BgWidget.container(html `
               <div class="title-container flex-column flex-sm-row">
@@ -1389,42 +1413,22 @@ export class ShoppingProductSetting {
                                 .join(html ` <div class="mx-1"></div>`)}
                 </div>
               </div>
-              ${BgWidget.tab([
-                                {
-                                    title: '基本設定',
-                                    key: 'normal',
-                                },
-                                {
-                                    title: '進階設定',
-                                    key: 'advance',
+              ${gvc.bindView({
+                                bind: gvc.glitter.getUUID(),
+                                view: () => {
+                                    return [
+                                        BgWidget.tab(Object.entries(tabMaps)
+                                            .map(([key, data]) => {
+                                            return { key, title: data.title, visible: data.visible };
+                                        })
+                                            .filter(data => data.visible), gvc, vm.show_page, text => {
+                                            vm.show_page = text;
+                                            gvc.notifyDataChange(vm.id);
+                                        }, 'margin-bottom: 0px;'),
+                                        tabMaps[vm.show_page].page(),
+                                    ].join('');
                                 },
-                            ], gvc, vm.show_page, text => {
-                                vm.show_page = text;
-                                gvc.notifyDataChange(vm.id);
-                            }, 'margin-bottom: 0px;')}
-              ${vm.show_page === 'normal'
-                                ? ShoppingSettingBasic.main({
-                                    gvc: gvc,
-                                    vm2: vm,
-                                    vm: obj.vm,
-                                    reload: () => {
-                                        refreshProductPage();
-                                    },
-                                    language_data: languageData,
-                                    postMD: postMD,
-                                    shipment_config: shipment_config,
-                                })
-                                : ShoppingSettingAdvance.main({
-                                    gvc: gvc,
-                                    vm2: vm,
-                                    vm: obj.vm,
-                                    reload: () => {
-                                        refreshProductPage();
-                                    },
-                                    language_data: languageData,
-                                    postMD: postMD,
-                                    shipment_config: shipment_config,
-                                })}
+                            })}
             `),
                             html ` <div class="update-bar-container">
               ${obj.type === 'replace'

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

@@ -15,6 +15,7 @@ import { LanguageBackend } from './language-backend.js';
 import { ProductConfig } from './product-config.js';
 import { ShoppingSettingBasic } from './shopping-setting-basic.js';
 import { ShoppingSettingAdvance } from './shopping-setting-advance.js';
+import { ShoppingSettingStockLog } from './shopping-setting-stock-log.js';
 import { ActiveSchedule, Product, ProductInitial } from '../public-models/product.js';
 import { IminModule } from './pos-pages/imin-module.js';
 import { TableStorage } from './module/table-storage.js';
@@ -741,12 +742,7 @@ export class ShoppingProductSetting {
                                   ];
                                   imageLibrary.selectImageFromArray(language_data.preview_image, {
                                     gvc: gvc,
-                                    title: html` <div
-                                      class="d-flex flex-column"
-                                      style="border-radius: 10px 10px 0px 0px;background: #F2F2F2;"
-                                    >
-                                      圖片庫
-                                    </div>`,
+                                    title: html` <div class="d-flex flex-column" style="">圖片庫</div>`,
                                     getSelect: imageUrl => {
                                       variant[`preview_image_${ShoppingProductSetting.select_language}`] = imageUrl;
                                       gvc.notifyDataChange(id);
@@ -1442,7 +1438,7 @@ export class ShoppingProductSetting {
       id: string;
       language: any;
       content_detail: any;
-      show_page: 'normal' | 'advance';
+      show_page: 'normal' | 'advance' | 'stock_changed_logs';
     } = {
       id: gvc.glitter.getUUID(),
       language: ShoppingProductSetting.select_language,
@@ -1554,6 +1550,37 @@ export class ShoppingProductSetting {
           };
 
           const categoryTitle = categoryTitleMap[postMD.product_category] || '商品';
+
+          const tabJsonData = {
+            gvc: gvc,
+            vm2: vm,
+            vm: obj.vm,
+            reload: () => {
+              refreshProductPage();
+            },
+            language_data: languageData,
+            postMD: postMD,
+            shipment_config: shipment_config,
+          };
+
+          const tabMaps = {
+            normal: {
+              title: '基本設定',
+              page: () => ShoppingSettingBasic.main(tabJsonData),
+              visible: true,
+            },
+            advance: {
+              title: '進階設定',
+              page: () => ShoppingSettingAdvance.main(tabJsonData),
+              visible: true,
+            },
+            stock_changed_logs: {
+              title: '庫存異動',
+              page: () => ShoppingSettingStockLog.main(tabJsonData),
+              visible: false,
+            },
+          };
+
           return [
             BgWidget.container(html`
               <div class="title-container flex-column flex-sm-row">
@@ -1665,48 +1692,28 @@ export class ShoppingProductSetting {
                     .join(html` <div class="mx-1"></div>`)}
                 </div>
               </div>
-              ${BgWidget.tab(
-                [
-                  {
-                    title: '基本設定',
-                    key: 'normal',
-                  },
-                  {
-                    title: '進階設定',
-                    key: 'advance',
-                  },
-                ],
-                gvc,
-                vm.show_page,
-                text => {
-                  vm.show_page = text as any;
-                  gvc.notifyDataChange(vm.id);
+              ${gvc.bindView({
+                bind: gvc.glitter.getUUID(),
+                view: () => {
+                  return [
+                    BgWidget.tab(
+                      Object.entries(tabMaps)
+                        .map(([key, data]) => {
+                          return { key, title: data.title, visible: data.visible };
+                        })
+                        .filter(data => data.visible),
+                      gvc,
+                      vm.show_page,
+                      text => {
+                        vm.show_page = text as any;
+                        gvc.notifyDataChange(vm.id);
+                      },
+                      'margin-bottom: 0px;'
+                    ),
+                    tabMaps[vm.show_page].page(),
+                  ].join('');
                 },
-                'margin-bottom: 0px;'
-              )}
-              ${vm.show_page === 'normal'
-                ? ShoppingSettingBasic.main({
-                    gvc: gvc,
-                    vm2: vm,
-                    vm: obj.vm,
-                    reload: () => {
-                      refreshProductPage();
-                    },
-                    language_data: languageData,
-                    postMD: postMD,
-                    shipment_config: shipment_config,
-                  })
-                : ShoppingSettingAdvance.main({
-                    gvc: gvc,
-                    vm2: vm,
-                    vm: obj.vm,
-                    reload: () => {
-                      refreshProductPage();
-                    },
-                    language_data: languageData,
-                    postMD: postMD,
-                    shipment_config: shipment_config,
-                  })}
+              })}
             `),
             html` <div class="update-bar-container">
               ${obj.type === 'replace'

package/lowcode/cms-plugin/shopping-rebate.js

@@ -44,7 +44,7 @@ export class ShoppingRebate {
                     if (status === 1) {
                         if (dataList.length === 0) {
                             dialog.checkYesOrNot({
-                                callback: (bool) => {
+                                callback: bool => {
                                     if (bool) {
                                         showUsersDialog(dataList, callback);
                                     }
@@ -54,7 +54,7 @@ export class ShoppingRebate {
                         }
                         else {
                             dialog.checkYesOrNot({
-                                callback: (bool) => {
+                                callback: bool => {
                                     if (bool) {
                                         callback(dataList);
                                     }
@@ -69,13 +69,14 @@ export class ShoppingRebate {
                 },
                 default: defaultValue,
                 api: (data) => {
-                    return new Promise((resolve) => {
+                    return new Promise(resolve => {
                         ApiUser.getUserListOrders({
                             page: 0,
                             limit: 99999,
                             search: data.query,
                             orderString: data.orderString,
-                        }).then((dd) => {
+                            only_id: true,
+                        }).then(dd => {
                             if (dd.response.data) {
                                 vm.dataList = dd.response.data
                                     .filter((item) => {
@@ -104,15 +105,15 @@ export class ShoppingRebate {
                 view: () => {
                     if (vm.type === 'list') {
                         return BgWidget.container(html `
-                                <div class="title-container">
-                                    ${BgWidget.title('購物金紀錄')}
-                                    <div class="flex-fill"></div>
-                                    ${BgWidget.darkButton('新增紀錄', gvc.event(() => {
+              <div class="title-container">
+                ${BgWidget.title('購物金紀錄')}
+                <div class="flex-fill"></div>
+                ${BgWidget.darkButton('新增紀錄', gvc.event(() => {
                             this.newRebateDialog({
                                 gvc: gvc,
                                 saveButton: {
-                                    event: (obj) => {
-                                        showUsersDialog([], (dataList) => {
+                                    event: obj => {
+                                        showUsersDialog([], dataList => {
                                             dialog.dataLoading({
                                                 text: '發送中...',
                                                 visible: true,
@@ -130,7 +131,7 @@ export class ShoppingRebate {
                                                 })(),
                                                 note: obj.note,
                                                 rebateEndDay: obj.rebateEndDay,
-                                            }).then((result) => {
+                                            }).then(result => {
                                                 dialog.dataLoading({ visible: false });
                                                 if (result.response.result) {
                                                     dialog.successMessage({ text: `設定成功` });
@@ -149,8 +150,8 @@ export class ShoppingRebate {
                                 },
                             });
                         }))}
-                                </div>
-                                ${BgWidget.container(BgWidget.mainCard([
+              </div>
+              ${BgWidget.container(BgWidget.mainCard([
                             BgWidget.searchPlace(gvc.event((e, event) => {
                                 vm.query = e.value;
                                 gvc.notifyDataChange(vm.id);
@@ -160,13 +161,13 @@ export class ShoppingRebate {
                                 view: () => {
                                     return BgWidget.tableV3({
                                         gvc: gvc,
-                                        getData: (vmi) => {
+                                        getData: vmi => {
                                             const limit = 15;
                                             ApiWallet.getRebate({
                                                 page: vmi.page - 1,
                                                 limit: limit,
                                                 search: vm.query || undefined,
-                                            }).then((data) => {
+                                            }).then(data => {
                                                 function getDatalist() {
                                                     return data.response.data.map((dd) => {
                                                         var _a, _b;
@@ -214,7 +215,10 @@ export class ShoppingRebate {
                                                                 key: '此筆可使用餘額',
                                                                 value: (() => {
                                                                     const now = new Date();
-                                                                    if (dd.origin > 0 && dd.remain > 0 && now > new Date(dd.created_at) && now < new Date(dd.deadline)) {
+                                                                    if (dd.origin > 0 &&
+                                                                        dd.remain > 0 &&
+                                                                        now > new Date(dd.created_at) &&
+                                                                        now < new Date(dd.deadline)) {
                                                                         return html `<span class="tx_700 text-success">+ ${dd.remain}</span>`;
                                                                     }
                                                                     return html `<span class="tx_700">0</span>`;
@@ -222,7 +226,9 @@ export class ShoppingRebate {
                                                             },
                                                             {
                                                                 key: '備註',
-                                                                value: `<span class="fs-7">${typeof dd.note === 'string' ? dd.note : (_b = (dd.note && dd.note.note)) !== null && _b !== void 0 ? _b : '尚未填寫備註'}</span>`,
+                                                                value: `<span class="fs-7">${typeof dd.note === 'string'
+                                                                    ? dd.note
+                                                                    : ((_b = (dd.note && dd.note.note)) !== null && _b !== void 0 ? _b : '尚未填寫備註')}</span>`,
                                                             },
                                                             {
                                                                 key: '建立時間',
@@ -248,7 +254,7 @@ export class ShoppingRebate {
                                 },
                             }),
                         ].join('')) + BgWidget.mbContainer(120))}
-                            `);
+            `);
                     }
                     else if (vm.type == 'replace') {
                         return UserList.userInformationDetail({
@@ -268,7 +274,7 @@ export class ShoppingRebate {
     static newRebateDialog(obj) {
         const html = String.raw;
         const gvc = obj.gvc;
-        return gvc.glitter.innerDialog((gvc2) => {
+        return gvc.glitter.innerDialog(gvc2 => {
             const vm = {
                 type: 'add',
                 value: '0',
@@ -276,18 +282,18 @@ export class ShoppingRebate {
                 rebateEndDay: '0',
             };
             return html `<div class="modal-content bg-white rounded-3 p-2" style="max-width: 90%; width: 400px;">
-                <div>
-                    <div style="height: 50px; margin-bottom: 16px" class="d-flex align-items-center border-bottom">
-                        <span class="ps-2 tx_700">新增紀錄</span>
-                    </div>
-                    ${gvc.bindView(() => {
+        <div>
+          <div style="height: 50px; margin-bottom: 16px" class="d-flex align-items-center border-bottom">
+            <span class="ps-2 tx_700">新增紀錄</span>
+          </div>
+          ${gvc.bindView(() => {
                 const id = gvc.glitter.getUUID();
                 return {
                     bind: id,
                     view: () => {
                         return [
                             html `<div>
-                                        ${EditorElem.radio({
+                    ${EditorElem.radio({
                                 title: html `<h6 class="tx_700">類型</h6>`,
                                 gvc: gvc,
                                 def: vm.type,
@@ -295,55 +301,55 @@ export class ShoppingRebate {
                                     { title: '新增', value: 'add' },
                                     { title: '減少', value: 'minus' },
                                 ],
-                                callback: (text) => {
+                                callback: text => {
                                     vm.type = text;
                                     gvc.notifyDataChange(id);
                                 },
                             })}
-                                    </div>`,
+                  </div>`,
                             html `<div class="row mt-2">
-                                        <div class="col-6">
-                                            ${EditorElem.editeInput({
+                    <div class="col-6">
+                      ${EditorElem.editeInput({
                                 title: html `<h6 class="tx_700">金額</h6>`,
                                 gvc: gvc,
                                 default: vm.value,
                                 type: 'number',
                                 placeHolder: '設定數值',
-                                callback: (text) => {
+                                callback: text => {
                                     vm.value = text;
                                     gvc.notifyDataChange(id);
                                 },
                             })}
-                                        </div>
-                                        <div class="col-6">
-                                            ${EditorElem.editeInput({
+                    </div>
+                    <div class="col-6">
+                      ${EditorElem.editeInput({
                                 title: html `<h6 class="tx_700">可使用天數</h6>`,
                                 gvc: gvc,
                                 default: vm.rebateEndDay,
                                 type: 'number',
                                 placeHolder: '設定數值',
-                                callback: (text) => {
+                                callback: text => {
                                     vm.rebateEndDay = text;
                                     gvc.notifyDataChange(id);
                                 },
                                 unit: '天',
                                 readonly: vm.type !== 'add',
                             })}
-                                            ${BgWidget.grayNote('輸入0，則為無期限', 'margin-top:6px;')}
-                                        </div>
-                                    </div>`,
+                      ${BgWidget.grayNote('輸入0，則為無期限', 'margin-top:6px;')}
+                    </div>
+                  </div>`,
                             html `<div>
-                                        ${EditorElem.editeText({
+                    ${EditorElem.editeText({
                                 title: html `<h6 class="tx_700">備註</h6>`,
                                 gvc: gvc,
                                 default: vm.note,
                                 placeHolder: '輸入備註',
-                                callback: (text) => {
+                                callback: text => {
                                     vm.note = text;
                                     gvc.notifyDataChange(id);
                                 },
                             })}
-                                    </div>`,
+                  </div>`,
                         ].join(``);
                     },
                     divCreate: {
@@ -352,11 +358,11 @@ export class ShoppingRebate {
                     },
                 };
             })}
-                    <div class="modal-footer mb-0 pb-0 mt-2 pt-1">
-                        ${BgWidget.cancel(gvc.event(() => {
+          <div class="modal-footer mb-0 pb-0 mt-2 pt-1">
+            ${BgWidget.cancel(gvc.event(() => {
                 gvc2.closeDialog();
             }))}
-                        ${BgWidget.save(gvc.event(() => {
+            ${BgWidget.save(gvc.event(() => {
                 const dialog = new ShareDialog(gvc.glitter);
                 const day = parseInt(`${vm.rebateEndDay}`, 10);
                 const value = parseInt(`${vm.value}`, 10);
@@ -371,9 +377,9 @@ export class ShoppingRebate {
                 gvc2.closeDialog();
                 obj.saveButton.event(vm);
             }), obj.saveButton.text)}
-                    </div>
-                </div>
-            </div>`;
+          </div>
+        </div>
+      </div>`;
         }, Tool.randomString(5));
     }
 }