tf-checkout-react 1.6.6-beta.30 → 1.6.6-beta.31

package/dist/components/paymentContainer/index.d.ts

@@ -32,5 +32,6 @@ export interface IPaymentPage {
     isSinglePageCheckout?: boolean;
     stripePaymentProps?: Partial<ICheckoutForm>;
     stripePublishableKey?: string;
+    stripeAccountId?: string;
 }
-export declare const PaymentContainer: ({ paymentFields, handlePayment, formTitle, errorText, checkoutData, onErrorClose, onGetPaymentDataSuccess, onGetPaymentDataError, onPaymentError, themeOptions, elementsOptions, onCountdownFinish, enableTimer, enablePaymentPlan, orderInfoLabel, paymentInfoLabel, displayPaymentButton, hidePaymentForm, hideFieldsBlock, isSinglePageCheckout, stripePaymentProps, stripePublishableKey: stripePublishableKeyProps, }: IPaymentPage) => JSX.Element;
+export declare const PaymentContainer: ({ paymentFields, handlePayment, formTitle, errorText, checkoutData, onErrorClose, onGetPaymentDataSuccess, onGetPaymentDataError, onPaymentError, themeOptions, elementsOptions, onCountdownFinish, enableTimer, enablePaymentPlan, orderInfoLabel, paymentInfoLabel, displayPaymentButton, hidePaymentForm, hideFieldsBlock, isSinglePageCheckout, stripePaymentProps, stripePublishableKey, stripeAccountId, }: IPaymentPage) => JSX.Element;

package/dist/tf-checkout-react.cjs.development.js

@@ -5455,7 +5455,6 @@ var PaymentPlanSection = function PaymentPlanSection(props) {
   })))));
 };
 
-var publishableKey = CONFIGS.STRIPE_PUBLISHABLE_KEY || '';
 var initialPaymentPlanConfiguration = {
   requires_deposit: false,
   deposit: 0,
@@ -5541,7 +5540,8 @@ var PaymentContainer = function PaymentContainer(_ref) {
     isSinglePageCheckout = _ref$isSinglePageChec === void 0 ? false : _ref$isSinglePageChec,
     _ref$stripePaymentPro = _ref.stripePaymentProps,
     stripePaymentProps = _ref$stripePaymentPro === void 0 ? {} : _ref$stripePaymentPro,
-    stripePublishableKeyProps = _ref.stripePublishableKey;
+    stripePublishableKey = _ref.stripePublishableKey,
+    stripeAccountId = _ref.stripeAccountId;
   var _useState = React.useState(initialReviewValues),
     reviewData = _useState[0],
     setReviewData = _useState[1];
@@ -5699,6 +5699,7 @@ var PaymentContainer = function PaymentContainer(_ref) {
         });
         setPaymentDataIsLoading(false);
       }
+    } else {
       fetchPaymentData();
     }
   }, [orderData, hash, isSinglePageCheckout, onGetPaymentDataError, onGetPaymentDataSuccess]);
@@ -5750,15 +5751,18 @@ var PaymentContainer = function PaymentContainer(_ref) {
     }
     return showPaymentForm;
   };
