tf-checkout-react 1.0.50 → 1.0.54

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

@@ -18,12 +18,14 @@ var Modal = _interopDefault(require('@mui/material/Modal'));
 var Box = _interopDefault(require('@mui/material/Box'));
 var _forEach = _interopDefault(require('lodash/forEach'));
 var _flatMapDeep = _interopDefault(require('lodash/flatMapDeep'));
+var _isArray = _interopDefault(require('lodash/isArray'));
+var nanoid = require('nanoid');
 var TextField = _interopDefault(require('@mui/material/TextField'));
 var styles = require('@mui/styles');
 var FormGroup = _interopDefault(require('@mui/material/FormGroup'));
 var FormControlLabel = _interopDefault(require('@mui/material/FormControlLabel'));
 var Checkbox = _interopDefault(require('@mui/material/Checkbox'));
-var nanoid = require('nanoid');
+var Select = _interopDefault(require('@mui/material/Select'));
 var Container = _interopDefault(require('@mui/material/Container'));
 var Alert = _interopDefault(require('@mui/material/Alert'));
 var reactStripeJs = require('@stripe/react-stripe-js');
@@ -39,7 +41,6 @@ var _sortBy = _interopDefault(require('lodash/sortBy'));
 var _has = _interopDefault(require('lodash/has'));
 var FormControl = _interopDefault(require('@mui/material/FormControl'));
 var MenuItem = _interopDefault(require('@mui/material/MenuItem'));
-var Select = _interopDefault(require('@mui/material/Select'));
 var Button$1 = _interopDefault(require('@mui/material/Button'));
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
@@ -96,6 +97,22 @@ function _extends() {
   return _extends.apply(this, arguments);
 }
 
