ts-glitter 20.6.7 → 20.6.9

package/lowcode/glitter-base/global/payment-config.js

@@ -18,22 +18,7 @@ export class PaymentConfig {
                 keyData = Object.assign(Object.assign({}, keyData), data.response.result[0].value);
             }
             const offlinePayArray = [
-                {
-                    key: 'atm',
-                    name: 'ATM銀行轉帳',
-                    customerClass: 'guide2-3',
-                    img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/20200804163522idfs9.jpg',
-                },
-                {
-                    key: 'line',
-                    name: 'LINE 轉帳',
-                    img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/unnamed.webp',
-                },
-                {
-                    key: 'cash_on_delivery',
-                    name: '貨到付款',
-                    img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/images.png',
-                },
+                ...this.defalutOfflinePay,
                 ...keyData.payment_info_custom.map((dd) => {
                     return {
                         key: dd.id,
@@ -96,3 +81,21 @@ PaymentConfig.onlinePay = [
         img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/unnamed (1) copy.jpg',
     },
 ];
+PaymentConfig.defalutOfflinePay = [
+    {
+        key: 'atm',
+        name: 'ATM銀行轉帳',
+        customerClass: 'guide2-3',
+        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/20200804163522idfs9.jpg',
+    },
+    {
+        key: 'line',
+        name: 'LINE 轉帳',
+        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/unnamed.webp',
+    },
+    {
+        key: 'cash_on_delivery',
+        name: '貨到付款',
+        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/images.png',
+    },
+];

package/lowcode/glitter-base/global/payment-config.ts

@@ -46,33 +46,39 @@ export class PaymentConfig {
     },
   ];
 
+  public static defalutOfflinePay = [
+    {
+      key: 'atm',
+      name: 'ATM銀行轉帳',
+      customerClass: 'guide2-3',
+      img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/20200804163522idfs9.jpg',
+    },
+    {
+      key: 'line',
+      name: 'LINE 轉帳',
+      img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/unnamed.webp',
+    },
+    {
+      key: 'cash_on_delivery',
+      name: '貨到付款',
+      img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/images.png',
+    },
+  ];
+
   public static async getSupportPayment(all: boolean = false) {
     const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
     const data = await saasConfig.api.getPrivateConfig(saasConfig.config.appName, 'glitter_finance');
     let keyData: any = {};
+
     if (data.response.result[0]) {
       keyData = {
         ...keyData,
         ...data.response.result[0].value,
       };
     }
+
     const offlinePayArray = [
-      {
-        key: 'atm',
-        name: 'ATM銀行轉帳',
-        customerClass: 'guide2-3',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/20200804163522idfs9.jpg',
-      },
-      {
-        key: 'line',
-        name: 'LINE 轉帳',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/unnamed.webp',
-      },
-      {
-        key: 'cash_on_delivery',
-        name: '貨到付款',
-        img: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/images.png',
-      },
+      ...this.defalutOfflinePay,
       ...keyData.payment_info_custom.map((dd: any) => {
         return {
           key: dd.id,

package/lowcode/glitter-base/global/shipment-config.js

@@ -69,7 +69,7 @@ ShipmentConfig.list = [
         src: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/Chunghwa_Post_Logo.svg.png',
     },
     {
-        title: '7-11交貨便',
+        title: '7-11店到店',
         value: 'UNIMARTC2C',
         src: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1716734544575-34f72af5b441738b1f65a0597c28d9cf (1).png',
         paynow_id: '01',
@@ -118,15 +118,16 @@ ShipmentConfig.list = [
     },
 ];
 ShipmentConfig.supportPrintList = [
-    'FAMIC2C',
     'UNIMARTC2C',
-    'HILIFEC2C',
+    'UNIMARTFREEZE',
+    'FAMIC2C',
+    'FAMIC2CFREEZE',
     'OKMARTC2C',
+    'HILIFEC2C',
     'normal',
     'black_cat',
     'black_cat_ice',
-    'UNIMARTFREEZE',
     'black_cat_freezing',
 ];
-ShipmentConfig.supermarketList = ['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C', 'UNIMARTFREEZE', 'FAMIC2CFREEZE'];
+ShipmentConfig.supermarketList = ['UNIMARTC2C', 'UNIMARTFREEZE', 'FAMIC2C', 'FAMIC2CFREEZE', 'OKMARTC2C', 'HILIFEC2C'];
 window.glitter.setModule(import.meta.url, ShipmentConfig);

package/lowcode/glitter-base/global/shipment-config.ts

@@ -1,4 +1,3 @@
-//這邊儲存所有宅配的配置檔案
 export class ShipmentConfig {
   public static list = [
     {
@@ -22,7 +21,7 @@ export class ShipmentConfig {
       src: 'https://d3jnmi1tfjgtti.cloudfront.net/file/122538856/Chunghwa_Post_Logo.svg.png',
     },
     {
-      title: '7-11交貨便',
+      title: '7-11店到店',
       value: 'UNIMARTC2C',
       src: 'https://d3jnmi1tfjgtti.cloudfront.net/file/234285319/1716734544575-34f72af5b441738b1f65a0597c28d9cf (1).png',
       paynow_id: '01',
@@ -70,22 +69,25 @@ export class ShipmentConfig {
       src: `<i class="fa-duotone fa-solid fa-shop" style="font-size: 35px;color:#319e49;"></i>`,
     },
   ];
-  //支援列印托運單的配送方式
+
+  // 支援列印托運單的配送方式
   public static supportPrintList = [
-    'FAMIC2C',
     'UNIMARTC2C',
-    'HILIFEC2C',
+    'UNIMARTFREEZE',
+    'FAMIC2C',
+    'FAMIC2CFREEZE',
     'OKMARTC2C',
+    'HILIFEC2C',
     'normal',
     'black_cat',
     'black_cat_ice',
-    'UNIMARTFREEZE',
     'black_cat_freezing',
   ];
-  //超商列表
-  public static supermarketList = ['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C', 'UNIMARTFREEZE', 'FAMIC2CFREEZE'];
 
-  //所有的配送方式
+  // 超商列表
+  public static supermarketList = ['UNIMARTC2C', 'UNIMARTFREEZE', 'FAMIC2C', 'FAMIC2CFREEZE', 'OKMARTC2C', 'HILIFEC2C'];
+
+  // 所有的配送方式
   public static async shipmentMethod(cf: { type: 'all' | 'market' | 'support' }) {
     const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
     const response: { response: any; result: boolean } = await saasConfig.api.getPrivateConfig(
@@ -101,7 +103,7 @@ export class ShipmentConfig {
         'zh-TW': { info: configData.info || '' },
       };
     }
-    configData.support=configData.support??[];
+    configData.support = configData.support ?? [];
     const shipmentOptions = ShipmentConfig.list
       .map(dd => {
         return { key: dd.value, name: dd.title };

package/lowcode/glitter-base/route/fcm.js

@@ -2,6 +2,26 @@ import { BaseApi } from "../../glitterBundle/api/base.js";
 export class ApiFcm {
     constructor() {
     }
+    static history(json) {
+        return BaseApi.create({
+            url: getBaseUrl() +
+                `/api-public/v1/fcm?${(() => {
+                    let par = [`type=list`, `limit=${json.limit}`, `page=${json.page}`];
+                    json.search && par.push(`search=${json.search}`);
+                    json.searchType && par.push(`searchType=${json.searchType}`);
+                    json.sendTime && par.push(`sendDate=${json.sendTime.date}&sendTime=${json.sendTime.time}`);
+                    json.status && par.push(`status=${json.status.join(',')}`);
+                    json.mailType && par.push(`mailType=${json.mailType.join(',')}`);
+                    return par.join('&');
+                })()}`,
+            type: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
+            },
+        });
+    }
     static send(json) {
         return BaseApi.create({
             "url": getBaseUrl() + `/api-public/v1/fcm`,
@@ -16,7 +36,7 @@ export class ApiFcm {
     }
 }
 function getConfig() {
-    const saasConfig = window.saasConfig;
+    const saasConfig = window.parent.saasConfig;
     return saasConfig;
 }
 function getBaseUrl() {

package/lowcode/glitter-base/route/fcm.ts

@@ -6,7 +6,27 @@ import {BaseApi} from "../../glitterBundle/api/base.js";
 export class ApiFcm {
     constructor() {
     }
-
+    public static history(json: { page: number; limit: number; search: string; searchType: string; sendTime?: { date: string; time: string }; status?: number[]; mailType?: string[] }) {
+        return BaseApi.create({
+            url:
+              getBaseUrl() +
+              `/api-public/v1/fcm?${(() => {
+                  let par = [`type=list`, `limit=${json.limit}`, `page=${json.page}`];
+                  json.search && par.push(`search=${json.search}`);
+                  json.searchType && par.push(`searchType=${json.searchType}`);
+                  json.sendTime && par.push(`sendDate=${json.sendTime.date}&sendTime=${json.sendTime.time}`);
+                  json.status && par.push(`status=${json.status.join(',')}`);
+                  json.mailType && par.push(`mailType=${json.mailType.join(',')}`);
+                  return par.join('&');
+              })()}`,
+            type: 'GET',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
+            },
+        });
+    }
     public static send(json: any) {
         return BaseApi.create({
             "url": getBaseUrl() + `/api-public/v1/fcm`,
@@ -24,7 +44,7 @@ export class ApiFcm {
 }
 
 function getConfig() {
-    const saasConfig: { config: any; api: any } = (window as any).saasConfig;
+    const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
     return saasConfig
 }
 

package/lowcode/glitter-base/route/shopping.js

@@ -383,6 +383,8 @@ export class ApiShop {
                     json.minPrice && par.push(`min_price=${json.minPrice}`);
                     json.status && par.push(`status=${json.status}`);
                     json.channel && par.push(`channel=${json.channel}`);
+                    json.general_tag && par.push(`general_tag=${json.general_tag}`);
+                    json.manager_tag && par.push(`manager_tag=${json.manager_tag}`);
                     json.whereStore && par.push(`whereStore=${json.whereStore}`);
                     if (json.schedule === true || json.schedule === false) {
                         par.push(`schedule=${json.schedule}`);
@@ -479,6 +481,12 @@ export class ApiShop {
             if (obj.payment_select && obj.payment_select.length > 0) {
                 list.push(`payment_select=${obj.payment_select.join(',')}`);
             }
+            if (obj.manager_tag && obj.manager_tag.length > 0) {
+                list.push(`manager_tag=${obj.manager_tag.join(',')}`);
+            }
+            if (obj.member_levels && obj.member_levels.length > 0) {
+                list.push(`member_levels=${obj.member_levels.join(',')}`);
+            }
         }
         return list;
     }
@@ -1059,38 +1067,6 @@ export class ApiShop {
             { title: '已退款', value: '-2' },
         ];
     }
-    static getProgressArray(shipment_number) {
-        return [
-            {
-                title: '出貨狀態',
-                value: '',
-            },
-            {
-                title: '已出貨',
-                value: 'shipping',
-            },
-            {
-                title: '待預購',
-                value: 'pre_order',
-            },
-            {
-                title: shipment_number ? `備貨中` : '未出貨',
-                value: 'wait',
-            },
-            {
-                title: '已取貨',
-                value: 'finish',
-            },
-            {
-                title: '已退貨',
-                value: 'returns',
-            },
-            {
-                title: '已到貨',
-                value: 'arrived',
-            },
-        ];
-    }
     static getVariants(json) {
         return BaseApi.create({
             url: getBaseUrl() +

package/lowcode/glitter-base/route/shopping.ts

@@ -410,6 +410,8 @@ export class ApiShop {
     minPrice?: string;
     status?: string;
     channel?: string;
+    general_tag?: string;
+    manager_tag?: string;
     whereStore?: string;
     schedule?: boolean;
     orderBy?: string;
@@ -438,6 +440,8 @@ export class ApiShop {
           json.minPrice && par.push(`min_price=${json.minPrice}`);
           json.status && par.push(`status=${json.status}`);
           json.channel && par.push(`channel=${json.channel}`);
+          json.general_tag && par.push(`general_tag=${json.general_tag}`);
+          json.manager_tag && par.push(`manager_tag=${json.manager_tag}`);
           json.whereStore && par.push(`whereStore=${json.whereStore}`);
           if (json.schedule === true || json.schedule === false) {
             par.push(`schedule=${json.schedule}`);
@@ -552,6 +556,12 @@ export class ApiShop {
       if (obj.payment_select && obj.payment_select.length > 0) {
         list.push(`payment_select=${obj.payment_select.join(',')}`);
       }
+      if (obj.manager_tag && obj.manager_tag.length > 0) {
+        list.push(`manager_tag=${obj.manager_tag.join(',')}`);
+      }
+      if (obj.member_levels && obj.member_levels.length > 0) {
+        list.push(`member_levels=${obj.member_levels.join(',')}`);
+      }
     }
 
     return list;
@@ -1359,39 +1369,6 @@ export class ApiShop {
     ];
   }
 
-  static getProgressArray(shipment_number: any) {
-    return [
-      {
-        title: '出貨狀態',
-        value: '',
-      },
-      {
-        title: '已出貨',
-        value: 'shipping',
-      },
-      {
-        title: '待預購',
-        value: 'pre_order',
-      },
-      {
-        title: shipment_number ? `備貨中` : '未出貨',
-        value: 'wait',
-      },
-      {
-        title: '已取貨',
-        value: 'finish',
-      },
-      {
-        title: '已退貨',
-        value: 'returns',
-      },
-      {
-        title: '已到貨',
-        value: 'arrived',
-      },
-    ];
-  }
-
   static getVariants(json: {
     limit: number;
     page: number;

package/lowcode/glitter-base/route/user.js

@@ -220,11 +220,11 @@ export class ApiUser {
                 data: JSON.stringify({
                     phone_number: phone_number,
                 }),
-            }).then((res) => {
+            }).then(res => {
                 if (res.response.out_limit) {
                     const dialog = new ShareDialog(window.glitter);
                     dialog.errorMessage({
-                        text: '連續驗證失敗超過三次，請聯絡客服進行修改'
+                        text: '連續驗證失敗超過三次，請聯絡客服進行修改',
                     });
                 }
                 else {
@@ -318,6 +318,7 @@ export class ApiUser {
                     let par = [`type=list`, `limit=${json.limit}`, `page=${json.page}`];
                     json.search && par.push(`search=${json.search}`);
                     json.search_type && par.push(`searchType=${json.search_type}`);
+                    json.only_id && par.push(`only_id=${json.only_id}`);
                     json.id && par.push(`id=${json.id}`);
                     return par.join('&');
                 })()}`,
@@ -799,6 +800,14 @@ export class ApiUser {
         });
     }
 }
+ApiUser.normalMember = {
+    id: '',
+    duration: { type: 'noLimit', value: 0 },
+    tag_name: '一般會員',
+    condition: { type: 'total', value: 0 },
+    dead_line: { type: 'noLimit' },
+    create_date: '2024-01-01T00:00:00.000Z',
+};
 ApiUser.getting_config = [];
 function getConfig() {
     const saasConfig = window.parent.saasConfig;

package/lowcode/glitter-base/route/user.ts

@@ -220,7 +220,7 @@ export class ApiUser {
   }
 
   public static phoneVerify(phone_number: string) {
-    return new Promise<{result:boolean,response:any}>((resolve, reject) => {
+    return new Promise<{ result: boolean; response: any }>((resolve, reject) => {
       BaseApi.create({
         url: getBaseUrl() + `/api-public/v1/user/phone-verify`,
         type: 'POST',
@@ -231,17 +231,17 @@ export class ApiUser {
         data: JSON.stringify({
           phone_number: phone_number,
         }),
-      }).then((res)=>{
-        if(res.response.out_limit){
-         const dialog=new ShareDialog((window as any).glitter);
-         dialog.errorMessage({
-           text:'連續驗證失敗超過三次，請聯絡客服進行修改'
-         })
-        }else{
-          resolve(res)
+      }).then(res => {
+        if (res.response.out_limit) {
+          const dialog = new ShareDialog((window as any).glitter);
+          dialog.errorMessage({
+            text: '連續驗證失敗超過三次，請聯絡客服進行修改',
+          });
+        } else {
+          resolve(res);
         }
-      })
-    })
+      });
+    });
   }
 
   public static registerFCM(userID: string, deviceToken: string, app_name?: string) {
@@ -336,7 +336,7 @@ export class ApiUser {
     search?: string;
     id?: string;
     search_type?: string;
-    only_id?: string;
+    only_id?: boolean;
   }) {
     return BaseApi.create({
       url:
@@ -345,7 +345,9 @@ export class ApiUser {
           let par = [`type=list`, `limit=${json.limit}`, `page=${json.page}`];
           json.search && par.push(`search=${json.search}`);
           json.search_type && par.push(`searchType=${json.search_type}`);
+          json.only_id && par.push(`only_id=${json.only_id}`);
           json.id && par.push(`id=${json.id}`);
+          
           return par.join('&');
         })()}`,
       type: 'GET',
@@ -402,6 +404,15 @@ export class ApiUser {
     return list;
   }
 
+  public static normalMember = {
+    id: '',
+    duration: { type: 'noLimit', value: 0 },
+    tag_name: '一般會員',
+    condition: { type: 'total', value: 0 },
+    dead_line: { type: 'noLimit' },
+    create_date: '2024-01-01T00:00:00.000Z',
+  };
+
   public static async getUserListOrders(json: {
     limit: number;
     page: number;

package/lowcode/jspage/function-page/setting_editor.js

@@ -1508,6 +1508,15 @@ Setting_editor.menuItems = () => {
             groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
             moduleName: '訂閱裝置管理',
         },
+        {
+            icon: '',
+            page: 'auto_fcm_history',
+            group: '品牌APP',
+            title: 'APP推播紀錄',
+            appName: 'cms_system',
+            groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
+            moduleName: '訂閱裝置管理',
+        },
         {
             icon: '',
             page: 'shop_list',

package/lowcode/jspage/function-page/setting_editor.ts

@@ -737,6 +737,15 @@ export class Setting_editor {
                 groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
                 moduleName: '訂閱裝置管理',
             },
+            {
+                icon: '',
+                page: 'auto_fcm_history',
+                group: '品牌APP',
+                title: 'APP推播紀錄',
+                appName: 'cms_system',
+                groupIcon: 'https://d3jnmi1tfjgtti.cloudfront.net/file/252530754/1713414599944-Component 56 (5).svg',
+                moduleName: '訂閱裝置管理',
+            },
             // {
             //     icon: '',
             //     page: 'auto_fcm_template',