From 38d8766b92c1236199360b373731e78f869c9cfc Mon Sep 17 00:00:00 2001 From: Kevin Midboe Date: Fri, 23 Dec 2022 21:59:50 +0100 Subject: [PATCH] Add customer struct, date and updated html template --- mail-templates/order-confirmation.html | 66 +++++++++++++++----------- mail/order_confirmation.go | 23 ++++++++- 2 files changed, 59 insertions(+), 30 deletions(-) diff --git a/mail-templates/order-confirmation.html b/mail-templates/order-confirmation.html index 53fc0bb..2b34209 100644 --- a/mail-templates/order-confirmation.html +++ b/mail-templates/order-confirmation.html @@ -82,7 +82,11 @@ } .btn:hover tbody tr td { - background-color: red !important; + background-color: white !important; + border-color: #18332F !important; + } + .btn:hover tbody tr td a { + color: #18332F !important; } @@ -98,38 +102,35 @@ -

{{.PageTitle}}

+

{{.PageTitle}}

-

planetposen.no

+

{{ .Site }}

diff --git a/mail/order_confirmation.go b/mail/order_confirmation.go index 7886ffd..8d8af55 100644 --- a/mail/order_confirmation.go +++ b/mail/order_confirmation.go @@ -3,6 +3,7 @@ package mail import ( "context" "fmt" + "time" ) type OrderMailSender interface { @@ -10,25 +11,39 @@ type OrderMailSender interface { } type Product struct { + ProductNo int Name string Image string - Description string Quantity int Price float32 Currency string } +type Customer struct { + FirstName string + LastName string + StreetAddress string + ZipCode string + City string +} + type OrderConfirmationData struct { // PageTitle string Email string OrderId string + Customer Customer Products []Product + Sum float32 } type EmailTemplateData struct { PageTitle string + Site string + Date string OrderId string + Customer Customer Products []Product + Sum float32 } type OrderConfirmationEmailData struct { @@ -48,9 +63,13 @@ type Record struct { func OrderConfirmation(payload OrderConfirmationData) (*OrderConfirmationEmailData, error) { var emailTemplate EmailTemplateData - emailTemplate.PageTitle = "Planetposen purchase" + emailTemplate.PageTitle = "Ordrebekreftelse fra planetposen.no" + emailTemplate.Site = "https://planet.schleppe.cloud" + emailTemplate.Date = time.Now().Format("2006-01-02") + emailTemplate.Sum = payload.Sum emailTemplate.OrderId = payload.OrderId emailTemplate.Products = payload.Products + emailTemplate.Customer = payload.Customer orderConfirmationEmailData := buildOrderConfirmation(emailTemplate) if orderConfirmationEmailData == nil {