Skip to content

Commit f2dfffc

Browse files
Pek5892Pek5892
committed
fix: retrofix per installazione
1 parent 8633f35 commit f2dfffc

2 files changed

Lines changed: 30 additions & 27 deletions

File tree

‎update/2_8.php‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,4 @@
145145
$id = $dbo->lastInsertedId();
146146
$dbo->query('UPDATE `zz_files` SET `id_category` = '.$id.' WHERE `category` = '.prepare($categoria));
147147
}
148-
$dbo->query('ALTER TABLE `zz_files` DROP `category`');
149-
150-
// Rimozione delle foreign key dalla tabella my_impianti_marche_lang
151-
try {
152-
$dbo->query('ALTER TABLE `my_impianti_marche_lang` DROP FOREIGN KEY `my_impianti_marche_lang_ibfk_1`');
153-
} catch (Exception $e) {
154-
}
155-
try {
156-
$dbo->query('ALTER TABLE `my_impianti_marche_lang` DROP FOREIGN KEY `my_impianti_marche_lang_ibfk_2`');
157-
} catch (Exception $e) {
158-
}
148+
$dbo->query('ALTER TABLE `zz_files` DROP `category`');

‎update/2_8.sql‎

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -211,15 +211,26 @@ ALTER TABLE `zz_categorie` ADD `is_impianto` TINYINT(1) NOT NULL DEFAULT 0;
211211
UPDATE `zz_categorie` SET `is_articolo` = 1 WHERE `id` IN (SELECT DISTINCT `id_categoria` FROM `mg_articoli` WHERE `id_categoria` IS NOT NULL AND `id_categoria` > 0)
212212
OR `id` IN (SELECT DISTINCT `id_sottocategoria` FROM `mg_articoli` WHERE `id_sottocategoria` IS NOT NULL AND `id_sottocategoria` > 0);
213213

214+
-- Inserisci prima le categorie senza parent (categorie principali)
214215
INSERT INTO `zz_categorie` (`colore`, `parent`, `is_articolo`, `is_impianto`)
215-
SELECT `colore`, `parent`, 0, 1 FROM `my_impianti_categorie`;
216+
SELECT `colore`, NULL, 0, 1 FROM `my_impianti_categorie` WHERE `parent` IS NULL OR `parent` = 0;
217+
218+
-- Inserisci le sottocategorie con parent, mappando i parent ID dalla vecchia alla nuova tabella
219+
INSERT INTO `zz_categorie` (`colore`, `parent`, `is_articolo`, `is_impianto`)
220+
SELECT `mic`.`colore`, `zz_cat_parent`.`id`, 0, 1
221+
FROM `my_impianti_categorie` `mic`
222+
JOIN `my_impianti_categorie` `mic_parent` ON `mic`.`parent` = `mic_parent`.`id`
223+
JOIN `zz_categorie` `zz_cat_parent` ON `zz_cat_parent`.`is_impianto` = 1 AND `zz_cat_parent`.`colore` = `mic_parent`.`colore`
224+
WHERE `mic`.`parent` IS NOT NULL AND `mic`.`parent` > 0;
216225

217226
INSERT INTO `zz_categorie_lang` (`id_lang`, `id_record`, `title`)
218227
SELECT `mic_lang`.`id_lang`, `zz_cat`.`id`, `mic_lang`.`title`
219228
FROM `my_impianti_categorie_lang` `mic_lang`
220229
JOIN `my_impianti_categorie` `mic` ON `mic_lang`.`id_record` = `mic`.`id`
221230
JOIN `zz_categorie` `zz_cat` ON `zz_cat`.`is_impianto` = 1 AND `zz_cat`.`colore` = `mic`.`colore`;
222231

