Skip to content

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 ⭐️

Fix: Include attendees from offline payment order in exports (#550)

Dave Earleye24e45dc5534
diff --git a/backend/app/Repository/Eloquent/AttendeeRepository.php b/backend/app/Repository/Eloquent/AttendeeRepository.php
index 92df6f4d9..a4ddf537a 100644
--- a/backend/app/Repository/Eloquent/AttendeeRepository.php
+++ b/backend/app/Repository/Eloquent/AttendeeRepository.php
@@ -37,7 +37,11 @@ class AttendeeRepository extends BaseRepository implements AttendeeRepositoryInt
$this->model->select('attendees.*');
$this->model->join('orders', 'orders.id', '=', 'attendees.order_id');
- $this->model->whereIn('orders.status', [OrderStatus::COMPLETED->name, OrderStatus::CANCELLED->name]);
+ $this->model->whereIn('orders.status', [
+ OrderStatus::AWAITING_OFFLINE_PAYMENT->name,
+ OrderStatus::COMPLETED->name,
+ OrderStatus::CANCELLED->name
+ ]);
$model = $this->model->limit(10000)->get();
$this->resetModel();
diff --git a/frontend/src/mutations/useExportAnswers.ts b/frontend/src/mutations/useExportAnswers.ts
index ab2842071..6f1102577 100644
--- a/frontend/src/mutations/useExportAnswers.ts
+++ b/frontend/src/mutations/useExportAnswers.ts
@@ -22,7 +22,9 @@ export const useExportAnswers = (eventId: IdParam) => {
const query = useQuery({
queryKey: ["exportStatus", jobUuid],
queryFn: async () => {
- if (!jobUuid) return null;
+ if (!jobUuid) {
+ return null;
+ }
try {
const data = await questionClient.checkExportStatus(eventId, jobUuid);
@@ -46,10 +48,13 @@ export const useExportAnswers = (eventId: IdParam) => {
}
},
enabled: !!jobUuid,
- refetchInterval: (data) => (data?.status === "IN_PROGRESS"
- ? 5000
- : false
- ),
+ refetchInterval: (data) => {
+ const status = data?.state?.data?.status;
+ return (status === "IN_PROGRESS"
+ ? 5000
+ : false
+ );
+ },
});
return {