ts-glitter 21.1.7 → 21.1.9

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

@@ -410,8 +410,7 @@ export class OrderExcel {
 
   // 取得客製化資訊
   static getCustomizeMap = async (order?: any) => {
-    const [cashflowConfigObj, shipmentConfigObj, registerConfig, memberConfig] = await OrderExcel.customizePromise();
-
+    const [cashflowConfigObj, shipmentConfigObj, registerConfig, memberConfig ,receipt] = await OrderExcel.customizePromise();
     const customizeMap = new Map();
 
     const getUserValue = (key: string) => {
@@ -456,6 +455,20 @@ export class OrderExcel {
       customizeMap.set(`物流自訂值 - ${item.title}`, order ? getShipmentValue(item.key) : '-');
     });
 
+    let viewModel = [
+      ['姓名', 'name'],
+      ['電話', 'phone'],
+      ['信箱', 'email'],
+    ];
+    receipt.list.map((d1: any) => {
+      if (
+        !viewModel.find(dd => {
+          return dd[1] === d1.key;
+        })
+      ) {
+        customizeMap.set(`收件人資訊 - ${d1.title}`, order ? (order.orderData.user_info[d1.key] ?? '-') : '-');
+      }
+    })
     return customizeMap;
   };
 
@@ -1010,6 +1023,13 @@ export class OrderExcel {
       await ApiUser.getPublicConfig('customer_form_user_setting', 'manager').then(r => {
         return Array.isArray(r.response.value.list) ? r.response.value.list : [];
       }),
+      //收件人資料
+      (
+        await ApiUser.getPublicConfig(
+          'custom_form_checkout_recipient',
+          'manager'
+        )
+      ).response.value
     ]);
 
     return dataArray;

package/lowcode/cms-plugin/module/table-storage.js

@@ -0,0 +1,11 @@
+export class TableStorage {
+}
+TableStorage.limitList = [10, 25, 50, 75, 100];
+TableStorage.setLimit = (limit) => {
+    localStorage.setItem('table_default_limit', `${limit}`);
+};
+TableStorage.getLimit = () => {
+    var _a;
+    const limit = parseInt((_a = localStorage.getItem('table_default_limit')) !== null && _a !== void 0 ? _a : '10', 10);
+    return isNaN(limit) ? 10 : limit;
+};

package/lowcode/cms-plugin/module/table-storage.ts

@@ -0,0 +1,12 @@
+export class TableStorage {
+  static limitList = [10, 25, 50, 75, 100];
+
+  static setLimit = (limit: number) => {
+    localStorage.setItem('table_default_limit', `${limit}`);
+  };
+
+  static getLimit = () => {
+    const limit = parseInt(localStorage.getItem('table_default_limit') ?? '10', 10);
+    return isNaN(limit) ? 10 : limit;
+  };
+}

package/lowcode/cms-plugin/permission-setting.js

@@ -6,6 +6,7 @@ import { BgListComponent } from '../backend-manager/bg-list-component.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Setting_editor } from '../jspage/function-page/setting_editor.js';
 import { Tool } from '../modules/tool.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 export class PermissionSetting {
     static main(gvc, edit_mode) {
@@ -41,6 +42,7 @@ export class PermissionSetting {
                     },
                     dataList: [],
                     filter: {},
+                    listLimit: TableStorage.getLimit(),
                 };
                 return a;
             }
@@ -73,6 +75,7 @@ export class PermissionSetting {
                     },
                     dataList: [],
                     filter: {},
+                    listLimit: TableStorage.getLimit(),
                 };
             }
         }
@@ -203,17 +206,23 @@ export class PermissionSetting {
                                             gvc,
                                             callback: (value) => {
                                                 vm.queryType = value;
-                                                gvc.notifyDataChange(vm.tableId);
-                                                gvc.notifyDataChange(id);
+                                                gvc.notifyDataChange([vm.tableId, id]);
                                             },
                                             default: vm.queryType || 'name',
                                             options: FilterOptions.permissionSelect,
                                         }),
                                         BgWidget.searchFilter(gvc.event(e => {
                                             vm.query = `${e.value}`.trim();
-                                            gvc.notifyDataChange(vm.tableId);
-                                            gvc.notifyDataChange(id);
+                                            gvc.notifyDataChange([vm.tableId, id]);
                                         }), vm.query || '', '搜尋所有員工'),
