Nabavke/Servis: nabavna cena u modalu, QR kod na otpremnici

- Modal +Novi artikal u nabavkama dobio polje nabavne cene pored prodajne
- QR kod dodat u zaglavlje otpremnice (isti mehanizam kao na radnom nalogu)
This commit is contained in:
2026-06-20 01:37:34 +02:00
parent 10f62abf84
commit 32d7813be6
4 changed files with 39 additions and 11 deletions
+3
View File
@@ -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())
+11 -5
View File
@@ -317,11 +317,17 @@
</div>
</div>
<div>
<label class="polje-labela">Prodajna cena (din)</label>
<input type="number" x-model="modalCena" min="0" step="0.01"
placeholder="0"
style="width:100%;">
<div style="display:grid;grid-template-columns:1fr 1fr;gap:12px;">
<div>
<label class="polje-labela">Nabavna cena (din)</label>
<input type="number" x-model="modalNabavnaCena" min="0" step="0.01"
placeholder="0" style="width:100%;">
</div>
<div>
<label class="polje-labela">Prodajna cena (din)</label>
<input type="number" x-model="modalCena" min="0" step="0.01"
placeholder="0" style="width:100%;">
</div>
</div>
<div>
+13 -6
View File
@@ -88,12 +88,19 @@
{{if .PIB}}PIB: {{.PIB}}{{end}}
</div>
</div>
<div class="dok-naslov">
<div class="dok-tip">Otpremnica</div>
<div class="dok-broj">{{.Nalog.BrojNaloga}}</div>
<div class="dok-datum">Datum: {{.Nalog.DatumPrijema.Format "02.01.2006."}}</div>
{{if .Nalog.DatumZavrsetka}}
<div class="dok-datum">Završeno: {{.Nalog.DatumZavrsetka.Format "02.01.2006."}}</div>
<div style="display:flex;align-items:flex-start;gap:14px;">
<div class="dok-naslov">
<div class="dok-tip">Otpremnica</div>
<div class="dok-broj">{{.Nalog.BrojNaloga}}</div>
<div class="dok-datum">Datum: {{.Nalog.DatumPrijema.Format "02.01.2006."}}</div>
{{if .Nalog.DatumZavrsetka}}
<div class="dok-datum">Završeno: {{.Nalog.DatumZavrsetka.Format "02.01.2006."}}</div>
{{end}}
</div>
{{if .QRKod}}
<img src="data:image/png;base64,{{.QRKod}}" width="76" height="76"
alt="QR {{.Nalog.BrojNaloga}}"
style="image-rendering:pixelated;border:1px solid #ddd;border-radius:4px;flex-shrink:0;">
{{end}}
</div>
</div>