232+
ALTER TABLE `my_impianti` DROP FOREIGN KEY `my_impianti_ibfk_1`;
233+
223234
UPDATE `my_impianti` `imp`
224235
JOIN `my_impianti_categorie` `mic` ON `imp`.`id_categoria` = `mic`.`id`
225236
JOIN `zz_categorie` `zz_cat` ON `zz_cat`.`is_impianto` = 1 AND `zz_cat`.`colore` = `mic`.`colore`
@@ -231,7 +242,6 @@ JOIN `zz_categorie` `zz_cat` ON `zz_cat`.`is_impianto` = 1 AND `zz_cat`.`colore`
231242
SET `imp`.`id_sottocategoria` = `zz_cat`.`id`;
232243

233244
DROP TABLE IF EXISTS `my_impianti_categorie_lang`;
234-
ALTER TABLE `my_impianti` DROP FOREIGN KEY `my_impianti_ibfk_1`;
235245
DROP TABLE IF EXISTS `my_impianti_categorie`;
236246

237247
UPDATE `zz_modules` SET `name` = 'Categorie' WHERE `name` = 'Categorie articoli' ;
@@ -250,7 +260,7 @@ INSERT INTO `zz_views_lang` (`id_lang`, `id_record`, `title`) VALUES
250260
(1, (SELECT `id` FROM `zz_views` WHERE `name` = 'Impianto' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Categorie')), 'Impianto'),
251261
(2, (SELECT `id` FROM `zz_views` WHERE `name` = 'Impianto' AND `id_module` = (SELECT `id` FROM `zz_modules` WHERE `name` = 'Categorie')), 'Equipment');
252262

253-
UPDATE `zz_modules` SET `directory` = 'categorie' WHERE `zz_modules`.`name` = 'Categorie';
263+
UPDATE `zz_modules` SET `directory` = 'categorie' WHERE `zz_modules`.`name` = 'Categorie';
254264
UPDATE `zz_modules` SET `attachments_directory` = 'categorie' WHERE `zz_modules`.`name` = 'Categorie';
255265

256266
-- Allineamento vista Articoli
@@ -269,7 +279,7 @@ FROM
269279
LEFT JOIN `mg_categorie_lang` ON (`mg_categorie`.`id` = `mg_categorie_lang`.`id_record` AND `mg_categorie_lang`.|lang|)
270280
LEFT JOIN `mg_categorie` AS sottocategorie ON `mg_articoli`.`id_sottocategoria` = `sottocategorie`.`id`
271281
LEFT JOIN `mg_categorie_lang` AS sottocategorie_lang ON (`sottocategorie`.`id` = `sottocategorie_lang`.`id_record` AND `sottocategorie_lang`.|lang|)
272-
LEFT JOIN (SELECT `co_iva`.`percentuale` AS perc, `co_iva`.`id`, `zz_settings`.`nome` FROM `co_iva` INNER JOIN `zz_settings` ON `co_iva`.`id`=`zz_settings`.`valore`)AS iva ON `iva`.`nome`= 'Iva predefinita'
282+
LEFT JOIN (SELECT `co_iva`.`percentuale` AS perc, `co_iva`.`id`, `zz_settings`.`nome` FROM `co_iva` INNER JOIN `zz_settings` ON `co_iva`.`id`=`zz_settings`.`valore`)AS iva ON `iva`.`nome`= 'Iva predefinita'
273283
LEFT JOIN mg_scorte_sedi ON mg_scorte_sedi.id_articolo = mg_articoli.id
274284
LEFT JOIN (SELECT CASE WHEN MIN(differenza) < 0 THEN -1 WHEN MAX(threshold_qta) > 0 THEN 1 ELSE 0 END AS stato_giacenza, idarticolo FROM (SELECT SUM(mg_movimenti.qta) - COALESCE(mg_scorte_sedi.threshold_qta, 0) AS differenza, COALESCE(mg_scorte_sedi.threshold_qta, 0) as threshold_qta, mg_movimenti.idarticolo FROM mg_movimenti LEFT JOIN mg_scorte_sedi ON mg_scorte_sedi.id_sede = mg_movimenti.idsede AND mg_scorte_sedi.id_articolo = mg_movimenti.idarticolo GROUP BY mg_movimenti.idarticolo, mg_movimenti.idsede) AS subquery GROUP BY idarticolo) AS giacenze ON giacenze.idarticolo = mg_articoli.id
275285
WHERE
@@ -292,17 +302,17 @@ UPDATE `zz_views` SET `query` = REPLACE(`query`, 'my_impianti_categorie', 'zz_ca
292302

293303
RENAME TABLE `mg_marchi` TO `zz_marche`;
294304

295-
ALTER TABLE `zz_marche` ADD `parent` INT NOT NULL AFTER `link`, ADD `is_articolo` BOOLEAN NOT NULL DEFAULT 1, ADD `is_impianto` BOOLEAN NOT NULL DEFAULT 0;
305+
ALTER TABLE `zz_marche` ADD `parent` INT NOT NULL AFTER `link`, ADD `is_articolo` BOOLEAN NOT NULL DEFAULT 1, ADD `is_impianto` BOOLEAN NOT NULL DEFAULT 0;
296306

297-
ALTER TABLE `mg_articoli` CHANGE `id_marchio` `id_marca` INT NULL DEFAULT NULL;
298-
ALTER TABLE `mg_articoli` CHANGE `modello` `id_modello` INT NULL DEFAULT NULL;
307+
ALTER TABLE `mg_articoli` CHANGE `id_marchio` `id_marca` INT NULL DEFAULT NULL;
308+
ALTER TABLE `mg_articoli` CHANGE `modello` `id_modello` INT NULL DEFAULT NULL;
299309

300310
UPDATE `zz_marche` SET `is_articolo` = 1 WHERE `id` IN (SELECT DISTINCT `id_marca` FROM `mg_articoli` WHERE `id_marca` IS NOT NULL AND `id_marca` > 0) OR `id` IN (SELECT DISTINCT `id_modello` FROM `mg_articoli` WHERE `id_modello` IS NOT NULL AND `id_modello` > 0);
301311

302312
INSERT INTO `zz_marche` (`name`,`parent`, `is_articolo`, `is_impianto`) SELECT `title`, `parent`, 0, 1 FROM `my_impianti_marche` INNER JOIN `my_impianti_marche_lang` ON `my_impianti_marche`.`id` = `my_impianti_marche_lang`.`id_record` AND `my_impianti_marche_lang`.`id_lang` = 1;
303313

304-
UPDATE `zz_modules` SET `name` = 'Marche', `directory` = 'marche' WHERE `zz_modules`.`name` = 'Marchi';
305-
UPDATE `zz_modules_lang` SET `title` = 'Marche' WHERE `zz_modules_lang`.`title` = 'Marchi';
314+
UPDATE `zz_modules` SET `name` = 'Marche', `directory` = 'marche' WHERE `zz_modules`.`name` = 'Marchi';
315+
UPDATE `zz_modules_lang` SET `title` = 'Marche' WHERE `zz_modules_lang`.`title` = 'Marchi';
306316

307317
UPDATE `zz_modules` SET `options` = REPLACE(`options`, 'mg_marchi', 'zz_marche') WHERE `options` LIKE '%mg_marchi%';
308318

@@ -316,7 +326,10 @@ UPDATE `zz_views` SET `query` = REPLACE(`query`, 'my_impianti_marche', 'zz_march
316326

317327
DELETE FROM `zz_modules` WHERE `name` = 'Marche impianti';
318328

319-
UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `zz_marche` WHERE 1=1 AND parent = 0 HAVING 2=2 ORDER BY `zz_marche`.`name`' WHERE `zz_modules`.`name` = 'Marche';
329+
UPDATE `zz_modules` SET `options` = 'SELECT |select| FROM `zz_marche` WHERE 1=1 AND parent = 0 HAVING 2=2 ORDER BY `zz_marche`.`name`' WHERE `zz_modules`.`name` = 'Marche';
330+
331+
ALTER TABLE `my_impianti_marche_lang` DROP FOREIGN KEY `my_impianti_marche_lang_ibfk_1`;
332+
ALTER TABLE `my_impianti_marche_lang` DROP FOREIGN KEY `my_impianti_marche_lang_ibfk_2`;
320333

321334
DROP TABLE `my_impianti_marche`;
322335
DROP TABLE `my_impianti_marche_lang`;
@@ -328,7 +341,7 @@ SELECT
328341
FROM
329342
`my_impianti`
330343
LEFT JOIN `an_anagrafiche` AS clienti ON `clienti`.`idanagrafica` = `my_impianti`.`idanagrafica`
331-
LEFT JOIN `an_anagrafiche` AS tecnici ON `tecnici`.`idanagrafica` = `my_impianti`.`idtecnico`
344+
LEFT JOIN `an_anagrafiche` AS tecnici ON `tecnici`.`idanagrafica` = `my_impianti`.`idtecnico`
332345
LEFT JOIN `zz_categorie` ON `zz_categorie`.`id` = `my_impianti`.`id_categoria`
333346
LEFT JOIN `zz_categorie_lang` ON (`zz_categorie`.`id` = `zz_categorie_lang`.`id_record` AND `zz_categorie_lang`.|lang|)
334347
LEFT JOIN `zz_categorie` as sub ON sub.`id` = `my_impianti`.`id_sottocategoria`
@@ -350,7 +363,7 @@ UPDATE `zz_views` SET `query` = 'modello.name' WHERE `name` = 'Modello' AND `id_
350363
-- Allineamento vista Preventivi
351364
UPDATE `zz_modules` SET `options` = "
352365
SELECT
353-
|select|
366+
|select|
354367
FROM
355368
`co_preventivi`
356369
LEFT JOIN `an_anagrafiche` ON `co_preventivi`.`idanagrafica` = `an_anagrafiche`.`idanagrafica`
@@ -360,13 +373,13 @@ FROM
360373
LEFT JOIN (SELECT `an_anagrafiche`.`idanagrafica`, `an_anagrafiche`.`ragione_sociale` AS nome FROM `an_anagrafiche`)AS agente ON `agente`.`idanagrafica`=`co_preventivi`.`idagente`
361374
LEFT JOIN (SELECT GROUP_CONCAT(DISTINCT `co_documenti`.`numero_esterno` SEPARATOR ', ') AS `info`, `co_righe_documenti`.`original_document_id` AS `idpreventivo` FROM `co_documenti` INNER JOIN `co_righe_documenti` ON `co_documenti`.`id` = `co_righe_documenti`.`iddocumento` WHERE `original_document_type`='Modules\Preventivi\Preventivo' GROUP BY `idpreventivo`, `original_document_id`) AS `fattura` ON `fattura`.`idpreventivo` = `co_preventivi`.`id`
362375
LEFT JOIN (SELECT COUNT(id) as emails, em_emails.id_record FROM em_emails INNER JOIN zz_operations ON zz_operations.id_email = em_emails.id WHERE id_module IN(SELECT `id` FROM `zz_modules` WHERE `name` = 'Preventivi') AND `zz_operations`.`op` = 'send-email' GROUP BY em_emails.id_record) AS `email` ON `email`.`id_record` = `co_preventivi`.`id`
363-
WHERE
376+
WHERE
364377
1=1 |segment(`co_preventivi`.`id_segment`)| |date_period(custom,'|period_start|' >= `data_bozza` AND '|period_start|' <= `data_conclusione`,'|period_end|' >= `data_bozza` AND '|period_end|' <= `data_conclusione`,`data_bozza` >= '|period_start|' AND `data_bozza` <= '|period_end|',`data_conclusione` >= '|period_start|' AND `data_conclusione` <= '|period_end|',`data_bozza` >= '|period_start|' AND `data_conclusione` = NULL)| AND `default_revision` = 1
365-
GROUP BY
378+
GROUP BY
366379
`co_preventivi`.`id`, `fattura`.`info`
367-
HAVING
380+
HAVING
368381
2=2
369-
ORDER BY
382+
ORDER BY
370383
`co_preventivi`.`data_bozza` DESC, numero ASC" WHERE `zz_modules`.`name` = 'Preventivi';
371384

372385
-- Nuovo modulo "Categorie file"

0 commit comments

Comments
 (0)