+                                        BgWidget.countingFilter({
+                                            gvc,
+                                            callback: value => {
+                                                vm.listLimit = value;
+                                                gvc.notifyDataChange([vm.tableId, id]);
+                                            },
+                                            default: vm.listLimit,
+                                        }),
                                         BgWidget.funnelFilter({
                                             gvc,
                                             callback: () => ListComp.showRightMenu(FilterOptions.permissionFunnel),
@@ -222,8 +231,7 @@ export class PermissionSetting {
                                             gvc,
                                             callback: (value) => {
                                                 vm.orderString = value;
-                                                gvc.notifyDataChange(vm.tableId);
-                                                gvc.notifyDataChange(id);
+                                                gvc.notifyDataChange([vm.tableId, id]);
                                             },
                                             default: vm.orderString || 'default',
                                             options: FilterOptions.permissionOrderBy,
@@ -241,17 +249,16 @@ export class PermissionSetting {
                                     gvc: gvc,
                                     getData: vd => {
                                         vmi = vd;
-                                        const limit = 10;
                                         ApiUser.getPermission({
                                             page: vmi.page - 1,
-                                            limit: limit,
+                                            limit: vm.listLimit,
                                             queryType: vm.queryType,
                                             query: vm.query,
                                             orderBy: vm.orderString,
                                             filter: vm.filter,
                                         }).then(data => {
                                             vm.dataList = data.response.data;
-                                            vmi.pageSize = Math.ceil(data.response.total / limit);
+                                            vmi.pageSize = Math.ceil(data.response.total / vm.listLimit);
                                             vmi.originalData = vm.dataList;
                                             vmi.tableData = getDatalist();
                                             vmi.loading = false;

package/lowcode/cms-plugin/permission-setting.ts

@@ -7,6 +7,7 @@ import { BgListComponent } from '../backend-manager/bg-list-component.js';
 import { CheckInput } from '../modules/checkInput.js';
 import { Setting_editor } from '../jspage/function-page/setting_editor.js';
 import { Tool } from '../modules/tool.js';
+import { TableStorage } from './module/table-storage.js';
 
 const html = String.raw;
 
@@ -84,6 +85,7 @@ type ViewModel = {
   data: PermissionItem;
   dataList: any;
   filter: any;
+  listLimit: number;
 };
 
 type PosViewModel = {
@@ -135,6 +137,7 @@ export class PermissionSetting {
           },
           dataList: [],
           filter: {},
+          listLimit: TableStorage.getLimit(),
         };
         return a;
       } else {
@@ -166,6 +169,7 @@ export class PermissionSetting {
           },
           dataList: [],
           filter: {},
+          listLimit: TableStorage.getLimit(),
         };
       }
     }
@@ -310,8 +314,7 @@ export class PermissionSetting {
                               gvc,
                               callback: (value: any) => {
                                 vm.queryType = value;
-                                gvc.notifyDataChange(vm.tableId);
-                                gvc.notifyDataChange(id);
+                                gvc.notifyDataChange([vm.tableId, id]);
                               },
                               default: vm.queryType || 'name',
                               options: FilterOptions.permissionSelect,
@@ -319,12 +322,19 @@ export class PermissionSetting {
                             BgWidget.searchFilter(
                               gvc.event(e => {
                                 vm.query = `${e.value}`.trim();
-                                gvc.notifyDataChange(vm.tableId);
-                                gvc.notifyDataChange(id);
+                                gvc.notifyDataChange([vm.tableId, id]);
                               }),
                               vm.query || '',
                               '搜尋所有員工'
                             ),
+                            BgWidget.countingFilter({
+                              gvc,
+                              callback: value => {
+                                vm.listLimit = value;
+                                gvc.notifyDataChange([vm.tableId, id]);
+                              },
+                              default: vm.listLimit,
+                            }),
                             BgWidget.funnelFilter({
                               gvc,
                               callback: () => ListComp.showRightMenu(FilterOptions.permissionFunnel),
@@ -333,8 +343,7 @@ export class PermissionSetting {
                               gvc,
                               callback: (value: any) => {
                                 vm.orderString = value;
-                                gvc.notifyDataChange(vm.tableId);
-                                gvc.notifyDataChange(id);
+                                gvc.notifyDataChange([vm.tableId, id]);
                               },
                               default: vm.orderString || 'default',
                               options: FilterOptions.permissionOrderBy,
@@ -353,17 +362,16 @@ export class PermissionSetting {
                           gvc: gvc,
                           getData: vd => {
                             vmi = vd;
-                            const limit = 10;
                             ApiUser.getPermission({
                               page: vmi.page - 1,
-                              limit: limit,
+                              limit: vm.listLimit,
                               queryType: vm.queryType,
                               query: vm.query,
                               orderBy: vm.orderString,
                               filter: vm.filter,
                             }).then(data => {
                               vm.dataList = data.response.data;
-                              vmi.pageSize = Math.ceil(data.response.total / limit);
+                              vmi.pageSize = Math.ceil(data.response.total / vm.listLimit);
                               vmi.originalData = vm.dataList;
                               vmi.tableData = getDatalist();
                               vmi.loading = false;
@@ -695,7 +703,7 @@ export class PermissionSetting {
                     }
 
                     dialog.dataLoading({ visible: true });
-                    
+
                     ApiUser.setPermission({
                       email: obj.type === 'add' ? vm.data.email : original.email,
                       config: {

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

@@ -199,7 +199,8 @@ export class PaymentPage {
                                       </div>
                                     </div>
                                     <div
-                                      class="d-flex flex-column py-2" onclick="${gvc.event(() => {
+                                      class="d-flex flex-column py-2"
+                                      onclick="${gvc.event(() => {
                                         PosFunction.setMoney(gvc, count => {
                                             obj.ogOrderData.lineItems[index].count = count;
                                             refreshOrderView();
@@ -242,7 +243,10 @@ export class PaymentPage {
                                         : ``}
                                     </div>
                                     <div class="flex-fill"></div>
-                                    <div class="d-sm-none d-flex align-items-center justify-content-center flex-column" style="gap:0px;" onclick="${gvc.event(() => {
+                                    <div
+                                      class="d-sm-none d-flex align-items-center justify-content-center flex-column"
+                                      style="gap:0px;"
+                                      onclick="${gvc.event(() => {
                                         PosFunction.setMoney(gvc, money => {
                                             if (money === data.sale_price) {
                                                 delete obj.ogOrderData.lineItems[index].custom_price;
@@ -252,20 +256,24 @@ export class PaymentPage {
                                             }
                                             refreshOrderView();
                                         }, '更改商品單價');
-                                    })}">
-                                      ${(data.sale_price !== data.variant_sale_price) ? `
-                                    <span class="text-decoration-line-through"
-                                      >$${parseInt((data.variant_sale_price * data.count), 10).toLocaleString()}</span
-                                    >
-                                     <span class="text-danger"
-                                      >$${parseInt((data.sale_price * data.count), 10).toLocaleString()}</span
-                                    >
-                                    ` : `
-                                    <span
-                                      >$${parseInt((data.sale_price * data.count), 10).toLocaleString()}</span
+                                    })}"
                                     >
-                                    `}
-
+                                      ${(() => {
+                                        function formatPrice(price) {
+                                            return `$${parseInt(`${price}`, 10).toLocaleString()}`;
+                                        }
+                                        if (data.variant_sale_price && data.sale_price !== data.variant_sale_price) {
+                                            return html `
+                                            <span class="text-decoration-line-through"
+                                              >${formatPrice(data.variant_sale_price * data.count)}</span
+                                            >
+                                            <span class="text-danger"
+                                              >${formatPrice(data.sale_price * data.count)}</span
+                                            >
+                                          `;
+                                        }
+                                        return html ` <span>${formatPrice(data.sale_price * data.count)}</span> `;
+                                    })()}
                                     </div>
                                   </div>
                                   <div class="col-2 d-none d-sm-flex align-items-center justify-content-start">
@@ -298,19 +306,20 @@ export class PaymentPage {
                                         }, '更改商品單價');
                                     })}"
                                   >
-                                    ${(data.sale_price !== data.variant_sale_price) ? `
-                                    <span class="text-decoration-line-through"
-                                      >$${parseInt((data.variant_sale_price * data.count), 10).toLocaleString()}</span
-                                    >
-                                     <span class="text-danger"
-                                      >$${parseInt((data.sale_price * data.count), 10).toLocaleString()}</span
-                                    >
-                                    ` : `
-                                    <span
-                                      >$${parseInt((data.sale_price * data.count), 10).toLocaleString()}</span
-                                    >
-                                    `}
-                                    
+                                    ${(() => {
+                                        function formatPrice(price) {
+                                            return `$${parseInt(`${price}`, 10).toLocaleString()}`;
+                                        }
+                                        if (data.variant_sale_price && data.sale_price !== data.variant_sale_price) {
+                                            return html `
+                                          <span class="text-decoration-line-through"
+                                            >${formatPrice(data.variant_sale_price * data.count)}</span
+                                          >
+                                          <span class="text-danger">${formatPrice(data.sale_price * data.count)}</span>
+                                        `;
+                                        }
+                                        return html ` <span>${formatPrice(data.sale_price * data.count)}</span> `;
+                                    })()}
                                   </div>
                                 </div>
                               `;
@@ -1956,7 +1965,6 @@ export class PaymentPage {
                     else {
                         PaymentPage.clearHistory();
                         const glitter = gvc.glitter;
-                        console.log(`res.response.order-data==>`, res.response.data);
                         const invoice = res.response.data.invoice;
                         if (res.response.data.invoice &&
                             (PayConfig.deviceType === 'pos' || ConnectionMode.on_connected_device) &&

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

@@ -233,16 +233,17 @@ export class PaymentPage {
                                       </div>
                                     </div>
                                     <div
-                                      class="d-flex flex-column py-2" onclick="${gvc.event(() => {
-                                      PosFunction.setMoney(
-                                        gvc,
-                                        count => {
-                                          obj.ogOrderData.lineItems[index].count = count;
-                                          refreshOrderView();
-                                        },
-                                        '更改商品數量'
-                                      );
-                                    })}"
+                                      class="d-flex flex-column py-2"
+                                      onclick="${gvc.event(() => {
+                                        PosFunction.setMoney(
+                                          gvc,
+                                          count => {
+                                            obj.ogOrderData.lineItems[index].count = count;
+                                            refreshOrderView();
+                                          },
+                                          '更改商品數量'
+                                        );
+                                      })}"
                                       style="font-size: 16px;font-style: normal;font-weight: 500;letter-spacing: 0.64px;margin-left: 12px;"
                                     >
                                       <div class="d-flex justify-content-center flex-column" style="gap:5px;">
@@ -279,33 +280,42 @@ export class PaymentPage {
                                         : ``}
                                     </div>
                                     <div class="flex-fill"></div>
-                                    <div class="d-sm-none d-flex align-items-center justify-content-center flex-column" style="gap:0px;" onclick="${gvc.event(()=>{
-                                      PosFunction.setMoney(
-                                        gvc,
-                                        money => {
-                                          if (money === data.sale_price) {
-                                            delete obj.ogOrderData.lineItems[index].custom_price;
-                                          } else {
-                                            obj.ogOrderData.lineItems[index].custom_price = money;
-                                          }
-                                          refreshOrderView();
-                                        },
-                                        '更改商品單價'
-                                      )
-                                    })}">
-                                      ${(data.sale_price !== data.variant_sale_price) ? `
-                                    <span class="text-decoration-line-through"
-                                      >$${parseInt((data.variant_sale_price * data.count) as any, 10).toLocaleString()}</span
-                                    >
-                                     <span class="text-danger"
-                                      >$${parseInt((data.sale_price * data.count) as any, 10).toLocaleString()}</span
-                                    >
-                                    `:`
-                                    <span
-                                      >$${parseInt((data.sale_price * data.count) as any, 10).toLocaleString()}</span
+                                    <div
+                                      class="d-sm-none d-flex align-items-center justify-content-center flex-column"
+                                      style="gap:0px;"
+                                      onclick="${gvc.event(() => {
+                                        PosFunction.setMoney(
+                                          gvc,
+                                          money => {
+                                            if (money === data.sale_price) {
+                                              delete obj.ogOrderData.lineItems[index].custom_price;
+                                            } else {
+                                              obj.ogOrderData.lineItems[index].custom_price = money;
+                                            }
+                                            refreshOrderView();
+                                          },
+                                          '更改商品單價'
+                                        );
+                                      })}"
                                     >
-                                    `}
+                                      ${(() => {
+                                        function formatPrice(price: any) {
+                                          return `$${parseInt(`${price}`, 10).toLocaleString()}`;
+                                        }
 
+                                        if (data.variant_sale_price && data.sale_price !== data.variant_sale_price) {
+                                          return html`
+                                            <span class="text-decoration-line-through"
+                                              >${formatPrice(data.variant_sale_price * data.count)}</span
+                                            >
+                                            <span class="text-danger"
+                                              >${formatPrice(data.sale_price * data.count)}</span
+                                            >
+                                          `;
+                                        }
+
+                                        return html` <span>${formatPrice(data.sale_price * data.count)}</span> `;
+                                      })()}
                                     </div>
                                   </div>
                                   <div class="col-2 d-none d-sm-flex align-items-center justify-content-start">
@@ -345,19 +355,22 @@ export class PaymentPage {
                                       );
                                     })}"
                                   >
-                                    ${(data.sale_price !== data.variant_sale_price) ? `
-                                    <span class="text-decoration-line-through"
-                                      >$${parseInt((data.variant_sale_price * data.count) as any, 10).toLocaleString()}</span
-                                    >
-                                     <span class="text-danger"
-                                      >$${parseInt((data.sale_price * data.count) as any, 10).toLocaleString()}</span
-                                    >
-                                    `:`
-                                    <span
-                                      >$${parseInt((data.sale_price * data.count) as any, 10).toLocaleString()}</span
-                                    >
-                                    `}
-                                    
+                                    ${(() => {
+                                      function formatPrice(price: any) {
+                                        return `$${parseInt(`${price}`, 10).toLocaleString()}`;
+                                      }
+
+                                      if (data.variant_sale_price && data.sale_price !== data.variant_sale_price) {
+                                        return html`
+                                          <span class="text-decoration-line-through"
+                                            >${formatPrice(data.variant_sale_price * data.count)}</span
+                                          >
+                                          <span class="text-danger">${formatPrice(data.sale_price * data.count)}</span>
+                                        `;
+                                      }
+
+                                      return html` <span>${formatPrice(data.sale_price * data.count)}</span> `;
+                                    })()}
                                   </div>
                                 </div>
                               `;
@@ -2125,7 +2138,6 @@ export class PaymentPage {
         } else {
           PaymentPage.clearHistory();
           const glitter = gvc.glitter;
-          console.log(`res.response.order-data==>`, res.response.data);
           const invoice = res.response.data.invoice;
           if (
             res.response.data.invoice &&

package/lowcode/cms-plugin/pos-pages/pos-function.js

@@ -18,6 +18,7 @@ import { PaymentPage } from './payment-page.js';
 import { BgWidget } from '../../backend-manager/bg-widget.js';
 import { UmClass } from '../../public-components/user-manager/um-class.js';
 import { Language } from '../../glitter-base/global/language.js';
+import { Tool } from '../../modules/tool.js';
 const html = String.raw;
 const css = String.raw;
 const dialogStyle = `
@@ -999,7 +1000,11 @@ export class PosFunction {
                                         'guest',
                                 }).then((res) => __awaiter(this, void 0, void 0, function* () {
                                     if (res.result && res.response.data) {
-                                        vm.dataList = res.response.data.filter((item) => item.content.trigger === 'code');
+                                        vm.dataList = res.response.data.filter((item) => {
+                                            return (item.content.status === 1 &&
+                                                item.content.trigger === 'code' &&
+                                                Tool.isNowBetweenDates(item.content.start_ISO_Date, item.content.end_ISO_Date));
+                                        });
                                     }
                                     else {
                                         vm.dataList = [];

package/lowcode/cms-plugin/pos-pages/pos-function.ts

@@ -12,6 +12,7 @@ import { BgWidget } from '../../backend-manager/bg-widget.js';
 import { UmClass } from '../../public-components/user-manager/um-class.js';
 import { Voucher, VoucherContent } from '../../public-components/user-manager/um-voucher.js';
 import { Language } from '../../glitter-base/global/language.js';
+import { Tool } from '../../modules/tool.js';
 
 const html = String.raw;
 const css = String.raw;
@@ -1093,7 +1094,13 @@ export class PosFunction {
                       'guest',
                   }).then(async res => {
                     if (res.result && res.response.data) {
-                      vm.dataList = res.response.data.filter((item: Voucher) => item.content.trigger === 'code');
+                      vm.dataList = res.response.data.filter((item: Voucher) => {
+                        return (
+                          item.content.status === 1 &&
+                          item.content.trigger === 'code' &&
+                          Tool.isNowBetweenDates(item.content.start_ISO_Date, item.content.end_ISO_Date)
+                        );
+                      });
                     } else {
                       vm.dataList = [];
                     }

package/lowcode/cms-plugin/reconciliation-area.js

@@ -19,6 +19,7 @@ import { ShoppingOrderManager } from './shopping-order-manager.js';
 import { PaymentConfig } from '../glitter-base/global/payment-config.js';
 import { GlobalUser } from '../glitter-base/global/global-user.js';
 import { OrderInfo } from '../public-models/order-info.js';
+import { TableStorage } from './module/table-storage.js';
 const html = String.raw;
 const globalStyle = {
     header_title: `
@@ -99,6 +100,7 @@ export class ReconciliationArea {
             apiJSON: {},
             checkedData: [],
             headerConfig: [],
+            listLimit: TableStorage.getLimit(),
         };
         return gvc.bindView(() => {
             const id = gvc.glitter.getUUID();
@@ -367,6 +369,14 @@ export class ReconciliationArea {
                                                                 vm.query = `${e.value}`.trim();
                                                                 gvc.notifyDataChange(vm.id);
                                                             }), vm.query || '', '搜尋訂單'),
+                                                            BgWidget.countingFilter({
+                                                                gvc,
+                                                                callback: value => {
+                                                                    vm.listLimit = value;
+                                                                    gvc.notifyDataChange(vm.id);
+                                                                },
+                                                                default: vm.listLimit,
+                                                            }),
                                                             BgWidget.funnelFilter({
                                                                 gvc,
                                                                 callback: () => {
@@ -393,10 +403,9 @@ export class ReconciliationArea {
                                                 defPage: ReconciliationArea.vm.page,
                                                 getData: vmi => {
                                                     ReconciliationArea.vm.page = vmi.page;
-                                                    const limit = 20;
                                                     vm.apiJSON = {
                                                         page: vmi.page - 1,
-                                                        limit: limit,
+                                                        limit: vm.listLimit,
                                                         search: vm.query || undefined,
                                                         searchType: vm.queryType || 'cart_token',
                                                         orderString: vm.orderString,
@@ -491,7 +500,7 @@ export class ReconciliationArea {
                                                             });
                                                         }
                                                         vm.dataList = data.response.data;
-                                                        vmi.pageSize = Math.ceil(data.response.total / limit);
+                                                        vmi.pageSize = Math.ceil(data.response.total / vm.listLimit);
                                                         vmi.originalData = vm.dataList;
                                                         vmi.tableData = getDatalist();
                                                         vmi.loading = false;