ts-glitter 20.7.4 → 20.7.6

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

@@ -62,6 +62,7 @@ export interface OrderData {
     CVSTelephone: string;
     MerchantTradeNo: string;
     CVSAddress: string;
+    shipment_number?: string;
     note?: string;
     code_note?: string;
   };

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

@@ -78,32 +78,50 @@ export class OrderSetting {
             };
         });
     }
-    static getAllStatusBadge(orderData) {
-        var _a;
+    static getAllStatusBadge(order, size = 'md') {
         const paymentBadges = {
-            '0': orderData.orderData.proof_purchase ? BgWidget.warningInsignia('待核款') : BgWidget.notifyInsignia('未付款'),
-            '1': BgWidget.infoInsignia('已付款'),
-            '3': BgWidget.warningInsignia('部分付款'),
-            '-2': BgWidget.notifyInsignia('已退款'),
+            '0': (() => {
+                if (order.orderData.proof_purchase) {
+                    return BgWidget.warningInsignia('待核款', { size });
+                }
+                if (order.orderData.customer_info.payment_select == 'cash_on_delivery') {
+                    return BgWidget.warningInsignia('貨到付款', { size });
+                }
+                return BgWidget.notifyInsignia('未付款', { size });
+            })(),
+            '1': BgWidget.infoInsignia('已付款', { size }),
+            '3': BgWidget.warningInsignia('部分付款', { size }),
+            '-1': BgWidget.notifyInsignia('付款失敗', { size }),
+            '-2': BgWidget.notifyInsignia('已退款', { size }),
         };
         const outShipBadges = {
-            finish: BgWidget.infoInsignia('已取貨'),
-            shipping: BgWidget.warningInsignia('已出貨'),
-            arrived: BgWidget.warningInsignia('已送達'),
-            wait: BgWidget.notifyInsignia('未出貨'),
-            pre_order: BgWidget.notifyInsignia('待預購'),
-            returns: BgWidget.notifyInsignia('已退貨'),
+            finish: BgWidget.infoInsignia('已取貨', { size }),
+            shipping: BgWidget.warningInsignia('已出貨', { size }),
+            arrived: BgWidget.warningInsignia('已送達', { size }),
+            wait: order.orderData.user_info.shipment_number
+                ? BgWidget.secondaryInsignia('備貨中', { size })
+                : BgWidget.notifyInsignia('未出貨', { size }),
+            pre_order: BgWidget.notifyInsignia('待預購', { size }),
+            returns: BgWidget.notifyInsignia('已退貨', { size }),
         };
         const orderStatusBadges = {
-            '1': BgWidget.infoInsignia('已完成'),
-            '0': BgWidget.warningInsignia('處理中'),
+            '1': BgWidget.infoInsignia('已完成', { size }),
+            '0': BgWidget.warningInsignia('處理中', { size }),
+            '-1': BgWidget.notifyInsignia('已取消', { size }),
+        };
+        const orderSourceBadges = {
+            manual: BgWidget.primaryInsignia('手動', { type: 'border', size }),
+            combine: BgWidget.successInsignia('合併', { type: 'border', size }),
+            POS: BgWidget.primaryInsignia('POS', { type: 'border', size }),
+            split: BgWidget.successInsignia('拆分', { type: 'border', size }),
+            default: '',
         };
-        orderData.orderData.orderStatus = (_a = orderData.orderData.orderStatus) !== null && _a !== void 0 ? _a : '0';
         return {
-            paymentBadge: () => paymentBadges[`${orderData.status}`] || BgWidget.notifyInsignia('付款失敗'),
-            outShipBadge: () => { var _a; return outShipBadges[(_a = orderData.orderData.progress) !== null && _a !== void 0 ? _a : 'wait'] || BgWidget.notifyInsignia('未知狀態'); },
-            orderStatusBadge: () => orderStatusBadges[`${orderData.orderData.orderStatus}`] || BgWidget.notifyInsignia('已取消'),
-            archivedBadge: () => (orderData.orderData.archived === 'true' ? BgWidget.secondaryInsignia('已封存') : ''),
+            sourceBadge: () => { var _a; return orderSourceBadges[(_a = order.orderData.orderSource) !== null && _a !== void 0 ? _a : 'default'] || orderSourceBadges['default']; },
+            paymentBadge: () => paymentBadges[`${order.status}`] || paymentBadges['0'],
+            outShipBadge: () => { var _a; return outShipBadges[(_a = order.orderData.progress) !== null && _a !== void 0 ? _a : 'wait'] || outShipBadges['wait']; },
+            orderStatusBadge: () => { var _a; return orderStatusBadges[`${(_a = order.orderData.orderStatus) !== null && _a !== void 0 ? _a : 0}`] || orderStatusBadges['0']; },
+            archivedBadge: () => (order.orderData.archived === 'true' ? BgWidget.secondaryInsignia('已封存') : ''),
         };
     }
     static showEditShip(obj) {
@@ -250,7 +268,7 @@ export class OrderSetting {
                                     return postMD
                                         .map((item) => {
                                         if (!item.deduction_log || Object.keys(item.deduction_log).length === 0) {
-                                            return ``;
+                                            return '';
                                         }
                                         return html `
                               <div class="d-inline-flex align-items-center" style="gap:44px;">
@@ -284,7 +302,7 @@ export class OrderSetting {
                                             .flatMap((stock) => {
                                             var _a, _b, _c, _d, _e;
                                             if (!item.deduction_log) {
-                                                return ``;
+                                                return '';
                                             }
                                             const limit = (_c = (_b = (_a = item.stockList) === null || _a === void 0 ? void 0 : _a[stock.id]) === null || _b === void 0 ? void 0 : _b.count) !== null && _c !== void 0 ? _c : 0;
                                             return [
@@ -333,7 +351,7 @@ export class OrderSetting {
                                         .map((dd, index) => {
                                         return `<div class="${index ? `border-top pt-2` : ` pb-2`}">${dd}</div>`;
                                     })
-                                        .join(``);
+                                        .join('');
                                 }
                                 catch (e) {
                                     console.error(e);
@@ -380,10 +398,9 @@ export class OrderSetting {
           `;
                 },
                 divCreate: {
-                    class: `d-flex align-items-center justify-content-center`,
-                    style: `width: 100vw; height: 100vh;`,
+                    class: 'd-flex align-items-center justify-content-center',
+                    style: 'width: 100vw; height: 100vh;',
                 },
-                onCreate: () => { },
             });
         }, 'batchEdit');
     }
