ts-glitter 20.5.3 → 20.5.5

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

@@ -35,27 +35,20 @@ type DashboardData = {
 export class OrderSetting {
   // 付款名稱
   static getPaymentMethodText(orderData: OrderData) {
-    if (orderData.orderSource === 'POS') {
-      return '門市POS付款';
-    }
-    switch (orderData.customer_info.payment_select) {
-      case 'off_line':
-        return '線下付款';
-      case 'newWebPay':
-        return '藍新金流';
-      case 'ecPay':
-        return '綠界金流';
-      case 'line_pay':
-        return 'Line Pay';
-      case 'atm':
-        return '銀行轉帳';
-      case 'line':
-        return 'Line 轉帳';
-      case 'cash_on_delivery':
-        return '貨到付款';
-      default:
-        return '線下付款';
-    }
+    const paymentMethods: Record<string, string> = {
+      POS: '門市POS付款',
+      off_line: '線下付款',
+      newWebPay: '藍新金流',
+      ecPay: '綠界金流',
+      line_pay: 'Line Pay',
+      atm: '銀行轉帳',
+      line: 'Line 轉帳',
+      cash_on_delivery: '貨到付款',
+    };
+
+    return orderData.orderSource === 'POS'
+      ? paymentMethods['POS']
+      : paymentMethods[orderData.customer_info.payment_select] || '線下付款';
   }
 
   // 配送名稱
@@ -1659,7 +1652,7 @@ export class OrderSetting {
     const orderCreateUnit = new OrderDetail(0, 0);
     assignOrder(orderCreateUnit);
     const splitOrderArray: OrderDetail[] = [structuredClone(orderCreateUnit)];
-    const passData = structuredClone(orderCreateUnit);//修改後的
+    const passData = structuredClone(orderCreateUnit); //修改後的
     const isDesktop = document.body.clientWidth > 768;
 
     const vm = {
@@ -1877,7 +1870,6 @@ export class OrderSetting {
 
     const closeDialog = () => glitter.closeDiaLog();
 
-
     const renderHeader = (gvc: GVC) =>
       gvc.bindView({
         bind: ids.header,
@@ -1899,33 +1891,35 @@ export class OrderSetting {
 
     const handleSave = () => {
       const alertHTML = html`
-      <div class="d-flex flex-column">
-        <div class="tx_normal text-start">您即將拆分訂單，系統將產生 ${splitOrderArray.length} 筆子訂單，拆分後：</div>
-        <ul class="${gClass('dialog-ul')}">
-          <li>原訂單調整金額與折扣，運費及附加費維持不變。子訂單按比例分配優惠。</li>
-          <li>子訂單繼承母訂單設定，發票需手動作廢與重開。 </li>
-          <li>代收金額更新，已建立的出貨單需取消並重新建立。</li>
-        </ul>
-      </div>
-      `
+        <div class="d-flex flex-column">
+          <div class="tx_normal text-start">
+            您即將拆分訂單，系統將產生 ${splitOrderArray.length} 筆子訂單，拆分後：
+          </div>
+          <ul class="${gClass('dialog-ul')}">
+            <li>原訂單調整金額與折扣，運費及附加費維持不變。子訂單按比例分配優惠。</li>
+            <li>子訂單繼承母訂單設定，發票需手動作廢與重開。</li>
+            <li>代收金額更新，已建立的出貨單需取消並重新建立。</li>
+          </ul>
+        </div>
+      `;
 
       dialog.checkYesOrNotWithCustomWidth({
         callback: bool => {
           if (bool) {
-            orderData.lineItems.forEach((lineItem:any,index:number)=>{
+            orderData.lineItems.forEach((lineItem: any, index: number) => {
               let count = 0;
-              count = splitOrderArray.reduce((total,order)=>{return total += Number(order.lineItems[index].count)},0)
+              count = splitOrderArray.reduce((total, order) => {
+                return (total += Number(order.lineItems[index].count));
+              }, 0);
               lineItem.count -= count;
-            })
+            });
             const passData = {
-              orderData : orderData,
-              splitOrderArray : splitOrderArray
-            }
-
+              orderData: orderData,
+              splitOrderArray: splitOrderArray,
+            };
 
             ApiShop.combineOrder(vm.dataObject).then(r => {
               if (r.result && r.response) {
-
               }
             });
             dialog.dataLoading({ visible: true });
@@ -1945,24 +1939,24 @@ export class OrderSetting {
       });
     };
 
-    const renderFooter = (gvc: GVC) => gvc.bindView({
-      bind:ids.footer,
-      view:()=>{
-        const allOrdersHaveZeroItems = splitOrderArray.every(order =>
-          order.lineItems.every(item => item.count === 0)
-        );
-        let checkBTN = ``;
-        if (!allOrdersHaveZeroItems) {
-          checkBTN = BgWidget.save(gvc.event(handleSave), '拆分訂單')
-        } else {
-          checkBTN = BgWidget.disableSave('拆分訂單')
-        }
+    const renderFooter = (gvc: GVC) =>
+      gvc.bindView({
+        bind: ids.footer,
+        view: () => {
+          const allOrdersHaveZeroItems = splitOrderArray.every(order =>
+            order.lineItems.every(item => item.count === 0)
+          );
+          let checkBTN = ``;
+          if (!allOrdersHaveZeroItems) {
+            checkBTN = BgWidget.save(gvc.event(handleSave), '拆分訂單');
+          } else {
+            checkBTN = BgWidget.disableSave('拆分訂單');
+          }
 
-        return html`
-          ${BgWidget.cancel(gvc.event(closeDialog))} ${checkBTN}
-        `
-      },divCreate:{class:`${gClass('footer')}`}
-    });
+          return html` ${BgWidget.cancel(gvc.event(closeDialog))} ${checkBTN} `;
+        },
+        divCreate: { class: `${gClass('footer')}` },
+      });
 
     const renderHint = (gvc: GVC) => {
       // mainCard 手機版專用
@@ -1996,27 +1990,33 @@ export class OrderSetting {
                       })
                       .join('')}
                   </ul>
-                  <div class="${gClass('split-rule')} ms-auto d-flex align-items-end" onclick="${gvc.event(()=>{
-                    BgWidget.settingDialog({
-                      gvc: gvc,
-                      title: '拆單需知',
-                      width: 766,
-                      innerHTML: gvc => {
-                        return html`
-                          <ul class="${gClass('dialog-ul')}">
-                            <li>原訂單將保留剩餘商品，訂單金額與折扣將調整；子訂單將包含選定商品，並按比例分配優惠折扣</li>
+                  <div
+                    class="${gClass('split-rule')} ms-auto d-flex align-items-end"
+                    onclick="${gvc.event(() => {
+                      BgWidget.settingDialog({
+                        gvc: gvc,
+                        title: '拆單需知',
+                        width: 766,
+                        innerHTML: gvc => {
+                          return html` <ul class="${gClass('dialog-ul')}">
+                            <li>
+                              原訂單將保留剩餘商品，訂單金額與折扣將調整；子訂單將包含選定商品，並按比例分配優惠折扣
+                            </li>
                             <li>拆單後運費及附加費用不變，將保留於原訂單內，如需更改，請手動編輯訂單新增費用</li>
                             <li>子訂單會預設繼承母訂單的配送與付款方式，如需更改，請手動編輯訂單內容</li>
                             <li>子訂單若要重新開立發票，請至發票頁面手動建立</li>
                             <li>若發票已開立，系統不會自動作廢，需至訂單頁面手動作廢並重新開立</li>
                             <li>代收金額將更新，已建立的出貨單需取消並重新建立</li>
                           </ul>`;
-                      },
-                      footer_html: (gvc: GVC) => {
-                        return '';
-                      },
-                    });
-                  })}">詳細拆單規則</div>
+                        },
+                        footer_html: (gvc: GVC) => {
+                          return '';
+                        },
+                      });
+                    })}"
+                  >
+                    詳細拆單規則
+                  </div>
                 </div>
               </div>
             `)}
@@ -2028,7 +2028,7 @@ export class OrderSetting {
     const renderItemList = (gvc: GVC) => {
       function newSplitOrder() {
         splitOrderArray.push(structuredClone(orderCreateUnit));
-        gvc.notifyDataChange([ids.itemList, ids.summary , ids.footer]);
+        gvc.notifyDataChange([ids.itemList, ids.summary, ids.footer]);
       }
       function drawSplitOrder() {
         const titleDom = {
@@ -2071,7 +2071,7 @@ export class OrderSetting {
                             } else {
                               item.count = temp;
                             }
-                            gvc.notifyDataChange([ids.itemList, ids.summary , ids.footer]);
+                            gvc.notifyDataChange([ids.itemList, ids.summary, ids.footer]);
                           })}"
                         />
                       `;
