Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️
PHP attendize-alternativedoor-managementevent-check-inevent-managementevent-registrationevent-ticketingeventbrite-alternativeeventslaravelopen-sourcephpreactself-hostedsell-ticketssell-tickets-onlineticket-sellingticketing-systemtickettailor-alternativetito-alternative
Fix binary downloads (#407)
Dave Earley8dde61e54ae5
diff --git a/backend/app/Exports/OrdersExport.php b/backend/app/Exports/OrdersExport.phpindex ea34a35a2..d6dc8c57d 100644--- a/backend/app/Exports/OrdersExport.php+++ b/backend/app/Exports/OrdersExport.php@@ -58,7 +58,7 @@ class OrdersExport implements FromCollection, WithHeadings, WithMapping, WithSty__('Currency'),__('Created At'),__('Public ID'),- __('Payment Gateway'),+ __('Payment Provider'),__('Is Partially Refunded'),__('Is Fully Refunded'),__('Is Free Order'),@@ -101,7 +101,7 @@ class OrdersExport implements FromCollection, WithHeadings, WithMapping, WithSty$order->getCurrency(),Carbon::parse($order->getCreatedAt())->format('Y-m-d H:i:s'),$order->getPublicId(),- $order->getPaymentGateway(),+ $order->getPaymentProvider(),$order->isPartiallyRefunded(),$order->isFullyRefunded(),$order->isFreeOrder(),diff --git a/backend/app/Http/Kernel.php b/backend/app/Http/Kernel.phpindex c8fbb3bae..07e3eeb69 100644--- a/backend/app/Http/Kernel.php+++ b/backend/app/Http/Kernel.php@@ -12,6 +12,7 @@ use HiEvents\Http\Middleware\SetUserLocaleMiddleware;use HiEvents\Http\Middleware\TrimStrings;use HiEvents\Http\Middleware\TrustProxies;use HiEvents\Http\Middleware\ValidateSignature;+use HiEvents\Http\Middleware\VaporBinaryResponseMiddleware;use HiEvents\Http\Middleware\VerifyCsrfToken;use Illuminate\Auth\Middleware\AuthenticateWithBasicAuth;use Illuminate\Auth\Middleware\Authorize;@@ -47,6 +48,7 @@ class Kernel extends HttpKernelTrimStrings::class,ConvertEmptyStringsToNull::class,HandleDeprecatedTimezones::class,+ VaporBinaryResponseMiddleware::class,];/**diff --git a/backend/app/Http/Middleware/VaporBinaryResponseMiddleware.php b/backend/app/Http/Middleware/VaporBinaryResponseMiddleware.phpnew file mode 100644index 000000000..36c195591--- /dev/null+++ b/backend/app/Http/Middleware/VaporBinaryResponseMiddleware.php@@ -0,0 +1,22 @@+<?php++namespace HiEvents\Http\Middleware;++use Closure;+use Illuminate\Http\Request;+use Symfony\Component\HttpFoundation\BinaryFileResponse;+use Symfony\Component\HttpFoundation\StreamedResponse;++class VaporBinaryResponseMiddleware+{+ public function handle(Request $request, Closure $next): mixed+ {+ $response = $next($request);++ if ($response instanceof BinaryFileResponse || $response instanceof StreamedResponse) {+ $response->headers->set('X-Vapor-Base64-Encode', 'True');+ }++ return $response;+ }+}diff --git a/frontend/src/components/routes/event/orders.tsx b/frontend/src/components/routes/event/orders.tsxindex f2767e6df..619c6ed3f 100644--- a/frontend/src/components/routes/event/orders.tsx+++ b/frontend/src/components/routes/event/orders.tsx@@ -1,39 +1,38 @@-import React, {useEffect, useState} from "react";-import { useParams } from "react-router";-import { Button } from "@mantine/core";-import { IconDownload } from "@tabler/icons-react";-import { t } from "@lingui/macro";-import { useGetEvent } from "../../../queries/useGetEvent";-import { useGetEventOrders } from "../../../queries/useGetEventOrders";-import { PageTitle } from "../../common/PageTitle";-import { PageBody } from "../../common/PageBody";-import { OrdersTable } from "../../common/OrdersTable";-import { SearchBarWrapper } from "../../common/SearchBar";-import { Pagination } from "../../common/Pagination";-import { ToolBar } from "../../common/ToolBar";-import { useFilterQueryParamSync } from "../../../hooks/useFilterQueryParamSync";-import { IdParam, QueryFilters, QueryFilterOperator } from "../../../types";-import { TableSkeleton } from "../../common/TableSkeleton";-import { orderClient } from "../../../api/order.client";-import { downloadBinary } from "../../../utilites/download";-import { showError } from "../../../utilites/notifications";+import React, {useState} from "react";+import {useParams} from "react-router";+import {Button} from "@mantine/core";+import {IconDownload} from "@tabler/icons-react";+import {t} from "@lingui/macro";+import {useGetEvent} from "../../../queries/useGetEvent";+import {useGetEventOrders} from "../../../queries/useGetEventOrders";+import {PageTitle} from "../../common/PageTitle";+import {PageBody} from "../../common/PageBody";+import {OrdersTable} from "../../common/OrdersTable";+import {SearchBarWrapper} from "../../common/SearchBar";+import {Pagination} from "../../common/Pagination";+import {ToolBar} from "../../common/ToolBar";+import {useFilterQueryParamSync} from "../../../hooks/useFilterQueryParamSync";+import {IdParam, QueryFilterOperator, QueryFilters} from "../../../types";+import {TableSkeleton} from "../../common/TableSkeleton";+import {orderClient} from "../../../api/order.client";+import {downloadBinary} from "../../../utilites/download";import {FilterModal, FilterOption} from "../../common/FilterModal";import {withLoadingNotification} from "../../../utilites/withLoadingNotification.tsx";const orderStatuses = [- { label: t`Completed`, value: 'COMPLETED' },- { label: t`Cancelled`, value: 'CANCELLED' },- { label: t`Awaiting Offline Payment`, value: 'AWAITING_OFFLINE_PAYMENT' },+ {label: t`Completed`, value: 'COMPLETED'},+ {label: t`Cancelled`, value: 'CANCELLED'},+ {label: t`Awaiting Offline Payment`, value: 'AWAITING_OFFLINE_PAYMENT'},];const refundStatuses = [- { label: t`Refunded`, value: 'REFUNDED' },- { label: t`Partially Refunded`, value: 'PARTIALLY_REFUNDED' },+ {label: t`Refunded`, value: 'REFUNDED'},+ {label: t`Partially Refunded`, value: 'PARTIALLY_REFUNDED'},];export const Orders: React.FC = () => {- const { eventId } = useParams<{ eventId: string }>();- const { data: event } = useGetEvent(eventId);+ const {eventId} = useParams<{ eventId: string }>();+ const {data: event} = useGetEvent(eventId);const [searchParams, setSearchParams] = useFilterQueryParamSync();const ordersQuery = useGetEventOrders(eventId, searchParams as QueryFilters);const orders = ordersQuery?.data?.data;@@ -61,10 +60,10 @@ export const Orders: React.FC = () => {filterFields: {...(searchParams.filterFields || {}),status: values.status?.length > 0- ? { operator: QueryFilterOperator.In, value: values.status }+ ? {operator: QueryFilterOperator.In, value: values.status}: undefined,refund_status: values.refund_status?.length > 0- ? { operator: QueryFilterOperator.In, value: values.refund_status }+ ? {operator: QueryFilterOperator.In, value: values.refund_status}: undefined}};@@ -82,26 +81,26 @@ export const Orders: React.FC = () => {const handleExport = async (eventId: IdParam) => {await withLoadingNotification(async () => {- setDownloadPending(true);- const blob = await orderClient.exportOrders(eventId);- downloadBinary(blob, 'orders.xlsx');- },- {- loading: {- title: t`Exporting Orders`,- message: t`Please wait while we prepare your orders for export...`- },- success: {- title: t`Orders Exported`,- message: t`Your orders have been exported successfully.`,- onRun: () => setDownloadPending(false)+ setDownloadPending(true);+ const blob = await orderClient.exportOrders(eventId);+ downloadBinary(blob, 'orders.xlsx');},- error: {- title: t`Failed to export orders`,- message: t`Please try again.`,- onRun: () => setDownloadPending(false)- }- });+ {+ loading: {+ title: t`Exporting Orders`,+ message: t`Please wait while we prepare your orders for export...`+ },+ success: {+ title: t`Orders Exported`,+ message: t`Your orders have been exported successfully.`,+ onRun: () => setDownloadPending(false)+ },+ error: {+ title: t`Failed to export orders`,+ message: t`Please try again.`,+ onRun: () => setDownloadPending(false)+ }+ });};const currentFilters = {@@ -133,7 +132,7 @@ export const Orders: React.FC = () => {><ButtononClick={() => handleExport(eventId)}- rightSection={<IconDownload size={14} />}+ rightSection={<IconDownload size={14}/>}color="green"loading={downloadPending}size="sm"@@ -142,16 +141,16 @@ export const Orders: React.FC = () => {</Button></ToolBar>- <TableSkeleton isVisible={!orders || ordersQuery.isFetching} />+ <TableSkeleton isVisible={!orders || ordersQuery.isFetching}/>{orders && event && (- <OrdersTable event={event} orders={orders} />+ <OrdersTable event={event} orders={orders}/>)}{!!orders?.length && (<Paginationvalue={searchParams.pageNumber}- onChange={(value) => setSearchParams({ pageNumber: value })}+ onChange={(value) => setSearchParams({pageNumber: value})}total={Number(pagination?.last_page)}/>)}diff --git a/misc/k6/event-hompage-load-test.js b/misc/k6/event-hompage-load-test.jsindex d0e1a99af..c4679e512 100644--- a/misc/k6/event-hompage-load-test.js+++ b/misc/k6/event-hompage-load-test.js@@ -3,11 +3,11 @@ import { check, sleep } from 'k6';export let options = {vus: 50,- duration: '60s', // Using '60s' instead of '60000' for clarity+ duration: '5s',};export default function () {- let res = http.get('https://api.hi.events/public/events/1', {+ let res = http.get('https://api.hi.events/public/events/2', {headers: {'Accept': 'application/json',},