ts-glitter 20.6.7 → 20.6.9

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

@@ -5,55 +5,40 @@ import { ShareDialog } from '../../glitterBundle/dialog/ShareDialog.js';
 import { Tool } from '../../modules/tool.js';
 import { OrderDetail } from './data.js';
 import { EditorElem } from '../../glitterBundle/plugins/editor-elem.js';
+import { ShipmentConfig } from '../../glitter-base/global/shipment-config.js';
+import { PaymentConfig } from '../../glitter-base/global/payment-config.js';
 const html = String.raw;
 export class OrderSetting {
-    static getPaymentMethodText(orderData) {
+    static getPaymentMethodText(orderData, paymentMethod) {
         const paymentMethods = {
             POS: '門市POS付款',
             off_line: '線下付款',
-            newWebPay: '藍新金流',
-            ecPay: '綠界金流',
-            line_pay: 'Line Pay',
-            atm: '銀行轉帳',
-            line: 'Line 轉帳',
-            cash_on_delivery: '貨到付款',
         };
+        paymentMethod.map((item) => {
+            paymentMethods[item.key] = item.name;
+        });
         return orderData.orderSource === 'POS'
             ? paymentMethods['POS']
             : paymentMethods[orderData.customer_info.payment_select] || '線下付款';
     }
     static getShippingMethodText(orderData) {
-        switch (orderData.user_info.shipment) {
-            case 'UNIMARTC2C':
-                return '7-11店到店';
-            case 'FAMIC2C':
-                return '全家店到店';
-            case 'OKMARTC2C':
-                return 'OK店到店';
-            case 'HILIFEC2C':
-                return '萊爾富店到店';
-            case 'normal':
-                return '中華郵政';
-            case 'black_cat':
-                return '黑貓到府';
-            case 'shop':
-                return '實體門市取貨';
-            case 'global_express':
-                return '國際快遞';
-            case 'now':
-                return '立即取貨';
-            default:
-                return '宅配';
+        if (!orderData.user_info.shipment) {
+            return '立即取貨';
         }
+        const shippingData = ShipmentConfig.list.find(item => item.value === orderData.user_info.shipment);
+        return shippingData ? shippingData.title : '立即取貨';
     }
     static getShippingAddress(orderData) {
         const shipment = orderData.user_info.shipment;
-        if (['UNIMARTC2C', 'FAMIC2C', 'OKMARTC2C', 'HILIFEC2C'].includes(shipment)) {
+        if (['UNIMARTC2C', 'UNIMARTFREEZE', 'FAMIC2C', 'FAMIC2CFREEZE', 'OKMARTC2C', 'HILIFEC2C'].includes(shipment)) {
             return `${orderData.user_info.CVSStoreName} (${orderData.user_info.CVSAddress})`;
         }
         if (shipment === 'shop') {
             return '實體門市';
         }
+        if (shipment === 'now') {
+            return '立即取貨';
+        }
         return orderData.user_info.address;
     }
     static getPaymentStatusOpt() {
@@ -72,6 +57,7 @@ export class OrderSetting {
     static getShippmentOpt() {
         return [
             { title: '未出貨', value: 'wait' },
+            { title: '待預購', value: 'pre_order' },
             { title: '備貨中', value: 'in_stock' },
             { title: '已出貨', value: 'shipping' },
             { title: '已到貨', value: 'arrived' },
@@ -678,6 +664,11 @@ export class OrderSetting {
                                         { width: 10, align: 'center' },
                                         { width: 30, align: 'center' },
                                     ];
+                                    const ovm = {
+                                        list_id: gvc.glitter.getUUID(),
+                                        list_loading: true,
+                                        payment_method: [],
+                                    };
                                     return html `
                     <div class="${gClass('check-info-box')}">
                       ${BgWidget.grayNote('請與顧客確認合併訂單的付款、配送方式及地址<br />應與下列哪筆訂單相同，避免爭議')}
@@ -700,59 +691,79 @@ export class OrderSetting {
                                     })
                                         .join('')}
                         </div>
-                        <div class="d-flex flex-column gap-0 mt-3">
-                          ${orders
-                                        .map(order => {
-                                        const orderData = order.orderData;
-                                        const vt = this.getAllStatusBadge(order);
-                                        const row = [
-                                            {
-                                                title: html `
-                                    <div class="d-flex gap-2">
-                                      ${gvc.bindView({
-                                                    bind: `r-${order.cart_token}`,
-                                                    view: () => {
-                                                        return html `<input
-                                            class="form-check-input ${dialogVM.dotClass} cursor_pointer"
-                                            style="margin-top: 0.25rem;"
-                                            type="radio"
-                                            id="r-${order.cart_token}"
-                                            name="check-info-radios"
-                                            onchange="${gvc.event(() => {
-                                                            dialogVM.selectOrderID = order.cart_token;
-                                                            gvc.notifyDataChange(orders.map(d => `r-${d.cart_token}`));
-                                                        })}"
-                                            ${dialogVM.selectOrderID === order.cart_token ? 'checked' : ''}
-                                          />`;
-                                                    },
-                                                })}
-                                      <span style="color: #4d86db;">${order.cart_token}</span>
-                                      <div class="d-flex justify-content-end gap-2">
-                                        ${vt.archivedBadge()}
-                                        ${vt.paymentBadge()}${vt.outShipBadge()}${vt.orderStatusBadge()}
-                                      </div>
-                                    </div>
-                                  `,
-                                            },
-                                            { title: order.created_time.split('T')[0] },
-                                            { title: this.getPaymentMethodText(orderData) },
-                                            { title: this.getShippingMethodText(orderData) },
-                                            { title: this.getShippingAddress(orderData) },
-                                        ]
-                                            .map((item, i) => {
-                                            var _a;
-                                            return html ` <div
-                                    class="tx_normal"
-                                    style="width: ${styles[i].width}%; text-align: ${styles[i].align};"
-                                  >
-                                    <span style="white-space: break-spaces;">${((_a = item.title) !== null && _a !== void 0 ? _a : '').trim()}</span>
-                                  </div>`;
-                                        })
-                                            .join('');
-                                        return html ` <div class="${gClass('order-row')}">${row}</div>`;
-                                    })
-                                        .join('')}
-                        </div>
+                        ${gvc.bindView({
+                                        bind: ovm.list_id,
+                                        view: () => {
+                                            if (ovm.list_loading) {
+                                                return '';
+                                            }
+                                            else {
+                                                return orders
+                                                    .map(order => {
+                                                    const orderData = order.orderData;
+                                                    const vt = this.getAllStatusBadge(order);
+                                                    const row = [
+                                                        {
+                                                            title: html `
+                                        <div class="d-flex gap-2">
+                                          ${gvc.bindView({
+                                                                bind: `r-${order.cart_token}`,
+                                                                view: () => {
+                                                                    return html `<input
+                                                class="form-check-input ${dialogVM.dotClass} cursor_pointer"
+                                                style="margin-top: 0.25rem;"
+                                                type="radio"
+                                                id="r-${order.cart_token}"
+                                                name="check-info-radios"
+                                                onchange="${gvc.event(() => {
+                                                                        dialogVM.selectOrderID = order.cart_token;
+                                                                        gvc.notifyDataChange(orders.map(d => `r-${d.cart_token}`));
+                                                                    })}"
+                                                ${dialogVM.selectOrderID === order.cart_token ? 'checked' : ''}
+                                              />`;
+                                                                },
+                                                            })}
+                                          <span style="color: #4d86db;">${order.cart_token}</span>
+                                          <div class="d-flex justify-content-end gap-2">
+                                            ${vt.archivedBadge()}
+                                            ${vt.paymentBadge()}${vt.outShipBadge()}${vt.orderStatusBadge()}
+                                          </div>
+                                        </div>
+                                      `,
+                                                        },
+                                                        { title: order.created_time.split('T')[0] },
+                                                        { title: this.getPaymentMethodText(orderData, ovm.payment_method) },
+                                                        { title: this.getShippingMethodText(orderData) },
+                                                        { title: this.getShippingAddress(orderData) },
+                                                    ]
+                                                        .map((item, i) => {
+                                                        var _a;
+                                                        return html ` <div
+                                        class="tx_normal"
+                                        style="width: ${styles[i].width}%; text-align: ${styles[i].align};"
+                                      >
+                                        <span style="white-space: break-spaces;">${((_a = item.title) !== null && _a !== void 0 ? _a : '').trim()}</span>
+                                      </div>`;
+                                                    })
+                                                        .join('');
+                                                    return html ` <div class="${gClass('order-row')}">${row}</div>`;
+                                                })
+                                                    .join('');
+                                            }
+                                        },
+                                        divCreate: {
+                                            class: 'd-flex flex-column gap-0 mt-3',
+                                        },
+                                        onCreate: () => {
+                                            if (ovm.list_loading) {
+                                                PaymentConfig.getSupportPayment(true).then(response => {
+                                                    ovm.payment_method = response;
+                                                    ovm.list_loading = false;
+                                                    gvc.notifyDataChange(ovm.list_id);
+                                                });
+                                            }
+                                        },
+                                    })}
                       </div>
                     </div>
                   `;
@@ -841,6 +852,11 @@ export class OrderSetting {
                         { width: 10, align: 'center' },
                         { width: 5, align: 'center' },
                     ];
+                    const ovm = {
+                        list_id: gvc.glitter.getUUID(),
+                        list_loading: true,
+                        payment_method: [],
+                    };
                     return html ` <div class="${gClass('box')} mt-2" style="${isDesktop ? '' : 'width: 1200px'}">
             <div class="d-flex">
               ${[
@@ -860,59 +876,79 @@ export class OrderSetting {
                     })
                         .join('')}
             </div>
-            <div class="d-flex flex-column gap-0 mt-3">
-              ${orders
-                        .map((order, index) => {
-                        const orderData = order.orderData;
-                        const vt = this.getAllStatusBadge(order);
-                        const row = [
-                            {
-                                title: html `
-                        <div class="d-flex gap-3">
-                          <span style="color: #4d86db;">${order.cart_token}</span>
-                          <div class="d-flex justify-content-end gap-2">
-                            ${vt.archivedBadge()} ${vt.paymentBadge()}${vt.outShipBadge()}${vt.orderStatusBadge()}
-                          </div>
-                        </div>
-                      `,
-                            },
-                            { title: order.created_time.split('T')[0] },
-                            { title: this.getPaymentMethodText(orderData) },
-                            { title: this.getShippingMethodText(orderData) },
-                            { title: this.getShippingAddress(orderData) },
-                            { title: `$ ${orderData.total.toLocaleString()}` },
-                            { title: `${orderData.lineItems.length}件商品` },
-                            {
-                                title: orders.length > 1
-                                    ? html `<i
-                              class="fa-solid fa-xmark"
-                              style="color: #B0B0B0; cursor: pointer"
-                              onclick="${gvc.event(() => {
-                                        if (order.cart_token === data.targetID) {
-                                            data.targetID = '';
-                                        }
-                                        data.orders.splice(index, 1);
-                                        vm.dataObject = setDataStatus(dataMap);
-                                        gvc.notifyDataChange([editID, ids.header, ids.dashboard]);
-                                    })}"
-                            ></i>`
-                                    : '',
-                            },
-                        ]
-                            .map((item, i) => {
-                            var _a;
-                            return html ` <div
-                        class="tx_normal"
-                        style="width: ${styles[i].width}%; text-align: ${styles[i].align};"
-                      >
-                        <span style="white-space: break-spaces;">${((_a = item.title) !== null && _a !== void 0 ? _a : '').trim()}</span>
-                      </div>`;
-                        })
-                            .join('');
-                        return html ` <div class="${gClass('order-row')}">${row}</div>`;
-                    })
-                        .join('')}
-            </div>
+            ${gvc.bindView({
+                        bind: ovm.list_id,
+                        view: () => {
+                            if (ovm.list_loading) {
+                                return '';
+                            }
+                            else {
+                                return orders
+                                    .map((order, index) => {
+                                    const orderData = order.orderData;
+                                    const vt = this.getAllStatusBadge(order);
+                                    const row = [
+                                        {
+                                            title: html `
+                            <div class="d-flex gap-3">
+                              <span style="color: #4d86db;">${order.cart_token}</span>
+                              <div class="d-flex justify-content-end gap-2">
+                                ${vt.archivedBadge()} ${vt.paymentBadge()}${vt.outShipBadge()}${vt.orderStatusBadge()}
+                              </div>
+                            </div>
+                          `,
+                                        },
+                                        { title: order.created_time.split('T')[0] },
+                                        { title: this.getPaymentMethodText(orderData, ovm.payment_method) },
+                                        { title: this.getShippingMethodText(orderData) },
+                                        { title: this.getShippingAddress(orderData) },
+                                        { title: `$ ${orderData.total.toLocaleString()}` },
+                                        { title: `${orderData.lineItems.length}件商品` },
+                                        {
+                                            title: orders.length > 1
+                                                ? html `<i
+                                  class="fa-solid fa-xmark"
+                                  style="color: #B0B0B0; cursor: pointer"
+                                  onclick="${gvc.event(() => {
+                                                    if (order.cart_token === data.targetID) {
+                                                        data.targetID = '';
+                                                    }
+                                                    data.orders.splice(index, 1);
+                                                    vm.dataObject = setDataStatus(dataMap);
+                                                    gvc.notifyDataChange([editID, ids.header, ids.dashboard]);
+                                                })}"
+                                ></i>`
+                                                : '',
+                                        },
+                                    ]
+                                        .map((item, i) => {
+                                        var _a;
+                                        return html ` <div
+                            class="tx_normal"
+                            style="width: ${styles[i].width}%; text-align: ${styles[i].align};"
+                          >
+                            <span style="white-space: break-spaces;">${((_a = item.title) !== null && _a !== void 0 ? _a : '').trim()}</span>
+                          </div>`;
+                                    })
+                                        .join('');
+                                    return html ` <div class="${gClass('order-row')}">${row}</div>`;
+                                })
+                                    .join('');
+                            }
+                        },
+                        divCreate: {
+                            class: 'd-flex flex-column gap-0 mt-3',
+                        },
+                        onCreate: () => {
+                            if (ovm.list_loading) {
+                                PaymentConfig.getSupportPayment(true).then(response => {
+                                    ovm.payment_method = response;
+                                    ovm.list_loading = false;
+                                    gvc.notifyDataChange(ovm.list_id);
+                                });
+                            }
+                        },
+                    })}
           </div>`;
                 };
                 const isExpanded = ids.show === editID;
@@ -994,7 +1030,14 @@ export class OrderSetting {
                 const { user_info } = orderData;
                 const isPayStatusSame = status === baseStatus;
                 const isShipmentSame = user_info.shipment === baseShipment;
-                const isAddressSame = ['UNIMARTC2C', 'FAMIC2C', 'OKMARTC2C', 'HILIFEC2C'].includes(baseShipment)
+                const isAddressSame = [
+                    'UNIMARTC2C',
+                    'UNIMARTFREEZE',
+                    'FAMIC2C',
+                    'FAMIC2CFREEZE',
+                    'OKMARTC2C',
+                    'HILIFEC2C',
+                ].includes(baseShipment)
                     ? user_info.CVSStoreName === baseCVSStoreName
                     : user_info.address === baseAddress;
                 return isPayStatusSame && isShipmentSame && isAddressSame;
@@ -1154,7 +1197,7 @@ export class OrderSetting {
                         },
                         {
                             key: '出貨單號碼',
-                            value: html `<div style="width: 200px;">
+                            value: html ` <div style="width: 200px;">
                 ${BgWidget.grayNote(dd.orderData.user_info.shipment_number
                                 ? `#${dd.orderData.user_info.shipment_number}`
                                 : dd.orderData.orderSource === 'POS'
@@ -1256,7 +1299,7 @@ export class OrderSetting {
                                                 })
                                                 : '',
                                         ].filter(Boolean);
-                                        return html `<div class="d-flex align-items-center gap-2">${htmlArray.join('')}</div>`;
+                                        return html ` <div class="d-flex align-items-center gap-2">${htmlArray.join('')}</div>`;
                                     },
                                     divCreate: {
                                         style: 'min-width: 580px;',
@@ -1330,6 +1373,9 @@ export class OrderSetting {
                                     callback: (value) => {
                                         checkArray.forEach((order) => {
                                             order.orderData.progress = value;
+                                            if (['wait', 'returns', undefined].includes(value)) {
+                                                order.orderData.user_info.shipment_number = '';
+                                            }
                                         });
                                     },
                                 });
@@ -1431,11 +1477,12 @@ export class OrderSetting {
             });
         }, 'batchEditOrders');
     }
