From fb5632c56e0f114787d58df1e911f43e94b472f6 Mon Sep 17 00:00:00 2001 From: fernanda-one Date: Wed, 28 Aug 2024 06:14:03 +0700 Subject: [PATCH] fix: order history get data from all time, to montly --- internal/repository/orders/order.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/internal/repository/orders/order.go b/internal/repository/orders/order.go index 50d2216..b3d93fd 100644 --- a/internal/repository/orders/order.go +++ b/internal/repository/orders/order.go @@ -168,6 +168,11 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Or endDate := req.EndDate + " 23:59:59" query = query.Where("orders.created_at BETWEEN ? AND ?", startDate, endDate) + } else { + currentTime := time.Now() + startOfMonth := time.Date(currentTime.Year(), currentTime.Month(), 1, 0, 0, 0, 0, time.Local) + endOfMonth := startOfMonth.AddDate(0, 1, -1) + query = query.Where("orders.created_at BETWEEN ? AND ?", startOfMonth, endOfMonth) } if req.SiteID != nil { @@ -215,7 +220,8 @@ func (r *OrderRepository) CountSoldOfTicket(ctx mycontext.Context, req entity.Or query := r.db.Table("orders"). Select("sum(items.qty) as count"). Joins("left join order_items items on orders.id = items.order_id"). - Where("orders.status = ?", "PAID") + Where("orders.status = ?", "PAID"). + Where("EXTRACT(MONTH FROM orders.created_at) = ?", time.Now().Month()) if !req.IsAdmin { query = query.Where("orders.partner_id = ?", req.PartnerID) @@ -234,7 +240,8 @@ func (r *OrderRepository) SumAmount(ctx mycontext.Context, req entity.OrderSearc query := r.db.Table("orders"). Select("sum(amount) as amount"). - Where("status = ?", "PAID") + Where("status = ?", "PAID"). + Where("EXTRACT(MONTH FROM orders.created_at) = ?", time.Now().Month()) if req.PaymentType == "CASH" { query = query.Where("payment_type = ?", req.PaymentType)