tf-checkout-react 1.3.24 → 1.3.26

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.24",
+  "version": "1.3.26",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/addonsContainer/index.tsx

@@ -2,9 +2,10 @@
 
 import { CircularProgress } from '@mui/material'
 import { Form, Formik } from 'formik'
+import { isEqual } from 'lodash'
 import _get from 'lodash/get'
 import _identity from 'lodash/identity'
-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 
 import {
   getAddons,
@@ -42,6 +43,7 @@ export interface IAddonContainterProps {
   onConfirmSelectionSuccess?: (res: any) => void;
   onConfirmSelectionError?: (error: any) => void;
   onCountdownFinish?: () => void;
+  samePageBilling?: boolean;
 }
 
 export interface ObjectLiteral {
@@ -59,7 +61,9 @@ export const AddonsContainter = ({
   onConfirmSelectionSuccess = _identity,
   onConfirmSelectionError = _identity,
   onCountdownFinish = _identity,
+  samePageBilling = false,
 }: IAddonContainterProps) => {
+  const valuesRef = useRef<any>(null)
   const eventId = getQueryVariable('event_id')
   const [addons, setAddons] = useState<any>([])
   const [addonsOptions, setAddonsOptions] = useState<any>({})
@@ -212,7 +216,7 @@ export const AddonsContainter = ({
       const collectOptionalWalletAddress = pageConfigsData.collect_optional_wallet_address ?? false
       const collectMandatoryWalletAddress = pageConfigsData.collect_mandatory_wallet_address ?? false
 
-      if (skipBillingPage && enableBillingInfoAutoCreate) {
+      if (skipBillingPage && enableBillingInfoAutoCreate && !samePageBilling) {
         const ticketsQuantity = window.localStorage.getItem('quantity')
         const userData = JSON.parse(
           window.localStorage.getItem('user_data') || '{}'
@@ -293,6 +297,8 @@ export const AddonsContainter = ({
     )
   }
 
+  const flagHasAddOn = getQueryVariable('hasAddOn') === 'true'
+
   return (
     <>
       {!!cartExpirationTime && enableTimer && (
@@ -304,11 +310,11 @@ export const AddonsContainter = ({
           }}
         />
       )}
-      <div className={`${classNamePrefix}_container`}>
+      {samePageBilling && !flagHasAddOn ? null : <div className={`${classNamePrefix}_container`}>
         <div className={`${classNamePrefix}_block`}>
           <div className={`${classNamePrefix}_line_block`}>
             <p className={`${classNamePrefix}_info_title`}>Get Your Tickets</p>
-            <button
+            {samePageBilling ? null : <button
               type="button"
               className={`${classNamePrefix}_skip`}
               onClick={() => {
@@ -317,7 +323,7 @@ export const AddonsContainter = ({
               }}
             >
               Skip
-            </button>
+            </button>}
           </div>
           <div className={`${classNamePrefix}_title`}>UPGRADES & ADD-ONS</div>
           <div className={`${classNamePrefix}_subtitle`}>
@@ -330,6 +336,9 @@ export const AddonsContainter = ({
             }}
           >
             {({ values }) => {
+              if (!isEqual(values, valuesRef.current)) {
+                valuesRef.current = values
+              }
               const isConfirmDisabled = !isAtLeastOneAddonSelected(values)
 
               return (
@@ -396,9 +405,14 @@ export const AddonsContainter = ({
                                   data={variant}
                                   selectOptions={addonsOptions[variant.id]}
                                   classNamePrefix={classNamePrefix}
-                                  handleAddonChange={(id, value) =>
+                                  handleAddonChange={(id, value) => {
                                     onFieldChange(id, value, addon)
-                                  }
+                                    if (samePageBilling) {
+                                      setTimeout(() => {
+                                        handleConfirm(valuesRef.current)
+                                      }, 100)
+                                    }
+                                  }}
                                 />
                               ))
                             ) : (
@@ -408,16 +422,21 @@ export const AddonsContainter = ({
                                 data={addon}
                                 selectOptions={addonsOptions[addon.id]}
                                 classNamePrefix={classNamePrefix}
-                                handleAddonChange={(id, value) =>
+                                handleAddonChange={(id, value) => {
                                   onFieldChange(id, value, addon)
-                                }
+                                  if (samePageBilling) {
+                                    setTimeout(() => {
+                                      handleConfirm(valuesRef.current)
+                                    }, 100)
+                                  }
+                                }}
                               />
                             )}
                           </div>
                         </div>
                       )
                     })}
-                    <button
+                    {samePageBilling ? null : <button
                       type="submit"
                       className={`${
                         isConfirmDisabled
@@ -427,14 +446,14 @@ export const AddonsContainter = ({
                       disabled={isConfirmDisabled}
                     >
                       CONFIRM SELECTION
-                    </button>
+                    </button>}
                   </>
                 </Form>
               )
             }}
           </Formik>
         </div>
-      </div>
+      </div>}
     </>
   )
 }

package/src/components/ticketsContainer/TicketsSection.tsx

@@ -1,7 +1,8 @@
-import React, { ReactNode } from 'react'
 import './style.css'
 
 import _sortBy from 'lodash/sortBy'
+import React, { ReactNode } from 'react'
+
 import { TicketRow } from './TicketRow'
 
 interface ITicketsSectionProps {
@@ -24,6 +25,7 @@ export const TicketsSection = ({
   const sortedTicketsList = sortBySoldOut
     ? _sortBy(_sortBy(ticketsList, 'sortOrder'), 'soldOut')
     : _sortBy(ticketsList, 'sortOrder')
+  const showGroup = !!sortedTicketsList.find(ticket => ticket.groupName)
   return (
     <>
       {!hideTicketsHeader && ticketsHeaderComponent}
@@ -45,41 +47,46 @@ export const TicketsSection = ({
         }
 
         const ticketIsFree = +ticket.price === 0
-        const ticketPrice = isSoldOut ? 'SOLD OUT' : ticketIsFree ? 'FREE' : `$ ${(+ticket.price).toFixed(2)}`
+        const ticketPrice = isSoldOut ? 'SOLD OUT' : ticketIsFree ? 'FREE' : `£ ${(+ticket.price).toFixed(2)}`
+        const isNewGroupTicket = ticket?.groupName !== arr[i-1]?.groupName
 
         return (
-          <div
-            key={ticket.id || ticket.name}
-            className={`event-detail__tier ${isSoldOut ? 'disabled' : ''}`}
-          >
-            <div className="event-detail__tier-name">
-              {ticket.displayName || ticket.name}
-            </div>
-            <div className="event-tickets-container">
-              <div className="event-detail__tier-price">
-                {ticketIsDiscounted && (
-                  <p className="old-price">$ {(+ticket.oldPrice).toFixed(2)}</p>
-                )}
-                <p className={isSoldOut ? 'sold-out' : ''}>{ticketPrice}</p>
-                {!isSoldOut && !ticketIsFree && (
-                  <p className="fees">
-                    {ticket.feeIncluded ? '(incl. Fees)' : '(excl. Fees)'}
-                  </p>
-                )}
+          <React.Fragment key={ticket.id || ticket.name}>
+            {showGroup && isNewGroupTicket ? (
+              <div className='event-detail__tier group-title'>{ticket.groupName || ''}</div>
+            ) : null}
+            <div
+              className={`event-detail__tier ${isSoldOut ? 'disabled' : ''}`}
+            >
+              <div className="event-detail__tier-name">
+                {ticket.displayName || ticket.name}
               </div>
-              <div
-                className="event-detail__tier-state"
-                style={{ minWidth: 55 }}
-              >
-                <TicketRow
-                  ticketTier={ticket}
-                  prevTicketTier={arr[i - 1]}
-                  selectedTickets={selectedTickets}
-                  handleTicketSelect={ticketSelect}
-                />
+              <div className="event-tickets-container">
+                <div className="event-detail__tier-price">
+                  {ticketIsDiscounted && (
+                    <p className="old-price">£ {(+ticket.oldPrice).toFixed(2)}</p>
+                  )}
+                  <p className={isSoldOut ? 'sold-out' : ''}>{ticketPrice}</p>
+                  {!isSoldOut && !ticketIsFree && (
+                    <p className="fees">
+                      {ticket.feeIncluded ? '(incl. Fees)' : '(excl. Fees)'}
+                    </p>
+                  )}
+                </div>
+                <div
+                  className="event-detail__tier-state"
+                  style={{ minWidth: 55 }}
+                >
+                  <TicketRow
+                    ticketTier={ticket}
+                    prevTicketTier={arr[i - 1]}
+                    selectedTickets={selectedTickets}
+                    handleTicketSelect={ticketSelect}
+                  />
+                </div>
               </div>
             </div>
-          </div>
+          </React.Fragment>
         )
       })}
     </>

package/src/components/common/dist/PhoneNumberField.js

@@ -1,96 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
-exports.PhoneNumberField = void 0;
-var TextField_1 = require("@mui/material/TextField");
-var debounce_1 = require("lodash/debounce");
-var get_1 = require("lodash/get");
-var react_1 = require("react");
-var api_1 = require("../../api");
-exports.PhoneNumberField = function (_a) {
-    var label = _a.label, _b = _a.type, type = _b === void 0 ? 'text' : _b, field = _a.field, _c = _a.form, errors = _c.errors, setFieldError = _c.setFieldError, setStatus = _c.setStatus;
-    var error = get_1["default"](errors, field.name);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    var debounceCb = react_1.useCallback(debounce_1["default"](function (cb) { return void cb(); }, 1000), []);
-    react_1.useEffect(function () {
-        var _a;
-        if (field.value) {
-            setStatus((_a = {}, _a[field.name] = true, _a));
-        }
-        debounceCb(function () { return __awaiter(void 0, void 0, void 0, function () {
-            var error_1, message;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _b.trys.push([0, 3, 4, 5]);
-                        if (!field.value) return [3 /*break*/, 2];
-                        return [4 /*yield*/, api_1.validatePhoneNumber(field.value)];
-                    case 1:
-                        _b.sent();
-                        _b.label = 2;
-                    case 2:
-                        setFieldError(field.name, '');
-                        return [3 /*break*/, 5];
-                    case 3:
-                        error_1 = _b.sent();
-                        message = get_1["default"](error_1, 'response.data.message', 'Invalid phone number');
-                        setFieldError(field.name, message);
-                        return [3 /*break*/, 5];
-                    case 4:
-                        setStatus((_a = {}, _a[field.name] = false, _a));
-                        return [7 /*endfinally*/];
-                    case 5: return [2 /*return*/];
-                }
-            });
-        }); });
-        // eslint-disable-next-line
-    }, [field.value]);
-    return (react_1["default"].createElement(TextField_1["default"], __assign({}, field, { id: field.name, label: label, type: type, fullWidth: true, error: !!error, helperText: error, value: field.value || '', inputProps: { pattern: '[+0-9]/d+' } })));
-};