ts-glitter 22.0.0 → 22.0.2

package/src/api-public/services/shopping.ts

@@ -2991,13 +2991,11 @@ export class Shopping {
             });
           }
 
-          const emailList = new Set(
-            [origin.orderData.customer_info, origin.orderData.user_info].map(user => user?.email)
+          const hasEamil = [origin.orderData.customer_info, origin.orderData.user_info].some(user =>
+            Boolean(user?.email)
           );
-          for (const email of emailList) {
-            if (email) {
-              await this.sendNotifications(orderData, 'order-cancel-success');
-            }
+          if (hasEamil) {
+            await this.sendNotifications(orderData, 'order-cancel-success');
           }
 
           // 購物金取消訂單退回

package/src/api-public/services/strategies/ecpay-strategy.js

@@ -16,7 +16,6 @@ class EcPayStrategy {
             MERCHANT_ID: this.keys.MERCHANT_ID,
             TYPE: 'ecPay',
         };
-        console.log("ecPayConfig -- ", ecPayConfig);
         const ecpayInstance = new financial_serviceV2_js_1.EcPayV2(config.app, ecPayConfig);
         const formHtml = await ecpayInstance.executePayment(orderData);
         return { form: formHtml };

package/src/api-public/services/strategies/ecpay-strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ecpay-strategy.js","sourceRoot":"","sources":["ecpay-strategy.ts"],"names":[],"mappings":";;;AAEA,sEAA6D;AAG7D,MAAa,aAAa;IAIxB,YAAY,IAAoB;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,SAAe,EAAE,MAAqB;QAC1D,MAAM,WAAW,GAAW;YAC1B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAC1B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;YAC9B,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,kCAAkC,MAAM,CAAC,GAAG,aAAa;YACpF,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,oCAAoC,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,EAAE,EAAE;YAC/F,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,IAAI,EAAE,OAAO;SACd,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAG,WAAW,CAAC,CAAC;QAC7C,MAAM,aAAa,GAAG,IAAI,gCAAO,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAG3D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC/D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF;AAxBD,sCAwBC"}
+{"version":3,"file":"ecpay-strategy.js","sourceRoot":"","sources":["ecpay-strategy.ts"],"names":[],"mappings":";;;AAEA,sEAA6D;AAG7D,MAAa,aAAa;IAIxB,YAAY,IAAoB;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,SAAe,EAAE,MAAqB;QAC1D,MAAM,WAAW,GAAY;YAC3B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAC1B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;YAC9B,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,kCAAkC,MAAM,CAAC,GAAG,aAAa;YACpF,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,oCAAoC,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,EAAE,EAAE;YAC/F,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,IAAI,EAAE,OAAO;SACd,CAAC;QACF,MAAM,aAAa,GAAG,IAAI,gCAAO,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAG3D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC/D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF;AAvBD,sCAuBC"}

package/src/api-public/services/strategies/ecpay-strategy.ts

@@ -11,20 +11,19 @@ export class EcPayStrategy implements IPaymentStrategy {
     this.keys = keys;
   }
   async initiatePayment(orderData: Cart, config: PaymentConfig): Promise<PaymentResult> {
-    const ecPayConfig:KeyData = {
+    const ecPayConfig: KeyData = {
       HASH_IV: this.keys.HASH_IV,
       HASH_KEY: this.keys.HASH_KEY,
       ActionURL: this.keys.ActionURL,
       NotifyURL: `${config.domain}/api-public/v1/ec/notify?g-app=${config.app}&type=ecPay`,
       ReturnURL: `${config.domain}/api-public/v1/ec/redirect?g-app=${config.app}&return=${config.id}`,
       MERCHANT_ID: this.keys.MERCHANT_ID,
-      TYPE: 'ecPay' ,
+      TYPE: 'ecPay',
     };
-    console.log("ecPayConfig -- " , ecPayConfig);
     const ecpayInstance = new EcPayV2(config.app, ecPayConfig);
     // 注意：原始的 createOrderPage 可能需要更完整的 orderData，這裡直接傳入
     // 您可能需要根據 EcPay 類別的實際需要調整傳遞給 createOrderPage 的參數
     const formHtml = await ecpayInstance.executePayment(orderData);
     return { form: formHtml };
   }
-}
+}

package/src/api-public/services/strategies/ezpay-strategy.js

@@ -17,7 +17,6 @@ class EzPayStrategy {
             TYPE: 'newWebPay',
         };
         const ezpayInstance = new financial_serviceV2_js_1.EzPayV2(config.app, ezPayConfig);
-        console.log('ezPayConfig -- ', ezPayConfig);
         const formHtml = await ezpayInstance.executePayment(orderData);
         return { form: formHtml };
     }

