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

package/src/hoc/CustomFields/index.tsx

@@ -9,6 +9,7 @@ import {
   getFieldsKeys,
   getQueryVariable,
 } from '../../utils'
+import { getAddOnDataWithCustomFields } from '../../utils/customFields'
 
 const withCustomFields = (Children: any) => (props: any) => {
   const {
@@ -27,18 +28,21 @@ const withCustomFields = (Children: any) => (props: any) => {
   const [customFieldsData, setCustomFieldsData] = useState({} as any)
   const [customFieldsOrderKeys, setCustomFieldsOrderKeys] = useState([] as any)
   const [customFieldsTicketHolderKeys, setCustomFieldsTicketHolderKeys] = useState([] as any)
+  const [customFieldsAddOnKeys, setCustomFieldsAddOnKeys] = useState([] as any)
 
   const getFields = async () => {
     try {
-      const eventId = getQueryVariable('event_id') || ''
+      const eventId = getQueryVariable('event_id') || getQueryVariable("eventId") || ''
       const customFields = await getCustomFields(eventId)
 
       const orderFieldsKeys = getFieldsKeys(_get(customFields, 'orderFields', []))
       const ticketHoldersFieldsKeys = getFieldsKeys(_get(customFields, 'ticketsFields', []))
+      const addOnFieldsKeys = getFieldsKeys(_get(customFields, 'addOnFields', []))
 
       setCustomFieldsTicketHolderKeys(ticketHoldersFieldsKeys)
       setCustomFieldsOrderKeys(orderFieldsKeys)
       setCustomFieldsData(customFields)
+      setCustomFieldsAddOnKeys(addOnFieldsKeys)
 
       onGetCustomFieldsSuccess(customFields)
     } catch (e) {
@@ -59,6 +63,8 @@ const withCustomFields = (Children: any) => (props: any) => {
     ticketHoldersWithCustomFields,
   } = getDataWithCustomFields(data, ticketHoldersFields, customFieldsData)
 
+  const { addOnDataWithCustomFields } = getAddOnDataWithCustomFields(customFieldsData)
+
   if (lodaing) {
     return <CircularProgress size={50} />
   }
@@ -70,6 +76,8 @@ const withCustomFields = (Children: any) => (props: any) => {
       ticketHoldersFields={ticketHoldersWithCustomFields}
       customFieldsOrderKeys={customFieldsOrderKeys}
       customFieldsTicketHolderKeys={customFieldsTicketHolderKeys}
+      customFieldsAddOnKeys={customFieldsAddOnKeys}
+      addOnDataWithCustomFields={addOnDataWithCustomFields}
     />
   )
 }

package/src/index.ts

@@ -6,7 +6,7 @@ export { currencyNormalizerCreator, createFixedFloatNormalizer } from './normali
 export { LoginModal } from './components/loginModal'
 export { MyTicketsContainer } from './components/myTicketsContainer'
 export { OrderDetailsContainer } from './components/orderDetailsContainer'
-export { setConfigs } from './utils/setConfigs'
+export { DEFAULT_FEES_STYLE } from './constants/index'
 export { TicketResaleContainer } from './components'
 export { RedirectModal } from './components/common/RedirectModal'
 export { RsvpContainer } from './components/rsvpContainer'
@@ -22,4 +22,9 @@ export { DelegationsContainer } from './components/delegationsContainer'
 export { PoweredBy } from './components/common/PoweredBy'
 export { SeatMapContainer } from './components/seatMapContainer'
 export { IDVerification } from './components/idVerificationContainer'
-export { VERIFICATION_STATUSES } from './components/idVerificationContainer/constants'
+export { VERIFICATION_STATUSES } from './components/idVerificationContainer/constants'
+
+export { setConfigs } from './utils/setConfigs'
+export { logoutUser } from './utils/auth'
+
+export { OrderDetails } from './components/paymentContainer/OrderDetails'

package/src/types/add_on.ts

@@ -3,5 +3,6 @@ export interface IAddOn {
   name: string;
   groupName: string | null;
   price: string;
+  cost: string;
   quantity: string | number;
 }

package/src/types/api/common.d.ts

@@ -14,7 +14,17 @@ interface IEventResponseData {
   startDate: string;
   timezone: string;
   country: any;
+  timeslotSettings: ITimeslotSettings | undefined | null;
 }
+
+interface ITimeslotSettings {
+  minPricePerDate: any;
+  showPrice: boolean;
+  groupsInfo: any;
+  availableDates: string[];
+  timeSlotDateInfo: any;
+}
+
 interface IEventResponse extends IAxiosResponseData {
   data: {
     attributes: IEventResponseData;
@@ -62,6 +72,11 @@ interface ITicketsResponseData {
 interface ITicketsAdaptedResponseData extends ITicketsResponseData {
   tickets: ITicketData[];
 }
+
+interface ITimeslotsAdaptedData extends ITicketsResponseData {
+  timeslots: {[key: string]: { [key: string]: ITicketData[] }};
+}
+
 interface ITicketsResponse extends IAxiosResponseData {
   data: {
     attributes: ITicketsResponseData;
@@ -77,6 +92,14 @@ interface ITicketsAdaptedResponse extends IAxiosResponseData {
   };
 }
 
+interface ITimeslotsAdaptedResponse extends IAxiosResponseData {
+  data: {
+    attributes: ITimeslotsAdaptedData;
+    relationships: Array<unknown>;
+    type: string;
+  };
+}
+
 // Countries
 interface ICountriesAdaptedData {
   label: string;
@@ -117,3 +140,7 @@ interface IRSVPRequestData {
   email: string;
 }
 type IRSVPResponse = IAxiosResponseData
+
+interface TimeSlotsResponse extends IAxiosResponseData {
+  data: string[];
+}

package/src/types/api/orders.d.ts

@@ -57,18 +57,34 @@ interface IOrderAddOn {
 interface IOrderTicketAddOn {
   status: string;
   name: string;
+  groupName: string;
 }
 
-interface IOrderTicketData {
+interface ITicketTypes {
+  add_ons?: IOrderTicketAddOn[];
   hash: string;
+  ticket_type: string;
+  holder_name: string;
+  status: string;
+  pdf_link: string;
+  is_sellable: boolean;
+  is_on_sale?: boolean;
+  event_name: string;
+  currency: string;
+  ticket_type_hash: string;
+  ticket_type_is_active?: boolean;
+  canSellTicket?: boolean;
+  retain_amount_on_sale: number | string;
+  ticketsTitle: string;
+}
+
+interface IOrderTicketData extends ITicketTypes {
   qrData: string;
   ticketType: string;
   description: string | null;
   descriptionPlain: string | null;
   holderName: string;
-  status: string;
   eventName: string;
-  currency: string;
   resaleFeeAmount: number;
   holderEmail: string;
   holderPhone: string | null;

package/src/types/api/payment.d.ts

@@ -18,6 +18,7 @@ interface IPaymentOrderDetails {
     id: string;
     name: string;
     price: number | string;
+    cost: number | string;
     quantity: number | string;
     guest_count?: string | number;
   }>;
@@ -25,6 +26,8 @@ interface IPaymentOrderDetails {
   pay_now?: string | number;
   guest_count?: string | number;
   debt?: number;
+  subtotal?: number | string;
+  fees?: number | string;
 }
 
 interface IPaymentMethodData {
@@ -34,7 +37,7 @@ interface IPaymentMethodData {
   stripe_payment_plan_enabled: boolean;
   stripe_payment_plan_configuration: any;
   stripeConnectedAccount: string;
-  stripePublishableKey: string;
+  stripe_publishable_key: string;
 }
 
 interface IShippingBillingInfoData {
@@ -171,4 +174,4 @@ interface ICheckoutCompleteDataResponse extends IAxiosResponseData {
     relationships: Array<unknown>;
     type: string;
   };
-}
+}

package/src/types/api/preRegistrationComplete.d.ts

@@ -1,4 +1,4 @@
-interface IInfluancerData {
+interface IInfluencerData {
   customer_id: string;
   data_capture: any;
   email: string;
@@ -25,7 +25,7 @@ interface IPrizeData {
 
 interface IInfluancersData {
   attributes: {
-    influencers: IInfluancerData[];
+    influencers: IInfluencerData[];
     prizes: IPrizeData[];
   };
   relationships: Array<unknown>;

package/src/types/checkoutPageConfigs.ts

@@ -2,7 +2,7 @@ export interface ICheckoutPageConfigs {
   age_required: boolean;
   event_id: string;
   has_add_on: boolean;
-  minimum_age: number | string | null;
+  minimum_age?: number | string | null;
   names_required: boolean;
   phone_required: boolean;
   skip_billing_page: boolean;

package/src/types/order-data.ts

@@ -3,7 +3,7 @@ import { IAddOn } from './add_on'
 export interface IOrderData {
   id: string;
   product_name: string;
-  ticketType: string;
+  ticketType: string | Array<any>;
   quantity: string | number;
   price: string | number;
   total: string | number;
@@ -11,4 +11,5 @@ export interface IOrderData {
   guest_count: string | number;
   pay_now: string | number;
   add_ons: IAddOn[];
+  cost: string | number;
 }

package/src/types/pre-registration-complete.d.ts

@@ -5,7 +5,7 @@ interface IPrewardsProps {
 }
 
 interface IInfluancersProps {
-  data: Array<IInfluancerData>;
+  data: Array<IInfluencerData>;
   classNamePrefix: string;
   headerNode?: string | Node;
 }
@@ -28,6 +28,11 @@ interface IPreRegistrationInformationProps {
   onGetPreregistrationDataError?: () => void;
   influancersHeaderNode?: string | Node;
   prewardsHeaderNode?: string | Node;
+
+  themeOptions?: ThemeOptions & {
+    input?: CSSProperties;
+    checkbox?: CSSProperties;
+  };
 }
 
 interface IPreRegistrationCompleteProps extends IShareOptionsProps {

package/src/utils/auth.ts

@@ -1,3 +1,9 @@
+import { AxiosError } from 'axios'
+
+import { logout } from '../api'
+import { deleteCookieByName } from './cookies'
+import { isBrowser } from './isBrowser'
+
 export const setLoggedUserData = (data: IProfileData) => ({
   id: data.id,
   first_name: data.firstName,
@@ -11,3 +17,29 @@ export const setLoggedUserData = (data: IProfileData) => ({
   state: data?.stateId || '',
   zip: data?.zipCode || '',
 })
+
+interface LogoutUserParams {
+  onLogoutSuccess?: () => void;
+  onLogoutError?: (error: AxiosError) => void;
+  setIsLogged?: (isLogged: boolean) => void;
+}
+
+export const logoutUser = async ({
+  onLogoutSuccess,
+  onLogoutError,
+  setIsLogged,
+}: LogoutUserParams) => {
+  try {
+    await logout()
+    onLogoutSuccess && onLogoutSuccess()
+    if (isBrowser) {
+      window.localStorage.removeItem('user_data')
+      setIsLogged && setIsLogged(false)
+      const event = new window.CustomEvent('tf-logout')
+      deleteCookieByName('X-TF-ECOMMERCE')
+      window.document.dispatchEvent(event)
+    }
+  } catch (e) {
+    onLogoutError && onLogoutError(e as AxiosError)
+  }
+}

package/src/utils/cookies.ts

@@ -1,5 +1,7 @@
 import { getDomain } from './getDomain'
 
+let generalDomain: string
+
 export function setCustomCookie(name: string, value: string, days = 5) {
   let expires = ''
   if (days) {
@@ -7,11 +9,25 @@ export function setCustomCookie(name: string, value: string, days = 5) {
     date.setTime(date.getTime() + days * 24 * 60 * 60 * 1000)
     expires = '; expires=' + date.toUTCString()
   }
-  if (typeof window !== 'undefined') {
-    const domain = getDomain(window.location.hostname)
-    document.cookie =
-      name + '=' + (value || '') + expires + `; path=/; domain=${domain}`
+  if (typeof window === 'undefined') {
+    return
+  }
+
+  const { hostname } = window.location
+
+  if (generalDomain && generalDomain.endsWith(getDomain(hostname))) {
+    document.cookie = name + '=' + (value || '') + expires + `; path=/;domain=${generalDomain}`
+    return
   }
+
+  let previousDomain = undefined
+  let domain = undefined
+  do {
+    previousDomain = domain
+    domain = getDomain(hostname, undefined, previousDomain)
+    document.cookie = name + '=' + (value || '') + expires + `; path=/;domain=${domain}`
+  } while (getCookieByName(name) === '' && hostname !== domain)
+  generalDomain = domain
 }
 
 export function getCookieByName(cname: string) {
@@ -31,12 +47,27 @@ export function getCookieByName(cname: string) {
 }
 
 export function deleteCookieByName(name: string) {
-  if (typeof window !== 'undefined') {
-    const domain = getDomain(window.location.hostname)
-    document.cookie =
-      name +
-      '=; Path=/' +
-      `; domain=${domain}` +
-      '; Expires=Thu, 01 Jan 1970 00:00:01 GMT;'
+  if (getCookieByName(name) === '') {
+    return
   }
+
+  if (typeof window === 'undefined') {
+    return
+  }
+
+  const { hostname } = window.location
+
+  if (generalDomain && generalDomain.endsWith(getDomain(hostname))) {
+    document.cookie = name + `=; Path=/;domain=${generalDomain}; Expires=Thu, 01 Jan 1970 00:00:01 GMT;`
+    return
+  }
+
+  let previousDomain = undefined
+  let domain = undefined
+  do {
+    previousDomain = domain
+    domain = getDomain(hostname, undefined, previousDomain)
+    document.cookie = name + `=; Path=/;domain=${domain}; Expires=Thu, 01 Jan 1970 00:00:01 GMT;`
+  } while (getCookieByName(name) !== '' && hostname !== domain)
+  generalDomain = domain
 }

package/src/utils/customFields.ts

@@ -54,5 +54,27 @@ export const getDataWithCustomFields = (
   return { dataWithCustomFields, ticketHoldersWithCustomFields }
 }
 
+export const getAddOnDataWithCustomFields = (customFields: any) => {
+  // Custom Fields are not specified case
+  if (_isEmpty(customFields)) {
+    return { addOnDataWithCustomFields: [] }
+  }
+
+  // Add Custom Fields for Order
+  const orderWithCustomFields = [
+    {
+      id: 1,
+      groupClassname: 'billing-info-container__customFields',
+      groupItems: [...customFields.addOnFields],
+    },
+  ]
+
+  const addOnDataWithCustomFields = {
+    fields: orderWithCustomFields,
+  }
+
+  return { addOnDataWithCustomFields }
+}
+
 export const getFieldsKeys = (customFields: any) =>
   _map(customFields, field => field.name)

package/src/utils/getDomain.ts

@@ -1,10 +1,16 @@
-export function getDomain(url: string, subdomain?: string): string {
+export function getDomain(url: string, subdomain?: string, publicSuffix?: string): string {
   let updatedUrl: any = url.replace(/(https?:\/\/)?(www.)?/i, '')
 
   if (!subdomain) {
-    updatedUrl = updatedUrl.split('.')
-
-    updatedUrl = updatedUrl.slice(updatedUrl.length - 2).join('.')
+    if (publicSuffix) {
+      const updatedPublicSuffix = publicSuffix.startsWith('.') ? publicSuffix : '.' + publicSuffix
+      updatedUrl = url.replace(updatedPublicSuffix, '').split('.')
+      updatedUrl = updatedUrl.length > 0 ? updatedUrl[updatedUrl.length - 1] : ''
+      updatedUrl += updatedPublicSuffix
+    } else {
+      updatedUrl = updatedUrl.split(".")
+      updatedUrl = updatedUrl.slice(updatedUrl.length - 2).join(".")
+    }
   }
 
   if (updatedUrl.indexOf('/') !== -1) {

package/src/utils/index.ts

@@ -9,7 +9,7 @@ export { createMarkup } from './createMarkup'
 export { replaceVarInString } from './replaceVarInString'
 export { isBrowser } from './isBrowser'
 export { getFormInitialValues } from './form'
-export { setLoggedUserData } from './auth'
+export { setLoggedUserData, logoutUser } from './auth'
 export { getDataWithCustomFields, getFieldsKeys } from './customFields'
 export { createElementFromHTML } from './htmlNodeFromString'
 export { isJson } from './jsonUtils'

package/src/utils/setConfigs.ts

@@ -1,6 +1,7 @@
 import _forEach from 'lodash/forEach'
 
 import { publicRequest } from '../api/publicRequest'
+import { DEFAULT_FEES_STYLE } from '../constants'
 
 export interface IConfigs {
   BASE_URL: string;
@@ -8,10 +9,11 @@ export interface IConfigs {
   CLIENT_SECRET: string;
   STRIPE_PUBLISHABLE_KEY: string;
   X_SOURCE_ORIGIN: string;
+  FEES_STYLE: string;
   [key: string]: string | number;
 }
 
-export const CONFIGS: IConfigs = {} as IConfigs
+export const CONFIGS: IConfigs = { FEES_STYLE: DEFAULT_FEES_STYLE } as IConfigs
 
 export const setConfigs = (configs: IConfigs) => {
   _forEach(configs, (value, key) => {