ts-glitter 21.0.4 → 21.0.6

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

@@ -1,18 +1,19 @@
-import { BgWidget } from '../backend-manager/bg-widget.js';
 import { GVC } from '../glitterBundle/GVController.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';
 
 type CustomFinance = {
   name: string;
@@ -21,6 +22,12 @@ type CustomFinance = {
   shipmentSupport: string[];
 };
 
+type ShipmentGroupData = {
+  key: string;
+  name: string;
+  list: string[];
+};
+
 const html = String.raw;
 
 export class ShoppingFinanceSetting {
@@ -601,6 +608,12 @@ export class ShoppingFinanceSetting {
                                         ),
                                         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();
@@ -1699,6 +1712,7 @@ export class ShoppingFinanceSetting {
               [
                 { title: '基本設定', key: 'delivery_setting' },
                 { title: '物流追蹤', key: 'delivery_track' },
+                { title: '物流群組', key: 'delivery_group' },
                 { title: '配送備註', key: 'delivery_note' },
               ],
               gvc,
@@ -2890,7 +2904,278 @@ export class ShoppingFinanceSetting {
                 };
               }),
             ]);
+          } else if (vm.page === 'delivery_group') {
+            const dvm = {
+              id: gvc.glitter.getUUID(),
+              loading: true,
+              dataList: [] as ShipmentGroupData[],
+            };
+
+            function updateGroup(dialogGVC: GVC) {
+              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: string | undefined, callback: () => void) {
+              if (group) {
+                ApiShop.deleteProductLogistic({ group }).then(() => callback());
+              }
+            }
+
+            function editGroupDialog(item?: ShipmentGroupData) {
+              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: any = [];
+
+                  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 as any).appName, 'logistics_setting').then(
+                          (dd: any) => {
+                            if (dd.result && dd.response.result[0]) {
+                              const shipment_setting = dd.response.result[0].value;
+
+                              // 合併 ShipmentConfig.list 和 shipment_setting.custom_delivery
+                              const combinedList = [
+                                ...ShipmentConfig.list.map(dd => ({
+                                  name: dd.title,
+                                  value: dd.value,
+                                })),
+                                ...(shipment_setting.custom_delivery ?? []).map((dd: any) => ({
+                                  form: dd.form,
+                                  name: dd.name,
+                                  value: dd.id,
+                                })),
+                              ];
+
+                              // 過濾出 shipment_setting.support 中支援的項目
+                              const supportedList = combinedList.filter(d1 =>
+                                shipment_setting.support.some((d2: any) => d2 === d1.value)
+                              );
+
+                              // 轉換為 dataList 所需的格式
+                              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?.key);
+                                  deleteProductLogisticGroup(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?.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 => {
+                        if (r.result) {
+                          dvm.dataList = r.response.value ?? [];
+                        }
+                        setTimeout(() => {
+                          dvm.loading = false;
+                          gvc.notifyDataChange(dvm.id);
+                        }, 100);
+                      });
+                    }
+                  },
+                };
+              }),
+            ]);
           }
+
           // view.push(
           //   html`<div
           //     style="width: 100%;padding: 14px 16px;background: #FFF; display: flex;justify-content: end;position: fixed;bottom: 0;right: 0;z-index:1;gap:14px;"

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

@@ -331,24 +331,30 @@ export class ShoppingOrderManager {
                                     })
                                         .flat()),
                                 ];
