Skip to content

Commit 51c74b6

Browse files
committed
fix: maggiorazione nei template
1 parent 1737b64 commit 51c74b6

6 files changed

Lines changed: 14 additions & 14 deletions

File tree

templates/contratti/body.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
$sconto_finale = $documento->getScontoFinale();
271271
$netto_a_pagare = $documento->netto;
272272

273-
$show_sconto = $sconto > 0;
273+
$show_sconto = $sconto != 0;
274274

275275
// TOTALE COSTI FINALI
276276
if (($options['pricing'] && !isset($options['hide-total'])) || $options['show-only-total']) {
@@ -291,7 +291,7 @@
291291
echo '
292292
<tr>
293293
<td colspan="'.($options['show-only-total'] ? 2 : 5).'" class="text-right text-muted">
294-
<b>'.tr('Sconto', [], ['upper' => true]).':</b>
294+
<b>'.tr($sconto > 0 ? 'Sconto' : 'Maggiorazione', [], ['upper' => true]).':</b>
295295
</td>
296296
297297
<th colspan="'.($options['show-only-total'] ? (($has_image) ? 2 : 1) : (($has_image) ? 3 : 2)).'" class="text-right">

templates/ddt/body.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@
184184
<td class="text-right" nowrap="nowrap">
185185
'.moneyFormat($prezzi_ivati ? $riga->prezzo_unitario_ivato : $riga->prezzo_unitario, $d_importi);
186186

187-
if ($riga->sconto > 0) {
188-
$text = discountInfo($riga, false);
187+
if ($riga->sconto != 0) {
188+
$text = discountInfo($riga, true);
189189

190190
$text = '<br><small class="text-muted">'.$text.'</small>';
191191
echo $text;

templates/fatture/body.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@
202202
<td class="text-right">
203203
'.moneyFormat($prezzi_ivati ? $riga->prezzo_unitario_ivato : $riga->prezzo_unitario, $d_importi);
204204

205-
if ($riga->sconto > 0) {
206-
$text = discountInfo($riga, false);
205+
if ($riga->sconto != 0) {
206+
$text = discountInfo($riga, true);
207207

208208
echo '
209209
<br><small class="text-muted">'.$text.'</small>';

templates/fatture/footer.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
$totale = $totale_iva + $totale_imponibile;
5151

52-
$show_sconto = $sconto > 0;
52+
$show_sconto = $sconto != 0;
5353

5454
$volume = $documento->volume ?: $documento->volume_calcolato;
5555
$peso_lordo = $documento->peso ?: $documento->peso_calcolato;
@@ -230,11 +230,11 @@
230230
if ($show_sconto) {
231231
echo "
232232
<th class='text-center small' style='width:".$width."'>
233-
".tr('Sconto', [], ['upper' => true])."
233+
".tr($sconto > 0 ? 'Sconto' : 'Maggiorazione', [], ['upper' => true])."
234234
</th>
235235
236236
<th class='text-center small' style='width:".$width."'>
237-
".tr('Totale scontato', [], ['upper' => true]).'
237+
".tr($sconto > 0 ? 'Totale scontato' : 'Totale maggiorato', [], ['upper' => true]).'
238238
</th>';
239239
}
240240
if ($has_rivalsa) {

templates/ordini/body.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
$sconto_finale = $documento->getScontoFinale();
312312
$netto_a_pagare = $documento->netto;
313313

314-
$show_sconto = $sconto > 0;
314+
$show_sconto = $sconto != 0;
315315

316316
$colspan = 5;
317317
$documento->direzione == 'uscita' ? $colspan += 2 : $colspan;
@@ -336,7 +336,7 @@
336336
echo '
337337
<tr>
338338
<td colspan="'.$colspan.'" class="text-right text-muted">
339-
<b>'.tr('Sconto', [], ['upper' => true]).':</b>
339+
<b>'.tr($sconto > 0 ? 'Sconto' : 'Maggiorazione', [], ['upper' => true]).':</b>
340340
</td>
341341
342342
<th colspan="2" class="text-right">

templates/preventivi/body.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@
201201

202202
// Gestione ottimizzata degli sconti
203203
if ($riga->sconto != 0) {
204-
$text = discountInfo($riga, false);
204+
$text = discountInfo($riga, true);
205205

206206
echo '
207207
<br><small class="text-muted">'.$text.'</small>';
@@ -300,7 +300,7 @@
300300
$sconto_finale = $documento->getScontoFinale();
301301
$netto_a_pagare = $documento->netto;
302302

303-
$show_sconto = $sconto > 0;
303+
$show_sconto = $sconto != 0;
304304

305305
// TOTALE COSTI FINALI
306306
if (($options['pricing'] && !isset($options['hide-total'])) || $options['show-only-total']) {
@@ -321,7 +321,7 @@
321321
echo '
322322
<tr>
323323
<td colspan="'.($options['show-only-total'] ? (($has_image) ? 3 : 2) : (($has_image) ? 6 : 5)).'" class="text-right text-muted">
324-
<b>'.tr('Sconto', [], ['upper' => true]).':</b>
324+
<b>'.tr($sconto > 0 ? 'Sconto' : 'Maggiorazione', [], ['upper' => true]).':</b>
325325
</td>
326326
327327
<th colspan="1" class="text-right">

0 commit comments

Comments
 (0)