Dasko/GoNtech
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge feature/prodaja-fiskal-retry → develop

Browse Source
This commit is contained in:
Dasko
2026-07-01 11:36:59 +02:00
parent 75a3270c20 0f47c3e56b
commit bd5a63511b
6 changed files with 160 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/templates/stranice/prodaja.html
+2
View File
@@ -37,6 +37,7 @@
<td style="padding: 12px 16px; font-size: 13px; font-family: monospace; color: var(--tekst-glavni)">
{{.BrojNaloga}}
{{if .Stornirano}}<span class="status-badge status-stornirano" style="margin-left: 8px">Stornirano</span>{{end}}
{{if index $.NemaFiskalnog .ID}}<span style="display:inline-block;margin-left:6px;font-size:10px;font-weight:600;padding:1px 6px;border-radius:4px;background:#fef3c7;color:#92400e;border:1px solid #fde68a;vertical-align:middle;" title="Fiskalni račun nije izdat">!</span>{{end}}
</td>
<td style="padding: 12px 16px; font-size: 13px; color: var(--tekst-sporedni); white-space: nowrap">{{.Datum.Format "02.01.2006."}}</td>
<td style="padding: 12px 16px; font-size: 14px; font-weight: 500; color: var(--tekst-glavni)">{{if .KlijentNaziv}}{{.KlijentNaziv}}{{else}}—{{end}}</td>
@@ -76,6 +77,7 @@
<div style="font-size: 13px; font-family: monospace; color: var(--tekst-glavni)">
{{.BrojNaloga}}
{{if .Stornirano}}<span class="status-badge status-stornirano" style="margin-left: 8px">Stornirano</span>{{end}}
{{if index $.NemaFiskalnog .ID}}<span style="display:inline-block;margin-left:4px;font-size:10px;font-weight:600;padding:1px 5px;border-radius:4px;background:#fef3c7;color:#92400e;border:1px solid #fde68a;vertical-align:middle;" title="Fiskalni račun nije izdat">!</span>{{end}}
</div>
<div style="font-size: 14px; font-weight: 500; color: var(--tekst-glavni); margin-top: 2px">{{if .KlijentNaziv}}{{.KlijentNaziv}}{{else}}Bez klijenta{{end}}</div>
<div style="font-size: 12px; color: var(--tekst-sporedni); margin-top: 2px">{{.Datum.Format "02.01.2006."}}</div>
web/templates/stranice/prodaja_detalji.html
+17
View File
@@ -286,6 +286,23 @@
</div>
{{end}}
{{if .FiskalGreska}}
<div class="fiskalni-racun" style="padding:14px;border:1.5px solid #f59e0b;border-radius:8px;background:color-mix(in srgb,#fef3c7 60%,var(--pozadina));">
<div style="display:flex;align-items:center;gap:12px;flex-wrap:wrap;">
<div style="flex:1;">
<div style="font-size:14px;font-weight:600;color:#92400e;margin-bottom:4px;">⚠ Fiskalni račun nije izdat</div>
<div style="font-size:13px;color:#78350f;">Veza sa ESIR/PFR serverom nije bila dostupna pri kreiranju prodaje.</div>
</div>
{{if index $.Dozvole "prodaja.dodaj"}}
<form method="POST" action="/prodaja/{{.Nalog.ID}}/fiskalizuj">
<input type="hidden" name="_csrf" value="{{.CsrfToken}}">
<button type="submit" class="btn-primarno" style="background:#d97706;border-color:#d97706;white-space:nowrap;">Pokušaj ponovo</button>
</form>
{{end}}
</div>
</div>
{{end}}
{{if index $.Dozvole "prodaja.obrisi"}}
<div style="display:flex;align-items:flex-start;gap:12px;flex-wrap:wrap;padding-top:14px;border-top:0.5px solid var(--ivica);">
<div style="flex:1;min-width:200px;">