apksel-dev/apskel-pos-backend
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: order history get data from all time, to montly

Browse Source
This commit is contained in:
fernanda-one 2024-08-28 06:14:03 +07:00
parent 1f3e98df7f
commit fb5632c56e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/repository/orders/order.go
View File

@ -168,6 +168,11 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Or
endDate := req.EndDate + " 23:59:59" endDate := req.EndDate + " 23:59:59"
query = query.Where("orders.created_at BETWEEN ? AND ?", startDate, endDate) 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 { if req.SiteID != nil {
@ -215,7 +220,8 @@ func (r *OrderRepository) CountSoldOfTicket(ctx mycontext.Context, req entity.Or
query := r.db.Table("orders"). query := r.db.Table("orders").
Select("sum(items.qty) as count"). Select("sum(items.qty) as count").
Joins("left join order_items items on orders.id = items.order_id"). 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 { if !req.IsAdmin {
query = query.Where("orders.partner_id = ?", req.PartnerID) 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"). query := r.db.Table("orders").
Select("sum(amount) as amount"). 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" { if req.PaymentType == "CASH" {
query = query.Where("payment_type = ?", req.PaymentType) query = query.Where("payment_type = ?", req.PaymentType)