fix(fees): poprawione polskie znaki i opisy filtrów na stronie składek
Some checks are pending
NordaBiz Tests / Unit & Integration Tests (push) Waiting to run
NordaBiz Tests / E2E Tests (Playwright) (push) Blocked by required conditions
NordaBiz Tests / Smoke Tests (Production) (push) Blocked by required conditions
NordaBiz Tests / Send Failure Notification (push) Blocked by required conditions
Some checks are pending
NordaBiz Tests / Unit & Integration Tests (push) Waiting to run
NordaBiz Tests / E2E Tests (Playwright) (push) Blocked by required conditions
NordaBiz Tests / Smoke Tests (Production) (push) Blocked by required conditions
NordaBiz Tests / Send Failure Notification (push) Blocked by required conditions
Dodano brakujące polskie znaki diakrytyczne (ł, ś, ź, ć, ó, ń) w całym szablonie składek członkowskich. Ulepszono opisy w dropdownie filtrów i dodano kontekst do kart statystyk. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
2c3aa9fe27
commit
1e36fd98a3
@ -1,6 +1,6 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Skladki Czlonkowskie - Norda Biznes Partner{% endblock %}
|
||||
{% block title %}Składki Członkowskie - Norda Biznes Partner{% endblock %}
|
||||
|
||||
{% block extra_css %}
|
||||
<style>
|
||||
@ -255,7 +255,7 @@
|
||||
{% block content %}
|
||||
<div class="container">
|
||||
<div class="admin-header">
|
||||
<h1>Skladki Czlonkowskie</h1>
|
||||
<h1>Składki Członkowskie</h1>
|
||||
<div class="header-actions">
|
||||
<a href="{{ url_for('admin.admin_fees_export', year=year, month=month) }}" class="btn btn-secondary">
|
||||
Eksportuj CSV
|
||||
@ -267,15 +267,15 @@
|
||||
<div class="stats-grid">
|
||||
<div class="stat-card primary">
|
||||
<div class="stat-value">{{ total_companies }}</div>
|
||||
<div class="stat-label">Firm czlonkowskich</div>
|
||||
<div class="stat-label">Firm członkowskich</div>
|
||||
</div>
|
||||
<div class="stat-card success">
|
||||
<div class="stat-value">{{ paid_count }}</div>
|
||||
<div class="stat-label">Oplaconych</div>
|
||||
<div class="stat-label">Opłaconych{% if month %} w tym miesiącu{% else %} składek (łącznie){% endif %}</div>
|
||||
</div>
|
||||
<div class="stat-card warning">
|
||||
<div class="stat-value">{{ pending_count }}</div>
|
||||
<div class="stat-label">Oczekujacych</div>
|
||||
<div class="stat-label">Oczekujących{% if month %} w tym miesiącu{% else %} składek (łącznie){% endif %}</div>
|
||||
</div>
|
||||
<div class="stat-card primary">
|
||||
<div class="stat-value">{{ total_paid|int }} zł</div>
|
||||
@ -314,19 +314,21 @@
|
||||
|
||||
<select name="status" onchange="this.form.submit()">
|
||||
<option value="">-- Wszystkie firmy --</option>
|
||||
<option value="paid" {% if status_filter == 'paid' %}selected{% endif %}>{% if month %}Opłacone{% else %}Uregulowane cały rok{% endif %}</option>
|
||||
<option value="pending" {% if status_filter == 'pending' %}selected{% endif %}>Oczekujące</option>
|
||||
{% if month %}
|
||||
<option value="overdue" {% if status_filter == 'overdue' %}selected{% endif %}>Zaległe</option>
|
||||
<option value="paid" {% if status_filter == 'paid' %}selected{% endif %}>Opłacone w tym miesiącu</option>
|
||||
<option value="pending" {% if status_filter == 'pending' %}selected{% endif %}>Nieopłacone w tym miesiącu</option>
|
||||
<option value="overdue" {% if status_filter == 'overdue' %}selected{% endif %}>Zaległe (po terminie)</option>
|
||||
{% else %}
|
||||
<option value="partial" {% if status_filter == 'partial' %}selected{% endif %}>Częściowo opłacone</option>
|
||||
<option value="paid" {% if status_filter == 'paid' %}selected{% endif %}>Opłacone za cały rok</option>
|
||||
<option value="pending" {% if status_filter == 'pending' %}selected{% endif %}>Mają nieopłacone miesiące</option>
|
||||
<option value="partial" {% if status_filter == 'partial' %}selected{% endif %}>Częściowo opłacone (część miesięcy opłacona, część nie)</option>
|
||||
{% endif %}
|
||||
</select>
|
||||
</form>
|
||||
|
||||
{% if month %}
|
||||
<button class="btn btn-success" onclick="generateFees()">
|
||||
Generuj skladki na {{ dict(months).get(month, month) }}
|
||||
Generuj składki na {{ dict(months).get(month, month) }}
|
||||
</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
@ -337,7 +339,7 @@
|
||||
<h2>Lista firm {% if month %}({{ dict(months).get(month, month) }} {{ year }}){% else %}({{ year }}){% endif %}</h2>
|
||||
{% if month %}
|
||||
<button class="btn btn-success btn-small" onclick="bulkMarkPaid()">
|
||||
Oznacz zaznaczone jako oplacone
|
||||
Oznacz zaznaczone jako opłacone
|
||||
</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
@ -350,12 +352,12 @@
|
||||
{% if month %}
|
||||
<th>Status</th>
|
||||
<th>Kwota</th>
|
||||
<th>Zaplacono</th>
|
||||
<th>Data platnosci</th>
|
||||
<th>Zapłacono</th>
|
||||
<th>Data płatności</th>
|
||||
<th>Akcje</th>
|
||||
{% else %}
|
||||
<th>Sty</th><th>Lut</th><th>Mar</th><th>Kwi</th><th>Maj</th><th>Cze</th>
|
||||
<th>Lip</th><th>Sie</th><th>Wrz</th><th>Paz</th><th>Lis</th><th>Gru</th>
|
||||
<th>Lip</th><th>Sie</th><th>Wrz</th><th>Paź</th><th>Lis</th><th>Gru</th>
|
||||
<th>Przypomnienie</th>
|
||||
<th></th>
|
||||
{% endif %}
|
||||
@ -382,21 +384,21 @@
|
||||
</td>
|
||||
<td>
|
||||
<span class="status-badge status-{{ cf.status }}">
|
||||
{% if cf.status == 'paid' %}Oplacone
|
||||
{% if cf.status == 'paid' %}Opłacone
|
||||
{% elif cf.status == 'pending' %}Oczekuje
|
||||
{% elif cf.status == 'overdue' %}Zalegle
|
||||
{% elif cf.status == 'partial' %}Czesciowe
|
||||
{% elif cf.status == 'overdue' %}Zaległe
|
||||
{% elif cf.status == 'partial' %}Częściowe
|
||||
{% else %}Brak
|
||||
{% endif %}
|
||||
</span>
|
||||
</td>
|
||||
<td>{% if cf.fee %}{{ cf.fee.amount }} zl{% else %}-{% endif %}</td>
|
||||
<td>{% if cf.fee and cf.fee.amount_paid %}{{ cf.fee.amount_paid }} zl{% else %}-{% endif %}</td>
|
||||
<td>{% if cf.fee %}{{ cf.fee.amount }} zł{% else %}-{% endif %}</td>
|
||||
<td>{% if cf.fee and cf.fee.amount_paid %}{{ cf.fee.amount_paid }} zł{% else %}-{% endif %}</td>
|
||||
<td>{% if cf.fee and cf.fee.payment_date %}{{ cf.fee.payment_date }}{% else %}-{% endif %}</td>
|
||||
<td class="actions-cell">
|
||||
{% if cf.fee and cf.status != 'paid' %}
|
||||
<button class="btn btn-success btn-small" onclick="openPaymentModal({{ cf.fee.id }}, '{{ cf.company.name }}', {{ cf.fee.amount }})">
|
||||
Oplac
|
||||
Opłać
|
||||
</button>
|
||||
{% elif not cf.fee %}
|
||||
<span class="text-secondary">Brak rekordu</span>
|
||||
@ -449,7 +451,7 @@
|
||||
<div class="modal" id="paymentModal">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h3>Rejestracja platnosci</h3>
|
||||
<h3>Rejestracja płatności</h3>
|
||||
<button class="modal-close" onclick="closePaymentModal()">×</button>
|
||||
</div>
|
||||
<form id="paymentForm">
|
||||
@ -461,20 +463,20 @@
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Kwota do zaplaty</label>
|
||||
<label>Kwota do zapłaty</label>
|
||||
<input type="number" name="amount_paid" id="modalAmount" step="0.01" required>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Data platnosci</label>
|
||||
<label>Data płatności</label>
|
||||
<input type="date" name="payment_date" id="modalDate" value="{{ now.strftime('%Y-%m-%d') if now else '' }}">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>Metoda platnosci</label>
|
||||
<label>Metoda płatności</label>
|
||||
<select name="payment_method">
|
||||
<option value="transfer">Przelew bankowy</option>
|
||||
<option value="cash">Gotowka</option>
|
||||
<option value="cash">Gotówka</option>
|
||||
<option value="card">Karta</option>
|
||||
<option value="other">Inna</option>
|
||||
</select>
|
||||
@ -492,7 +494,7 @@
|
||||
|
||||
<div class="btn-group">
|
||||
<button type="button" class="btn btn-secondary" onclick="closePaymentModal()">Anuluj</button>
|
||||
<button type="submit" class="btn btn-success">Zarejestruj platnosc</button>
|
||||
<button type="submit" class="btn btn-success">Zarejestruj płatność</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user