ts-glitter 20.8.6 → 20.8.9

package/lowcode/cms-plugin/pos-pages/pos-function.ts

@@ -35,6 +35,7 @@ function getVoucherText(gvc: GVC, voucherData: VoucherContent): string[] {
   const productForList = [
     { title: Language.text('all_products'), value: 'all' },
     { title: Language.text('product_categories'), value: 'collection' },
+    { title: Language.text('products'), value: 'manager_tag' }, // 管理員標籤的篩選於前台顯示「特定商品」
     { title: Language.text('products'), value: 'product' },
   ];
 

package/lowcode/cms-plugin/pos-pages/products-page.js

@@ -390,7 +390,7 @@ export class ProductsPage {
                             return html `
                             <div class="w-100 d-flex">
                               <div style="font-size: 18px;font-style: normal;font-weight: 700;">${data.left}</div>
-                              <div class="ms-auto" style="font-size: 16px;font-weight: 700;">${data.right}</div>
+                              <div class="ms-auto" style="font-size: 16px;font-weight: 700;">$ ${data.right}</div>
                             </div>
                           `;
                         })

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

@@ -480,7 +480,7 @@ export class ProductsPage {
                           return html`
                             <div class="w-100 d-flex">
                               <div style="font-size: 18px;font-style: normal;font-weight: 700;">${data.left}</div>
-                              <div class="ms-auto" style="font-size: 16px;font-weight: 700;">${data.right}</div>
+                              <div class="ms-auto" style="font-size: 16px;font-weight: 700;">$ ${data.right}</div>
                             </div>
                           `;
                         })

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

