@pelcro/react-pelcro-js 3.10.1-beta.1 → 3.10.1-beta.11

package/dist/index.cjs.js

@@ -10531,35 +10531,38 @@ const showInvoiceDetailsFromUrl = () => {
     isAuthenticated,
     setInvoice,
     whenUserReady,
+    whenSiteReady,
     switchView
   } = usePelcro.getStore();
-  whenUserReady(() => {
+  whenSiteReady(() => {
     if (!isAuthenticated()) {
       return switchView("login");
     }
 
-    const invoiceId = window.Pelcro.helpers.getURLParameter("id");
-    const wasSetSuccessfully = setInvoice(invoiceId);
+    whenUserReady(() => {
+      const invoiceId = window.Pelcro.helpers.getURLParameter("id");
+      const wasSetSuccessfully = setInvoice(invoiceId);
 
-    if (!wasSetSuccessfully) {
-      const errorMessage = i18next.t("messages:invalidInvoice", {
-        returnObjects: true
-      });
-      return notify.error(errorMessage);
-    }
+      if (!wasSetSuccessfully) {
+        const errorMessage = i18next.t("messages:invalidInvoice", {
+          returnObjects: true
+        });
+        return notify.error(errorMessage);
+      }
 
-    const {
-      invoice
-    } = usePelcro.getStore();
+      const {
+        invoice
+      } = usePelcro.getStore();
 
-    if (invoice.total === 0) {
-      const errorMessage = i18next.t("messages:zeroTotalInvoice", {
-        returnObjects: true
-      });
-      return notify.error(errorMessage);
-    }
+      if (invoice.total === 0) {
+        const errorMessage = i18next.t("messages:zeroTotalInvoice", {
+          returnObjects: true
+        });
+        return notify.error(errorMessage);
+      }
 
-    return switchView("invoice-details");
+      return switchView("invoice-details");
+    });
   });
 };
 
@@ -12232,18 +12235,25 @@ function LoginModal({
   } = useTranslation("login");
   const {
     switchView,
-    resetView
+    resetView,
+    invoice
   } = usePelcro();
 
   const onSuccess = res => {
     var _props$onSuccess;
 
     (_props$onSuccess = props.onSuccess) === null || _props$onSuccess === void 0 ? void 0 : _props$onSuccess.call(props, res);
-    resetView();
 
     if (window.Pelcro.paywall.isArticleRestricted()) {
       initPaywalls();
     }
+
+    resetView();
+    const viewFromURL = getStableViewID(window.Pelcro.helpers.getURLParameter("view"));
+
+    if (viewFromURL === "invoice-details") {
+      initViewFromURL();
+    }
   };
 
   const onCreateAccountClick = () => {
@@ -15395,6 +15405,9 @@ const PaymentMethodContainerWithoutStripe = ({
     selectedPaymentMethodId,
     couponCode
   } = usePelcro();
+  const {
+    whenUserReady
+  } = usePelcro.getStore();
   const product = (_props$product = props.product) !== null && _props$product !== void 0 ? _props$product : pelcroStore.product;
   const plan = (_props$plan = props.plan) !== null && _props$plan !== void 0 ? _props$plan : pelcroStore.plan;
   const subscriptionIdToRenew = (_props$subscriptionId = props.subscriptionIdToRenew) !== null && _props$subscriptionId !== void 0 ? _props$subscriptionId : pelcroStore.subscriptionIdToRenew;
@@ -15403,6 +15416,17 @@ const PaymentMethodContainerWithoutStripe = ({
   const isGift = (_props$isGift = props.isGift) !== null && _props$isGift !== void 0 ? _props$isGift : pelcroStore.isGift;
   const isRenewingGift = (_props$isRenewingGift = props.isRenewingGift) !== null && _props$isRenewingGift !== void 0 ? _props$isRenewingGift : pelcroStore.isRenewingGift;
   const invoice = (_props$invoice = props.invoice) !== null && _props$invoice !== void 0 ? _props$invoice : pelcroStore.invoice;
+  const cardProcessor = getSiteCardProcessor();
+  const [isTapLoaded, setIsTapLoaded] = React.useState(Boolean(window.Tapjsli));
+  React.useEffect(() => {
+    whenUserReady(() => {
+      if (cardProcessor === "tap" && !window.Tapjsli) {
+        window.Pelcro.helpers.loadSDK("https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.3.4/bluebird.min.js", "tap-bluebird");
+        window.Pelcro.helpers.loadSDK("https://secure.gosell.io/js/sdk/tap.min.js", "tap-sdk");
+        setIsTapLoaded(true);
+      }
+    });
+  }, []);
   React.useEffect(() => {
     if (window.Pelcro.coupon.getFromUrl()) {
       dispatch({
@@ -15858,8 +15882,6 @@ const PaymentMethodContainerWithoutStripe = ({
   const tapInstanceRef = React__default['default'].useRef(null);
   const tapInstanceCard = React__default['default'].useRef(null);
   React.useEffect(() => {
-    const cardProcessor = getSiteCardProcessor();
-
     if (cardProcessor === "vantiv" && !selectedPaymentMethodId) {
       var _window$Pelcro$site$r, _window$Pelcro$site$r2;
 
@@ -15886,10 +15908,12 @@ const PaymentMethodContainerWithoutStripe = ({
         }
       });
     }
-
-    if (cardProcessor === "tap" && !selectedPaymentMethodId) {
+  }, [selectedPaymentMethodId]);
+  React.useEffect(() => {
+    if (cardProcessor === "tap" && !selectedPaymentMethodId && isTapLoaded) {
       var _window$Pelcro$site$r3;
 
+      console.log("Yes Tap JSLI is enabled and activated");
       const tapKey = Tapjsli((_window$Pelcro$site$r3 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r3 === void 0 ? void 0 : _window$Pelcro$site$r3.tap_gateway_settings.publishable_key);
       let elements = tapKey.elements({});
       let style = {
@@ -15952,7 +15976,7 @@ const PaymentMethodContainerWithoutStripe = ({
       tapInstanceRef.current = tapKey;
       tapInstanceCard.current = card;
     }
-  }, [selectedPaymentMethodId]);
+  }, [selectedPaymentMethodId, isTapLoaded]);
 
   const initPaymentRequest = (state, dispatch) => {
     try {
@@ -17074,12 +17098,17 @@ const UnwrappedForm = es_12(PaymentMethodContainerWithoutStripe);
 
 const PaymentMethodContainer = props => {
   const [isStripeLoaded, setIsStripeLoaded] = React.useState(Boolean(window.Stripe));
+  const {
+    whenUserReady
+  } = usePelcro.getStore();
   React.useEffect(() => {
-    if (!window.Stripe) {
-      document.querySelector('script[src="https://js.stripe.com/v3"]').addEventListener("load", () => {
-        setIsStripeLoaded(true);
-      });
-    }
+    whenUserReady(() => {
+      if (!window.Stripe) {
+        document.querySelector('script[src="https://js.stripe.com/v3"]').addEventListener("load", () => {
+          setIsStripeLoaded(true);
+        });
+      }
+    });
   }, []);
 
   if (isStripeLoaded) {

package/dist/index.esm.js

@@ -10501,35 +10501,38 @@ const showInvoiceDetailsFromUrl = () => {
     isAuthenticated,
     setInvoice,
     whenUserReady,
+    whenSiteReady,
     switchView
   } = usePelcro.getStore();
-  whenUserReady(() => {
+  whenSiteReady(() => {
     if (!isAuthenticated()) {
       return switchView("login");
     }
 
-    const invoiceId = window.Pelcro.helpers.getURLParameter("id");
-    const wasSetSuccessfully = setInvoice(invoiceId);
+    whenUserReady(() => {
+      const invoiceId = window.Pelcro.helpers.getURLParameter("id");
+      const wasSetSuccessfully = setInvoice(invoiceId);
 
-    if (!wasSetSuccessfully) {
-      const errorMessage = i18next.t("messages:invalidInvoice", {
-        returnObjects: true
-      });
-      return notify.error(errorMessage);
-    }
+      if (!wasSetSuccessfully) {
+        const errorMessage = i18next.t("messages:invalidInvoice", {
+          returnObjects: true
+        });
+        return notify.error(errorMessage);
+      }
 
-    const {
-      invoice
-    } = usePelcro.getStore();
+      const {
+        invoice
+      } = usePelcro.getStore();
 
-    if (invoice.total === 0) {
-      const errorMessage = i18next.t("messages:zeroTotalInvoice", {
-        returnObjects: true
-      });
-      return notify.error(errorMessage);
-    }
+      if (invoice.total === 0) {
+        const errorMessage = i18next.t("messages:zeroTotalInvoice", {
+          returnObjects: true
+        });
+        return notify.error(errorMessage);
+      }
 
-    return switchView("invoice-details");
+      return switchView("invoice-details");
+    });
   });
 };
 
@@ -12202,18 +12205,25 @@ function LoginModal({
   } = useTranslation("login");
   const {
     switchView,
-    resetView
+    resetView,
+    invoice
   } = usePelcro();
 
   const onSuccess = res => {
     var _props$onSuccess;
 
     (_props$onSuccess = props.onSuccess) === null || _props$onSuccess === void 0 ? void 0 : _props$onSuccess.call(props, res);
-    resetView();
 
     if (window.Pelcro.paywall.isArticleRestricted()) {
       initPaywalls();
     }
+
+    resetView();
+    const viewFromURL = getStableViewID(window.Pelcro.helpers.getURLParameter("view"));
+
+    if (viewFromURL === "invoice-details") {
+      initViewFromURL();
+    }
   };
 
   const onCreateAccountClick = () => {
@@ -15365,6 +15375,9 @@ const PaymentMethodContainerWithoutStripe = ({
     selectedPaymentMethodId,
     couponCode
   } = usePelcro();
+  const {
+    whenUserReady
+  } = usePelcro.getStore();
   const product = (_props$product = props.product) !== null && _props$product !== void 0 ? _props$product : pelcroStore.product;
   const plan = (_props$plan = props.plan) !== null && _props$plan !== void 0 ? _props$plan : pelcroStore.plan;
   const subscriptionIdToRenew = (_props$subscriptionId = props.subscriptionIdToRenew) !== null && _props$subscriptionId !== void 0 ? _props$subscriptionId : pelcroStore.subscriptionIdToRenew;
@@ -15373,6 +15386,17 @@ const PaymentMethodContainerWithoutStripe = ({
   const isGift = (_props$isGift = props.isGift) !== null && _props$isGift !== void 0 ? _props$isGift : pelcroStore.isGift;
   const isRenewingGift = (_props$isRenewingGift = props.isRenewingGift) !== null && _props$isRenewingGift !== void 0 ? _props$isRenewingGift : pelcroStore.isRenewingGift;
   const invoice = (_props$invoice = props.invoice) !== null && _props$invoice !== void 0 ? _props$invoice : pelcroStore.invoice;
+  const cardProcessor = getSiteCardProcessor();
+  const [isTapLoaded, setIsTapLoaded] = useState(Boolean(window.Tapjsli));
+  useEffect(() => {
+    whenUserReady(() => {
+      if (cardProcessor === "tap" && !window.Tapjsli) {
+        window.Pelcro.helpers.loadSDK("https://cdnjs.cloudflare.com/ajax/libs/bluebird/3.3.4/bluebird.min.js", "tap-bluebird");
+        window.Pelcro.helpers.loadSDK("https://secure.gosell.io/js/sdk/tap.min.js", "tap-sdk");
+        setIsTapLoaded(true);
+      }
+    });
+  }, []);
   useEffect(() => {
     if (window.Pelcro.coupon.getFromUrl()) {
       dispatch({
@@ -15828,8 +15852,6 @@ const PaymentMethodContainerWithoutStripe = ({
   const tapInstanceRef = React__default.useRef(null);
   const tapInstanceCard = React__default.useRef(null);
   useEffect(() => {
-    const cardProcessor = getSiteCardProcessor();
-
     if (cardProcessor === "vantiv" && !selectedPaymentMethodId) {
       var _window$Pelcro$site$r, _window$Pelcro$site$r2;
 
@@ -15856,10 +15878,12 @@ const PaymentMethodContainerWithoutStripe = ({
         }
       });
     }
-
-    if (cardProcessor === "tap" && !selectedPaymentMethodId) {
+  }, [selectedPaymentMethodId]);
+  useEffect(() => {
+    if (cardProcessor === "tap" && !selectedPaymentMethodId && isTapLoaded) {
       var _window$Pelcro$site$r3;
 
+      console.log("Yes Tap JSLI is enabled and activated");
       const tapKey = Tapjsli((_window$Pelcro$site$r3 = window.Pelcro.site.read()) === null || _window$Pelcro$site$r3 === void 0 ? void 0 : _window$Pelcro$site$r3.tap_gateway_settings.publishable_key);
       let elements = tapKey.elements({});
       let style = {
@@ -15922,7 +15946,7 @@ const PaymentMethodContainerWithoutStripe = ({
       tapInstanceRef.current = tapKey;
       tapInstanceCard.current = card;
     }
-  }, [selectedPaymentMethodId]);
+  }, [selectedPaymentMethodId, isTapLoaded]);
 
   const initPaymentRequest = (state, dispatch) => {
     try {
@@ -17044,12 +17068,17 @@ const UnwrappedForm = es_12(PaymentMethodContainerWithoutStripe);
 
 const PaymentMethodContainer = props => {
   const [isStripeLoaded, setIsStripeLoaded] = useState(Boolean(window.Stripe));
+  const {
+    whenUserReady
+  } = usePelcro.getStore();
   useEffect(() => {
-    if (!window.Stripe) {
-      document.querySelector('script[src="https://js.stripe.com/v3"]').addEventListener("load", () => {
-        setIsStripeLoaded(true);
-      });
-    }
+    whenUserReady(() => {
+      if (!window.Stripe) {
+        document.querySelector('script[src="https://js.stripe.com/v3"]').addEventListener("load", () => {
+          setIsStripeLoaded(true);
+        });
+      }
+    });
   }, []);
 
   if (isStripeLoaded) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pelcro/react-pelcro-js",
   "description": "Pelcro's React UI Elements",
-  "version": "3.10.1-beta.1",
+  "version": "3.10.1-beta.11",
   "license": "MIT",
   "private": false,
   "main": "dist/index.cjs.js",