-    static splitOrder(topGVC, orderData, callback) {
+    static splitOrder(topGVC, origOrderData, callback) {
         var _a, _b;
+        const orderData = structuredClone(origOrderData);
         function assignOrder(orderCreateUnit) {
             orderCreateUnit.cart_token = orderData.orderID;
-            orderCreateUnit.customer_info = orderData.user_info;
+            orderCreateUnit.customer_info = orderData.customer_info;
             orderCreateUnit.user_info = orderData.user_info;
             orderCreateUnit.voucher = orderData.voucherList;
             orderCreateUnit.lineItems = structuredClone(orderData.lineItems);
@@ -1444,6 +1491,7 @@ export class OrderSetting {
             });
         }
         orderData.orderSource = 'split';
+        let storeList = [];
         const dataArray = orderData.lineItems;
         const parentPageConfig = (_b = (_a = window.parent) === null || _a === void 0 ? void 0 : _a.glitter) === null || _b === void 0 ? void 0 : _b.pageConfig;
         const latestPageConfig = parentPageConfig === null || parentPageConfig === void 0 ? void 0 : parentPageConfig[parentPageConfig.length - 1];
@@ -1456,9 +1504,8 @@ export class OrderSetting {
         const passData = structuredClone(orderCreateUnit);
         const isDesktop = document.body.clientWidth > 768;
         const vm = {
-            dataObject: {},
-            originDataObject: {},
             prefix: 'split-orders',
+            loading: true,
             splitCount: 1,
         };
         const ids = {
@@ -1466,6 +1513,7 @@ export class OrderSetting {
             page: glitter.getUUID(),
             header: glitter.getUUID(),
             dashboard: glitter.getUUID(),
+            origQTY: glitter.getUUID(),
             itemList: glitter.getUUID(),
             block: glitter.getUUID(),
             summary: glitter.getUUID(),
@@ -1527,31 +1575,7 @@ export class OrderSetting {
           bottom: 0;
           z-index: 10;
         }
-        .${vm.prefix}-dashboard-gray {
-          color: #8d8d8d;
-          font-size: 16px;
-          font-weight: 400;
-        }
-        .${vm.prefix}-update {
-          width: 80px;
-          color: #4d86db;
-          font-weight: 400;
-          gap: 8px;
-          cursor: pointer;
-        }
-        .${vm.prefix}-list {
-          list-style: disc;
-          white-space: break-spaces;
-        }
-        .${vm.prefix}-box {
-          border-radius: 10px;
-          padding: 6px 10px;
-        }
-        .${vm.prefix}-check-info-box {
-          position: absolute;
-          width: 1000px;
-          overflow: auto;
-        }
+     
         .${vm.prefix}-order-row {
           display: flex;
           align-items: center;
@@ -1589,7 +1613,7 @@ export class OrderSetting {
           height:26px;
           color:#4D86DB;
           gap: 6px;
-          padding-left:18px;
+          padding:0 18px;
           display: flex;
           align-items: start;
           cursor:pointer;
@@ -1601,13 +1625,15 @@ export class OrderSetting {
         }
         .${vm.prefix}-itemList-section{
           min-width: 100%;
+          border-bottom: 1px solid #DDD;
           padding-top:24px;
           gap:5px;
-          display: flex;
+          display: inline-flex;
         }
         .${vm.prefix}-summary-section{
-          border-top: 1px solid #DDD;
+          min-width: 100%;
           border-bottom: 1px solid #DDD;
+          width:fit-content;
         }
         .${vm.prefix}-summary-title{
           width:606px;
@@ -1654,13 +1680,13 @@ export class OrderSetting {
         
         .${vm.prefix}-dialog-ul{
           padding:6px ;
-          list-style:disc;
           
         }
         .${vm.prefix}-dialog-ul li{
+          margin-bottom: 3px;
           list-style:disc;
           text-align:left;
-          list-style-position: inside;
+          white-space:break-spaces;
         }
       `);
         };
@@ -1697,21 +1723,43 @@ export class OrderSetting {
             dialog.checkYesOrNotWithCustomWidth({
                 callback: bool => {
                     if (bool) {
+                        function deductFromStoresTS(log, amountToDeduct) {
+                            const updatedLog = Object.assign({}, log);
+                            const deductions = {};
+                            let remainingAmount = Math.max(0, amountToDeduct);
+                            const sortedEntries = Object.entries(updatedLog).sort(([, valueA], [, valueB]) => valueB - valueA);
+                            for (const [storeKey, storeValue] of sortedEntries) {
+                                if (remainingAmount <= 0) {
+                                    break;
+                                }
+                                if (storeValue <= 0) {
+                                    continue;
+                                }
+                                const amountDeductedFromThisStore = Math.min(remainingAmount, storeValue);
+                                if (amountDeductedFromThisStore > 0) {
+                                    updatedLog[storeKey] -= amountDeductedFromThisStore;
+                                    deductions[storeKey] = amountDeductedFromThisStore;
+                                    remainingAmount -= amountDeductedFromThisStore;
+                                }
+                            }
+                            return {
+                                updatedLog: updatedLog,
+                                deductions: deductions,
+                            };
+                        }
                         orderData.lineItems.forEach((lineItem, index) => {
                             let count = 0;
-                            count = splitOrderArray.reduce((total, order) => {
-                                return (total += Number(order.lineItems[index].count));
-                            }, 0);
-                            lineItem.count -= count;
+                            splitOrderArray.forEach(order => {
+                                lineItem.count -= order.lineItems[index].count;
+                                const resultTS = deductFromStoresTS(lineItem.deduction_log, order.lineItems[index].count);
+                                order.lineItems[index].deduction_log = resultTS.deductions;
+                                lineItem.deduction_log = resultTS.updatedLog;
+                            });
                         });
                         const passData = {
                             orderData: orderData,
                             splitOrderArray: splitOrderArray,
                         };
-                        ApiShop.combineOrder(vm.dataObject).then(r => {
-                            if (r.result && r.response) {
-                            }
-                        });
                         dialog.dataLoading({ visible: true });
                         ApiShop.splitOrder(passData).then(r => {
                             if (r.result && r.response) {
@@ -1731,13 +1779,27 @@ export class OrderSetting {
         const renderFooter = (gvc) => gvc.bindView({
             bind: ids.footer,
             view: () => {
-                const allOrdersHaveZeroItems = splitOrderArray.every(order => order.lineItems.every(item => item.count === 0));
+                let allOrdersHaveZeroItems = false;
+                let origQtyZero = true;
+                let iSplitQtyCount = 0;
+                splitOrderArray.forEach(splitOrder => {
+                    if (splitOrder.lineItems.every(item => item.count === 0)) {
+                        allOrdersHaveZeroItems = true;
+                    }
+                    iSplitQtyCount += splitOrder.lineItems.reduce((count, lineItem) => {
+                        return (count += lineItem.count);
+                    }, 0);
+                });
+                const iQtyCount = dataArray.reduce((iCount, lineItem) => {
+                    return (iCount += lineItem.count);
+                }, 0);
+                origQtyZero = iSplitQtyCount === iQtyCount;
                 let checkBTN = ``;
-                if (!allOrdersHaveZeroItems) {
-                    checkBTN = BgWidget.save(gvc.event(handleSave), '拆分訂單');
+                if (allOrdersHaveZeroItems || origQtyZero) {
+                    checkBTN = BgWidget.disableSave('拆分訂單');
                 }
                 else {
-                    checkBTN = BgWidget.disableSave('拆分訂單');
+                    checkBTN = BgWidget.save(gvc.event(handleSave), '拆分訂單');
                 }
                 return html ` ${BgWidget.cancel(gvc.event(closeDialog))} ${checkBTN} `;
             },
@@ -1755,52 +1817,51 @@ export class OrderSetting {
             const hits = [
                 '原訂單將保留剩餘商品，訂單金額與折扣將調整；子訂單將包含選定商品，並按比例分配優惠折扣',
                 '拆單後，運費及附加費用不變，將保留於原訂單內，若需要，請手動編輯訂單新增費用',
+                '請務必進入每一張新的子訂單，為其中的所有商品選擇正確的出貨庫存',
             ];
             return html `
         <div class="row">
-          <div class="col-12 ">
-            ${BgWidget.mainCard(html `
-              <div style="${phoneCardStyle}">
-                <span class="tx_700">拆單需知</span>
-                <div class="w-100 d-flex">
-                  <ul class="mt-2 ms-4">
-                    ${hits
+          ${BgWidget.mainCard(html `
+            <div style="${phoneCardStyle}">
+              <span class="tx_700">拆單需知</span>
+              <div class="w-100 d-flex flex-column">
+                <ul class="mt-2 ms-4 ${gClass('dialog-ul')}">
+                  ${hits
                 .map(hit => {
-                return html ` <li class="${gClass('list')}">${hit}</li>`;
+                return html ` <li class="">${hit}</li>`;
             })
                 .join('')}
-                  </ul>
-                  <div
-                    class="${gClass('split-rule')} ms-auto d-flex align-items-end"
-                    onclick="${gvc.event(() => {
+                </ul>
+                <div
+                  class="${gClass('split-rule')} ms-auto d-flex align-items-end justify-content-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>`;
+                          <li>
+                            原訂單將保留剩餘商品，訂單金額與折扣將調整；子訂單將包含選定商品，並按比例分配優惠折扣
+                          </li>
+                          <li>拆單後運費及附加費用不變，將保留於原訂單內，如需更改，請手動編輯訂單新增費用</li>
+                          <li>子訂單會預設繼承母訂單的配送與付款方式，如需更改，請手動編輯訂單內容</li>
+                          <li>子訂單若要重新開立發票，請至發票頁面手動建立</li>
+                          <li>若發票已開立，系統不會自動作廢，需至訂單頁面手動作廢並重新開立</li>
+                          <li>代收金額將更新，已建立的出貨單需取消並重新建立</li>
+                        </ul>`;
                     },
                     footer_html: (gvc) => {
                         return '';
                     },
                 });
             })}"
-                  >
-                    詳細拆單規則
-                  </div>
+                >
+                  詳細拆單規則
                 </div>
               </div>
-            `)}
-          </div>
+            </div>
+          `)}
         </div>
       `;
         };
@@ -1819,15 +1880,26 @@ export class OrderSetting {
                 };
                 return splitOrderArray
                     .map((order, index) => {
-                    var _a, _b;
+                    var _a, _b, _c;
                     return html `
               <div class="d-flex flex-column">
                 <div class="${commonClass}" style="width: ${titleDom.width};${(_a = titleDom === null || titleDom === void 0 ? void 0 : titleDom.style) !== null && _a !== void 0 ? _a : ''}">
-                  <div class="tx_700">${titleDom.title}${index + 1}</div>
+                  <div class="tx_700">
+                    ${titleDom.title}${index + 1}
+                    <i
+                      class="fa-solid fa-xmark cursor_pointer"
+                      onclick="${gvc.event(() => {
+                        if (splitOrderArray.length > 1) {
+                            splitOrderArray.splice(index, 1);
+                            gvc.notifyDataChange([ids.itemList, ids.summary, ids.footer]);
+                        }
+                    })}"
+                    ></i>
+                  </div>
                   <div class="flex-fill"></div>
                 </div>
                 <div
-                  class="d-flex flex-column"
+                  class="d-flex flex-column flex-shrink-0"
                   style="width: ${titleDom.width};gap:16px;padding-top: 24px;${(_b = titleDom === null || titleDom === void 0 ? void 0 : titleDom.style) !== null && _b !== void 0 ? _b : ''}"
                 >
                   ${splitOrderArray[index].lineItems
@@ -1838,26 +1910,31 @@ export class OrderSetting {
                           style="${commonHeight};"
                           type="number"
                           value="${item.count}"
-                          min="0"
                           onchange="${gvc.event(e => {
+                            if (Number(e.value) < 0) {
+                                e.value = '0';
+                            }
                             const temp = structuredClone(item.count);
                             item.count = Number(e.value);
                             let nowQty = 0;
-                            splitOrderArray.forEach((order, index) => {
-                                nowQty += order.lineItems[itemIndex].count;
+                            splitOrderArray.forEach((splitOrder, index) => {
+                                nowQty += splitOrder.lineItems[itemIndex].count;
                             });
-                            if (order.lineItems[itemIndex].count >= nowQty) {
-                            }
-                            else {
+                            if (dataArray[itemIndex].count < nowQty) {
                                 item.count = temp;
+                                e.value = temp;
                             }
-                            gvc.notifyDataChange([ids.itemList, ids.summary, ids.footer]);
+                            gvc.notifyDataChange([ids.summary, ids.footer, 'oriQty']);
                         })}"
                         />
                       `;
                     })
                         .join('')}
                 </div>
+                <div
+                  class="d-flex flex-column flex-grow-1"
+                  style="width: ${titleDom.width};gap:16px;padding-top: 24px;${(_c = titleDom === null || titleDom === void 0 ? void 0 : titleDom.style) !== null && _c !== void 0 ? _c : ''}"
+                ></div>
               </div>
             `;
                 })
@@ -1897,125 +1974,161 @@ export class OrderSetting {
                             htmlArray: [],
                         },
                     ];
-                    dataArray.forEach((item, lineItemIndex) => {
-                        return html `
-              <div class="d-flex w-100">
-                ${dataRaws
-                            .map((dataRaw, dataRowIndex) => {
-                            var _a, _b;
-                            switch (dataRaw.key) {
-                                case 'name': {
+                    function drawLineItems(dataRaw) {
+                        switch (dataRaw.key) {
+                            case 'name': {
+                                return dataArray
+                                    .map((item, lineItemIndex) => {
+                                    var _a, _b;
                                     const spec = item.spec.length > 0 ? Tool.truncateString(item.spec.join(''), 5) : '單一規格';
-                                    const sku = '';
-                                    dataRaw.htmlArray.push(html ` <div class="${commonClass}" style="width: ${dataRaw.width};gap:12px;${commonHeight}">
-                            <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((_a = item.title) !== null && _a !== void 0 ? _a : '', 10)} -${spec}
-                              </div>
-                              <div class="tx_normal_14 ${gClass('font-gray')}">
-                                存貨單位 (SKU): ${(_b = item.sku) !== null && _b !== void 0 ? _b : '無SKU'}
-                              </div>
-                            </div>
-                          </div>`);
-                                    break;
-                                }
-                                case 'stock': {
-                                    dataRaw.htmlArray.push(html `
-                          <div
-                            class="tx_normal ${commonClass} justify-content-start"
-                            style="width: ${dataRaw.width};${commonHeight}"
-                          >
-                            AA倉庫
-                          </div>
-                        `);
-                                    break;
-                                }
-                                case 'price': {
-                                    dataRaw.htmlArray.push(html `
-                          <div
-                            class="tx_normal ${commonClass} justify-content-start"
-                            style="width: ${dataRaw.width};${commonHeight}"
-                          >
-                            ${item.sale_price}
-                          </div>
-                        `);
-                                    break;
-                                }
-                                case 'totalQty': {
-                                    dataRaw.htmlArray.push(html `
-                          <div
-                            class="tx_normal ${commonClass} justify-content-start"
-                            style="width: ${dataRaw.width};${commonHeight}"
-                          >
-                            ${item.count}
-                          </div>
-                        `);
-                                    break;
+                                    return html ` <div class="${commonClass}" style="width: ${dataRaw.width};gap:12px;${commonHeight}">
+                      ${BgWidget.validImageBox({
+                                        gvc: gvc,
+                                        image: (_a = item.preview_image) !== null && _a !== void 0 ? _a : '',
+                                        width: 42,
+                                    })}
+                      <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((_b = item.title) !== null && _b !== void 0 ? _b : '', 10)} -${spec}
+                        </div>
+                        <div class="tx_normal_14 ${gClass('font-gray')}">
+                          存貨單位 (SKU): ${item.sku && item.sku.length > 0 ? item.sku : '無SKU'}
+                        </div>
+                      </div>
+                    </div>`;
+                                })
+                                    .join('');
+                            }
+                            case 'stock': {
+                                if (storeList.length > 0) {
+                                    return dataArray.map((item) => {
+                                        var _a;
+                                        let maxEntry = {
+                                            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]
+                                                };
+                                            }
+                                        });
+                                        maxEntry.title = storeList.find((store) => {
+                                            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('');
                                 }
-                                case 'oriQty': {
+                                return html `
+                  <div
+                    class="tx_normal ${commonClass} justify-content-start"
+                    style="width: ${dataRaw.width};${commonHeight}"
+                  >
+                    AA倉庫
+                  </div>
+                `;
+                            }
+                            case 'price': {
+                                return dataArray
+                                    .map((item, lineItemIndex) => {
+                                    const spec = item.spec.length > 0 ? Tool.truncateString(item.spec.join(''), 5) : '單一規格';
+                                    return html `
+                      <div
+                        class="tx_normal ${commonClass} justify-content-start"
+                        style="width: ${dataRaw.width};${commonHeight}"
+                      >
+                        ${item.sale_price}
+                      </div>
+                    `;
+                                })
+                                    .join('');
+                            }
+                            case 'totalQty': {
+                                return dataArray
+                                    .map((item, lineItemIndex) => {
+                                    const spec = item.spec.length > 0 ? Tool.truncateString(item.spec.join(''), 5) : '單一規格';
+                                    return html `
+                      <div
+                        class="tx_normal ${commonClass} justify-content-start"
+                        style="width: ${dataRaw.width};${commonHeight}"
+                      >
+                        ${item.count}
+                      </div>
+                    `;
+                                })
+                                    .join('');
+                            }
+                            case 'oriQty': {
+                                return dataArray
+                                    .map((item, lineItemIndex) => {
                                     let splitQty = 0;
                                     splitOrderArray.forEach(order => {
                                         splitQty += Number(order.lineItems[lineItemIndex].count);
                                     });
                                     const minusQtyClass = `${gClass('minusQty')} ${splitQty > 0 ? '' : 'd-none'}`;
-                                    dataRaw.htmlArray.push(html `
-                          <div
-                            class="tx_normal ${commonClass} justify-content-start"
-                            style="width: ${dataRaw.width};${commonHeight}"
-                          >
-                            ${item.count} <span class="${minusQtyClass}"> -> ${Number(item.count) - splitQty}</span>
-                          </div>
-                        `);
-                                    break;
-                                }
+                                    return html `
+                      <div
+                        class="tx_normal ${commonClass} justify-content-start"
+                        style="width: ${dataRaw.width};${commonHeight}"
+                      >
+                        ${item.count}
+                        <span class="${minusQtyClass}">
+                          <i class="fa-solid fa-arrow-right ${gClass('font-blue')} ${gClass('summary-right')}"></i
+                          >${Number(item.count) - splitQty}</span
+                        >
+                      </div>
+                    `;
+                                })
+                                    .join('');
                             }
-                            return html ``;
-                        })
-                            .join('')}
-              </div>
-            `;
-                    });
+                            default: {
+                                return '';
+                            }
+                        }
+                    }
                     return html `
             ${dataRaws
                         .map(item => {
                         var _a, _b;
                         return html `
-                  <div class="d-flex flex-column">
+                  <div class="d-flex flex-column flex-shrink-0">
                     <div class="${commonClass}" style="width: ${item.width};${(_a = item === null || item === void 0 ? void 0 : item.style) !== null && _a !== void 0 ? _a : ''}">
                       <div class="tx_700">${item.title}</div>
                       <div class="flex-fill"></div>
                     </div>
-                    <div
-                      class="d-flex flex-column"
-                      style="width: ${item.width};gap:16px;padding-top: 24px;${(_b = item === null || item === void 0 ? void 0 : item.style) !== null && _b !== void 0 ? _b : ''}"
-                    >
-                      ${item.htmlArray.join('')}
-                    </div>
+                    ${gvc.bindView({
+                            bind: item.key,
+                            view: () => {
+                                return (drawLineItems(item) +
+                                    html ` <div class="${commonClass} mt-3" style="width: ${item.width};"></div>`);
+                            },
+                            divCreate: {
+                                class: 'd-flex flex-column',
+                                style: `width: ${item.width};gap:16px;padding-top: 24px;${(_b = item === null || item === void 0 ? void 0 : item.style) !== null && _b !== void 0 ? _b : ''}`,
+                            },
+                        })}
                   </div>
                 `;
                     })
                         .join('')}
-            ${drawSplitOrder()} ${addBTN}
+            <div class="d-flex flex-shrink-0" style="overflow-x: scroll;gap:5px;">${drawSplitOrder()} ${addBTN}</div>
           `;
                 },
                 divCreate: { style: '', class: `${gClass('itemList-section')}` },
             });
         };
-        const renderBlock = (gvc) => {
-            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>
-          <div class="${gClass('summary-oriSummary')}"></div>
-          ${subBlock}
-        </div>
-      `;
-        };
         const renderSummary = (gvc) => {
             return gvc.bindView({
                 bind: ids.summary,
@@ -2033,8 +2146,7 @@ export class OrderSetting {
                         const sale_price = dataArray.reduce((total, data) => total + data.sale_price * Number(data.count), 0);
                         const split_price = splitOrderArray.reduce((total, order) => total +
                             order.lineItems.reduce((subTotal, lineItem) => subTotal + lineItem.sale_price * Number(lineItem.count), 0), 0);
-                        const rate = 1 - split_price / (sale_price + orderData.shipment_fee);
-                        const discount = Math.round(orderData.discount * rate);
+                        const split_discount = splitOrderArray.reduce((total, order) => total + order.discount, 0);
                         switch (index) {
                             case 1:
                                 if (split_price) {
@@ -2055,7 +2167,7 @@ export class OrderSetting {
                     <div class="d-flex align-items-center">
                       <span class="text-decoration-line-through">-${orderData.discount}</span
                       ><i class="fa-solid fa-arrow-right ${gClass('font-blue')} ${gClass('summary-right')}"></i
-                      ><span class="${gClass('font-blue')}">-${discount}</span>
+                      ><span class="${gClass('font-blue')}">-${orderData.discount - split_discount}</span>
                     </div>
                   `;
                                 }
@@ -2067,7 +2179,10 @@ export class OrderSetting {
                       <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
+                        >${sale_price -
+                                        split_price -
+                                        (orderData.discount - split_discount) +
+                                        orderData.shipment_fee}</span
                       >
                     </div>
                   `;
@@ -2142,18 +2257,33 @@ export class OrderSetting {
             applyClass();
             return gvc.bindView({
                 bind: ids.page,
-                view: () => html `
-          <div class="d-flex flex-column ${gClass('full-screen')}">
-            ${renderHeader(gvc)}
-            <div
-              class="flex-fill scrollbar-appear"
-              style="${isDesktop ? 'padding: 24px 32px;' : 'padding: 0;'} overflow: hidden auto;"
-            >
-              ${renderHint(gvc)} ${renderItemList(gvc)} ${renderBlock(gvc)} ${renderSummary(gvc)}
+                view: () => {
+                    if (vm.loading) {
+                        glitter.share.loading_dialog.dataLoading({ text: '載入中...', visible: true });
+                        ApiUser.getPublicConfig('store_manager', 'manager').then((dd) => {
+                            if (dd.result && dd.response.value) {
+                                storeList = dd.response.value.list;
+                                vm.loading = false;
+                                gvc.notifyDataChange(ids.page);
+                            }
+                        });
+                    }
+                    else {
+                        glitter.share.loading_dialog.dataLoading({ text: '載入中...', visible: false });
+                    }
+                    return html `
+            <div class="d-flex flex-column ${gClass('full-screen')}">
+              ${renderHeader(gvc)}
+              <div
+                class="flex-fill scrollbar-appear"
+                style="${isDesktop ? 'padding: 24px 32px;' : 'padding: 0 24px;'} overflow: scroll;"
+              >
+                ${renderHint(gvc)} ${renderItemList(gvc)} ${renderSummary(gvc)}
+              </div>
+              ${renderFooter(gvc)}
             </div>
-            ${renderFooter(gvc)}
-          </div>
-        `,
+          `;
+                },
             });
         }, 'splitOrder');
     }