@@ -5,16 +5,11 @@ export class ProductService {
         const gvc = obj.gvc;
         const dialog = new ShareDialog(gvc.glitter);
         function checkEmpty() {
-            const variantsCheckList = ['sale_price'];
             if (postMD.product_category !== 'kitchen') {
-                for (const checkItem of variantsCheckList) {
-                    if (postMD['variants'][0][checkItem] == undefined ||
-                        postMD['variants'][0][checkItem] == 0) {
-                        dialog.infoMessage({
-                            text: '售價未填',
-                        });
-                        return false;
-                    }
+                const salePrice = postMD['variants'][0]['sale_price'];
+                if (salePrice === '' || salePrice === undefined || salePrice === null) {
+                    dialog.infoMessage({ text: '尚未填寫售價' });
+                    return false;
                 }
             }
             for (const index in postMD['variants']) {

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

@@ -1,7 +1,6 @@
 import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 import { ShoppingProductSetting } from './shopping-product-setting.js';
 import { LanguageData } from '../public-models/product.js';
-import { CheckInput } from '../modules/checkInput.js';
 
 export class ProductService {
   public static checkData(postMD: any, obj: any, vm: any, refresh: () => void) {
@@ -9,19 +8,11 @@ export class ProductService {
     const dialog = new ShareDialog(gvc.glitter);
 
     function checkEmpty() {
-      const variantsCheckList = ['sale_price'];
-
       if (postMD.product_category !== 'kitchen') {
-        for (const checkItem of variantsCheckList) {
-          if (
-            (postMD['variants'][0] as any)[checkItem] == undefined ||
-            (postMD['variants'][0] as any)[checkItem] == 0
-          ) {
-            dialog.infoMessage({
-              text: '售價未填',
-            });
-            return false;
-          }
+        const salePrice = (postMD['variants'][0] as any)['sale_price'];
+        if (salePrice === '' || salePrice === undefined || salePrice === null) {
+          dialog.infoMessage({ text: '尚未填寫售價' });
+          return false;
         }
       }
 

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

@@ -38,7 +38,6 @@ export class ShoppingDiscountSetting {
         const html = String.raw;
         return gvc.bindView(() => {
             const id = glitter.getUUID();
-            const filterID = glitter.getUUID();
             return {
                 bind: id,
                 dataList: [{ obj: vm, key: 'type' }],
@@ -75,7 +74,7 @@ export class ShoppingDiscountSetting {
                                         };
                                         function getDatalist() {
                                             return data.response.data.map((dd) => {
-                                                var _a;
+                                                var _a, _b;
                                                 return [
                                                     {
                                                         key: '標題',
@@ -96,9 +95,9 @@ export class ShoppingDiscountSetting {
                                   </span>`,
                                                     },
                                                     {
-                                                        key: '對象',
+                                                        key: '套用至',
                                                         value: html `<span class="fs-7"
-                                    >${dd.content.for === 'product' ? `指定商品` : `商品分類`}</span
+                                    >${(_b = ShoppingDiscountSetting.productForList.find(item => item.value === dd.content.for)) === null || _b === void 0 ? void 0 : _b.title}</span
                                   >`,
                                                     },
                                                     {
@@ -190,17 +189,12 @@ export class ShoppingDiscountSetting {
         const vm = obj.vm;
         const html = String.raw;
         const voucherData = Object.assign({ title: '', code: '', trigger: 'auto', method: 'fixed', value: '0', for: 'all', forKey: [], device: ['normal'], rule: 'min_price', ruleValue: 1000, startDate: this.getDateTime().date, startTime: this.getDateTime().time, endDate: undefined, endTime: undefined, status: 1, type: 'voucher', overlay: false, start_ISO_Date: '', end_ISO_Date: '', reBackType: obj.reBackType, rebateEndDay: '30', target: 'all', targetList: [], macroLimited: 0, microLimited: 0, counting: 'single', conditionType: 'order', includeDiscount: 'before', productOffStart: 'price_desc' }, vm.data);
-        const productForList = [
-            { title: '所有商品', value: 'all' },
-            { title: '商品分類', value: 'collection' },
-            { title: '單一商品', value: 'product' },
-        ];
         function getVoucherTextList() {
             var _a, _b;
             return [
                 `活動標題：${voucherData.title && voucherData.title.length > 0 ? voucherData.title : '尚無標題'}`,
                 `適用商品：${(() => {
-                    const forData = productForList.find(item => item.value === voucherData.for);
+                    const forData = ShoppingDiscountSetting.productForList.find(item => item.value === voucherData.for);
                     return forData ? forData.title : '';
                 })()}`,
                 `活動方式：${(() => {
@@ -466,7 +460,7 @@ export class ShoppingDiscountSetting {
                                                       </div>
                                                       ${obj.gvc.map(customVM.dataList.map((opt, index) => {
                                                                             return html ` <div class="form-check-label c_updown_label">
-                                                            <span class="tx_normal">${index + 1} . ${opt.value}</span>
+                                                            <span class="tx_normal">${index + 1}. ${opt.value}</span>
                                                             ${opt.note
                                                                                 ? html ` <span class="tx_gray_12 ms-2">${opt.note}</span> `
                                                                                 : ''}
@@ -634,10 +628,12 @@ export class ShoppingDiscountSetting {
                                 BgWidget.mainCard(gvc.bindView(() => {
                                     var _a;
                                     const id = glitter.getUUID();
+                                    const originForType = String(voucherData.for);
                                     voucherData.forKey = (_a = voucherData.forKey) !== null && _a !== void 0 ? _a : [];
                                     let defKeys = {
                                         collection: JSON.parse(JSON.stringify(voucherData.forKey)),
                                         product: JSON.parse(JSON.stringify(voucherData.forKey)),
+                                        manager_tag: JSON.parse(JSON.stringify(voucherData.forKey)),
                                     };
                                     return {
                                         bind: id,
@@ -711,7 +707,7 @@ export class ShoppingDiscountSetting {
                                                             gvc: gvc,
                                                             title: '',
                                                             def: (_a = voucherData.for) !== null && _a !== void 0 ? _a : 'all',
-                                                            array: productForList,
+                                                            array: ShoppingDiscountSetting.productForList,
                                                             callback: text => {
                                                                 voucherData.forKey = defKeys[text];
                                                                 voucherData.for = text;
@@ -722,6 +718,52 @@ export class ShoppingDiscountSetting {
                                     ${BgWidget.mbContainer(8)}
                                     ${(() => {
                                                             switch (voucherData.for) {
+                                                                case 'manager_tag':
+                                                                    return gvc.bindView(() => {
+                                                                        const subVM = {
+                                                                            id: gvc.glitter.getUUID(),
+                                                                            dataList: originForType === 'manager_tag' ? [...defKeys.manager_tag] : [],
+                                                                        };
+                                                                        return {
+                                                                            bind: subVM.id,
+                                                                            view: () => {
+                                                                                return html `
+                                                  <div class="d-flex flex-column p-2" style="gap: 18px;">
+                                                    <div
+                                                      class="d-flex align-items-center gray-bottom-line-18"
+                                                      style="gap: 24px; justify-content: space-between;"
+                                                    >
+                                                      <div class="form-check-label c_updown_label">
+                                                        <div class="tx_normal">標籤列表</div>
+                                                      </div>
+                                                      ${BgWidget.grayButton('選擇標籤', gvc.event(() => {
+                                                                                    BgProduct.useProductTags({
+                                                                                        gvc,
+                                                                                        config_key: 'product_manager_tags',
+                                                                                        def: originForType === 'manager_tag' && voucherData.forKey
+                                                                                            ? voucherData.forKey.map(item => `${item}`)
+                                                                                            : [],
+                                                                                        callback: (value) => __awaiter(this, void 0, void 0, function* () {
+                                                                                            voucherData.forKey = value;
+                                                                                            defKeys.manager_tag = value;
+                                                                                            subVM.dataList = value;
+                                                                                            gvc.notifyDataChange(subVM.id);
+                                                                                        }),
+                                                                                    });
+                                                                                }), { textStyle: 'font-weight: 400;' })}
+                                                    </div>
+                                                    ${obj.gvc.map(subVM.dataList.map((opt, index) => {
+                                                                                    return html ` <div
+                                                          class="d-flex align-items-center form-check-label c_updown_label gap-3"
+                                                        >
+                                                          <span class="tx_normal">${index + 1}. #${opt}</span>
+                                                        </div>`;
+                                                                                }))}
+                                                  </div>
+                                                `;
+                                                                            },
+                                                                        };
+                                                                    });
                                                                 case 'collection':
                                                                     return gvc.bindView(() => {
                                                                         const subVM = {
@@ -763,7 +805,7 @@ export class ShoppingDiscountSetting {
                                                                                     return html ` <div
                                                           class="d-flex align-items-center form-check-label c_updown_label gap-3"
                                                         >
-                                                          <span class="tx_normal">${index + 1} . ${opt.value}</span>
+                                                          <span class="tx_normal">${index + 1}. ${opt.value}</span>
                                                           ${opt.note
                                                                                         ? html ` <span class="tx_gray_12 ms-2">${opt.note}</span> `
                                                                                         : ''}
@@ -836,7 +878,7 @@ export class ShoppingDiscountSetting {
                                                                                     return html ` <div
                                                           class="d-flex align-items-center form-check-label c_updown_label gap-3"
                                                         >
-                                                          <span class="tx_normal">${index + 1} .</span>
+                                                          <span class="tx_normal">${index + 1}.</span>
                                                           ${BgWidget.validImageBox({
                                                                                         gvc: gvc,
                                                                                         image: opt.image,
@@ -886,7 +928,6 @@ export class ShoppingDiscountSetting {
                                                 })(),
                                             ].join(BgWidget.horizontalLine());
                                         },
-                                        divCreate: {},
                                     };
                                 })),
                                 ...(() => {
@@ -961,7 +1002,7 @@ export class ShoppingDiscountSetting {
                                                                                         return html ` <div
                                                           class="d-flex align-items-center form-check-label c_updown_label gap-3"
                                                         >
-                                                          <span class="tx_normal">${index + 1} .</span>
+                                                          <span class="tx_normal">${index + 1}.</span>
                                                           ${BgWidget.validImageBox({
                                                                                             gvc: gvc,
                                                                                             image: opt.image,
@@ -1265,7 +1306,8 @@ export class ShoppingDiscountSetting {
                                                 ...(() => {
                                                     var _a, _b;
                                                     if (voucherData.reBackType === 'rebate') {
-                                                        return [[
+                                                        return [
+                                                            [
                                                                 `<div class="tx_700">購物金有效天數</div>`,
                                                                 BgWidget.multiCheckboxContainer(gvc, [
                                                                     {
@@ -1276,13 +1318,13 @@ export class ShoppingDiscountSetting {
                                                                         key: 'withEnd',
                                                                         name: '有效期限',
                                                                         innerHtml: html ` <div
-                                        class="d-flex mt-0 mt-md-3 ${document.body.clientWidth < 768
+                                              class="d-flex mt-0 mt-md-3 ${document.body.clientWidth < 768
                                                                             ? 'flex-column'
                                                                             : ''}"
-                                        style="gap: 12px"
-                                      >
-                                        <div class="d-flex align-items-center" style="gap:10px;">
-                                          ${BgWidget.editeInput({
+                                              style="gap: 12px"
+                                            >
+                                              <div class="d-flex align-items-center" style="gap:10px;">
+                                                ${BgWidget.editeInput({
                                                                             gvc: gvc,
                                                                             title: '',
                                                                             type: 'number',
@@ -1294,16 +1336,17 @@ export class ShoppingDiscountSetting {
                                                                                 gvc.notifyDataChange(id);
                                                                             },
                                                                         })}
-                                          <span class="tx_normal me-2">天</span>
-                                        </div>
-                                      </div>`,
+                                                <span class="tx_normal me-2">天</span>
+                                              </div>
+                                            </div>`,
                                                                     },
                                                                 ], [parseInt((_b = voucherData.rebateEndDay) !== null && _b !== void 0 ? _b : '0', 10) ? `withEnd` : `noEnd`], text => {
                                                                     if (text[0] === 'noEnd') {
                                                                         voucherData.rebateEndDay = '0';
                                                                     }
-                                                                }, { single: true })
-                                                            ].join('<div class="my-2"></div>')];
+                                                                }, { single: true }),
+                                                            ].join('<div class="my-2"></div>'),
+                                                        ];
                                                     }
                                                     else {
                                                         return [];
@@ -1535,4 +1578,10 @@ ShoppingDiscountSetting.getDateTime = (n = 0) => {
     const timeStr = `${hours}:00`;
     return { date: dateStr, time: timeStr };
 };
+ShoppingDiscountSetting.productForList = [
+    { title: '所有商品', value: 'all' },
+    { title: '商品分類', value: 'collection' },
+    { title: '管理員標籤', value: 'manager_tag' },
+    { title: '特定商品', value: 'product' },
+];
 window.glitter.setModule(import.meta.url, ShoppingDiscountSetting);

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

@@ -8,6 +8,8 @@ import { ShareDialog } from '../glitterBundle/dialog/ShareDialog.js';
 import { FilterOptions } from './filter-options.js';
 import { Tool } from '../modules/tool.js';
 
+type VoucherForType = 'all' | 'collection' | 'product' | 'manager_tag';
+
 export class ShoppingDiscountSetting {
   public static getLabel(voucher_type: string): string {
     const labels: Record<string, string> = {
@@ -37,7 +39,6 @@ export class ShoppingDiscountSetting {
 
     return gvc.bindView(() => {
       const id = glitter.getUUID();
-      const filterID = glitter.getUUID();
       return {
         bind: id,
         dataList: [{ obj: vm, key: 'type' }],
@@ -104,9 +105,11 @@ export class ShoppingDiscountSetting {
                                   </span>`,
                                 },
                                 {
-                                  key: '對象',
+                                  key: '套用至',
                                   value: html`<span class="fs-7"
-                                    >${dd.content.for === 'product' ? `指定商品` : `商品分類`}</span
+                                    >${ShoppingDiscountSetting.productForList.find(
+                                      item => item.value === dd.content.for
+                                    )?.title}</span
                                   >`,
                                 },
                                 {
@@ -205,6 +208,13 @@ export class ShoppingDiscountSetting {
     return { date: dateStr, time: timeStr };
   };
 
+  static productForList = [
+    { title: '所有商品', value: 'all' },
+    { title: '商品分類', value: 'collection' },
+    { title: '管理員標籤', value: 'manager_tag' },
+    { title: '特定商品', value: 'product' },
+  ];
+
   public static voucherEditor(obj: { vm: any; gvc: GVC; type?: 'add' | 'replace'; defData?: any; reBackType: string }) {
     const gvc = obj.gvc;
     const glitter = gvc.glitter;
@@ -220,7 +230,7 @@ export class ShoppingDiscountSetting {
       device: ('normal' | 'pos')[];
       value: string;
       add_on_products?: string[];
-      for: 'collection' | 'product' | 'all';
+      for: VoucherForType;
       rule: 'min_price' | 'min_count';
       counting: 'single' | 'each';
       conditionType: 'item' | 'order';
@@ -276,17 +286,11 @@ export class ShoppingDiscountSetting {
       ...vm.data,
     };
 
-    const productForList = [
-      { title: '所有商品', value: 'all' },
-      { title: '商品分類', value: 'collection' },
-      { title: '單一商品', value: 'product' },
-    ];
-
     function getVoucherTextList() {
       return [
         `活動標題：${voucherData.title && voucherData.title.length > 0 ? voucherData.title : '尚無標題'}`,
         `適用商品：${(() => {
-          const forData = productForList.find(item => item.value === voucherData.for);
+          const forData = ShoppingDiscountSetting.productForList.find(item => item.value === voucherData.for);
           return forData ? forData.title : '';
         })()}`,
         `活動方式：${(() => {
@@ -586,7 +590,7 @@ export class ShoppingDiscountSetting {
                                                       ${obj.gvc.map(
                                                         customVM.dataList.map((opt: OptionsItem, index) => {
                                                           return html` <div class="form-check-label c_updown_label">
-                                                            <span class="tx_normal">${index + 1} . ${opt.value}</span>
+                                                            <span class="tx_normal">${index + 1}. ${opt.value}</span>
                                                             ${opt.note
                                                               ? html` <span class="tx_gray_12 ms-2">${opt.note}</span> `
                                                               : ''}
@@ -770,10 +774,12 @@ export class ShoppingDiscountSetting {
                     BgWidget.mainCard(
                       gvc.bindView(() => {
                         const id = glitter.getUUID();
+                        const originForType = String(voucherData.for);
                         voucherData.forKey = voucherData.forKey ?? [];
                         let defKeys: any = {
                           collection: JSON.parse(JSON.stringify(voucherData.forKey)),
                           product: JSON.parse(JSON.stringify(voucherData.forKey)),
+                          manager_tag: JSON.parse(JSON.stringify(voucherData.forKey)),
                         };
                         return {
                           bind: id,
@@ -851,10 +857,10 @@ export class ShoppingDiscountSetting {
                                       gvc: gvc,
                                       title: '',
                                       def: voucherData.for ?? 'all',
-                                      array: productForList,
+                                      array: ShoppingDiscountSetting.productForList,
                                       callback: text => {
                                         voucherData.forKey = defKeys[text];
-                                        voucherData.for = text as 'collection' | 'product' | 'all';
+                                        voucherData.for = text as VoucherForType;
                                         gvc.notifyDataChange(id);
                                       },
                                       oneLine: true,
@@ -862,6 +868,60 @@ export class ShoppingDiscountSetting {
                                     ${BgWidget.mbContainer(8)}
                                     ${(() => {
                                       switch (voucherData.for) {
+                                        case 'manager_tag':
+                                          return gvc.bindView(() => {
+                                            const subVM = {
+                                              id: gvc.glitter.getUUID(),
+                                              dataList: originForType === 'manager_tag' ? [...defKeys.manager_tag] : [],
+                                            };
+
+                                            return {
+                                              bind: subVM.id,
+                                              view: () => {
+                                                return html`
+                                                  <div class="d-flex flex-column p-2" style="gap: 18px;">
+                                                    <div
+                                                      class="d-flex align-items-center gray-bottom-line-18"
+                                                      style="gap: 24px; justify-content: space-between;"
+                                                    >
+                                                      <div class="form-check-label c_updown_label">
+                                                        <div class="tx_normal">標籤列表</div>
+                                                      </div>
+                                                      ${BgWidget.grayButton(
+                                                        '選擇標籤',
+                                                        gvc.event(() => {
+                                                          BgProduct.useProductTags({
+                                                            gvc,
+                                                            config_key: 'product_manager_tags',
+                                                            def:
+                                                              originForType === 'manager_tag' && voucherData.forKey
+                                                                ? voucherData.forKey.map(item => `${item}`)
+                                                                : [],
+                                                            callback: async value => {
+                                                              voucherData.forKey = value;
+                                                              defKeys.manager_tag = value;
+                                                              subVM.dataList = value;
+                                                              gvc.notifyDataChange(subVM.id);
+                                                            },
+                                                          });
+                                                        }),
+                                                        { textStyle: 'font-weight: 400;' }
+                                                      )}
+                                                    </div>
+                                                    ${obj.gvc.map(
+                                                      subVM.dataList.map((opt, index) => {
+                                                        return html` <div
+                                                          class="d-flex align-items-center form-check-label c_updown_label gap-3"
+                                                        >
+                                                          <span class="tx_normal">${index + 1}. #${opt}</span>
+                                                        </div>`;
+                                                      })
+                                                    )}
+                                                  </div>
+                                                `;
+                                              },
+                                            };
+                                          });
                                         case 'collection':
                                           return gvc.bindView(() => {
                                             const subVM = {
@@ -907,7 +967,7 @@ export class ShoppingDiscountSetting {
                                                         return html` <div
                                                           class="d-flex align-items-center form-check-label c_updown_label gap-3"
                                                         >
-                                                          <span class="tx_normal">${index + 1} . ${opt.value}</span>
+                                                          <span class="tx_normal">${index + 1}. ${opt.value}</span>
                                                           ${opt.note
                                                             ? html` <span class="tx_gray_12 ms-2">${opt.note}</span> `
                                                             : ''}
@@ -985,7 +1045,7 @@ export class ShoppingDiscountSetting {
                                                         return html` <div
                                                           class="d-flex align-items-center form-check-label c_updown_label gap-3"
                                                         >
-                                                          <span class="tx_normal">${index + 1} .</span>
+                                                          <span class="tx_normal">${index + 1}.</span>
                                                           ${BgWidget.validImageBox({
                                                             gvc: gvc,
                                                             image: opt.image,
@@ -1034,7 +1094,6 @@ export class ShoppingDiscountSetting {
                               })(),
                             ].join(BgWidget.horizontalLine());
                           },
-                          divCreate: {},
                         };
                       })
                     ),
@@ -1122,7 +1181,7 @@ export class ShoppingDiscountSetting {
                                                         return html` <div
                                                           class="d-flex align-items-center form-check-label c_updown_label gap-3"
                                                         >
-                                                          <span class="tx_normal">${index + 1} .</span>
+                                                          <span class="tx_normal">${index + 1}.</span>
                                                           ${BgWidget.validImageBox({
                                                             gvc: gvc,
                                                             image: opt.image,
@@ -1500,52 +1559,53 @@ export class ShoppingDiscountSetting {
                                 )}`,
                               ...(() => {
                                 if (voucherData.reBackType === 'rebate') {
-
-                                  return [[
-                                    `<div class="tx_700">購物金有效天數</div>`,
-                                    BgWidget.multiCheckboxContainer(
-                                      gvc,
-                                      [
-                                        {
-                                          key: 'noEnd',
-                                          name: '無期限',
-                                        },
-                                        {
-                                          key: 'withEnd',
-                                          name: '有效期限',
-                                          innerHtml: html` <div
-                                        class="d-flex mt-0 mt-md-3 ${document.body.clientWidth < 768
-                                            ? 'flex-column'
-                                            : ''}"
-                                        style="gap: 12px"
-                                      >
-                                        <div class="d-flex align-items-center" style="gap:10px;">
-                                          ${BgWidget.editeInput({
-                                            gvc: gvc,
-                                            title: '',
-                                            type: 'number',
-                                            style: inputStyle,
-                                            default: `${voucherData.rebateEndDay ?? ''}`,
-                                            placeHolder: '0則為無期限',
-                                            callback: text => {
-                                              voucherData.rebateEndDay = text;
-                                              gvc.notifyDataChange(id)
-                                            },
-                                          })}
-                                          <span class="tx_normal me-2">天</span>
-                                        </div>
-                                      </div>`,
+                                  return [
+                                    [
+                                      `<div class="tx_700">購物金有效天數</div>`,
+                                      BgWidget.multiCheckboxContainer(
+                                        gvc,
+                                        [
+                                          {
+                                            key: 'noEnd',
+                                            name: '無期限',
+                                          },
+                                          {
+                                            key: 'withEnd',
+                                            name: '有效期限',
+                                            innerHtml: html` <div
+                                              class="d-flex mt-0 mt-md-3 ${document.body.clientWidth < 768
+                                                ? 'flex-column'
+                                                : ''}"
+                                              style="gap: 12px"
+                                            >
+                                              <div class="d-flex align-items-center" style="gap:10px;">
+                                                ${BgWidget.editeInput({
+                                                  gvc: gvc,
+                                                  title: '',
+                                                  type: 'number',
+                                                  style: inputStyle,
+                                                  default: `${voucherData.rebateEndDay ?? ''}`,
+                                                  placeHolder: '0則為無期限',
+                                                  callback: text => {
+                                                    voucherData.rebateEndDay = text;
+                                                    gvc.notifyDataChange(id);
+                                                  },
+                                                })}
+                                                <span class="tx_normal me-2">天</span>
+                                              </div>
+                                            </div>`,
+                                          },
+                                        ],
+                                        [parseInt(voucherData.rebateEndDay ?? '0', 10) ? `withEnd` : `noEnd`],
+                                        text => {
+                                          if (text[0] === 'noEnd') {
+                                            voucherData.rebateEndDay = '0';
+                                          }
                                         },
-                                      ],
-                                      [parseInt(voucherData.rebateEndDay ?? '0',10) ? `withEnd` : `noEnd`],
-                                      text => {
-                                        if (text[0] === 'noEnd') {
-                                          voucherData.rebateEndDay='0'
-                                        }
-                                      },
-                                      { single: true }
-                                    )
-                                  ].join('<div class="my-2"></div>')];
+                                        { single: true }
+                                      ),
+                                    ].join('<div class="my-2"></div>'),
+                                  ];
                                 } else {
                                   return [];
                                 }