Skip to content

Commit 7168e02

Browse files
Pek5892Pek5892
committed
refactor: miglioria grafica modulo Stampe contabili
1 parent 2152643 commit 7168e02

4 files changed

Lines changed: 278 additions & 180 deletions

File tree

‎modules/stampe_contabili/edit.php‎

Lines changed: 82 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -22,102 +22,139 @@
2222

2323
echo '
2424
<div class="row">
25-
<div class="col-md-12 text-center">
25+
<div class="col-md-12">
2626
<div class="alert alert-warning">
27-
<i class="fa fa-warning"></i> <strong>'.tr('Attenzione', [], ['upper']).':</strong><br> '.tr('le seguenti stampe contabili possono essere utilizzate per fini fiscali previa verifica delle informazioni inserite nel gestionale.<br/> Rimane esclusiva responsabilità dell\'utente controllare la correttezza dei documenti qui prodotti').'.
27+
<div class="row">
28+
<div class="col-md-1 text-center d-flex align-items-center justify-content-center">
29+
<i class="fa fa-warning fa-3x"></i>
30+
</div>
31+
<div class="col-md-11">
32+
<strong class="text-blue">'.tr('Attenzione').':</strong>
33+
<hr class="mt-1 mb-1">
34+
<p>'.tr('Le seguenti stampe contabili possono essere utilizzate per fini fiscali previa verifica delle informazioni inserite nel gestionale.').'</p>
35+
<p>'.tr('Rimane esclusiva responsabilità dell\'utente controllare la correttezza dei documenti qui prodotti.').'</p>
36+
</div>
37+
</div>
2838
</div>
2939
</div>
3040
</div>
3141
3242
<div class="row">
33-
<div class="col-md-6 text-center">
34-
<div class="card card-primary">
43+
<div class="col-md-6">
44+
<div class="card card-primary card-outline">
3545
<div class="card-header">
36-
<h3 class="card-title">'.tr('Registri IVA').'</h3>
46+
<h3 class="card-title text-blue">
47+
<i class="fa fa-file-text-o mr-2"></i>'.tr('Registri IVA').'
48+
</h3>
3749
</div>
3850
3951
<div class="card-body">
4052
<div class="row">
41-
<div class="col-md-4">
42-
<button type="button" class="btn btn-primary col-md-12" data-card-widget="modal" data-title="'.tr('Stampa registro IVA vendite').'" data-href="'.base_path().'/modules/stampe_contabili/stampe_contabili.php?dir=entrata&nome_stampa=Registro IVA&id_record='.$id_record.'" ><i class="fa fa-print fa-2x"></i><br>'.tr('Registro').'<br>'.tr('IVA vendite').'</button>
53+
<div class="col-md-4 mb-3">
54+
<button type="button" class="btn btn-primary btn-block" data-card-widget="modal" data-title="'.tr('Stampa registro IVA vendite').'" data-href="'.base_path().'/modules/stampe_contabili/stampe_contabili.php?dir=entrata&nome_stampa=Registro IVA&id_record='.$id_record.'" >
55+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Registro').'<br>'.tr('IVA vendite').'
56+
</button>
4357
</div>
44-
<div class="col-md-4">
45-
<button type="button" class="btn btn-primary col-md-12" data-card-widget="modal" data-title="'.tr('Stampa registro IVA acquisti').'" data-href="'.base_path().'/modules/stampe_contabili/stampe_contabili.php?dir=uscita&nome_stampa=Registro IVA&id_record='.$id_record.'" ><i class="fa fa-print fa-2x"></i><br>'.tr('Registro').'<br>'.tr('IVA acquisti').'</button>
58+
<div class="col-md-4 mb-3">
59+
<button type="button" class="btn btn-primary btn-block" data-card-widget="modal" data-title="'.tr('Stampa registro IVA acquisti').'" data-href="'.base_path().'/modules/stampe_contabili/stampe_contabili.php?dir=uscita&nome_stampa=Registro IVA&id_record='.$id_record.'" >
60+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Registro').'<br>'.tr('IVA acquisti').'
61+
</button>
4662
</div>
47-
<div class="col-md-4">
48-
<button type="button" class="btn btn-primary col-md-12" data-card-widget="modal" data-title="'.tr('Stampa liquidazione IVA').'" data-href="'.base_path().'/modules/stampe_contabili/stampe_contabili.php?nome_stampa=Liquidazione IVA&id_record='.$id_record.'" ><i class="fa fa-print fa-2x"></i><br>'.tr('Liquidazione').'<br>'.tr('IVA').'</button>
63+
<div class="col-md-4 mb-3">
64+
<button type="button" class="btn btn-primary btn-block" data-card-widget="modal" data-title="'.tr('Stampa liquidazione IVA').'" data-href="'.base_path().'/modules/stampe_contabili/stampe_contabili.php?nome_stampa=Liquidazione IVA&id_record='.$id_record.'" >
65+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Liquidazione').'<br>'.tr('IVA').'
66+
</button>
4967
</div>
5068
</div>
5169
</div>
5270
</div>
5371
</div>
5472
55-
56-
57-
<div class="col-md-6 text-center">
58-
<div class="card card-primary">
73+
<div class="col-md-6">
74+
<div class="card card-primary card-outline">
5975
<div class="card-header">
60-
<h3 class="card-title">'.tr('Contabilità').'</h3>
76+
<h3 class="card-title text-blue">
77+
<i class="fa fa-balance-scale mr-2"></i>'.tr('Contabilità').'
78+
</h3>
6179
</div>
6280
6381
<div class="card-body">
6482
<div class="row">
65-
<div class="col-md-4">
66-
<button type="button" class="btn btn-primary col-md-12" data-card-widget="modal" data-title="'.tr('Stampa Bilancio').'" data-href="'.base_path().'/modules/stampe_contabili/stampa_bilancio.php" ><i class="fa fa-print fa-2x"></i> <br>'.tr('Stampa').'<br>'.tr('Bilancio').'<br></button>
83+
<div class="col-md-4 mb-3">
84+
<button type="button" class="btn btn-primary btn-block" data-card-widget="modal" data-title="'.tr('Stampa Bilancio').'" data-href="'.base_path().'/modules/stampe_contabili/stampa_bilancio.php" >
85+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Stampa').'<br>'.tr('Bilancio').'
86+
</button>
6787
</div>
68-
<div class="col-md-4">
69-
'.Prints::getLink('Mastrino', 1, 'btn-primary col-md-12', '<br>'.tr('Situazione').'<br>'.tr('patrimoniale'), '|default| fa-2x', 'lev=1').'
88+
<div class="col-md-4 mb-3">
89+
<button type="button" class="btn btn-primary btn-block" onclick="window.open(\''.base_path().'/pdfgen.php?id_print='.Prints::getPrints()['Mastrino'].'&id_record=1&lev=1\', \'_blank\')">
90+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Situazione').'<br>'.tr('patrimoniale').'
91+
</button>
7092
</div>
71-
<div class="col-md-4">
72-
'.Prints::getLink('Mastrino', 2, 'btn-primary col-md-12', '<br>'.tr('Situazione').'<br>'.tr('economica'), '|default| fa-2x', 'lev=1').'
93+
<div class="col-md-4 mb-3">
94+
<button type="button" class="btn btn-primary btn-block" onclick="window.open(\''.base_path().'/pdfgen.php?id_print='.Prints::getPrints()['Mastrino'].'&id_record=2&lev=1\', \'_blank\')">
95+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Situazione').'<br>'.tr('economica').'
96+
</button>
7397
</div>
7498
</div>
7599
</div>
76100
</div>
77101
</div>
78102
</div>
79103
80-
<div class="row">
81-
<div class="col-md-4 text-center">
82-
<div class="card card-primary">
104+
<div class="row mt-3">
105+
<div class="col-md-4">
106+
<div class="card card-primary card-outline">
83107
<div class="card-header">
84-
<h3 class="card-title">'.tr('Dati economici dal _START_ al _END_', [
108+
<h3 class="card-title text-blue">
109+
<i class="fa fa-bar-chart mr-2"></i>'.tr('Dati economici dal _START_ al _END_', [
85110
'_START_' => Translator::dateToLocale($_SESSION['period_start']),
86111
'_END_' => Translator::dateToLocale($_SESSION['period_end']),
87112
]).'</h3>
88113
</div>
89114
90115
<div class="card-body">
91116
<div class="row">
92-
<div class="col-md-6">
93-
'.Prints::getLink('Fatturato', $id_record, 'btn-primary col-md-12', '<br>'.tr('Stampa').'<br>'.tr('Fatturato'), '|default| fa-2x', 'dir=entrata').'
117+
<div class="col-md-6 mb-3">
118+
<button type="button" class="btn btn-primary btn-block" onclick="window.open(\''.base_path().'/pdfgen.php?id_print='.Prints::getPrints()['Fatturato'].'&id_record='.$id_record.'&dir=entrata\', \'_blank\')">
119+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Stampa').'<br>'.tr('Fatturato').'
120+
</button>
94121
</div>
95-
<div class="col-md-6">
96-
'.Prints::getLink('Fatturato', $id_record, 'btn-primary col-md-12', '<br>'.tr('Stampa').'<br>'.tr('Acquisti').'<br>', '|default| fa-2x', 'dir=uscita').'
122+
<div class="col-md-6 mb-3">
123+
<button type="button" class="btn btn-primary btn-block" onclick="window.open(\''.base_path().'/pdfgen.php?id_print='.Prints::getPrints()['Fatturato'].'&id_record='.$id_record.'&dir=uscita\', \'_blank\')">
124+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Stampa').'<br>'.tr('Acquisti').'
125+
</button>
97126
</div>
98127
</div>
99128
</div>
100129
</div>
101130
</div>
102131
103-
<div class="col-md-4 text-center">
104-
<div class="card card-primary">
132+
<div class="col-md-4">
133+
<div class="card card-primary card-outline">
105134
<div class="card-header">
106-
<h3 class="card-title">'.tr('Libro giornale').'</h3>
135+
<h3 class="card-title text-blue">
136+
<i class="fa fa-book mr-2"></i>'.tr('Libro giornale').'
137+
</h3>
107138
</div>
108139
109140
<div class="card-body">
110-
<div class="col-md-6">
111-
<button type="button" class="btn btn-primary col-md-12" data-card-widget="modal" data-title="'.tr('Libro giornale').'" data-href="'.base_path().'/modules/stampe_contabili/stampe_contabili.php?nome_stampa=Libro giornale&id_record='.$id_record.'"><i class="fa fa-print fa-2x"></i><br>'.tr('Libro').'<br>'.tr('giornale').'</button>
141+
<div class="row">
142+
<div class="col-md-8 offset-md-2 mb-3">
143+
<button type="button" class="btn btn-primary btn-block" data-card-widget="modal" data-title="'.tr('Libro giornale').'" data-href="'.base_path().'/modules/stampe_contabili/stampe_contabili.php?nome_stampa=Libro giornale&id_record='.$id_record.'">
144+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Libro').'<br>'.tr('giornale').'
145+
</button>
146+
</div>
112147
</div>
113148
</div>
114149
</div>
115150
</div>
116151
117-
<div class="col-md-4 text-center">
118-
<div class="card card-primary">
152+
<div class="col-md-4">
153+
<div class="card card-primary card-outline">
119154
<div class="card-header">
120-
<h3 class="card-title">'.tr('Scadenzario').'</h3>
155+
<h3 class="card-title text-blue">
156+
<i class="fa fa-calendar-check-o mr-2"></i>'.tr('Scadenzario').'
157+
</h3>
121158
</div>
122159
123160
<div class="card-body">';
@@ -130,11 +167,13 @@
130167
$disabled = '';
131168
}
132169

