ts-glitter 22.5.7 → 22.5.9

package/lowcode/cms-plugin/order/order-module.js

@@ -20,77 +20,102 @@ import { PosFunction } from '../pos-pages/pos-function.js';
 const html = String.raw;
 export class OrderModule {
     static getPaymentMethodText(gvc, orderData) {
-        if (orderData.orderSource === 'POS') {
-            return `${(() => {
-                if (typeof orderData.pos_info.payment === 'string') {
-                    return `門市『 ${(() => {
-                        switch (orderData.pos_info.payment) {
-                            case 'creditCard':
-                                return '信用卡';
-                            case 'line':
-                                return 'Line Pay';
-                            case 'cash':
-                                return '現金';
-                        }
-                    })()} 』付款`;
-                }
-                else {
-                    const pay_total = orderData.pos_info.payment
-                        .map((dd) => {
-                        return dd.total;
-                    })
-                        .reduce((acc, val) => acc + val, 0);
-                    let map_ = orderData.pos_info.payment.map((dd) => {
-                        return `${(() => {
-                            switch (dd.method) {
-                                case 'creditCard':
-                                    return '信用卡';
-                                case 'line':
-                                    return 'Line Pay';
-                                case 'cash':
-                                    return '現金';
+        return gvc.bindView({
+            bind: gvc.glitter.getUUID(),
+            view: () => __awaiter(this, void 0, void 0, function* () {
+                var _a;
+                if (orderData.orderSource === 'POS') {
+                    const saasConfig = window.parent.saasConfig;
+                    const custom_pos_payment = yield saasConfig.api
+                        .getPrivateConfig(saasConfig.config.appName, 'glitter_finance')
+                        .then((d) => {
+                        return (() => {
+                            try {
+                                const val = d.response.result[0].value;
+                                return val.payment_info_custom
+                                    .filter((item) => item.type === 'pos')
+                                    .map((item) => {
+                                    return {
+                                        title: item.name,
+                                        value: item.id,
+                                        key: item.id,
+                                    };
+                                });
                             }
-                        })()}付款<span class="fw-500" style="color:#E85757;"> $${dd.total.toLocaleString()}</span>`;
+                            catch (error) {
+                                return [];
+                            }
+                        })();
                     });
-                    if (pay_total < orderData.total) {
-                        map_.push(html ` <div class="d-flex align-items-center">
-                <span class="fw-500 text-danger">付款金額不足</span>
-                <div class="mx-1"></div>
-                <span class="fw-500"> $${(orderData.total - pay_total).toLocaleString()}</span>
-                <div class="mx-1"></div>
-                ${BgWidget.customButton({
-                            button: {
-                                color: 'gray',
-                                size: 'sm',
-                            },
-                            text: {
-                                name: '前往結帳',
-                            },
-                            event: gvc.event(() => {
-                                PaymentPage.storeHistory(orderData);
-                                gvc.closeDialog();
-                                localStorage.setItem('show_pos_page', 'payment');
-                                gvc.glitter.share.reloadPosPage();
-                            }),
-                        })}
-              </div>`);
-                    }
-                    return map_.join('<div class="w-100"></div>');
+                    return this.formatPosPaymentInfo(gvc, orderData, custom_pos_payment);
+                }
+                return (((_a = (yield PaymentConfig.getSupportPayment()).find(dd => {
+                    return dd.key === orderData.customer_info.payment_select;
+                })) === null || _a === void 0 ? void 0 : _a.name) || '線下付款');
+            }),
+        });
+    }
+    static formatPosPaymentInfo(gvc, orderData, custom_pos_payment) {
+        if (typeof orderData.pos_info.payment === 'string') {
+            return `門市『 ${(() => {
+                switch (orderData.pos_info.payment) {
+                    case 'creditCard':
+                        return '信用卡';
+                    case 'line':
+                        return 'Line Pay';
+                    case 'cash':
+                        return '現金';
                 }
-            })()}
-            `;
+            })()} 』付款`;
         }
-        return gvc.bindView(() => {
-            return {
-                bind: gvc.glitter.getUUID(),
-                view: () => __awaiter(this, void 0, void 0, function* () {
-                    var _a;
-                    return (((_a = (yield PaymentConfig.getSupportPayment()).find(dd => {
-                        return dd.key === orderData.customer_info.payment_select;
-                    })) === null || _a === void 0 ? void 0 : _a.name) || '線下付款');
-                }),
-            };
+        const pay_total = orderData.pos_info.payment
+            .map((dd) => dd.total)
+            .reduce((acc, val) => acc + val, 0);
+        const getPaymentMethodLabel = (method) => {
+            if (method === 'cash') {
+                return '現金';
+            }
+            if (method === 'creditCard') {
+                return '刷卡';
+            }
+            if (method === 'line') {
+                return 'LINE PAY';
+            }
+            const payment = (custom_pos_payment || []).find((item) => item.key === method);
+            if (!payment) {
+                return '';
+            }
+            return payment.title;
+        };
+        let map_ = orderData.pos_info.payment.map((dd) => {
+            return html `${getPaymentMethodLabel(dd.method)}付款<span class="fw-500" style="color: #E85757;">
+          $${dd.total.toLocaleString()}</span
+        >`;
         });
+        if (pay_total < orderData.total) {
+            map_.push(html ` <div class="d-flex align-items-center">
+          <span class="fw-500 text-danger">付款金額不足</span>
+          <div class="mx-1"></div>
+          <span class="fw-500"> $${(orderData.total - pay_total).toLocaleString()}</span>
+          <div class="mx-1"></div>
+          ${BgWidget.customButton({
+                button: {
+                    color: 'gray',
+                    size: 'sm',
+                },
+                text: {
+                    name: '前往結帳',
+                },
+                event: gvc.event(() => {
+                    PaymentPage.storeHistory(orderData);
+                    gvc.closeDialog();
+                    localStorage.setItem('show_pos_page', 'payment');
+                    gvc.glitter.share.reloadPosPage();
+                }),
+            })}
+        </div>`);
+        }
+        return map_.join('<div class="w-100"></div>');
     }
     static getProofPurchaseString(gvc, orderData) {
         if (orderData.method !== 'off_line' || orderData.customer_info.payment_select === 'cash_on_delivery') {
@@ -284,10 +309,8 @@ export class OrderModule {
     }
     static formatRecord(gvc, vm, orderID, record) {
         const orderNumbers = record.match(/{{order=(\d+[a-zA-Z]?)}}/g) || [];
-        console.log('orderNumbers - ', orderNumbers);
         orderNumbers.map((order) => {
             const pureOrder = order.replace(/{{order=|}}/g, '');
-            console.log('pureOrder -- ', pureOrder);
             record = record.replace(order, BgWidget.blueNote(`#${pureOrder}`, gvc.event(() => {
                 vm.data.cart_token = pureOrder;
                 vm.type = 'replace';

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

@@ -14,79 +14,114 @@ const html = String.raw;
 
 export class OrderModule {
   static getPaymentMethodText(gvc: GVC, orderData: any) {
-    if (orderData.orderSource === 'POS') {
-      return `${(() => {
-        if (typeof orderData.pos_info.payment === 'string') {
-          return `門市『 ${(() => {
-            switch (orderData.pos_info.payment) {
-              case 'creditCard':
-                return '信用卡';
-              case 'line':
-                return 'Line Pay';
-              case 'cash':
-                return '現金';
-            }
-          })()} 』付款`;
-        } else {
-          const pay_total = orderData.pos_info.payment
-            .map((dd: any) => {
-              return dd.total;
-            })
-            .reduce((acc: any, val: any) => acc + val, 0);
-          let map_ = orderData.pos_info.payment.map((dd: any) => {
-            return `${(() => {
-              switch (dd.method) {
-                case 'creditCard':
-                  return '信用卡';
-                case 'line':
-                  return 'Line Pay';
-                case 'cash':
-                  return '現金';
-              }
-            })()}付款<span class="fw-500" style="color:#E85757;"> $${dd.total.toLocaleString()}</span>`;
-          });
-          if (pay_total < orderData.total) {
-            map_.push(
-              html` <div class="d-flex align-items-center">
-                <span class="fw-500 text-danger">付款金額不足</span>
-                <div class="mx-1"></div>
-                <span class="fw-500"> $${(orderData.total - pay_total).toLocaleString()}</span>
-                <div class="mx-1"></div>
-                ${BgWidget.customButton({
-                  button: {
-                    color: 'gray',
-                    size: 'sm',
-                  },
-                  text: {
-                    name: '前往結帳',
-                  },
-                  event: gvc.event(() => {
-                    PaymentPage.storeHistory(orderData);
-                    gvc.closeDialog();
-                    localStorage.setItem('show_pos_page', 'payment');
-                    gvc.glitter.share.reloadPosPage();
-                  }),
-                })}
-              </div>`
-            );
-          }
-          return map_.join('<div class="w-100"></div>');
+    return gvc.bindView({
+      bind: gvc.glitter.getUUID(),
+      view: async () => {
+        if (orderData.orderSource === 'POS') {
+          const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
+
+          const custom_pos_payment = await saasConfig.api
+            .getPrivateConfig(saasConfig.config.appName, 'glitter_finance')
+            .then((d: any) => {
+              return (() => {
+                try {
+                  const val = d.response.result[0].value;
+
+                  return val.payment_info_custom
+                    .filter((item: any) => item.type === 'pos')
+                    .map((item: any) => {
+                      return {
+                        title: item.name,
+                        value: item.id,
+                        key: item.id,
+                      };
+                    });
+                } catch (error) {
+                  return [];
+                }
+              })();
+            });
+          return this.formatPosPaymentInfo(gvc, orderData, custom_pos_payment);
         }
-      })()}
-            `;
+
+        return (
+          (await PaymentConfig.getSupportPayment()).find(dd => {
+            return dd.key === orderData.customer_info.payment_select;
+          })?.name || '線下付款'
+        );
+      },
+    });
+  }
+
+  static formatPosPaymentInfo(gvc: GVC, orderData: any, custom_pos_payment: any) {
+    if (typeof orderData.pos_info.payment === 'string') {
+      return `門市『 ${(() => {
+        switch (orderData.pos_info.payment) {
+          case 'creditCard':
+            return '信用卡';
+          case 'line':
+            return 'Line Pay';
+          case 'cash':
+            return '現金';
+        }
+      })()} 』付款`;
     }
-    return gvc.bindView(() => {
-      return {
-        bind: gvc.glitter.getUUID(),
-        view: async () => {
-          return (
-            (await PaymentConfig.getSupportPayment()).find(dd => {
-              return dd.key === orderData.customer_info.payment_select;
-            })?.name || '線下付款'
-          );
-        },
-      };
+
+    const pay_total = orderData.pos_info.payment
+      .map((dd: any) => dd.total)
+      .reduce((acc: any, val: any) => acc + val, 0);
+
+    const getPaymentMethodLabel = (method: string) => {
+      if (method === 'cash') {
+        return '現金';
+      }
+      if (method === 'creditCard') {
+        return '刷卡';
+      }
+      if (method === 'line') {
+        return 'LINE PAY';
+      }
+
+      const payment = (custom_pos_payment || []).find((item: any) => item.key === method);
+      if (!payment) {
+        return '';
+      }
+      return payment.title;
+    };
+
+    let map_ = orderData.pos_info.payment.map((dd: any) => {
+      return html`${getPaymentMethodLabel(dd.method)}付款<span class="fw-500" style="color: #E85757;">
+          $${dd.total.toLocaleString()}</span
+        >`;
     });
+
+    if (pay_total < orderData.total) {
+      map_.push(
+        html` <div class="d-flex align-items-center">
+          <span class="fw-500 text-danger">付款金額不足</span>
+          <div class="mx-1"></div>
+          <span class="fw-500"> $${(orderData.total - pay_total).toLocaleString()}</span>
+          <div class="mx-1"></div>
+          ${BgWidget.customButton({
+            button: {
+              color: 'gray',
+              size: 'sm',
+            },
+            text: {
+              name: '前往結帳',
+            },
+            event: gvc.event(() => {
+              PaymentPage.storeHistory(orderData);
+              gvc.closeDialog();
+              localStorage.setItem('show_pos_page', 'payment');
+              gvc.glitter.share.reloadPosPage();
+            }),
+          })}
+        </div>`
+      );
+    }
+
+    return map_.join('<div class="w-100"></div>');
   }
 
   static getProofPurchaseString(gvc: GVC, orderData: any) {
@@ -304,12 +339,9 @@ export class OrderModule {
 
   static formatRecord(gvc: GVC, vm: any, orderID: string, record: string): string {
     // 處理訂單連結
-
     const orderNumbers = record.match(/{{order=(\d+[a-zA-Z]?)}}/g) || [];
-    console.log('orderNumbers - ', orderNumbers);
     orderNumbers.map((order: string) => {
       const pureOrder = order.replace(/{{order=|}}/g, '');
-      console.log('pureOrder -- ', pureOrder);
       record = record.replace(
         order,
         BgWidget.blueNote(

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

@@ -26,7 +26,9 @@ export class PosCheckoutSetting {
         const dialog = new ShareDialog(gvc.glitter);
         function save(next) {
             dialog.dataLoading({ visible: true, text: '請稍候...' });
-            saasConfig.api.setPrivateConfig(saasConfig.config.appName, `invoice_setting`, vm.data).then((r) => {
+            saasConfig.api
+                .setPrivateConfig(saasConfig.config.appName, `invoice_setting`, vm.data)
+                .then((r) => {
                 setTimeout(() => {
                     dialog.dataLoading({ visible: false, text: '請稍候...' });
                     if (r.response) {
@@ -42,11 +44,11 @@ export class PosCheckoutSetting {
             bind: vm.id,
             view: () => {
                 return BgWidget.container(html `
-                        <div class="title-container">
-                            ${BgWidget.title(`發票設定`)}
-                            <div class="flex-fill"></div>
-                        </div>
-                        ${BgWidget.container([
+          <div class="title-container">
+            ${BgWidget.title(`發票設定`)}
+            <div class="flex-fill"></div>
+          </div>
+          ${BgWidget.container([
                     BgWidget.mainCard(gvc.bindView(() => {
                         const id = gvc.glitter.getUUID();
                         return {
@@ -71,13 +73,15 @@ export class PosCheckoutSetting {
                                             bind: id,
                                             view: () => {
                                                 return html `
-                                                                        <div class="d-flex flex-column" style="gap:18px;">
-                                                                            ${[
+                                  <div class="d-flex flex-column" style="gap:18px;">
+                                    ${[
                                                     {
                                                         title: html ` <div class="d-flex flex-column">
-                                                                                        開立發票
-                                                                                        <span  style="color:#8D8D8D;font-size: 12px;">串接綠界電子發票系統進行發票開立</span>
-                                                                                    </div>`,
+                                          開立發票
+                                          <span style="color:#8D8D8D;font-size: 12px;"
+                                            >串接綠界電子發票系統進行發票開立</span
+                                          >
+                                        </div>`,
                                                         value: 'ecpay',
                                                     },
                                                     {
@@ -85,26 +89,29 @@ export class PosCheckoutSetting {
                                                         value: 'nouse',
                                                     },
                                                 ]
-                                                    .map((dd) => {
+                                                    .map(dd => {
                                                     return html ` <div>
-                                                                                        ${[
+                                          ${[
                                                         html ` <div
-                                                                                                class="d-flex align-items-center cursor_pointer"
-                                                                                                style="gap:8px;"
-                                                                                                onclick="${gvc.event(() => {
+                                              class="d-flex align-items-center cursor_pointer"
+                                              style="gap:8px;"
+                                              onclick="${gvc.event(() => {
                                                             vm.data.fincial = dd.value;
                                                             gvc.notifyDataChange(id);
                                                         })}"
-                                                                                            >
-                                                                                                ${vm.data.fincial === dd.value
+                                            >
+                                              ${vm.data.fincial === dd.value
                                                             ? `<i class="fa-sharp fa-solid fa-circle-dot color39"></i>`
                                                             : ` <div class="c_39_checkbox"></div>`}
-                                                                                                <div class="tx_normal fw-normal">${dd.title}</div>
-                                                                                            </div>`,
-                                                        html ` <div class="d-flex position-relative mt-2" >
-                                                                                                <div class="ms-2 border-end position-absolute h-100" style="left: 0px;"></div>
-                                                                                                <div class="flex-fill " style="margin-left:30px;max-width: 518px;">
-                                                                                                    ${(() => {
+                                              <div class="tx_normal fw-normal">${dd.title}</div>
+                                            </div>`,
+                                                        html ` <div class="d-flex position-relative mt-2">
+                                              <div
+                                                class="ms-2 border-end position-absolute h-100"
+                                                style="left: 0px;"
+                                              ></div>
+                                              <div class="flex-fill " style="margin-left:30px;max-width: 518px;">
+                                                ${(() => {
                                                             var _a, _b, _c;
                                                             if (vm.data.fincial === 'nouse' ||
                                                                 vm.data.fincial === 'off_line' ||
@@ -127,7 +134,7 @@ export class PosCheckoutSetting {
                                                                                 value: 'official',
                                                                             },
                                                                         ],
-                                                                        callback: (text) => {
+                                                                        callback: text => {
                                                                             vm.data.point = text;
                                                                             if (vm.data.point == 'beta') {
                                                                                 vm.data.hashkey = vm.data.bhashkey;
@@ -142,11 +149,11 @@ export class PosCheckoutSetting {
                                                                     }),
                                                                     BgWidget.editeInput({
                                                                         gvc: gvc,
-                                                                        title: '特店編號',
+                                                                        title: '商店代號',
                                                                         default: (_a = vm.data.merchNO) !== null && _a !== void 0 ? _a : '',
                                                                         type: 'text',
-                                                                        placeHolder: '請輸入特店編號',
-                                                                        callback: (text) => {
+                                                                        placeHolder: '請輸入商店代號',
+                                                                        callback: text => {
                                                                             vm.data.merchNO = text;
                                                                         },
                                                                     }),
@@ -156,7 +163,7 @@ export class PosCheckoutSetting {
                                                                         default: (_b = vm.data.hashkey) !== null && _b !== void 0 ? _b : '',
                                                                         type: 'text',
                                                                         placeHolder: '請輸入HashKey',
-                                                                        callback: (text) => {
+                                                                        callback: text => {
                                                                             vm.data.hashkey = text;
                                                                             if (vm.data.point == 'beta') {
                                                                                 vm.data.bhashkey = text;
@@ -172,7 +179,7 @@ export class PosCheckoutSetting {
                                                                         default: (_c = vm.data.hashiv) !== null && _c !== void 0 ? _c : '',
                                                                         type: 'text',
                                                                         placeHolder: '請輸入HashIV',
-                                                                        callback: (text) => {
+                                                                        callback: text => {
                                                                             vm.data.hashiv = text;
                                                                             if (vm.data.point == 'beta') {
                                                                                 vm.data.bhashiv = text;
@@ -182,17 +189,17 @@ export class PosCheckoutSetting {
                                                                             }
                                                                         },
                                                                     }),
-                                                                ].join(html ` <div  style="height: 12px;"></div>`);
+                                                                ].join(html ` <div style="height: 12px;"></div>`);
                                                             }
                                                         })()}
-                                                                                                </div>
-                                                                                            </div>`,
+                                              </div>
+                                            </div>`,
                                                     ].join('')}
-                                                                                    </div>`;
+                                        </div>`;
                                                 })
                                                     .join('')}
-                                                                        </div>
-                                                                    `;
+                                  </div>
+                                `;
                                             },
                                             divCreate: {
                                                 style: ``,
@@ -210,14 +217,14 @@ export class PosCheckoutSetting {
                     })),
                     BgWidget.mbContainer(240),
                     html ` <div class="update-bar-container">
-                                    ${BgWidget.save(gvc.event(() => {
+                ${BgWidget.save(gvc.event(() => {
                         save(() => {
                             dialog.successMessage({ text: '設定成功' });
                         });
                     }))}
-                                </div>`,
+              </div>`,
                 ].join(''))}
-                    `);
+        `);
             },
         });
     }