diff --git a/api/db/order.go b/api/db/order.go index 88297cff9385023c32bf29deae37e78ba9a8842f..315ab731b79802d1c0cbff318e436e19b91e32fb 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 1b709af451968475e1dfa6455865ac2eebdbd1cf..7c97aea3f6741da680c3fb4ffb25a08ec24de8d1 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.