ts-glitter 21.2.3 → 21.2.5

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

@@ -342,7 +342,6 @@ export class PosFunction {
           `;
         },
         divCreate: {
-          class: '',
           style: `width: 338px; max-height: 400px; overflow-y: auto; padding: 25px 20px; background: white; box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.15); border-radius: 20px; display: flex; flex-direction: column; align-items: center; gap: 10px;`,
         },
       }));
@@ -477,86 +476,129 @@ export class PosFunction {
   }
 
   // SetMoney
-  public static setMoney(gvc: GVC, callback: (money: number) => void, title?: string) {
+  public static setMoney(gvc: GVC, def: number, callback: (money: number) => void, title?: string) {
     gvc.glitter.innerDialog(gvc => {
       const c_vm = {
-        text: '',
         id: gvc.glitter.getUUID(),
+        addListener: false,
+        text: def ? `${def}` : '',
       };
 
       const numberButtons = [
-        [1, 2, 3],
-        [4, 5, 6],
         [7, 8, 9],
-        ['<i class="fa-regular fa-delete-left"></i>', 0, '確認'],
+        [4, 5, 6],
+        [1, 2, 3],
+        ['C', 0, '<i class="fa-regular fa-delete-left"></i>'],
       ];
 
       const handleButtonClick = (value: any) => {
-        if (value === '確認') {
-          callback(parseInt(c_vm.text, 10));
-          gvc.closeDialog();
+        if (value === '確認' || value === 'Enter') {
+          saveEvent();
         } else if (value === '取消') {
-          gvc.closeDialog();
-        } else if (typeof value === 'string' && value.includes('fa-regular')) {
+          closeEvent();
+        } else if (value === 'Backspace' || (typeof value === 'string' && value.includes('fa-regular'))) {
           c_vm.text = c_vm.text.slice(0, -1);
           gvc.notifyDataChange(c_vm.id);
+        } else if (value === 'c' || value === 'C') {
+          c_vm.text = '';
+          gvc.notifyDataChange(c_vm.id);
         } else {
           c_vm.text += value;
+          if (c_vm.text[0] === '0') {
+            c_vm.text = c_vm.text.slice(1, c_vm.text.length);
+          }
           gvc.notifyDataChange(c_vm.id);
         }
       };
 
+      const numberBoardClickEvent = (e: any) => {
+        const key = e.key;
+
+        if (/^[0-9]$/.test(key) || key === 'Backspace' || key === 'Enter' || key.toLowerCase() === 'c') {
+          handleButtonClick(key);
+        }
+      };
+
+      const closeEvent = () => {
+        document.removeEventListener('keydown', numberBoardClickEvent);
+        gvc.closeDialog();
+      };
+
+      const saveEvent = () => {
+        callback(parseInt(c_vm.text, 10));
+        closeEvent();
+      };
+
       return gvc.bindView(() => ({
         bind: c_vm.id,
-        view: () => html`
-          <div
-            style="flex-direction: column; justify-content: flex-start; align-items: flex-start; gap: 20px; display: inline-flex"
-          >
-            <div style="align-self: stretch; display: inline-flex; justify-content: center;">
-              <div class="fw-bold" style="text-align: center; color: #585858; font-size: 28px;">
-                ${title || '輸入收款金額'}
-              </div>
-            </div>
-            <div class="border w-100 p-3 rounded-3 d-flex align-items-center justify-content-end" style="gap: 20px;">
-              <span style="font-size: 28px;">${c_vm.text || 0}</span>
-            </div>
+        view: () => {
+          return html`
             <div
-              style="background: white; flex-direction: column; justify-content: flex-start; align-items: center; gap: 32px; display: flex"
+              style="flex-direction: column; justify-content: flex-start; align-items: flex-end; gap: 20px; display: inline-flex"
             >
+              <div style="align-self: stretch; display: inline-flex; justify-content: center;">
+                <div class="fw-bold" style="text-align: center; color: #585858; font-size: 28px;">
+                  ${title || '輸入收款金額'}
+                </div>
+              </div>
+              <div class="border w-100 p-3 rounded-3 d-flex align-items-center justify-content-end" style="gap: 20px;">
+                <span style="font-size: 28px;">${c_vm.text || 0}</span>
+              </div>
               <div
-                style="align-self: stretch; border-radius: 10px; border: 1px solid #DDD; display: flex; flex-direction: column;"
+                style="background: white; flex-direction: column; justify-content: flex-start; align-items: center; gap: 32px; display: flex"
               >
-                ${numberButtons
-                  .map(
-                    row => html`
-                      <div style="display: inline-flex; justify-content: flex-start; align-items: center;">
-                        ${row
-                          .map(
-                            value => html`
-                              <div
-                                style="height: 56px; width: 95px; display: inline-flex; flex-direction: column; justify-content: center; align-items: center; gap: 10px;"
-                                onclick="${gvc.event(() => handleButtonClick(value))}"
-                              >
+                <div
+                  style="align-self: stretch; border-radius: 10px; border: 1px solid #DDD; display: flex; flex-direction: column;"
+                >
+                  ${numberButtons
+                    .map(
+                      row => html`
+                        <div style="display: inline-flex; justify-content: flex-start; align-items: center;">
+                          ${row
+                            .map(
+                              value => html`
                                 <div
-                                  style="align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px;"
+                                  style="height: 56px; width: 95px; display: inline-flex; flex-direction: column; justify-content: center; align-items: center; gap: 10px;"
+                                  onclick="${gvc.event(() => handleButtonClick(value))}"
                                 >
-                                  ${value}
+                                  <div
+                                    style="align-self: stretch; text-align: center; color: #393939; font-size: 20px; font-weight: 700; line-height: 28px;"
+                                  >
+                                    ${value}
+                                  </div>
                                 </div>
-                              </div>
-                            `
-                          )
-                          .join('<div style="border-right: 1px #DDDDDD solid; height: 56px;"></div>')}
-                      </div>
-                    `
-                  )
-                  .join('<div style="border-top: 1px #DDDDDD solid; height: 1px; width: 100%;"></div>')}
+                              `
+                            )
+                            .join('<div style="border-right: 1px #DDDDDD solid; height: 56px;"></div>')}
+                        </div>
+                      `
+                    )
+                    .join('<div style="border-top: 1px #DDDDDD solid; height: 1px; width: 100%;"></div>')}
+                </div>
               </div>
+              <div>${BgWidget.save(gvc.event(saveEvent), '確認')}</div>
             </div>
-          </div>
-        `,
+          `;
+        },
         divCreate: {
-          class: '',
-          style: `width: 338px; padding: 25px 20px; background: white; box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.15); border-radius: 20px; overflow: hidden; display: flex; flex-direction: column; align-items: center; gap: 10px;`,
+          style: `
+            width: 338px;
+            padding: 25px 20px;
+            background: white;
+            box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.15);
+            border-radius: 20px;
+            overflow: hidden;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            gap: 10px;
+          `,
+        },
+        onCreate: () => {
+          if (!c_vm.addListener) {
+            c_vm.addListener = true;
+            document.addEventListener('keydown', numberBoardClickEvent);
+          }
         },
       }));
     }, 'setMoney');
@@ -615,11 +657,12 @@ export class PosFunction {
         };
 
         const handlePaymentAmountClick = (method: any, id: string, gvc: GVC, dialog: ShareDialog) => {
+          console.log(method);
           if (method.paied) {
             dialog.errorMessage({ text: '此付款金額已結清，無法進行調整' });
             return;
           }
-          PosFunction.setMoney(gvc, money => {
+          PosFunction.setMoney(gvc, method.total, money => {
             method.total = money || 0;
             gvc.notifyDataChange(id);
           });
@@ -735,16 +778,23 @@ export class PosFunction {
 
                     return btnArray
                       .map(btn => {
-                        return `
-                                                <div style="flex: 1; display: flex; flex-direction: column; justify-content: center; align-items: center; padding: 15px; border-radius: 10px; background: #F6F6F6; ${method.method === btn.value ? 'color: #393939; border: 3px solid #393939; box-shadow: 2px 2px 15px rgba(0, 0, 0, 0.20);' : 'color: #8D8D8D;'}"
-                                                    onclick="${gvc.event(() => {
-                                                      method = { method: btn.value, total: 0 };
-                                                      gvc.notifyDataChange(id);
-                                                    })}">
-                                                    <div style="width: 28px; height: 28px;">${drawIcon(method.method === btn.value, btn.value)}</div>
-                                                    <div style="font-size: 16px; font-weight: 500;">${btn.title}</div>
-                                                </div>
-                                            `;
+                        return html`
+                          <div
+                            style="flex: 1; display: flex; flex-direction: column; justify-content: center; align-items: center; padding: 15px; border-radius: 10px; background: #F6F6F6; ${method.method ===
+                            btn.value
+                              ? 'color: #393939; border: 3px solid #393939; box-shadow: 2px 2px 15px rgba(0, 0, 0, 0.20);'
+                              : 'color: #8D8D8D;'}"
+                            onclick="${gvc.event(() => {
+                              method = { method: btn.value, total: 0 };
+                              gvc.notifyDataChange(id);
+                            })}"
+                          >
+                            <div style="width: 28px; height: 28px;">
+                              ${drawIcon(method.method === btn.value, btn.value)}
+                            </div>
+                            <div style="font-size: 16px; font-weight: 500;">${btn.title}</div>
+                          </div>
+                        `;
                       })
                       .join('');
                   })()}

package/lowcode/glitter-base/global/global-user.js

@@ -30,11 +30,13 @@ export class GlobalUser {
     }
     static set token(value) {
         GlobalUser.getWindow().glitter.setCookie(GlobalUser.getTag('token'), value);
-        if (value) {
-            GlobalUser.registerFCM(value);
-        }
-        else {
-            GlobalUser.unregisterFCM();
+        if (!['cms_system'].includes(window.appName)) {
+            if (value) {
+                GlobalUser.registerFCM(value);
+            }
+            else {
+                GlobalUser.unregisterFCM();
+            }
         }
     }
     static registerFCM(value) {

package/lowcode/glitter-base/global/global-user.ts

@@ -39,10 +39,12 @@ export class GlobalUser {
 
   public static set token(value) {
     GlobalUser.getWindow().glitter.setCookie(GlobalUser.getTag('token'), value);
-    if(value){
-      GlobalUser.registerFCM(value);
-    }else{
-      GlobalUser.unregisterFCM()
+    if(!['cms_system'].includes((window as any).appName)){
+      if(value){
+        GlobalUser.registerFCM(value);
+      }else{
+        GlobalUser.unregisterFCM()
+      }
     }
 
   }

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

@@ -1181,6 +1181,7 @@ export class CheckoutIndex {
                                             return d1.reBackType === 'giveaway';
                                         })
                                             .map((dd) => {
+                                            dd.add_on_products = dd.add_on_products.filter(Boolean);
                                             let isSelected = already_add.find(d2 => {
                                                 return dd.add_on_products.find((d1) => {
                                                     return d1.id === d2.id;
@@ -1296,7 +1297,7 @@ export class CheckoutIndex {
                                                                 callback: () => {
                                                                     let find = vm.cartData.lineItems.find((d1) => {
                                                                         return dd.add_on_products.find((d2) => {
-                                                                            return d2.id === d1.id;
+                                                                            return d2 && d2.id === d1.id;
                                                                         });
                                                                     });
                                                                     if (find) {
@@ -1351,14 +1352,14 @@ export class CheckoutIndex {
                                       `;
                                         })
                                             .join('');
