@pelcro/react-pelcro-js 3.33.1 → 3.33.2

package/dist/index.cjs.js

@@ -14100,14 +14100,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();
@@ -14118,15 +14141,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");
@@ -20083,7 +20103,7 @@ const CouponCodeField = props => {
   };
   return /*#__PURE__*/React__default['default'].createElement(Input, Object.assign({
     className: "plc-h-12",
-    wrapperClassName: "plc-mb-1",
+    wrapperClassName: "plc-mb-6",
     errorClassName: "plc-h-12 sm:plc-h-8",
     error: couponError,
     "aria-label": t("labels.code"),
@@ -30436,9 +30456,7 @@ const MembershipsItems = () => {
   };
   if (memberships.length === 0) return null;
   return memberships.sort((a, b) => a.created_at - b.created_at).map(membership => {
-    var _window$Pelcro$addres;
-    (_window$Pelcro$addres = window.Pelcro.address.list()) === null || _window$Pelcro$addres === void 0 ? void 0 : _window$Pelcro$addres.find(address => address.id === membership.address_id);
-    return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, membership.subscription.ended_at === null && /*#__PURE__*/React__default['default'].createElement("tr", {
+    return /*#__PURE__*/React__default['default'].createElement("tr", {
       key: membership.id,
       className: `plc-w-full plc-align-top pelcro-membership-row`
     }, /*#__PURE__*/React__default['default'].createElement("td", {
@@ -30454,12 +30472,13 @@ const MembershipsItems = () => {
       }),
       className: "plc-text-blue-400 focus:plc-ring-blue-500 pelcro-dashboard-membership-address-button",
       onClick: () => onChangeAddressClick(membership.id)
-    }, `${t("labels.editAddress")}`))));
+    }, `${t("labels.editAddress")}`)));
   });
 };
 function getActiveMemberships() {
   var _window$Pelcro$user$r, _window$Pelcro$user$r2;
-  return (_window$Pelcro$user$r = (_window$Pelcro$user$r2 = window.Pelcro.user.read().memberships) === null || _window$Pelcro$user$r2 === void 0 ? void 0 : _window$Pelcro$user$r2.filter(membership => membership.status === "active")) !== null && _window$Pelcro$user$r !== void 0 ? _window$Pelcro$user$r : [];
+  const subsStatuses = ["active", "extended", "trialing"];
+  return (_window$Pelcro$user$r = (_window$Pelcro$user$r2 = window.Pelcro.user.read().memberships) === null || _window$Pelcro$user$r2 === void 0 ? void 0 : _window$Pelcro$user$r2.filter(membership => membership.status === "active" && subsStatuses.includes(membership.subscription.status))) !== null && _window$Pelcro$user$r !== void 0 ? _window$Pelcro$user$r : [];
 }
 function getMemberShipStatus(status) {
   return {
@@ -31184,7 +31203,8 @@ function hasDonationSubs() {
 }
 function hasActiveMemberships() {
   var _window$Pelcro$user$r6, _window$Pelcro$user$r7;
-  return (_window$Pelcro$user$r6 = (_window$Pelcro$user$r7 = window.Pelcro.user.read().memberships) === null || _window$Pelcro$user$r7 === void 0 ? void 0 : _window$Pelcro$user$r7.some(membership => membership.status === "active" && membership.subscription.ended_at === null)) !== null && _window$Pelcro$user$r6 !== void 0 ? _window$Pelcro$user$r6 : false;
+  const subsStatuses = ["active", "extended", "trialing"];
+  return (_window$Pelcro$user$r6 = (_window$Pelcro$user$r7 = window.Pelcro.user.read().memberships) === null || _window$Pelcro$user$r7 === void 0 ? void 0 : _window$Pelcro$user$r7.some(membership => membership.status === "active" && subsStatuses.includes(membership.subscription.status))) !== null && _window$Pelcro$user$r6 !== void 0 ? _window$Pelcro$user$r6 : false;
 }
 const DashboardWithTrans = withTranslation("dashboard")(Dashboard);
 

package/dist/index.esm.js

@@ -14070,14 +14070,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();
@@ -14088,15 +14111,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");
@@ -20053,7 +20073,7 @@ const CouponCodeField = props => {
   };
   return /*#__PURE__*/React__default.createElement(Input, Object.assign({
     className: "plc-h-12",
-    wrapperClassName: "plc-mb-1",
+    wrapperClassName: "plc-mb-6",
     errorClassName: "plc-h-12 sm:plc-h-8",
     error: couponError,
     "aria-label": t("labels.code"),
@@ -30406,9 +30426,7 @@ const MembershipsItems = () => {
   };
   if (memberships.length === 0) return null;
   return memberships.sort((a, b) => a.created_at - b.created_at).map(membership => {
-    var _window$Pelcro$addres;
-    (_window$Pelcro$addres = window.Pelcro.address.list()) === null || _window$Pelcro$addres === void 0 ? void 0 : _window$Pelcro$addres.find(address => address.id === membership.address_id);
-    return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, membership.subscription.ended_at === null && /*#__PURE__*/React__default.createElement("tr", {
+    return /*#__PURE__*/React__default.createElement("tr", {
       key: membership.id,
       className: `plc-w-full plc-align-top pelcro-membership-row`
     }, /*#__PURE__*/React__default.createElement("td", {
@@ -30424,12 +30442,13 @@ const MembershipsItems = () => {
       }),
       className: "plc-text-blue-400 focus:plc-ring-blue-500 pelcro-dashboard-membership-address-button",
       onClick: () => onChangeAddressClick(membership.id)
-    }, `${t("labels.editAddress")}`))));
+    }, `${t("labels.editAddress")}`)));
   });
 };
 function getActiveMemberships() {
   var _window$Pelcro$user$r, _window$Pelcro$user$r2;
-  return (_window$Pelcro$user$r = (_window$Pelcro$user$r2 = window.Pelcro.user.read().memberships) === null || _window$Pelcro$user$r2 === void 0 ? void 0 : _window$Pelcro$user$r2.filter(membership => membership.status === "active")) !== null && _window$Pelcro$user$r !== void 0 ? _window$Pelcro$user$r : [];
+  const subsStatuses = ["active", "extended", "trialing"];
+  return (_window$Pelcro$user$r = (_window$Pelcro$user$r2 = window.Pelcro.user.read().memberships) === null || _window$Pelcro$user$r2 === void 0 ? void 0 : _window$Pelcro$user$r2.filter(membership => membership.status === "active" && subsStatuses.includes(membership.subscription.status))) !== null && _window$Pelcro$user$r !== void 0 ? _window$Pelcro$user$r : [];
 }
 function getMemberShipStatus(status) {
   return {
@@ -31154,7 +31173,8 @@ function hasDonationSubs() {
 }
 function hasActiveMemberships() {
   var _window$Pelcro$user$r6, _window$Pelcro$user$r7;
-  return (_window$Pelcro$user$r6 = (_window$Pelcro$user$r7 = window.Pelcro.user.read().memberships) === null || _window$Pelcro$user$r7 === void 0 ? void 0 : _window$Pelcro$user$r7.some(membership => membership.status === "active" && membership.subscription.ended_at === null)) !== null && _window$Pelcro$user$r6 !== void 0 ? _window$Pelcro$user$r6 : false;
+  const subsStatuses = ["active", "extended", "trialing"];
+  return (_window$Pelcro$user$r6 = (_window$Pelcro$user$r7 = window.Pelcro.user.read().memberships) === null || _window$Pelcro$user$r7 === void 0 ? void 0 : _window$Pelcro$user$r7.some(membership => membership.status === "active" && subsStatuses.includes(membership.subscription.status))) !== null && _window$Pelcro$user$r6 !== void 0 ? _window$Pelcro$user$r6 : false;
 }
 const DashboardWithTrans = withTranslation("dashboard")(Dashboard);
 

package/package.json

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