New Abo cost for calendar year, not month (in the perspective of the customer)
This commit is contained in:
parent
a8f17eed19
commit
717fac9efd
10
main.go
10
main.go
|
|
@ -12,7 +12,7 @@ import (
|
||||||
func getConfigFromEnv(item string) string {
|
func getConfigFromEnv(item string) string {
|
||||||
value := os.Getenv("CONFIG_ENVVAR")
|
value := os.Getenv("CONFIG_ENVVAR")
|
||||||
if value == "" {
|
if value == "" {
|
||||||
value = "ADDRESS,INITIALCOST,MONTHLYCOST"
|
value = "ADDRESS,INITIALCOST,YEARLYCOST"
|
||||||
}
|
}
|
||||||
configArr := strings.Split(value, ",")
|
configArr := strings.Split(value, ",")
|
||||||
|
|
||||||
|
|
@ -27,7 +27,7 @@ func getConfigFromEnv(item string) string {
|
||||||
return configArr[0]
|
return configArr[0]
|
||||||
case "initialcost":
|
case "initialcost":
|
||||||
return configArr[1]
|
return configArr[1]
|
||||||
case "monthlycost":
|
case "yearlycost":
|
||||||
return configArr[2]
|
return configArr[2]
|
||||||
default:
|
default:
|
||||||
return "NOTFOUND"
|
return "NOTFOUND"
|
||||||
|
|
@ -67,7 +67,7 @@ func serveTemplate(w http.ResponseWriter, r *http.Request) {
|
||||||
var datetimestring = t.Format("20060102150405")
|
var datetimestring = t.Format("20060102150405")
|
||||||
var address = template.HTML(getConfigFromEnv("address"))
|
var address = template.HTML(getConfigFromEnv("address"))
|
||||||
var initialcost = getConfigFromEnv("initialcost")
|
var initialcost = getConfigFromEnv("initialcost")
|
||||||
var monthlycost = getConfigFromEnv("monthlycost")
|
var yearlycost = getConfigFromEnv("yearlycost")
|
||||||
var scales = getMyDevs(userName)
|
var scales = getMyDevs(userName)
|
||||||
var last_metrics []OneMetric
|
var last_metrics []OneMetric
|
||||||
|
|
||||||
|
|
@ -93,7 +93,7 @@ func serveTemplate(w http.ResponseWriter, r *http.Request) {
|
||||||
DateTimeString string
|
DateTimeString string
|
||||||
Address template.HTML
|
Address template.HTML
|
||||||
InitialCost string
|
InitialCost string
|
||||||
MonthlyCost string
|
YearlyCost string
|
||||||
Scales []string
|
Scales []string
|
||||||
LastMetrics []OneMetric
|
LastMetrics []OneMetric
|
||||||
QueryValues map[string][]string
|
QueryValues map[string][]string
|
||||||
|
|
@ -102,7 +102,7 @@ func serveTemplate(w http.ResponseWriter, r *http.Request) {
|
||||||
datetimestring,
|
datetimestring,
|
||||||
address,
|
address,
|
||||||
initialcost,
|
initialcost,
|
||||||
monthlycost,
|
yearlycost,
|
||||||
scales,
|
scales,
|
||||||
last_metrics,
|
last_metrics,
|
||||||
query_values,
|
query_values,
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,11 @@
|
||||||
<div>
|
<div>
|
||||||
<div class="message is-danger">
|
<div class="message is-danger">
|
||||||
<div class="message-body">
|
<div class="message-body">
|
||||||
Kann ab sofort für {{ .MonthlyCost }} pro Monat gemietet werden.
|
Kann ab sofort gemietet werden. Abokosten pro Kalenderjahr: {{ .YearlyCost }}
|
||||||
<br /><br />
|
<br /><br />
|
||||||
Hier gibt es einen <a href="static/files/mini-beieli-kurzbeschrieb.pdf" target="_blank">Kurzbeschrieb</a>, hier ein paar <a href="/images.html">Bilder</a>.
|
Hier gibt es einen <a href="static/files/mini-beieli-kurzbeschrieb.pdf" target="_blank">Kurzbeschrieb</a>, hier ein paar <a href="/images.html">Bilder</a>.
|
||||||
<br /><br />
|
<br /><br />
|
||||||
Einmalige Kosten pro Waage: {{ .InitialCost }} (so lange Vorrat)
|
Einmalige Kosten pro Waage: {{ .InitialCost }} (so lange Vorrat, beinhaltet das Abo für das erste Kalenderjahr)
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue