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

Bugfix: PDV obračun u prodaji, magacinski trag nabavke, fiskalizacija servisa, admin/podesavanja greške

Browse Source
This commit is contained in:
Dasko
2026-06-28 16:02:26 +02:00
parent 3475422cb9
commit 147a0d6e88
9 changed files with 136 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/templates/stranice/magacin.html
+7 -1
View File
@@ -79,9 +79,13 @@
<th style="padding:12px 16px;text-align:left;font-size:12px;font-weight:500;color:var(--tekst-jak);">Naziv</th>
<th style="padding:12px 16px;text-align:left;font-size:12px;font-weight:500;color:var(--tekst-jak);">Kategorija</th>
<th style="padding:12px 16px;text-align:center;font-size:12px;font-weight:500;color:var(--tekst-jak);">Količina</th>
{{if index .Moduli "pdv"}}
<th style="padding:12px 16px;text-align:right;font-size:12px;font-weight:500;color:var(--tekst-jak);cursor:pointer;white-space:nowrap;" id="cena-zaglavlje" onclick="toggleCenaPdv()">
Cena <span id="cena-toggle" style="font-size:10px;color:var(--sb-akcent);">▾ bez PDV</span>
</th>
{{else}}
<th style="padding:12px 16px;text-align:right;font-size:12px;font-weight:500;color:var(--tekst-jak);">Cena</th>
{{end}}
<th style="padding:12px 16px;text-align:left;font-size:12px;font-weight:500;color:var(--tekst-jak);">Lokacija</th>
<th style="padding:12px 16px;text-align:center;font-size:12px;font-weight:500;color:var(--tekst-jak);">Akcije</th>
</tr>
@@ -104,7 +108,7 @@
{{end}}
</td>
<td style="padding:12px 16px;text-align:right;font-size:14px;color:var(--tekst-glavni);">
<span class="cena-bez-pdv">{{dinari .ProdajnaCena}}</span><span class="cena-sa-pdv" style="display:none">{{dinari .CenaSaPdv}}</span> din
<span class="cena-bez-pdv">{{dinari .ProdajnaCena}}</span>{{if index $.Moduli "pdv"}}<span class="cena-sa-pdv" style="display:none">{{dinari .CenaSaPdv}}</span>{{end}} din
</td>
<td style="padding:12px 16px;font-size:13px;color:var(--tekst-sporedni);">
{{if .Lokacija}}{{.Lokacija}}{{else}}—{{end}}
@@ -259,6 +263,7 @@ document.body.addEventListener('htmx:afterSwap', function (e) {
rez.classList.remove('bez-anim');
});
{{if index .Moduli "pdv"}}
// toggle cena: bez PDV ↔ sa PDV
var cenaPdvRezim = false; // false = bez PDV
function toggleCenaPdv() {
@@ -270,6 +275,7 @@ function toggleCenaPdv() {
for (var j = 0; j < sa.length; j++) { sa[j].style.display = cenaPdvRezim ? '' : 'none'; }
if (tgl) tgl.textContent = cenaPdvRezim ? '▾ sa PDV' : '▾ bez PDV';
}
{{end}}
</script>
{{end}}