ts-glitter 21.5.2 → 21.5.4

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

@@ -367,6 +367,8 @@ export class ShoppingOrderManager {
                                     dd.orderData.customer_info = (_a = dd.orderData.customer_info) !== null && _a !== void 0 ? _a : {};
                                     const isWatchUser = watchUsers.includes(dd.orderData.email);
                                     const tooltipText = isWatchUser ? '此份訂單的顧客為觀察名單' : '';
+                                    const userName = dd.orderData.customer_info ? dd.orderData.customer_info.name || '未填寫' : '匿名';
+                                    const receiveName = dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : '匿名';
                                     if (query.isShipment) {
                                         return [
                                             {
@@ -382,7 +384,11 @@ export class ShoppingOrderManager {
                                             },
                                             {
                                                 key: '訂購人',
-                                                value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : '匿名',
+                                                value: dd.orderData.orderSource === 'POS' ? receiveName : userName,
+                                            },
+                                            {
+                                                key: '收件人',
+                                                value: receiveName,
                                             },
                                             {
                                                 key: '出貨狀態',
@@ -412,7 +418,11 @@ export class ShoppingOrderManager {
                                             },
                                             {
                                                 key: '訂購人',
-                                                value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : '匿名',
+                                                value: dd.orderData.orderSource === 'POS' ? receiveName : userName,
+                                            },
+                                            {
+                                                key: '收件人',
+                                                value: receiveName,
                                             },
                                             {
                                                 key: '訂單金額',
@@ -2655,12 +2665,14 @@ export class ShoppingOrderManager {
                                     >
                                       ${[
                                                 (() => {
-                                                    var _a;
+                                                    var _a, _b, _c;
                                                     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>`;
+                                                    return html `<span style="font-weight: normal; color: #393939;"
+                                            >${((_c = (_b = orderData.orderData) === null || _b === void 0 ? void 0 : _b.customer_info) === null || _c === void 0 ? void 0 : _c.name) || '訪客'}</span
+                                          >`;
                                                 })(),
                                                 (() => {
                                                     if (userData.status === 0) {

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

@@ -440,6 +440,11 @@ export class ShoppingOrderManager {
                     const isWatchUser = watchUsers.includes(dd.orderData.email);
                     const tooltipText = isWatchUser ? '此份訂單的顧客為觀察名單' : '';
 
+                    // 顧客資料 | 訂購人資料
+                    const userName = dd.orderData.customer_info ? dd.orderData.customer_info.name || '未填寫' : '匿名';
+                    // 收件人資料
+                    const receiveName = dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : '匿名';
+
                     if (query.isShipment) {
                       return [
                         {
@@ -455,7 +460,11 @@ export class ShoppingOrderManager {
                         },
                         {
                           key: '訂購人',
-                          value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : '匿名',
+                          value: dd.orderData.orderSource === 'POS' ? receiveName : userName,
+                        },
+                        {
+                          key: '收件人',
+                          value: receiveName,
                         },
                         {
                           key: '出貨狀態',
@@ -484,7 +493,11 @@ export class ShoppingOrderManager {
                         },
                         {
                           key: '訂購人',
-                          value: dd.orderData.user_info ? dd.orderData.user_info.name || '未填寫' : '匿名',
+                          value: dd.orderData.orderSource === 'POS' ? receiveName : userName,
+                        },
+                        {
+                          key: '收件人',
+                          value: receiveName,
                         },
                         {
                           key: '訂單金額',
@@ -2930,7 +2943,9 @@ export class ShoppingOrderManager {
                                           if (name) {
                                             return html`<span style="font-weight: 500; color: #4D86DB;">${name}</span>`;
                                           }
-                                          return html`<span style="font-weight: normal; color: #393939;">訪客</span>`;
+                                          return html`<span style="font-weight: normal; color: #393939;"
+                                            >${orderData.orderData?.customer_info?.name || '訪客'}</span
+                                          >`;
                                         })(),
                                         (() => {
                                           if (userData.status === 0) {

package/lowcode/glitter-base/global/language.js

@@ -140,6 +140,7 @@ export class Language {
             { key: 'can_buy', tw: '可售數量', cn: '可售数量', en: `Available quantity` },
             { key: 'login_in_to_checkout', tw: '登入後結帳', cn: '登入后结帐', en: `Log in and checkout` },
             { key: 'birth', tw: '生日', cn: '生日', en: `Birth` },
+            { key: 'select', tw: '選取', cn: '选择', en: 'Select' },
             {
                 key: 'disable_ship',
                 tw: '無配送方式',
@@ -154,6 +155,7 @@ export class Language {
             },
             { key: 'buy_it_now', tw: '立即購買', cn: '立即购买', en: `Buy it now` },
             { key: 'cart', tw: '購物車', cn: '购物车', en: `Cart` },
+            { key: 'cart_subtotal', tw: '購物車小計', cn: '购物车小计', en: `Cart Subtotal` },
             {
                 key: 'free_shipping_achieved',
                 tw: '已達成免運費',
@@ -249,6 +251,7 @@ export class Language {
                 cn: '付款及配送方式',
                 en: 'Payment and shipping',
             },
+            { key: 'recipient_info', tw: '收件人資料', cn: '收件人资料', en: 'Recipient Information' },
             { key: 'payment_method', tw: '付款方式', cn: '付款方式', en: 'Payment method' },
             { key: 'shipping_method', tw: '配送方式', cn: '配送方式', en: 'Shipping method' },
             { key: 'shipping_address', tw: '配送地址', cn: '配送地址', en: 'Shipping address' },
@@ -256,7 +259,6 @@ export class Language {
             { key: 'name', tw: '姓名', cn: '姓名', en: 'Name' },
             { key: 'contact_number', tw: '聯絡電話', cn: '联系电话', en: 'Contact number' },
             { key: 'email', tw: '電子信箱', cn: '电子邮箱', en: 'Email' },
-            { key: 'recipient_info', tw: '收件人資料', cn: '收件人资料', en: 'Recipient information' },
             { key: 'invoice_recipient', tw: '發票開立對象', cn: '发票开立对象', en: 'Invoice recipient' },
             { key: 'invoice_method', tw: '開立方式', cn: '开立方式', en: 'Invoice method' },
             { key: 'invoice_number', tw: '發票號碼', cn: '發票號碼', en: 'Invoice number' },
@@ -273,6 +275,7 @@ export class Language {
             { key: 'send_to_user_email', tw: '傳送至用戶信箱', cn: '传送至用户邮箱', en: 'Send to user email' },
             { key: 'mobile_barcode_device', tw: '手機條碼載具', cn: '手机条码载具', en: 'Mobile barcode device' },
             { key: 'add_to_cart', tw: '加入購物車', cn: '加入购物车', en: 'Add to Cart' },
+            { key: 'sold_out', tw: '商品已售完', cn: '商品已售罄', en: 'Sold Out' },
             { key: 'preorder_item', tw: '預購商品', cn: '预购商品', en: 'Preorder Item' },
             { key: 'confirm_select', tw: '確認選擇', cn: '确认选择', en: 'Confirm selection' },
             { key: 'add_to_cart_success', tw: '加入成功', cn: '加入成功', en: 'Added successfully' },

package/lowcode/glitter-base/global/language.ts

@@ -140,7 +140,6 @@ export class Language {
       { key: 'line_pay', tw: 'Line Pay', cn: 'Line Pay', en: `Line Pay` },
       { key: 'jkopay', tw: '街口支付', cn: '街口支付', en: `JKOPAY` },
       { key: 'paynow', tw: 'PayNow 立吉富', cn: 'PayNow 立吉富', en: `PayNow` },
-
       { key: 'atm', tw: 'ATM 轉帳', cn: 'ATM 转帐', en: `ATM Transfer` },
       { key: 'line', tw: 'Line 轉帳', cn: 'Line 转帐', en: `Line Bank` },
       { key: 'cash_on_delivery', tw: '貨到付款', cn: '货到付款', en: `Cash on delivery` },
@@ -150,6 +149,7 @@ export class Language {
       { key: 'can_buy', tw: '可售數量', cn: '可售数量', en: `Available quantity` },
       { key: 'login_in_to_checkout', tw: '登入後結帳', cn: '登入后结帐', en: `Log in and checkout` },
       { key: 'birth', tw: '生日', cn: '生日', en: `Birth` },
+      { key: 'select', tw: '選取', cn: '选择', en: 'Select' },
       {
         key: 'disable_ship',
         tw: '無配送方式',
@@ -164,6 +164,7 @@ export class Language {
       },
       { key: 'buy_it_now', tw: '立即購買', cn: '立即购买', en: `Buy it now` },
       { key: 'cart', tw: '購物車', cn: '购物车', en: `Cart` },
+      { key: 'cart_subtotal', tw: '購物車小計', cn: '购物车小计', en: `Cart Subtotal` },
       {
         key: 'free_shipping_achieved',
         tw: '已達成免運費',
@@ -259,6 +260,7 @@ export class Language {
         cn: '付款及配送方式',
         en: 'Payment and shipping',
       },
+      { key: 'recipient_info', tw: '收件人資料', cn: '收件人资料', en: 'Recipient Information' },
       { key: 'payment_method', tw: '付款方式', cn: '付款方式', en: 'Payment method' },
       { key: 'shipping_method', tw: '配送方式', cn: '配送方式', en: 'Shipping method' },
       { key: 'shipping_address', tw: '配送地址', cn: '配送地址', en: 'Shipping address' },
@@ -266,7 +268,6 @@ export class Language {
       { key: 'name', tw: '姓名', cn: '姓名', en: 'Name' },
       { key: 'contact_number', tw: '聯絡電話', cn: '联系电话', en: 'Contact number' },
       { key: 'email', tw: '電子信箱', cn: '电子邮箱', en: 'Email' },
-      { key: 'recipient_info', tw: '收件人資料', cn: '收件人资料', en: 'Recipient information' },
       { key: 'invoice_recipient', tw: '發票開立對象', cn: '发票开立对象', en: 'Invoice recipient' },
       { key: 'invoice_method', tw: '開立方式', cn: '开立方式', en: 'Invoice method' },
       { key: 'invoice_number', tw: '發票號碼', cn: '發票號碼', en: 'Invoice number' },
@@ -283,6 +284,7 @@ export class Language {
       { key: 'send_to_user_email', tw: '傳送至用戶信箱', cn: '传送至用户邮箱', en: 'Send to user email' },
       { key: 'mobile_barcode_device', tw: '手機條碼載具', cn: '手机条码载具', en: 'Mobile barcode device' },
       { key: 'add_to_cart', tw: '加入購物車', cn: '加入购物车', en: 'Add to Cart' },
+      { key: 'sold_out', tw: '商品已售完', cn: '商品已售罄', en: 'Sold Out' },
       { key: 'preorder_item', tw: '預購商品', cn: '预购商品', en: 'Preorder Item' },
       { key: 'confirm_select', tw: '確認選擇', cn: '确认选择', en: 'Confirm selection' },
       { key: 'add_to_cart_success', tw: '加入成功', cn: '加入成功', en: 'Added successfully' },

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

@@ -10,11 +10,29 @@ export class ApiShopee {
                 Authorization: getConfig().config.token,
             },
             data: JSON.stringify({
-                "redirect": redirect
-            })
+                redirect: redirect,
+            }),
         }).then(r => {
-            console.log("r.response.result -- ", r.response.result);
-            localStorage.setItem("shopee", window.parent.location.href);
+            console.log('r.response.result -- ', r.response.result);
+            localStorage.setItem('shopee', window.parent.location.href);
+            window.parent.location.href = r.response.result;
+        });
+    }
+    static generateOrderAuth(redirect) {
+        BaseApi.create({
+            url: getBaseUrl() + `/api-public/v1/shopee/getOrderAuth`,
+            type: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
+            },
+            data: JSON.stringify({
+                redirect: redirect,
+            }),
+        }).then(r => {
+            console.log('r.response.result -- ', r.response.result);
+            localStorage.setItem('shopee', window.parent.location.href);
             window.parent.location.href = r.response.result;
         });
     }
@@ -28,11 +46,11 @@ export class ApiShopee {
                 Authorization: getConfig().config.token,
             },
             data: JSON.stringify({
-                "code": code,
-                "shop_id": shop_id
-            })
+                code: code,
+                shop_id: shop_id,
+            }),
         }).then(r => {
-            console.log("r -- ", r);
+            console.log('r -- ', r);
         });
     }
     static getItemList(start, end, callback) {
@@ -45,10 +63,11 @@ export class ApiShopee {
                 Authorization: getConfig().config.token,
             },
             data: JSON.stringify({
-                "start": start,
-                "end": end
-            })
+                start: start,
+                end: end,
+            }),
         }).then(r => {
+            console.log('r -- ', r);
             callback(r.response);
         });
     }
@@ -76,6 +95,24 @@ export class ApiShopee {
             },
         });
     }
+    static getOrderList(start, end, callback) {
+        BaseApi.create({
+            url: getBaseUrl() + `/api-public/v1/shopee/getOrderList`,
+            type: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'g-app': getConfig().config.appName,
+                Authorization: getConfig().config.token,
+            },
+            data: JSON.stringify({
+                start: start,
+                end: end,
+            }),
+        }).then(r => {
+            console.log('r -- ', r);
+            callback(r.response);
+        });
+    }
 }
 function getConfig() {
     const saasConfig = window.parent.saasConfig;

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

@@ -1,93 +1,132 @@
 import { BaseApi } from '../../glitterBundle/api/base.js';
 
 export class ApiShopee {
-    public static generateAuth(redirect:string){
-        BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/shopee/getAuth`,
-            type: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: getConfig().config.token,
-            },
-            data: JSON.stringify({
-                "redirect" : redirect
-            })
-        }).then(r => {
-            console.log("r.response.result -- " , r.response.result)
-            localStorage.setItem("shopee" , window.parent.location.href);
-            window.parent.location.href = r.response.result;
-        });
-    }
-    public static getToken(code:string , shop_id:number){
-        BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/shopee/getToken`,
-            type: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: getConfig().config.token,
-            },
-            data: JSON.stringify({
-                "code" : code,
-                "shop_id" : shop_id
-            })
-        }).then(r => {
-            console.log("r -- " , r);
+  public static generateAuth(redirect: string) {
+    BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/shopee/getAuth`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+      data: JSON.stringify({
+        redirect: redirect,
+      }),
+    }).then(r => {
+      console.log('r.response.result -- ', r.response.result);
+      localStorage.setItem('shopee', window.parent.location.href);
+      window.parent.location.href = r.response.result;
+    });
+  }
 
-        });
-    }
-    public static getItemList(start:number , end:number ,callback:(response:any)=>void){
+  public static generateOrderAuth(redirect: string) {
+    BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/shopee/getOrderAuth`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+      data: JSON.stringify({
+        redirect: redirect,
+      }),
+    }).then(r => {
+      console.log('r.response.result -- ', r.response.result);
+      localStorage.setItem('shopee', window.parent.location.href);
+      window.parent.location.href = r.response.result;
+    });
+  }
 
-        BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/shopee/getItemList`,
-            type: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: getConfig().config.token,
-            },
-            data: JSON.stringify({
-                "start" : start,
-                "end" : end
-            })
-        }).then(r => {
-            callback(r.response);
-        });
-    }
-    public static syncProduct(callback:(response:any)=>void){
-        BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/shopee/syncStock`,
-            type: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: getConfig().config.token,
-            },
-        }).then(r => {
-            callback(r.response);
-        });
-    }
-    public static syncStatus(){
-        return BaseApi.create({
-            url: getBaseUrl() + `/api-public/v1/shopee/sync-status`,
-            type: 'GET',
-            headers: {
-                'Content-Type': 'application/json',
-                'g-app': getConfig().config.appName,
-                Authorization: getConfig().config.token,
-            },
-        });
-    }
+  public static getToken(code: string, shop_id: number) {
+    BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/shopee/getToken`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+      data: JSON.stringify({
+        code: code,
+        shop_id: shop_id,
+      }),
+    }).then(r => {
+      console.log('r -- ', r);
+    });
+  }
 
