From 6ae460cf4e2768fada6eba5d23ce815604c8cce3 Mon Sep 17 00:00:00 2001
From: valentina <pek5892@gmail.com>
Date: Wed, 6 Nov 2024 09:45:50 +0100
Subject: [PATCH] feat: aggiunta modello in articoli #1180

---
 modules/articoli/actions.php |  1 +
 modules/articoli/edit.php    |  9 ++++++---
 modules/articoli/header.php  | 23 ++++++++++++++++-------
 update/2_6.sql               |  5 ++++-
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/modules/articoli/actions.php b/modules/articoli/actions.php
index 0b631b751..071d8df9a 100755
--- a/modules/articoli/actions.php
+++ b/modules/articoli/actions.php
@@ -150,6 +150,7 @@ switch (post('op')) {
         $articolo->volume = post('volume');
         $articolo->peso_lordo = post('peso_lordo');
         $articolo->id_marchio = post('id_marchio');
+        $articolo->modello = post('modello');
 
         $articolo->um_secondaria = post('um_secondaria');
         $articolo->fattore_um_secondaria = post('fattore_um_secondaria');
diff --git a/modules/articoli/edit.php b/modules/articoli/edit.php
index b858a7b7a..bbf12608a 100755
--- a/modules/articoli/edit.php
+++ b/modules/articoli/edit.php
@@ -62,20 +62,23 @@ use Modules\Iva\Aliquota;
                     </div>
 
                     <div class="row">
-                        <div class="col-md-4">
+                        <div class="col-md-3">
                             <?php echo (!empty($record['id_categoria'])) ?
                                 Modules::link('Categorie articoli', $record['id_categoria'], null, null, 'class="pull-right"') : ''; ?>
                             {[ "type": "select", "label": "<?php echo tr('Categoria'); ?>", "name": "categoria", "required": 0, "value": "$id_categoria$", "ajax-source": "categorie", "icon-after": "add|<?php echo Module::where('name', 'Categorie articoli')->first()->id; ?>" ]}
                         </div>
 
-                        <div class="col-md-4">
+                        <div class="col-md-3">
                             {[ "type": "select", "label": "<?php echo tr('Sottocategoria'); ?>", "name": "subcategoria", "value": "$id_sottocategoria$", "ajax-source": "sottocategorie", "select-options": <?php echo json_encode(['id_categoria' => $record['id_categoria']]); ?>, "icon-after": "add|<?php echo Module::where('name', 'Categorie articoli')->first()->id; ?>|id_original=<?php echo $record['id_categoria']; ?>" ]}
                         </div>
 
-                        <div class="col-md-4">
+                        <div class="col-md-3">
                             <?php echo !empty($record['id_marchio']) ? Modules::link('Marchi', $record['id_marchio'], null, null, 'class="pull-right"') : ''; ?>
                             {[ "type": "select", "label": "<?php echo tr('Marchio'); ?>", "name": "id_marchio", "value":"$id_marchio$", "values": "query=SELECT id, name AS descrizione FROM mg_marchi ORDER BY descrizione ASC" ]}
                         </div>
+                        <div class="col-md-3">
+                            {[ "type": "text", "label": "<?php echo tr('Modello'); ?>", "name": "modello", "value": "$modello$" ]}
+                        </div>
                     </div>
                     <div class="row">
                         <div class="col-md-12">
diff --git a/modules/articoli/header.php b/modules/articoli/header.php
index 0bf178865..76e95c3eb 100644
--- a/modules/articoli/header.php
+++ b/modules/articoli/header.php
@@ -36,15 +36,24 @@ echo '
                     </div>
                     
                     <div class="col-md-9">';
-
-// Articolo
-echo '
-                        '.($articolo->id_marchio ? '<p class="float-right"><i class="fa fa-tag"></i> '.($articolo->marchio->name? '<a href="'.$articolo->marchio->link.'" target="_blank" rel="noopener noreferrer"> '.$articolo->marchio->name.'</a>' : $articolo->marchio->name).'</p>' : '').                    
-                        ($articolo->id_categoria ? '<p class="text-muted"> '.$articolo->categoria->getTranslation('title') : '').($articolo->id_sottocategoria ? ' <small><i class="fa fa-chevron-right"></i></small> '.$articolo->sottocategoria->getTranslation('title') : '').'</p>
-                        <h4><b>'.$articolo->getTranslation('title').'</b> '.($articolo->attivo ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-times text-danger"></i> ').'</h4>
+                        // Articolo
+                        if ($articolo->marchio || $articolo->modello) {
+                            echo'
+                            <p class="float-right"><i class="fa fa-tag"></i>
+                                '.($articolo->marchio ? ($articolo->marchio->link ? '<a href="'.$articolo->marchio->link.'" target="_blank" rel="noopener noreferrer"> '.$articolo->marchio->name.'</a>' : $articolo->marchio->name.' ') : '').
+                                ($articolo->modello ? ' <small><i class="fa fa-chevron-right"></i></small> '.$articolo->modello.' ' : '')
+                            .'</p>';
+                        }
+                        if ($articolo->id_categoria) {
+                            echo'
+                            <p class="text-muted">'.$articolo->categoria->getTranslation('title').
+                            ($articolo->sottocategoria ? ' <small><i class="fa fa-chevron-right"></i></small> '.$articolo->sottocategoria->getTranslation('title') : '').
+                            '</p>';
+                        }
+                        echo'
+                        <p><h4><b>'.$articolo->getTranslation('title').'</b> '.($articolo->attivo ? '<i class="fa fa-check text-success"></i>' : '<i class="fa fa-times text-danger"></i> ').'</h4></p>
                         <p><b>'.$articolo->codice.'</b> '.($articolo->barcode ? ' - <i class="fa fa-barcode"></i> '.$articolo->barcode.'</p>' : '').'</p>
                         '.($articolo->note ? '<p class="text-danger"><i class="fa fa-pencil-square-o"></i> '.$articolo->note.'</p>' : '').'
-                        
                     </div>
                 </div>
             </div>
diff --git a/update/2_6.sql b/update/2_6.sql
index 541b552a2..783d7976e 100644
--- a/update/2_6.sql
+++ b/update/2_6.sql
@@ -90,4 +90,7 @@ UPDATE `zz_views` SET `name` = 'tel_Cellulare' WHERE `zz_views`.`name` = 'Cellul
 UPDATE `zz_views` SET `name` = 'emailto_Email' WHERE `zz_views`.`name` = 'Email'; 
 UPDATE `zz_views_lang` SET `title` = 'tel_Telefono' WHERE `zz_views_lang`.`id_record` = (SELECT `id` FROM `zz_views` WHERE `name` = 'tel_Telefono'); 
 UPDATE `zz_views_lang` SET `title` = 'tel_Cellulare' WHERE `zz_views_lang`.`id_record` = (SELECT `id` FROM `zz_views` WHERE `name` = 'tel_Cellulare');
-UPDATE `zz_views_lang` SET `title` = 'emailto_Email' WHERE `zz_views_lang`.`id_record` = (SELECT `id` FROM `zz_views` WHERE `name` = 'emailto_Email');
\ No newline at end of file
+UPDATE `zz_views_lang` SET `title` = 'emailto_Email' WHERE `zz_views_lang`.`id_record` = (SELECT `id` FROM `zz_views` WHERE `name` = 'emailto_Email');
+
+-- Aggiunta campo modello
+ALTER TABLE `mg_articoli` ADD `modello` VARCHAR(255) NULL AFTER `id_marchio`; 
\ No newline at end of file