From d27aa9b0480b2a20a0f3b2eebfbbfa15cc25480f Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 29 Oct 2020 11:07:18 +0100 Subject: [PATCH 1/6] Fix salvataggio impostazioni per campi di tipo time --- modules/impostazioni/sezione.php | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/modules/impostazioni/sezione.php b/modules/impostazioni/sezione.php index 5cd268875..8f4a6328c 100644 --- a/modules/impostazioni/sezione.php +++ b/modules/impostazioni/sezione.php @@ -31,9 +31,27 @@ foreach ($impostazioni as $impostazione) { '.Settings::input($impostazione['id']).' - '; } From f17324dd392d803cea697037948726d5d6dbe889 Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 29 Oct 2020 12:30:46 +0100 Subject: [PATCH 2/6] Aggiunta impostazione per mostrare o nascondere barra plugin --- assets/src/css/style.css | 2 +- composer.json | 2 +- editor.php | 22 +++++++++++++++++++++- update/2_4_18.sql | 6 +++++- 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/assets/src/css/style.css b/assets/src/css/style.css index 57bf57765..3cd6e2766 100755 --- a/assets/src/css/style.css +++ b/assets/src/css/style.css @@ -1028,7 +1028,7 @@ div.tip { } .control-sidebar-toggle { - display: none !important; + /*display: none !important;*/ } } diff --git a/composer.json b/composer.json index 8aab949e8..ceedcba65 100755 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ ], "homepage": "https://www.openstamanager.com/", "authors": [{ - "name": "DevCode s.n.c", + "name": "DevCode s.n.c.", "email": "info@openstamanager.com" }], "type": "project", diff --git a/editor.php b/editor.php index 87e70994f..fe815d71c 100755 --- a/editor.php +++ b/editor.php @@ -105,11 +105,31 @@ if (empty($record) || !$has_access) { echo ' - + '; + + $hide_left_sidebar = Auth::check() && (setting('Nascondere la barra dei plugin di default')); + + echo '
  • '.tr('Plugin').'
    • + +
    diff --git a/update/2_4_18.sql b/update/2_4_18.sql index 4d1163a51..1e3f79495 100644 --- a/update/2_4_18.sql +++ b/update/2_4_18.sql @@ -326,4 +326,8 @@ UPDATE `zz_modules` SET `options` = 'custom' WHERE `name` = 'Impostazioni'; UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `co_scadenziario`\r\n LEFT JOIN `co_documenti` ON `co_scadenziario`.`iddocumento` = `co_documenti`.`id`\r\n LEFT JOIN `an_anagrafiche` ON `co_documenti`.`idanagrafica` = `an_anagrafiche`.`idanagrafica`\r\n LEFT JOIN `co_pagamenti` ON `co_documenti`.`idpagamento` = `co_pagamenti`.`id`\r\n LEFT JOIN `co_tipidocumento` ON `co_documenti`.`idtipodocumento` = `co_tipidocumento`.`id`\r\n LEFT JOIN `co_statidocumento` ON `co_documenti`.`idstatodocumento` = `co_statidocumento`.`id`\r\nWHERE 1=1 AND\r\n (`co_scadenziario`.`scadenza` BETWEEN \'|period_start|\' AND \'|period_end|\' OR ABS(`co_scadenziario`.`pagato`) < ABS(`co_scadenziario`.`da_pagare`)) AND\r\n (`co_statidocumento`.`descrizione` IS NULL OR `co_statidocumento`.`descrizione` IN(\'Emessa\',\'Parzialmente pagato\',\'Pagato\'))\r\nHAVING 2=2\r\nORDER BY `scadenza` ASC' WHERE `zz_modules`.`name` = 'Scadenzario'; -- Elimino token disabilitati -DELETE FROM `zz_tokens` WHERE `zz_tokens`.`enabled` = 0; \ No newline at end of file +DELETE FROM `zz_tokens` WHERE `zz_tokens`.`enabled` = 0; + + +-- Aggiunta impostazione per mostrare o nascondere barra plugin +INSERT INTO `zz_settings` (`id`, `nome`, `valore`, `tipo`, `editable`, `sezione`, `order`, `help`) VALUES (NULL, 'Nascondere la barra dei plugin di default', '0', 'boolean', '1', 'Generali', '2', NULL); \ No newline at end of file From 5fe1a5cf5975d3633dfd505539dbdc352c28767a Mon Sep 17 00:00:00 2001 From: Luca Date: Thu, 29 Oct 2020 13:23:47 +0100 Subject: [PATCH 3/6] Migliorie minori --- editor.php | 5 +++-- modules/fatture/row-list.php | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/editor.php b/editor.php index fe815d71c..324deb236 100755 --- a/editor.php +++ b/editor.php @@ -119,13 +119,14 @@ if (empty($record) || !$has_access) { $( document ).ready(function() {'; if (!empty($hide_left_sidebar)){ - echo ' $(".control-sidebar").removeClass("control-sidebar-shown"); $("aside.content-wrapper").toggleClass("with-control-sidebar");'; + echo ' $(".control-sidebar").removeClass("control-sidebar-shown"); $("aside.content-wrapper, .main-footer").toggleClass("with-control-sidebar");'; } echo ' $(".control-sidebar-toggle").bind("click", function() { - $("aside.content-wrapper").toggleClass("with-control-sidebar"); + $("aside.content-wrapper, .main-footer").toggleClass("with-control-sidebar"); $(".control-sidebar").toggleClass("control-sidebar-shown"); + }); }); diff --git a/modules/fatture/row-list.php b/modules/fatture/row-list.php index e7b5e7b53..03a7513a3 100755 --- a/modules/fatture/row-list.php +++ b/modules/fatture/row-list.php @@ -80,7 +80,8 @@ foreach ($righe as $riga) { '_RIVALSA_' => $riga->rivalsa_inps ? '
    Rivalsa: '.moneyFormat(abs($riga->rivalsa_inps)) : null, '_RITENUTA_ACCONTO_' => $riga->ritenuta_acconto ? '
    Ritenuta acconto: '.moneyFormat(abs($riga->ritenuta_acconto)) : null, '_RITENUTA_CONTRIBUTI_' => $riga->ritenuta_contributi ? '
    Ritenuta contributi: '.moneyFormat(abs($riga->ritenuta_contributi)) : null, - '_DESCRIZIONE_CONTO_' => $descrizione_conto ?: null, + '_DESCRIZIONE_CONTO_' => $descrizione_conto ?: ' + '.tr("Conto mancante").'', '_ID_DOCUMENTO_' => $id_documento_fe ? ' - DOC: '.$id_documento_fe : null, '_NUMERO_RIGA_' => $num_item ? ', NRI: '.$num_item : null, '_CODICE_CIG_' => $codice_cig ? ', CIG: '.$codice_cig : null, From fdd130bf1b6bdbcfc0bf69635fa075f395e8ace3 Mon Sep 17 00:00:00 2001 From: Dasc3er Date: Thu, 29 Oct 2020 16:48:37 +0100 Subject: [PATCH 4/6] Correzione nomi di alcune funzioni Correzione delle funzioni - starts_with in string_starts_with - ends_with in string_ends_with - str_contains in string_contains - str_to_lower in string_lowercase - str_to_upper in string_uppercase per maggiore coerenza e per evitare problemi con PHP 8. --- actions.php | 6 +++--- controller.php | 2 +- editor.php | 8 +++---- include/bottom.php | 2 +- include/init/configuration.php | 4 ++-- include/init/requirements.php | 4 ++-- include/top.php | 10 ++++----- lib/functions.php | 2 +- lib/util.php | 24 ++++++++++----------- modules/anagrafiche/ajax/search.php | 4 ++-- modules/articoli/ajax/search.php | 2 +- modules/backups/edit.php | 4 ++-- modules/ddt/ajax/search.php | 2 +- modules/fatture/ajax/search.php | 2 +- modules/impianti/ajax/search.php | 2 +- modules/import/edit.php | 4 ++-- modules/interventi/ajax/search.php | 2 +- modules/interventi/src/API/v1/Sync.php | 2 +- modules/preventivi/ajax/search.php | 2 +- modules/segmenti/actions.php | 4 ++-- modules/segmenti/edit.php | 2 +- plugins/importFE/actions.php | 2 +- plugins/importFE/src/FatturaElettronica.php | 2 +- plugins/receiptFE/src/Ricevuta.php | 2 +- src/AJAX.php | 2 +- src/API/Manager.php | 2 +- src/App.php | 2 +- src/Backup.php | 2 +- src/Database.php | 2 +- src/HTMLBuilder/HTMLBuilder.php | 2 +- src/HTMLBuilder/Handler/DefaultHandler.php | 2 +- src/HTMLBuilder/Handler/SelectHandler.php | 4 ++-- src/HTMLBuilder/Wrapper/HTMLWrapper.php | 6 +++--- src/Intl/Formatter.php | 2 +- src/Modules.php | 2 +- src/Prints.php | 2 +- src/Update.php | 6 +++--- src/Util/Ini.php | 2 +- src/Util/Query.php | 14 ++++++------ src/Validate.php | 2 +- templates/pdfgen_variables.php | 2 +- templates/riepilogo_interventi/init.php | 2 +- templates/scadenzario/init.php | 2 +- update/v2_4_17/recupero_date_movimenti.php | 4 ++-- 44 files changed, 82 insertions(+), 82 deletions(-) diff --git a/actions.php b/actions.php index 1927ec76a..1f2a67eae 100755 --- a/actions.php +++ b/actions.php @@ -348,7 +348,7 @@ if ($structure->permission == 'rw') { $query = 'SELECT `id`, `html_name` AS `name` FROM `zz_fields` WHERE '.$custom_where; $customs = $dbo->fetchArray($query); - if (!starts_with(post('op'), 'delete')) { + if (!string_starts_with(post('op'), 'delete')) { $values = []; foreach ($customs as $custom) { if (post($custom['name']) !== null) { @@ -357,7 +357,7 @@ if ($structure->permission == 'rw') { } // Inserimento iniziale - if (starts_with(post('op'), 'add')) { + if (string_starts_with(post('op'), 'add')) { // Informazioni di log Filter::set('get', 'id_record', $id_record); @@ -371,7 +371,7 @@ if ($structure->permission == 'rw') { } // Aggiornamento - elseif (starts_with(post('op'), 'update')) { + elseif (string_starts_with(post('op'), 'update')) { $query = 'SELECT `zz_field_record`.`id_field` FROM `zz_field_record` JOIN `zz_fields` ON `zz_fields`.`id` = `zz_field_record`.`id_field` WHERE id_record = '.prepare($id_record).' AND '.$custom_where; $customs_present = $dbo->fetchArray($query); $customs_present = array_column($customs_present, 'id_field'); diff --git a/controller.php b/controller.php index 821068453..f546515bf 100755 --- a/controller.php +++ b/controller.php @@ -96,7 +96,7 @@ echo ' redirectOperation($id_module, isset($id_parent) ? $id_parent : $id_record); // Interfaccia per la modifica dell'ordine e della visibilità delle colonne (Amministratore) -if ($user->is_admin && str_contains($module['option'], '|select|')) { +if ($user->is_admin && string_contains($module['option'], '|select|')) { echo '