tf-checkout-react 1.2.21 → 1.2.24

package/package.json

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

package/src/api/index.ts

@@ -329,7 +329,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}&filter[brand]=${CONFIGS.BRAND_SLUG}&filter[subbrands]=yes`
+    `v1/account/orders/?page=${page}&limit=${limit}&filter[event]=${eventSlug}&filter[brand]=${CONFIGS.BRAND_SLUG}&filter[subbrands]=true`
   )
 
 export const getOrderDetails = (orderId: string) =>

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

@@ -0,0 +1,96 @@
+"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+' } })));
+};

package/src/components/myTicketsContainer/row.tsx

@@ -1,6 +1,7 @@
-import React from 'react'
-import TableRow from '@mui/material/TableRow'
 import TableCell from '@mui/material/TableCell'
+import TableRow from '@mui/material/TableRow'
+import React from 'react'
+
 import tableConfig from './tableConfig'
 
 export interface RowItems {
@@ -17,25 +18,23 @@ interface RowPropsTypes {
   handleDetailsInfo: (id: string) => void;
 }
 
-const Row = ({ row, handleDetailsInfo }: RowPropsTypes) => {
-  return (
-    <TableRow sx={{ '& > *': { borderBottom: 'unset' } }}>
-      {tableConfig().body.map((column: any, index: number) => (
-        <TableCell component="th" scope="row" key={index}>
-          {column(row)}
-        </TableCell>
-      ))}
-      <TableCell component="th" scope="row">
-        <button
-          type='button'
-          className="order-details-button"
-          onClick={() => handleDetailsInfo(row.id)}
-        >
-          Details
-        </button>
+const Row = ({ row, handleDetailsInfo }: RowPropsTypes) => (
+  <TableRow sx={{ '& > *': { borderBottom: 'unset' } }}>
+    {tableConfig().body.map((column: any, index: number) => (
+      <TableCell component="th" scope="row" key={index}>
+        {column(row)}
       </TableCell>
-    </TableRow>
-  );
-}
+    ))}
+    <TableCell component="th" scope="row">
+      <button
+        type="button"
+        className="order-details-button"
+        onClick={() => handleDetailsInfo(row.id)}
+      >
+        Details
+      </button>
+    </TableCell>
+  </TableRow>
+)
 
 export default Row

package/src/components/orderDetailsContainer/index.tsx

@@ -11,6 +11,7 @@ import TableRow from '@mui/material/TableRow'
 import _find from 'lodash/find'
 import _get from 'lodash/get'
 import _has from 'lodash/has'
+import _identity from 'lodash/identity'
 import _map from 'lodash/map'
 import moment from 'moment-timezone'
 import React, { useEffect, useState } from 'react'
@@ -18,7 +19,7 @@ import React, { useEffect, useState } from 'react'
 import { getOrderDetails, removeFromResale, resaleTicket } from '../../api'
 import ConfirmModal from '../confirmModal'
 import { InitialValuesTypes, TicketResaleModal } from '../ticketResaleModal'
-import TicketsTable, { ITicketTypes } from './ticketsTable'
+import TicketsTable, { IActionColumns, ITicketTypes } from './ticketsTable'
 
 interface TicketTypes {
   currency: string;
@@ -39,6 +40,12 @@ interface OrderDetailsTypes {
   onResaleTicketSuccess: () => void;
   onResaleTicketError: (err: any) => void;
   personalLinkIcon?: string;
+  displayColumnNameInRow?: boolean;
+  ticketsTableColumns?: Array<{
+    id?: string | number;
+    key: keyof ITicketTypes & keyof IActionColumns;
+    label: string | number | null | undefined;
+  }>;
 }
 
 const getTotal = (data: any) => {
@@ -49,14 +56,16 @@ const getTotal = (data: any) => {
 
 export const OrderDetailsContainer = ({
   columns = [],
-  onGetOrdersSuccess = () => {},
-  onGetOrdersError = () => {},
-  onRemoveFromResaleSuccess = () => {},
-  onRemoveFromResaleError = () => {},
-  onResaleTicketSuccess = () => {},
-  onResaleTicketError = () => {},
+  onGetOrdersSuccess = _identity,
+  onGetOrdersError = _identity,
+  onRemoveFromResaleSuccess = _identity,
+  onRemoveFromResaleError = _identity,
+  onResaleTicketSuccess = _identity,
+  onResaleTicketError = _identity,
   onReturnButtonClick,
   personalLinkIcon = '',
+  displayColumnNameInRow = false,
+  ticketsTableColumns,
 }: OrderDetailsTypes) => {
   const [data, setData] = useState<any>({})
   const [loading, setLoading] = useState(true)
@@ -259,8 +268,7 @@ export const OrderDetailsContainer = ({
                     (ticket: TicketTypes, index: number) => (
                       <TableRow key={index}>
                         <TableCell>
-                          <b>Ticket Type: </b>
-                          {ticket.name}
+                          <b>Ticket Type:</b> {ticket.name}
                         </TableCell>
                         <TableCell>{ticket.currency + ticket.price}</TableCell>
                         <TableCell>{ticket.quantity}</TableCell>
@@ -293,8 +301,21 @@ export const OrderDetailsContainer = ({
           </div>
           <TicketsTable
             tickets={data.tickets}
+            columns={
+              ticketsTableColumns?.length
+                ? ticketsTableColumns
+                : [
+                    { key: 'hash' as never, label: 'Ticket ID' },
+                    { key: 'ticket_type' as never, label: 'Ticket Type' },
+                    { key: 'holder_name' as never, label: 'Ticket Holder' },
+                    { key: 'status' as never, label: 'Status' },
+                    { key: 'download' as never, label: '' },
+                    { key: 'sell_ticket' as never, label: '' },
+                  ]
+            }
             handleSellTicket={handleSellTicket}
             handleRemoveFromResale={handleRemoveFromResale}
+            displayColumnNameInRow={displayColumnNameInRow}
           />
           <div className="return-button-container">
             <button

package/src/components/orderDetailsContainer/ticketsTable.tsx

@@ -6,6 +6,7 @@ import TableContainer from '@mui/material/TableContainer'
 import TableHead from '@mui/material/TableHead'
 import TableRow from '@mui/material/TableRow'
 import _identity from 'lodash/identity'
+import _map from 'lodash/map'
 import React, { Fragment, useState } from 'react'
 
 import { downloadPDF } from '../../utils'
@@ -31,21 +32,105 @@ export interface ITicketTypes {
   ticket_type_is_active?: boolean;
 }
 
+export interface IActionColumns {
+  download?: boolean;
+  sell_ticket?: boolean;
+}
+
 interface TicketsTableTypes {
   tickets: ITicketTypes[];
+  columns: Array<{
+    id?: string | number;
+    key: keyof ITicketTypes & keyof IActionColumns;
+    label: string | number | null | undefined;
+  }>;
   handleSellTicket: (ticket: ITicketTypes) => void;
   handleRemoveFromResale: (ticket: ITicketTypes) => void;
 
   icon?: string;
+  displayColumnNameInRow?: boolean;
 }
 
 const TicketsTable = ({
   tickets = [],
+  columns = [],
   handleSellTicket = _identity,
   handleRemoveFromResale = _identity,
   icon = '',
+  displayColumnNameInRow = false,
 }: TicketsTableTypes) => {
   const [pdfError, setPdfError] = useState<string | null>(null)
+
+  const getRow = (ticket: ITicketTypes) =>
+    _map(columns, (column, columnIndex) => {
+      if (column.key === 'download') {
+        if (ticket.pdf_link && ticket.status === 'Sold') return null
+        return (
+          <TableCell key={columnIndex}>
+            {Boolean(icon) && <img src={icon} alt="nodata" />}
+            <span
+              aria-hidden={true}
+              className="action-button"
+              onClick={async () => {
+                try {
+                  const pdfDownloadError = await downloadPDF(ticket.pdf_link)
+                  if (pdfDownloadError) {
+                    setPdfError(pdfDownloadError?.message)
+                  }
+                } catch (err) {
+                  if (err && typeof err === 'string') {
+                    setPdfError(err)
+                  }
+                }
+              }}
+            >
+              Download
+            </span>
+          </TableCell>
+        )
+      }
+
+      if (column.key === 'sell_ticket') {
+        return (
+          <TableCell key={columnIndex}>
+            {ticket.is_sellable && (
+              <span
+                aria-hidden={true}
+                className="action-button"
+                onClick={() => handleSellTicket(ticket)}
+              >
+                Sell Ticket
+              </span>
+            )}
+            {ticket.is_on_sale && (
+              <span
+                aria-hidden={true}
+                className="action-button"
+                onClick={() => handleRemoveFromResale(ticket)}
+              >
+                Remove from Resale
+              </span>
+            )}
+          </TableCell>
+        )
+      }
+
+      return displayColumnNameInRow ? (
+        <TableCell key={columnIndex}>
+          <div className="cell-block">
+            <span>{column.label}</span>
+            <span>{ticket[column.key]}</span>
+          </div>
+        </TableCell>
+      ) : (
+        <TableCell key={columnIndex}>
+          <div className="cell-block">
+            <span>{ticket[column.key]}</span>
+          </div>
+        </TableCell>
+      )
+    })
+
   return (
     <div className="tickets-box">
       <SnackbarAlert
@@ -57,90 +142,19 @@ const TicketsTable = ({
       <h4 className="sub-title">Your Tickets</h4>
       <TableContainer component={Paper}>
         <Table aria-label="collapsible table">
-          <TableHead>
-            <TableRow>
-              <TableCell />
-              <TableCell />
-              <TableCell />
-              <TableCell />
-              <TableCell />
-              <TableCell />
-            </TableRow>
-          </TableHead>
+          {displayColumnNameInRow ? null : (
+            <TableHead>
+              <TableRow>
+                {_map(columns, item => (
+                  <TableCell key={item.key}>{item.label || ''}</TableCell>
+                ))}
+              </TableRow>
+            </TableHead>
+          )}
           <TableBody>
             {tickets.map((ticket: ITicketTypes, index: number) => (
               <Fragment key={index}>
-                <TableRow>
-                  <TableCell>
-                    <div className="cell-block">
-                      <span>Ticket ID</span>
-                      <span>{ticket.hash}</span>
-                    </div>
-                  </TableCell>
-                  <TableCell>
-                    <div className="cell-block">
-                      <span>Ticket Type</span>
-                      <span>{ticket.ticket_type}</span>
-                    </div>
-                  </TableCell>
-                  <TableCell>
-                    <div className="cell-block">
-                      <span>Ticket Holder</span>
-                      <span>{ticket.holder_name}</span>
-                    </div>
-                  </TableCell>
-                  <TableCell>
-                    <div className="cell-block">
-                      <span>Status</span>
-                      <span>{ticket.status}</span>
-                    </div>
-                  </TableCell>
-                  {ticket.pdf_link && ticket.status !== "Sold" ? (
-                    <TableCell>
-                      {Boolean(icon) && <img src={icon} alt="nodata" />}
-                      <span
-                        aria-hidden={true}
-                        className="action-button"
-                        onClick={async () => {
-                          try {
-                            const pdfDownloadError = await downloadPDF(
-                              ticket.pdf_link
-                            )
-                            if (pdfDownloadError) {
-                              setPdfError(pdfDownloadError?.message)
-                            }
-                          } catch (err) {
-                            if (err && typeof err === 'string') {
-                              setPdfError(err)
-                            }
-                          }
-                        }}
-                      >
-                        Download
-                      </span>
-                    </TableCell>
-                  ) : null}
-                  <TableCell>
-                    {ticket.is_sellable && (
-                      <span
-                        aria-hidden={true}
-                        className="action-button"
-                        onClick={() => handleSellTicket(ticket)}
-                      >
-                        Sell Ticket
-                      </span>
-                    )}
-                    {ticket.is_on_sale && (
-                      <span
-                        aria-hidden={true}
-                        className="action-button"
-                        onClick={() => handleRemoveFromResale(ticket)}
-                      >
-                        Remove from Resale
-                      </span>
-                    )}
-                  </TableCell>
-                </TableRow>
+                <TableRow>{getRow(ticket)}</TableRow>
                 {!!ticket.add_ons?.length && (
                   <TableRow>
                     <TableCell colSpan={6}>
@@ -174,4 +188,4 @@ const TicketsTable = ({
   )
 }
 
-export default TicketsTable
+export default TicketsTable

package/src/components/ticketsContainer/index.tsx

@@ -413,6 +413,7 @@ export const TicketsContainer = ({
   const externalUrl = event?.redirectUrl
   const eventSaleIsNotStarted = !event?.salesStarted && event?.salesStart
   const influencers = event?.referralsEnabled ? event?.referrals : []
+  const previewKey = getQueryVariable('pk') || undefined
 
   return (
     <ThemeProvider theme={themeMui}>
@@ -476,7 +477,8 @@ export const TicketsContainer = ({
               !eventSaleIsNotStarted &&
               isTicketOnSale &&
               !event?.salesEnded &&
-              !externalUrl && (
+              !externalUrl &&
+              !previewKey && (
                 <Button
                   aria-hidden={true}
                   className={`book-button