From 815076eac680e1c8c539cd7171ec07048f0e9216 Mon Sep 17 00:00:00 2001 From: Filip Borum Poulsen Date: Mon, 24 Apr 2023 20:21:08 +0200 Subject: [PATCH] User and Trainer order view should also display orders awaiting payment --- server/src/routes/order.ts | 3 ++- server/src/routes/trainer/order.ts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/routes/order.ts b/server/src/routes/order.ts index 04d2284..f5fec28 100644 --- a/server/src/routes/order.ts +++ b/server/src/routes/order.ts @@ -89,7 +89,8 @@ router.get("/order", UserAuth, async (req: AuthedRequest, res: Response) => { WHERE orders.user_id = $1 AND ( - orders.order_status = 'Confirmed' + orders.order_status = 'Created' + OR orders.order_status = 'Confirmed' OR orders.order_status = 'CancelledByTrainer' OR orders.order_status = 'CancelledByUser' ) diff --git a/server/src/routes/trainer/order.ts b/server/src/routes/trainer/order.ts index 8e56c21..3221940 100644 --- a/server/src/routes/trainer/order.ts +++ b/server/src/routes/trainer/order.ts @@ -60,7 +60,8 @@ router.get("/trainer/order", TrainerAuth, async (req: AuthedRequest, res: Respon WHERE trainers.user_id = $1 AND ( - orders.order_status = 'Confirmed' + orders.order_status = 'Created' + OR orders.order_status = 'Confirmed' OR orders.order_status = 'CancelledByTrainer' OR orders.order_status = 'CancelledByUser' )