From 030049befdc47926b94bced4f187dcba8ccea459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Markovi=C4=87?= Date: Mon, 29 Jun 2026 22:35:31 +0200 Subject: [PATCH] Servis detalji: PDV pravilo na cenama radova/delova, bruto u formama, ispravka otpremnice --- internal/model/usluga.go | 4 + web/templates/stranice/servis_detalji.html | 89 +++++++++++++------ web/templates/stranice/servis_otpremnica.html | 2 +- 3 files changed, 68 insertions(+), 27 deletions(-) diff --git a/internal/model/usluga.go b/internal/model/usluga.go index 555b59b..481383f 100644 --- a/internal/model/usluga.go +++ b/internal/model/usluga.go @@ -15,3 +15,7 @@ type Usluga struct { Arhiviran bool DatumUnosa string } + +func (u Usluga) CenaSaPdv() float64 { + return u.Cena * (1 + u.PdvStopa/100) +} diff --git a/web/templates/stranice/servis_detalji.html b/web/templates/stranice/servis_detalji.html index a006c5b..c5bca6c 100644 --- a/web/templates/stranice/servis_detalji.html +++ b/web/templates/stranice/servis_detalji.html @@ -557,7 +557,7 @@
— odaberi uslugu —
- {{range .Usluge}}{{if not (index $.KorisceneUsluge .ID)}}
{{.Naziv}}{{dinari .Cena}} din
{{end}}{{end}} + {{range .Usluge}}{{if not (index $.KorisceneUsluge .ID)}}
{{.Naziv}}{{if index $.Moduli "pdv"}}{{dinari (.CenaSaPdv)}}{{else}}{{dinari .Cena}}{{end}} din
{{end}}{{end}}
@@ -567,8 +567,9 @@
- - + + +
@@ -602,7 +603,7 @@ {{.Kolicina}} {{dinari .CenaKomada}} din {{if index $.Moduli "pdv"}}{{printf "%.0f" .PdvStopa}}%{{end}} - {{dinari .Ukupno}} din + {{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}} din{{else}}{{dinari .Ukupno}} din{{end}} {{if index $.Moduli "pdv"}}{{dinari .CenaSaPdv}} din{{end}} {{if and (not $.ZakljucaniUgradjeni) (index $.Dozvole "servis.izmeni")}} @@ -625,7 +626,7 @@ {{.Kolicina}} {{dinari .CenaKomada}} din {{if index $.Moduli "pdv"}}{{printf "%.0f" .PdvStopa}}%{{end}} - {{dinari .Ukupno}} din + {{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}} din{{else}}{{dinari .Ukupno}} din{{end}} {{if index $.Moduli "pdv"}}{{dinari .CenaSaPdv}} din{{end}} {{if and (index $.Dozvole "servis.izmeni") (ne $.Nalog.Status "U popravci")}} @@ -695,8 +696,9 @@
- - + + +
@@ -735,7 +737,7 @@ {{if index $.Moduli "pdv"}}{{printf "%.0f" .PdvStopa}}%{{end}} - {{if .Kolicina}}{{dinari .Ukupno}} din{{else}}—{{end}} + {{if .Kolicina}}{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}} din{{else}}{{dinari .Ukupno}} din{{end}}{{else}}—{{end}} {{if index $.Moduli "pdv"}} {{if .Kolicina}}{{dinari .CenaSaPdv}} din{{else}}—{{end}} @@ -766,7 +768,7 @@ {{if index $.Moduli "pdv"}}{{printf "%.0f" .PdvStopa}}%{{end}} - {{if .Kolicina}}{{dinari .Ukupno}} din{{else}}—{{end}} + {{if .Kolicina}}{{if index $.Moduli "pdv"}}{{dinari .UkupnoSaPdv}} din{{else}}{{dinari .Ukupno}} din{{end}}{{else}}—{{end}} {{if index $.Moduli "pdv"}} {{if .Kolicina}}{{dinari .CenaSaPdv}} din{{else}}—{{end}} @@ -804,6 +806,7 @@