@pelcro/react-pelcro-js 3.26.0-sandbox.1 → 3.26.0-sandbox.7

package/dist/index.cjs.js

@@ -14651,7 +14651,6 @@ class SelectModal extends React.Component {
             });
           });
         });
-        console.log("bugsnag Triggered");
       }
     });
     _defineProperty$3(this, "componentWillUnmount", () => {
@@ -17216,7 +17215,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   };
   const submitUsingCybersource = (state, dispatch) => {
     var _cybersourceInstanceR;
-    console.log("State", state);
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (isUsingExistingPaymentMethod) {
       // no need to create a new source using cybersrce
@@ -17257,7 +17255,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } else if (type === "orderCreate") {
       purchase(new CybersourceGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new CybersourceGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
+      payInvoice(new CybersourceGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
     } else if (type === "updatePaymentSource") {
       createNewCybersourceCard();
     }
@@ -17579,7 +17577,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } else if (type === "orderCreate") {
       purchase(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
+      payInvoice(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
     } else if (type === "updatePaymentSource") {
       createNewTapCard();
     }
@@ -17790,7 +17788,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } else if (type === "orderCreate") {
       purchase(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
+      payInvoice(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
     } else if (type === "updatePaymentSource") {
       createNewVantivCard();
     }
@@ -18263,30 +18261,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       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 = function (response, error) {
-    let isSubCreate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  const confirmStripePaymentIntent = (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) {
+      if (paymentIntent !== null && paymentIntent !== void 0 && paymentIntent.client_secret) {
         stripe.confirmCardPayment(paymentIntent.client_secret).then(res => {
-          if (!isSubCreate) {
-            dispatch({
-              type: DISABLE_SUBMIT,
-              payload: false
-            });
-          }
           dispatch({
             type: LOADING,
             payload: false
@@ -18297,53 +18277,52 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               type: SHOW_ALERT,
               payload: {
                 type: "error",
-                content: isSubCreate ? t("messages.tryAgainFromInvoice") : getErrorMessages(res.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) {
-        if (!isSubCreate) {
+      }
+    }
+  };
+
+  /**
+   * 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 confirmStripeIntentSetup = (response, error, stripeSource) => {
+    var _response$data2;
+    const setup_intent = (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.setup_intent;
+    if (setup_intent !== null && setup_intent !== void 0 && setup_intent.client_secret) {
+      var _response$data3, _response$data3$sourc;
+      stripe.confirmCardSetup(setup_intent.client_secret, {
+        payment_method: (_response$data3 = response.data) === null || _response$data3 === void 0 ? void 0 : (_response$data3$sourc = _response$data3.source) === null || _response$data3$sourc === void 0 ? void 0 : _response$data3$sourc.object_id
+      }).then(res => {
+        var _response$data4;
+        if (res.error) {
           dispatch({
-            type: DISABLE_SUBMIT,
+            type: LOADING,
             payload: false
           });
+          onFailure(res.error);
+          return dispatch({
+            type: SHOW_ALERT,
+            payload: {
+              type: "error",
+              content: getErrorMessages(res.error)
+            }
+          });
         }
-        dispatch({
-          type: LOADING,
-          payload: false
-        });
-        onFailure(error);
-        return dispatch({
-          type: SHOW_ALERT,
-          payload: {
-            type: "error",
-            content: isSubCreate ? t("messages.tryAgainFromInvoice") : t("messages.cardAuthFailed")
-          }
-        });
-      } else {
-        onSuccess(response);
-      }
-    } else {
-      dispatch({
-        type: DISABLE_SUBMIT,
-        payload: false
+        return handlePayment(response === null || response === void 0 ? void 0 : (_response$data4 = response.data) === null || _response$data4 === void 0 ? void 0 : _response$data4.source);
       });
-      dispatch({
-        type: LOADING,
-        payload: false
-      });
-      if (error) {
-        onFailure(error);
-        return dispatch({
-          type: SHOW_ALERT,
-          payload: {
-            type: "error",
-            content: getErrorMessages(error)
-          }
-        });
-      }
+    } else {
       onSuccess(response);
     }
   };
@@ -18353,8 +18332,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } = state;
     if (!subscriptionIdToRenew) {
       window.Pelcro.subscription.create({
-        source_id: stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
-        stripe_token: !(stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource) ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
+        source_id: (stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id) || undefined,
         auth_token: window.Pelcro.user.read().auth_token,
         plan_id: plan.id,
         campaign_key: window.Pelcro.helpers.getURLParameter("campaign_key"),
@@ -18367,20 +18345,10 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
         address_id: product.address_required ? selectedAddressId : null
       }, (err, res) => {
-        confirmStripeCardPayment(res, err, true);
-      });
-    } else {
-      if (isRenewingGift) {
-        window.Pelcro.subscription.renewGift({
-          source_id: stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
-          stripe_token: !(stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource) ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
-          auth_token: window.Pelcro.user.read().auth_token,
-          plan_id: plan.id,
-          quantity: plan.quantity,
-          coupon_code: couponCode,
-          subscription_id: subscriptionIdToRenew,
-          address_id: product.address_required ? selectedAddressId : null
-        }, (err, res) => {
+        var _res$data, _res$data$payment_int;
+        if ((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$payment_int = _res$data.payment_intent) === null || _res$data$payment_int === void 0 ? void 0 : _res$data$payment_int.status) === "requires_action") {
+          confirmStripePaymentIntent(res);
+        } else {
           dispatch({
             type: DISABLE_SUBMIT,
             payload: false
@@ -18399,12 +18367,48 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               }
             });
           }
-          onGiftRenewalSuccess(res);
+          onSuccess(res);
+        }
+      });
+    } else {
+      if (isRenewingGift) {
+        window.Pelcro.subscription.renewGift({
+          source_id: (stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id) || undefined,
+          auth_token: window.Pelcro.user.read().auth_token,
+          plan_id: plan.id,
+          quantity: plan.quantity,
+          coupon_code: couponCode,
+          subscription_id: subscriptionIdToRenew,
+          address_id: product.address_required ? selectedAddressId : null
+        }, (err, res) => {
+          var _res$data2, _res$data2$payment_in;
+          if ((res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$payment_in = _res$data2.payment_intent) === null || _res$data2$payment_in === void 0 ? void 0 : _res$data2$payment_in.status) === "requires_action") {
+            confirmStripePaymentIntent(res);
+          } else {
+            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)
+                }
+              });
+            }
+            onGiftRenewalSuccess(res);
+          }
         });
       } else {
         window.Pelcro.subscription.renew({
-          source_id: stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
-          stripe_token: !(stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource) ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
+          source_id: (stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id) || undefined,
           auth_token: window.Pelcro.user.read().auth_token,
           plan_id: plan.id,
           campaign_key: window.Pelcro.helpers.getURLParameter("campaign_key"),
@@ -18412,25 +18416,30 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           subscription_id: subscriptionIdToRenew,
           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)
-              }
+          var _res$data3, _res$data3$payment_in;
+          if ((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : (_res$data3$payment_in = _res$data3.payment_intent) === null || _res$data3$payment_in === void 0 ? void 0 : _res$data3$payment_in.status) === "requires_action") {
+            confirmStripePaymentIntent(res);
+          } else {
+            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);
           }
-          onSuccess(res);
         });
       }
     }
@@ -18517,7 +18526,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       onSuccess(res);
     });
   };
-  const purchase = (gatewayService, gatewayToken, state, dispatch) => {
+  const purchase = (gatewayService, backendSource, state, dispatch) => {
     const isQuickPurchase = !Array.isArray(order);
     const mappedOrderItems = isQuickPurchase ? [{
       sku_id: order.id,
@@ -18532,45 +18541,85 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     const payment = new Payment(gatewayService);
     payment.execute({
       type: PAYMENT_TYPES.PURCHASE_ECOMMERCE_ORDER,
-      token: gatewayToken,
-      isExistingSource: Boolean(selectedPaymentMethodId),
+      token: backendSource,
+      isExistingSource: true,
       items: mappedOrderItems,
       addressId: selectedAddressId,
       couponCode
     }, (err, orderResponse) => {
-      var _window$Pelcro2, _window$Pelcro2$user, _window$Pelcro2$user$;
-      if (err) {
-        toggleAuthenticationSuccessPendingView(false);
-        dispatch({
-          type: DISABLE_SUBMIT,
-          payload: false
-        });
-        dispatch({
-          type: LOADING,
-          payload: false
-        });
-        onFailure(err);
-        return dispatch({
-          type: SHOW_ALERT,
-          payload: {
-            type: "error",
-            content: getErrorMessages(err)
+      var _res, _res$data4, _res$data4$payment_in;
+      if (((_res = res) === null || _res === void 0 ? void 0 : (_res$data4 = _res.data) === null || _res$data4 === void 0 ? void 0 : (_res$data4$payment_in = _res$data4.payment_intent) === null || _res$data4$payment_in === void 0 ? void 0 : _res$data4$payment_in.status) === "requires_action") {
+        confirmStripePaymentIntent(res);
+      } else {
+        var _window$Pelcro2, _window$Pelcro2$user, _window$Pelcro2$user$;
+        if (err) {
+          toggleAuthenticationSuccessPendingView(false);
+          dispatch({
+            type: DISABLE_SUBMIT,
+            payload: false
+          });
+          dispatch({
+            type: LOADING,
+            payload: false
+          });
+          onFailure(err);
+          return dispatch({
+            type: SHOW_ALERT,
+            payload: {
+              type: "error",
+              content: getErrorMessages(err)
+            }
+          });
+        }
+        if (isQuickPurchase) {
+          set({
+            order: null
+          });
+        } else {
+          set({
+            order: null,
+            cartItems: []
+          });
+        }
+        window.Pelcro.user.refresh({
+          auth_token: (_window$Pelcro2 = window.Pelcro) === null || _window$Pelcro2 === void 0 ? void 0 : (_window$Pelcro2$user = _window$Pelcro2.user) === null || _window$Pelcro2$user === void 0 ? void 0 : (_window$Pelcro2$user$ = _window$Pelcro2$user.read()) === null || _window$Pelcro2$user$ === void 0 ? void 0 : _window$Pelcro2$user$.auth_token
+        }, (err, res) => {
+          dispatch({
+            type: DISABLE_SUBMIT,
+            payload: false
+          });
+          dispatch({
+            type: LOADING,
+            payload: false
+          });
+          toggleAuthenticationSuccessPendingView(false);
+          if (err) {
+            onFailure(err);
+            return dispatch({
+              type: SHOW_ALERT,
+              payload: {
+                type: "error",
+                content: getErrorMessages(err)
+              }
+            });
           }
+          onSuccess(orderResponse);
         });
       }
-      if (isQuickPurchase) {
-        set({
-          order: null
-        });
+    });
+  };
+  const payInvoice = (gatewayService, backendSource, dispatch) => {
+    const payment = new Payment(gatewayService);
+    return payment.execute({
+      type: PAYMENT_TYPES.PAY_INVOICE,
+      token: backendSource,
+      isExistingSource: true,
+      invoiceId: invoice.id
+    }, (err, res) => {
+      var _res$data5, _res$data5$payment_in;
+      if ((res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : (_res$data5$payment_in = _res$data5.payment_intent) === null || _res$data5$payment_in === void 0 ? void 0 : _res$data5$payment_in.status) === "requires_action") {
+        confirmStripePaymentIntent(res);
       } else {
-        set({
-          order: null,
-          cartItems: []
-        });
-      }
-      window.Pelcro.user.refresh({
-        auth_token: (_window$Pelcro2 = window.Pelcro) === null || _window$Pelcro2 === void 0 ? void 0 : (_window$Pelcro2$user = _window$Pelcro2.user) === null || _window$Pelcro2$user === void 0 ? void 0 : (_window$Pelcro2$user$ = _window$Pelcro2$user.read()) === null || _window$Pelcro2$user$ === void 0 ? void 0 : _window$Pelcro2$user$.auth_token
-      }, (err, res) => {
         dispatch({
           type: DISABLE_SUBMIT,
           payload: false
@@ -18579,7 +18628,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           type: LOADING,
           payload: false
         });
-        toggleAuthenticationSuccessPendingView(false);
         if (err) {
           onFailure(err);
           return dispatch({
@@ -18590,21 +18638,11 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             }
           });
         }
-        onSuccess(orderResponse);
-      });
-    });
-  };
-  const payInvoice = (gatewayService, gatewayToken, dispatch) => {
-    const payment = new Payment(gatewayService);
-    return payment.execute({
-      type: PAYMENT_TYPES.PAY_INVOICE,
-      token: gatewayToken,
-      isExistingSource: Boolean(selectedPaymentMethodId),
-      invoiceId: invoice.id
-    }, (err, res) => {
-      confirmStripeCardPayment(res, err);
+        onSuccess(res);
+      }
     });
   };
+  console.log("trigger release");
   const updatePaymentSource = (state, dispatch) => {
     return stripe.createSource({
       type: "card"
@@ -18719,7 +18757,36 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         }, 0);
       };
       (_ref10 = (_ref11 = (_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 && _ref11 !== void 0 ? _ref11 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref10 !== void 0 ? _ref10 : getOrderItemsTotal();
-      return handlePayment(source);
+      return resolveTaxCalculation().then(res => window.Pelcro.source.create({
+        auth_token: window.Pelcro.user.read().auth_token,
+        token: source.id
+      }, (err, res) => {
+        var _res$data6, _res$data6$setup_inte;
+        if (((_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : (_res$data6$setup_inte = _res$data6.setup_intent) === null || _res$data6$setup_inte === void 0 ? void 0 : _res$data6$setup_inte.status) === "requires_action") {
+          confirmStripeIntentSetup(res);
+        } else {
+          var _res$data7;
+          if (err) {
+            onFailure(err);
+            dispatch({
+              type: DISABLE_SUBMIT,
+              payload: false
+            });
+            dispatch({
+              type: LOADING,
+              payload: false
+            });
+            return dispatch({
+              type: SHOW_ALERT,
+              payload: {
+                type: "error",
+                content: getErrorMessages(err)
+              }
+            });
+          }
+          return handlePayment((_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.source);
+        }
+      }));
     }).catch(error => {
       return handlePaymentError(error);
     });
@@ -18747,12 +18814,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         coupon_code: state === null || state === void 0 ? void 0 : state.couponCode,
         address_id: selectedAddressId
       }, (error, res) => {
-        var _res$data, _res$data2;
+        var _res$data8, _res$data9;
         if (error) {
           return reject(error);
         }
-        const taxAmount = (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.taxes;
-        const totalAmountWithTax = (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total;
+        const taxAmount = (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.taxes;
+        const totalAmountWithTax = (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.total;
         resolve({
           totalAmountWithTax,
           taxAmount
@@ -18796,13 +18863,13 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       }
     });
   };
-  const handlePayment = stripeSource => {
-    if (stripeSource && type === "createPayment") {
-      subscribe(stripeSource, state, dispatch);
-    } else if (stripeSource && type === "orderCreate") {
-      purchase(new StripeGateway(), stripeSource.id, state, dispatch);
-    } else if (stripeSource && type === "invoicePayment") {
-      payInvoice(new StripeGateway(), stripeSource.id);
+  const handlePayment = backendSource => {
+    if (backendSource && type === "createPayment") {
+      subscribe(backendSource, state, dispatch);
+    } else if (backendSource && type === "orderCreate") {
+      purchase(new StripeGateway(), backendSource.id, state, dispatch);
+    } else if (backendSource && type === "invoicePayment") {
+      payInvoice(new StripeGateway(), backendSource.id, dispatch);
     }
   };
   const handlePaymentError = error => {
@@ -18926,7 +18993,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           isLoading: true
         }, (state, dispatch) => {
           if (skipPayment && props !== null && props !== void 0 && props.freeOrders) {
-            return submitPayment(state);
+            return submitPayment(state, dispatch);
           }
           if (getSiteCardProcessor() === "vantiv") {
             return submitUsingVantiv(state);
@@ -18947,12 +19014,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           if (type === "updatePaymentSource") {
             return updatePaymentSource(state, dispatch);
           }
-          submitPayment(state);
+          submitPayment(state, dispatch);
         });
       case HANDLE_PAYPAL_SUBSCRIPTION:
         return lib_5(state, (state, dispatch) => {
           if (type === "invoicePayment") {
-            payInvoice(new PaypalGateway(), action.payload);
+            payInvoice(new PaypalGateway(), action.payload, dispatch);
           } else {
             handlePaypalSubscription(state, action.payload);
           }

package/dist/index.esm.js

@@ -14621,7 +14621,6 @@ class SelectModal extends Component {
             });
           });
         });
-        console.log("bugsnag Triggered");
       }
     });
     _defineProperty$3(this, "componentWillUnmount", () => {
@@ -17186,7 +17185,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
   };
   const submitUsingCybersource = (state, dispatch) => {
     var _cybersourceInstanceR;
-    console.log("State", state);
     const isUsingExistingPaymentMethod = Boolean(selectedPaymentMethodId);
     if (isUsingExistingPaymentMethod) {
       // no need to create a new source using cybersrce
@@ -17227,7 +17225,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } else if (type === "orderCreate") {
       purchase(new CybersourceGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new CybersourceGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
+      payInvoice(new CybersourceGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
     } else if (type === "updatePaymentSource") {
       createNewCybersourceCard();
     }
@@ -17549,7 +17547,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } else if (type === "orderCreate") {
       purchase(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
+      payInvoice(new TapGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
     } else if (type === "updatePaymentSource") {
       createNewTapCard();
     }
@@ -17760,7 +17758,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } else if (type === "orderCreate") {
       purchase(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, state, dispatch);
     } else if (type === "invoicePayment") {
-      payInvoice(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest);
+      payInvoice(new VantivGateway(), isUsingExistingPaymentMethod ? selectedPaymentMethodId : paymentRequest, dispatch);
     } else if (type === "updatePaymentSource") {
       createNewVantivCard();
     }
@@ -18233,30 +18231,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       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 = function (response, error) {
-    let isSubCreate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  const confirmStripePaymentIntent = (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) {
+      if (paymentIntent !== null && paymentIntent !== void 0 && paymentIntent.client_secret) {
         stripe.confirmCardPayment(paymentIntent.client_secret).then(res => {
-          if (!isSubCreate) {
-            dispatch({
-              type: DISABLE_SUBMIT,
-              payload: false
-            });
-          }
           dispatch({
             type: LOADING,
             payload: false
@@ -18267,53 +18247,52 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               type: SHOW_ALERT,
               payload: {
                 type: "error",
-                content: isSubCreate ? t("messages.tryAgainFromInvoice") : getErrorMessages(res.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) {
-        if (!isSubCreate) {
+      }
+    }
+  };
+
+  /**
+   * 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 confirmStripeIntentSetup = (response, error, stripeSource) => {
+    var _response$data2;
+    const setup_intent = (_response$data2 = response.data) === null || _response$data2 === void 0 ? void 0 : _response$data2.setup_intent;
+    if (setup_intent !== null && setup_intent !== void 0 && setup_intent.client_secret) {
+      var _response$data3, _response$data3$sourc;
+      stripe.confirmCardSetup(setup_intent.client_secret, {
+        payment_method: (_response$data3 = response.data) === null || _response$data3 === void 0 ? void 0 : (_response$data3$sourc = _response$data3.source) === null || _response$data3$sourc === void 0 ? void 0 : _response$data3$sourc.object_id
+      }).then(res => {
+        var _response$data4;
+        if (res.error) {
           dispatch({
-            type: DISABLE_SUBMIT,
+            type: LOADING,
             payload: false
           });
+          onFailure(res.error);
+          return dispatch({
+            type: SHOW_ALERT,
+            payload: {
+              type: "error",
+              content: getErrorMessages(res.error)
+            }
+          });
         }
-        dispatch({
-          type: LOADING,
-          payload: false
-        });
-        onFailure(error);
-        return dispatch({
-          type: SHOW_ALERT,
-          payload: {
-            type: "error",
-            content: isSubCreate ? t("messages.tryAgainFromInvoice") : t("messages.cardAuthFailed")
-          }
-        });
-      } else {
-        onSuccess(response);
-      }
-    } else {
-      dispatch({
-        type: DISABLE_SUBMIT,
-        payload: false
+        return handlePayment(response === null || response === void 0 ? void 0 : (_response$data4 = response.data) === null || _response$data4 === void 0 ? void 0 : _response$data4.source);
       });
-      dispatch({
-        type: LOADING,
-        payload: false
-      });
-      if (error) {
-        onFailure(error);
-        return dispatch({
-          type: SHOW_ALERT,
-          payload: {
-            type: "error",
-            content: getErrorMessages(error)
-          }
-        });
-      }
+    } else {
       onSuccess(response);
     }
   };
@@ -18323,8 +18302,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     } = state;
     if (!subscriptionIdToRenew) {
       window.Pelcro.subscription.create({
-        source_id: stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
-        stripe_token: !(stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource) ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
+        source_id: (stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id) || undefined,
         auth_token: window.Pelcro.user.read().auth_token,
         plan_id: plan.id,
         campaign_key: window.Pelcro.helpers.getURLParameter("campaign_key"),
@@ -18337,20 +18315,10 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         gift_message: giftRecipient === null || giftRecipient === void 0 ? void 0 : giftRecipient.giftMessage,
         address_id: product.address_required ? selectedAddressId : null
       }, (err, res) => {
-        confirmStripeCardPayment(res, err, true);
-      });
-    } else {
-      if (isRenewingGift) {
-        window.Pelcro.subscription.renewGift({
-          source_id: stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
-          stripe_token: !(stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource) ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
-          auth_token: window.Pelcro.user.read().auth_token,
-          plan_id: plan.id,
-          quantity: plan.quantity,
-          coupon_code: couponCode,
-          subscription_id: subscriptionIdToRenew,
-          address_id: product.address_required ? selectedAddressId : null
-        }, (err, res) => {
+        var _res$data, _res$data$payment_int;
+        if ((res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$payment_int = _res$data.payment_intent) === null || _res$data$payment_int === void 0 ? void 0 : _res$data$payment_int.status) === "requires_action") {
+          confirmStripePaymentIntent(res);
+        } else {
           dispatch({
             type: DISABLE_SUBMIT,
             payload: false
@@ -18369,12 +18337,48 @@ const PaymentMethodContainerWithoutStripe = _ref => {
               }
             });
           }
-          onGiftRenewalSuccess(res);
+          onSuccess(res);
+        }
+      });
+    } else {
+      if (isRenewingGift) {
+        window.Pelcro.subscription.renewGift({
+          source_id: (stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id) || undefined,
+          auth_token: window.Pelcro.user.read().auth_token,
+          plan_id: plan.id,
+          quantity: plan.quantity,
+          coupon_code: couponCode,
+          subscription_id: subscriptionIdToRenew,
+          address_id: product.address_required ? selectedAddressId : null
+        }, (err, res) => {
+          var _res$data2, _res$data2$payment_in;
+          if ((res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$payment_in = _res$data2.payment_intent) === null || _res$data2$payment_in === void 0 ? void 0 : _res$data2$payment_in.status) === "requires_action") {
+            confirmStripePaymentIntent(res);
+          } else {
+            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)
+                }
+              });
+            }
+            onGiftRenewalSuccess(res);
+          }
         });
       } else {
         window.Pelcro.subscription.renew({
-          source_id: stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
-          stripe_token: !(stripeSource !== null && stripeSource !== void 0 && stripeSource.isExistingSource) ? stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id : undefined,
+          source_id: (stripeSource === null || stripeSource === void 0 ? void 0 : stripeSource.id) || undefined,
           auth_token: window.Pelcro.user.read().auth_token,
           plan_id: plan.id,
           campaign_key: window.Pelcro.helpers.getURLParameter("campaign_key"),
@@ -18382,25 +18386,30 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           subscription_id: subscriptionIdToRenew,
           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)
-              }
+          var _res$data3, _res$data3$payment_in;
+          if ((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : (_res$data3$payment_in = _res$data3.payment_intent) === null || _res$data3$payment_in === void 0 ? void 0 : _res$data3$payment_in.status) === "requires_action") {
+            confirmStripePaymentIntent(res);
+          } else {
+            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);
           }
-          onSuccess(res);
         });
       }
     }
@@ -18487,7 +18496,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       onSuccess(res);
     });
   };
-  const purchase = (gatewayService, gatewayToken, state, dispatch) => {
+  const purchase = (gatewayService, backendSource, state, dispatch) => {
     const isQuickPurchase = !Array.isArray(order);
     const mappedOrderItems = isQuickPurchase ? [{
       sku_id: order.id,
@@ -18502,45 +18511,85 @@ const PaymentMethodContainerWithoutStripe = _ref => {
     const payment = new Payment(gatewayService);
     payment.execute({
       type: PAYMENT_TYPES.PURCHASE_ECOMMERCE_ORDER,
-      token: gatewayToken,
-      isExistingSource: Boolean(selectedPaymentMethodId),
+      token: backendSource,
+      isExistingSource: true,
       items: mappedOrderItems,
       addressId: selectedAddressId,
       couponCode
     }, (err, orderResponse) => {
-      var _window$Pelcro2, _window$Pelcro2$user, _window$Pelcro2$user$;
-      if (err) {
-        toggleAuthenticationSuccessPendingView(false);
-        dispatch({
-          type: DISABLE_SUBMIT,
-          payload: false
-        });
-        dispatch({
-          type: LOADING,
-          payload: false
-        });
-        onFailure(err);
-        return dispatch({
-          type: SHOW_ALERT,
-          payload: {
-            type: "error",
-            content: getErrorMessages(err)
+      var _res, _res$data4, _res$data4$payment_in;
+      if (((_res = res) === null || _res === void 0 ? void 0 : (_res$data4 = _res.data) === null || _res$data4 === void 0 ? void 0 : (_res$data4$payment_in = _res$data4.payment_intent) === null || _res$data4$payment_in === void 0 ? void 0 : _res$data4$payment_in.status) === "requires_action") {
+        confirmStripePaymentIntent(res);
+      } else {
+        var _window$Pelcro2, _window$Pelcro2$user, _window$Pelcro2$user$;
+        if (err) {
+          toggleAuthenticationSuccessPendingView(false);
+          dispatch({
+            type: DISABLE_SUBMIT,
+            payload: false
+          });
+          dispatch({
+            type: LOADING,
+            payload: false
+          });
+          onFailure(err);
+          return dispatch({
+            type: SHOW_ALERT,
+            payload: {
+              type: "error",
+              content: getErrorMessages(err)
+            }
+          });
+        }
+        if (isQuickPurchase) {
+          set({
+            order: null
+          });
+        } else {
+          set({
+            order: null,
+            cartItems: []
+          });
+        }
+        window.Pelcro.user.refresh({
+          auth_token: (_window$Pelcro2 = window.Pelcro) === null || _window$Pelcro2 === void 0 ? void 0 : (_window$Pelcro2$user = _window$Pelcro2.user) === null || _window$Pelcro2$user === void 0 ? void 0 : (_window$Pelcro2$user$ = _window$Pelcro2$user.read()) === null || _window$Pelcro2$user$ === void 0 ? void 0 : _window$Pelcro2$user$.auth_token
+        }, (err, res) => {
+          dispatch({
+            type: DISABLE_SUBMIT,
+            payload: false
+          });
+          dispatch({
+            type: LOADING,
+            payload: false
+          });
+          toggleAuthenticationSuccessPendingView(false);
+          if (err) {
+            onFailure(err);
+            return dispatch({
+              type: SHOW_ALERT,
+              payload: {
+                type: "error",
+                content: getErrorMessages(err)
+              }
+            });
           }
+          onSuccess(orderResponse);
         });
       }
-      if (isQuickPurchase) {
-        set({
-          order: null
-        });
+    });
+  };
+  const payInvoice = (gatewayService, backendSource, dispatch) => {
+    const payment = new Payment(gatewayService);
+    return payment.execute({
+      type: PAYMENT_TYPES.PAY_INVOICE,
+      token: backendSource,
+      isExistingSource: true,
+      invoiceId: invoice.id
+    }, (err, res) => {
+      var _res$data5, _res$data5$payment_in;
+      if ((res === null || res === void 0 ? void 0 : (_res$data5 = res.data) === null || _res$data5 === void 0 ? void 0 : (_res$data5$payment_in = _res$data5.payment_intent) === null || _res$data5$payment_in === void 0 ? void 0 : _res$data5$payment_in.status) === "requires_action") {
+        confirmStripePaymentIntent(res);
       } else {
-        set({
-          order: null,
-          cartItems: []
-        });
-      }
-      window.Pelcro.user.refresh({
-        auth_token: (_window$Pelcro2 = window.Pelcro) === null || _window$Pelcro2 === void 0 ? void 0 : (_window$Pelcro2$user = _window$Pelcro2.user) === null || _window$Pelcro2$user === void 0 ? void 0 : (_window$Pelcro2$user$ = _window$Pelcro2$user.read()) === null || _window$Pelcro2$user$ === void 0 ? void 0 : _window$Pelcro2$user$.auth_token
-      }, (err, res) => {
         dispatch({
           type: DISABLE_SUBMIT,
           payload: false
@@ -18549,7 +18598,6 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           type: LOADING,
           payload: false
         });
-        toggleAuthenticationSuccessPendingView(false);
         if (err) {
           onFailure(err);
           return dispatch({
@@ -18560,21 +18608,11 @@ const PaymentMethodContainerWithoutStripe = _ref => {
             }
           });
         }
-        onSuccess(orderResponse);
-      });
-    });
-  };
-  const payInvoice = (gatewayService, gatewayToken, dispatch) => {
-    const payment = new Payment(gatewayService);
-    return payment.execute({
-      type: PAYMENT_TYPES.PAY_INVOICE,
-      token: gatewayToken,
-      isExistingSource: Boolean(selectedPaymentMethodId),
-      invoiceId: invoice.id
-    }, (err, res) => {
-      confirmStripeCardPayment(res, err);
+        onSuccess(res);
+      }
     });
   };
+  console.log("trigger release");
   const updatePaymentSource = (state, dispatch) => {
     return stripe.createSource({
       type: "card"
@@ -18689,7 +18727,36 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         }, 0);
       };
       (_ref10 = (_ref11 = (_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 && _ref11 !== void 0 ? _ref11 : invoice === null || invoice === void 0 ? void 0 : invoice.amount_remaining) !== null && _ref10 !== void 0 ? _ref10 : getOrderItemsTotal();
-      return handlePayment(source);
+      return resolveTaxCalculation().then(res => window.Pelcro.source.create({
+        auth_token: window.Pelcro.user.read().auth_token,
+        token: source.id
+      }, (err, res) => {
+        var _res$data6, _res$data6$setup_inte;
+        if (((_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : (_res$data6$setup_inte = _res$data6.setup_intent) === null || _res$data6$setup_inte === void 0 ? void 0 : _res$data6$setup_inte.status) === "requires_action") {
+          confirmStripeIntentSetup(res);
+        } else {
+          var _res$data7;
+          if (err) {
+            onFailure(err);
+            dispatch({
+              type: DISABLE_SUBMIT,
+              payload: false
+            });
+            dispatch({
+              type: LOADING,
+              payload: false
+            });
+            return dispatch({
+              type: SHOW_ALERT,
+              payload: {
+                type: "error",
+                content: getErrorMessages(err)
+              }
+            });
+          }
+          return handlePayment((_res$data7 = res.data) === null || _res$data7 === void 0 ? void 0 : _res$data7.source);
+        }
+      }));
     }).catch(error => {
       return handlePaymentError(error);
     });
@@ -18717,12 +18784,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
         coupon_code: state === null || state === void 0 ? void 0 : state.couponCode,
         address_id: selectedAddressId
       }, (error, res) => {
-        var _res$data, _res$data2;
+        var _res$data8, _res$data9;
         if (error) {
           return reject(error);
         }
-        const taxAmount = (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.taxes;
-        const totalAmountWithTax = (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.total;
+        const taxAmount = (_res$data8 = res.data) === null || _res$data8 === void 0 ? void 0 : _res$data8.taxes;
+        const totalAmountWithTax = (_res$data9 = res.data) === null || _res$data9 === void 0 ? void 0 : _res$data9.total;
         resolve({
           totalAmountWithTax,
           taxAmount
@@ -18766,13 +18833,13 @@ const PaymentMethodContainerWithoutStripe = _ref => {
       }
     });
   };
-  const handlePayment = stripeSource => {
-    if (stripeSource && type === "createPayment") {
-      subscribe(stripeSource, state, dispatch);
-    } else if (stripeSource && type === "orderCreate") {
-      purchase(new StripeGateway(), stripeSource.id, state, dispatch);
-    } else if (stripeSource && type === "invoicePayment") {
-      payInvoice(new StripeGateway(), stripeSource.id);
+  const handlePayment = backendSource => {
+    if (backendSource && type === "createPayment") {
+      subscribe(backendSource, state, dispatch);
+    } else if (backendSource && type === "orderCreate") {
+      purchase(new StripeGateway(), backendSource.id, state, dispatch);
+    } else if (backendSource && type === "invoicePayment") {
+      payInvoice(new StripeGateway(), backendSource.id, dispatch);
     }
   };
   const handlePaymentError = error => {
@@ -18896,7 +18963,7 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           isLoading: true
         }, (state, dispatch) => {
           if (skipPayment && props !== null && props !== void 0 && props.freeOrders) {
-            return submitPayment(state);
+            return submitPayment(state, dispatch);
           }
           if (getSiteCardProcessor() === "vantiv") {
             return submitUsingVantiv(state);
@@ -18917,12 +18984,12 @@ const PaymentMethodContainerWithoutStripe = _ref => {
           if (type === "updatePaymentSource") {
             return updatePaymentSource(state, dispatch);
           }
-          submitPayment(state);
+          submitPayment(state, dispatch);
         });
       case HANDLE_PAYPAL_SUBSCRIPTION:
         return lib_5(state, (state, dispatch) => {
           if (type === "invoicePayment") {
-            payInvoice(new PaypalGateway(), action.payload);
+            payInvoice(new PaypalGateway(), action.payload, dispatch);
           } else {
             handlePaypalSubscription(state, action.payload);
           }

package/package.json

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