@pelcro/react-pelcro-js 3.6.0-beta.25 → 3.6.0-beta.27

package/dist/index.cjs.js

@@ -15325,7 +15325,7 @@ const PaymentMethodContainerWithoutStripe = ({
     } else if (type === "orderCreate") {
       purchase(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
+      payInvoice(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
     } else if (type === "updatePaymentSource") {
       createNewTapCard();
     }
@@ -15502,7 +15502,7 @@ const PaymentMethodContainerWithoutStripe = ({
     } else if (type === "orderCreate") {
       purchase(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
+      payInvoice(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
     } else if (type === "updatePaymentSource") {
       createNewVantivCard();
     }
@@ -16025,6 +16025,90 @@ const PaymentMethodContainerWithoutStripe = ({
       updateTotalAmountWithTax();
     }
   };
+  /**
+   * Attempt to confirm a Stripe card payment via it's PaymentIntent.
+   * Only trigger method if PaymentIntent status is `requires_action`.
+   *
+   * @see https://stripe.com/docs/payments/intents#intent-statuses
+   *
+   * @param response
+   * @param error
+   * @returns {*}
+   */
+
+
+  const confirmStripeCardPayment = (response, error) => {
+    if (response) {
+      var _response$data;
+
+      const paymentIntent = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.payment_intent;
+
+      if ((paymentIntent === null || paymentIntent === void 0 ? void 0 : paymentIntent.status) === "requires_action" && paymentIntent !== null && paymentIntent !== void 0 && paymentIntent.client_secret) {
+        stripe.confirmCardPayment(paymentIntent.client_secret).then(res => {
+          console.log("The validation response", res);
+          dispatch({
+            type: DISABLE_SUBMIT,
+            payload: false
+          });
+          dispatch({
+            type: LOADING,
+            payload: false
+          });
+
+          if (res.error) {
+            onFailure(res.error);
+            return dispatch({
+              type: SHOW_ALERT,
+              payload: {
+                type: "error",
+                content: getErrorMessages(res.error)
+              }
+            });
+          }
+
+          onSuccess(res);
+        });
+      } else if ((paymentIntent === null || paymentIntent === void 0 ? void 0 : paymentIntent.status) === "requires_payment_method" && paymentIntent !== null && paymentIntent !== void 0 && paymentIntent.client_secret) {
+        dispatch({
+          type: DISABLE_SUBMIT,
+          payload: false
+        });
+        dispatch({
+          type: LOADING,
+          payload: false
+        });
+        return dispatch({
+          type: SHOW_ALERT,
+          payload: {
+            type: "error",
+            content: t("messages.cardAuthFailed")
+          }
+        });
+      }
+    } else {
+      dispatch({
+        type: DISABLE_SUBMIT,
+        payload: false
+      });
+      dispatch({
+        type: LOADING,
+        payload: false
+      });
+
+      if (error) {
+        onFailure(error);
+        return dispatch({
+          type: SHOW_ALERT,
+          payload: {
+            type: "error",
+            content: getErrorMessages(error)
+          }
+        });
+      }
+
+      onSuccess(response);
+    }
+  };
 
   const subscribe = (stripeSource, state, dispatch) => {
     const {
@@ -16047,27 +16131,7 @@ const PaymentMethodContainerWithoutStripe = ({
         gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
         address_id: product.address_required ? selectedAddressId : null
       }, (err, res) => {
-        dispatch({
-          type: DISABLE_SUBMIT,
-          payload: false
-        });
-        dispatch({
-          type: LOADING,
-          payload: false
-        });
-
-        if (err) {
-          onFailure(err);
-          return dispatch({
-            type: SHOW_ALERT,
-            payload: {
-              type: "error",
-              content: getErrorMessages(err)
-            }
-          });
-        }
-
-        onSuccess(res);
+        confirmStripeCardPayment(res, err);
       });
     } else {
       if (isRenewingGift) {
@@ -16291,27 +16355,7 @@ const PaymentMethodContainerWithoutStripe = ({
       isExistingSource: Boolean(selectedPaymentMethodId),
       invoiceId: invoice.id
     }, (err, res) => {
-      dispatch({
-        type: DISABLE_SUBMIT,
-        payload: false
-      });
-      dispatch({
-        type: LOADING,
-        payload: false
-      });
-
-      if (err) {
-        onFailure(err);
-        return dispatch({
-          type: SHOW_ALERT,
-          payload: {
-            type: "error",
-            content: getErrorMessages(err)
-          }
-        });
-      }
-
-      onSuccess(res);
+      confirmStripeCardPayment(res, err);
     });
   };
 
@@ -16391,7 +16435,7 @@ const PaymentMethodContainerWithoutStripe = ({
       source,
       error
     }) => {
-      var _ref3, _ref4, _state$updatedPrice2, _source$card3;
+      var _ref3, _ref4, _state$updatedPrice2;
 
       if (error) {
         return handlePaymentError(error);
@@ -16417,25 +16461,7 @@ const PaymentMethodContainerWithoutStripe = ({
         }, 0);
       };
 
-      const totalAmount = (_ref3 = (_ref4 = (_state$updatedPrice2 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice2 !== void 0 ? _state$updatedPrice2 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref4 !== void 0 ? _ref4 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref3 !== void 0 ? _ref3 : getOrderItemsTotal();
-
-      if ((source === null || source === void 0 ? void 0 : (_source$card3 = source.card) === null || _source$card3 === void 0 ? void 0 : _source$card3.three_d_secure) === "required" && totalAmount > 0) {
-        return resolveTaxCalculation().then(res => {
-          var _res$totalAmountWithT;
-
-          return generate3DSecureSource(source, (_res$totalAmountWithT = res === null || res === void 0 ? void 0 : res.totalAmountWithTax) !== null && _res$totalAmountWithT !== void 0 ? _res$totalAmountWithT : totalAmount).then(({
-            source,
-            error
-          }) => {
-            if (error) {
-              return handlePaymentError(error);
-            }
-
-            toggleAuthenticationPendingView(true, source);
-          });
-        });
-      }
-
+      (_ref3 = (_ref4 = (_state$updatedPrice2 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice2 !== void 0 ? _state$updatedPrice2 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref4 !== void 0 ? _ref4 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref3 !== void 0 ? _ref3 : getOrderItemsTotal();
       return handlePayment(source);
     }).catch(error => {
       return handlePaymentError(error);
@@ -16529,7 +16555,7 @@ const PaymentMethodContainerWithoutStripe = ({
     } else if (stripeSource && type === "orderCreate") {
       purchase(new StripeGateway(), stripeSource.id, state, dispatch);
     } else if (stripeSource && type === "invoicePayment") {
-      payInvoice(new StripeGateway(), stripeSource.id, dispatch);
+      payInvoice(new StripeGateway(), stripeSource.id);
     }
   };
 
@@ -16679,7 +16705,7 @@ const PaymentMethodContainerWithoutStripe = ({
       case HANDLE_PAYPAL_SUBSCRIPTION:
         return lib_5(state, (state, dispatch) => {
           if (type === "invoicePayment") {
-            payInvoice(new PaypalGateway(), action.payload, dispatch);
+            payInvoice(new PaypalGateway(), action.payload);
           } else {
             handlePaypalSubscription(state, action.payload);
           }
@@ -18523,6 +18549,7 @@ class DefaultNewsLetter extends React.Component {
     });
 
     _defineProperty$3(this, "postSubmit", () => {
+      window.Pelcro.paywall.setNewsletterExtraVisits(true);
       this.props.setView("meter");
     });
 

package/dist/index.esm.js

@@ -15295,7 +15295,7 @@ const PaymentMethodContainerWithoutStripe = ({
     } else if (type === "orderCreate") {
       purchase(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
+      payInvoice(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
     } else if (type === "updatePaymentSource") {
       createNewTapCard();
     }
@@ -15472,7 +15472,7 @@ const PaymentMethodContainerWithoutStripe = ({
     } else if (type === "orderCreate") {
       purchase(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
+      payInvoice(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
     } else if (type === "updatePaymentSource") {
       createNewVantivCard();
     }
@@ -15995,6 +15995,90 @@ const PaymentMethodContainerWithoutStripe = ({
       updateTotalAmountWithTax();
     }
   };
+  /**
+   * Attempt to confirm a Stripe card payment via it's PaymentIntent.
+   * Only trigger method if PaymentIntent status is `requires_action`.
+   *
+   * @see https://stripe.com/docs/payments/intents#intent-statuses
+   *
+   * @param response
+   * @param error
+   * @returns {*}
+   */
+
+
+  const confirmStripeCardPayment = (response, error) => {
+    if (response) {
+      var _response$data;
+
+      const paymentIntent = (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.payment_intent;
+
+      if ((paymentIntent === null || paymentIntent === void 0 ? void 0 : paymentIntent.status) === "requires_action" && paymentIntent !== null && paymentIntent !== void 0 && paymentIntent.client_secret) {
+        stripe.confirmCardPayment(paymentIntent.client_secret).then(res => {
+          console.log("The validation response", res);
+          dispatch({
+            type: DISABLE_SUBMIT,
+            payload: false
+          });
+          dispatch({
+            type: LOADING,
+            payload: false
+          });
+
+          if (res.error) {
+            onFailure(res.error);
+            return dispatch({
+              type: SHOW_ALERT,
+              payload: {
+                type: "error",
+                content: getErrorMessages(res.error)
+              }
+            });
+          }
+
+          onSuccess(res);
+        });
+      } else if ((paymentIntent === null || paymentIntent === void 0 ? void 0 : paymentIntent.status) === "requires_payment_method" && paymentIntent !== null && paymentIntent !== void 0 && paymentIntent.client_secret) {
+        dispatch({
+          type: DISABLE_SUBMIT,
+          payload: false
+        });
+        dispatch({
+          type: LOADING,
+          payload: false
+        });
+        return dispatch({
+          type: SHOW_ALERT,
+          payload: {
+            type: "error",
+            content: t("messages.cardAuthFailed")
+          }
+        });
+      }
+    } else {
+      dispatch({
+        type: DISABLE_SUBMIT,
+        payload: false
+      });
+      dispatch({
+        type: LOADING,
+        payload: false
+      });
+
+      if (error) {
+        onFailure(error);
+        return dispatch({
+          type: SHOW_ALERT,
+          payload: {
+            type: "error",
+            content: getErrorMessages(error)
+          }
+        });
+      }
+
+      onSuccess(response);
+    }
+  };
 
   const subscribe = (stripeSource, state, dispatch) => {
     const {
@@ -16017,27 +16101,7 @@ const PaymentMethodContainerWithoutStripe = ({
         gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
         address_id: product.address_required ? selectedAddressId : null
       }, (err, res) => {
-        dispatch({
-          type: DISABLE_SUBMIT,
-          payload: false
-        });
-        dispatch({
-          type: LOADING,
-          payload: false
-        });
-
-        if (err) {
-          onFailure(err);
-          return dispatch({
-            type: SHOW_ALERT,
-            payload: {
-              type: "error",
-              content: getErrorMessages(err)
-            }
-          });
-        }
-
-        onSuccess(res);
+        confirmStripeCardPayment(res, err);
       });
     } else {
       if (isRenewingGift) {
@@ -16261,27 +16325,7 @@ const PaymentMethodContainerWithoutStripe = ({
       isExistingSource: Boolean(selectedPaymentMethodId),
       invoiceId: invoice.id
     }, (err, res) => {
-      dispatch({
-        type: DISABLE_SUBMIT,
-        payload: false
-      });
-      dispatch({
-        type: LOADING,
-        payload: false
-      });
-
-      if (err) {
-        onFailure(err);
-        return dispatch({
-          type: SHOW_ALERT,
-          payload: {
-            type: "error",
-            content: getErrorMessages(err)
-          }
-        });
-      }
-
-      onSuccess(res);
+      confirmStripeCardPayment(res, err);
     });
   };
 
@@ -16361,7 +16405,7 @@ const PaymentMethodContainerWithoutStripe = ({
       source,
       error
     }) => {
-      var _ref3, _ref4, _state$updatedPrice2, _source$card3;
+      var _ref3, _ref4, _state$updatedPrice2;
 
       if (error) {
         return handlePaymentError(error);
@@ -16387,25 +16431,7 @@ const PaymentMethodContainerWithoutStripe = ({
         }, 0);
       };
 
-      const totalAmount = (_ref3 = (_ref4 = (_state$updatedPrice2 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice2 !== void 0 ? _state$updatedPrice2 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref4 !== void 0 ? _ref4 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref3 !== void 0 ? _ref3 : getOrderItemsTotal();
-
-      if ((source === null || source === void 0 ? void 0 : (_source$card3 = source.card) === null || _source$card3 === void 0 ? void 0 : _source$card3.three_d_secure) === "required" && totalAmount > 0) {
-        return resolveTaxCalculation().then(res => {
-          var _res$totalAmountWithT;
-
-          return generate3DSecureSource(source, (_res$totalAmountWithT = res === null || res === void 0 ? void 0 : res.totalAmountWithTax) !== null && _res$totalAmountWithT !== void 0 ? _res$totalAmountWithT : totalAmount).then(({
-            source,
-            error
-          }) => {
-            if (error) {
-              return handlePaymentError(error);
-            }
-
-            toggleAuthenticationPendingView(true, source);
-          });
-        });
-      }
-
+      (_ref3 = (_ref4 = (_state$updatedPrice2 = state === null || state === void 0 ? void 0 : state.updatedPrice) !== null && _state$updatedPrice2 !== void 0 ? _state$updatedPrice2 : plan === null || plan === void 0 ? void 0 : plan.amount) !== null && _ref4 !== void 0 ? _ref4 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref3 !== void 0 ? _ref3 : getOrderItemsTotal();
       return handlePayment(source);
     }).catch(error => {
       return handlePaymentError(error);
@@ -16499,7 +16525,7 @@ const PaymentMethodContainerWithoutStripe = ({
     } else if (stripeSource && type === "orderCreate") {
       purchase(new StripeGateway(), stripeSource.id, state, dispatch);
     } else if (stripeSource && type === "invoicePayment") {
-      payInvoice(new StripeGateway(), stripeSource.id, dispatch);
+      payInvoice(new StripeGateway(), stripeSource.id);
     }
   };
 
@@ -16649,7 +16675,7 @@ const PaymentMethodContainerWithoutStripe = ({
       case HANDLE_PAYPAL_SUBSCRIPTION:
         return lib_5(state, (state, dispatch) => {
           if (type === "invoicePayment") {
-            payInvoice(new PaypalGateway(), action.payload, dispatch);
+            payInvoice(new PaypalGateway(), action.payload);
           } else {
             handlePaypalSubscription(state, action.payload);
           }
@@ -18493,6 +18519,7 @@ class DefaultNewsLetter extends Component {
     });
 
     _defineProperty$3(this, "postSubmit", () => {
+      window.Pelcro.paywall.setNewsletterExtraVisits(true);
       this.props.setView("meter");
     });
 

package/package.json

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