From 67d3529980149b9f0b0d2ce2e29865cbe3c374fe Mon Sep 17 00:00:00 2001 From: "aditya.siregar" Date: Thu, 22 Aug 2024 02:38:22 +0700 Subject: [PATCH] Add Integartion --- internal/repository/orders/order.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/internal/repository/orders/order.go b/internal/repository/orders/order.go index 702c386..4f5823d 100644 --- a/internal/repository/orders/order.go +++ b/internal/repository/orders/order.go @@ -211,14 +211,12 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Or } func (r *OrderRepository) CountSoldOfTicket(ctx mycontext.Context, req entity.OrderSearch) (*entity.TicketSoldDB, error) { - today := time.Now().Format("2006-01-02") ticketCount := new(entity.TicketSoldDB) 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.created_at = ?", today) + Where("orders.status = ?", "PAID") if !req.IsAdmin { query = query.Where("orders.partner_id = ?", req.PartnerID) @@ -234,14 +232,17 @@ func (r *OrderRepository) CountSoldOfTicket(ctx mycontext.Context, req entity.Or func (r *OrderRepository) SumAmount(ctx mycontext.Context, req entity.OrderSearch) (*entity.OrderDB, error) { amount := new(entity.OrderDB) - today := time.Now().Format("2006-01-02") query := r.db.Table("orders"). Select("sum(amount) as amount"). - Where("payment_type = ?", req.PaymentType). - Where("date(created_at) = ?", today). Where("status = ?", "PAID") + if req.PaymentType == "CASH" { + query = query.Where("payment_type = ?", req.PaymentType) + } else { + query = query.Where("payment_type != ?", "CASH") + } + if req.PartnerID != nil { query = query.Where("orders.partner_id = ?", req.PartnerID) }