package/src/api-public/services/strategies/ezpay-strategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"ezpay-strategy.js","sourceRoot":"","sources":["ezpay-strategy.ts"],"names":[],"mappings":";;;AAEA,sEAA8D;AAI9D,MAAa,aAAa;IAIxB,YAAY,IAAoB;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,SAAe,EAAE,MAAqB;QAC1D,MAAM,WAAW,GAAW;YAC1B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAC1B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;YAC9B,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,kCAAkC,MAAM,CAAC,GAAG,iBAAiB;YACxF,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,oCAAoC,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,EAAE,EAAE;YAC/F,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,IAAI,EAAE,WAAW;SAClB,CAAC;QACF,MAAM,aAAa,GAAG,IAAI,gCAAO,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC3D,OAAO,CAAC,GAAG,CACT,iBAAiB,EACjB,WAAW,CAAE,CAAC;QAChB,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC/D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF;AAxBD,sCAwBC"}
+{"version":3,"file":"ezpay-strategy.js","sourceRoot":"","sources":["ezpay-strategy.ts"],"names":[],"mappings":";;;AAEA,sEAA6D;AAI7D,MAAa,aAAa;IAIxB,YAAY,IAAoB;QAC9B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;IACD,KAAK,CAAC,eAAe,CAAC,SAAe,EAAE,MAAqB;QAC1D,MAAM,WAAW,GAAY;YAC3B,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO;YAC1B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAC5B,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS;YAC9B,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,kCAAkC,MAAM,CAAC,GAAG,iBAAiB;YACxF,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,oCAAoC,MAAM,CAAC,GAAG,WAAW,MAAM,CAAC,EAAE,EAAE;YAC/F,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW;YAClC,IAAI,EAAE,WAAW;SAClB,CAAC;QACF,MAAM,aAAa,GAAG,IAAI,gCAAO,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC/D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;CACF;AArBD,sCAqBC"}

package/src/api-public/services/strategies/ezpay-strategy.ts

@@ -1,6 +1,6 @@
 import { IPaymentStrategy, PaymentConfig, PaymentResult } from '../interface/payment-strategy-interface.js';
 import { Cart } from '../shopping.js';
-import {  EzPayV2, KeyData } from '../financial-serviceV2.js';
+import { EzPayV2, KeyData } from '../financial-serviceV2.js';
 import { EcEzPayKeyData } from '../interface/payment-keys-interface';
 //藍新金流
 //測試信用卡 4000 2211 1111 1111 驗證碼123
@@ -12,20 +12,17 @@ export class EzPayStrategy implements IPaymentStrategy {
     this.keys = keys;
   }
   async initiatePayment(orderData: Cart, config: PaymentConfig): Promise<PaymentResult> {
-    const ezPayConfig:KeyData = {
+    const ezPayConfig: KeyData = {
       HASH_IV: this.keys.HASH_IV,
       HASH_KEY: this.keys.HASH_KEY,
       ActionURL: this.keys.ActionURL,
       NotifyURL: `${config.domain}/api-public/v1/ec/notify?g-app=${config.app}&type=newWebPay`,
       ReturnURL: `${config.domain}/api-public/v1/ec/redirect?g-app=${config.app}&return=${config.id}`,
       MERCHANT_ID: this.keys.MERCHANT_ID,
-      TYPE: 'newWebPay' ,
+      TYPE: 'newWebPay',
     };
     const ezpayInstance = new EzPayV2(config.app, ezPayConfig);
-    console.log(
-      'ezPayConfig -- ',
-      ezPayConfig,);
     const formHtml = await ezpayInstance.executePayment(orderData);
     return { form: formHtml };
   }
-}
+}

package/src/api-public/services/user.js

@@ -15,23 +15,13 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -2260,26 +2250,6 @@ class User {
     async getConfigV2(config) {
         const app = this.app;
         try {
-            function checkConfigCache() {
-                if (!config.key.split(',').find(dd => {
-                    return !User.configData[app + dd + config.user_id];
-                })) {
-                    if (config.key.includes(',')) {
-                        return config.key.split(',').map(dd => {
-                            return {
-                                key: dd,
-                                value: User.configData[app + dd + config.user_id],
-                            };
-                        });
-                    }
-                    else {
-                        return User.configData[app + config.key + config.user_id];
-                    }
-                }
-            }
-            if (checkConfigCache()) {
-                return JSON.parse(JSON.stringify(checkConfigCache()));
-            }
             const that = this;
             const getData = await database_1.default.execute(`SELECT *
          FROM \`${this.app}\`.t_user_public_config
@@ -2336,17 +2306,14 @@ class User {
                 return await that.checkLeakData(config.key, (data && data.value) || {});
             }
             if (config.key.includes(',')) {
-                (await Promise.all(config.key.split(',').map(async (dd) => ({
+                return Promise.all(config.key.split(',').map(async (dd) => ({
                     key: dd,
                     value: await loop(getData.find((d1) => d1.key === dd)),
-                })))).map(dd => {
-                    User.configData[app + dd.key + config.user_id] = dd.value;
-                });
+                })));
             }
             else {
-                User.configData[app + config.key + config.user_id] = await loop(getData[0]);
+                return loop(getData[0]);
             }
-            return JSON.parse(JSON.stringify(checkConfigCache()));
         }
         catch (e) {
             console.error(e);