diff --git a/ajax_select.php b/ajax_select.php index badc7559b..366e76edf 100644 --- a/ajax_select.php +++ b/ajax_select.php @@ -237,8 +237,8 @@ switch ($op) { } if (!empty($search)) { - $search_fields[] = 'descrizione LIKE '.prepare('%'.$search.'%'); - $search_fields[] = 'codice LIKE '.prepare('%'.$search.'%'); + $search_fields[] = 'mg_articoli.descrizione LIKE '.prepare('%'.$search.'%'); + $search_fields[] = 'mg_articoli.codice LIKE '.prepare('%'.$search.'%'); } $wh = ''; @@ -259,8 +259,12 @@ switch ($op) { $rs = $dbo->fetchArray($query); foreach ($rs as $r) { if ($prev != $r['id_sottocategoria']) { + $categoria = $dbo->fetchArray('SELECT `nome` FROM `mg_categorie` WHERE `id`='.prepare($r['id_categoria']))[0]['nome']; + + $sottocategoria = $dbo->fetchArray('SELECT `nome` FROM `mg_categorie` WHERE `id`='.prepare($r['id_sottocategoria']))[0]['nome']; + $prev = $r['id_sottocategoria']; - $results[] = ['text' => $dbo->fetchArray('SELECT `nome` FROM `mg_categorie` WHERE `id`='.prepare($r['id_categoria']))[0]['nome'], 'children' => []]; + $results[] = ['text' => $categoria.' ('.(!empty($r['id_sottocategoria']) ? $sottocategoria : '-').')', 'children' => []]; } if (empty($r['idiva_vendita'])) { diff --git a/modules/articoli/add.php b/modules/articoli/add.php index 7d89ecb66..e4a6e27da 100644 --- a/modules/articoli/add.php +++ b/modules/articoli/add.php @@ -22,7 +22,7 @@ unset($_SESSION['superselect']['id_categoria']);
- {[ "type": "select", "label": "", "name": "subcategoria", "value": "", "ajax-source": "sottocategorie", "icon-after": "add|||hide" ]} + {[ "type": "select", "label": "", "name": "subcategoria", "id": "subcategoria_add", "value": "", "ajax-source": "sottocategorie", "icon-after": "add|||hide" ]}
@@ -36,7 +36,7 @@ unset($_SESSION['superselect']['id_categoria']);