+  public static getItemList(start: number, end: number, callback: (response: any) => void) {
+    BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/shopee/getItemList`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+      data: JSON.stringify({
+        start: start,
+        end: end,
+      }),
+    }).then(r => {
+      console.log('r -- ', r);
+      callback(r.response);
+    });
+  }
+
+  public static syncProduct(callback: (response: any) => void) {
+    BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/shopee/syncStock`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+    }).then(r => {
+      callback(r.response);
+    });
+  }
+
+  public static syncStatus() {
+    return BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/shopee/sync-status`,
+      type: 'GET',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+    });
+  }
+
+  public static getOrderList(start: number, end: number, callback: (response: any) => void) {
+    BaseApi.create({
+      url: getBaseUrl() + `/api-public/v1/shopee/getOrderList`,
+      type: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'g-app': getConfig().config.appName,
+        Authorization: getConfig().config.token,
+      },
+      data: JSON.stringify({
+        start: start,
+        end: end,
+      }),
+    }).then(r => {
+      console.log('r -- ', r);
+      callback(r.response);
+    });
+  }
 }
 
 function getConfig() {
-    const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
-    return saasConfig;
+  const saasConfig: { config: any; api: any } = (window.parent as any).saasConfig;
+  return saasConfig;
 }
 
 function getBaseUrl() {
-    return getConfig().config.url;
+  return getConfig().config.url;
 }
-