ts-glitter 21.0.4 → 21.0.6

package/lowcode/cms-plugin/pos-pages/payment-page.ts

@@ -202,10 +202,10 @@ export class PaymentPage {
                       ${(() => {
                         if (orderDetail.lineItems.length > 0) {
                           return orderDetail.lineItems
-                            .map((data: any) => {
+                            .map((data: any, index: number) => {
                               return html`
                                 <div class="d-flex" style="">
-                                  <div class="col-9 col-sm-6 d-flex align-items-center">
+                                  <div class="col-12 col-sm-6 d-flex align-items-center">
                                     <div
                                       class="d-flex flex-column align-items-center justify-content-center"
                                       style="gap:5px;width:75px;"
@@ -233,7 +233,16 @@ export class PaymentPage {
                                       </div>
                                     </div>
                                     <div
-                                      class="d-flex flex-column py-2"
+                                      class="d-flex flex-column py-2" onclick="${gvc.event(() => {
+                                      PosFunction.setMoney(
+                                        gvc,
+                                        count => {
+                                          obj.ogOrderData.lineItems[index].count = count;
+                                          refreshOrderView();
+                                        },
+                                        '更改商品數量'
+                                      );
+                                    })}"
                                       style="font-size: 16px;font-style: normal;font-weight: 500;letter-spacing: 0.64px;margin-left: 12px;"
                                     >
                                       <div class="d-flex justify-content-center flex-column" style="gap:5px;">
@@ -241,7 +250,7 @@ export class PaymentPage {
                                           if (!data.pre_order) {
                                             return ``;
                                           } else {
-                                            return html`<div>${BgWidget.dangerInsignia('需預購')}</div>`;
+                                            return html` <div>${BgWidget.dangerInsignia('需預購')}</div>`;
                                           }
                                         })()}
                                         ${data.title}
@@ -269,15 +278,86 @@ export class PaymentPage {
                                           </div>`
                                         : ``}
                                     </div>
+                                    <div class="flex-fill"></div>
+                                    <div class="d-sm-none d-flex align-items-center justify-content-center flex-column" style="gap:0px;" onclick="${gvc.event(()=>{
+                                      PosFunction.setMoney(
+                                        gvc,
+                                        money => {
+                                          if (money === data.sale_price) {
+                                            delete obj.ogOrderData.lineItems[index].custom_price;
+                                          } else {
+                                            obj.ogOrderData.lineItems[index].custom_price = money;
+                                          }
+                                          refreshOrderView();
+                                        },
+                                        '更改商品單價'
+                                      )
+                                    })}">
+                                      ${(data.sale_price !== data.variant_sale_price) ? `
+                                    <span class="text-decoration-line-through"
+                                      >$${parseInt((data.variant_sale_price * data.count) as any, 10).toLocaleString()}</span
+                                    >
+                                     <span class="text-danger"
+                                      >$${parseInt((data.sale_price * data.count) as any, 10).toLocaleString()}</span
+                                    >
+                                    `:`
+                                    <span
+                                      >$${parseInt((data.sale_price * data.count) as any, 10).toLocaleString()}</span
+                                    >
+                                    `}
+
+                                    </div>
                                   </div>
                                   <div class="col-2 d-none d-sm-flex align-items-center justify-content-start">
                                     $${parseInt(data.sale_price as any, 10).toLocaleString()}
                                   </div>
-                                  <div class="col-3 col-lg-2 d-flex align-items-center justify-content-center">
+                                  <div
+                                    class="col-3 col-lg-2 d-flex align-items-center justify-content-center d-none d-sm-flex"
+                                    style="gap:10px;cursor: pointer;"
+                                    onclick="${gvc.event(() => {
+                                      PosFunction.setMoney(
+                                        gvc,
+                                        count => {
+                                          obj.ogOrderData.lineItems[index].count = count;
+                                          refreshOrderView();
+                                        },
+                                        '更改商品數量'
+                                      );
+                                    })}"
+                                  >
                                     ${Number(data.count as any).toLocaleString()}
                                   </div>
-                                  <div class="col-3 col-lg-2 d-flex align-items-center justify-content-center">
-                                    $${parseInt((data.sale_price * data.count) as any, 10).toLocaleString()}
+                                  <div
+                                    class="col-3 col-lg-2 d-flex align-items-center justify-content-center  d-none d-sm-flex"
+                                    style="gap:10px;cursor: pointer;"
+                                    onclick="${gvc.event(() => {
+                                      PosFunction.setMoney(
+                                        gvc,
+                                        money => {
+                                          if (money === data.sale_price) {
+                                            delete obj.ogOrderData.lineItems[index].custom_price;
+                                          } else {
+                                            obj.ogOrderData.lineItems[index].custom_price = money;
+                                          }
+                                          refreshOrderView();
+                                        },
+                                        '更改商品單價'
+                                      );
+                                    })}"
+                                  >
+                                    ${(data.sale_price !== data.variant_sale_price) ? `
+                                    <span class="text-decoration-line-through"
+                                      >$${parseInt((data.variant_sale_price * data.count) as any, 10).toLocaleString()}</span
+                                    >
+                                     <span class="text-danger"
+                                      >$${parseInt((data.sale_price * data.count) as any, 10).toLocaleString()}</span
+                                    >
+                                    `:`
+                                    <span
+                                      >$${parseInt((data.sale_price * data.count) as any, 10).toLocaleString()}</span
+                                    >
+                                    `}
+                                    
                                   </div>
                                 </div>
                               `;
@@ -2075,25 +2155,24 @@ export class PaymentPage {
             PayConfig.pos_config.pos_support_finction.includes('print_order_receipt') ||
             PayConfig.pos_config.pos_support_finction.includes('print_order_detail')
           ) {
-
             if (PayConfig.deviceType === 'pos') {
               //客戶聯
-              await IminModule.printTransactionDetails(res.response.data.orderID,invoice,glitter.share.staff_title);
+              await IminModule.printTransactionDetails(res.response.data.orderID, invoice, glitter.share.staff_title);
               //如果需要收執聯的話
-              if(
+              if (
                 PayConfig.pos_config.pos_support_finction.includes('print_order_receipt') &&
                 PayConfig.pos_config.pos_support_finction.includes('print_order_detail')
-              ){
+              ) {
                 await new Promise(resolve => {
-                  const dialog=new ShareDialog(glitter)
+                  const dialog = new ShareDialog(glitter);
                   dialog.infoMessage({
-                    text:'請撕取客戶聯，在列印留存聯',
-                    callback:()=>{
-                      resolve(true)
-                    }
-                  })
-                })
-                await IminModule.printTransactionDetails(res.response.data.orderID,invoice,glitter.share.staff_title);
+                    text: '請撕取客戶聯，在列印留存聯',
+                    callback: () => {
+                      resolve(true);
+                    },
+                  });
+                });
+                await IminModule.printTransactionDetails(res.response.data.orderID, invoice, glitter.share.staff_title);
               }
             } else {
               ConnectionMode.sendCommand({

package/lowcode/cms-plugin/product-service.js

@@ -58,10 +58,11 @@ export class ProductService {
                 {
                     check: (data) => !data.seo.domain,
                     errorMessage: '未設定商品連結',
-                },
+                }
             ];
             for (const languageCode of supportedLanguages) {
                 const currentLanguageData = languageData[languageCode];
+                currentLanguageData.seo.domain = currentLanguageData.seo.domain.replace(/\+/g, '');
                 for (const rule of validationRules) {
                     if (rule.check(currentLanguageData)) {
                         vm.language = languageCode;

package/lowcode/cms-plugin/product-service.ts

@@ -67,7 +67,7 @@ export class ProductService {
         {
           check: (data: LanguageData) => !data.seo.domain,
           errorMessage: '未設定商品連結',
-        },
+        }
         // {
         //   check: (data: LanguageData) => !CheckInput.isChineseEnglishNumberHyphen(data.seo.domain),
         //   errorMessage: '連結僅限使用中英文數字與連接號',
@@ -77,8 +77,9 @@ export class ProductService {
       // 遍歷支持的語言並進行驗證
       for (const languageCode of supportedLanguages) {
         const currentLanguageData = languageData[languageCode];
-
+        currentLanguageData.seo.domain = currentLanguageData.seo.domain.replace(/\+/g, '');
         for (const rule of validationRules) {
+
           if (rule.check(currentLanguageData)) {
             vm.language = languageCode;
             refresh();

package/lowcode/cms-plugin/shopping-finance-setting.js

@@ -7,20 +7,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { BgWidget } from '../backend-manager/bg-widget.js';
 import { EditorElem } from '../glitterBundle/plugins/editor-elem.js';
 import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
-import { ApiPageConfig } from '../api/pageConfig.js';
+import { BgWidget } from '../backend-manager/bg-widget.js';
 import { CheckInput } from '../modules/checkInput.js';
-import { LanguageBackend } from './language-backend.js';
 import { Tool } from '../modules/tool.js';
-import { ProductAi } from './ai-generator/product-ai.js';
 import { imageLibrary } from '../modules/image-library.js';
+import { LanguageBackend } from './language-backend.js';
+import { ProductAi } from './ai-generator/product-ai.js';
+import { ApiPageConfig } from '../api/pageConfig.js';
 import { Language } from '../glitter-base/global/language.js';
-import { ShoppingShipmentSetting } from './shopping-shipment-setting.js';
-import { ShipmentConfig } from '../glitter-base/global/shipment-config.js';
 import { ApiUser } from '../glitter-base/route/user.js';
+import { ApiShop } from '../glitter-base/route/shopping.js';
 import { PaymentConfig } from '../glitter-base/global/payment-config.js';
+import { ShipmentConfig } from '../glitter-base/global/shipment-config.js';
+import { ShoppingShipmentSetting } from './shopping-shipment-setting.js';
 const html = String.raw;
 export class ShoppingFinanceSetting {
     static main(gvc, pos) {
@@ -552,6 +553,11 @@ export class ShoppingFinanceSetting {
                                                         gvc.closeDialog();
                                                     })),
                                                     BgWidget.save(gvc.event(() => {
+                                                        if (payData.key == "ecPay" && key_d.ActionURL == "https://payment-stage.ecpay.com.tw/Cashier/AioCheckOut/V5") {
+                                                            key_d.MERCHANT_ID = "3002607";
+                                                            key_d.HASH_KEY = "pwFHCqoQZGmho4w6";
+                                                            key_d.HASH_IV = "EkRm7iFT261dpevs";
+                                                        }
                                                         keyData[payData.key] = key_d;
                                                         saveData();
                                                         gvc.closeDialog();
@@ -1537,6 +1543,7 @@ export class ShoppingFinanceSetting {
                         BgWidget.tab([
                             { title: '基本設定', key: 'delivery_setting' },
                             { title: '物流追蹤', key: 'delivery_track' },
+                            { title: '物流群組', key: 'delivery_group' },
                             { title: '配送備註', key: 'delivery_note' },
                         ], gvc, vm.page, text => {
                             vm.page = text;
@@ -2608,6 +2615,244 @@ export class ShoppingFinanceSetting {
                             }),
                         ]);
                     }
+                    else if (vm.page === 'delivery_group') {
+                        const dvm = {
+                            id: gvc.glitter.getUUID(),
+                            loading: true,
+                            dataList: [],
+                        };
+                        function updateGroup(dialogGVC) {
+                            dialog.dataLoading({ visible: true });
+                            setTimeout(() => {
+                                ApiUser.setPublicConfig({
+                                    user_id: 'manager',
+                                    key: 'logistics_group',
+                                    value: dvm.dataList,
+                                }).then(() => {
+                                    dialog.dataLoading({ visible: false });
+                                    dialog.successMessage({ text: '設定成功' });
+                                    dialogGVC.closeDialog();
+                                    dvm.loading = true;
+                                    gvc.notifyDataChange(dvm.id);
+                                });
+                            }, 100);
+                        }
+                        function deleteProductLogisticGroup(group, callback) {
+                            if (group) {
+                                ApiShop.deleteProductLogistic({ group }).then(() => callback());
+                            }
+                        }
+                        function editGroupDialog(item) {
+                            const cloneData = structuredClone(item);
+                            const postData = item
+                                ? structuredClone(item)
+                                : {
+                                    key: Tool.randomString(8),
+                                    name: '',
+                                    list: [],
+                                };
+                            return BgWidget.settingDialog({
+                                gvc,
+                                title: '設定群組',
+                                innerHTML: iGVC => {
+                                    const id = iGVC.glitter.getUUID();
+                                    let loading = true;
+                                    let dataList = [];
+                                    return iGVC.bindView({
+                                        bind: id,
+                                        view: () => {
+                                            if (loading) {
+                                                return BgWidget.spinner();
+                                            }
+                                            return [
+                                                html `<div class="tx_700">群組名稱</div>`,
+                                                BgWidget.editeInput({
+                                                    gvc: iGVC,
+                                                    title: '',
+                                                    default: postData.name,
+                                                    placeHolder: '請輸入群組名稱',
+                                                    callback: value => {
+                                                        postData.name = value;
+                                                    },
+                                                }),
+                                                html `<div class="tx_700">包含的物流</div>`,
+                                                BgWidget.multiCheckboxContainer(iGVC, dataList, postData.list, text => {
+                                                    postData.list = text;
+                                                }, { single: false }),
+                                            ].join(BgWidget.mbContainer(12));
+                                        },
+                                        onCreate: () => {
+                                            if (loading) {
+                                                ApiPageConfig.getPrivateConfig(window.parent.appName, 'logistics_setting').then((dd) => {
+                                                    var _a;
+                                                    if (dd.result && dd.response.result[0]) {
+                                                        const shipment_setting = dd.response.result[0].value;
+                                                        const combinedList = [
+                                                            ...ShipmentConfig.list.map(dd => ({
+                                                                name: dd.title,
+                                                                value: dd.value,
+                                                            })),
+                                                            ...((_a = shipment_setting.custom_delivery) !== null && _a !== void 0 ? _a : []).map((dd) => ({
+                                                                form: dd.form,
+                                                                name: dd.name,
+                                                                value: dd.id,
+                                                            })),
+                                                        ];
+                                                        const supportedList = combinedList.filter(d1 => shipment_setting.support.some((d2) => d2 === d1.value));
+                                                        dataList = supportedList.map(data => ({
+                                                            key: data.value,
+                                                            name: data.name,
+                                                        }));
+                                                    }
+                                                    loading = false;
+                                                    iGVC.notifyDataChange(id);
+                                                });
+                                            }
+                                        },
+                                    });
+                                },
+                                footer_html: fGVC => {
+                                    return [
+                                        item
+                                            ? BgWidget.danger(fGVC.event(() => {
+                                                dialog.checkYesOrNot({
+                                                    text: '若刪除此群組，有使用到此群組的商品將會改成全部物流皆可使用，確定要刪除此物流群組？',
+                                                    callback: bool => {
+                                                        if (bool) {
+                                                            dvm.dataList = dvm.dataList.filter(data => data.key !== (item === null || item === void 0 ? void 0 : item.key));
+                                                            deleteProductLogisticGroup(item === null || item === void 0 ? void 0 : item.key, () => updateGroup(fGVC));
+                                                        }
+                                                    },
+                                                });
+                                            }))
+                                            : '',
+                                        BgWidget.cancel(fGVC.event(() => {
+                                            if (item) {
+                                                item = cloneData;
+                                            }
+                                            fGVC.closeDialog();
+                                        })),
+                                        BgWidget.save(fGVC.event(() => {
+                                            for (const data of dvm.dataList) {
+                                                if (data.key !== postData.key) {
+                                                    if (data.name === postData.name) {
+                                                        dialog.infoMessage({ text: `群組名「${postData.name}」已經存在` });
+                                                        return;
+                                                    }
+                                                    if (Tool.ObjCompare(postData.list, data.list)) {
+                                                        dialog.infoMessage({ text: '此群組的物流組合已經存在，請調整您點選的物流' });
+                                                        return;
+                                                    }
+                                                    if (postData.list.length === 0) {
+                                                        dialog.infoMessage({ text: '請勾選至少一種物流的組合' });
+                                                        return;
+                                                    }
+                                                }
+                                            }
+                                            if (item) {
+                                                const target = dvm.dataList.find(data => data.key === (item === null || item === void 0 ? void 0 : item.key));
+                                                target && Object.assign(target, postData);
+                                            }
+                                            else {
+                                                dvm.dataList.push(postData);
+                                            }
+                                            updateGroup(fGVC);
+                                        })),
+                                    ].join('');
+                                },
+                            });
+                        }
+                        view = view.concat([
+                            html ` <div class="px-md-0 px-2">
+                ${BgWidget.normalInsignia('可以將多個物流設定成一個群組集中，在商品設定頁可以一次管理物流方式')}
+              </div>`,
+                            gvc.bindView(() => {
+                                return {
+                                    bind: dvm.id,
+                                    view: () => {
+                                        if (dvm.loading) {
+                                            return BgWidget.spinner();
+                                        }
+                                        return dvm.dataList
+                                            .map(item => {
+                                            const dd = {
+                                                title: item.name,
+                                                value: item.key,
+                                                list: item.list,
+                                                type: 'font_awesome',
+                                                src: html `<i class="fa-solid fa-object-group fs-4"></i>`,
+                                            };
+                                            return html `
+                          <div class="col-12 col-md-4 p-0 p-md-2">
+                            <div
+                              class="w-100 position-relative main-card"
+                              style="padding: 24px; background: white; overflow: hidden; justify-content: space-between; align-items: center; gap: 18px; display: inline-flex;"
+                            >
+                              <div
+                                style="align-self: stretch; justify-content: flex-start; align-items: center; gap: 28px; display: inline-flex;"
+                              >
+                                <div>${dd.type === 'font_awesome' ? dd.src : html ` <img src="${dd.src}" />`}</div>
+                                <div
+                                  style="flex-direction: column; justify-content: center; align-items: flex-start; gap: 4px; display: inline-flex"
+                                >
+                                  <div class="tx_normal">${dd.title}</div>
+                                </div>
+                              </div>
+                              <div>
+                                ${BgWidget.customButton({
+                                                button: { color: 'gray', size: 'sm' },
+                                                text: { name: '設定群組' },
+                                                event: gvc.event(() => editGroupDialog(item)),
+                                            })}
+                              </div>
+                            </div>
+                          </div>
+                          ${document.body.clientWidth > 768 ? '' : BgWidget.mbContainer(8)}
+                        `;
+                                        })
+                                            .concat([
+                                            html ` <div
+                          class="col-12 col-md-4 p-0 p-md-2"
+                          style="cursor: pointer;"
+                          onclick="${gvc.event(() => editGroupDialog())}"
+                        >
+                          <div
+                            class="w-100 main-card"
+                            style="max-height:73.59px;padding: 24px; background: white; overflow: hidden; flex-direction: column; justify-content: center; align-items: center; gap: 18px; display: inline-flex"
+                          >
+                            <div
+                              class="fw-bold"
+                              style="align-self: stretch; justify-content: center; align-items: center; gap: 14px; display: inline-flex;color:#4D86DB;"
+                            >
+                              <i class="fa-regular fa-circle-plus fs-5"></i>
+                              <div class="fs-5">新增物流群組</div>
+                            </div>
+                          </div>
+                        </div>`,
+                                        ])
+                                            .join('');
+                                    },
+                                    divCreate: {
+                                        class: 'row guide3-3 mt-3 px-1',
+                                    },
+                                    onCreate: () => {
+                                        if (dvm.loading) {
+                                            ApiUser.getPublicConfig('logistics_group', 'manager').then(r => {
+                                                var _a;
+                                                if (r.result) {
+                                                    dvm.dataList = (_a = r.response.value) !== null && _a !== void 0 ? _a : [];
+                                                }
+                                                setTimeout(() => {
+                                                    dvm.loading = false;
+                                                    gvc.notifyDataChange(dvm.id);
+                                                }, 100);
+                                            });
+                                        }
+                                    },
+                                };
+                            }),
+                        ]);
+                    }
                     view.push(BgWidget.mbContainer(240));
                     return BgWidget.container(view.join(''));
                 },