@lancom/shared 0.0.420 → 0.0.421

package/components/checkout/order/order-payment-information/order-payment-information.vue

@@ -190,6 +190,7 @@ export default {
             country: this.country?._id
           });
         } catch (e) {
+          console.log('initOrderData: ', e);
         } finally {
           this.initing = false;
         }

package/components/common/payment/payment_card/pinpayment/pinpayment.scss

@@ -10,6 +10,15 @@
       background-color: #F4F4F4;
     }
   }
+  &__error {
+    font-weight: bold;
+    font-size: 14px;
+    padding: 18px 10px;
+    text-align: center;
+    color: $white;
+    background: #EA3434;
+    margin-top: 20px;
+  }
   &__field-container {
     width: 100%;
   }
@@ -50,4 +59,4 @@
       }
     }
   }
-}
+}

package/components/common/payment/payment_card/pinpayment/pinpayment.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="Payment__wrapper">
-    <div v-if="(hasSpinner && processing) || loading">
+    <div
+      v-if="pinpaymentsError"
+      class="Payment__error">
+      {{ pinpaymentsError }}
+    </div>
+    <div v-else-if="(hasSpinner && processing) || loading">
       <spinner />
     </div>
     <div
@@ -86,7 +91,6 @@
 </template>
 
 <script>
-let timer = null;
 let pinpaymentStartLoaded = false;
 
 export default {
@@ -108,26 +112,20 @@ export default {
     return {
       processing: false,
       loading: false,
+      waitPinpaymentTimer: null,
+      pinpaymentsError: null,
       fields: null
     };
   },
   async mounted() {
     this.loading = true;
-
     await this.loadPinpayments();
-
     if (window.HostedFields) {
       await this.initHostedPayment();
-    } else {
-      window.addEventListener('load', async () => {
-        if (!this.fields) {
-          await this.initHostedPayment();
-        }
-      });
     }
   },
   destroyed() {
-    clearInterval(timer);
+    clearInterval(this.waitPinpaymentTimer);
   },
   methods: {
     initHostedPayment() {
@@ -207,30 +205,56 @@ export default {
     },
     async loadPinpayments() {
       if (process.browser) {
-        await (new Promise((resolve, reject) => {
-          if (!pinpaymentStartLoaded) {
-            pinpaymentStartLoaded = true;
-            let domElement = document.createElement('script');
-            domElement.type = "text/javascript";
-            domElement.setAttribute('src', 'https://cdn.pinpayments.com/pin.hosted_fields.v1.js');
-            domElement.onload = () => {
-              resolve();
-            };
-            domElement.onerror = () => {
-              setTimeout(() => this.loadPinpayments(), 1000);
-            };
-            document.body.appendChild(domElement);
-          } else {
-            let repeated = 0;
-            timer = setInterval(() => {
-              if (!!window.HostedFields || repeated++ > 40) {
-                clearInterval(timer);
-                resolve();
-              }
-            }, 500);
+        if (pinpaymentStartLoaded) {
+          await this.waitUntilLoadedPinpayment();
+        }
+        if (!window.HostedField) {
+          pinpaymentStartLoaded = true;
+          for (let index = 0; index < 10; index++) {
+            try {
+              await this.loadPinpaymentsJs();
+              break;
+            } catch (e) {
+              console.log('loadPinpayments:error ', e);
+              await new Promise(resolve => setTimeout(resolve, 500));
+            }
           }
-        }));
+        }
+        if (!window.HostedFields) {
+          this.pinpaymentsError = '"Credit Card" payment temporarily not available';
+        }
       }
+    },
+    waitUntilLoadedPinpayment() {
+      return new Promise((resolve, reject) => {
+        let repeated = 0;
+        this.waitPinpaymentTimer = setInterval(() => {
+          if (!!window.HostedFields || repeated++ > 10) {
+            clearInterval(this.waitPinpaymentTimer);
+            resolve();
+          }
+        }, 500);
+      });
+    },
+    loadPinpaymentsJs() {
+      return (new Promise((resolve, reject) => {
+        const domElement = document.createElement('script');
+        domElement.type = 'text/javascript';
+        domElement.setAttribute('src', 'https://cdn.pinpayments.com/pin.hosted_fields.v1.js');
+        domElement.onload = () => {
+          setTimeout(() => {
+            if (window.HostedFields) {
+              resolve();
+            } else {
+              reject(new Error('Failed to Load JS'));
+            }
+          }, 500);
+        };
+        domElement.onerror = () => {
+          reject(new Error('Failed to Load JS'));
+        };
+        document.body.appendChild(domElement);
+      }));
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.420",
+  "version": "0.0.421",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/plugins/vue-recaptcha.js

@@ -1,29 +1,57 @@
 import Vue from 'vue';
 
-let interval = null;
+let recaptchaStartLoaded = false;
 
 export default () => {
   Vue.mixin({
+    data() {
+      return {
+        waitRecaptchaTimer: null,
+        recaptchaError: null
+      };
+    },
     methods: {
       async getRecaptcha(name) {
         await this.preloadReCaptcha();
         return process.env.IS_LOCAL === 'true' || await this.$recaptcha(name);
       },
       async preloadReCaptcha() {
+        if (recaptchaStartLoaded) {
+          await this.waitUntilLoadedRecaptcha();
+        }
+
         if (!this.$recaptcha) {
-          clearInterval(interval);
-          await this.loadReCaptcha();
-          await new Promise((resolve, reject) => {
-            interval = setInterval(() => {
-              if (this.$recaptcha) {
-                clearInterval(interval);
-                resolve()
-              }
-            }, 100);
-          });
+          recaptchaStartLoaded = true;
+          for (let index = 0; index < 10; index++) {
+            try {
+              await this.loadRecaptchaJs();
+              break;
+            } catch (e) {
+              console.log('loadRecaptcha:error ', e);
+              await new Promise(resolve => setTimeout(resolve, 500));
+            }
+          }
         }
+
+        await this.$recaptchaLoaded();
+
+        if (!this.$recaptcha) {
+          this.recaptchaError = 'Recaptcha temporarily not available';
+        }
+        console.log('loadRecaptcha:result ', !!this.$recaptcha);
+      },
+      waitUntilLoadedRecaptcha() {
+        return new Promise((resolve, reject) => {
+          let repeated = 0;
+          this.waitRecaptchaTimer = setInterval(() => {
+            if (!!this.$recaptcha || repeated++ > 10) {
+              clearInterval(this.waitRecaptchaTimer);
+              resolve();
+            }
+          }, 500);
+        });
       },
-      async loadReCaptcha() {
+      async loadRecaptchaJs() {
         const { VueReCaptcha } = await import('vue-recaptcha-v3');
         Vue.use(VueReCaptcha, {
           siteKey: process.env.RECAPTCHA_KEY,