ts-glitter 20.6.8 → 20.7.0

package/lowcode/cms-plugin/cms-router.js

@@ -56,6 +56,11 @@ export class CmsRouter {
                                     resolve(cl.main(gvc));
                                 });
                                 break;
+                            case 'auto_fcm_history':
+                                gvc.glitter.getModule(new URL('./cms-plugin/auto-fcm-history.js', gvc.glitter.root_path).href, (cl) => {
+                                    resolve(cl.emailHistory(gvc));
+                                });
+                                break;
                             case 'auto_fcm_advertise':
                                 gvc.glitter.getModule(new URL('./cms-plugin/auto-fcm-advertise.js', gvc.glitter.root_path).href, (cl) => {
                                     resolve(cl.main(gvc));

package/lowcode/cms-plugin/cms-router.ts

@@ -72,6 +72,12 @@ export class CmsRouter{
                                    resolve(cl.main(gvc))
                                })
                                break
+                           case 'auto_fcm_history':
+                               // resolve('12345')
+                               gvc.glitter.getModule(new URL('./cms-plugin/auto-fcm-history.js', gvc.glitter.root_path).href, (cl) => {
+                                   resolve(cl.emailHistory(gvc))
+                               })
+                               break
                            case 'auto_fcm_advertise':
                                gvc.glitter.getModule(new URL('./cms-plugin/auto-fcm-advertise.js', gvc.glitter.root_path).href, (cl) => {
                                    resolve(cl.main(gvc))

package/lowcode/cms-plugin/filter-options.js

@@ -11,7 +11,19 @@ import { ShipmentConfig } from '../glitter-base/global/shipment-config.js';
 import { ApiUser } from '../glitter-base/route/user.js';
 import { PaymentConfig } from '../glitter-base/global/payment-config.js';
 import { BgWidget } from '../backend-manager/bg-widget.js';
+import { BgProduct } from '../backend-manager/bg-product.js';
+import { OrderModule } from './order/order-module.js';
+const html = String.raw;
 export class FilterOptions {
+    static getLevelData() {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const normalMember = ApiUser.normalMember;
+            normalMember.id = 'null';
+            const levelConfig = yield ApiUser.getPublicConfig('member_level_config', 'manager');
+            return [normalMember, ...((_c = (_b = (_a = levelConfig === null || levelConfig === void 0 ? void 0 : levelConfig.response) === null || _a === void 0 ? void 0 : _a.value) === null || _b === void 0 ? void 0 : _b.levels) !== null && _c !== void 0 ? _c : [])];
+        });
+    }
     static getUserFunnel() {
         return __awaiter(this, void 0, void 0, function* () {
             const generalTags = yield new Promise(resolve => {
@@ -25,7 +37,7 @@ export class FilterOptions {
                     }
                 });
             });
-            const levelData = (yield ApiUser.getPublicConfig('member_level_config', 'manager')).response.value.levels;
+            const levelData = yield this.getLevelData();
             return [
                 {
                     key: 'created_time',
@@ -137,6 +149,7 @@ export class FilterOptions {
     }
     static getOrderFunnel() {
         return __awaiter(this, void 0, void 0, function* () {
+            const levelData = yield this.getLevelData();
             return [
                 { key: 'orderStatus', type: 'multi_checkbox', name: '訂單狀態', data: this.orderStatusOptions },
                 { key: 'payload', type: 'multi_checkbox', name: '付款狀態', data: this.payloadStatusOptions },
@@ -148,7 +161,9 @@ export class FilterOptions {
                     data: (yield PaymentConfig.getSupportPayment()).map(dd => {
                         if (dd.type === 'pos' && !dd.name.includes('POS')) {
                             const name = dd.name;
-                            dd.name = `<div class="d-flex">${[BgWidget.warningInsignia('POS'), name].join(`<div class="mx-1"></div>`)}</div>`;
+                            dd.name = html `<div class="d-flex">
+              ${[BgWidget.warningInsignia('POS'), name].join(html `<div class="mx-1"></div>`)}
+            </div>`;
                         }
                         return dd;
                     }),
@@ -158,9 +173,7 @@ export class FilterOptions {
                     key: 'shipment',
                     type: 'multi_checkbox',
                     name: '運送方式',
-                    data: yield ShipmentConfig.shipmentMethod({
-                        type: 'support',
-                    }),
+                    data: yield ShipmentConfig.shipmentMethod({ type: 'support' }),
                 },
                 {
                     key: 'created_time',
@@ -186,6 +199,20 @@ export class FilterOptions {
                         ],
                     },
                 },
+                {
+                    key: 'member_levels',
+                    type: 'multi_checkbox',
+                    name: '會員等級',
+                    data: levelData.map((dd) => {
+                        return { key: dd.id, name: dd.tag_name };
+                    }),
+                },
+                {
+                    key: 'manager_tag',
+                    type: 'search_and_select',
+                    name: '訂單管理標籤',
+                    data: yield OrderModule.getOrderManagerTag(),
+                },
             ];
         });
     }
@@ -241,6 +268,50 @@ export class FilterOptions {
             ];
         });
     }
+    static getProductFunnel() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return [
+                {
+                    key: 'status',
+                    type: 'multi_checkbox',
+                    name: '商品狀態',
+                    data: [
+                        { key: 'inRange', name: '上架' },
+                        { key: 'beforeStart', name: '待上架' },
+                        { key: 'afterEnd', name: '下架' },
+                        { key: 'draft', name: '草稿' },
+                    ],
+                },
+                {
+                    key: 'channel',
+                    type: 'multi_checkbox',
+                    name: '銷售管道',
+                    data: [
+                        { key: 'normal', name: 'APP & 官網' },
+                        { key: 'pos', name: 'POS' },
+                    ],
+                },
+                {
+                    key: 'collection',
+                    type: 'multi_checkbox',
+                    name: '商品分類',
+                    data: yield BgProduct.getCollectonCheckData(),
+                },
+                {
+                    key: 'general_tag',
+                    type: 'search_and_select',
+                    name: '商品標籤',
+                    data: yield BgProduct.getProductGeneralTag(),
+                },
+                {
+                    key: 'manager_tag',
+                    type: 'search_and_select',
+                    name: '商品管理標籤',
+                    data: yield BgProduct.getProductManagerTag(),
+                },
+            ];
+        });
+    }
 }
 FilterOptions.userFilterFrame = {
     created_time: ['', ''],
@@ -281,6 +352,8 @@ FilterOptions.orderFilterFrame = {
     payment_select: [],
     shipment: [],
     created_time: ['', ''],
+    manager_tag: [],
+    member_levels: [],
 };
 FilterOptions.returnOrderFilterFrame = {
     progress: [],
@@ -486,29 +559,9 @@ FilterOptions.productFilterFrame = {
     status: [],
     channel: [],
     collection: [],
+    general_tag: [],
+    manager_tag: [],
 };
-FilterOptions.productFunnel = [
-    {
-        key: 'status',
-        type: 'multi_checkbox',
-        name: '商品狀態',
-        data: [
-            { key: 'inRange', name: '上架' },
-            { key: 'beforeStart', name: '待上架' },
-            { key: 'afterEnd', name: '下架' },
-            { key: 'draft', name: '草稿' },
-        ],
-    },
-    {
-        key: 'channel',
-        type: 'multi_checkbox',
-        name: '銷售管道',
-        data: [
-            { key: 'normal', name: 'APP & 官網' },
-            { key: 'pos', name: 'POS' },
-        ],
-    },
-];
 FilterOptions.productOrderBy = [
     { key: 'default', value: '預設' },
     { key: 'max_price', value: '價格高 > 低' },

package/lowcode/cms-plugin/filter-options.ts

@@ -2,6 +2,10 @@ import { ShipmentConfig } from '../glitter-base/global/shipment-config.js';
 import { ApiUser } from '../glitter-base/route/user.js';
 import { PaymentConfig } from '../glitter-base/global/payment-config.js';
 import { BgWidget } from '../backend-manager/bg-widget.js';
+import { BgProduct } from '../backend-manager/bg-product.js';
+import { OrderModule } from './order/order-module.js';
+
+const html = String.raw;
 
 export class FilterOptions {
   static userFilterFrame = {
@@ -17,6 +21,15 @@ export class FilterOptions {
     last_order_total: { key: '', value: '' },
   };
 
+  static async getLevelData() {
+    const normalMember = ApiUser.normalMember;
+    normalMember.id = 'null';
+
+    const levelConfig = await ApiUser.getPublicConfig('member_level_config', 'manager');
+
+    return [normalMember, ...(levelConfig?.response?.value?.levels ?? [])];
+  }
+
   static async getUserFunnel() {
     const generalTags = await new Promise<{ key: string; name: string }[]>(resolve => {
       ApiUser.getPublicConfig('user_general_tags', 'manager').then((dd: any) => {
@@ -27,7 +40,9 @@ export class FilterOptions {
         }
       });
     });
-    const levelData = (await ApiUser.getPublicConfig('member_level_config', 'manager')).response.value.levels;
+
+    const levelData = await this.getLevelData();
+
     return [
       {
         key: 'created_time',
@@ -166,6 +181,8 @@ export class FilterOptions {
     payment_select: [],
     shipment: [],
     created_time: ['', ''],
+    manager_tag: [],
+    member_levels: [],
   };
 
   static returnOrderFilterFrame = {
@@ -225,6 +242,8 @@ export class FilterOptions {
   ];
 
   static async getOrderFunnel() {
+    const levelData = await this.getLevelData();
+
     return [
       { key: 'orderStatus', type: 'multi_checkbox', name: '訂單狀態', data: this.orderStatusOptions },
       { key: 'payload', type: 'multi_checkbox', name: '付款狀態', data: this.payloadStatusOptions },
@@ -236,7 +255,9 @@ export class FilterOptions {
         data: (await PaymentConfig.getSupportPayment()).map(dd => {
           if (dd.type === 'pos' && !dd.name.includes('POS')) {
             const name = dd.name;
-            dd.name = `<div class="d-flex">${[BgWidget.warningInsignia('POS'), name].join(`<div class="mx-1"></div>`)}</div>`;
+            dd.name = html`<div class="d-flex">
+              ${[BgWidget.warningInsignia('POS'), name].join(html`<div class="mx-1"></div>`)}
+            </div>`;
           }
           return dd;
         }),
@@ -246,9 +267,7 @@ export class FilterOptions {
         key: 'shipment',
         type: 'multi_checkbox',
         name: '運送方式',
-        data: await ShipmentConfig.shipmentMethod({
-          type: 'support',
-        }),
+        data: await ShipmentConfig.shipmentMethod({ type: 'support' }),
       },
       {
         key: 'created_time',
@@ -274,6 +293,20 @@ export class FilterOptions {
           ],
         },
       },
+      {
+        key: 'member_levels',
+        type: 'multi_checkbox',
+        name: '會員等級',
+        data: levelData.map((dd: any) => {
+          return { key: dd.id, name: dd.tag_name };
+        }),
+      },
+      {
+        key: 'manager_tag',
+        type: 'search_and_select',
+        name: '訂單管理標籤',
+        data: await OrderModule.getOrderManagerTag(),
+      },
     ];
   }
 
@@ -503,30 +536,52 @@ export class FilterOptions {
     status: [],
     channel: [],
     collection: [],
+    general_tag: [],
+    manager_tag: [],
   };
 
-  static productFunnel = [
-    {
-      key: 'status',
-      type: 'multi_checkbox',
-      name: '商品狀態',
-      data: [
-        { key: 'inRange', name: '上架' },
-        { key: 'beforeStart', name: '待上架' },
-        { key: 'afterEnd', name: '下架' },
-        { key: 'draft', name: '草稿' },
-      ],
-    },
-    {
-      key: 'channel',
-      type: 'multi_checkbox',
-      name: '銷售管道',
-      data: [
-        { key: 'normal', name: 'APP & 官網' },
-        { key: 'pos', name: 'POS' },
-      ],
-    },
-  ];
+  static async getProductFunnel() {
+    return [
+      {
+        key: 'status',
+        type: 'multi_checkbox',
+        name: '商品狀態',
+        data: [
+          { key: 'inRange', name: '上架' },
+          { key: 'beforeStart', name: '待上架' },
+          { key: 'afterEnd', name: '下架' },
+          { key: 'draft', name: '草稿' },
+        ],
+      },
+      {
+        key: 'channel',
+        type: 'multi_checkbox',
+        name: '銷售管道',
+        data: [
+          { key: 'normal', name: 'APP & 官網' },
+          { key: 'pos', name: 'POS' },
+        ],
+      },
+      {
+        key: 'collection',
+        type: 'multi_checkbox',
+        name: '商品分類',
+        data: await BgProduct.getCollectonCheckData(),
+      },
+      {
+        key: 'general_tag',
+        type: 'search_and_select',
+        name: '商品標籤',
+        data: await BgProduct.getProductGeneralTag(),
+      },
+      {
+        key: 'manager_tag',
+        type: 'search_and_select',
+        name: '商品管理標籤',
+        data: await BgProduct.getProductManagerTag(),
+      },
+    ];
+  }
 
   static productOrderBy = [
     { key: 'default', value: '預設' },
@@ -629,6 +684,7 @@ export class FilterOptions {
     { key: 'title', value: '內容' },
   ];
 
+
   static emailOptions = [
     { key: 'def', value: '請選擇根據的條件' },
     { key: 'all', value: '所有會員' },

package/lowcode/cms-plugin/language-backend.js

@@ -1,14 +1,15 @@
-import { BgWidget } from "../backend-manager/bg-widget.js";
-import { Language } from "../glitter-base/global/language.js";
+import { BgWidget } from '../backend-manager/bg-widget.js';
+import { Language } from '../glitter-base/global/language.js';
+const html = String.raw;
 export class LanguageBackend {
     static switchBtn(cf) {
         const gvc = cf.gvc;
-        return BgWidget.grayButton(`<div class="d-flex align-items-center" style="gap:5px;">
-<i class="fa-duotone fa-solid fa-earth-americas"></i>${Language.getLanguageText({
+        return BgWidget.grayButton(html `<div class="d-flex align-items-center" style="gap:5px;">
+        <i class="fa-duotone fa-solid fa-earth-americas"></i>${Language.getLanguageText({
             local: true,
-            compare: cf.language
+            compare: cf.language,
         })}
-</div>`, gvc.event(() => {
+      </div>`, gvc.event(() => {
             BgWidget.settingDialog({
                 gvc: gvc,
                 innerHTML: (gvc) => {
@@ -20,10 +21,9 @@ export class LanguageBackend {
                         return {
                             bind: id,
                             view: () => {
-                                return html `
-                                                                                <div style="position: relative;word-break: break-all;white-space: normal;">
-                                                                                    ${BgWidget.grayNote('前往商店設定->商店訊息中，設定支援的語言。')}
-                                                                                    ${gvc.bindView(() => {
+                                return html ` <div style="position: relative;word-break: break-all;white-space: normal;">
+                      ${BgWidget.grayNote('前往商店設定->商店訊息中，設定支援的語言。')}
+                      ${gvc.bindView(() => {
                                     const html = String.raw;
                                     return {
                                         bind: glitter.getUUID(),
@@ -31,57 +31,68 @@ export class LanguageBackend {
                                             const sup = [
                                                 {
                                                     key: 'en-US',
-                                                    value: '英文'
+                                                    value: '英文',
                                                 },
                                                 {
                                                     key: 'zh-CN',
-                                                    value: '簡體中文'
+                                                    value: '簡體中文',
                                                 },
                                                 {
                                                     key: 'zh-TW',
-                                                    value: '繁體中文'
-                                                }
-                                            ].filter((dd) => {
+                                                    value: '繁體中文',
+                                                },
+                                            ]
+                                                .filter(dd => {
                                                 return window.parent.store_info.language_setting.support.includes(dd.key);
-                                            }).sort((dd) => {
+                                            })
+                                                .sort((dd) => {
                                                 return dd.key === cf.language ? -1 : 1;
                                             });
-                                            return html `
-                                                                                                    <div class="d-flex mt-3 flex-wrap align-items-center justify-content-center"
-                                                                                                         style="gap:15px;">
-                                                                                                        ${sup.map((dd) => {
+                                            return html ` <div
+                              class="d-flex mt-3 flex-wrap align-items-center justify-content-center"
+                              style="gap:15px;"
+                            >
+                              ${sup
+                                                .map((dd) => {
                                                 return html `
-                                                                                                                <div class="px-3 py-1 text-white position-relative d-flex align-items-center justify-content-center"
-                                                                                                                     style="border-radius: 20px;background: #393939;cursor: pointer;width:100px;"
-                                                                                                                     onclick="${gvc.event(() => {
+                                    <div
+                                      class="px-3 py-1 text-white position-relative d-flex align-items-center justify-content-center"
+                                      style="border-radius: 20px;background: #393939;cursor: pointer;width:100px;"
+                                      onclick="${gvc.event(() => {
                                                     cf.callback(dd.key);
                                                     gvc.closeDialog();
-                                                })}">
-                                                                                                                    ${dd.value}
-                                                                                                                    <div class="position-absolute  text-white rounded-2 px-2 d-flex align-items-center rounded-3 ${dd.key !== cf.language ? `d-none` : ``}"
-                                                                                                                         style="top: -12px;right: -10px; height:20px;font-size: 11px;background: #ff6c02;">
-                                                                                                                        已選擇
-                                                                                                                    </div>
-                                                                                                                </div>
-                                                                                                            `;
-                                            }).join('')}
-                                                                                                    </div>`;
-                                        }
+                                                })}"
+                                    >
+                                      ${dd.value}
+                                      <div
+                                        class="position-absolute  text-white rounded-2 px-2 d-flex align-items-center rounded-3 ${dd.key !==
+                                                    cf.language
+                                                    ? `d-none`
+                                                    : ``}"
+                                        style="top: -12px;right: -10px; height:20px;font-size: 11px;background: #ff6c02;"
+                                      >
+                                        已選擇
+                                      </div>
+                                    </div>
+                                  `;
+                                            })
+                                                .join('')}
+                            </div>`;
+                                        },
                                     };
                                 })}
-                                                                                </div>`;
+                    </div>`;
                             },
                             divCreate: {},
-                            onCreate: () => {
-                            },
+                            onCreate: () => { },
                         };
                     })());
                 },
                 title: '切換語系',
-                footer_html: (gvc) => {
+                footer_html: gvc => {
                     return ``;
                 },
-                width: 350
+                width: 350,
             });
         }));
     }