tf-checkout-react 1.3.35 → 1.3.37-beta

package/dist/validators/index.d.ts

@@ -1,3 +1,4 @@
 export declare const combineValidators: (...validators: any) => (...value: any) => any;
-export declare const requiredValidator: (value?: string | number | undefined, message?: string | undefined) => string;
+export declare function isFalsy(item: any): boolean;
+export declare const requiredValidator: (value?: string | number | boolean | string[] | undefined, message?: string | undefined) => string;
 export declare const emailValidator: (email: string) => "" | "Please enter a valid email address";

package/package.json

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

package/src/components/addonsContainer/AddonComponent.tsx

@@ -3,7 +3,7 @@ import _identity from 'lodash/identity'
 import _isNull from 'lodash/isNull'
 import React from 'react'
 
-import { SelectField } from '../common'
+import { NativeSelectField } from '../common'
 
 interface IAddonComponentProps {
   classNamePrefix: string;
@@ -32,7 +32,7 @@ const AddonComponent = ({
               <Field
                 name={id}
                 selectOptions={selectOptions}
-                component={SelectField}
+                component={NativeSelectField}
                 onChange={(e: any) => {
                   const { value } = e.target
                   handleAddonChange(id, value)

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

@@ -46,6 +46,7 @@ import { DatePickerField } from '../common/DatePickerField'
 import {
   CheckboxField,
   CustomField,
+  NativeSelectField,
   PhoneNumberField,
   RadioGroupField,
   SelectField,
@@ -887,13 +888,16 @@ export const BillingInfoContainer = React.memo(
                                                 element.type === 'checkbox'
                                                   ? CheckboxField
                                                   : element.type === 'select'
-                                                  ? SelectField
+                                                  ? NativeSelectField
                                                   : element.type === 'phone'
                                                   ? PhoneNumberField
                                                   : element.type === 'date'
                                                   ? DatePickerField
                                                   : element.type === 'radio'
                                                   ? RadioGroupField
+                                                  : element.type ===
+                                                    'select_multi'
+                                                  ? SelectField
                                                   : CustomField
                                               }
                                               selectOptions={

package/src/components/common/{SelectField.tsx → NativeSelectFeild/index.tsx}

@@ -29,7 +29,7 @@ interface IOtherProps {
   [key: string]: any;
 }
 
-export const SelectField = ({
+export const NativeSelectField = ({
   label,
   type = 'text',
   field,

package/src/components/common/SelectField/index.tsx

@@ -0,0 +1,82 @@
+import { FormControl, InputLabel } from '@mui/material'
+import Checkbox from '@mui/material/Checkbox'
+import FormHelperText from '@mui/material/FormHelperText'
+import ListItemText from '@mui/material/ListItemText'
+import MenuItem from '@mui/material/MenuItem'
+import OutlinedInput from '@mui/material/OutlinedInput'
+import Select, { SelectChangeEvent } from '@mui/material/Select'
+import { FieldInputProps, FormikProps } from 'formik'
+import _get from 'lodash/get'
+import _identity from 'lodash/identity'
+import React from 'react'
+
+interface ISelectOption {
+  id: string | number;
+  name: string | number;
+  value: string | number;
+}
+
+interface ISelectField {
+  field: FieldInputProps<any>;
+  form: FormikProps<any>;
+  options: ISelectOption[];
+
+  // optional
+  label?: string;
+  isMultiple?: boolean;
+  onChange?: (e: SelectChangeEvent<string[]>) => void;
+}
+
+function SelectField({
+  label,
+  isMultiple,
+  field,
+  form: { errors, setFieldValue },
+  options,
+  onChange = _identity,
+}: ISelectField) {
+  const { name, value } = field
+  const selectId = `select-field-${name}`
+  const error = _get(errors, name)
+
+  const handleChange = (event: SelectChangeEvent<string[]>) => {
+    const {
+      target: { value },
+    } = event
+
+    setFieldValue(name, value)
+    onChange(event)
+  }
+
+  return (
+    <>
+      <FormControl fullWidth={true} error={Boolean(error)}>
+        {label && <InputLabel id={selectId}>{label}</InputLabel>}
+        <Select
+          id={name}
+          labelId={selectId}
+          multiple={isMultiple}
+          value={value}
+          onChange={handleChange}
+          input={<OutlinedInput label={label} />}
+          renderValue={selected =>
+            isMultiple ? selected.join(', ') : selected
+          }
+          sx={{ textAlign: 'start' }}
+        >
+          {options.map((option: ISelectOption) => (
+            <MenuItem key={option.name} value={option.value}>
+              {isMultiple && (
+                <Checkbox checked={value.indexOf(option.value) > -1} />
+              )}
+              <ListItemText primary={option.name} />
+            </MenuItem>
+          ))}
+        </Select>
+        {error ? <FormHelperText error>{error}</FormHelperText> : null}
+      </FormControl>
+    </>
+  )
+}
+
+export { SelectField }

package/src/components/common/index.tsx

@@ -3,5 +3,6 @@ export { CustomField } from './CustomField'
 export { FormikPhoneNumberField } from './FormikPhoneNumberField'
 export { PhoneNumberField } from './PhoneNumberField'
 export { Loader } from './Loader'
-export { SelectField } from './SelectField'
+export { NativeSelectField } from './NativeSelectFeild'
 export { RadioGroupField } from './RadioGroupField'
+export { SelectField } from './SelectField'

package/src/components/ticketsContainer/TicketsSection.tsx

@@ -3,9 +3,12 @@ import './style.css'
 import _sortBy from 'lodash/sortBy'
 import React, { ReactNode } from 'react'
 
+import { currencyNormalizerCreator } from '../../normalizers'
 import { TicketRow } from './TicketRow'
 
 interface ITicketsSectionProps {
+  event: any;
+
   ticketsList: any;
   selectedTickets: any;
   handleTicketSelect: any;
@@ -15,13 +18,17 @@ interface ITicketsSectionProps {
 }
 
 export const TicketsSection = ({
+  event = { currency: {} },
   ticketsList,
   selectedTickets,
   handleTicketSelect,
   sortBySoldOut,
   ticketsHeaderComponent,
-  hideTicketsHeader
+  hideTicketsHeader,
 }: ITicketsSectionProps) => {
+  const {
+    currency: { currency },
+  } = event
   const sortedTicketsList = sortBySoldOut
     ? _sortBy(_sortBy(ticketsList, 'sortOrder'), 'soldOut')
     : _sortBy(ticketsList, 'sortOrder')
@@ -30,6 +37,15 @@ export const TicketsSection = ({
     <>
       {!hideTicketsHeader && ticketsHeaderComponent}
       {sortedTicketsList.map((ticket, i, arr) => {
+        const ticketPrice = currencyNormalizerCreator(
+          (+ticket.price).toFixed(2),
+          currency
+        )
+        const ticketOldPrice = currencyNormalizerCreator(
+          (+ticket.oldPrice).toFixed(2),
+          currency
+        )
+
         const isSoldOut =
           ticket.sold_out || !ticket.displayTicket || ticket.soldOut
         const ticketSelect = (event: any) => {
@@ -38,22 +54,24 @@ export const TicketsSection = ({
         }
 
         let ticketIsDiscounted = false
-        if (
-          ticket.oldPrice &&
-          !isSoldOut &&
-          ticket.oldPrice !== ticket.price
-        ) {
+        if (ticket.oldPrice && !isSoldOut && ticket.oldPrice !== ticket.price) {
           ticketIsDiscounted = true
         }
 
         const ticketIsFree = +ticket.price === 0
-        const ticketPrice = isSoldOut ? 'SOLD OUT' : ticketIsFree ? 'FREE' : `$ ${(+ticket.price).toFixed(2)}`
-        const isNewGroupTicket = ticket?.groupName !== arr[i-1]?.groupName
+        const ticketPriceElem = isSoldOut
+          ? 'SOLD OUT'
+          : ticketIsFree
+          ? 'FREE'
+          : ticketPrice
+        const isNewGroupTicket = ticket?.groupName !== arr[i - 1]?.groupName
 
         return (
           <React.Fragment key={ticket.id || ticket.name}>
             {showGroup && isNewGroupTicket ? (
-              <div className='event-detail__tier group-title'>{ticket.groupName || ''}</div>
+              <div className="event-detail__tier group-title">
+                {ticket.groupName || ''}
+              </div>
             ) : null}
             <div
               className={`event-detail__tier ${isSoldOut ? 'disabled' : ''}`}
@@ -64,9 +82,11 @@ export const TicketsSection = ({
               <div className="event-tickets-container">
                 <div className="event-detail__tier-price">
                   {ticketIsDiscounted && (
-                    <p className="old-price">$ {(+ticket.oldPrice).toFixed(2)}</p>
+                    <p className="old-price">{ticketOldPrice}</p>
                   )}
-                  <p className={isSoldOut ? 'sold-out' : ''}>{ticketPrice}</p>
+                  <p className={isSoldOut ? 'sold-out' : ''}>
+                    {ticketPriceElem}
+                  </p>
                   {!isSoldOut && !ticketIsFree && (
                     <p className="fees">
                       {ticket.feeIncluded ? '(incl. Fees)' : '(excl. Fees)'}

package/src/components/ticketsContainer/index.tsx

@@ -564,6 +564,7 @@ export const TicketsContainer = ({
           <div ref={ticketsContainerRef}>
             {!isSalesClosed && (
               <TicketsSection
+                event={event}
                 ticketsList={tickets}
                 selectedTickets={selectedTickets}
                 handleTicketSelect={handleTicketSelect}
@@ -593,7 +594,7 @@ export const TicketsContainer = ({
               />
             ) : null}
             {showWaitingList && event.salesStarted && !hideWaitingList && (
-              <WaitingList tickets={tickets} eventId={eventId} />
+              <WaitingList tickets={tickets} eventId={eventId} defaultMaxQuantity={event.waitingListMaxQuantity} />
             )}
             {codeIsLoading ? (
               <Loader />

package/src/components/waitingList/index.tsx

@@ -16,6 +16,7 @@ import './style.css'
 interface WaitingListProps {
   tickets: any;
   eventId: number;
+  defaultMaxQuantity: number;
 }
 
 interface WaitingListFields {
@@ -34,7 +35,7 @@ const generateQuantity = (n: number) => {
   return quantityList
 }
  
-const WaitingList = ({ tickets = {}, eventId }: WaitingListProps) => {
+const WaitingList = ({ tickets = {}, eventId, defaultMaxQuantity = 10 }: WaitingListProps) => {
   const isWindowDefined = typeof window !== 'undefined'
   const userData =
     isWindowDefined && window.localStorage.getItem('user_data')
@@ -117,7 +118,7 @@ const WaitingList = ({ tickets = {}, eventId }: WaitingListProps) => {
                           value: '',
                           disabled: true,
                         },
-                        ...generateQuantity(10),
+                        ...generateQuantity(defaultMaxQuantity ?? 10),
                       ]}
                     />
                   </div>

package/src/env.ts

@@ -1,7 +1,7 @@
 // preview
 export const ENV = {
-  EVENT_ID: 5106,
-  BASE_URL: 'https://staging2.ttf.fluxtech.me',
+  EVENT_ID: 12927,
+  BASE_URL: 'https://test.ticketfairy.com',
   CLIENT_ID: 'e9d8f8922797b4621e562255afe90dbf',
   CLIENT_SECRET: 'b89c191eff22fdcf84ac9bfd88d005355a151ec2c83b26b9',
   STRIPE_PUBLISHABLE_KEY:

package/src/normalizers/index.ts

@@ -1,8 +1,11 @@
-export const currencyNormalizerCreator = (value: string | number, currency: string) =>
-  !value ? '' : `${getCurrencySymbolByCurrency(currency)}${value}`
+export const currencyNormalizerCreator = (
+  value: string | number,
+  currency: string
+) => (!value ? '' : `${getCurrencySymbolByCurrency(currency)} ${value}`)
 
-export const createFixedFloatNormalizer = (fixedValue: number) => (value: string | number) =>
-  value || `${value}` === '0' ? (+value).toFixed(fixedValue) : ''
+export const createFixedFloatNormalizer = (fixedValue: number) => (
+  value: string | number
+) => (value || `${value}` === '0' ? (+value).toFixed(fixedValue) : '')
 
 export const getCurrencySymbolByCurrency = (currency = '') => {
   switch (currency) {
@@ -43,4 +46,4 @@ export const getCurrencySymbolByCurrency = (currency = '') => {
   }
 }
 
-export const removePlusSign = (string = '') => string.replace('+', '')
+export const removePlusSign = (string = '') => string.replace('+', '')

package/src/validators/index.ts

@@ -7,14 +7,34 @@ export const combineValidators = (...validators: any) => (...value: any) => {
   }
 }
 
-export const requiredValidator = (value?: string | number, message?: string): string => {
+export function isFalsy(item: any) {
+  try {
+    if (
+      !item || // handles most, like false, 0, null, etc
+      (typeof item == 'object' &&
+      Object.keys(item).length === 0 && // for empty objects, like {}, []
+        !(typeof item.addEventListener == 'function')) // omit webpage elements
+    ) {
+      return true
+    }
+  } catch (err) {
+    return true
+  }
+
+  return false
+}
+
+export const requiredValidator = (
+  value?: string | number | Array<string> | boolean,
+  message?: string
+): string => {
   let errorMessage = ''
-  if (!value) {
+
+  if (isFalsy(value)) {
     errorMessage = message || 'Required'
   }
   return errorMessage
 }
 
-export const emailValidator = (email: string) => {
-  return !emailRegex.test(email) ? 'Please enter a valid email address' : '' 
-}
+export const emailValidator = (email: string) =>
+  !emailRegex.test(email) ? 'Please enter a valid email address' : ''

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+' } })));
-};