+function _inheritsLoose(subClass, superClass) {
+  subClass.prototype = Object.create(superClass.prototype);
+  subClass.prototype.constructor = subClass;
+
+  _setPrototypeOf(subClass, superClass);
+}
+
+function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+    o.__proto__ = p;
+    return o;
+  };
+
+  return _setPrototypeOf(o, p);
+}
+
 function _objectWithoutPropertiesLoose(source, excluded) {
   if (source == null) return {};
   var target = {};
@@ -1509,7 +1526,7 @@ var getInitialValues = function getInitialValues(data, propsInitialValues, userV
 
   return initialValues;
 };
-var createRegisterFormData = function createRegisterFormData(values) {
+var createRegisterFormData = function createRegisterFormData(values, checkoutBody) {
   if (values === void 0) {
     values = {};
   }
@@ -1522,6 +1539,11 @@ var createRegisterFormData = function createRegisterFormData(values) {
   bodyFormData.append('password_confirmation', values.confirmPassword);
   bodyFormData.append('client_id', ENV.CLIENT_ID );
   bodyFormData.append('client_secret', ENV.CLIENT_SECRET );
+
+  _forEach(checkoutBody.attributes, function (item, key) {
+    bodyFormData.append(key, item);
+  });
+
   return bodyFormData;
 };
 var setLoggedUserData = function setLoggedUserData(data) {
@@ -1530,6 +1552,7 @@ var setLoggedUserData = function setLoggedUserData(data) {
     first_name: data.firstName,
     last_name: data.lastName,
     email: data.email,
+    confirmEmail: data.email,
     city: (data == null ? void 0 : data.city) || '',
     country: (data == null ? void 0 : data.country) || '',
     phone: (data == null ? void 0 : data.phone) || '',
@@ -1610,6 +1633,38 @@ var createCheckoutDataBody = function createCheckoutDataBody(ticketsQuantity, va
 
   return body;
 };
+var getValidateFunctions = function getValidateFunctions(element, states) {
+  var validationFunctions = [];
+
+  if (element.required) {
+    if (element.name !== 'state' || element.name === 'state' && states.length) {
+      validationFunctions.push(requiredValidator);
+    }
+  }
+
+  if (element.onValidate) {
+    validationFunctions.push(element.onValidate);
+  }
+
+  return combineValidators.apply(void 0, validationFunctions);
+};
+var assingUniqueIds = function assingUniqueIds(data) {
+  if (_get(data[0], 'uniqueId')) {
+    return data;
+  }
+
+  return _map(data, function (item) {
+    _forEach(item, function (itemValue, key) {
+      if (_isArray(itemValue)) {
+        item[key] = assingUniqueIds(itemValue);
+      }
+    });
+
+    return _extends({}, item, {
+      uniqueId: nanoid.nanoid()
+    });
+  });
+};
 
 var useStyles = /*#__PURE__*/styles.makeStyles({
   input: {
@@ -1628,13 +1683,13 @@ var CustomField = function CustomField(_ref) {
       _ref$form = _ref.form,
       touched = _ref$form.touched,
       errors = _ref$form.errors,
+      submitCount = _ref$form.submitCount,
       theme = _ref.theme;
   var isSelectField = type === 'select';
-  var isShrink = Boolean(field.value) || type === 'date' || type === 'select';
-  var isTouched = Boolean(_get(touched, field.name));
 
   var error = _get(errors, field.name);
 
+  var isTouched = Boolean(_get(touched, field.name)) || _includes(field.name, 'holder') && !!error && !!submitCount;
   var classes = useStyles();
   return React__default.createElement(TextField, Object.assign({
     id: field.name,
@@ -1644,9 +1699,6 @@ var CustomField = function CustomField(_ref) {
     fullWidth: true,
     error: !!error && isTouched,
     helperText: isTouched && error,
-    InputLabelProps: {
-      shrink: isShrink
-    },
     InputProps: {
       classes: {
         input: classes.input
@@ -1697,6 +1749,102 @@ var getQueryVariable = function getQueryVariable(variable) {
   return false;
 };
 
+var useStyles$1 = /*#__PURE__*/styles.makeStyles({
+  input: {
+    '&::placeholder': {
+      color: 'gray'
+    }
+  }
+});
+var SelectField = function SelectField(_ref) {
+  var label = _ref.label,
+      _ref$type = _ref.type,
+      type = _ref$type === void 0 ? 'text' : _ref$type,
+      field = _ref.field,
+      _ref$selectOptions = _ref.selectOptions,
+      selectOptions = _ref$selectOptions === void 0 ? [] : _ref$selectOptions,
+      _ref$form = _ref.form,
+      touched = _ref$form.touched,
+      errors = _ref$form.errors,
+      theme = _ref.theme;
+  var isTouched = Boolean(_get(touched, field.name));
+
+  var error = _get(errors, field.name);
+
+  var classes = useStyles$1();
+  return React__default.createElement(material.FormControl, {
+    fullWidth: true
+  }, React__default.createElement(material.InputLabel, {
+    htmlFor: field.name,
+    error: !!error && isTouched,
+    shrink: true
+  }, label), React__default.createElement(Select, Object.assign({
+    id: field.name,
+    label: label,
+    type: type,
+    fullWidth: true,
+    error: !!error && isTouched,
+    inputProps: {
+      id: field.name,
+      classes: {
+        input: classes.input
+      }
+    },
+    "native": true,
+    className: theme,
+    MenuProps: {
+      className: theme
+    }
+  }, field), _map(selectOptions, function (option) {
+    return React__default.createElement("option", {
+      key: option.value,
+      value: option.value,
+      disabled: option.disabled
+    }, option.label);
+  })), isTouched && error ? React__default.createElement(material.FormHelperText, {
+    error: !!error && isTouched
+  }, error) : null);
+};
+
+var ErrorFocusInternal = /*#__PURE__*/function (_Component) {
+  _inheritsLoose(ErrorFocusInternal, _Component);
+
+  function ErrorFocusInternal() {
+    var _this;
+
+    _this = _Component.apply(this, arguments) || this;
+
+    _this.render = function () {
+      return null;
+    };
+
+    return _this;
+  }
+
+  var _proto = ErrorFocusInternal.prototype;
+
+  _proto.componentDidUpdate = function componentDidUpdate(prevProps) {
+    var _prevProps$formik = prevProps.formik,
+        isSubmitting = _prevProps$formik.isSubmitting,
+        isValidating = _prevProps$formik.isValidating,
+        errors = _prevProps$formik.errors;
+    var keys = Object.keys(errors);
+
+    if (keys.length > 0 && isSubmitting && !isValidating) {
+      var selector = "[name=\"" + keys[0] + "\"]";
+      var errorElement = document.querySelector(selector);
+
+      if (errorElement) {
+        errorElement.focus();
+      }
+    }
+  };
+
+  return ErrorFocusInternal;
+}(React.Component);
+
+var ErrorFocus = /*#__PURE__*/formik.connect(ErrorFocusInternal);
+
 var LogicRunner = function LogicRunner(_ref) {
   var values = _ref.values,
       setStates = _ref.setStates,
@@ -1768,7 +1916,7 @@ var LogicRunner = function LogicRunner(_ref) {
               lastName: parsedData == null ? void 0 : parsedData.last_name,
               email: (parsedData == null ? void 0 : parsedData.email) || '',
               phone: (parsedData == null ? void 0 : parsedData.phone) || '',
-              confirmEmail: '',
+              confirmEmail: (parsedData == null ? void 0 : parsedData.email) || '',
               state: (parsedData == null ? void 0 : parsedData.state) || '',
               street_address: (parsedData == null ? void 0 : parsedData.street_address) || '',
               country: (parsedData == null ? void 0 : parsedData.country) || 1,
@@ -1837,39 +1985,43 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
   var userData = typeof window !== 'undefined' && window.localStorage.getItem('user_data') ? JSON.parse(window.localStorage.getItem('user_data') || '') : {};
   var access_token = typeof window !== 'undefined' && window.localStorage.getItem('access_token') ? window.localStorage.getItem('access_token') || '' : '';
 
-  var _useState = React.useState({}),
-      cartInfoData = _useState[0],
-      setCartInfo = _useState[1];
+  var _useState = React.useState(data),
+      dataWithUniqueIds = _useState[0],
+      setDataWithUniqueIds = _useState[1];
 
-  var _useState2 = React.useState([]),
-      countries = _useState2[0],
-      setCountries = _useState2[1];
+  var _useState2 = React.useState({}),
+      cartInfoData = _useState2[0],
+      setCartInfo = _useState2[1];
 
   var _useState3 = React.useState([]),
-      states = _useState3[0],
-      setStates = _useState3[1];
+      countries = _useState3[0],
+      setCountries = _useState3[1];
 
-  var _useState4 = React.useState(false),
-      showModalLogin = _useState4[0],
-      setShowModalLogin = _useState4[1];
+  var _useState4 = React.useState([]),
+      states = _useState4[0],
+      setStates = _useState4[1];
 
   var _useState5 = React.useState(false),
-      alreadyHasUser = _useState5[0],
-      setAlreadyHasUser = _useState5[1];
+      showModalLogin = _useState5[0],
+      setShowModalLogin = _useState5[1];
 
   var _useState6 = React.useState(false),
-      userExpired = _useState6[0],
-      setUserExpired = _useState6[1];
+      alreadyHasUser = _useState6[0],
+      setAlreadyHasUser = _useState6[1];
 
   var _useState7 = React.useState(false),
-      showModalRegister = _useState7[0],
-      setShowModalRegister = _useState7[1];
+      userExpired = _useState7[0],
+      setUserExpired = _useState7[1];
 
-  var _useState8 = React.useState([]),
-      ticketsQuantity = _useState8[0],
-      setTicketsQuantity = _useState8[1];
+  var _useState8 = React.useState(false),
+      showModalRegister = _useState8[0],
+      setShowModalRegister = _useState8[1];
 
-  var _useState9 = React.useState({
+  var _useState9 = React.useState([]),
+      ticketsQuantity = _useState9[0],
+      setTicketsQuantity = _useState9[1];
+
+  var _useState10 = React.useState({
     firstName: '',
     lastName: '',
     email: '',
@@ -1884,8 +2036,8 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
     state: '',
     zip: ''
   }),
-      userValues = _useState9[0],
-      setUserValues = _useState9[1];
+      userValues = _useState10[0],
+      setUserValues = _useState10[1];
 
   var isLoggedIn = !!access_token;
 
@@ -1901,7 +2053,11 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
 
   var optedInFieldValue = _get(cartInfoData, 'optedIn', false);
 
-  var hideOptIn = _get(cartInfoData, 'hide_ttf_opt_in', false);
+  var hideTtfOptIn = _get(cartInfoData, 'hide_ttf_opt_in', true);
+
+  if (!_get(dataWithUniqueIds, '[0].uniqueId')) {
+    setDataWithUniqueIds(assingUniqueIds(data));
+  }
 
   var getQuantity = function getQuantity(cart) {
     if (cart === void 0) {
@@ -2068,7 +2224,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
     fetchUserData(access_token);
   }, [access_token]);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(formik.Formik, {
-    initialValues: getInitialValues(data, _extends({}, initialValues, {
+    initialValues: getInitialValues(dataWithUniqueIds, _extends({}, initialValues, {
       email: emailLogged,
       firstName: firstNameLogged,
       lastName: lastNameLogged,
@@ -2078,7 +2234,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
     enableReinitialize: true,
     onSubmit: function () {
       var _onSubmit = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5(values, formikHelpers) {
-        var updatedUserData, _profileSpecifiedData, _profileDataObj, _checkoutBody, _res, bodyFormData, access_token_register, resRegister, refreshToken, tokens, _e$response, _e$response$data, error, profileData, profileSpecifiedData, profileDataObj, checkoutBody, res, _e$response2;
+        var updatedUserData, _profileSpecifiedData, _profileDataObj, _checkoutBody, _res, checkoutBodyForRegistration, bodyFormData, access_token_register, resRegister, refreshToken, tokens, _e$response, _e$response$data, error, profileData, profileSpecifiedData, profileDataObj, checkoutBody, res, _e$response2;
 
         return runtime_1.wrap(function _callee5$(_context5) {
           while (1) {
@@ -2123,13 +2279,18 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
                 return _context5.abrupt("return");
 
               case 15:
-                bodyFormData = createRegisterFormData(values);
+                checkoutBodyForRegistration = createCheckoutDataBody(ticketsQuantity.length, values, {
+                  emailLogged: emailLogged,
+                  firstNameLogged: firstNameLogged,
+                  lastNameLogged: lastNameLogged
+                }, showDOB);
+                bodyFormData = createRegisterFormData(values, checkoutBodyForRegistration);
                 access_token_register = null;
-                _context5.prev = 17;
-                _context5.next = 20;
+                _context5.prev = 18;
+                _context5.next = 21;
                 return register(bodyFormData);
 
-              case 20:
+              case 21:
                 resRegister = _context5.sent;
                 access_token_register = _get(resRegister, 'data.data.attributes.access_token');
                 refreshToken = _get(resRegister, 'data.data.attributes.refresh_token');
@@ -2139,12 +2300,12 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
                   refreshToken: refreshToken
                 };
                 onRegisterSuccess(tokens);
-                _context5.next = 32;
+                _context5.next = 33;
                 break;
 
-              case 28:
-                _context5.prev = 28;
-                _context5.t0 = _context5["catch"](17);
+              case 29:
+                _context5.prev = 29;
+                _context5.t0 = _context5["catch"](18);
 
                 if (axios.isAxiosError(_context5.t0)) {
                   error = _context5.t0 == null ? void 0 : (_e$response = _context5.t0.response) == null ? void 0 : (_e$response$data = _e$response.data) == null ? void 0 : _e$response$data.message;
@@ -2168,11 +2329,11 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
 
                 return _context5.abrupt("return");
 
-              case 32:
-                _context5.next = 34;
+              case 33:
+                _context5.next = 35;
                 return getProfileData(access_token_register);
 
-              case 34:
+              case 35:
                 profileData = _context5.sent;
                 profileSpecifiedData = _get(profileData, 'data.data');
                 profileDataObj = setLoggedUserData(profileSpecifiedData);
@@ -2186,17 +2347,17 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
                   firstNameLogged: firstNameLogged,
                   lastNameLogged: lastNameLogged
                 }, showDOB);
-                _context5.next = 41;
+                _context5.next = 42;
                 return postOnCheckout(checkoutBody, access_token_register);
 
-              case 41:
+              case 42:
                 res = _context5.sent;
                 handleSubmit(values, formikHelpers, eventId, res);
-                _context5.next = 48;
+                _context5.next = 49;
                 break;
 
-              case 45:
-                _context5.prev = 45;
+              case 46:
+                _context5.prev = 46;
                 _context5.t1 = _context5["catch"](0);
 
                 if (axios.isAxiosError(_context5.t1)) {
@@ -2212,12 +2373,12 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
                   onSubmitError(_context5.t1);
                 }
 
-              case 48:
+              case 49:
               case "end":
                 return _context5.stop();
             }
           }
-        }, _callee5, null, [[0, 45], [17, 28]]);
+        }, _callee5, null, [[0, 46], [18, 29]]);
       }));
 
       function onSubmit(_x2, _x3) {
@@ -2229,7 +2390,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
   }, function (props) {
     return React__default.createElement(formik.Form, {
       onSubmit: props.handleSubmit
-    }, React__default.createElement(LogicRunner, {
+    }, React__default.createElement(ErrorFocus, null), React__default.createElement(LogicRunner, {
       values: props.values,
       setStates: setStates,
       setFieldValue: props.setFieldValue,
@@ -2250,7 +2411,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
         onLogin();
         setShowModalLogin(true);
       }
-    }, "Login"))), _map(data, function (item) {
+    }, "Login"))), _map(dataWithUniqueIds, function (item) {
       var label = item.label,
           labelClassName = item.labelClassName,
           fields = item.fields;
@@ -2260,7 +2421,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
       }
 
       return React__default.createElement(React__default.Fragment, {
-        key: nanoid.nanoid()
+        key: item.uniqueId
       }, React__default.createElement("p", {
         className: labelClassName
       }, label), _map(fields, function (group) {
@@ -2269,7 +2430,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
             groupLabel = group.groupLabel,
             groupLabelClassName = group.groupLabelClassName;
         return React__default.createElement(React__default.Fragment, {
-          key: nanoid.nanoid()
+          key: group.uniqueId
         }, !isLoggedIn && React__default.createElement("div", {
           className: groupLabelClassName
         }, groupLabel), React__default.createElement("div", {
@@ -2287,47 +2448,45 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
             return false;
           }
 
-          if (el.name === 'brand_opt_in' && hideOptIn) {
+          if (el.name === 'ttf_opt_in' && hideTtfOptIn) {
             return false;
           }
 
           return true;
         }), function (element) {
           return ['password', 'confirmPassword'].includes(element.name) && isLoggedIn ? null : React__default.createElement(React__default.Fragment, {
-            key: nanoid.nanoid()
+            key: element.uniqueId
           }, element.name === 'email' ? React__default.createElement("div", {
             className: "email-checking"
-          }, "IMPORTANT: Please double check that your email address is correct. It's where we send your confirmation and e-tickets to!") : null, React__default.createElement("div", {
+          }, "IMPORTANT: Please double check that your\n                                        email address is correct. It's where we\n                                        send your confirmation and e-tickets to!") : null, React__default.createElement("div", {
             className: element.className
           }, element.component ? element.component : React__default.createElement(formik.Field, {
             name: element.name,
             label: element.label,
             type: element.type,
-            validate: combineValidators(element.required ? requiredValidator : function () {}, element.onValidate ? element.onValidate : function () {}),
-            component: element.type === 'checkbox' ? CheckboxField : CustomField,
+            validate: getValidateFunctions(element, states),
+            component: element.type === 'checkbox' ? CheckboxField : element.type === 'select' ? SelectField : CustomField,
             selectOptions: element.name === 'country' ? countries : element.name === 'state' ? states : [],
             theme: theme
           })));
         })));
       }));
-    }), showTicketHolderName && React__default.createElement(React__default.Fragment, {
-      key: nanoid.nanoid()
-    }, React__default.createElement("div", {
+    }), showTicketHolderName && React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
       className: "ticket-holders-fields"
     }, React__default.createElement("p", null, ticketHoldersFields.label), _map(ticketsQuantity, function (_item, index) {
       return React__default.createElement("div", {
-        key: nanoid.nanoid()
+        key: _item
       }, React__default.createElement("h5", null, "Ticket ", index + 1), _map(ticketHoldersFields.fields, function (group) {
         var groupClassname = group.groupClassname,
             groupItems = group.groupItems;
         return React__default.createElement("div", {
-          key: nanoid.nanoid()
+          key: group.uniqueId
         }, React__default.createElement("div", {
           className: groupClassname
         }, _map(groupItems, function (element) {
           return React__default.createElement("div", {
             className: element.className,
-            key: nanoid.nanoid()
+            key: element.uniqueId
           }, React__default.createElement(formik.Field, {
             name: element.name + "-" + index,
             label: element.label,
@@ -2339,8 +2498,7 @@ var BillingInfoContainer = function BillingInfoContainer(_ref3) {
         })));
       }));
     }))), React__default.createElement("div", {
-      className: "button-container",
-      key: nanoid.nanoid()
+      className: "button-container"
     }, React__default.createElement(LoadingButton, {
       type: "submit",
       variant: "contained",
@@ -2490,6 +2648,14 @@ var CheckoutForm = function CheckoutForm(_ref) {
       stripeError = _useState2[0],
       setStripeError = _useState2[1];
 
+  var _useState3 = React.useState([]),
+      checkboxes = _useState3[0],
+      setCheckboxes = _useState3[1];
+
+  var _useState4 = React.useState(false),
+      allowSubmit = _useState4[0],
+      setAllowSubmit = _useState4[1];
+
   var handleSubmit = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(event) {
       var card, address, paymentMethodReq, _yield$stripe$confirm, _error;
@@ -2595,6 +2761,17 @@ var CheckoutForm = function CheckoutForm(_ref) {
     };
   }();
 
+  var handleCheckboxes = function handleCheckboxes(e) {
+    var checkbox = e.target;
+    var updatedCheckedState = checkboxes.map(function (item) {
+      var value = item.id === checkbox.name ? !item.checked : item.checked;
+      return _extends({}, item, {
+        checked: value
+      });
+    });
+    setCheckboxes(updatedCheckedState);
+  };
+
   var onChangePostalCode = function onChangePostalCode(e) {
     setPostalCode(e.target.value);
   };
@@ -2608,6 +2785,19 @@ var CheckoutForm = function CheckoutForm(_ref) {
       zipCode && setPostalCode(zipCode);
     }
   }, []);
+  React.useEffect(function () {
+    if (conditions.length) {
+      setCheckboxes(conditions);
+    }
+  }, [conditions]);
+  React.useEffect(function () {
+    if (checkboxes.length) {
+      var allChecked = checkboxes.every(function (item) {
+        return (item == null ? void 0 : item.checked) === true;
+      });
+      setAllowSubmit(allChecked);
+    }
+  }, [checkboxes]);
   var buttonIsDiabled = !stripe || !!error || isLoading;
   return React__default.createElement("div", {
     className: "stripe_payment_container"
@@ -2648,7 +2838,7 @@ var CheckoutForm = function CheckoutForm(_ref) {
     value: postalCode,
     onChange: onChangePostalCode,
     placeholder: "ZIP"
-  }))), conditions == null ? void 0 : conditions.map(function (checkbox) {
+  }))), checkboxes == null ? void 0 : checkboxes.map(function (checkbox) {
     return React__default.createElement("div", {
       className: 'billing-info-container__singleField',
       key: checkbox.id
@@ -2657,10 +2847,12 @@ var CheckoutForm = function CheckoutForm(_ref) {
     }, React__default.createElement(CheckboxField, {
       name: checkbox.id,
       label: checkbox.text,
-      required: true
+      required: true,
+      onChange: handleCheckboxes,
+      checked: checkbox.checked
     })));
   }), React__default.createElement("div", {
-    className: "payment_button " + (buttonIsDiabled ? 'disabled-payment-button' : '')
+    className: "payment_button " + (buttonIsDiabled || !allowSubmit ? 'disabled-payment-button' : '')
   }, React__default.createElement("button", {
     disabled: buttonIsDiabled,
     type: "submit"
@@ -2802,7 +2994,8 @@ var PaymentContainer = function PaymentContainer(_ref) {
                 setConditions(conditionsInfo ? conditionsInfo.map(function (item) {
                   return {
                     id: nanoid.nanoid(),
-                    text: item
+                    text: item,
+                    checked: false
                   };
                 }) : []);
 
@@ -3283,25 +3476,24 @@ var WaitingList = function WaitingList(_ref) {
                 setShowSuccessMessage(true);
               }
 
-              _context.next = 14;
+              _context.next = 13;
               break;
 
             case 11:
               _context.prev = 11;
               _context.t0 = _context["catch"](0);
-              console.log(_context.t0);
 
-            case 14:
-              _context.prev = 14;
+            case 13:
+              _context.prev = 13;
               setLoading(false);
-              return _context.finish(14);
+              return _context.finish(13);
 
-            case 17:
+            case 16:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[0, 11, 14, 17]]);
+      }, _callee, null, [[0, 11, 13, 16]]);
     }));
 
     return function handleSubmit(_x) {
@@ -3322,7 +3514,7 @@ var WaitingList = function WaitingList(_ref) {
       email: ''
     },
     onSubmit: handleSubmit
-  }, React__default.createElement(formik.Form, null, showTicketsField && React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
+  }, React__default.createElement(formik.Form, null, React__default.createElement(ErrorFocus, null), showTicketsField && React__default.createElement(React__default.Fragment, null, React__default.createElement("div", {
     className: "field-item"
   }, React__default.createElement(formik.Field, {
     name: "ticketTypeId",