+                                function cartTokenComponent(cart_token, source_badge, is_watch_user) {
+                                    return html `<div style="min-width:200px;">
+                      <div style="position: relative; height: 40px;">
+                        <div
+                          style="position: absolute; bottom: 9px; height: 9px; width: 127px; ${is_watch_user
+                                        ? 'background-color: #ffe9b2'
+                                        : ''}"
+                        ></div>
+                        <span style="position: absolute; bottom: 0;">${cart_token}${source_badge}</span>
+                      </div>
+                    </div>`;
+                                }
                                 return data.response.data.map((dd) => {
                                     var _a;
                                     const vt = OrderSetting.getAllStatusBadge(dd);
                                     dd.orderData.total = dd.orderData.total || 0;
                                     dd.orderData.customer_info = (_a = dd.orderData.customer_info) !== null && _a !== void 0 ? _a : {};
                                     const isWatchUser = watchUsers.includes(dd.orderData.email);
-                                    const backgroundColor = isWatchUser ? `background-color: #ffe9b2` : '';
                                     const tooltipText = isWatchUser ? '此份訂單的顧客為觀察名單' : '';
                                     if (query.isShipment) {
                                         return [
                                             {
                                                 key: '訂單編號',
-                                                value: html ` <div
-                            class="d-flex align-items-center gap-2"
-                            style="min-width: 200px; ${backgroundColor}"
-                          >
-                            ${dd.cart_token}${vt.sourceBadge()}
-                          </div>`,
+                                                value: cartTokenComponent(dd.cart_token, vt.sourceBadge(), isWatchUser),
                                                 tooltip: tooltipText,
                                             },
                                             {
@@ -378,12 +384,7 @@ export class ShoppingOrderManager {
                                         return [
                                             {
                                                 key: '訂單編號',
-                                                value: html ` <div
-                            class="d-flex align-items-center gap-2"
-                            style="min-width: 200px; ${backgroundColor}"
-                          >
-                            ${dd.cart_token}${vt.sourceBadge()}
-                          </div>`,
+                                                value: cartTokenComponent(dd.cart_token, vt.sourceBadge(), isWatchUser),
                                                 tooltip: tooltipText,
                                             },
                                             {
@@ -1541,12 +1542,13 @@ export class ShoppingOrderManager {
                                                                 ['姓名', 'name'],
                                                                 ['電話', 'phone'],
                                                                 ['信箱', 'email'],
+                                                                ['縣市', 'city'],
+                                                                ['鄉鎮', 'area'],
+                                                                ['地址', 'address'],
                                                             ];
                                                             const receipt = (yield ApiUser.getPublicConfig('custom_form_checkout_recipient', 'manager')).response.value;
                                                             receipt.list.map((d1) => {
-                                                                if (!viewModel.find(dd => {
-                                                                    return dd[1] === d1.key;
-                                                                })) {
+                                                                if (!viewModel.find(dd => dd[1] === d1.key)) {
                                                                     viewModel.push([d1.title, d1.key]);
                                                                 }
                                                             });
@@ -2603,7 +2605,7 @@ export class ShoppingOrderManager {
                                             html ` <div class="d-flex flex-column" style="gap:8px;">
                                     <div
                                       class="d-flex align-items-center"
-                                      style="font-weight: 700; gap:8px;cursor:pointer;"
+                                      style="gap: 8px; cursor: pointer;"
                                       onclick="${gvc.event(() => {
                                                 if (userData.userID) {
                                                     child_vm.userID = userData.userID;
@@ -2611,31 +2613,44 @@ export class ShoppingOrderManager {
                                                 }
                                             })}"
                                     >
-                                      ${(() => {
-                                                var _a;
-                                                const name = (_a = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _a === void 0 ? void 0 : _a.name;
-                                                if (name) {
-                                                    return html `<span style="color: #4D86DB;">${name}</span>`;
-                                                }
-                                                return html `<span style="color: #393939;">訪客</span>`;
-                                            })()}
-                                      ${(() => {
-                                                if (userDataLoading) {
-                                                    return BgWidget.secondaryInsignia('讀取中');
-                                                }
-                                                if (userData.member == undefined) {
-                                                    return BgWidget.secondaryInsignia('訪客');
-                                                }
-                                                if ((userData === null || userData === void 0 ? void 0 : userData.member.length) > 0) {
-                                                    for (let i = 0; i < userData.member.length; i++) {
-                                                        if (userData.member[i].trigger) {
-                                                            return BgWidget.primaryInsignia(userData.member[i].tag_name);
+                                      ${[
+                                                (() => {
+                                                    var _a;
+                                                    const name = (_a = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _a === void 0 ? void 0 : _a.name;
+                                                    if (name) {
+                                                        return html `<span style="font-weight: 500; color: #4D86DB;">${name}</span>`;
+                                                    }
+                                                    return html `<span style="font-weight: normal; color: #393939;">訪客</span>`;
+                                                })(),
+                                                (() => {
+                                                    if (userData.status === 0) {
+                                                        return '';
+                                                    }
+                                                    if (userDataLoading) {
+                                                        return BgWidget.grayInsignia('讀取中');
+                                                    }
+                                                    if (userData.member === undefined) {
+                                                        return BgWidget.grayInsignia('訪客');
+                                                    }
+                                                    if ((userData === null || userData === void 0 ? void 0 : userData.member.length) > 0) {
+                                                        for (let i = 0; i < userData.member.length; i++) {
+                                                            if (userData.member[i].trigger) {
+                                                                return BgWidget.darkInsignia(userData.member[i].tag_name);
+                                                            }
                                                         }
                                                     }
-                                                    return BgWidget.primaryInsignia('一般會員');
-                                                }
-                                                return BgWidget.secondaryInsignia('訪客');
-                                            })()}
+                                                    return BgWidget.darkInsignia('一般會員');
+                                                })(),
+                                                (() => {
+                                                    if (userData.status === 0) {
+                                                        return BgWidget.dangerInsignia('黑名單');
+                                                    }
+                                                    if (userData.status === 2) {
+                                                        return BgWidget.watchingInsignia('觀察名單');
+                                                    }
+                                                    return '';
+                                                })(),
+                                            ].join('')}
                                     </div>
                                     <div style="color: #393939;font-weight: 400;">
                                       ${(_h = (_g = (_f = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _f === void 0 ? void 0 : _f.phone) !== null && _g !== void 0 ? _g : orderData.orderData.user_info.phone) !== null && _h !== void 0 ? _h : '此會員未填手機'}
@@ -2643,9 +2658,6 @@ export class ShoppingOrderManager {
                                     <div style="color: #393939;font-weight: 400;word-break:break-all;">
                                       ${(_l = (_k = (_j = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _j === void 0 ? void 0 : _j.email) !== null && _k !== void 0 ? _k : orderData.orderData.user_info.email) !== null && _l !== void 0 ? _l : ''}
                                     </div>
-                                    <div style="color: #393939;font-weight: 700;">
-                                      ${userData.status === 2 ? '* 此顧客列為觀察名單' : ''}
-                                    </div>
                                   </div>`,
                                             BgWidget.horizontalLine(),
                                             gvc.bindView({
@@ -2744,9 +2756,7 @@ export class ShoppingOrderManager {
                                                                         orderData.orderData.user_info.area,
                                                                         orderData.orderData.user_info.address,
                                                                     ]
-                                                                        .filter(dd => {
-                                                                        return dd;
-                                                                    })
+                                                                        .filter(Boolean)
                                                                         .join('')}
                                                     </div>`);
                                                                 }