@@ -1575,16 +1592,17 @@ export class OrderSetting {
           bottom: 0;
           z-index: 10;
         }
-     
+
         .${vm.prefix}-order-row {
           display: flex;
           align-items: center;
           min-height: 80px;
         }
         .${vm.prefix}-split-rule {
-          color: #4D86DB;
+          color: #4d86db;
           font-size: 16px;
-          font-weight: 400;text-decoration-line: underline;
+          font-weight: 400;
+          text-decoration-line: underline;
           text-decoration-style: solid;
           text-decoration-skip-ink: none;
           text-decoration-thickness: auto;
@@ -1592,101 +1610,102 @@ export class OrderSetting {
           text-underline-position: from-font;
           cursor: pointer;
         }
-        .${vm.prefix}-product-preview-img{
+        .${vm.prefix}-product-preview-img {
           width: 42px;
           height: 42px;
           border-radius: 5px;
         }
-        .${vm.prefix}-font-gray{
+        .${vm.prefix}-font-gray {
           color: #8d8d8d;
         }
-        .${vm.prefix}-font-blue{
-          color: #4D86DB;
+        .${vm.prefix}-font-blue {
+          color: #4d86db;
         }
-        .${vm.prefix}-product-input{
+        .${vm.prefix}-product-input {
           border-radius: 10px;
-          border: 1px solid #DDD;
-          background: #FFF;
+          border: 1px solid #ddd;
+          background: #fff;
           padding: 9px 18px;
         }
-        .${vm.prefix}-split-BTN{
-          height:26px;
-          color:#4D86DB;
+        .${vm.prefix}-split-BTN {
+          height: 26px;
+          color: #4d86db;
           gap: 6px;
-          padding:0 18px;
+          padding: 0 18px;
           display: flex;
           align-items: start;
-          cursor:pointer;
+          cursor: pointer;
         }
-        .${vm.prefix}-minusQty{
-          color: #4D86DB;
+        .${vm.prefix}-minusQty {
+          color: #4d86db;
           font-size: 16px;
           font-weight: 400;
         }
-        .${vm.prefix}-itemList-section{
+        .${vm.prefix}-itemList-section {
           min-width: 100%;
-          border-bottom: 1px solid #DDD;
-          padding-top:24px;
-          gap:5px;
+          border-bottom: 1px solid #ddd;
+          padding-top: 24px;
+          gap: 5px;
           display: inline-flex;
         }
-        .${vm.prefix}-summary-section{
+        .${vm.prefix}-summary-section {
           min-width: 100%;
-          border-bottom: 1px solid #DDD;
-          width:fit-content;
+          border-bottom: 1px solid #ddd;
+          width: fit-content;
         }
-        .${vm.prefix}-summary-title{
-          width:606px;
-          flex-shrink:0;
-          border-right: 1px solid #DDD;
-          padding-left:18px;
-          padding:9px 18px;
+        .${vm.prefix}-summary-title {
+          width: 606px;
+          flex-shrink: 0;
+          border-right: 1px solid #ddd;
+          padding-left: 18px;
+          padding: 9px 18px;
           display: flex;
           justify-content: end;
           align-items: center;
         }
-        .${vm.prefix}-summary-oriSummary{
-          width:152px;
-          border-right: 1px solid #DDD;
-          flex-shrink:0;
+        .${vm.prefix}-summary-oriSummary {
+          width: 152px;
+          border-right: 1px solid #ddd;
+          flex-shrink: 0;
         }
-        .${vm.prefix}-summary-subSummary{
-          width:155px;
-          border-right: 1px solid #DDD;
-          flex-shrink:0;
+        .${vm.prefix}-summary-subSummary {
+          width: 155px;
+          border-right: 1px solid #ddd;
+          flex-shrink: 0;
         }
-        .${vm.prefix}-summary-raw-BG1{
-          background: #F7F7F7;
+        .${vm.prefix}-summary-raw-BG1 {
+          background: #f7f7f7;
         }
-        .${vm.prefix}-summary-raw{
+        .${vm.prefix}-summary-raw {
           display: flex;
           font-size: 16px;
           align-items: center;
-          justify-content:start;
-          padding-left:18px;
+          justify-content: start;
+          padding-left: 18px;
         }
-        .${vm.prefix}-summary-raw1{
+        .${vm.prefix}-summary-raw1 {
           display: flex;
           font-size: 16px;
           font-weight: 700;
           align-items: end;
-          justify-content:start;
-          padding-left:18px;
-          padding-bottom:9px;
+          justify-content: start;
+          padding-left: 18px;
+          padding-bottom: 9px;
+        }
+        .${vm.prefix}-summary-right {
+          margin: 0 6px;
         }
-        .${vm.prefix}-summary-right{
-          margin:0 6px;
+        .${vm.prefix}-dialog-ul {
+          padding: 6px;
         }
-        
-        .${vm.prefix}-dialog-ul{
-          padding:6px ;
-          
+        .${vm.prefix}-dialog-ul-p24 {
+          padding: 6px 24px;
         }
-        .${vm.prefix}-dialog-ul li{
+        .${vm.prefix}-dialog-ul li {
           margin-bottom: 3px;
-          list-style:disc;
-          text-align:left;
-          white-space:break-spaces;
+          list-style: disc;
+          text-align: left;
+          white-space: break-spaces;
         }
       `);
         };
@@ -1713,7 +1732,7 @@ export class OrderSetting {
           <div class="tx_normal text-start">
             您即將拆分訂單，系統將產生 ${splitOrderArray.length} 筆子訂單，拆分後：
           </div>
-          <ul class="${gClass('dialog-ul')}">
+          <ul class="${gClass('dialog-ul')} ${gClass('dialog-ul-p24')}">
             <li>原訂單調整金額與折扣，運費及附加費維持不變。子訂單按比例分配優惠。</li>
             <li>子訂單繼承母訂單設定，發票需手動作廢與重開。</li>
             <li>代收金額更新，已建立的出貨單需取消並重新建立。</li>
@@ -1748,7 +1767,6 @@ export class OrderSetting {
                             };
                         }
                         orderData.lineItems.forEach((lineItem, index) => {
-                            let count = 0;
                             splitOrderArray.forEach(order => {
                                 lineItem.count -= order.lineItems[index].count;
                                 const resultTS = deductFromStoresTS(lineItem.deduction_log, order.lineItems[index].count);
@@ -1794,7 +1812,7 @@ export class OrderSetting {
                     return (iCount += lineItem.count);
                 }, 0);
                 origQtyZero = iSplitQtyCount === iQtyCount;
-                let checkBTN = ``;
+                let checkBTN = '';
                 if (allOrdersHaveZeroItems || origQtyZero) {
                     checkBTN = BgWidget.disableSave('拆分訂單');
                 }
@@ -1809,11 +1827,6 @@ export class OrderSetting {
             const phoneCardStyle = isDesktop
                 ? ''
                 : 'border-radius: 10px; padding: 12px; background: #fff; box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.08);';
-            const fontColor = {
-                success: '#10931D',
-                error: '#DA1313',
-                normal: '#393939',
-            };
             const hits = [
                 '原訂單將保留剩餘商品，訂單金額與折扣將調整；子訂單將包含選定商品，並按比例分配優惠折扣',
                 '拆單後，運費及附加費用不變，將保留於原訂單內，若需要，請手動編輯訂單新增費用',
@@ -1828,7 +1841,7 @@ export class OrderSetting {
                 <ul class="mt-2 ms-4 ${gClass('dialog-ul')}">
                   ${hits
                 .map(hit => {
-                return html ` <li class="">${hit}</li>`;
+                return html ` <li>${hit}</li>`;
             })
                 .join('')}
                 </ul>
@@ -1839,16 +1852,17 @@ export class OrderSetting {
                     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>
+                    innerHTML: () => {
+                        const list = [
+                            '原訂單將保留剩餘商品，訂單金額與折扣將調整；子訂單將包含選定商品，並按比例分配優惠折扣',
+                            '拆單後運費及附加費用不變，將保留於原訂單內，如需更改，請手動編輯訂單新增費用',
+                            '子訂單會預設繼承母訂單的配送與付款方式，如需更改，請手動編輯訂單內容',
+                            '子訂單若要重新開立發票，請至發票頁面手動建立',
+                            '若發票已開立，系統不會自動作廢，需至訂單頁面手動作廢並重新開立',
+                            '代收金額將更新，已建立的出貨單需取消並重新建立',
+                        ];
+                        return html ` <ul class="${gClass('dialog-ul')} ${gClass('dialog-ul-p24')}">
+                          ${list.map(text => html `<li>${text}</li>`).join('')}
                         </ul>`;
                     },
                     footer_html: (gvc) => {
@@ -2001,20 +2015,20 @@ export class OrderSetting {
                             }
                             case 'stock': {
                                 if (storeList.length > 0) {
-                                    return dataArray.map((item) => {
+                                    return dataArray
+                                        .map(item => {
                                         var _a;
                                         let maxEntry = {
-                                            key: "",
-                                            title: "",
-                                            value: 0
+                                            key: '',
+                                            title: '',
+                                            value: 0,
                                         };
-                                        console.log("item.deduction_log -- ", item.deduction_log);
                                         Object.entries(item.deduction_log).forEach((log) => {
                                             if (maxEntry.value < log[1]) {
                                                 maxEntry = {
                                                     key: log[0],
                                                     title: log[0],
-                                                    value: log[1]
+                                                    value: log[1],
                                                 };
                                             }
                                         });
@@ -2022,14 +2036,15 @@ export class OrderSetting {
                                             return store.id == maxEntry.key;
                                         }).name;
                                         return html `
-                  <div
-                    class="tx_normal ${commonClass} justify-content-start"
-                    style="width: ${dataRaw.width};${commonHeight}"
-                  >
-                    ${(_a = maxEntry.title) !== null && _a !== void 0 ? _a : "出貨庫存錯誤"}
-                  </div>
-                `;
-                                    }).join('');
+                        <div
+                          class="tx_normal ${commonClass} justify-content-start"
+                          style="width: ${dataRaw.width};${commonHeight}"
+                        >
+                          ${(_a = maxEntry.title) !== null && _a !== void 0 ? _a : '出貨庫存錯誤'}
+                        </div>
+                      `;
+                                    })
+                                        .join('');
                                 }
                                 return html `
                   <div
@@ -2112,7 +2127,7 @@ export class OrderSetting {
                             bind: item.key,
                             view: () => {
                                 return (drawLineItems(item) +
-                                    html ` <div class="${commonClass} mt-3" style="width: ${item.width};"></div>`);
+                                    html `<div class="${commonClass} mt-3" style="width: ${item.width};"></div>`);
                             },
                             divCreate: {
                                 class: 'd-flex flex-column',
@@ -2126,7 +2141,9 @@ export class OrderSetting {
             <div class="d-flex flex-shrink-0" style="overflow-x: scroll;gap:5px;">${drawSplitOrder()} ${addBTN}</div>
           `;
                 },
-                divCreate: { style: '', class: `${gClass('itemList-section')}` },
+                divCreate: {
+                    class: `${gClass('itemList-section')}`,
+                },
             });
         };
         const renderSummary = (gvc) => {