From 5e743363fff8b9a70abf8bb4679d07231873b8b6 Mon Sep 17 00:00:00 2001 From: MatteoPistorello Date: Fri, 25 Mar 2022 16:07:17 +0100 Subject: [PATCH 1/2] Fix file update --- update/2_4_20.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/update/2_4_20.php b/update/2_4_20.php index afc6b7d2b..6a422ae3b 100644 --- a/update/2_4_20.php +++ b/update/2_4_20.php @@ -10,7 +10,13 @@ use Modules\Preventivi\Components\Articolo as ArticoloPreventivo; use Modules\Preventivi\Components\Riga as RigaPreventivo; // File e cartelle deprecate -$files = []; +$files = [ + 'modules/listini/src/', + 'modules/listini/actions.php', + 'modules/listini/add.php', + 'modules/listini/edit.php', + 'modules/listini/init.php', +]; foreach ($files as $key => $value) { $files[$key] = realpath(base_dir().'/'.$value); From 9c75dd6402e0b68380a8bc2c9c196e308b94542e Mon Sep 17 00:00:00 2001 From: Luca Date: Fri, 25 Mar 2022 16:28:25 +0100 Subject: [PATCH 2/2] Fix minori --- modules/contratti/edit.php | 2 +- modules/impianti/edit.php | 2 +- update/2_4_26.sql | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/contratti/edit.php b/modules/contratti/edit.php index bcdda45b8..baa7de552 100755 --- a/modules/contratti/edit.php +++ b/modules/contratti/edit.php @@ -114,7 +114,7 @@ if (strtotime($record['data_conclusione']) < strtotime($record['data_accettazion
- {[ "type": "select", "multiple": "1", "label": "", "name": "matricolaimpianto[]", "values": "query=SELECT idanagrafica, id AS id, IF(nome = '', matricola, CONCAT(matricola, ' - ', nome)) AS descrizione FROM my_impianti WHERE idanagrafica='$idanagrafica$' ORDER BY descrizione", "value": "$idimpianti$", "icon-after": "add||||" ]} + {[ "type": "select", "multiple": "1", "label": "", "name": "matricolaimpianto[]", "values": "query=SELECT idanagrafica, id AS id, IF(nome = '', matricola, CONCAT(matricola, ' - ', nome)) AS descrizione FROM my_impianti WHERE idanagrafica='$idanagrafica$' ORDER BY descrizione", "value": "$idimpianti$", "icon-after": "add||||" ]}
diff --git a/modules/impianti/edit.php b/modules/impianti/edit.php index 049b49b9c..74dddba53 100644 --- a/modules/impianti/edit.php +++ b/modules/impianti/edit.php @@ -63,7 +63,7 @@ if (!empty($record['immagine'])) { {[ "type": "select", "label": "", "name": "idanagrafica", "required": 1, "value": "$idanagrafica$", "extra": "", "ajax-source": "clienti" ]}
- {[ "type": "select", "label": "", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "values": "query=SELECT id, nome AS descrizione FROM my_impianti_categorie" ]} + {[ "type": "select", "label": "", "name": "id_categoria", "required": 0, "value": "$id_categoria$", "values": "query=SELECT id, nome AS descrizione FROM my_impianti_categorie", "icon-after": "add|" ]}
diff --git a/update/2_4_26.sql b/update/2_4_26.sql index 66b3ac490..54427f986 100644 --- a/update/2_4_26.sql +++ b/update/2_4_26.sql @@ -62,8 +62,8 @@ CREATE TABLE IF NOT EXISTS `mg_articolo_attributo` ( ALTER TABLE `mg_articoli` ADD `id_combinazione` int(11), ADD FOREIGN KEY (`id_combinazione`) REFERENCES `mg_combinazioni`(`id`); INSERT INTO `zz_modules` (`id`, `name`, `title`, `directory`, `options`, `options2`, `icon`, `version`, `compatibility`, `order`, `parent`, `default`, `enabled`) VALUES -(NULL, 'Attributi Combinazioni', 'Attributi Combinazioni', 'attributi_combinazioni', 'SELECT |select| FROM mg_attributi WHERE mg_attributi.deleted_at IS NULL AND 1=1 HAVING 2=2', NULL, 'fa fa-angle-right', '1.0', '2.*', '100', '20', '1', '1'), -(NULL, 'Combinazioni', 'Combinazioni', 'combinazioni_articoli', 'SELECT |select| FROM mg_combinazioni WHERE mg_combinazioni.deleted_at IS NULL AND 1=1 HAVING 2=2', NULL, 'fa fa-angle-right', '1.0', '2.*', '100', '20', '1', '1'); +(NULL, 'Attributi Combinazioni', 'Attributi Combinazioni', 'attributi_combinazioni', 'SELECT |select| FROM mg_attributi WHERE mg_attributi.deleted_at IS NULL AND 1=1 HAVING 2=2', NULL, 'fa fa-angle-right', '1.0', '2.*', '100', (SELECT id FROM zz_modules t WHERE t.name = 'Magazzino'), '1', '1'), +(NULL, 'Combinazioni', 'Combinazioni', 'combinazioni_articoli', 'SELECT |select| FROM mg_combinazioni WHERE mg_combinazioni.deleted_at IS NULL AND 1=1 HAVING 2=2', NULL, 'fa fa-angle-right', '1.0', '2.*', '100', (SELECT id FROM zz_modules t WHERE t.name = 'Magazzino'), '1', '1'); INSERT INTO `zz_plugins` (`id`, `name`, `title`, `idmodule_from`, `idmodule_to`, `position`, `directory`, `options`) VALUES (NULL, 'Varianti Articolo', 'Varianti Articolo', (SELECT `id` FROM `zz_modules` WHERE `name`='Articoli'), (SELECT `id` FROM `zz_modules` WHERE `name`='Articoli'), 'tab', 'varianti_articolo', 'custom');