From 203059918bfb71f083c9de3d872d1e2167b5a879 Mon Sep 17 00:00:00 2001 From: fernanda-one Date: Thu, 15 Aug 2024 22:45:07 +0700 Subject: [PATCH] fix: history filter --- internal/repository/orders/order.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/repository/orders/order.go b/internal/repository/orders/order.go index 9723d56..650dcbf 100644 --- a/internal/repository/orders/order.go +++ b/internal/repository/orders/order.go @@ -117,7 +117,8 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Or Select("orders.id as id, users.name as employee, sites.name as site, orders.created_at as timestamp, orders.created_at as booking_time, STRING_AGG(ticket_summary.name || ' x' || ticket_summary.total_qty, ', ') AS tickets, orders.payment_type as payment_type, orders.status as status, orders.amount as amount, orders.visit_date as visit_date, orders.ticket_status as ticket_status, orders.source as source"). Joins("left join (SELECT items.order_id, products.name, SUM(items.qty) AS total_qty FROM order_items items LEFT JOIN products ON items.item_id = products.id GROUP BY items.order_id, products.name) AS ticket_summary ON orders.id = ticket_summary.order_id"). Joins("left join users on orders.created_by = users.id"). - Joins("left join sites on orders.site_id = sites.id") + Joins("left join sites on orders.site_id = sites.id"). + Where("orders.payment_type != ?", "NEW") if req.PaymentType != "" { query = query.Where("orders.payment_type = ?", req.PaymentType)