Skip to content

Commit 993c0d9

Browse files
NeoRazorXclaude
NeoRazorX
and
claude
committed
refactor: integra títulos de cards en card-body y filtra deudores/acreedores con saldo 0
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 581a206 commit 993c0d9

6 files changed

Lines changed: 85 additions & 147 deletions

File tree

‎Controller/ReportCustomers.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ protected function getDebtorsSql(int $limit = 0): string
362362
. "WHERE f.pagada = " . $this->db()->var2str(false)
363363
. " AND f.idempresa = " . $this->db()->var2str((int)$this->idempresa);
364364

365-
$sql .= " GROUP BY f.codcliente ORDER BY ycol DESC, xcol ASC";
365+
$sql .= " GROUP BY f.codcliente HAVING SUM(f.total) <> 0 ORDER BY ycol DESC, xcol ASC";
366366
if ($limit > 0) {
367367
$sql .= " LIMIT " . $limit;
368368
}

‎Controller/ReportSuppliers.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ protected function getCreditorsSql(int $limit = 0): string
329329
. "WHERE f.pagada = " . $this->db()->var2str(false)
330330
. " AND f.idempresa = " . $this->db()->var2str((int)$this->idempresa);
331331

332-
$sql .= " GROUP BY f.codproveedor ORDER BY ycol DESC, xcol ASC";
332+
$sql .= " GROUP BY f.codproveedor HAVING SUM(f.total) <> 0 ORDER BY ycol DESC, xcol ASC";
333333
if ($limit > 0) {
334334
$sql .= " LIMIT " . $limit;
335335
}

‎View/ReportAgents.html.twig‎

