From d0be5a3098dcf10d111c811750a23e782f608b8f Mon Sep 17 00:00:00 2001
From: meskio <meskio@sindominio.net>
Date: Sat, 23 Jan 2021 18:23:01 +0100
Subject: [PATCH] Get the right information from DB to display orders
---
api/db/order.go | 4 ++--
api/mail.go | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/api/db/order.go b/api/db/order.go
index 88297cf..315ab73 100644
--- a/api/db/order.go
+++ b/api/db/order.go
@@ -78,7 +78,7 @@ func (d *DB) GetOrder(memberNum int, id int) (order Order, transaction Transacti
}
err = d.db.Where("member = ? AND type = 'order' AND order_id = ?", memberNum, id).
- Preload("OrderPurchase.OrderProduct").
+ Preload("OrderPurchase.OrderProduct.Product").
Find(&transaction).Error
return
}
@@ -391,7 +391,7 @@ func (d *DB) DeactivateOrders() []Order {
t := time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, time.Local)
err := d.db.Where("active = ? AND deadline < ?", true, t).
Preload("Member").
- Preload("Transactions.OrderPurchase.OrderProduct").
+ Preload("Transactions.OrderPurchase.OrderProduct.Product").
Preload("Transactions.Member").
Find(&orders).Error
if err != nil {
diff --git a/api/mail.go b/api/mail.go
index 1b709af..7c97aea 100644
--- a/api/mail.go
+++ b/api/mail.go
@@ -25,7 +25,7 @@ Se han pedido:{{range $name, $amount := .Products}}
Las siguientes personas han pedido:
{{range $name, $purchases := .Purchases}}
{{$name}}:{{range $purchases}}
- * {{.Product.Name}}: {{.Amount}}{{end}}
+ * {{.OrderProduct.Product.Name}}: {{.Amount}}{{end}}
{{end}}
Salud y garbancicos.
--
GitLab