133-
echo '
134-
<div class="col-md-6">
135-
<button type="button" '.$disabled.' class="btn btn-'.$class.' col-md-12" data-card-widget="modal" data-title="'.tr('Stampa scadenzario').'" data-href="'.base_path().'/modules/stampe_contabili/stampa_scadenzario.php" >
136-
<i class="fa fa-print fa-2x"></i><br>'.tr('Stampa<br>scadenzario').'
137-
</button>
170+
echo '
171+
<div class="row">
172+
<div class="col-md-8 offset-md-2 mb-3">
173+
<button type="button" '.$disabled.' class="btn btn-'.$class.' btn-block" data-card-widget="modal" data-title="'.tr('Stampa scadenzario').'" data-href="'.base_path().'/modules/stampe_contabili/stampa_scadenzario.php" >
174+
<i class="fa fa-print fa-2x mb-2"></i><br>'.tr('Stampa').'<br>'.tr('scadenzario').'
175+
</button>
176+
</div>
138177
</div>';
139178

140179
echo '

‎modules/stampe_contabili/stampa_bilancio.php‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,27 @@
2525

2626
echo '
2727
<form action="" method="post" onsubmit="if($(this).parsley().validate()) { return avvia_stampa(); }" >
28-
29-
<div class="row">
30-
<div class="col-md-6">
31-
{[ "type": "checkbox", "label": "'.tr('Elenco analitico delle anagrafiche').'", "name": "elenco_analitico", "value": "0" ]}
32-
</div>
33-
34-
</div>
35-
36-
<div class="row">
37-
<div class="col-md-12 text-right">
38-
<button type="submit" class="btn btn-primary">
39-
<i class="fa fa-print"></i> '.tr('Stampa Bilancio').'
40-
</button>
41-
</div>
42-
</div>
43-
28+
<div class="card card-primary card-outline">
29+
<div class="card-header">
30+
<h3 class="card-title">
31+
<i class="fa fa-cog mr-2"></i>'.tr('Opzioni di stampa').'
32+
</h3>
33+
</div>
34+
35+
<div class="card-body">
36+
<div class="row">
37+
<div class="col-md-6">
38+
{[ "type": "checkbox", "label": "'.tr('Elenco analitico delle anagrafiche').'", "name": "elenco_analitico", "value": "0" ]}
39+
</div>
40+
</div>
41+
</div>
42+
43+
<div class="card-footer text-right">
44+
<button type="submit" class="btn btn-primary btn-lg">
45+
<i class="fa fa-print mr-2"></i> '.tr('Stampa Bilancio').'
46+
</button>
47+
</div>
48+
</div>
4449
</form>
4550
4651
<script>$(document).ready(init)</script>';
@@ -51,7 +56,7 @@ function avvia_stampa (){
5156
var elenco = 0;
5257
if($("#elenco_analitico").is(":checked")){
5358
elenco = 1;
54-
}
59+
}
5560
window.open("'.$link.'&elenco_analitico="+elenco+"");
5661
return false;
5762
}

