ts-glitter 20.7.8 → 20.8.0

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

@@ -142,7 +142,7 @@ export class PaymentPage {
                         const rebateTitle = (_b = gvc.glitter.share.rebateConfig.title) !== null && _b !== void 0 ? _b : '購物金';
                         gvc.glitter.share.rebateConfig.title = rebateTitle;
                         const hasWeighing = orderDetail.lineItems.find((item) => item.product_category === 'weighing');
-                        resolve(html `<div
+                        resolve(html ` <div
                   class="left-panel"
                   style="${document.body.offsetWidth < 800
                             ? `width:calc(100%);padding: 20px 18px;height:auto;background:#FFF;`
@@ -236,7 +236,7 @@ export class PaymentPage {
                                       </span>
 
                                       ${document.body.clientWidth < 800
-                                        ? html `<div
+                                        ? html ` <div
                                             style="color: #393939; font-size: 16px; font-style: normal; font-weight: 400; line-height: normal; letter-spacing: 0.64px; text-transform: uppercase;"
                                           >
                                             NT.${parseInt(data.sale_price, 10).toLocaleString()}
@@ -285,7 +285,7 @@ export class PaymentPage {
                                 bind: vm.id,
                                 view: () => {
                                     const view = [
-                                        html `<div class="w-100 d-flex flex-fill">
+                                        html ` <div class="w-100 d-flex flex-fill">
                             <div
                               class="w-100 d-flex align-items-center justify-content-center"
                               style="cursor:pointer;flex:1; height: 65px; ${vm.type === 'old'
@@ -460,14 +460,14 @@ export class PaymentPage {
                                                                 bind: vm.id,
                                                                 view: () => {
                                                                     if (vm.loading) {
-                                                                        return html `<div
+                                                                        return html ` <div
                                                 class="w-100 d-flex align-items-center justify-content-center"
                                               >
                                                 <div class="spinner-border"></div>
                                               </div>`;
                                                                     }
                                                                     else {
-                                                                        return html `<div
+                                                                        return html ` <div
                                                   style="align-self: stretch; justify-content: flex-start; align-items: center; gap: 6px; display: inline-flex"
                                                 >
                                                   <div
@@ -743,7 +743,7 @@ export class PaymentPage {
                                       </div>`,
                                                         ];
                                                         resolve(form_array_view.join(`<div class="my-4 border"></div>`) +
-                                                            html `<div class="d-flex align-content-end justify-content-end pt-3">
+                                                            html ` <div class="d-flex align-content-end justify-content-end pt-3">
                                           ${BgWidget.save(gvc.event(() => __awaiter(this, void 0, void 0, function* () {
                                                                 const dialog = new ShareDialog(gvc.glitter);
                                                                 if (CheckInput.isEmpty(userData.name)) {
@@ -862,7 +862,8 @@ export class PaymentPage {
                   ${(() => {
                             var _a;
                             if (['FAMIC2C', 'HILIFEC2C', 'OKMARTC2C', 'UNIMARTC2C'].includes(obj.ogOrderData.user_info.shipment)) {
-                                return html `<div
+                                return html `
+                        <div
                           class="mb-2"
                           style="margin-top: 14px;font-size: 18px;font-weight: 700;letter-spacing: 0.72px;"
                         >
@@ -885,7 +886,8 @@ export class PaymentPage {
                                 })}"
                         >
                           ${decodeURI(gvc.glitter.getUrlParameter('CVSStoreName') || '') || '請選擇到店門市'}
-                        </div> `;
+                        </div>
+                      `;
                             }
                             else if (obj.ogOrderData.user_info.shipment === 'normal') {
                                 return `<input class="form-control mt-2" value="${(_a = obj.ogOrderData.user_info.address) !== null && _a !== void 0 ? _a : ''}" onchange="${gvc.event((e, event) => {
@@ -930,7 +932,7 @@ export class PaymentPage {
                                     },
                                 ]
                                     .map(dd => {
-                                    return html `<div class="mb-2 col-${dd.col} ps-0" style="">
+                                    return html ` <div class="mb-2 col-${dd.col} ps-0" style="">
                                 <div>
                                   <div
                                     class="fw-normal mb-2 fs-6"
@@ -984,7 +986,7 @@ export class PaymentPage {
                                     return [
                                         {
                                             title: `${gvc.glitter.share.rebateConfig.title}折抵`,
-                                            value: html `<div class="d-flex align-items-center" style="gap:5px;">
+                                            value: html ` <div class="d-flex align-items-center" style="gap:5px;">
                                 ${`-${Number(orderDetail.use_rebate).toLocaleString()}`}
                                 <i
                                   class="fa-solid fa-xmark fs-5"
@@ -1006,7 +1008,7 @@ export class PaymentPage {
                                 return orderDetail.voucherList.map((dd, index) => {
                                     return {
                                         hint: dd.title,
-                                        value: html `<div class="d-flex align-items-center" style="gap:5px;">
+                                        value: html ` <div class="d-flex align-items-center" style="gap:5px;">
                               ${dd.reBackType === 'rebate'
                                             ? `+${dd.discount_total.toLocaleString()} ${gvc.glitter.share.rebateConfig.title}`
                                             : (() => {
@@ -1226,7 +1228,7 @@ export class PaymentPage {
                                                         .join('');
                                                 }
                                                 else {
-                                                    return html `<div class="w-100 d-flex flex-column">
+                                                    return html ` <div class="w-100 d-flex flex-column">
                                   <div class="d-flex align-items-center justify-content-center w-100 " style="">
                                     <div class="d-flex" style="flex:68;">${PosWidget.fontLight('付款方式')}</div>
                                     <div class="d-flex" style="flex:94;">${PosWidget.fontLight('付款金額')}</div>
@@ -1328,7 +1330,7 @@ export class PaymentPage {
                                                 style: `display: flex;justify-content: space-between;margin-top: 24px;gap:15px;`,
                                             },
                                         })}`,
-                                        html `<div style="height:24px;"></div>`,
+                                        html ` <div style="height:24px;"></div>`,
                                         PosWidget.buttonSnow(`新增付款方式`, gvc.event(() => {
                                             PosFunction.selectPaymentMethod({
                                                 gvc: gvc,
@@ -1896,6 +1898,7 @@ 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) &&
@@ -1919,6 +1922,33 @@ export class PaymentPage {
                             }
                             print('client');
                         }
+                        else if (PayConfig.pos_config.pos_support_finction.includes('print_order_receipt') ||
+                            PayConfig.pos_config.pos_support_finction.includes('print_order_detail')) {
+                            if (PayConfig.deviceType === 'pos') {
+                                yield IminModule.printTransactionDetails(res.response.data.orderID, invoice, glitter.share.staff_title);
+                                if (PayConfig.pos_config.pos_support_finction.includes('print_order_receipt') &&
+                                    PayConfig.pos_config.pos_support_finction.includes('print_order_detail')) {
+                                    yield new Promise(resolve => {
+                                        const dialog = new ShareDialog(glitter);
+                                        dialog.infoMessage({
+                                            text: '請撕取客戶聯，在列印留存聯',
+                                            callback: () => {
+                                                resolve(true);
+                                            }
+                                        });
+                                    });
+                                    yield IminModule.printTransactionDetails(res.response.data.orderID, invoice, glitter.share.staff_title);
+                                }
+                            }
+                            else {
+                                ConnectionMode.sendCommand({
+                                    cmd: 'printTransactionDetails',
+                                    invoice: invoice,
+                                    orderID: res.response.data.orderID,
+                                    staff_title: glitter.share.staff_title,
+                                });
+                            }
+                        }
                         dialog.dataLoading({ visible: false });
                         orderDetail.lineItems = [];
                         gvc.glitter.share.clearOrderData();
@@ -1982,7 +2012,8 @@ export class PaymentPage {
                     .map((dd) => {
                     return dd.total;
                 })
-                    .reduce((accumulator, currentValue) => accumulator + currentValue, 0) < orderDetail.total) {
+                    .reduce((accumulator, currentValue) => accumulator + currentValue, 0) < orderDetail.total ||
+                !PayConfig.pos_config.pos_support_finction.includes('print_invoice')) {
                 c_vm.invoice_select = 'nouse';
                 next();
             }
@@ -2055,7 +2086,7 @@ export class PaymentPage {
                 </div>
                 ${(() => {
                         if (c_vm.invoice_select === 'carry') {
-                            return html `<div
+                            return html ` <div
                       class="d-flex w-100 align-items-center mt-3"
                       style="border:1px solid grey;height: 50px;"
                     >
@@ -2084,7 +2115,7 @@ export class PaymentPage {
                     </div>`;
                         }
                         else if (c_vm.invoice_select === 'company') {
-                            return html `<div
+                            return html ` <div
                       class="d-flex w-100 align-items-center mt-3"
                       style="border:1px solid grey;height: 50px;"
                     >

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

@@ -175,7 +175,7 @@ export class PaymentPage {
             gvc.glitter.share.rebateConfig.title = rebateTitle;
             const hasWeighing = orderDetail.lineItems.find((item: any) => item.product_category === 'weighing');
             resolve(
-              html`<div
+              html` <div
                   class="left-panel"
                   style="${document.body.offsetWidth < 800
                     ? `width:calc(100%);padding: 20px 18px;height:auto;background:#FFF;`
@@ -269,7 +269,7 @@ export class PaymentPage {
                                       </span>
 
                                       ${document.body.clientWidth < 800
-                                        ? html`<div
+                                        ? html` <div
                                             style="color: #393939; font-size: 16px; font-style: normal; font-weight: 400; line-height: normal; letter-spacing: 0.64px; text-transform: uppercase;"
                                           >
                                             NT.${parseInt(data.sale_price as any, 10).toLocaleString()}
@@ -322,7 +322,7 @@ export class PaymentPage {
                       bind: vm.id,
                       view: () => {
                         const view = [
-                          html`<div class="w-100 d-flex flex-fill">
+                          html` <div class="w-100 d-flex flex-fill">
                             <div
                               class="w-100 d-flex align-items-center justify-content-center"
                               style="cursor:pointer;flex:1; height: 65px; ${vm.type === 'old'
@@ -514,13 +514,13 @@ export class PaymentPage {
                                           bind: vm.id,
                                           view: () => {
                                             if (vm.loading) {
-                                              return html`<div
+                                              return html` <div
                                                 class="w-100 d-flex align-items-center justify-content-center"
                                               >
                                                 <div class="spinner-border"></div>
                                               </div>`;
                                             } else {
-                                              return html`<div
+                                              return html` <div
                                                   style="align-self: stretch; justify-content: flex-start; align-items: center; gap: 6px; display: inline-flex"
                                                 >
                                                   <div
@@ -742,6 +742,7 @@ export class PaymentPage {
                                     );
 
                                     let need_check: any = {};
+
                                     function loopForm(data: any, refer_obj: any) {
                                       let h = '';
                                       data.map((item: any) => {
@@ -807,7 +808,7 @@ export class PaymentPage {
 
                                     resolve(
                                       form_array_view.join(`<div class="my-4 border"></div>`) +
-                                        html`<div class="d-flex align-content-end justify-content-end pt-3">
+                                        html` <div class="d-flex align-content-end justify-content-end pt-3">
                                           ${BgWidget.save(
                                             gvc.event(async () => {
                                               const dialog = new ShareDialog(gvc.glitter);
@@ -938,7 +939,8 @@ export class PaymentPage {
                     if (
                       ['FAMIC2C', 'HILIFEC2C', 'OKMARTC2C', 'UNIMARTC2C'].includes(obj.ogOrderData.user_info.shipment)
                     ) {
-                      return html`<div
+                      return html`
+                        <div
                           class="mb-2"
                           style="margin-top: 14px;font-size: 18px;font-weight: 700;letter-spacing: 0.72px;"
                         >
@@ -961,7 +963,8 @@ export class PaymentPage {
                           })}"
                         >
                           ${decodeURI(gvc.glitter.getUrlParameter('CVSStoreName') || '') || '請選擇到店門市'}
-                        </div> `;
+                        </div>
+                      `;
                     } else if (obj.ogOrderData.user_info.shipment === 'normal') {
                       return `<input class="form-control mt-2" value="${obj.ogOrderData.user_info.address ?? ''}" onchange="${gvc.event(
                         (e, event) => {
@@ -1005,7 +1008,7 @@ export class PaymentPage {
                             },
                           ]
                             .map(dd => {
-                              return html`<div class="mb-2 col-${dd.col} ps-0" style="">
+                              return html` <div class="mb-2 col-${dd.col} ps-0" style="">
                                 <div>
                                   <div
                                     class="fw-normal mb-2 fs-6"
@@ -1060,7 +1063,7 @@ export class PaymentPage {
                           return [
                             {
                               title: `${gvc.glitter.share.rebateConfig.title}折抵`,
-                              value: html`<div class="d-flex align-items-center" style="gap:5px;">
+                              value: html` <div class="d-flex align-items-center" style="gap:5px;">
                                 ${`-${Number(orderDetail.use_rebate).toLocaleString()}`}
                                 <i
                                   class="fa-solid fa-xmark fs-5"
@@ -1081,7 +1084,7 @@ export class PaymentPage {
                         return (orderDetail as any).voucherList.map((dd: any, index: number) => {
                           return {
                             hint: dd.title,
-                            value: html`<div class="d-flex align-items-center" style="gap:5px;">
+                            value: html` <div class="d-flex align-items-center" style="gap:5px;">
                               ${dd.reBackType === 'rebate'
                                 ? `+${dd.discount_total.toLocaleString()} ${gvc.glitter.share.rebateConfig.title}`
                                 : (() => {
@@ -1315,7 +1318,7 @@ export class PaymentPage {
                                   })
                                   .join('');
                               } else {
-                                return html`<div class="w-100 d-flex flex-column">
+                                return html` <div class="w-100 d-flex flex-column">
                                   <div class="d-flex align-items-center justify-content-center w-100 " style="">
                                     <div class="d-flex" style="flex:68;">${PosWidget.fontLight('付款方式')}</div>
                                     <div class="d-flex" style="flex:94;">${PosWidget.fontLight('付款金額')}</div>
@@ -1434,7 +1437,7 @@ export class PaymentPage {
                               style: `display: flex;justify-content: space-between;margin-top: 24px;gap:15px;`,
                             },
                           })}`,
-                          html`<div style="height:24px;"></div>`,
+                          html` <div style="height:24px;"></div>`,
                           PosWidget.buttonSnow(
                             `新增付款方式`,
                             gvc.event(() => {
@@ -2050,6 +2053,7 @@ 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 &&
@@ -2058,6 +2062,7 @@ export class PaymentPage {
             c_vm.invoice_select !== 'nouse'
           ) {
             POSSetting.config.pickup_number++;
+
             function print(type: 'save' | 'client') {
               if (type === 'client') {
                 if (PayConfig.deviceType === 'pos') {
@@ -2072,7 +2077,40 @@ export class PaymentPage {
                 }
               }
             }
+
             print('client');
+          } else if (
+            PayConfig.pos_config.pos_support_finction.includes('print_order_receipt') ||
+            PayConfig.pos_config.pos_support_finction.includes('print_order_detail')
+          ) {
+
+            if (PayConfig.deviceType === 'pos') {
+              //客戶聯
+              await IminModule.printTransactionDetails(res.response.data.orderID,invoice,glitter.share.staff_title);
+              //如果需要收執聯的話
+              if(
+                PayConfig.pos_config.pos_support_finction.includes('print_order_receipt') &&
+                PayConfig.pos_config.pos_support_finction.includes('print_order_detail')
+              ){
+                await new Promise(resolve => {
+                  const dialog=new ShareDialog(glitter)
+                  dialog.infoMessage({
+                    text:'請撕取客戶聯，在列印留存聯',
+                    callback:()=>{
+                      resolve(true)
+                    }
+                  })
+                })
+                await IminModule.printTransactionDetails(res.response.data.orderID,invoice,glitter.share.staff_title);
+              }
+            } else {
+              ConnectionMode.sendCommand({
+                cmd: 'printTransactionDetails',
+                invoice: invoice,
+                orderID: res.response.data.orderID,
+                staff_title: glitter.share.staff_title,
+              });
+            }
           }
           dialog.dataLoading({ visible: false });
           orderDetail.lineItems = [];
@@ -2145,7 +2183,8 @@ export class PaymentPage {
         .map((dd: any) => {
           return dd.total;
         })
-        .reduce((accumulator: number, currentValue: number) => accumulator + currentValue, 0) < orderDetail.total
+        .reduce((accumulator: number, currentValue: number) => accumulator + currentValue, 0) < orderDetail.total ||
+      !PayConfig.pos_config.pos_support_finction.includes('print_invoice')
     ) {
       c_vm.invoice_select = 'nouse';
       next();
@@ -2221,7 +2260,7 @@ export class PaymentPage {
                 </div>
                 ${(() => {
                   if (c_vm.invoice_select === 'carry') {
-                    return html`<div
+                    return html` <div
                       class="d-flex w-100 align-items-center mt-3"
                       style="border:1px solid grey;height: 50px;"
                     >
@@ -2249,7 +2288,7 @@ export class PaymentPage {
                       </div>
                     </div>`;
                   } else if (c_vm.invoice_select === 'company') {
-                    return html`<div
+                    return html` <div
                       class="d-flex w-100 align-items-center mt-3"
                       style="border:1px solid grey;height: 50px;"
                     >

package/lowcode/glitterBundle/dialog/ShareDialog.js

@@ -39,6 +39,9 @@ export class ShareDialog {
         this.checkYesOrNot = (obj) => {
             this.openConfirmDialog('checkYesOrNot', obj);
         };
+        this.confirmMessage = (obj) => {
+            this.openConfirmDialog('confirmMessage', obj);
+        };
         this.customCheck = (obj) => {
             this.openConfirmDialog('input_text', obj);
         };

package/lowcode/glitterBundle/dialog/ShareDialog.ts

@@ -9,6 +9,7 @@ interface DataLoadingOptions {
 
 interface MessageOptions {
   text?: string;
+  callback?: () => void;
 }
 
 interface ErrorMessageOptions extends MessageOptions {
@@ -32,6 +33,7 @@ export class ShareDialog {
   public successMessage: (obj: MessageOptions) => void;
   public warningMessage: (obj: ConfirmDialogOptions) => void;
   public checkYesOrNot: (obj: ConfirmDialogOptions) => void;
+  public confirmMessage: (obj: ConfirmDialogOptions) => void;
   public checkYesOrNotWithCustomWidth: (obj: ConfirmDialogOptions) => void;
   public customCheck: (obj: ConfirmDialogOptions) => void;
 
@@ -78,6 +80,9 @@ export class ShareDialog {
     this.checkYesOrNot = (obj: ConfirmDialogOptions): void => {
       this.openConfirmDialog('checkYesOrNot', obj);
     };
+    this.confirmMessage = (obj: ConfirmDialogOptions): void => {
+      this.openConfirmDialog('confirmMessage', obj);
+    };
 
     this.customCheck = (obj: ConfirmDialogOptions): void => {
       this.openConfirmDialog('input_text', obj);

package/lowcode/glitterBundle/dialog/dialog.js

@@ -122,7 +122,11 @@ init(import.meta.url, (gvc, glitter, gBundle) => {
                             content: (_h = (_g = gBundle.obj) === null || _g === void 0 ? void 0 : _g.text) !== null && _h !== void 0 ? _h : '系統提示',
                             confirm: {
                                 title: Language.text('okay'),
-                                event: () => gvc.closeDialog(),
+                                event: () => {
+                                    var _a, _b;
+                                    (_b = (_a = gBundle.obj) === null || _a === void 0 ? void 0 : _a.callback) === null || _b === void 0 ? void 0 : _b.call(_a, true);
+                                    gvc.closeDialog();
+                                }
                             },
                             width: 420,
                         });

package/lowcode/glitterBundle/dialog/dialog.ts

@@ -154,7 +154,10 @@ init(import.meta.url, (gvc, glitter, gBundle: Bundle) => {
               content: gBundle.obj?.text ?? '系統提示',
               confirm: {
                 title: Language.text('okay'),
-                event: () => gvc.closeDialog(),
+                event: () => {
+                  gBundle.obj?.callback?.(true);
+                  gvc.closeDialog()
+                }
               },
               width: 420,
             });

package/lowcode/jspage/function-page/setting_editor.js

@@ -1517,6 +1517,14 @@ Setting_editor.menuItems = () => {
             groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
             moduleName: '訂閱裝置管理',
         },
+        {
+            icon: '',
+            page: 'pos_setting',
+            group: 'POS實體門市',
+            title: 'POS設定',
+            appName: 'cms_system',
+            groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/cash-register-regular (1).svg',
+        },
         {
             icon: '',
             page: 'shop_list',

package/lowcode/jspage/function-page/setting_editor.ts

@@ -774,6 +774,14 @@ export class Setting_editor {
             //     groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
             //     moduleName: '訂閱裝置管理',
             // },
+            {
+                icon: '',
+                page: 'pos_setting',
+                group: 'POS實體門市',
+                title: 'POS設定',
+                appName: 'cms_system',
+                groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/cash-register-regular (1).svg',
+            },
             {
                 icon: '',
                 page: 'shop_list',
@@ -959,7 +967,6 @@ export class Setting_editor {
                 if (['app-design', 'app-upload', 'cloud_subscrible', 'notify_message_list'].includes(item.page)) {
                     return userPlan > 2;
                 }
-
                 return true;
             });
 
@@ -1052,7 +1059,6 @@ export class Setting_editor {
                                 if (loading) {
                                     return BgWidget.spinner({ text: { visible: false } });
                                 }
-
                                 function renderHTML(items: any) {
                                     const authConfig = permissionData.config.auth;
                                     let list: any = [];
@@ -1319,7 +1325,6 @@ export class Setting_editor {
                                     return html`
                                         <div class="p-2">${renderItem(list)}</div>`;
                                 }
-
                                 return renderHTML(items);
                             })()}
                         </div>

package/lowcode/public-components/checkout/index.js

@@ -2973,7 +2973,7 @@ export class CheckoutIndex {
                                                                 const urlObject = new URL(originalUrl);
                                                                 urlObject.searchParams.set('EndCheckout', '1');
                                                                 const newUrl = urlObject.toString();
-                                                                if ((ApplicationConfig.device_type === 'ios') && ['jkopay', 'line_pay'].includes(vm.cartData.customer_info.payment_select)) {
+                                                                if ((ApplicationConfig.device_type !== 'web') && ['jkopay', 'line_pay'].includes(vm.cartData.customer_info.payment_select)) {
                                                                     return `${ApplicationConfig.bundle_id}://?path=${encodeURIComponent(newUrl)}`;
                                                                 }
                                                                 else {

package/lowcode/public-components/checkout/index.ts

@@ -3220,7 +3220,7 @@ export class CheckoutIndex {
                                                       const urlObject = new URL(originalUrl);
                                                       urlObject.searchParams.set('EndCheckout', '1');
                                                       const newUrl = urlObject.toString();
-                                                      if ((ApplicationConfig.device_type === 'ios') && ['jkopay','line_pay'].includes(vm.cartData.customer_info.payment_select)) {
+                                                      if ((ApplicationConfig.device_type !== 'web') && ['jkopay','line_pay'].includes(vm.cartData.customer_info.payment_select)) {
                                                         return `${ApplicationConfig.bundle_id}://?path=${encodeURIComponent(newUrl)}`;
                                                       } else {
                                                         return newUrl;

package/lowcode/public-components/terms-related/index.js

@@ -63,7 +63,7 @@ export class TermsRelated {
                         'shipment_list_archive',
                         'reconciliation_area',
                         'app-design',
-                        'auto_fcm_push', 'auto_fcm_advertise', 'auto_fcm_history'
+                        'auto_fcm_push', 'auto_fcm_advertise', 'auto_fcm_history', 'pos_setting'
                     ].includes(glitter.getUrlParameter('page'))) {
                         return yield new Promise((resolve, reject) => {
                             glitter.getModule(new URL('./cms-plugin/cms-router.js', gvc.glitter.root_path).href, res => {

package/lowcode/public-components/terms-related/index.ts

@@ -65,7 +65,7 @@ export class TermsRelated {
               'shipment_list_archive',
               'reconciliation_area',
               'app-design',
-              'auto_fcm_push','auto_fcm_advertise','auto_fcm_history'
+              'auto_fcm_push','auto_fcm_advertise','auto_fcm_history','pos_setting'
             ].includes(glitter.getUrlParameter('page'))
           ) {
             return await new Promise((resolve, reject) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-glitter",
-  "version": "20.7.8",
+  "version": "20.8.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/api-public/controllers/app-release.js

@@ -89,6 +89,7 @@ router.post('/release/android/download', async (req, resp) => {
                 appDomain: req.get('g-app'),
                 project_router: copyFile,
                 domain_url: domain,
+                config: config
             });
             await release_js_1.Release.compressFiles(copyFile, `${copyFile}.zip`);
             const url = await release_js_1.Release.uploadFile(`${copyFile}.zip`, `${copyFile}.zip`);

package/src/api-public/controllers/app-release.js.map

@@ -1 +1 @@
-{"version":3,"file":"app-release.js","sourceRoot":"","sources":["app-release.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"app-release.js","sourceRoot":"","sources":["app-release.ts"],"names":[],"mappings":"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"}

package/src/api-public/controllers/app-release.ts

@@ -108,8 +108,8 @@ router.post('/release/android/download', async (req: express.Request, resp: expr
         appDomain: req.get('g-app') as string,
         project_router: copyFile,
         domain_url: domain,
+        config:config
       });
-
       await Release.compressFiles(copyFile, `${copyFile}.zip`);
       const url = await Release.uploadFile(`${copyFile}.zip`, `${copyFile}.zip`);
       Release.deleteFile(`${copyFile}.zip`);

package/src/api-public/services/ai-robot.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export declare class AiRobot {
     static guide(app_name: string, question: string): Promise<{
         text: string;

package/src/api-public/services/fb-api.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="cookie-parser" />
 import { Cart } from "./shopping.js";
 import express from "express";
 import { IToken } from "../models/Auth.js";

package/src/api-public/services/fb-message.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IToken } from '../models/Auth.js';
 export interface ChatRoom {
     chat_id: string;

package/src/api-public/services/financial-service.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Encoding } from 'crypto';
 import axios from 'axios';
 interface KeyData {

package/src/api-public/services/line-message.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { IToken } from '../models/Auth.js';
 export interface ChatRoom {
     chat_id: string;