@@ -2138,7 +2138,7 @@ export class OrderSetting {
                             <img class="${gClass('product-preview-img')}" src="${item.preview_image}" alt="產品圖片" />
                             <div class="d-flex flex-column flex-grow-1" style="gap:2px;">
                               <div class="tx_normal_14" style="white-space: normal;line-height: normal;">
-                                ${Tool.truncateString(item.title??"", 10)} -${spec}
+                                ${Tool.truncateString(item.title ?? '', 10)} -${spec}
                               </div>
                               <div class="tx_normal_14 ${gClass('font-gray')}">
                                 存貨單位 (SKU): ${item.sku ?? '無SKU'}
@@ -2231,9 +2231,11 @@ export class OrderSetting {
     };
 
     const renderBlock = (gvc: GVC) => {
-      const subBlock = splitOrderArray.map((order, index) => {
-        return html`<div class="${gClass('summary-subSummary')}"></div>`
-      }).join('')
+      const subBlock = splitOrderArray
+        .map((order, index) => {
+          return html`<div class="${gClass('summary-subSummary')}"></div>`;
+        })
+        .join('');
       return html`
         <div class="d-flex" style="height:27px;">
           <div class="${gClass('summary-title')}"></div>
@@ -2303,7 +2305,9 @@ export class OrderSetting {
                     <div class="d-flex align-items-center">
                       <span class="text-decoration-line-through">${orderData.total}</span
                       ><i class="fa-solid fa-arrow-right ${gClass('font-blue')} ${gClass('summary-right')}"></i
-                      ><span class="${gClass('font-blue')}">${sale_price - split_price - discount + orderData.shipment_fee}</span>
+                      ><span class="${gClass('font-blue')}"
+                        >${sale_price - split_price - discount + orderData.shipment_fee}</span
+                      >
                     </div>
                   `;
                 }
@@ -2319,7 +2323,7 @@ export class OrderSetting {
                 0
               );
               const rate = total / orderData.total;
-              order.discount = Math.round(orderData.discount*rate)
+              order.discount = Math.round(orderData.discount * rate);
               //產品總價-折扣
               order.total = total - order.discount;
               switch (rawIndex) {

package/lowcode/cms-plugin/shopping-order-manager.ts

@@ -24,7 +24,7 @@ import { UserList } from './user-list.js';
 import { FilterOptions } from './filter-options.js';
 import { ListHeaderOption } from './list-header-option.js';
 import { ShoppingInvoiceManager } from './shopping-invoice-manager.js';
-import { CartData, LineItem } from './module/data.js';
+import { LineItem } from './module/data.js';
 import { OrderModule } from './order/order-module.js';
 
 const html = String.raw;

package/lowcode/public-components/product/pd-class.js

@@ -238,7 +238,8 @@ export class PdClass {
           >
             <div
               class="w-100 d-flex align-items-center p-3 border-bottom"
-              style="position: sticky; top: 0; background: #fff;z-index:12;height: calc(60px + ${gvc.glitter.share.top_inset}px);
+              style="position: sticky; top: 0; background: #fff;z-index:12;height: calc(60px + ${gvc.glitter.share
+                .top_inset}px);
               ${gvc.glitter.share.top_inset ? `padding-top: ${gvc.glitter.share.top_inset}px !important;` : ``}
 
 "
@@ -471,6 +472,19 @@ export class PdClass {
             return prod.variants.find(item => PdClass.ObjCompare(item.spec, vm.specs, true));
         }
     }