‎modules/stampe_contabili/stampa_scadenzario.php‎

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -55,42 +55,53 @@
5555
}
5656

5757
echo '
58-
<div class="row">
59-
<div class="col-md-3">
60-
{[ "type": "date", "label": "'.tr('Data inizio').'", "name": "date_start", "value": "'.$_SESSION['period_start'].'" ]}
61-
</div>
62-
<div class="col-md-3">
63-
{[ "type": "date", "label": "'.tr('Data fine').'", "name": "date_end", "value": "'.$_SESSION['period_end'].'" ]}
64-
</div>
65-
<div class="col-md-3">
66-
{[ "type": "select", "label": "'.tr('Periodo').'", "name": "periodo", "required": "1", "values": '.json_encode($periodi).', "value": "manuale" ]}
67-
</div>
68-
<div class="col-md-3">
69-
{[ "type": "select", "label": "'.tr('Anagrafica').'", "name": "id_anagrafica", "values": "'.$id_anagrafica.'", "ajax-source": "anagrafiche" ]}
70-
</div>
58+
<div class="card card-primary card-outline">
59+
<div class="card-header">
60+
<h3 class="card-title">
61+
<i class="fa fa-calendar-check-o mr-2"></i>'.tr('Opzioni scadenzario').'
62+
</h3>
7163
</div>
72-
<div class="row">
73-
<div class="col-md-3">
74-
{[ "type": "checkbox", "label": "'.tr('Includi scadenze pagate').'", "name": "is_pagata" ]}
75-
</div>
76-
<div class="col-md-3">
77-
{[ "type": "checkbox", "label": "'.tr('Includi solo Ri.Ba').'", "name": "is_riba" ]}
78-
</div>
79-
<div class="col-md-3">
80-
{[ "type": "checkbox", "label": "'.tr('Includi solo scadenze Clienti').'", "name": "is_cliente" ]}
64+
65+
<div class="card-body">
66+
<div class="row">
67+
<div class="col-md-3">
68+
{[ "type": "date", "label": "'.tr('Data inizio').'", "name": "date_start", "value": "'.$_SESSION['period_start'].'" ]}
69+
</div>
70+
<div class="col-md-3">
71+
{[ "type": "date", "label": "'.tr('Data fine').'", "name": "date_end", "value": "'.$_SESSION['period_end'].'" ]}
72+
</div>
73+
<div class="col-md-3">
74+
{[ "type": "select", "label": "'.tr('Periodo').'", "name": "periodo", "required": "1", "values": '.json_encode($periodi).', "value": "manuale" ]}
75+
</div>
76+
<div class="col-md-3">
77+
{[ "type": "select", "label": "'.tr('Anagrafica').'", "name": "id_anagrafica", "values": "'.$id_anagrafica.'", "ajax-source": "anagrafiche" ]}
78+
</div>
8179
</div>
82-
<div class="col-md-3">
83-
{[ "type": "checkbox", "label": "'.tr('Includi solo scadenze Fornitori').'", "name": "is_fornitore" ]}
80+
81+
<hr>
82+
83+
<div class="row">
84+
<div class="col-md-3">
85+
{[ "type": "checkbox", "label": "'.tr('Includi scadenze pagate').'", "name": "is_pagata" ]}
86+
</div>
87+
<div class="col-md-3">
88+
{[ "type": "checkbox", "label": "'.tr('Includi solo Ri.Ba').'", "name": "is_riba" ]}
89+
</div>
90+
<div class="col-md-3">
91+
{[ "type": "checkbox", "label": "'.tr('Includi solo scadenze Clienti').'", "name": "is_cliente" ]}
92+
</div>
93+
<div class="col-md-3">
94+
{[ "type": "checkbox", "label": "'.tr('Includi solo scadenze Fornitori').'", "name": "is_fornitore" ]}
95+
</div>
8496
</div>
85-
</div>
97+
</div>
8698
87-
<div class="row">
88-
<div class="col-md-12 text-right">
89-
<button type="button" onclick="avvia_stampa();" class="btn btn-primary">
90-
<i class="fa fa-print"></i> '.tr('Stampa scadenzario').'
91-
</button>
92-
</div>
93-
</div>
99+
<div class="card-footer text-right">
100+
<button type="button" onclick="avvia_stampa();" class="btn btn-primary btn-lg">
101+
<i class="fa fa-print mr-2"></i> '.tr('Stampa scadenzario').'
102+
</button>
103+
</div>
104+
</div>
94105
95106
<script>$(document).ready(init)</script>';
96107

@@ -106,7 +117,7 @@ function avvia_stampa (){
106117
var is_riba = $("#is_riba").is(":checked");
107118
var is_cliente = $("#is_cliente").is(":checked");
108119
var is_fornitore = $("#is_fornitore").is(":checked");
109-
120+
110121
window.open("'.$link.'&date_start="+date_start+"&date_end="+date_end+"&is_pagata="+is_pagata+"&is_riba="+is_riba+"&is_cliente="+is_cliente+"&is_fornitore="+is_fornitore+"&id_anagrafica="+id_anagrafica, "_blank");
111122
}
112123
@@ -115,7 +126,7 @@ function avvia_stampa (){
115126
$("#is_fornitore").prop("checked", false);
116127
}
117128
});
118-
129+
119130
$("#is_fornitore").change(function() {
120131
if($(this).is(":checked")) {
121132
$("#is_cliente").prop("checked", false);

0 commit comments

Comments
 (0)