@pelcro/react-pelcro-js 3.13.0-beta.13 → 3.13.0-beta.15

package/dist/index.cjs.js

@@ -8313,7 +8313,7 @@ class PelcroActions {
         return console.error("invalid subscription id");
       }
 
-      if ((subscriptionToManageMembers === null || subscriptionToManageMembers === void 0 ? void 0 : (_subscriptionToManage = subscriptionToManageMembers.plan) === null || _subscriptionToManage === void 0 ? void 0 : _subscriptionToManage.type) !== 'membership') {
+      if ((subscriptionToManageMembers === null || subscriptionToManageMembers === void 0 ? void 0 : (_subscriptionToManage = subscriptionToManageMembers.plan) === null || _subscriptionToManage === void 0 ? void 0 : _subscriptionToManage.type) !== "membership") {
         return console.error("subscription is not from type membership");
       }
 
@@ -13482,7 +13482,7 @@ function LoginModal({
     resetView();
     const viewFromURL = getStableViewID(window.Pelcro.helpers.getURLParameter("view"));
 
-    if (viewFromURL === "invoice-details") {
+    if (viewFromURL === "invoice-details" || viewFromURL === "gift-redeem") {
       initViewFromURL();
     }
   };
@@ -14066,7 +14066,7 @@ function RegisterModal(props) {
 
 
     if (giftCode) {
-      return switchToAddressView();
+      return switchView("gift-redeem"); // return switchToAddressView();
     } // Check if the subscription is meant as a gift (if so, gather recipients info)
 
 
@@ -21060,8 +21060,8 @@ function SubscriptionManageMembersList(props) {
       return {
         title: sub.status,
         content: sub.status,
-        textColor: "plc-text-red-500",
-        bgColor: "plc-bg-red-100",
+        textColor: "plc-text-yellow-500",
+        bgColor: "plc-bg-yellow-100",
         icon: /*#__PURE__*/React__default['default'].createElement(SvgExclamation, null)
       };
     }
@@ -21117,7 +21117,8 @@ function SubscriptionManageMembersList(props) {
     key: member.id,
     className: `plc-w-full plc-align-middle plc-cursor-pointer accordion-header hover:plc-bg-gray-50 plc-text-center`
   }, /*#__PURE__*/React__default['default'].createElement("td", {
-    className: "plc-truncate"
+    className: "plc-truncate plc-text-left",
+    title: member === null || member === void 0 ? void 0 : member.invitation_email
   }, /*#__PURE__*/React__default['default'].createElement("span", {
     className: "plc-font-semibold plc-text-gray-500"
   }, member === null || member === void 0 ? void 0 : member.invitation_email)), /*#__PURE__*/React__default['default'].createElement("td", {
@@ -21171,8 +21172,10 @@ function SubscriptionManageMembersView(props) {
     className: "plc-flex-shrink-0 plc-p-2 plc-text-xs plc-text-gray-400 plc-uppercase"
   }, t("labels.listOfMembers")), /*#__PURE__*/React__default['default'].createElement("hr", {
     className: "plc-w-full plc-border-gray-300"
-  })), /*#__PURE__*/React__default['default'].createElement("table", {
-    className: "plc-w-full plc-table-fixed plc-text-center"
+  })), /*#__PURE__*/React__default['default'].createElement("div", {
+    className: "plc-max-h-48 plc-overflow-x-hidden plc-overflow-y-auto"
+  }, /*#__PURE__*/React__default['default'].createElement("table", {
+    className: "plc-w-full plc-table-fixed plc-text-center plc-p-2 plc-m-1"
   }, /*#__PURE__*/React__default['default'].createElement("thead", {
     className: "plc-text-xs plc-font-semibold plc-tracking-wider plc-text-gray-400 plc-uppercase "
   }, /*#__PURE__*/React__default['default'].createElement("tr", null, /*#__PURE__*/React__default['default'].createElement("th", {
@@ -21181,7 +21184,7 @@ function SubscriptionManageMembersView(props) {
     className: "plc-w-3/12 "
   }, t("labels.status")), /*#__PURE__*/React__default['default'].createElement("th", {
     className: "plc-w-3/12 "
-  }, t("labels.actions")))), /*#__PURE__*/React__default['default'].createElement("tbody", null, /*#__PURE__*/React__default['default'].createElement(SubscriptionManageMembersList, null)))))));
+  }, t("labels.actions")))), /*#__PURE__*/React__default['default'].createElement("tbody", null, /*#__PURE__*/React__default['default'].createElement(SubscriptionManageMembersList, null))))))));
 }
 
 /**
@@ -25272,6 +25275,7 @@ const GiftCreateModal = ({
 GiftCreateModal.viewId = "gift-create";
 
 const initialState$6 = {
+  isSubmitting: false,
   giftCode: "",
   buttonDisabled: true,
   alert: {
@@ -25290,14 +25294,24 @@ const GiftRedeemContainer = ({
   onSuccess = () => {},
   onFailure = () => {},
   onDisplay = () => {},
-  children
+  children,
+  ...props
 }) => {
+  var _ref, _props$subscriptionId;
+
   const {
     t
   } = useTranslation("register");
   const {
     set
   } = usePelcro();
+  const {
+    switchView,
+    switchToAddressView,
+    isAuthenticated,
+    subscriptionIdToRenew: subscriptionIdToRenewFromStore
+  } = usePelcro();
+  const subscriptionIdToRenew = (_ref = (_props$subscriptionId = props.subscriptionIdToRenew) !== null && _props$subscriptionId !== void 0 ? _props$subscriptionId : subscriptionIdToRenewFromStore) !== null && _ref !== void 0 ? _ref : undefined;
   React.useEffect(() => {
     onDisplay();
   }, []);
@@ -25318,7 +25332,41 @@ const GiftRedeemContainer = ({
       set({
         giftCode
       });
-      onSuccess(giftCode);
+
+      if (!isAuthenticated()) {
+        switchView("register");
+      } else {
+        console.log("Shaker");
+        window.Pelcro.subscription.redeemGift({
+          auth_token: window.Pelcro.user.read().auth_token,
+          gift_code: giftCode,
+          // redeem gift as a future phase of an existing subscription
+          subscription_id: subscriptionIdToRenew
+        }, (err, res) => {
+          dispatch({
+            type: LOADING,
+            payload: false
+          });
+
+          if (err) {
+            dispatch({
+              type: SHOW_ALERT,
+              payload: {
+                type: "error",
+                content: getErrorMessages(err)
+              }
+            });
+
+            if (getErrorMessages(err) === "Address ID is required") {
+              switchToAddressView();
+            } else {
+              return onFailure(err);
+            }
+          } else {
+            return onSuccess(giftCode);
+          }
+        });
+      }
     }
   };
 
@@ -25339,8 +25387,14 @@ const GiftRedeemContainer = ({
           buttonDisabled: action.payload
         });
 
+      case LOADING:
+        return lib_7({ ...state,
+          isSubmitting: action.payload
+        });
+
       case HANDLE_SUBMIT:
         return lib_5({ ...state,
+          isSubmitting: true,
           buttonDisabled: true
         }, (state, dispatch) => handleRedeem(state, dispatch));
 
@@ -25409,7 +25463,8 @@ const GiftRedeemSubmitButton = ({
   const {
     dispatch,
     state: {
-      disableSubmit
+      disableSubmit,
+      isSubmitting
     }
   } = React.useContext(store$6);
   const {
@@ -25422,7 +25477,8 @@ const GiftRedeemSubmitButton = ({
       });
       onClick === null || onClick === void 0 ? void 0 : onClick();
     },
-    disabled: disableSubmit
+    disabled: disableSubmit,
+    isLoading: isSubmitting
   }, otherProps), name !== null && name !== void 0 ? name : t("redeem.buttons.redeem"));
 };
 
@@ -25473,12 +25529,7 @@ const GiftRedeemModal = ({
     var _otherProps$onSuccess;
 
     (_otherProps$onSuccess = otherProps.onSuccess) === null || _otherProps$onSuccess === void 0 ? void 0 : _otherProps$onSuccess.call(otherProps, giftCode);
-
-    if (isAuthenticated()) {
-      switchToAddressView();
-    } else {
-      switchView("register");
-    }
+    switchView("subscription-success");
   };
 
   return /*#__PURE__*/React__default['default'].createElement(Modal, {

package/dist/index.esm.js

@@ -8283,7 +8283,7 @@ class PelcroActions {
         return console.error("invalid subscription id");
       }
 
-      if ((subscriptionToManageMembers === null || subscriptionToManageMembers === void 0 ? void 0 : (_subscriptionToManage = subscriptionToManageMembers.plan) === null || _subscriptionToManage === void 0 ? void 0 : _subscriptionToManage.type) !== 'membership') {
+      if ((subscriptionToManageMembers === null || subscriptionToManageMembers === void 0 ? void 0 : (_subscriptionToManage = subscriptionToManageMembers.plan) === null || _subscriptionToManage === void 0 ? void 0 : _subscriptionToManage.type) !== "membership") {
         return console.error("subscription is not from type membership");
       }
 
@@ -13452,7 +13452,7 @@ function LoginModal({
     resetView();
     const viewFromURL = getStableViewID(window.Pelcro.helpers.getURLParameter("view"));
 
-    if (viewFromURL === "invoice-details") {
+    if (viewFromURL === "invoice-details" || viewFromURL === "gift-redeem") {
       initViewFromURL();
     }
   };
@@ -14036,7 +14036,7 @@ function RegisterModal(props) {
 
 
     if (giftCode) {
-      return switchToAddressView();
+      return switchView("gift-redeem"); // return switchToAddressView();
     } // Check if the subscription is meant as a gift (if so, gather recipients info)
 
 
@@ -21030,8 +21030,8 @@ function SubscriptionManageMembersList(props) {
       return {
         title: sub.status,
         content: sub.status,
-        textColor: "plc-text-red-500",
-        bgColor: "plc-bg-red-100",
+        textColor: "plc-text-yellow-500",
+        bgColor: "plc-bg-yellow-100",
         icon: /*#__PURE__*/React__default.createElement(SvgExclamation, null)
       };
     }
@@ -21087,7 +21087,8 @@ function SubscriptionManageMembersList(props) {
     key: member.id,
     className: `plc-w-full plc-align-middle plc-cursor-pointer accordion-header hover:plc-bg-gray-50 plc-text-center`
   }, /*#__PURE__*/React__default.createElement("td", {
-    className: "plc-truncate"
+    className: "plc-truncate plc-text-left",
+    title: member === null || member === void 0 ? void 0 : member.invitation_email
   }, /*#__PURE__*/React__default.createElement("span", {
     className: "plc-font-semibold plc-text-gray-500"
   }, member === null || member === void 0 ? void 0 : member.invitation_email)), /*#__PURE__*/React__default.createElement("td", {
@@ -21141,8 +21142,10 @@ function SubscriptionManageMembersView(props) {
     className: "plc-flex-shrink-0 plc-p-2 plc-text-xs plc-text-gray-400 plc-uppercase"
   }, t("labels.listOfMembers")), /*#__PURE__*/React__default.createElement("hr", {
     className: "plc-w-full plc-border-gray-300"
-  })), /*#__PURE__*/React__default.createElement("table", {
-    className: "plc-w-full plc-table-fixed plc-text-center"
+  })), /*#__PURE__*/React__default.createElement("div", {
+    className: "plc-max-h-48 plc-overflow-x-hidden plc-overflow-y-auto"
+  }, /*#__PURE__*/React__default.createElement("table", {
+    className: "plc-w-full plc-table-fixed plc-text-center plc-p-2 plc-m-1"
   }, /*#__PURE__*/React__default.createElement("thead", {
     className: "plc-text-xs plc-font-semibold plc-tracking-wider plc-text-gray-400 plc-uppercase "
   }, /*#__PURE__*/React__default.createElement("tr", null, /*#__PURE__*/React__default.createElement("th", {
@@ -21151,7 +21154,7 @@ function SubscriptionManageMembersView(props) {
     className: "plc-w-3/12 "
   }, t("labels.status")), /*#__PURE__*/React__default.createElement("th", {
     className: "plc-w-3/12 "
-  }, t("labels.actions")))), /*#__PURE__*/React__default.createElement("tbody", null, /*#__PURE__*/React__default.createElement(SubscriptionManageMembersList, null)))))));
+  }, t("labels.actions")))), /*#__PURE__*/React__default.createElement("tbody", null, /*#__PURE__*/React__default.createElement(SubscriptionManageMembersList, null))))))));
 }
 
 /**
@@ -25242,6 +25245,7 @@ const GiftCreateModal = ({
 GiftCreateModal.viewId = "gift-create";
 
 const initialState$6 = {
+  isSubmitting: false,
   giftCode: "",
   buttonDisabled: true,
   alert: {
@@ -25260,14 +25264,24 @@ const GiftRedeemContainer = ({
   onSuccess = () => {},
   onFailure = () => {},
   onDisplay = () => {},
-  children
+  children,
+  ...props
 }) => {
+  var _ref, _props$subscriptionId;
+
   const {
     t
   } = useTranslation("register");
   const {
     set
   } = usePelcro();
+  const {
+    switchView,
+    switchToAddressView,
+    isAuthenticated,
+    subscriptionIdToRenew: subscriptionIdToRenewFromStore
+  } = usePelcro();
+  const subscriptionIdToRenew = (_ref = (_props$subscriptionId = props.subscriptionIdToRenew) !== null && _props$subscriptionId !== void 0 ? _props$subscriptionId : subscriptionIdToRenewFromStore) !== null && _ref !== void 0 ? _ref : undefined;
   useEffect(() => {
     onDisplay();
   }, []);
@@ -25288,7 +25302,41 @@ const GiftRedeemContainer = ({
       set({
         giftCode
       });
-      onSuccess(giftCode);
+
+      if (!isAuthenticated()) {
+        switchView("register");
+      } else {
+        console.log("Shaker");
+        window.Pelcro.subscription.redeemGift({
+          auth_token: window.Pelcro.user.read().auth_token,
+          gift_code: giftCode,
+          // redeem gift as a future phase of an existing subscription
+          subscription_id: subscriptionIdToRenew
+        }, (err, res) => {
+          dispatch({
+            type: LOADING,
+            payload: false
+          });
+
+          if (err) {
+            dispatch({
+              type: SHOW_ALERT,
+              payload: {
+                type: "error",
+                content: getErrorMessages(err)
+              }
+            });
+
+            if (getErrorMessages(err) === "Address ID is required") {
+              switchToAddressView();
+            } else {
+              return onFailure(err);
+            }
+          } else {
+            return onSuccess(giftCode);
+          }
+        });
+      }
     }
   };
 
@@ -25309,8 +25357,14 @@ const GiftRedeemContainer = ({
           buttonDisabled: action.payload
         });
 
+      case LOADING:
+        return lib_7({ ...state,
+          isSubmitting: action.payload
+        });
+
       case HANDLE_SUBMIT:
         return lib_5({ ...state,
+          isSubmitting: true,
           buttonDisabled: true
         }, (state, dispatch) => handleRedeem(state, dispatch));
 
@@ -25379,7 +25433,8 @@ const GiftRedeemSubmitButton = ({
   const {
     dispatch,
     state: {
-      disableSubmit
+      disableSubmit,
+      isSubmitting
     }
   } = useContext(store$6);
   const {
@@ -25392,7 +25447,8 @@ const GiftRedeemSubmitButton = ({
       });
       onClick === null || onClick === void 0 ? void 0 : onClick();
     },
-    disabled: disableSubmit
+    disabled: disableSubmit,
+    isLoading: isSubmitting
   }, otherProps), name !== null && name !== void 0 ? name : t("redeem.buttons.redeem"));
 };
 
@@ -25443,12 +25499,7 @@ const GiftRedeemModal = ({
     var _otherProps$onSuccess;
 
     (_otherProps$onSuccess = otherProps.onSuccess) === null || _otherProps$onSuccess === void 0 ? void 0 : _otherProps$onSuccess.call(otherProps, giftCode);
-
-    if (isAuthenticated()) {
-      switchToAddressView();
-    } else {
-      switchView("register");
-    }
+    switchView("subscription-success");
   };
 
   return /*#__PURE__*/React__default.createElement(Modal, {

package/dist/pelcro.css

@@ -2217,6 +2217,10 @@ in order to scope selectors under pelcro-root
   margin: 0px;
 }
 
+.pelcro-root .plc-m-1 {
+  margin: 0.25rem;
+}
+
 .pelcro-root .plc-m-3 {
   margin: 0.75rem;
 }
@@ -2337,6 +2341,10 @@ in order to scope selectors under pelcro-root
   max-height: 3.5rem;
 }
 
+.pelcro-root .plc-max-h-48 {
+  max-height: 12rem;
+}
+
 .pelcro-root .plc-max-h-72 {
   max-height: 18rem;
 }
@@ -2383,6 +2391,10 @@ in order to scope selectors under pelcro-root
   overflow-y: auto;
 }
 
+.pelcro-root .plc-overflow-x-hidden {
+  overflow-x: hidden;
+}
+
 .pelcro-root .plc-overflow-y-scroll {
   overflow-y: scroll;
 }
@@ -2740,6 +2752,11 @@ in order to scope selectors under pelcro-root
   color: rgba(98, 26, 23, var(--tw-text-opacity));
 }
 
+.pelcro-root .plc-text-yellow-500 {
+  --tw-text-opacity: 1;
+  color: rgba(245, 158, 11, var(--tw-text-opacity));
+}
+
 .pelcro-root .plc-text-yellow-700 {
   --tw-text-opacity: 1;
   color: rgba(180, 83, 9, var(--tw-text-opacity));

package/package.json

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