-                                        return giftHtml && `<div class="rounded-3 bg-white p-3 mt-3">${giftHtml}</div>`;
+                                        return giftHtml && html `<div class="rounded-3 bg-white p-3 mt-3">${giftHtml}</div>`;
                                     })()}
                                 <!--加購品-->
                                 ${(() => {
                                         let add_on = [];
                                         vm.cartData.voucherList.filter((dd) => {
                                             if (dd.reBackType === 'add_on_items') {
-                                                add_on = add_on.concat(dd.add_on_products);
+                                                add_on = add_on.concat(dd.add_on_products).filter(Boolean);
                                             }
                                         });
                                         if (add_on.length) {
@@ -1472,6 +1473,7 @@ export class CheckoutIndex {
                                                                         is_gift: true,
                                                                         callback: () => {
                                                                             gvc.closeDialog();
+                                                                            console.log(5);
                                                                             let find = vm.cartData.lineItems.find((d1) => {
                                                                                 return dd.add_on_products.find((d2) => {
                                                                                     return d2.id === d1.id;

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

@@ -1315,14 +1315,18 @@ export class CheckoutIndex {
                                       return d1.reBackType === 'giveaway';
                                     })
                                     .map((dd: any) => {
+                                      dd.add_on_products = dd.add_on_products.filter(Boolean);
+
                                       let isSelected = already_add.find(d2 => {
                                         return dd.add_on_products.find((d1: any) => {
                                           return d1.id === d2.id;
                                         });
                                       });
+
                                       already_add = already_add.filter(dd => {
                                         return !dd === isSelected;
                                       });
+
                                       return html`
                                         <span class="${gClass('banner-text')}">${dd.title}</span>
                                         <div class="d-flex align-items-center w-100" style="overflow-x:auto;gap:10px;">
@@ -1442,7 +1446,7 @@ export class CheckoutIndex {
                                                                       let find = vm.cartData.lineItems.find(
                                                                         (d1: any) => {
                                                                           return dd.add_on_products.find((d2: any) => {
-                                                                            return d2.id === d1.id;
+                                                                            return d2 && d2.id === d1.id;
                                                                           });
                                                                         }
                                                                       );
@@ -1501,14 +1505,14 @@ export class CheckoutIndex {
                                       `;
                                     })
                                     .join('');
-                                  return giftHtml && `<div class="rounded-3 bg-white p-3 mt-3">${giftHtml}</div>`;
+                                  return giftHtml && html`<div class="rounded-3 bg-white p-3 mt-3">${giftHtml}</div>`;
                                 })()}
                                 <!--加購品-->
                                 ${(() => {
                                   let add_on: any[] = [];
                                   vm.cartData.voucherList.filter((dd: any) => {
                                     if (dd.reBackType === 'add_on_items') {
-                                      add_on = add_on.concat(dd.add_on_products);
+                                      add_on = add_on.concat(dd.add_on_products).filter(Boolean);
                                     }
                                   });
                                   if (add_on.length) {
@@ -1634,6 +1638,7 @@ export class CheckoutIndex {
                                                                         is_gift: true,
                                                                         callback: () => {
                                                                           gvc.closeDialog();
+                                                                          console.log(5);
                                                                           let find = vm.cartData.lineItems.find(
                                                                             (d1: any) => {
                                                                               return dd.add_on_products.find(

package/package.json

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

package/src/api-public/controllers/shop.js

@@ -22,6 +22,7 @@ const pos_js_1 = require("../services/pos.js");
 const shopnex_line_message_1 = require("../services/model/shopnex-line-message");
 const caught_error_js_1 = require("../../modules/caught-error.js");
 const checkout_event_js_1 = require("../services/checkout-event.js");
+const monitor_js_1 = require("../services/monitor.js");
 const router = express_1.default.Router();
 router.post('/worker', async (req, resp) => {
     try {
@@ -158,7 +159,7 @@ router.post('/checkout', async (req, resp) => {
             code_array: req.body.code_array,
             give_away: req.body.give_away,
             language: req.headers['language'],
-            client_ip_address: (req.query.ip || req.headers['x-real-ip'] || req.ip),
+            client_ip_address: monitor_js_1.Monitor.userIP(req),
             fbc: req.cookies._fbc,
             fbp: req.cookies._fbp,
             temp_cart_id: req.body.temp_cart_id,