tf-checkout-react 1.0.91 → 1.0.95

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.91",
+  "version": "1.0.95",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -29,7 +29,7 @@
   },
   "prettier": {
     "printWidth": 80,
-    "semi": true,
+    "semi": false,
     "singleQuote": true,
     "trailingComma": "es5"
   },

package/src/api/index.ts

@@ -100,10 +100,7 @@ export const setXSourceOrigin = (sourceOrigin: string) => {
 }
 
 export const setCustomHeader = (response: any) => {
-  const guestHeaderResponseValue = _get(
-    response,
-    'headers.authorization-guest'
-  )
+  const guestHeaderResponseValue = _get(response, 'headers.authorization-guest')
   const guestHeaderExistingValue = _get(
     response,
     'config.headers[Authorization-Guest]'
@@ -141,10 +138,10 @@ export function getTickets(id: string | number, promoCode: string) {
     .get(`v1/event/${id}/tickets/`, {
       headers: promoCode
         ? {
-          ...ttfHeaders,
-          'Promotion-Event': String(id),
-          'Promotion-Code': promoCode,
-        }
+            ...ttfHeaders,
+            'Promotion-Event': String(id),
+            'Promotion-Code': promoCode,
+          }
         : { ...ttfHeaders },
     })
     .catch(error => {
@@ -241,7 +238,7 @@ export const getStates = (countryId: string) =>
 
 export const getOrders = (page: number, limit: number, eventSlug: string) =>
   publicRequest.get(
-    `/v1/account/orders/?page=${page}&limit=${limit}&filter[event]=${eventSlug}`
+    `/v1/account/orders/?page=${page}&limit=${limit}&filter[event]=${eventSlug}&filter[brand]=${CONFIGS.BRAND_SLUG}`
   )
 
 export const getOrderDetails = (orderId: string) =>
@@ -252,3 +249,8 @@ export const addToWaitingList = (id: number, data: any) =>
 
 export const getConditions = (eventId: string) =>
   publicRequest.get(`v1/event/${eventId}/conditions`)
+
+export const postReferralVisits = (eventId: string, referralId: string) =>
+  publicRequest.post(`/v1/event/${eventId}/referrer/`, {
+    referrer: `${referralId}`,
+  })

package/src/components/billing-info-container/index.tsx

@@ -263,6 +263,7 @@ export const BillingInfoContainer = ({
   const optedInFieldValue: boolean = _get(cartInfoData, 'optedIn', false)
   const ttfOptIn: boolean = Boolean(_get(cartInfoData, 'ttfOptIn', false))
   const hideTtfOptIn: boolean = _get(cartInfoData, 'hide_ttf_opt_in', true)
+  const flagRequirePhone: boolean = _get(cartInfoData, 'flagRequirePhone', false)
 
   // Get prevProps
   const prevData = useRef(data)
@@ -618,6 +619,9 @@ export const BillingInfoContainer = ({
                                 if (el.name === 'ttf_opt_in' && hideTtfOptIn) {
                                   return false
                                 }
+                                if (el.name === 'phone' && !flagRequirePhone) {
+                                  el.required = true
+                                }
                                 return true
                               }),
                               element =>
@@ -638,7 +642,8 @@ export const BillingInfoContainer = ({
                                           type={element.type}
                                           validate={getValidateFunctions(
                                             element,
-                                            states
+                                            states,
+                                            props.values
                                           )}
                                           setFieldValue={props.setFieldValue}
                                           onBlur={props.handleBlur}

package/src/components/billing-info-container/utils.ts

@@ -8,6 +8,7 @@ import { CONFIGS } from '../../utils'
 import { IGroupItem } from '../../types'
 import { combineValidators, requiredValidator } from '../../validators'
 import { nanoid } from 'nanoid'
+import { FormikValues } from 'formik'
 
 export interface ILoggedInValues {
   emailLogged?: string;
@@ -176,7 +177,8 @@ export const createCheckoutDataBody = (
 
 export const getValidateFunctions = (
   element: IGroupItem,
-  states: Array<{ [key: string]: any }>
+  states: Array<{ [key: string]: any }>,
+  values: FormikValues
 ) => {
   const validationFunctions: any[] = []
 
@@ -193,6 +195,14 @@ export const getValidateFunctions = (
     validationFunctions.push(element.onValidate)
   }
 
+  if (element.name === 'confirmEmail') {
+    const isSameEmail = (confirmEmail?: string) =>
+      values.email !== confirmEmail
+        ? 'Please confirm your email address correctly'
+        : null
+    validationFunctions.push(isSameEmail)
+  }
+
   return combineValidators(...validationFunctions)
 }
 

package/src/components/confirmationContainer/social-buttons.tsx

@@ -84,6 +84,9 @@ const SocialButtons = ({ showDefaultShareButtons, shareLink, name, appId, shareB
           <SocialComponent key={index} {...shareButton} />
         ))}
       </div>
+      {(showDefaultShareButtons || shareButtons.length) && (
+        <p>We <strong>never</strong> post on Facebook without your permission!</p>
+      )}
     </>
   )
 }

package/src/components/ticketsContainer/ReferralLogic.tsx

@@ -0,0 +1,33 @@
+import { useEffect } from 'react'
+import { postReferralVisits } from '../../api'
+
+interface IReferralLogicProps {
+  eventId: string | number;
+}
+
+export const ReferralLogic = (props: IReferralLogicProps) => {
+  const { eventId } = props
+  const isWindowDefined = typeof window !== 'undefined'
+
+  useEffect(() => {
+    if (isWindowDefined) {
+      const params: URLSearchParams = new URL(`${window.location}`).searchParams
+      const referralId = params.get('ttf_r') || ''
+      const isAlreadyCounted = !!localStorage.getItem('referral_key')
+
+      if (referralId && eventId && !isAlreadyCounted) {
+        (async () => {
+          try {
+            await postReferralVisits(`${eventId}`, referralId)
+            localStorage.setItem(
+              'referral_key',
+              [eventId, '.', referralId].join('')
+            )
+          } catch (error) {}
+        })()
+      }
+    }
+  }, [])
+
+  return null
+}

package/src/components/ticketsContainer/TicketsSection.tsx

@@ -57,7 +57,7 @@ export const TicketsSection = ({
                 <p>{ticketPrice}</p>
                 {!isSoldOut && !ticketIsFree && (
                   <p className="fees">
-                    {ticket.taxesIncluded ? '(incl. Fees)' : '(excl. Fees)'}
+                    {ticket.feeIncluded ? '(incl. Fees)' : '(excl. Fees)'}
                   </p>
                 )}
               </div>

package/src/components/ticketsContainer/index.tsx

@@ -26,6 +26,7 @@ import { createCheckoutDataBodyWithDefaultHolder, getQueryVariable } from '../..
 import { ThemeProvider } from '@mui/private-theming'
 import { createTheme, ThemeOptions } from '@mui/material'
 import { CSSProperties } from '@mui/styles'
+import { ReferralLogic } from './ReferralLogic'
 
 function Loader() {
   return (
@@ -315,6 +316,7 @@ export const TicketsContainer = ({
 
   return (
     <ThemeProvider theme={themeMui}>
+      <ReferralLogic eventId={eventId} />
       <div className={`get-tickets-page ${theme}`} style={contentStyle}>
         {isLoading ? (
           <Loader />