franconian
/
matrix-pretix
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

Calculate per-category sub-totals
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Luca 2023-03-06 00:42:51 +01:00
parent ab9447591b
commit a61e057cfb
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/pretix/order_placed.go
View File

@ -23,6 +23,8 @@ const (
var adverbs = []string{" Außerdem ", " Zusätzlich ", " Weiterhin ", " Des Weiteren "} var adverbs = []string{" Außerdem ", " Zusätzlich ", " Weiterhin ", " Des Weiteren "}
type categoryBin struct { type categoryBin struct {
Cents uint
Euros uint
NumFree uint NumFree uint
NumPaid uint NumPaid uint
} }
@ -77,7 +79,6 @@ func (s Server) orderPlaced(w http.ResponseWriter, r *http.Request) {
Item uint Item uint
Price string Price string
} }
Total string
}{} }{}
err = decoder.Decode(&order) err = decoder.Decode(&order)
@ -111,6 +112,12 @@ func (s Server) orderPlaced(w http.ResponseWriter, r *http.Request) {
category := categories[name] category := categories[name]
if euros > 0 || cents > 0 { if euros > 0 || cents > 0 {
category.Cents += cents
if carry := category.Cents / 100; carry > 0 {
category.Cents -= carry * 100
category.Euros += carry
}
category.Euros += euros
category.NumPaid++ category.NumPaid++
} else { } else {
category.NumFree++ category.NumFree++
@ -154,15 +161,15 @@ func (s Server) orderPlaced(w http.ResponseWriter, r *http.Request) {
preposition = `aus der Kategorie "` preposition = `aus der Kategorie "`
quote = `" ` quote = `" `
} }
if totalEuros, totalCents, err := parsePrice(order.Total); err == nil && (totalEuros > 0 || totalCents > 0) { if bin.Euros > 0 || bin.Cents > 0 {
var adverb, fraction string var adverb, fraction string
if bin.NumPaid > 1 { if bin.NumPaid > 1 {
adverb = "insgesamt " adverb = "insgesamt "
} }
if totalCents > 0 { if bin.Cents > 0 {
fraction = fmt.Sprintf(",%02d", totalCents) fraction = fmt.Sprintf(",%02d", bin.Cents)
} }
total = fmt.Sprint("für ", adverb, totalEuros, fraction, " Euro ") total = fmt.Sprint("für ", adverb, bin.Euros, fraction, " Euro ")
} }
body.WriteString(fmt.Sprint(adverb, verb, free, conjunction, paid, noun, preposition, category, quote, total, "bestellt.")) body.WriteString(fmt.Sprint(adverb, verb, free, conjunction, paid, noun, preposition, category, quote, total, "bestellt."))