update

internal/repository/orders/order.go

@@ -141,9 +141,8 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Or
 
 	query := b.db.Table("orders").
 		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 (SELECT items.order_id, products.name, SUM(items.quantity) 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").
 		Where("orders.payment_type != ?", "NEW")
 
 	if req.PaymentType != "" {
@@ -176,7 +175,7 @@ func (b *OrderRepository) GetAllHystoryOrders(ctx context.Context, req entity.Or
 	}
 
 	if req.SiteID != nil {
-		query = query.Where("orders.site_id = ?", req.SiteID)
+		query = query.Where("orders.partner_id = ?", req.SiteID)
 	}
 
 	if req.Source != "" {
@@ -253,10 +252,6 @@ func (r *OrderRepository) SumAmount(ctx mycontext.Context, req entity.OrderSearc
 		query = query.Where("orders.partner_id = ?", req.PartnerID)
 	}
 
-	if req.SiteID != nil {
-		query = query.Where("orders.site_id = ?", req.SiteID)
-	}
-
 	if err := query.Scan(&amount).Error; err != nil {
 		logger.ContextLogger(ctx).Error("error when get cash amount", zap.Error(err))
 		return nil, err