Fix stampe Automezzi

assets/src/css/style.css

@@ -195,6 +195,10 @@ a:focus {
     margin: 7% auto
 }
 
+.card-center-medium {
+    margin: 7% auto
+}
+
 .box-center .box-body,
 .box-center-large .box-body {
     padding: 20px;
@@ -307,10 +311,6 @@ span.form-control {
     padding: 5px;
 }
 
-.input-group .input-group-addon {
-    background-color: transparent;
-}
-
 .input-group-addon {
     padding: 3px 12px;
 }
@@ -1068,6 +1068,7 @@ kbd{
 .login-page{
     background: #ccc;
     background: radial-gradient(circle, rgba(255,255,255,1) 0%, rgba(229,229,229,1) 34%, rgba(204,204,204,1) 100%);
+    display: block;
 }
 
 .icon{

include/init/init.php

@@ -148,10 +148,7 @@ if (!$has_user) {
                 <div class="card-body">
                     <div class="row">
                         <div class="col-md-4">
-                            <div class="form-group">
+                            {[ "type": "text", "label": "'.tr('Username').'", "id": "admin_username", "name": "admin_username", "value": "", "placeholder": "'.tr("Imposta lo username dell'amministratore").'", "required": 1]}
-                                <label for="admin_username">'.tr('Username').'</label>
-                                <input type="text" class="form-control" id="admin_username" name="admin_username" placeholder="'.tr("Imposta l'username dell'amministratore").'" required>
-                            </div>
                         </div>
 
                         <div class="col-md-4">
@@ -159,10 +156,7 @@ if (!$has_user) {
                         </div>
 
                         <div class="col-md-4">
-                            <div class="form-group">
+                            {[ "type": "text", "label": "'.tr('Email').'", "id": "admin_email", "name": "admin_email", "value": "", "placeholder": "'.tr("Imposta l'indirizzo email dell'amministratore").'", "required": 1]}
-                                <label for="admin_email">'.tr('Email').'</label>
-                                <input type="email" class="form-control" id="admin_email" name="admin_email" placeholder="'.tr("Imposta l'indirizzo email dell'amministratore").'" required>
-                            </div>
                         </div>
                     </div>
                 </div>

index.php

@@ -157,7 +157,7 @@ if (!empty(flash()->getMessage('error'))) {
 
 echo '
 			<form action="?op=login" method="post" autocomplete="off">
-				<div class="login-box">
+				<div class="login-box card-center-medium">
                     <div class="card card-outline card-orange">
                         <div class="card-header text-center">
                             <img src="'.App::getPaths()['img'].'/logo_completo.png" alt="'.tr('OpenSTAManager, il software gestionale open source per assistenza tecnica e fatturazione elettronica').'" class="img-fluid">

modules/interventi/modals/manage_sessione.php

@@ -38,7 +38,7 @@ $intervento = Intervento::find($id_record);
 if (!empty($intervento->id_contratto)) {
     $query = 'SELECT `in_tipiintervento`.`id`, `title`, `co_contratti_tipiintervento`.`costo_ore` AS prezzo_ore_unitario, `co_contratti_tipiintervento`.`costo_km` AS prezzo_km_unitario, `co_contratti_tipiintervento`.`costo_dirittochiamata` AS prezzo_dirittochiamata FROM `in_tipiintervento` LEFT JOIN `in_tipiintervento_lang` ON (`in_tipiintervento`.`id` = `in_tipiintervento_lang`.`id_record` AND `in_tipiintervento_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `co_contratti_tipiintervento` ON `in_tipiintervento`.`id` = `co_contratti_tipiintervento`.`idtipointervento` WHERE `co_contratti_tipiintervento`.`idcontratto` = '.prepare($intervento->id_contratto).' AND `in_tipiintervento`.`deleted_at` IS NULL ORDER BY `title`';
 } else {
-    $query = 'SELECT `in_tipiintervento`.`id`, `title`, `in_tariffe`.`costo_ore` AS prezzo_ore_unitario, `in_tariffe`.`costo_km` AS prezzo_km_unitario, `in_tariffe`.`costo_dirittochiamata` AS prezzo_dirittochiamata FROM `in_tipiintervento` LEFT JOIN `in_tipiintervento_lang` ON (`in_tipiintervento`.`id` = `in_tipiintervento_lang`.`id_record` AND `in_tipiintervento_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `in_tariffe` ON `in_tipiintervento`.`id` = `in_tariffe`.`idtipointervento` WHERE `in_tariffe`.`idtecnico` = '.prepare($sessione['idtecnico']).' AND `in_tipiintervento`.`deleted_at` IS NULL ORDER BY `title`';
+    $query = 'SELECT `in_tipiintervento`.`id`, `title` as `descrizione`, `in_tariffe`.`costo_ore` AS prezzo_ore_unitario, `in_tariffe`.`costo_km` AS prezzo_km_unitario, `in_tariffe`.`costo_dirittochiamata` AS prezzo_dirittochiamata FROM `in_tipiintervento` LEFT JOIN `in_tipiintervento_lang` ON (`in_tipiintervento`.`id` = `in_tipiintervento_lang`.`id_record` AND `in_tipiintervento_lang`.`id_lang` = '.prepare(Models\Locale::getDefault()->id).') INNER JOIN `in_tariffe` ON `in_tipiintervento`.`id` = `in_tariffe`.`idtipointervento` WHERE `in_tariffe`.`idtecnico` = '.prepare($sessione['idtecnico']).' AND `in_tipiintervento`.`deleted_at` IS NULL ORDER BY `title`';
 }
 echo '
 <form id="add_form" action="'.base_path().'/editor.php?id_module='.$id_module.'&id_record='.get('id_record').'" method="post">

package.json

@@ -88,5 +88,6 @@
         "windows-fix": "yarn global add windows-build-tools",
         "php-cs-fix": "vendor/bin/php-cs-fixer fix",
         "rector": "vendor/bin/rector process"
-    }
+    },
+    "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

plugins/sedi/add.php

@@ -108,7 +108,7 @@ echo '
         <div class="card-header with-border">
             <h3 class="card-title">'.tr('Dettagli aggiuntivi').'</h3>
             <div class="card-tools pull-right">
-                <button type="button" class="btn btn-tool" data-widget="collapse">
+                <button type="button" class="btn btn-tool" data-card-widget="collapse">
                     <i class="fa fa-'.(empty($espandi_dettagli) ? 'plus' : 'minus').'"></i>
                 </button>
             </div>

plugins/statistiche_anagrafiche/edit.php

@@ -31,8 +31,8 @@ echo '
             <button class="btn btn-warning btn-xs" onclick="add_calendar()">
                 <i class="fa fa-plus"></i> '.tr('Aggiungi periodo').'
             </button>
-            <button type="button" class="btn btn-card-tool" data-widget="collapse">
+            <button type="button" class="btn btn-card-tool" data-card-widget="collapse">
-                <i class="fa fa-minus"></i>
+                <i class="fa fa-plus"></i>
             </button>
         </div>
     </div>

src/HTMLBuilder/Handler/DefaultHandler.php

@@ -105,8 +105,6 @@ class DefaultHandler implements HandlerInterface
     
         $result = '
     <script>
-
-       
         const characters ="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!$£%-()*[]";
     
         function generateString(length) {
@@ -133,8 +131,7 @@ class DefaultHandler implements HandlerInterface
                 $("#'.$values['id'].'").attr("type", "text");
                 button.removeClass("fa-eye").addClass("fa-eye-slash");
                 button.attr("title", "'.tr('Nascondi password').'");
-            }
+            } else {
-            else {
                 $("#'.$values['id'].'").attr("type", "password");
                 button.removeClass("fa-eye-slash").addClass("fa-eye");
                 button.attr("title", "'.tr('Visualizza password').'");
@@ -157,7 +154,7 @@ class DefaultHandler implements HandlerInterface
         $(document).ready(function(){
             $("#'.$values['id'].'").pwstrength({
                 ui: {
-                    bootstrap3: true,
+                    bootstrap4: true,
                     showVerdictsInsideProgressBar: true,
                     viewports: {
                         progress: "#'.$values['id'].'_viewport_progress",

src/Prints.php

@@ -210,7 +210,7 @@ class Prints
         $infos = PrintTemplate::where('name', $print)->first()->id;
 
         if (empty($infos)) {
-            $infos = PrintTemplate::find($print);
+            $infos = PrintTemplate::find($print)->id;
         }
 
         if (empty($infos)) {
@@ -224,7 +224,7 @@ class Prints
 
             $link .= !empty($infos['previous']) && !empty($id_record) ? '&'.$infos['previous'].'='.$id_record : '';
         } else {
-            $link .= 'id_print='.$infos['id'];
+            $link .= 'id_print='.$infos;
 
             $link .= !empty($id_record) ? '&id_record='.$id_record : '';
         }

templates/automezzi_carico/body.php

@@ -1,7 +1,7 @@
 <?php
 
 echo '
-	<br><br><span><big><b>CARICO SUGLI AUTOMEZZI IL '.date('d/m/Y', strtotime((string) $dt_carico)).'</b></big></span><br>';
+<br><br><span><big><b>CARICO SUGLI AUTOMEZZI IL '.date('d/m/Y', strtotime((string) $dt_carico)).'</b></big></span><br>';
 
 $targa = '';
 $totale_qta = 0.000;
@@ -11,8 +11,14 @@ if ($rs) {
         if ($targa != $rs[$r]['targa']) {
             if ($targa != '') {
                 echo "
-                    <table cellspacing='0' style='table-layout:fixed;'>
+<table cellspacing='0' style='table-layout:fixed;'>
-                        <col width='35'><col width='275'><col width='50'><col width='70'><col width='45'><col width='65'><col width='65'>
+    <col width='35'>
+    <col width='275'>
+    <col width='50'>
+    <col width='70'>
+    <col width='45'>
+    <col width='65'>
+    <col width='65'>
     <tr>
         <td class='first_cell cell-padded'>".'&nbsp;'."</td>
         <td class='table_cell cell-padded'>".'&nbsp;'."</td>
@@ -22,21 +28,21 @@ if ($rs) {
         <td class='table_cell text-right cell-padded'>".number_format($totale_ven, 2, ',', '.')." &euro;</td>
         <td class='table_cell cell-padded'>".'&nbsp;'.'</td>
     </tr>
-                    </table>';
+</table>';
             }
 
             echo "
                 <br/>
-                <table cellspacing='0' style='table-layout:fixed;'>
+<table cellspacing='0' style='table-layout:fixed;'>
     <col width='150'><col width='250'>
     <tr>
         <th bgcolor='#ffffff' class='full_cell1 cell-padded' width='150'>Targa: ".$rs[$r]['targa']."</th>
         <th bgcolor='#ffffff' class='full_cell cell-padded' width='250'>Automezzo: ".$rs[$r]['nome'].'</th>
     </tr>
-                </table>';
+</table>';
 
             echo "
-                <table class='table table-bordered' cellspacing='0' style='table-layout:fixed;'>
+<table class='table table-bordered' cellspacing='0' style='table-layout:fixed;'>
     <col width='35'><col width='275'><col width='50'><col width='70'><col width='45'><col width='65'><col width='65'>
     <tr>
         <th bgcolor='#dddddd' class='full_cell1 cell-padded' width='10%'>Codice</th>
@@ -74,16 +80,15 @@ if ($rs) {
             $totale_qta = $totale_qta + $rs[$r]['qta'];
         }
     }
+    echo '
+</table>';
 } else {
     echo 'Nessun articolo caricato sugli automezzi il '.date('d/m/Y', strtotime((string) $dt_carico)),'.';
 }
 
-echo '
-    </table>';
-
 if ($targa != '') {
     echo "
-		<table cellspacing='0' style='table-layout:fixed;'>
+<table cellspacing='0' style='table-layout:fixed;'>
     <tr>
         <td class='first_cell cell-padded'>".'&nbsp;'."</td>
         <td class='table_cell cell-padded'>".'&nbsp;'."</td>
@@ -93,5 +98,5 @@ if ($targa != '') {
         <td class='table_cell text-right cell-padded'>".number_format($totale_ven, 2, ',', '.')." &euro;</td>
         <td class='table_cell cell-padded'>".'&nbsp;'.'</td>
     </tr>
-		</table>';
+</table>';
 }

templates/automezzi_inventario/init.php

@@ -25,8 +25,8 @@ $where = [];
 $search_targa = get('search_targa');
 $search_nome = get('search_nome');
 
-$where[] = 'movimenti.qta > 0';
+$where[] = 'mg_movimenti.qta > 0';
-$where[] = 'movimenti.qta > 0';
+
 if ($search_targa) {
     $where[] = 'an_sedi.targa like '.prepare('%'.$search_targa.'%');
 }

templates/bilancio/body.php

@@ -93,7 +93,7 @@ foreach ($liv2_patrimoniale as $liv2_p) {
 echo '
                     <tr>
                         <td colspan="2"><h6><b>Totale Attività</b></h6></td>
-                        <td class="text-right" style="font-size:8pt;"><b>'.numberFormat(abs($totale_attivita), 2).'</b></td>
+                        <td class="text-right" style="font-size:8pt;"><b>'.($totale_attivita ? numberFormat(abs($totale_attivita), 2): '').'</b></td>
                     </tr>';
 if ($utile_perdita > 0) {
     echo '
@@ -182,7 +182,7 @@ foreach ($liv2_patrimoniale as $liv2_p) {
 echo '
                     <tr>
                         <td colspan="2"><h6><b>Totale Passività</b></h6></td>
-                        <td class="text-right" style="font-size:8pt;"><b>'.numberFormat(abs($totale_passivita), 2).'</b></td>
+                        <td class="text-right" style="font-size:8pt;"><b>'.($totale_passivita ? numberFormat(abs($totale_passivita), 2):'').'</b></td>
                     </tr>';
 if ($utile_perdita < 0) {
     echo '
@@ -262,7 +262,7 @@ foreach ($liv2_economico as $liv2_e) {
 echo '
                     <tr>
                         <td colspan="2"><h6><b>Totale costi</b></h6></td>
-                        <td class="text-right" style="font-size:8pt;"><b>'.numberFormat(abs($totale_costi), 2).'</b></td>
+                        <td class="text-right" style="font-size:8pt;"><b>'.($totale_costi ? numberFormat(abs($totale_costi), 2) : '').'</b></td>
                         <td></td>
                     </tr>';
 if ($utile_perdita < 0) {
@@ -274,7 +274,7 @@ if ($utile_perdita < 0) {
                         </tr>
                         <tr>
                             <td colspan="2"><h6><b>Totale a pareggio</b></h6></td>
-                            <td class="text-right" style="font-size:8pt;"><b>'.numberFormat(abs($totale_costi) + abs($utile_perdita), 2).'</b></td>
+                            <td class="text-right" style="font-size:8pt;"><b>'.($totale_costi ? numberFormat(abs($totale_costi)) : 0) + ($utile_perdita ? numberFormat(abs($utile_perdita), 2) : 0).'</b></td>
                             <td></td>
                         </tr>';
 }
@@ -335,7 +335,7 @@ foreach ($liv2_economico as $liv2_e) {
 echo '
                     <tr>
                         <td colspan="2"><h6><b>Totale ricavi</b></h6></td>
-                        <td style="font-size:8pt;" class="text-right"><b>'.numberFormat(abs($totale_ricavi), 2).'</b></td>
+                        <td style="font-size:8pt;" class="text-right"><b>'.($totale_ricavi ? numberFormat(abs($totale_ricavi), 2) : '').'</b></td>
                         <td></td>
                     </tr>';
 if ($utile_perdita > 0) {

templates/magazzino_inventario/body.php

@@ -58,7 +58,7 @@ if (post('acquisto') == 'standard') {
 }
 
 if (post('tipo') == 'nozero') {
-    $query = str_replace('2=2', '2=2 AND `qta_totale` > 0', $query);
+    $query = str_replace('1=1 AND 1=1', '1=1 AND `qta_totale` > 0', $query);
 }
 
 $data = Query::executeAndCount($query);

templates/partitario_mastrino/bottom.php

@@ -48,8 +48,9 @@ if (get('lev') == '2' || get('lev') == '3') {
             $totale_passivo += $patrimoniale[$i]['totale'];
         }
     }
-    echo '</table>
+    echo '
-    <table class="table table-striped table-bordered">
+</table>
+<table class="table table-striped table-bordered">
     <tr>
         <th width="25%">TOTALE ATTIVITÀ</th>
         <th width="25%" class="text-right">'.moneyFormat(abs($totale_attivo), 2).'</th>
@@ -63,7 +64,7 @@ if (get('lev') == '2' || get('lev') == '3') {
         <th></th>
         <th></th>
         <th>UTILE</th>
-            <th class="text-right">'.moneyFormat(abs($utile_perdita['totale']), 2).'</th>
+        <th class="text-right">'.($utile_perdita['totale'] ? moneyFormat(abs($utile_perdita['totale']), 2) : 0).'</th>
     </tr>';
         $totale_passivo = abs($totale_passivo + $utile_perdita['totale']);
     } else {
@@ -83,7 +84,5 @@ if (get('lev') == '2' || get('lev') == '3') {
         <th>TOTALE A PAREGGIO</th>
         <th class="text-right">'.moneyFormat(abs($totale_passivo), 2).'</th>
     </tr>
-    </table>';
+</table>';
 }
-
-echo '</tbody></table>';

update/2_5_3.sql

@@ -117,3 +117,14 @@ INSERT INTO `zz_settings_lang` (`id_lang`, `id_record`, `title`, `help`) VALUES
 
 -- Aggiunte note sessioni
 ALTER TABLE `in_interventi_tecnici` ADD `note` TEXT NOT NULL AFTER `tipo_scontokm`; 
+
+-- Fix campo id visibile in vista Fasce orarie
+UPDATE `zz_views` SET `visible` = '0' WHERE `zz_views`.`name` = 'id' AND `zz_views`.`id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Fasce orarie') 
+
+-- Fix widget Anagrafiche in modulo Anagrafiche
+UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Cliente\'){ $(\'#th_Tipo input\').val(\'Cliente\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di clienti'; 
+UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Tecnico\'){ $(\'#th_Tipo input\').val(\'Tecnico\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di tecnici'; 
+UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Fornitore\'){ $(\'#th_Tipo input\').val(\'Fornitore\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di fornitori'; 
+UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Agente\'){ $(\'#th_Tipo input\').val(\'Agente\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di agenti'; 
+UPDATE `zz_widgets` SET `more_link` = "if($(\'#th_Tipo input\').val()!= \'Vettore\'){ $(\'#th_Tipo input\').val(\'Vettore\').trigger(\'keyup\');} else { $(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');}" WHERE `zz_widgets`.`name` = 'Numero di vettori'; 
+UPDATE `zz_widgets` SET `more_link` = "$(\'#th_Tipo input\').val(\'\').trigger(\'keyup\');" WHERE `zz_widgets`.`name` = 'Tutte le anagrafiche';