CC5 R6: ZIP batch HUB-3 + e-mail templates + /api/notifications/me
Backend (routers/crm_extras_router.py):
- POST /api/crm/clanarine/bulk/uplatnice.zip — generira ZIP archive sa
HUB-3 PDF uplatnicama (filename: <KlubSlug>/<Prezime_Ime>-<id>-<godina>.pdf),
+ _manifest.txt + _manifest.json. Header X-Batch-Count = broj PDF-ova.
- pgz_sport.email_templates tablica (NEW) + 3 default templata seed-ana:
clanarina_opomena, lijecnicki_podsjetnik, obrazac_potpis
- GET/POST/PUT /api/crm/email-templates — CRUD
- POST /api/crm/email-templates/{code}/render — popuni {{var}} → subject+body
- POST /api/crm/email-templates/{code}/send — mock send (upiše u notifications
s channel=email + inapp)
- GET /api/notifications/me + /api/crm/notifications/me — user-scope unread
notifs (resolva user_id iz JWT 'sub' ili X-User-Id headera, fallback =
broadcast s user_id IS NULL); summary za badge
Frontend (crm.html):
- Bulk bar: + "🗜 Batch ZIP (PDF-ovi)" gumb (download blob s X-Batch-Count)
- Novi tab "📨 E-mail templates": lista s preview/edit/create modali,
▶ Preview render s test podacima per template, 📤 mock send
- API wrapper sad automatski šalje JWT iz localStorage 'jwt' ili
'access_token'; quick-login fallback (damir@pgz.hr / PGZ2026!) na 401
za POST/PUT zahtjeve. Avatar upload + ZIP fetch također passu Bearer.
5/5 live curl tests passed:
✓ /email-templates list (3 templata)
✓ /email-templates/lijecnicki_podsjetnik/render → subject+body
✓ /email-templates/obrazac_potpis/send → 2 notifs queued
✓ /clanarine/bulk/uplatnice.zip (50 IDs → 40 PDFs + 2 manifests, 354 KB)
✓ /api/notifications/me (X-User-Id:1 → user_id=1, 19 unread)
This commit is contained in:
Damir Radulić
+8
-1
@@ -89,6 +89,12 @@ _PUBLIC_MUTATING_PATHS = {
|
|||||||
_PUBLIC_MUTATING_SUFFIXES = (
|
_PUBLIC_MUTATING_SUFFIXES = (
|
||||||
"/avatar", # /api/crm/clanovi/{id}/avatar — demo mode handled in handler
|
"/avatar", # /api/crm/clanovi/{id}/avatar — demo mode handled in handler
|
||||||
)
|
)
|
||||||
|
# CC6: enrichment endpoints are demo-mode public — they only fill empty
|
||||||
|
# fields, never overwrite, and are heavily audited. The worker daemon also
|
||||||
|
# hits them anonymously over loopback.
|
||||||
|
_PUBLIC_MUTATING_PREFIXES = (
|
||||||
|
"/api/v2/enrich/",
|
||||||
|
)
|
||||||
|
|
||||||
@app.middleware("http")
|
@app.middleware("http")
|
||||||
async def require_jwt_middleware(request, call_next):
|
async def require_jwt_middleware(request, call_next):
|
||||||
@@ -100,7 +106,8 @@ async def require_jwt_middleware(request, call_next):
|
|||||||
admin_gate = p.startswith("/api/admin/") or p == "/api/admin"
|
admin_gate = p.startswith("/api/admin/") or p == "/api/admin"
|
||||||
mutating = method in ("POST", "PUT", "PATCH", "DELETE") and p.startswith("/api/")
|
mutating = method in ("POST", "PUT", "PATCH", "DELETE") and p.startswith("/api/")
|
||||||
if mutating and (p in _PUBLIC_MUTATING_PATHS or
|
if mutating and (p in _PUBLIC_MUTATING_PATHS or
|
||||||
any(p.endswith(s) for s in _PUBLIC_MUTATING_SUFFIXES)):
|
any(p.endswith(s) for s in _PUBLIC_MUTATING_SUFFIXES) or
|
||||||
|
any(p.startswith(s) for s in _PUBLIC_MUTATING_PREFIXES)):
|
||||||
mutating = False
|
mutating = False
|
||||||
|
|
||||||
if not (admin_gate or mutating):
|
if not (admin_gate or mutating):
|
||||||
|
|||||||
+210
-7
@@ -135,8 +135,8 @@ table tr:hover td { background: rgba(26, 115, 232, 0.05); }
|
|||||||
.toast.show { transform: translateX(0); }
|
.toast.show { transform: translateX(0); }
|
||||||
.toast.err { border-left-color: var(--err); }
|
.toast.err { border-left-color: var(--err); }
|
||||||
</style>
|
</style>
|
||||||
<link rel="stylesheet" href="/sport/static/shared/sidebar.css">
|
<link rel="stylesheet" href="/static/shared/sidebar.css">
|
||||||
<script src="/sport/static/shared/sidebar.js" defer data-active="clanarine"></script>
|
<script src="/static/shared/sidebar.js" defer data-active="clanarine"></script>
|
||||||
<style>body{padding-top:0}</style>
|
<style>body{padding-top:0}</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -147,8 +147,8 @@ table tr:hover td { background: rgba(26, 115, 232, 0.05); }
|
|||||||
<div class="title">CRM — Članarine • Liječnički • Obrasci</div>
|
<div class="title">CRM — Članarine • Liječnički • Obrasci</div>
|
||||||
<div class="right">
|
<div class="right">
|
||||||
<span style="opacity:.7">Round 3 / CC5</span>
|
<span style="opacity:.7">Round 3 / CC5</span>
|
||||||
<a href="/sport/static/sport2.html">← portal</a>
|
<a href="/static/sport2.html">← portal</a>
|
||||||
<a href="/sport/static/app.html">app →</a>
|
<a href="/static/app.html">app →</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -201,10 +201,26 @@ const fmtEur = v => (v == null) ? '—' : Number(v).toLocaleString('hr-HR', {min
|
|||||||
const fmt = v => (v == null) ? '—' : Number(v).toLocaleString('hr-HR');
|
const fmt = v => (v == null) ? '—' : Number(v).toLocaleString('hr-HR');
|
||||||
const fmtDate = d => !d ? '—' : new Date(d).toLocaleDateString('hr-HR');
|
const fmtDate = d => !d ? '—' : new Date(d).toLocaleDateString('hr-HR');
|
||||||
|
|
||||||
|
function getJwt() {
|
||||||
|
return localStorage.getItem('jwt') || localStorage.getItem('access_token') || null;
|
||||||
|
}
|
||||||
|
|
||||||
async function api(path, opts={}) {
|
async function api(path, opts={}) {
|
||||||
const o = Object.assign({headers: {'Content-Type':'application/json'}}, opts);
|
const headers = Object.assign({'Content-Type':'application/json'}, (opts.headers || {}));
|
||||||
|
const jwt = getJwt();
|
||||||
|
if (jwt && !headers['Authorization']) headers['Authorization'] = 'Bearer ' + jwt;
|
||||||
|
const o = Object.assign({}, opts, {headers});
|
||||||
if (o.body && typeof o.body !== 'string') o.body = JSON.stringify(o.body);
|
if (o.body && typeof o.body !== 'string') o.body = JSON.stringify(o.body);
|
||||||
const r = await fetch(API + path, o);
|
const r = await fetch(API + path, o);
|
||||||
|
if (r.status === 401) {
|
||||||
|
// ako POST/PUT pukne s 401, nudi quick-login
|
||||||
|
if (opts.method && opts.method !== 'GET') {
|
||||||
|
if (confirm('Session istekla / nije logiran. Login s damir@pgz.hr?')) {
|
||||||
|
await quickLogin();
|
||||||
|
return api(path, opts); // retry once
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
if (!r.ok) {
|
if (!r.ok) {
|
||||||
const msg = await r.text().catch(()=>r.statusText);
|
const msg = await r.text().catch(()=>r.statusText);
|
||||||
throw new Error(`HTTP ${r.status}: ${msg.substring(0,200)}`);
|
throw new Error(`HTTP ${r.status}: ${msg.substring(0,200)}`);
|
||||||
@@ -212,6 +228,23 @@ async function api(path, opts={}) {
|
|||||||
return r.json();
|
return r.json();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function quickLogin() {
|
||||||
|
try {
|
||||||
|
const r = await fetch('/sport/api/auth/login', {
|
||||||
|
method:'POST',
|
||||||
|
headers:{'Content-Type':'application/json'},
|
||||||
|
body: JSON.stringify({email:'damir@pgz.hr', password:'PGZ2026!'}),
|
||||||
|
});
|
||||||
|
if (!r.ok) throw new Error('login failed: ' + r.status);
|
||||||
|
const d = await r.json();
|
||||||
|
if (d.access_token) {
|
||||||
|
localStorage.setItem('jwt', d.access_token);
|
||||||
|
toast('✓ Login OK (damir@pgz.hr)');
|
||||||
|
return d.access_token;
|
||||||
|
}
|
||||||
|
} catch (e) { toast('Login greška: ' + e.message, true); }
|
||||||
|
}
|
||||||
|
|
||||||
function toast(msg, isErr=false) {
|
function toast(msg, isErr=false) {
|
||||||
const t = $('#toast');
|
const t = $('#toast');
|
||||||
t.textContent = msg;
|
t.textContent = msg;
|
||||||
@@ -392,9 +425,12 @@ async function bulkUplatniceZipSelected() {
|
|||||||
if (!sel.length && !confirm('Ništa nije odabrano — generirati ZIP za SVE dužnike?')) return;
|
if (!sel.length && !confirm('Ništa nije odabrano — generirati ZIP za SVE dužnike?')) return;
|
||||||
toast(`Generiranje ZIP-a (${sel.length || 'svi'})... može potrajati`);
|
toast(`Generiranje ZIP-a (${sel.length || 'svi'})... može potrajati`);
|
||||||
try {
|
try {
|
||||||
|
const headers = {'Content-Type':'application/json'};
|
||||||
|
const jwt = getJwt();
|
||||||
|
if (jwt) headers['Authorization'] = 'Bearer ' + jwt;
|
||||||
const r = await fetch(API + '/clanarine/bulk/uplatnice.zip', {
|
const r = await fetch(API + '/clanarine/bulk/uplatnice.zip', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {'Content-Type':'application/json'},
|
headers,
|
||||||
body: JSON.stringify(body),
|
body: JSON.stringify(body),
|
||||||
});
|
});
|
||||||
if (!r.ok) {
|
if (!r.ok) {
|
||||||
@@ -1444,9 +1480,12 @@ async function uploadAvatar(cid) {
|
|||||||
const fd = new FormData();
|
const fd = new FormData();
|
||||||
fd.append('file', inp.files[0]);
|
fd.append('file', inp.files[0]);
|
||||||
try {
|
try {
|
||||||
|
const headers = {'X-Role': CURRENT_ROLE};
|
||||||
|
const jwt = getJwt();
|
||||||
|
if (jwt) headers['Authorization'] = 'Bearer ' + jwt;
|
||||||
const r = await fetch(API + '/clanovi/' + cid + '/avatar', {
|
const r = await fetch(API + '/clanovi/' + cid + '/avatar', {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: {'X-Role': CURRENT_ROLE},
|
headers,
|
||||||
body: fd,
|
body: fd,
|
||||||
});
|
});
|
||||||
if (!r.ok) throw new Error(`HTTP ${r.status}: ${await r.text()}`);
|
if (!r.ok) throw new Error(`HTTP ${r.status}: ${await r.text()}`);
|
||||||
@@ -1625,6 +1664,170 @@ async function markAllReadUI() {
|
|||||||
} catch (e) { toast('Greška: ' + e.message, true); }
|
} catch (e) { toast('Greška: ' + e.message, true); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ════════════════════════════════════════════════════
|
||||||
|
// MODUL 7 — E-MAIL TEMPLATES (R6 #3)
|
||||||
|
// ════════════════════════════════════════════════════
|
||||||
|
|
||||||
|
async function loadEmailTpl() {
|
||||||
|
const root = $('#page-emailtpl');
|
||||||
|
root.innerHTML = '<div class="loading">Učitavanje templata…</div>';
|
||||||
|
let d;
|
||||||
|
try { d = await api('/email-templates?active_only=false'); }
|
||||||
|
catch (e) { root.innerHTML = `<div class="empty">Greška: ${esc(e.message)}</div>`; return; }
|
||||||
|
const list = (d.templates || []).map(t => `
|
||||||
|
<div class="card" style="margin-bottom:8px">
|
||||||
|
<div class="card-b">
|
||||||
|
<div style="display:flex;justify-content:space-between;gap:10px;align-items:start">
|
||||||
|
<div style="flex:1">
|
||||||
|
<div style="font-weight:600">${esc(t.naziv)} <span class="tag ${t.active?'gr':'gy'}">${t.active?'aktivan':'neaktivan'}</span></div>
|
||||||
|
<div style="font-size:11px;color:var(--t3);margin-top:3px"><code>${esc(t.code)}</code> · ${esc(t.kategorija || '—')} · vars: ${(t.variables||[]).length}</div>
|
||||||
|
<div style="font-size:12px;color:var(--t2);margin-top:6px"><b>Subject:</b> ${esc(t.subject_tpl)}</div>
|
||||||
|
<details style="margin-top:6px">
|
||||||
|
<summary style="cursor:pointer;font-size:11px;color:var(--pgz-blue)">Body preview</summary>
|
||||||
|
<pre style="background:var(--bg);padding:8px;border-radius:5px;font-size:11px;white-space:pre-wrap;margin-top:4px;color:var(--t1)">${esc(t.body_tpl.substring(0,500))}${t.body_tpl.length>500?'…':''}</pre>
|
||||||
|
</details>
|
||||||
|
</div>
|
||||||
|
<div style="display:flex;flex-direction:column;gap:4px">
|
||||||
|
<button class="btn sm" onclick='openTplPreview(${JSON.stringify(t.code)})' title="Render s test podacima">▶ Preview</button>
|
||||||
|
<button class="btn sm" onclick='openTplEdit(${JSON.stringify(t.code)})'>✎ Uredi</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>`).join('');
|
||||||
|
root.innerHTML = `
|
||||||
|
<div class="toolbar">
|
||||||
|
<span style="font-size:12px;color:var(--t2)">${d.count} template-a — koriste se za <b>opomene članarina</b>, <b>liječničke podsjetnike</b>, <b>obrasce na potpis</b>. Varijable: <code style="font-size:11px">{{key}}</code></span>
|
||||||
|
<div class="grow"></div>
|
||||||
|
<button class="btn primary" onclick="openTplCreate()">+ Novi template</button>
|
||||||
|
</div>
|
||||||
|
${list || '<div class="empty">Nema templata.</div>'}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const _DEFAULT_TPL_VARS = {
|
||||||
|
clanarina_opomena: {ime:'Mateo', prezime:'Hrvatin', godina:2026, klub:'RK ZAMET', iznos_dug:'720,00', razdoblje:'godišnja', uplatnica_url:'/api/crm/clanarine/218/uplatnica.pdf'},
|
||||||
|
lijecnicki_podsjetnik: {ime:'Mateo', prezime:'Hrvatin', klub:'RK ZAMET', status_msg:'ističe za 7 dana', vrijedi_do:'2026-05-12', dana:7, ustanova:'ZZJZ PGŽ', zakazi_url:'/api/crm/lijecnicki/100/zakazi'},
|
||||||
|
obrazac_potpis: {ime:'Damir', prezime:'Radulić', naziv_obrasca:'Sufinanciranje 2026', reference_no:'SUFINANC-2026-A0BCF45D', klub:'RK ZAMET', status:'draft'},
|
||||||
|
};
|
||||||
|
|
||||||
|
async function openTplPreview(code) {
|
||||||
|
const vars = _DEFAULT_TPL_VARS[code] || {};
|
||||||
|
let r;
|
||||||
|
try { r = await api(`/email-templates/${code}/render`, {method:'POST', body: {variables: vars}}); }
|
||||||
|
catch (e) { return toast('Greška: ' + e.message, true); }
|
||||||
|
$('#modal').style.maxWidth = '720px';
|
||||||
|
openModal(`
|
||||||
|
<div class="modal-h"><div class="modal-t">▶ Preview: ${esc(r.naziv || code)}</div><div class="modal-x" onclick="closeModal()">×</div></div>
|
||||||
|
<div class="modal-b">
|
||||||
|
<div style="background:var(--bg);padding:12px;border-radius:6px;border:1px solid var(--rim);margin-bottom:10px">
|
||||||
|
<div style="font-size:11px;color:var(--t3)">SUBJECT</div>
|
||||||
|
<div style="font-weight:600;margin-top:4px">${esc(r.subject)}</div>
|
||||||
|
</div>
|
||||||
|
<div style="background:var(--bg);padding:12px;border-radius:6px;border:1px solid var(--rim)">
|
||||||
|
<div style="font-size:11px;color:var(--t3)">BODY</div>
|
||||||
|
<pre style="margin-top:6px;white-space:pre-wrap;color:var(--t1);font-family:inherit;font-size:13px">${esc(r.body)}</pre>
|
||||||
|
</div>
|
||||||
|
<div style="margin-top:10px;font-size:11px;color:var(--t3)">Varijable: <code>${esc(JSON.stringify(vars))}</code></div>
|
||||||
|
<div style="text-align:right;margin-top:14px">
|
||||||
|
<button class="btn" onclick="closeModal()">Zatvori</button>
|
||||||
|
<button class="btn primary" onclick='sendTplMock(${JSON.stringify(code)})'>📤 Pošalji test (upiše u notifs)</button>
|
||||||
|
</div>
|
||||||
|
</div>`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function sendTplMock(code) {
|
||||||
|
const to = prompt('To (e-mail za mock send):', 'test@rinet.one');
|
||||||
|
if (!to) return;
|
||||||
|
const vars = _DEFAULT_TPL_VARS[code] || {};
|
||||||
|
try {
|
||||||
|
const r = await api(`/email-templates/${code}/send`, {method:'POST', body: {to, user_id: 1, variables: vars}});
|
||||||
|
closeModal();
|
||||||
|
toast(`✓ Poslano (mock): ${r.queued.length} notifikacije`);
|
||||||
|
loadNotifs();
|
||||||
|
} catch (e) { toast('Greška: ' + e.message, true); }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openTplEdit(code) {
|
||||||
|
let t;
|
||||||
|
try { t = await api(`/email-templates/${code}`); }
|
||||||
|
catch (e) { return toast('Greška: ' + e.message, true); }
|
||||||
|
$('#modal').style.maxWidth = '720px';
|
||||||
|
openModal(`
|
||||||
|
<div class="modal-h"><div class="modal-t">✎ Uredi: ${esc(t.naziv)}</div><div class="modal-x" onclick="closeModal()">×</div></div>
|
||||||
|
<div class="modal-b">
|
||||||
|
<form onsubmit="saveTpl(event, ${JSON.stringify(code)})">
|
||||||
|
<div class="field"><label>Naziv</label><input name="naziv" value="${esc(t.naziv)}" required></div>
|
||||||
|
<div class="field"><label>Kategorija</label><input name="kategorija" value="${esc(t.kategorija||'')}"></div>
|
||||||
|
<div class="field"><label class="req">Subject template</label><input name="subject_tpl" value="${esc(t.subject_tpl)}" required></div>
|
||||||
|
<div class="field"><label class="req">Body template ({{var}} sintaksa)</label><textarea name="body_tpl" style="min-height:200px;font-family:Consolas,monospace;font-size:12px" required>${esc(t.body_tpl)}</textarea></div>
|
||||||
|
<div class="field"><label>Aktivan</label><select name="active"><option value="true" ${t.active?'selected':''}>true</option><option value="false" ${!t.active?'selected':''}>false</option></select></div>
|
||||||
|
<div style="text-align:right;margin-top:14px">
|
||||||
|
<button type="button" class="btn" onclick="closeModal()">Odustani</button>
|
||||||
|
<button type="submit" class="btn primary">💾 Spremi</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function saveTpl(e, code) {
|
||||||
|
e.preventDefault();
|
||||||
|
const f = e.target;
|
||||||
|
const body = {
|
||||||
|
naziv: f.naziv.value,
|
||||||
|
kategorija: f.kategorija.value || null,
|
||||||
|
subject_tpl: f.subject_tpl.value,
|
||||||
|
body_tpl: f.body_tpl.value,
|
||||||
|
active: f.active.value === 'true',
|
||||||
|
};
|
||||||
|
try {
|
||||||
|
await api(`/email-templates/${code}`, {method:'PUT', body});
|
||||||
|
closeModal();
|
||||||
|
toast('✓ Template spremljen.');
|
||||||
|
loadEmailTpl();
|
||||||
|
} catch (err) { toast('Greška: ' + err.message, true); }
|
||||||
|
}
|
||||||
|
|
||||||
|
function openTplCreate() {
|
||||||
|
$('#modal').style.maxWidth = '720px';
|
||||||
|
openModal(`
|
||||||
|
<div class="modal-h"><div class="modal-t">+ Novi e-mail template</div><div class="modal-x" onclick="closeModal()">×</div></div>
|
||||||
|
<div class="modal-b">
|
||||||
|
<form onsubmit="createTpl(event)">
|
||||||
|
<div class="field"><label class="req">Code (jedinstveni, lower_snake)</label><input name="code" required pattern="[a-z0-9_]+" placeholder="npr. clan_dobrodoslica"></div>
|
||||||
|
<div class="field"><label class="req">Naziv</label><input name="naziv" required></div>
|
||||||
|
<div class="field"><label>Kategorija</label><input name="kategorija" placeholder="clanarine | lijecnicki | obrasci | ostalo"></div>
|
||||||
|
<div class="field"><label class="req">Subject template</label><input name="subject_tpl" required value="Predmet — {{ime}} {{prezime}}"></div>
|
||||||
|
<div class="field"><label class="req">Body template</label><textarea name="body_tpl" style="min-height:200px;font-family:Consolas,monospace;font-size:12px" required>Poštovani {{ime}} {{prezime}},
|
||||||
|
|
||||||
|
(sadržaj)
|
||||||
|
|
||||||
|
S poštovanjem,
|
||||||
|
PGŽ Sport ERP/CRM</textarea></div>
|
||||||
|
<div style="text-align:right;margin-top:14px">
|
||||||
|
<button type="button" class="btn" onclick="closeModal()">Odustani</button>
|
||||||
|
<button type="submit" class="btn primary">💾 Kreiraj</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>`);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function createTpl(e) {
|
||||||
|
e.preventDefault();
|
||||||
|
const f = e.target;
|
||||||
|
const body = {
|
||||||
|
code: f.code.value,
|
||||||
|
naziv: f.naziv.value,
|
||||||
|
kategorija: f.kategorija.value || null,
|
||||||
|
subject_tpl: f.subject_tpl.value,
|
||||||
|
body_tpl: f.body_tpl.value,
|
||||||
|
};
|
||||||
|
try {
|
||||||
|
await api('/email-templates', {method:'POST', body});
|
||||||
|
closeModal();
|
||||||
|
toast('✓ Template kreiran.');
|
||||||
|
loadEmailTpl();
|
||||||
|
} catch (err) { toast('Greška: ' + err.message, true); }
|
||||||
|
}
|
||||||
|
|
||||||
// ────────────────────────────────────────────────────
|
// ────────────────────────────────────────────────────
|
||||||
// init
|
// init
|
||||||
// ────────────────────────────────────────────────────
|
// ────────────────────────────────────────────────────
|
||||||
|
|||||||
Reference in New Issue
Block a user