ts-glitter 21.0.4 → 21.0.6

package/src/api-public/services/checkout-event.ts

@@ -40,6 +40,7 @@ export type CartItem = {
   rebate: number;
   designated_logistics: {
     type: 'all' | 'designated';
+    group: string[];
     list: string[];
   };
   deduction_log?: {
@@ -338,7 +339,7 @@ export class CheckoutEvent {
       shipment_setting.custom_delivery = shipment_setting.custom_delivery
         ? await Promise.all(
             shipment_setting.custom_delivery.map(async (form: any) => {
-              const config = await new User(this.app).getConfigV2({
+              const config = await userClass.getConfigV2({
                 user_id: 'manager',
                 key: `form_delivery_${form.id}`,
               });
@@ -464,7 +465,7 @@ export class CheckoutEvent {
         }
       }
 
-      const store_info = await new User(this.app).getConfigV2({ key: 'store-information', user_id: 'manager' });
+      const store_info = await userClass.getConfigV2({ key: 'store-information', user_id: 'manager' });
 
       data.line_items = await Promise.all(
         data.line_items.map(async item => {
@@ -509,14 +510,31 @@ export class CheckoutEvent {
               }
 
               if (variant && item.count > 0) {
+                const sale_price= (()=>{
+                  //POS允許自訂價格
+                  if(checkOutType === 'POS' &&  (item as any).custom_price){
+                    return  (item as any).custom_price
+                  }else{
+                    return variant.sale_price;
+                  }
+                })()
+                const origin_price= (()=>{
+                  //POS如果有自訂價格，則比較金額改成和原售價相比
+                  if(checkOutType === 'POS' &&  (item as any).custom_price){
+                    return variant.sale_price;
+                  }else{
+                    return variant.origin_price;
+                  }
+                })()
                 Object.assign(item, {
                   specs: content.specs,
                   language_data: content.language_data,
                   product_category: content.product_category,
                   preview_image: variant.preview_image || content.preview_image[0],
                   title: content.title,
-                  sale_price: variant.sale_price,
-                  origin_price: variant.origin_price,
+                  sale_price:sale_price,
+                  variant_sale_price: variant.sale_price,
+                  origin_price: origin_price,
                   collection: content.collection,
                   sku: variant.sku,
                   stock: variant.stock,
@@ -577,7 +595,7 @@ export class CheckoutEvent {
                   if (content.productType.giveaway) {
                     variant.sale_price = 0;
                   } else {
-                    carData.total += variant.sale_price * item.count;
+                    carData.total += sale_price * item.count;
                   }
                 }
               }
@@ -942,20 +960,30 @@ export class CheckoutEvent {
 
       const excludedValuesByTotal = new Set(['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C']);
       const excludedValuesByWeight = new Set(['normal', 'black_cat']);
+      const logisticsGroupResult = await userClass.getConfig({ key: 'logistics_group', user_id: 'manager' });
+      const logisticsGroup = logisticsGroupResult[0]?.value ?? [];
 
       const isExcludedByTotal = (dd: any) => {
         return carData.total > 20000 && excludedValuesByTotal.has(dd.value);
       };
+
       const isExcludedByWeight = (dd: any) => {
         return carData.goodsWeight > 20 && excludedValuesByWeight.has(dd.value);
       };
+
       const isIncludedInDesignatedLogistics = (dd: any) => {
         return carData.lineItems.every(item => {
-          return (
-            item.designated_logistics === undefined ||
-            item.designated_logistics.type === 'all' ||
-            item.designated_logistics.list.includes(dd.value)
-          );
+          if (item.designated_logistics === undefined || item.designated_logistics.type === 'all') {
+            return true;
+          }
+
+          for (const group of logisticsGroup) {
+            if (item.designated_logistics.group.includes(group.key) && group.list.includes(dd.value)) {
+              return true;
+            }
+          }
+
+          return false;
         });
       };
 

package/src/api-public/services/factories/payment-strategy-factory.d.ts

@@ -0,0 +1,6 @@
+import { IPaymentStrategy } from '../interface/payment-strategy-interface.js';
+export declare class PaymentStrategyFactory {
+    private allKeyData;
+    constructor(loadedKeyData: Record<string, any>);
+    createStrategyRegistry(): Map<string, IPaymentStrategy>;
+}

package/src/api-public/services/factories/payment-strategy-factory.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaymentStrategyFactory = void 0;
+const ecpay_strategy_js_1 = require("../strategies/ecpay-strategy.js");
+const ezpay_strategy_js_1 = require("../strategies/ezpay-strategy.js");
+const paypal_strategy_js_1 = require("../strategies/paypal-strategy.js");
+const linepay_strategy_js_1 = require("../strategies/linepay-strategy.js");
+const jkopay_strategy_1 = require("../strategies/jkopay-strategy");
+const paynow_strategy_1 = require("../strategies/paynow-strategy");
+const paymentStrategyConfigurations = [
+    { key: 'ecPay', strategyClass: ecpay_strategy_js_1.EcPayStrategy },
+    { key: 'newWebPay', strategyClass: ezpay_strategy_js_1.EzPayStrategy },
+    { key: 'paypal', strategyClass: paypal_strategy_js_1.PayPalStrategy },
+    { key: 'line_pay', strategyClass: linepay_strategy_js_1.LinePayStrategy },
+    { key: 'jkopay', strategyClass: jkopay_strategy_1.JkoPayStrategy },
+    { key: 'paynow', strategyClass: paynow_strategy_1.PayNowStrategy },
+];
+class PaymentStrategyFactory {
+    constructor(loadedKeyData) {
+        if (!loadedKeyData) {
+            throw new Error("KeyData must be provided to PaymentStrategyFactory");
+        }
+        this.allKeyData = loadedKeyData;
+    }
+    createStrategyRegistry() {
+        const strategies = new Map();
+        paymentStrategyConfigurations.forEach(config => {
+            const specificKeyData = this.allKeyData[config.key];
+            if (specificKeyData) {
+                try {
+                    const strategyInstance = new config.strategyClass(specificKeyData);
+                    strategies.set(config.key, strategyInstance);
+                    console.log(`Strategy registered for key: ${config.key}`);
+                }
+                catch (error) {
+                    console.error(`Error instantiating strategy for key '${config.key}':`, error);
+                    console.warn(`Strategy for '${config.key}' will not be available.`);
+                }
+            }
+            else {
+                console.warn(`Key data for '${config.key}' not found in provided configuration. Strategy not available.`);
+            }
+        });
+        console.log(`PaymentStrategyFactory: Registry created with ${strategies.size} strategies.`);
+        return strategies;
+    }
+}
+exports.PaymentStrategyFactory = PaymentStrategyFactory;
+//# sourceMappingURL=payment-strategy-factory.js.map

package/src/api-public/services/factories/payment-strategy-factory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"payment-strategy-factory.js","sourceRoot":"","sources":["payment-strategy-factory.ts"],"names":[],"mappings":";;;AACA,uEAAgE;AAChE,uEAAgE;AAChE,yEAAkE;AAClE,2EAAoE;AACpE,mEAA+D;AAE/D,mEAA+D;AAO/D,MAAM,6BAA6B,GAA0B;IAC3D,EAAE,GAAG,EAAE,OAAO,EAAK,aAAa,EAAE,iCAAa,EAAE;IACjD,EAAE,GAAG,EAAE,WAAW,EAAE,aAAa,EAAE,iCAAa,EAAE;IAClD,EAAE,GAAG,EAAE,QAAQ,EAAI,aAAa,EAAE,mCAAc,EAAE;IAClD,EAAE,GAAG,EAAE,UAAU,EAAI,aAAa,EAAE,qCAAe,EAAE;IACrD,EAAE,GAAG,EAAE,QAAQ,EAAI,aAAa,EAAE,gCAAc,EAAE;IAClD,EAAE,GAAG,EAAE,QAAQ,EAAI,aAAa,EAAE,gCAAc,EAAE;CACnD,CAAC;AAGF,MAAa,sBAAsB;IAGjC,YAAY,aAAkC;QAC5C,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,aAAa,CAAC;IAClC,CAAC;IAEM,sBAAsB;QAC3B,MAAM,UAAU,GAAG,IAAI,GAAG,EAA4B,CAAC;QAGvD,6BAA6B,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAE7C,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAEpD,IAAI,eAAe,EAAE,CAAC;gBACpB,IAAI,CAAC;oBACH,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;oBACnE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;oBAC7C,OAAO,CAAC,GAAG,CAAC,gCAAgC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC5D,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAEf,OAAO,CAAC,KAAK,CAAC,yCAAyC,MAAM,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC;oBAC9E,OAAO,CAAC,IAAI,CAAC,iBAAiB,MAAM,CAAC,GAAG,0BAA0B,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;iBAAM,CAAC;gBAEN,OAAO,CAAC,IAAI,CAAC,iBAAiB,MAAM,CAAC,GAAG,gEAAgE,CAAC,CAAC;YAC5G,CAAC;QACH,CAAC,CAAC,CAAC;QASH,OAAO,CAAC,GAAG,CAAC,iDAAiD,UAAU,CAAC,IAAI,cAAc,CAAC,CAAC;QAC5F,OAAO,UAAU,CAAC;IACpB,CAAC;CAGF;AA9CD,wDA8CC"}

package/src/api-public/services/factories/payment-strategy-factory.ts

@@ -0,0 +1,71 @@
+import { IPaymentStrategy } from '../interface/payment-strategy-interface.js';
+import { EcPayStrategy } from '../strategies/ecpay-strategy.js';
+import { EzPayStrategy } from '../strategies/ezpay-strategy.js';
+import { PayPalStrategy } from '../strategies/paypal-strategy.js';
+import { LinePayStrategy } from '../strategies/linepay-strategy.js';
+import { JkoPayStrategy } from '../strategies/jkopay-strategy';
+import { EcEzPayKeyData } from '../interface/payment-keys-interface';
+import { PayNowStrategy } from '../strategies/paynow-strategy';
+// 定義每個策略設定項目的型別
+interface StrategyConfigEntry {
+  key: string;
+  strategyClass: new (keys: any) => IPaymentStrategy;
+}
+
+const paymentStrategyConfigurations: StrategyConfigEntry[] = [
+  { key: 'ecPay',    strategyClass: EcPayStrategy },
+  { key: 'newWebPay', strategyClass: EzPayStrategy },
+  { key: 'paypal',   strategyClass: PayPalStrategy },
+  { key: 'line_pay',   strategyClass: LinePayStrategy },
+  { key: 'jkopay',   strategyClass: JkoPayStrategy },
+  { key: 'paynow',   strategyClass: PayNowStrategy },
+];
+
+
+export class PaymentStrategyFactory {
+  // 如果策略的創建需要依賴，可以注入到工廠的建構子
+  private allKeyData: Record<string, any>;
+  constructor(loadedKeyData: Record<string, any>) {
+    if (!loadedKeyData) {
+      throw new Error("KeyData must be provided to PaymentStrategyFactory");
+    }
+    this.allKeyData = loadedKeyData;
+  }
+
+  public createStrategyRegistry(): Map<string, IPaymentStrategy> {
+    const strategies = new Map<string, IPaymentStrategy>();
+
+// **** 使用迴圈處理 strategyConfigs ****
+    paymentStrategyConfigurations.forEach(config => {
+      // 從 allKeyData 中獲取該策略所需的特定金鑰物件
+      const specificKeyData = this.allKeyData[config.key];
+
+      if (specificKeyData) {
+        try {
+          const strategyInstance = new config.strategyClass(specificKeyData);
+          strategies.set(config.key, strategyInstance);
+          console.log(`Strategy registered for key: ${config.key}`);
+        } catch (error) {
+          // 捕捉並記錄實例化過程中可能發生的錯誤
+          console.error(`Error instantiating strategy for key '${config.key}':`, error);
+          console.warn(`Strategy for '${config.key}' will not be available.`);
+        }
+      } else {
+        // 如果在 allKeyData 中找不到對應的金鑰資料，則發出警告
+        console.warn(`Key data for '${config.key}' not found in provided configuration. Strategy not available.`);
+      }
+    });
+    //
+    // strategies.set('newWebPay', new EzPayStrategy());
+    // strategies.set('paypal', new PayPalStrategy());
+    // strategies.set('line_pay', new LinePayStrategy());
+    // strategies.set('jkopay', new JkoPayStrategy());
+    // strategies.set('paynow', new PayNowStrategy(/* ... */));
+    // strategies.set('off_line', new OfflineStrategy(/* ... */)); // 線下也視為一種策略
+
+    console.log(`PaymentStrategyFactory: Registry created with ${strategies.size} strategies.`);
+    return strategies;
+  }
+
+
+}

package/src/api-public/services/fb-service.js

@@ -3,10 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FacebookService = void 0;
-exports.getFacebookPages = getFacebookPages;
-exports.getFacebookPagePicture = getFacebookPagePicture;
-exports.getFacebookPageLiveVideo = getFacebookPageLiveVideo;
+exports.getFacebookPageLiveVideo = exports.getFacebookPagePicture = exports.getFacebookPages = exports.FacebookService = void 0;
 const database_js_1 = __importDefault(require("../../modules/database.js"));
 const process_1 = __importDefault(require("process"));
 const private_config_js_1 = require("../../services/private_config.js");
@@ -151,6 +148,7 @@ async function getFacebookPages(accessToken) {
         throw error;
     }
 }
+exports.getFacebookPages = getFacebookPages;
 async function getFacebookPagePicture(id) {
     const url = `https://graph.facebook.com/v22.0/${id}/picture`;
     try {
@@ -165,6 +163,7 @@ async function getFacebookPagePicture(id) {
         throw error;
     }
 }
+exports.getFacebookPagePicture = getFacebookPagePicture;
 async function getFacebookPageLiveVideo(id, accessToken) {
     const url = `https://graph.facebook.com/v22.0/${id}/live_videos?fields=id,status,broadcast_start_time,title&access_token=${accessToken}&broadcast_status=["LIVE"]`;
     try {
@@ -180,4 +179,5 @@ async function getFacebookPageLiveVideo(id, accessToken) {
         throw error;
     }
 }
+exports.getFacebookPageLiveVideo = getFacebookPageLiveVideo;
 //# sourceMappingURL=fb-service.js.map

package/src/api-public/services/fb-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"fb-service.js","sourceRoot":"","sources":["fb-service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fb-service.js","sourceRoot":"","sources":["fb-service.ts"],"names":[],"mappings":"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"}

package/src/api-public/services/financial-service.d.ts

@@ -208,8 +208,8 @@ export declare class PayNow {
     constructor(appName: string, keyData: any);
     executePaymentIntent(transactionId: string, secret: string, paymentNo: string): Promise<any>;
     bindKey(): Promise<{
-        public_key: string;
         private_key: string;
+        public_key: string;
     }>;
     confirmAndCaptureOrder(transactionId?: string): Promise<any>;
     createOrder(orderData: {
@@ -228,6 +228,7 @@ export declare class PayNow {
         user_email: string;
         method: string;
     }): Promise<{
+        returnUrl: string | undefined;
         data: any;
         publicKey: string;
         BETA: string;

package/src/api-public/services/financial-service.js

@@ -12,6 +12,7 @@ const redis_1 = __importDefault(require("../../modules/redis"));
 const process_1 = __importDefault(require("process"));
 const order_event_js_1 = require("./order-event.js");
 const private_config_js_1 = require("../../services/private_config.js");
+const node_console_1 = __importDefault(require("node:console"));
 const html = String.raw;
 class FinancialService {
     constructor(appName, keyData) {
@@ -76,6 +77,11 @@ class EzPay {
         return EzPay.aesDecrypt(data, this.keyData.HASH_KEY, this.keyData.HASH_IV);
     }
     async createOrderPage(orderData) {
+        await order_event_js_1.OrderEvent.insertOrder({
+            cartData: orderData,
+            status: 0,
+            app: this.appName,
+        });
         const params = {
             MerchantID: this.keyData.MERCHANT_ID,
             RespondType: 'JSON',
@@ -124,11 +130,6 @@ class EzPay {
                 }
             });
         }
-        await order_event_js_1.OrderEvent.insertOrder({
-            cartData: orderData,
-            status: 0,
-            app: this.appName,
-        });
         const qs = FinancialService.JsonToQueryString(params);
         const tradeInfo = FinancialService.aesEncrypt(qs, this.keyData.HASH_KEY, this.keyData.HASH_IV);
         const tradeSha = crypto_1.default
@@ -200,7 +201,7 @@ EzPay.aesDecrypt = (data, key, iv, input = 'hex', output = 'utf-8', method = 'ae
         decrypted += decipher.final(output);
     }
     catch (e) {
-        e instanceof Error && console.error(e.message);
+        e instanceof Error && node_console_1.default.error(e.message);
     }
     return decrypted;
 };
@@ -241,6 +242,11 @@ class EcPay {
         return sha256Hash.toUpperCase();
     }
     async createOrderPage(orderData) {
+        await order_event_js_1.OrderEvent.insertOrder({
+            cartData: orderData,
+            status: 0,
+            app: this.appName,
+        });
         const params = {
             MerchantTradeNo: orderData.orderID,
             MerchantTradeDate: (0, moment_timezone_1.default)().tz('Asia/Taipei').format('YYYY/MM/DD HH:mm:ss'),
@@ -298,12 +304,7 @@ class EcPay {
         };
         const chkSum = EcPay.generateCheckMacValue(params, this.keyData.HASH_KEY, this.keyData.HASH_IV);
         orderData.CheckMacValue = chkSum;
-        await order_event_js_1.OrderEvent.insertOrder({
-            cartData: orderData,
-            status: 0,
-            app: this.appName,
-        });
-        console.log(`params-is=>`, params);
+        node_console_1.default.log(`params-is=>`, params);
         return html `
       <form id="_form_aiochk" action="${this.keyData.ActionURL}" method="post">
         <input type="hidden" name="MerchantTradeNo" id="MerchantTradeNo" value="${params.MerchantTradeNo}" />
@@ -352,7 +353,7 @@ class EcPay {
                 resolve(response.data.RtnValue);
             })
                 .catch((error) => {
-                console.log(error);
+                node_console_1.default.log(error);
                 resolve({});
             });
         });
@@ -394,7 +395,7 @@ class EcPay {
                 resolve(paramsObject);
             })
                 .catch((error) => {
-                console.log(error);
+                node_console_1.default.log(error);
                 resolve({
                     TradeStatus: '10200095',
                 });
@@ -432,7 +433,7 @@ class EcPay {
                 resolve(paramsObject);
             })
                 .catch((error) => {
-                console.log(error);
+                node_console_1.default.log(error);
                 resolve({
                     RtnCode: `-1`,
                 });
@@ -525,8 +526,8 @@ class PayPal {
     constructor(appName, keyData) {
         this.keyData = keyData;
         this.appName = appName;
-        this.PAYPAL_CLIENT_ID = keyData.PAYPAL_CLIENT_ID;
-        this.PAYPAL_SECRET = keyData.PAYPAL_SECRET;
+        this.PAYPAL_CLIENT_ID = keyData.BETA == 'true' ? "ATz7uJryxmGA2SmR5PxQ_IFXFYKeWd_R1SIzsr_bDrJQMYgRR5z_TXEnjcBh2P4DQDDYnLdHu0aNfugX" : keyData.PAYPAL_CLIENT_ID;
+        this.PAYPAL_SECRET = keyData.BETA == 'true' ? "ENb25ujfYB0GBzv6GvzDW2a7gx-KgsVZwxOBqF0WSH3Zr7SU1BBdI8KQ_XRpcgcjj8VWTOWwo83NxK5d" : keyData.PAYPAL_SECRET;
         this.PAYPAL_BASE_URL = keyData.BETA == 'true' ? 'https://api-m.sandbox.paypal.com' : 'https://api-m.paypal.com';
     }
     async getAccessToken() {
@@ -547,11 +548,13 @@ class PayPal {
                     grant_type: 'client_credentials',
                 }).toString(),
             };
+            node_console_1.default.log("this.PAYPAL_CLIENT_ID -- ", this.PAYPAL_CLIENT_ID);
+            node_console_1.default.log("this.PAYPAL_SECRET -- ", this.PAYPAL_SECRET);
             const response = await axios_1.default.request(config);
             return response.data.access_token;
         }
         catch (error) {
-            console.error('Error fetching access token:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
+            node_console_1.default.error('Error fetching access token:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
             throw new Error('Failed to retrieve PayPal access token.');
         }
     }
@@ -627,7 +630,7 @@ class PayPal {
             return response.data;
         }
         catch (error) {
-            console.error('Error creating order:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
+            node_console_1.default.error('Error creating order:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
             throw new Error('Failed to create PayPal order.');
         }
     }
@@ -658,7 +661,7 @@ class PayPal {
             }
         }
         catch (error) {
-            console.error('Error fetching order details:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
+            node_console_1.default.error('Error fetching order details:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
             throw error;
         }
     }
@@ -683,7 +686,7 @@ class PayPal {
             return response.data;
         }
         catch (error) {
-            console.error('Error capturing payment:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
+            node_console_1.default.error('Error capturing payment:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
             throw error;
         }
     }
@@ -692,11 +695,11 @@ class PayPal {
             const accessToken = await this.getAccessToken();
             const order = await this.getOrderDetails(orderId, accessToken);
             const captureResult = await this.capturePayment(order.id, accessToken);
-            console.log('Payment process completed successfully.');
+            node_console_1.default.log('Payment process completed successfully.');
             return captureResult;
         }
         catch (error) {
-            console.error('Error during order confirmation or payment capture:', error.message);
+            node_console_1.default.error('Error during order confirmation or payment capture:', error.message);
             throw error;
         }
     }
@@ -732,17 +735,11 @@ class LinePay {
             },
             data: body,
         };
-        console.log(`line-conform->
-        URL:${url}
-        X-LINE-ChannelId:${this.LinePay_CLIENT_ID}
-        LinePay_SECRET:${this.LinePay_SECRET}
-        `);
         try {
-            const response = await axios_1.default.request(config);
-            return response;
+            return await axios_1.default.request(config);
         }
         catch (error) {
-            console.error('Error linePay:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data.data) || error.message);
+            node_console_1.default.error('Error linePay:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data.data) || error.message);
             throw error;
         }
     }
@@ -826,18 +823,18 @@ class LinePay {
                 status: 0,
                 app: this.appName,
             });
-            console.log(`response.data===>`, response.data);
+            node_console_1.default.log(`response.data===>`, response.data);
             await redis_1.default.setValue('linepay' + orderData.orderID, response.data.info.transactionId);
             if (response.data.returnCode === '0000') {
                 return response.data;
             }
             else {
-                console.log(' Line Pay Error: ', response.data.returnCode, response.data.returnMessage);
+                node_console_1.default.log(' Line Pay Error: ', response.data.returnCode, response.data.returnMessage);
                 return response.data;
             }
         }
         catch (error) {
-            console.error('Error linePay:', ((_b = error.response) === null || _b === void 0 ? void 0 : _b.data) || error.message);
+            node_console_1.default.error('Error linePay:', ((_b = error.response) === null || _b === void 0 ? void 0 : _b.data) || error.message);
             throw error;
         }
     }
@@ -887,12 +884,15 @@ class PayNow {
             return response.data;
         }
         catch (error) {
-            console.error('Error paynow:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data.data) || error.message);
+            node_console_1.default.error('Error paynow:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data.data) || error.message);
             throw error;
         }
     }
     async bindKey() {
         var _a;
+        if (this.keyData.BETA == 'true') {
+            return { private_key: 'bES1o13CUQJhZzcOkkq2BRoSa8a4f0Kv', public_key: 'sm22610RIIwOTz4STCFf0dF22G067lnd' };
+        }
         const keyData = (await private_config_js_1.Private_config.getConfig({
             appName: this.appName,
             key: 'glitter_finance',
@@ -951,7 +951,7 @@ class PayNow {
             return response.data;
         }
         catch (error) {
-            console.error('Error paynow:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data.data) || error.message);
+            node_console_1.default.error('Error paynow:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data.data) || error.message);
             throw error;
         }
     }
@@ -966,15 +966,9 @@ class PayNow {
             allowedPaymentMethods: ['CreditCard'],
             expireDays: 3,
         });
-        console.log(`webhook=>`, this.keyData.NotifyURL + `&orderID=${orderData.orderID}`);
+        node_console_1.default.log(`webhook=>`, this.keyData.NotifyURL + `&orderID=${orderData.orderID}`);
         const url = `${this.BASE_URL}/api/v1/payment-intents`;
-        const key_ = `${this.keyData.BETA}` === 'true'
-            ? {
-                private_key: 'bES1o13CUQJhZzcOkkq2BRoSa8a4f0Kv',
-                public_key: 'sm22610RIIwOTz4STCFf0dF22G067lnd',
-            }
-            : await this.bindKey();
-        console.log(`key_===>`, key_);
+        const key_ = await this.bindKey();
         const config = {
             method: 'post',
             maxBodyLength: Infinity,
@@ -995,13 +989,14 @@ class PayNow {
             });
             await redis_1.default.setValue('paynow' + orderData.orderID, response.data.result.id);
             return {
+                returnUrl: this.keyData.ReturnURL,
                 data: response.data,
                 publicKey: key_.public_key,
                 BETA: this.keyData.BETA,
             };
         }
         catch (error) {
-            console.error('Error payNow:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
+            node_console_1.default.error('Error payNow:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
             throw error;
         }
     }
@@ -1032,7 +1027,7 @@ class JKO {
             return response.data.result_object;
         }
         catch (error) {
-            console.error('Error paynow:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data.data) || error.message);
+            node_console_1.default.error('Error paynow:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data.data) || error.message);
             throw error;
         }
     }
@@ -1073,7 +1068,7 @@ class JKO {
             return response.data;
         }
         catch (error) {
-            console.error('Error jkoPay:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
+            node_console_1.default.error('Error jkoPay:', ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) || error.message);
             throw error;
         }
     }
@@ -1084,20 +1079,20 @@ class JKO {
         });
         const apiKey = '689c57cd9d5b5ec80f5d5451d18fe24cfe855d21b25c7ff30bcd07829a902f7a';
         const secretKey = '8ec78345a13e3d376452d9c89c66b543ef1516c0ef1a05f0adf654c37ac8edac';
-        console.log('payload -- ', payload);
+        node_console_1.default.log('payload -- ', payload);
         const digest = crypto_1.default.createHmac('sha256', secretKey).update(payload, 'utf8').digest('hex');
         const headers = {
             'api-key': apiKey,
             digest: digest,
             'Content-Type': 'application/json',
         };
-        console.log('API Key:', apiKey);
-        console.log('Digest:', digest);
-        console.log('Headers:', headers);
+        node_console_1.default.log('API Key:', apiKey);
+        node_console_1.default.log('Digest:', digest);
+        node_console_1.default.log('Headers:', headers);
     }
     generateDigest(data, apiSecret) {
-        console.log('data --', data);
-        console.log('apiSecret -- ', apiSecret);
+        node_console_1.default.log('data --', data);
+        node_console_1.default.log('apiSecret -- ', apiSecret);
         const hmac = crypto_1.default.createHmac('sha256', apiSecret);
         hmac.update(data);
         return hmac.digest('hex');