ts-glitter 20.9.4 → 20.9.6

package/lowcode/Entry.js

@@ -144,7 +144,7 @@ export class Entry {
             }
             window.renderClock = (_b = window.renderClock) !== null && _b !== void 0 ? _b : createClock();
             console.log(`Entry-time:`, window.renderClock.stop());
-            glitter.share.editerVersion = 'V_20.9.4';
+            glitter.share.editerVersion = 'V_20.9.6';
             glitter.share.start = new Date();
             const vm = { appConfig: [] };
             window.saasConfig = {

package/lowcode/Entry.ts

@@ -146,7 +146,7 @@ export class Entry {
       }
       (window as any).renderClock = (window as any).renderClock ?? createClock();
       console.log(`Entry-time:`, (window as any).renderClock.stop());
-      glitter.share.editerVersion = 'V_20.9.4';
+      glitter.share.editerVersion = 'V_20.9.6';
       glitter.share.start = new Date();
       const vm = { appConfig: [] };
       (window as any).saasConfig = {

package/lowcode/cms-plugin/pos-config-setting.js

@@ -13,6 +13,7 @@ import { BgWidget } from '../backend-manager/bg-widget.js';
 import { Currency } from '../glitter-base/global/currency.js';
 import { FilterOptions } from './filter-options.js';
 import { LanguageBackend } from './language-backend.js';
+import { ShoppingFinanceSetting } from './shopping-finance-setting.js';
 const html = String.raw;
 export class PosConfigSetting {
     static main(gvc) {
@@ -307,33 +308,38 @@ ${BgWidget.customButton({
                 const typeMap = {
                     function: () => {
                         var _a;
-                        return BgWidget.mainCard(html `
+                        return [BgWidget.mainCard(html `
               <div class="d-flex flex-column gap-2">
                 ${createSection('POS功能', '系統將根據您勾選的項目，開放相對應的功能')}
                 ${BgWidget.inlineCheckBox({
-                            title: '',
-                            gvc,
-                            def: (_a = vm.data.pos_support_finction) !== null && _a !== void 0 ? _a : [],
-                            array: [
-                                { title: '列印明細', value: 'print_order_detail' },
-                                { title: '列印留存聯', value: 'print_order_receipt' },
-                                { title: '發票開立', value: 'print_invoice' },
-                                { title: '桌號設定', value: 'table_select' },
-                            ],
-                            callback: (array) => {
-                                vm.data.pos_support_finction = array;
-                            },
-                            type: 'multiple',
-                        })}
+                                title: '',
+                                gvc,
+                                def: (_a = vm.data.pos_support_finction) !== null && _a !== void 0 ? _a : [],
+                                array: [
+                                    { title: '列印明細', value: 'print_order_detail' },
+                                    { title: '列印留存聯', value: 'print_order_receipt' },
+                                    { title: '發票開立', value: 'print_invoice' },
+                                    { title: '桌號設定', value: 'table_select' },
+                                ],
+                                callback: (array) => {
+                                    vm.data.pos_support_finction = array;
+                                },
+                                type: 'multiple',
+                            })}
                 ${createPickUpModeDialog('叫號取餐', `針對特店取餐功能，會自動遞增取餐號碼。`)}
               </div>
-            `);
+            `)
+                        ].join('');
                     },
+                    finance: () => {
+                        return ShoppingFinanceSetting.main(gvc, true);
+                    }
                 };
                 return BgWidget.container(html `
           <div class="title-container">${BgWidget.title('全站設定')}</div>
           ${BgWidget.tab([
                     { title: '功能管理', key: 'function' },
+                    { title: '金流設定', key: 'finance' },
                 ], gvc, vm.type, text => {
                     vm.type = text;
                 })}

package/lowcode/cms-plugin/pos-config-setting.ts

@@ -6,6 +6,7 @@ import { Currency } from '../glitter-base/global/currency.js';
 import { FilterOptions } from './filter-options.js';
 import { GlobalUser } from '../glitter-base/global/global-user.js';
 import { LanguageBackend } from './language-backend.js';
+import { ShoppingFinanceSetting } from './shopping-finance-setting.js';
 
 const html = String.raw;
 
@@ -366,31 +367,35 @@ ${BgWidget.customButton({
         vm.data.pos_support_finction = vm.data.pos_support_finction ?? [];
         const typeMap: Record<string, () => string> = {
           function: () => {
-            return BgWidget.mainCard(html`
+            return [BgWidget.mainCard(html`
               <div class="d-flex flex-column gap-2">
                 ${createSection('POS功能', '系統將根據您勾選的項目，開放相對應的功能')}
                 ${BgWidget.inlineCheckBox({
-                  title: '',
-                  gvc,
-                  def: vm.data.pos_support_finction ?? [],
-                  array: [
-                    { title: '列印明細', value: 'print_order_detail' },
-                    { title: '列印留存聯', value: 'print_order_receipt' },
-                    { title: '發票開立', value: 'print_invoice' },
-                    { title: '桌號設定', value: 'table_select' },
-                  ],
-                  callback: (array: any) => {
-                    vm.data.pos_support_finction = array;
-                  },
-                  type: 'multiple',
-                })}
+              title: '',
+              gvc,
+              def: vm.data.pos_support_finction ?? [],
+              array: [
+                { title: '列印明細', value: 'print_order_detail' },
+                { title: '列印留存聯', value: 'print_order_receipt' },
+                { title: '發票開立', value: 'print_invoice' },
+                { title: '桌號設定', value: 'table_select' },
+              ],
+              callback: (array: any) => {
+                vm.data.pos_support_finction = array;
+              },
+              type: 'multiple',
+            })}
                 ${createPickUpModeDialog(
-                  '叫號取餐',
-                  `針對特店取餐功能，會自動遞增取餐號碼。`
-                )}
+              '叫號取餐',
+              `針對特店取餐功能，會自動遞增取餐號碼。`
+            )}
               </div>
-            `);
+            `)
+            ].join('');
           },
+          finance:()=>{
+            return ShoppingFinanceSetting.main(gvc,true)
+          }
         };
 
         return BgWidget.container(html`
@@ -399,7 +404,7 @@ ${BgWidget.customButton({
             [
               // { title: '商店訊息', key: 'basic' },
               { title: '功能管理', key: 'function' },
-              // { title: '跨境電商', key: 'global' },
+              { title: '金流設定', key: 'finance' },
             ],
             gvc,
             vm.type,

package/lowcode/cms-plugin/pos-pages/connection-mode.js

@@ -77,6 +77,7 @@ export class ConnectionMode {
                                         gvc.glitter.runJsInterFace('credit_card', {
                                             amount: data.function.amount,
                                             memo: data.function.memo,
+                                            orderID: data.function.orderID,
                                             pwd: data.function.pwd
                                         }, (res) => {
                                             res.cmd = 'credit_card';

package/lowcode/cms-plugin/pos-pages/connection-mode.ts

@@ -94,6 +94,7 @@ export class ConnectionMode {
                                             {
                                                 amount: data.function.amount,
                                                 memo: data.function.memo,
+                                              orderID:data.function.orderID,
                                                 pwd:data.function.pwd
                                             },
                                             (res: any) => {

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

@@ -107,6 +107,7 @@ export class PaymentFunction {
                 gvc.glitter.runJsInterFace('credit_card', {
                     amount: `${total}`,
                     memo: `訂單ID:${orderDetail.orderID}`,
+                    orderID: orderDetail.orderID,
                     pwd: pwd,
                 }, (res) => {
                     if (res.result) {
@@ -136,6 +137,7 @@ export class PaymentFunction {
                     cmd: 'credit_card',
                     amount: `${total}`,
                     memo: `訂單ID:${orderDetail.orderID}`,
+                    orderID: orderDetail.orderID,
                     pwd: pwd,
                 });
             }

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

@@ -112,6 +112,7 @@ export class PaymentFunction {
                         {
                             amount: `${total}`,
                             memo: `訂單ID:${orderDetail.orderID}`,
+                            orderID:orderDetail.orderID,
                             pwd: pwd,
                         },
                         (res: any) => {
@@ -140,6 +141,7 @@ export class PaymentFunction {
                         cmd: 'credit_card',
                         amount: `${total}`,
                         memo: `訂單ID:${orderDetail.orderID}`,
+                      orderID:orderDetail.orderID,
                         pwd: pwd,
                     });
                 } else {

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

@@ -23,7 +23,8 @@ import { ApiUser } from '../glitter-base/route/user.js';
 import { PaymentConfig } from '../glitter-base/global/payment-config.js';
 const html = String.raw;
 export class ShoppingFinanceSetting {
-    static main(gvc) {
+    static main(gvc, pos) {
+        pos = (`${pos}` === 'true');
         const dialog = new ShareDialog(gvc.glitter);
         const saasConfig = window.parent.saasConfig;
         const vm = {
@@ -32,7 +33,7 @@ export class ShoppingFinanceSetting {
             posBoxId: gvc.glitter.getUUID(),
             offBoxId: gvc.glitter.getUUID(),
             loading: true,
-            page: 'online',
+            page: pos ? 'pos' : 'online',
         };
         let keyData = { payment_info_custom: [] };
         function refresh() {
@@ -193,7 +194,7 @@ export class ShoppingFinanceSetting {
         }
         return BgWidget.container(html `
       ${[
-            html ` <div class="title-container">
+            html ` <div class="title-container ${pos ? `d-none` : ``}">
           ${BgWidget.title('金流設定')}
           <div class="flex-fill"></div>
         </div>`,
@@ -726,7 +727,7 @@ export class ShoppingFinanceSetting {
                   </div>`;
                         }
                         if (vm.page === 'pos') {
-                            h = html ` <div class="px-md-0 px-2 mb-2">
+                            h = html `<div class="px-md-0 px-2 mb-2">
                     ${BgWidget.normalInsignia('設定實體店面所需串接的付款方式')}
                   </div>
                   <div class="row">
@@ -826,10 +827,9 @@ export class ShoppingFinanceSetting {
                   </div>`;
                         }
                         return [
-                            BgWidget.tab([
+                            pos ? `` : BgWidget.tab([
                                 { key: 'online', title: '線上金流' },
                                 { key: 'offline', title: '線下金流' },
-                                { key: 'pos', title: 'POS付款' },
                             ], gvc, vm.page, (key) => {
                                 vm.page = key;
                                 gvc.notifyDataChange(vm.id);
@@ -865,8 +865,10 @@ export class ShoppingFinanceSetting {
                 },
             }),
         ].join('')}
-      ${BgWidget.mbContainer(240)}
-    `);
+      ${pos ? `` : BgWidget.mbContainer(240)}
+    `, {
+            style: pos ? `margin-top: 0px !important;` : ``,
+        });
     }
     static tabView(gvc, viewList) {
         var _a;
@@ -1381,6 +1383,38 @@ export class ShoppingFinanceSetting {
         return this.tabView(gvc, [cashflow, shipment, cartSetting]);
     }
     static utCreditCard(gvc, data) {
+        const cashflow = {
+            key: 'cashflow',
+            title: '基本設定',
+            html: BgWidget.editeInput({
+                gvc: gvc,
+                title: '商家ID',
+                default: data.pwd,
+                callback: text => {
+                    data.pwd = text;
+                },
+                placeHolder: '請輸入商家ID',
+            }),
+        };
+        const shipment = {
+            key: 'shipment',
+            title: '指定物流',
+            html: gvc.bindView({
+                bind: gvc.glitter.getUUID(),
+                view: () => ShoppingFinanceSetting.setShipmentSupport(gvc, data),
+            }),
+        };
+        const cartSetting = {
+            key: 'cartSetting',
+            title: '購物車設定',
+            html: gvc.bindView({
+                bind: gvc.glitter.getUUID(),
+                view: () => ShoppingFinanceSetting.setCartSetting(gvc, data),
+            }),
+        };
+        return this.tabView(gvc, [cashflow, shipment, cartSetting]);
+    }
+    static myPayPos(gvc, data) {
         const cashflow = {
             key: 'cashflow',
             title: '基本設定',

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

@@ -24,7 +24,8 @@ type CustomFinance = {
 const html = String.raw;
 
 export class ShoppingFinanceSetting {
-  static main(gvc: GVC) {
+  static main(gvc: GVC,pos?:boolean) {
+    pos=(`${pos}`==='true')
     const dialog = new ShareDialog(gvc.glitter);
     const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
 
@@ -41,7 +42,7 @@ export class ShoppingFinanceSetting {
       posBoxId: gvc.glitter.getUUID(),
       offBoxId: gvc.glitter.getUUID(),
       loading: true,
-      page: 'online',
+      page: pos ? 'pos':'online',
     };
 
     let keyData: any = { payment_info_custom: [] };
@@ -223,7 +224,7 @@ export class ShoppingFinanceSetting {
 
     return BgWidget.container(html`
       ${[
-        html` <div class="title-container">
+        html` <div class="title-container ${pos ? `d-none`:``}">
           ${BgWidget.title('金流設定')}
           <div class="flex-fill"></div>
         </div>`,
@@ -790,7 +791,7 @@ export class ShoppingFinanceSetting {
 
               // POS
               if (vm.page === 'pos') {
-                h = html` <div class="px-md-0 px-2 mb-2">
+                h = html`<div class="px-md-0 px-2 mb-2">
                     ${BgWidget.normalInsignia('設定實體店面所需串接的付款方式')}
                   </div>
                   <div class="row">
@@ -827,6 +828,8 @@ export class ShoppingFinanceSetting {
                                                 return this.linePayScan(gvc, key_d);
                                               case 'ut_credit_card':
                                                 return this.utCreditCard(gvc, key_d);
+                                                // case 'my_pay':
+                                                //   return this.myPayPos(gvc, key_d); 
                                             }
                                             return ``;
                                           })()}
@@ -894,11 +897,11 @@ export class ShoppingFinanceSetting {
               }
 
               return [
-                BgWidget.tab(
+                pos ? ``: BgWidget.tab(
                   [
                     { key: 'online', title: '線上金流' },
                     { key: 'offline', title: '線下金流' },
-                    { key: 'pos', title: 'POS付款' },
+                    // { key: 'pos', title: 'POS付款' },
                   ],
                   gvc,
                   vm.page,
@@ -906,7 +909,8 @@ export class ShoppingFinanceSetting {
                     vm.page = key;
                     gvc.notifyDataChange(vm.id);
                   }
-                ),
+                )
+               ,
                 h,
               ].join('');
             } catch (e) {
@@ -939,8 +943,10 @@ export class ShoppingFinanceSetting {
           },
         }),
       ].join('')}
-      ${BgWidget.mbContainer(240)}
-    `);
+      ${pos ? ``:BgWidget.mbContainer(240)}
+    `,{
+      style: pos ? `margin-top: 0px !important;` : ``,
+    });
   }
 
   // 分頁模組
@@ -1513,6 +1519,43 @@ export class ShoppingFinanceSetting {
 
   // 彈窗: 聯合信用卡 (POS)
   static utCreditCard(gvc: GVC, data: any) {
+    const cashflow = {
+      key: 'cashflow',
+      title: '基本設定',
+      html: BgWidget.editeInput({
+        gvc: gvc,
+        title: '商家ID',
+        default: data.pwd,
+        callback: text => {
+          data.pwd = text;
+        },
+        placeHolder: '請輸入商家ID',
+      }),
+    };
+
+    const shipment = {
+      key: 'shipment',
+      title: '指定物流',
+      html: gvc.bindView({
+        bind: gvc.glitter.getUUID(),
+        view: () => ShoppingFinanceSetting.setShipmentSupport(gvc, data),
+      }),
+    };
+
+    const cartSetting = {
+      key: 'cartSetting',
+      title: '購物車設定',
+      html: gvc.bindView({
+        bind: gvc.glitter.getUUID(),
+        view: () => ShoppingFinanceSetting.setCartSetting(gvc, data),
+      }),
+    };
+
+    return this.tabView(gvc, [cashflow, shipment, cartSetting]);
+  }
+
+  // 彈窗: MyPay高鉅科技 (POS)
+  static myPayPos(gvc: GVC, data: any) {
     const cashflow = {
       key: 'cashflow',
       title: '基本設定',

package/lowcode/glitter-base/global/payment-config.js

@@ -76,9 +76,9 @@ PaymentConfig.onlinePay = [
     },
     {
         key: 'ut_credit_card',
-        name: '聯合信用卡',
+        name: '高鉅信用卡支付',
         type: 'pos',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/unnamed (1) copy.jpg',
+        img: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAgCAMAAADZqYNOAAAALVBMVEXzmB5HcEzzmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB5P11V9AAAAD3RSTlP/AEsrpvPHDhwH2XGJYTqdn/9qAAAA4UlEQVQokX3TSQLDIAgFUBBBTTT3P26BTK1a/6KDzxJFC5hoTMEzgAHGsBwL1exLdf6vkJdal7otlUk1hy7bzUF1zK1tqvLsaabbStvw3BblzrMoX/P37HG/iPt8v82V5ih+ChjndZNr5hnG6/SPZ4QlXtnzcHMkjz19tTyDpZTz7dXzSVUkYGMO+pH5Vb9m/sXOgW2j9dVq6rs7bKVVZ/SVGbTP9ZrV8Fe12hGtwdYEwU4jcAp+VysAdVo2/UFiK70D507JV66ly5eyxbR60Wavt2I6o+3JRNYiomT/Wx34AAcuBkbh8b8BAAAAAElFTkSuQmCC',
     },
 ];
 PaymentConfig.defalutOfflinePay = [

package/lowcode/glitter-base/global/payment-config.ts

@@ -40,10 +40,18 @@ export class PaymentConfig {
     },
     {
       key: 'ut_credit_card',
-      name: '聯合信用卡',
+      name: '高鉅信用卡支付',
       type: 'pos',
-      img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/unnamed (1) copy.jpg',
+      img: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAgCAMAAADZqYNOAAAALVBMVEXzmB5HcEzzmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB5P11V9AAAAD3RSTlP/AEsrpvPHDhwH2XGJYTqdn/9qAAAA4UlEQVQokX3TSQLDIAgFUBBBTTT3P26BTK1a/6KDzxJFC5hoTMEzgAHGsBwL1exLdf6vkJdal7otlUk1hy7bzUF1zK1tqvLsaabbStvw3BblzrMoX/P37HG/iPt8v82V5ih+ChjndZNr5hnG6/SPZ4QlXtnzcHMkjz19tTyDpZTz7dXzSVUkYGMO+pH5Vb9m/sXOgW2j9dVq6rs7bKVVZ/SVGbTP9ZrV8Fe12hGtwdYEwU4jcAp+VysAdVo2/UFiK70D507JV66ly5eyxbR60Wavt2I6o+3JRNYiomT/Wx34AAcuBkbh8b8BAAAAAElFTkSuQmCC',
     },
+    // {
+    //   key: 'my_pay',
+    //   name: '高鉅信用卡支付',
+    //   type: 'pos',
+    //   img: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB0AAAAgCAMAAADZqYNOAAAALVBMVEXzmB5HcEzzmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB7zmB5P11V9AAAAD3RSTlP/AEsrpvPHDhwH2XGJYTqdn/9qAAAA4UlEQVQokX3TSQLDIAgFUBBBTTT3P26BTK1a/6KDzxJFC5hoTMEzgAHGsBwL1exLdf6vkJdal7otlUk1hy7bzUF1zK1tqvLsaabbStvw3BblzrMoX/P37HG/iPt8v82V5ih+ChjndZNr5hnG6/SPZ4QlXtnzcHMkjz19tTyDpZTz7dXzSVUkYGMO+pH5Vb9m/sXOgW2j9dVq6rs7bKVVZ/SVGbTP9ZrV8Fe12hGtwdYEwU4jcAp+VysAdVo2/UFiK70D507JV66ly5eyxbR60Wavt2I6o+3JRNYiomT/Wx34AAcuBkbh8b8BAAAAAElFTkSuQmCC',
+    // },
+
+
   ];
 
   public static defalutOfflinePay = [