@pelcro/react-pelcro-js 3.26.0-beta.40 → 3.26.0-beta.42

package/dist/index.cjs.js

@@ -14459,14 +14459,37 @@ function LoginModal(_ref) {
     plan,
     order,
     switchToAddressView,
-    switchToPaymentView
+    switchToPaymentView,
+    giftCode,
+    isGift
   } = usePelcro();
   const onSuccess = res => {
     var _props$onSuccess;
     (_props$onSuccess = props.onSuccess) === null || _props$onSuccess === void 0 ? void 0 : _props$onSuccess.call(props, res);
+    handleAfterLoginLogic();
+  };
+  const handleAfterLoginLogic = () => {
     if (window.Pelcro.paywall.isArticleRestricted()) {
       initPaywalls();
     }
+    if (!product && !order && !giftCode) {
+      // If product and plan are not selected
+      return resetView();
+    }
+
+    // If this is a redeem gift
+    if (giftCode) {
+      return switchView("gift-redeem");
+      // return switchToAddressView();
+    }
+
+    // Check if the subscription is meant as a gift (if so, gather recipients info)
+    if (isGift) {
+      return switchView("gift-create");
+    }
+    if (order) {
+      return switchToAddressView();
+    }
     if (product && plan) {
       if (product.address_required) {
         return switchToAddressView();
@@ -14477,15 +14500,12 @@ function LoginModal(_ref) {
     if (product && !plan) {
       return switchView("plan-select");
     }
-    if (order) {
-      return switchToAddressView();
-    }
-    resetView();
     const viewFromURL = getStableViewID(window.Pelcro.helpers.getURLParameter("view"));
     const viewsURLs = ["invoice-details", "gift-redeem", "plan-select", "payment-method-update"];
     if (viewsURLs.includes(viewFromURL)) {
-      initViewFromURL();
+      return initViewFromURL();
     }
+    return resetView();
   };
   const onCreateAccountClick = () => {
     switchView("plan-select");
@@ -21499,7 +21519,7 @@ const TaxAmount = () => {
   const isTaxInclusive = (_window$Pelcro$site = window.Pelcro.site) === null || _window$Pelcro$site === void 0 ? void 0 : (_window$Pelcro$site$r = _window$Pelcro$site.read()) === null || _window$Pelcro$site$r === void 0 ? void 0 : _window$Pelcro$site$r.tax_inclusive;
   if (taxAmount) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "plc-text-center pelcro-tax-amount"
+      className: "plc-text-center pelcro-tax-amount plc-mt-10"
     }, isTaxInclusive && "(", isTaxInclusive ? `Includes ${t("labels.tax")}` : `+ ${t("labels.tax")}`, " ", /*#__PURE__*/React__default['default'].createElement("span", {
       className: "plc-font-bold"
     }, priceFormatted), isTaxInclusive && ")");

package/dist/index.esm.js

@@ -14429,14 +14429,37 @@ function LoginModal(_ref) {
     plan,
     order,
     switchToAddressView,
-    switchToPaymentView
+    switchToPaymentView,
+    giftCode,
+    isGift
   } = usePelcro();
   const onSuccess = res => {
     var _props$onSuccess;
     (_props$onSuccess = props.onSuccess) === null || _props$onSuccess === void 0 ? void 0 : _props$onSuccess.call(props, res);
+    handleAfterLoginLogic();
+  };
+  const handleAfterLoginLogic = () => {
     if (window.Pelcro.paywall.isArticleRestricted()) {
       initPaywalls();
     }
+    if (!product && !order && !giftCode) {
+      // If product and plan are not selected
+      return resetView();
+    }
+
+    // If this is a redeem gift
+    if (giftCode) {
+      return switchView("gift-redeem");
+      // return switchToAddressView();
+    }
+
+    // Check if the subscription is meant as a gift (if so, gather recipients info)
+    if (isGift) {
+      return switchView("gift-create");
+    }
+    if (order) {
+      return switchToAddressView();
+    }
     if (product && plan) {
       if (product.address_required) {
         return switchToAddressView();
@@ -14447,15 +14470,12 @@ function LoginModal(_ref) {
     if (product && !plan) {
       return switchView("plan-select");
     }
-    if (order) {
-      return switchToAddressView();
-    }
-    resetView();
     const viewFromURL = getStableViewID(window.Pelcro.helpers.getURLParameter("view"));
     const viewsURLs = ["invoice-details", "gift-redeem", "plan-select", "payment-method-update"];
     if (viewsURLs.includes(viewFromURL)) {
-      initViewFromURL();
+      return initViewFromURL();
     }
+    return resetView();
   };
   const onCreateAccountClick = () => {
     switchView("plan-select");
@@ -21469,7 +21489,7 @@ const TaxAmount = () => {
   const isTaxInclusive = (_window$Pelcro$site = window.Pelcro.site) === null || _window$Pelcro$site === void 0 ? void 0 : (_window$Pelcro$site$r = _window$Pelcro$site.read()) === null || _window$Pelcro$site$r === void 0 ? void 0 : _window$Pelcro$site$r.tax_inclusive;
   if (taxAmount) {
     return /*#__PURE__*/React__default.createElement("div", {
-      className: "plc-text-center pelcro-tax-amount"
+      className: "plc-text-center pelcro-tax-amount plc-mt-10"
     }, isTaxInclusive && "(", isTaxInclusive ? `Includes ${t("labels.tax")}` : `+ ${t("labels.tax")}`, " ", /*#__PURE__*/React__default.createElement("span", {
       className: "plc-font-bold"
     }, priceFormatted), isTaxInclusive && ")");

package/dist/pelcro.css

@@ -2384,6 +2384,10 @@ apple-pay-button {
   margin-bottom: 1.5rem;
 }
 
+.pelcro-root .plc-mt-10 {
+  margin-top: 2.5rem;
+}
+
 .pelcro-root .plc-mt-auto {
   margin-top: auto;
 }

package/package.json

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