+    static showCanBuyStock(variant, titleFontColor) {
+        if (variant && variant.show_understocking !== 'false' && window.store_info.stock_view) {
+            const stockInt = parseInt(`${variant.stock}`, 10);
+            const stockValue = !isNaN(stockInt) && stockInt > 0 ? stockInt : 0;
+            const stockClass = stockValue === 0 ? 'text-danger' : '';
+            return html `
+        <div class="${stockClass} fw-500 mt-2 mb-1 fs-6" style="color: ${titleFontColor};">
+          ${Language.text('can_buy')}：${stockValue}
+        </div>
+      `;
+        }
+        return html `<div class=" fw-500 mt-2 mb-1 fs-6">&ensp;</div>`;
+    }
     static selectSpec(obj) {
         var _a, _b;
         const gvc = obj.gvc;
@@ -725,27 +739,12 @@ export class PdClass {
                         },
                     };
                 }),
-                gvc.bindView(() => {
-                    return {
-                        bind: ids.stock_count,
-                        view: () => {
-                            return [
-                                (() => {
-                                    const variant = PdClass.getVariant(prod, vm);
-                                    if (variant && variant.show_understocking !== 'false' && window.store_info.stock_view) {
-                                        const stockClass = `${variant.stock}` === '0' ? 'text-danger' : '';
-                                        return html `
-                        <div class="${stockClass} fw-500 mt-2" style="font-size: 14px; color: ${titleFontColor};">
-                          ${Language.text('can_buy')}：${variant.stock}
-                        </div>
-                      `;
-                                    }
-                                    return '';
-                                })(),
-                            ].join('');
-                        },
-                        divCreate: {},
-                    };
+                gvc.bindView({
+                    bind: ids.stock_count,
+                    view: () => {
+                        const variant = PdClass.getVariant(prod, vm);
+                        return this.showCanBuyStock(variant, titleFontColor);
+                    },
                 }),
                 gvc.bindView({
                     bind: ids.addCartButton,
@@ -1182,29 +1181,12 @@ export class PdClass {
                     <div class="mt-3"></div>`;
                 })
                     .join(''),
-                gvc.bindView(() => {
-                    return {
-                        bind: ids.stock_count,
-                        view: () => {
-                            return [
-                                (() => {
-                                    const variant = PdClass.getVariant(prod, vm);
-                                    if (variant &&
-                                        variant.show_understocking !== 'false' &&
-                                        window.store_info.stock_view) {
-                                        const stockClass = `${variant.stock}` === '0' ? 'text-danger' : '';
-                                        return html `
-                            <div class="${stockClass} fw-500 mt-2" style="font-size: 14px; color: ${titleFontColor};">
-                              ${Language.text('can_buy')}：${variant.stock}
-                            </div>
-                          `;
-                                    }
-                                    return '';
-                                })(),
-                            ].join('');
-                        },
-                        divCreate: {},
-                    };
+                gvc.bindView({
+                    bind: ids.stock_count,
+                    view: () => {
+                        const variant = PdClass.getVariant(prod, vm);
+                        return this.showCanBuyStock(variant, titleFontColor);
+                    },
                 }),
                 gvc.bindView({
                     bind: ids.addCartButton,

package/lowcode/public-components/product/pd-class.ts

@@ -365,8 +365,9 @@ export class PdClass {
           >
             <div
               class="w-100 d-flex align-items-center p-3 border-bottom"
-              style="position: sticky; top: 0; background: #fff;z-index:12;height: calc(60px + ${gvc.glitter.share.top_inset}px);
-              ${gvc.glitter.share.top_inset ? `padding-top: ${gvc.glitter.share.top_inset}px !important;`:``}
+              style="position: sticky; top: 0; background: #fff;z-index:12;height: calc(60px + ${gvc.glitter.share
+                .top_inset}px);
+              ${gvc.glitter.share.top_inset ? `padding-top: ${gvc.glitter.share.top_inset}px !important;` : ``}
 
 "
             >
@@ -631,6 +632,22 @@ export class PdClass {
     }
   }
 
+  static showCanBuyStock(variant: any, titleFontColor: string) {
+    if (variant && variant.show_understocking !== 'false' && (window as any).store_info.stock_view) {
+      const stockInt = parseInt(`${variant.stock}`, 10);
+      const stockValue = !isNaN(stockInt) && stockInt > 0 ? stockInt : 0;
+      const stockClass = stockValue === 0 ? 'text-danger' : '';
+
+      return html`
+        <div class="${stockClass} fw-500 mt-2 mb-1 fs-6" style="color: ${titleFontColor};">
+          ${Language.text('can_buy')}：${stockValue}
+        </div>
+      `;
+    }
+
+    return html`<div class=" fw-500 mt-2 mb-1 fs-6">&ensp;</div>`;
+  }
+
   static selectSpec(obj: {
     gvc: GVC;
     titleFontColor: string;
@@ -916,29 +933,12 @@ export class PdClass {
             };
           }),
           //庫存顯示
-          gvc.bindView(() => {
-            return {
-              bind: ids.stock_count,
-              view: () => {
-                return [
-                  (() => {
-                    const variant = PdClass.getVariant(prod, vm);
-
-                    if (variant && variant.show_understocking !== 'false' && (window as any).store_info.stock_view) {
-                      const stockClass = `${variant.stock}` === '0' ? 'text-danger' : '';
-                      return html`
-                        <div class="${stockClass} fw-500 mt-2" style="font-size: 14px; color: ${titleFontColor};">
-                          ${Language.text('can_buy')}：${variant.stock}
-                        </div>
-                      `;
-                    }
-
-                    return '';
-                  })(),
-                ].join('');
-              },
-              divCreate: {},
-            };
+          gvc.bindView({
+            bind: ids.stock_count,
+            view: () => {
+              const variant = PdClass.getVariant(prod, vm);
+              return this.showCanBuyStock(variant, titleFontColor);
+            },
           }),
           //購物車按鈕
           gvc.bindView({
@@ -1023,7 +1023,7 @@ export class PdClass {
                     style="height:44px;width:44px;"
                     onclick="${gvc.event(() => {
                       if (!GlobalUser.token) {
-                        gvc.glitter.href='/login'
+                        gvc.glitter.href = '/login';
                       }
                       const userID = (() => {
                         if (GlobalUser.token) {
@@ -1422,33 +1422,12 @@ export class PdClass {
                 })
                 .join(''),
               //庫存顯示
-              gvc.bindView(() => {
-                return {
-                  bind: ids.stock_count,
-                  view: () => {
-                    return [
-                      (() => {
-                        const variant = PdClass.getVariant(prod, vm);
-
-                        if (
-                          variant &&
-                          variant.show_understocking !== 'false' &&
-                          (window as any).store_info.stock_view
-                        ) {
-                          const stockClass = `${variant.stock}` === '0' ? 'text-danger' : '';
-                          return html`
-                            <div class="${stockClass} fw-500 mt-2" style="font-size: 14px; color: ${titleFontColor};">
-                              ${Language.text('can_buy')}：${variant.stock}
-                            </div>
-                          `;
-                        }
-
-                        return '';
-                      })(),
-                    ].join('');
-                  },
-                  divCreate: {},
-                };
+              gvc.bindView({
+                bind: ids.stock_count,
+                view: () => {
+                  const variant = PdClass.getVariant(prod, vm);
+                  return this.showCanBuyStock(variant, titleFontColor);
+                },
               }),
               //購物車按鈕
               gvc.bindView({

package/package.json

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