diff --git a/internal/handler/servis.go b/internal/handler/servis.go index 2b118d4..fc7c5fd 100644 --- a/internal/handler/servis.go +++ b/internal/handler/servis.go @@ -680,6 +680,7 @@ type PodaciOtpremnice struct { UkupnoDelovi float64 PreostaloSve float64 ImaAvans bool + QRKod string Klijent *model.Klijent KlijentNaziv string TehnicarNaziv string @@ -757,12 +758,23 @@ func (h *Handler) StampaOtpremnice(w http.ResponseWriter, r *http.Request) { } } + nalogURL := "http" + if r.TLS != nil { + nalogURL += "s" + } + nalogURL += "://" + r.Host + "/servis/" + strconv.FormatInt(id, 10) + var qrKodOtpr string + if png, err := qrcode.Encode(nalogURL, qrcode.Medium, 160); err == nil { + qrKodOtpr = base64.StdEncoding.EncodeToString(png) + } + h.renderujStandalone(w, "servis_otpremnica", PodaciOtpremnice{ Nalog: *nalog, ServisniDelovi: delovi, UkupnoDelovi: ukupnoDelovi, PreostaloSve: preostaloSve, ImaAvans: imaAvans, + QRKod: qrKodOtpr, Klijent: klijent, KlijentNaziv: klijentNaziv, TehnicarNaziv: tehnicarNaziv, diff --git a/web/static/js/ntech.js b/web/static/js/ntech.js index 92c0a63..571c5d6 100644 --- a/web/static/js/ntech.js +++ b/web/static/js/ntech.js @@ -201,6 +201,7 @@ document.addEventListener('alpine:init', () => { modalOpis: '', modalKolicina: '', modalKolicinaMin: '', + modalNabavnaCena: '', modalCena: '', modalLokacija: '', modalNapomena: '', @@ -313,6 +314,7 @@ document.addEventListener('alpine:init', () => { this.modalOpis = '' this.modalKolicina = '' this.modalKolicinaMin = '' + this.modalNabavnaCena = '' this.modalCena = '' this.modalLokacija = '' this.modalNapomena = '' @@ -334,6 +336,7 @@ document.addEventListener('alpine:init', () => { params.append('opis', this.modalOpis.trim()) if (this.modalKolicina) params.append('kolicina', this.modalKolicina) if (this.modalKolicinaMin) params.append('kolicina_min', this.modalKolicinaMin) + if (this.modalNabavnaCena) params.append('nabavna_cena', this.modalNabavnaCena) if (this.modalCena) params.append('prodajna_cena', this.modalCena) params.append('lokacija', this.modalLokacija.trim()) params.append('napomena', this.modalNapomena.trim()) diff --git a/web/templates/stranice/nabavka_forma.html b/web/templates/stranice/nabavka_forma.html index 1851d32..822ffd1 100644 --- a/web/templates/stranice/nabavka_forma.html +++ b/web/templates/stranice/nabavka_forma.html @@ -317,11 +317,17 @@ -