+  var getPublishableKey = function getPublishableKey() {
+    return stripePublishableKey || _get(reviewData, 'payment_method.stripe_publishable_key');
+  };
   var getStripePromise = React.useCallback(function () {
-    var stripePublishableKey = stripePublishableKeyProps || _get(reviewData, 'payment_method.stripe_publishable_key') || publishableKey;
-    var stripeAccount = _get(reviewData, 'payment_method.stripe_connected_account');
+    var stripePublishableKey = getPublishableKey();
+    var stripeAccount = stripeAccountId || _get(reviewData, 'payment_method.stripe_connected_account');
     var options = {};
     if (stripeAccount) {
       options.stripeAccount = stripeAccount;
     }
     return stripeJs.loadStripe(stripePublishableKey, options);
-  }, [reviewData, stripePublishableKeyProps]);
+  }, [reviewData, stripePublishableKey]);
   var themeMui = styles.createTheme(themeOptions);
   var hasTableTypes = Boolean(Number(orderData.guest_count));
   var paymentFieldsData = hasTableTypes ? [{
@@ -5899,7 +5903,7 @@ var PaymentContainer = function PaymentContainer(_ref) {
     currency: currency,
     paymentPlanUseSavedCard: paymentPlanUseSavedCard,
     setPaymentPlanUseSavedCard: setPaymentPlanUseSavedCard
-  }), showPaymentForm() ? React__default.createElement("div", {
+  }), showPaymentForm() && !!getPublishableKey() ? React__default.createElement("div", {
     className: "payment_info"
   }, React__default.createElement("div", {
     className: "payment_info_label"
@@ -6227,7 +6231,7 @@ var LogicRunner = function LogicRunner(_ref) {
   return null;
 };
 var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
-  var _reviewData$payment_m, _checkoutUpdateData$a, _checkoutUpdateData$a2;
+  var _reviewData$payment_m, _checkoutUpdateData$a, _checkoutUpdateData$a2, _reviewData$payment_m2, _checkoutUpdateData$a3, _checkoutUpdateData$a4;
   var _ref4$data = _ref4.data,
     data = _ref4$data === void 0 ? [] : _ref4$data,
     _ref4$ticketHoldersFi = _ref4.ticketHoldersFields,
@@ -6902,6 +6906,7 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
     dataWithUniqueIds[0].label = 'Get Your Tables';
   }
   var stripePublishableKey = (reviewData == null ? void 0 : (_reviewData$payment_m = reviewData.payment_method) == null ? void 0 : _reviewData$payment_m.stripe_publishable_key) || (checkoutUpdateData == null ? void 0 : (_checkoutUpdateData$a = checkoutUpdateData.additional_payment_information) == null ? void 0 : (_checkoutUpdateData$a2 = _checkoutUpdateData$a.basic_config) == null ? void 0 : _checkoutUpdateData$a2.apiKey);
+  var stripeAccountId = (reviewData == null ? void 0 : (_reviewData$payment_m2 = reviewData.payment_method) == null ? void 0 : _reviewData$payment_m2.stripe_connected_account) || (checkoutUpdateData == null ? void 0 : (_checkoutUpdateData$a3 = checkoutUpdateData.additional_payment_information) == null ? void 0 : (_checkoutUpdateData$a4 = _checkoutUpdateData$a3.basic_config) == null ? void 0 : _checkoutUpdateData$a4.accountId);
   return React__default.createElement(styles.ThemeProvider, {
     theme: themeMui
   }, (loading || cardLoading || isCountriesLoading || isConfigLoading) && React__default.createElement(Backdrop, {
@@ -6933,7 +6938,7 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
     enableReinitialize: false,
     onSubmit: function () {
       var _onSubmit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(values, formikHelpers) {
-        var checkoutBodyForRegistration, bodyFormData, resRegister, _xtfCookie, refreshToken, userProfile, hasUnverifiedOrder, message, profileData, profileSpecifiedData, profileDataObj, userDataObj, checkoutBody, checkoutResponse, checkoutUpdateResponse, paymentResponse, _checkoutResponse$dat, hash, total, paymentDataResponse, _cart$, attributes, order_details, cart, _order_details$ticket, ticket, updatedOrderData, isFreeTickets, paymentMethod, paymentPlanAvailable, card, paymentMethodReq, _hasUnverifiedOrder, _message, _e$response, event;
+        var stripePaymentMethod, card, stripePaymentMethodResponse, _stripePaymentMethodR, checkoutBodyForRegistration, bodyFormData, resRegister, _xtfCookie, refreshToken, userProfile, hasUnverifiedOrder, message, profileData, profileSpecifiedData, profileDataObj, userDataObj, checkoutBody, checkoutResponse, checkoutUpdateResponse, paymentResponse, _checkoutResponse$dat, hash, total, paymentDataResponse, _cart$, attributes, order_details, cart, _order_details$ticket, ticket, updatedOrderData, isFreeTickets, paymentMethod, paymentPlanAvailable, confirmationResult, _confirmationResult$e, _hasUnverifiedOrder, _message, _e$response, event;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
@@ -6945,6 +6950,33 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
               setError('Fill in the card details');
               return _context9.abrupt("return");
             case 4:
+              stripePaymentMethod = null;
+              if (!(isSinglePageCheckout && !orderIsFree)) {
+                _context9.next = 14;
+                break;
+              }
+              card = cardRef.current;
+              _context9.next = 9;
+              return stripeRef.current.createPaymentMethod({
+                type: 'card',
+                card: card || {
+                  token: ''
+                },
+                billing_details: {
+                  address: addressRef.current
+                }
+              });
+            case 9:
+              stripePaymentMethodResponse = _context9.sent;
+              if (!(stripePaymentMethodResponse != null && stripePaymentMethodResponse.error)) {
+                _context9.next = 13;
+                break;
+              }
+              setError('' + (stripePaymentMethodResponse == null ? void 0 : (_stripePaymentMethodR = stripePaymentMethodResponse.error) == null ? void 0 : _stripePaymentMethodR.message));
+              return _context9.abrupt("return");
+            case 13:
+              stripePaymentMethod = stripePaymentMethodResponse.paymentMethod;
+            case 14:
               if (isBrowser) {
                 window.localStorage.setItem('extraData', JSON.stringify({
                   data_capture: {
@@ -6956,7 +6988,7 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
                 }));
               }
               if (isLoggedIn) {
-                _context9.next = 27;
+                _context9.next = 37;
                 break;
               }
               checkoutBodyForRegistration = createCheckoutDataBody(ticketsQuantity.length, values, {
@@ -6965,11 +6997,11 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
                 lastNameLogged: lastNameLogged
               }, showDOB);
               bodyFormData = createRegisterFormData(values, checkoutBodyForRegistration, flagFreeTicket);
-              _context9.prev = 8;
+              _context9.prev = 18;
               setLoading(true);
-              _context9.next = 12;
+              _context9.next = 22;
               return register(bodyFormData);
-            case 12:
+            case 22:
               resRegister = _context9.sent;
               _xtfCookie = _get(resRegister, 'headers.x-tf-ecommerce');
               refreshToken = _get(resRegister, 'data.attributes.refresh_token');
@@ -6980,11 +7012,11 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
                 refreshToken: refreshToken,
                 userProfile: userProfile
               });
-              _context9.next = 27;
+              _context9.next = 37;
               break;
-            case 20:
-              _context9.prev = 20;
-              _context9.t0 = _context9["catch"](8);
+            case 30:
+              _context9.prev = 30;
+              _context9.t0 = _context9["catch"](18);
               setLoading(false);
               hasUnverifiedOrder = _get(_context9.t0, 'response.data.data.hasUnverifiedOrder');
               message = _get(_context9.t0, 'response.data.message', {});
@@ -7009,10 +7041,10 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
                 onRegisterError(_context9.t0, values.email);
               }
               return _context9.abrupt("return");
-            case 27:
-              _context9.next = 29;
+            case 37:
+              _context9.next = 39;
               return getProfileData();
-            case 29:
+            case 39:
               profileData = _context9.sent;
               profileSpecifiedData = _get(profileData, 'data');
               profileDataObj = setLoggedUserData(profileSpecifiedData);
@@ -7027,21 +7059,21 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
               if (isSinglePageCheckout) {
                 checkoutBody.attributes.add_ons = singleCheckoutAddons;
               }
-              _context9.next = 39;
+              _context9.next = 49;
               return postOnCheckout(checkoutBody, flagFreeTicket);
-            case 39:
+            case 49:
               checkoutResponse = _context9.sent;
-              _context9.next = 42;
+              _context9.next = 52;
               return updateCheckout({
                 attributes: {
                   event_id: eventId
                 }
               });
-            case 42:
+            case 52:
               checkoutUpdateResponse = _context9.sent;
               paymentResponse = null;
               if (!isSinglePageCheckout) {
-                _context9.next = 68;
+                _context9.next = 81;
                 break;
               }
               _checkoutResponse$dat = checkoutResponse.data.attributes, hash = _checkoutResponse$dat.hash, total = _checkoutResponse$dat.total;
@@ -7049,12 +7081,12 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
                 hash: hash,
                 total: total
               }));
-              _context9.next = 49;
+              _context9.next = 59;
               return getPaymentData(String(hash));
-            case 49:
+            case 59:
               paymentDataResponse = _context9.sent;
               if (!paymentDataResponse.success) {
-                _context9.next = 68;
+                _context9.next = 81;
                 break;
               }
               attributes = paymentDataResponse.data.attributes;
@@ -7081,28 +7113,30 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
               paymentMethod = attributes.payment_method || {};
               paymentPlanAvailable = paymentMethod.stripe_payment_plan_enabled;
               if (isFreeTickets) {
-                _context9.next = 66;
+                _context9.next = 79;
                 break;
               }
-              card = cardRef.current;
-              _context9.next = 63;
-              return stripeRef.current.createPaymentMethod({
-                type: 'card',
-                card: card || {
-                  token: ''
-                },
-                billing_details: {
-                  address: addressRef.current
-                }
-              });
-            case 63:
-              paymentMethodReq = _context9.sent;
-              _context9.next = 66;
+              if (stripePaymentMethod) {
+                _context9.next = 73;
+                break;
+              }
+              setError('Fill in the card details');
+              return _context9.abrupt("return");
+            case 73:
+              _context9.next = 75;
               return stripeRef.current.confirmCardPayment(paymentMethod.stripe_client_secret, {
-                payment_method: paymentMethodReq.paymentMethod.id
+                payment_method: stripePaymentMethod.id
               });
-            case 66:
-              _context9.next = 68;
+            case 75:
+              confirmationResult = _context9.sent;
+              if (!(confirmationResult != null && confirmationResult.error)) {
+                _context9.next = 79;
+                break;
+              }
+              setError('' + (confirmationResult == null ? void 0 : (_confirmationResult$e = confirmationResult.error) == null ? void 0 : _confirmationResult$e.message));
+              return _context9.abrupt("return");
+            case 79:
+              _context9.next = 81;
               return handlePaymentMiddleWare(null, {}, {
                 reviewData: attributes,
                 isFreeTickets: isFreeTickets,
@@ -7120,13 +7154,13 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
                   throw error;
                 }
               });
-            case 68:
+            case 81:
               removeReferralKey();
               handleSubmit(values, formikHelpers, eventId, checkoutResponse, checkoutUpdateResponse, paymentResponse);
-              _context9.next = 79;
+              _context9.next = 92;
               break;
-            case 72:
-              _context9.prev = 72;
+            case 85:
+              _context9.prev = 85;
               _context9.t1 = _context9["catch"](0);
               setLoading(false);
               onSubmitError(_context9.t1);
@@ -7153,15 +7187,15 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
                 }
                 onSubmitError(_context9.t1);
               }
-            case 79:
-              _context9.prev = 79;
+            case 92:
+              _context9.prev = 92;
               setLoading(false);
-              return _context9.finish(79);
-            case 82:
+              return _context9.finish(92);
+            case 95:
             case "end":
               return _context9.stop();
           }
-        }, _callee9, null, [[0, 72, 79, 82], [8, 20]]);
+        }, _callee9, null, [[0, 85, 92, 95], [18, 30]]);
       }));
       function onSubmit(_x3, _x4) {
         return _onSubmit.apply(this, arguments);
@@ -7319,6 +7353,7 @@ var BillingInfoContainer = /*#__PURE__*/React__default.memo(function (_ref4) {
       }));
     })), isSinglePageCheckout && !orderIsFree && stripePublishableKey && React__default.createElement(PaymentContainer, {
       stripePublishableKey: stripePublishableKey,
+      stripeAccountId: stripeAccountId,
       formTitle: "Payment Information",
       orderInfoLabel: "",
       enableTimer: false,