Lines changed: 47 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<button class="nav-link" id="tab-estimates-btn" data-bs-toggle="pill"
4040
data-bs-target="#tab-estimates" type="button" role="tab">
4141
<i class="fa-solid fa-file-lines me-1"></i>
42-
{{ trans('estimates') }}
42+
{{ trans('estimations') }}
4343
</button>
4444
</li>
4545
{% if fsc.comisionesEnabled %}
@@ -63,39 +63,33 @@
6363
<div class="row">
6464
<div class="col-xl-4 col-lg-5 mb-4 d-flex">
6565
<div class="card shadow-sm w-100">
66-
<div class="card-header py-3">
67-
<h6 class="m-0 font-weight-bold text-primary">
66+
<div class="card-body">
67+
<h6 class="font-weight-bold text-primary mb-3">
6868
<i class="fa-solid fa-file-invoice me-1"></i>
69-
{{ trans('invoices-by-agent') }}
69+
{{ trans('by-agent') }}
7070
</h6>
71-
</div>
72-
<div class="card-body">
7371
{{ fsc.facturas.getChart().render({'height': 260}) | raw }}
7472
</div>
7573
</div>
7674
</div>
7775
<div class="col-xl-8 col-lg-7 mb-4 d-flex">
7876
<div class="card shadow-sm w-100">
79-
<div class="card-header py-3">
80-
<h6 class="m-0 font-weight-bold text-primary">
77+
<div class="card-body">
78+
<h6 class="font-weight-bold text-primary mb-3">
8179
<i class="fa-solid fa-chart-bar me-1"></i>
82-
{{ trans('invoices-by-month') }}
80+
{{ trans('by-month') }}
8381
</h6>
84-
</div>
85-
<div class="card-body">
8682
{{ fsc.facturasByMonth.getChart().render({'height': 260}) | raw }}
8783
</div>
8884
</div>
8985
</div>
9086
</div>
9187
<div class="card shadow-sm mb-4">
92-
<div class="card-header py-3">
93-
<h6 class="m-0 font-weight-bold text-primary">
88+
<div class="card-body">
89+
<h6 class="font-weight-bold text-primary mb-3">
9490
<i class="fa-solid fa-chart-column me-1"></i>
95-
{{ trans('invoices-by-year') }}
91+
{{ trans('by-year') }}
9692
</h6>
97-
</div>
98-
<div class="card-body">
9993
{{ fsc.facturasByYear.getChart().render({'height': 350}) | raw }}
10094
</div>
10195
</div>
@@ -106,39 +100,33 @@
106100
<div class="row">
107101
<div class="col-xl-4 col-lg-5 mb-4 d-flex">
108102
<div class="card shadow-sm w-100">
109-
<div class="card-header py-3">
110-
<h6 class="m-0 font-weight-bold text-primary">
103+
<div class="card-body">
104+
<h6 class="font-weight-bold text-primary mb-3">
111105
<i class="fa-solid fa-truck me-1"></i>
112-
{{ trans('delivery-notes-by-agent') }}
106+
{{ trans('by-agent') }}
113107
</h6>
114-
</div>
115-
<div class="card-body">
116108
{{ fsc.albaranes.getChart().render({'height': 260}) | raw }}
117109
</div>
118110
</div>
119111
</div>
120112
<div class="col-xl-8 col-lg-7 mb-4 d-flex">
121113
<div class="card shadow-sm w-100">
122-
<div class="card-header py-3">
123-
<h6 class="m-0 font-weight-bold text-primary">
114+
<div class="card-body">
115+
<h6 class="font-weight-bold text-primary mb-3">
124116
<i class="fa-solid fa-chart-bar me-1"></i>
125-
{{ trans('delivery-notes-by-month') }}
117+
{{ trans('by-month') }}
126118
</h6>
127-
</div>
128-
<div class="card-body">
129119
{{ fsc.albaranesByMonth.getChart().render({'height': 260}) | raw }}
130120
</div>
131121
</div>
132122
</div>
133123
</div>
134124
<div class="card shadow-sm mb-4">
135-
<div class="card-header py-3">
136-
<h6 class="m-0 font-weight-bold text-primary">
125+
<div class="card-body">
126+
<h6 class="font-weight-bold text-primary mb-3">
137127
<i class="fa-solid fa-chart-column me-1"></i>
138-
{{ trans('delivery-notes-by-year') }}
128+
{{ trans('by-year') }}
139129
</h6>
140-
</div>
141-
<div class="card-body">
142130
{{ fsc.albaranesByYear.getChart().render({'height': 350}) | raw }}
143131
</div>
144132
</div>
@@ -149,39 +137,33 @@
149137
<div class="row">
150138
<div class="col-xl-4 col-lg-5 mb-4 d-flex">
151139
<div class="card shadow-sm w-100">
152-
<div class="card-header py-3">
153-
<h6 class="m-0 font-weight-bold text-primary">
140+
<div class="card-body">
141+
<h6 class="font-weight-bold text-primary mb-3">
154142
<i class="fa-solid fa-cart-shopping me-1"></i>
155-
{{ trans('orders-by-agent') }}
143+
{{ trans('by-agent') }}
156144
</h6>
157-
</div>
158-
<div class="card-body">
159145
{{ fsc.pedidos.getChart().render({'height': 260}) | raw }}
160146
</div>
161147
</div>
162148
</div>
163149
<div class="col-xl-8 col-lg-7 mb-4 d-flex">
164150
<div class="card shadow-sm w-100">
165-
<div class="card-header py-3">
166-
<h6 class="m-0 font-weight-bold text-primary">
151+
<div class="card-body">
152+
<h6 class="font-weight-bold text-primary mb-3">
167153
<i class="fa-solid fa-chart-bar me-1"></i>
168-
{{ trans('orders-by-month') }}
154+
{{ trans('by-month') }}
169155
</h6>
170-
</div>
171-
<div class="card-body">
172156
{{ fsc.pedidosByMonth.getChart().render({'height': 260}) | raw }}
173157
</div>
174158
</div>
175159
</div>
176160
</div>
177161
<div class="card shadow-sm mb-4">
178-
<div class="card-header py-3">
179-
<h6 class="m-0 font-weight-bold text-primary">
162+
<div class="card-body">
163+
<h6 class="font-weight-bold text-primary mb-3">
180164
<i class="fa-solid fa-chart-column me-1"></i>
181-
{{ trans('orders-by-year') }}
165+
{{ trans('by-year') }}
182166
</h6>
183-
</div>
184-
<div class="card-body">
185167
{{ fsc.pedidosByYear.getChart().render({'height': 350}) | raw }}
186168
</div>
187169
</div>
@@ -192,39 +174,33 @@
192174
<div class="row">
193175
<div class="col-xl-4 col-lg-5 mb-4 d-flex">
194176
<div class="card shadow-sm w-100">
195-
<div class="card-header py-3">
196-
<h6 class="m-0 font-weight-bold text-primary">
177+
<div class="card-body">
178+
<h6 class="font-weight-bold text-primary mb-3">
197179
<i class="fa-solid fa-file-lines me-1"></i>
198-
{{ trans('estimates-by-agent') }}
180+
{{ trans('by-agent') }}
199181
</h6>
200-
</div>
201-
<div class="card-body">
202182
{{ fsc.presupuestos.getChart().render({'height': 260}) | raw }}
203183
</div>
204184
</div>
205185
</div>
206186
<div class="col-xl-8 col-lg-7 mb-4 d-flex">
207187
<div class="card shadow-sm w-100">
208-
<div class="card-header py-3">
209-
<h6 class="m-0 font-weight-bold text-primary">
188+
<div class="card-body">
189+
<h6 class="font-weight-bold text-primary mb-3">
210190
<i class="fa-solid fa-chart-bar me-1"></i>
211-
{{ trans('estimates-by-month') }}
191+
{{ trans('by-month') }}
212192
</h6>
213-
</div>
214-
<div class="card-body">
215193
{{ fsc.presupuestosByMonth.getChart().render({'height': 260}) | raw }}
216194
</div>
217195
</div>
218196
</div>
219197
</div>
220198
<div class="card shadow-sm mb-4">
221-
<div class="card-header py-3">
222-
<h6 class="m-0 font-weight-bold text-primary">
199+
<div class="card-body">
200+
<h6 class="font-weight-bold text-primary mb-3">
223201
<i class="fa-solid fa-chart-column me-1"></i>
224-
{{ trans('estimates-by-year') }}
202+
{{ trans('by-year') }}
225203
</h6>
226-
</div>
227-
<div class="card-body">
228204
{{ fsc.presupuestosByYear.getChart().render({'height': 350}) | raw }}
229205
</div>
230206
</div>
@@ -236,26 +212,22 @@
236212
<div class="row">
237213
<div class="col-md-6">
238214
<div class="card shadow-sm mb-4">
239-
<div class="card-header py-3">
240-
<h6 class="m-0 font-weight-bold text-success">
215+
<div class="card-body">
216+
<h6 class="font-weight-bold text-success mb-3">
241217
<i class="fa-solid fa-hand-holding-dollar me-1"></i>
242-
{{ trans('commissions-by-month') }}
218+
{{ trans('by-month') }}
243219
</h6>
244-
</div>
245-
<div class="card-body">
246220
{{ fsc.comisionesByMonth.getChart().render({'height': 260}) | raw }}
247221
</div>
248222
</div>
249223
</div>
250224
<div class="col-md-6">
251225
<div class="card shadow-sm mb-4">
252-
<div class="card-header py-3">
253-
<h6 class="m-0 font-weight-bold text-success">
226+
<div class="card-body">
227+
<h6 class="font-weight-bold text-success mb-3">
254228
<i class="fa-solid fa-chart-column me-1"></i>
255-
{{ trans('commissions-by-year') }}
229+
{{ trans('by-year') }}
256230
</h6>
257-
</div>
258-
<div class="card-body">
259231
{{ fsc.comisionesByYear.getChart().render({'height': 350}) | raw }}
260232
</div>
261233
</div>
@@ -264,26 +236,22 @@
264236
<div class="row">
265237
<div class="col-md-6">
266238
<div class="card shadow-sm mb-4">
267-
<div class="card-header py-3">
268-
<h6 class="m-0 font-weight-bold text-info">
239+
<div class="card-body">
240+
<h6 class="font-weight-bold text-info mb-3">
269241
<i class="fa-solid fa-money-bill-transfer me-1"></i>
270242
{{ trans('settlements-by-month') }}
271243
</h6>
272-
</div>
273-
<div class="card-body">
274244
{{ fsc.liquidacionesByMonth.getChart().render({'height': 260}) | raw }}
275245
</div>
276246
</div>
277247
</div>
278248
<div class="col-md-6">
279249
<div class="card shadow-sm mb-4">
280-
<div class="card-header py-3">
281-
<h6 class="m-0 font-weight-bold text-info">
250+
<div class="card-body">
251+
<h6 class="font-weight-bold text-info mb-3">
282252
<i class="fa-solid fa-chart-column me-1"></i>
283253
{{ trans('settlements-by-year') }}
284254
</h6>
285-
</div>
286-
<div class="card-body">
287255
{{ fsc.liquidacionesByYear.getChart().render({'height': 350}) | raw }}
288256
</div>
289257
</div>

0 commit comments

Comments
 (0)