From 697dae404f191805c3907214f3f9626b553a687a Mon Sep 17 00:00:00 2001
From: loviuz <loviuz@gmail.com>
Date: Thu, 9 Dec 2021 15:32:21 +0100
Subject: [PATCH 1/2] Fix per import articoli cancellati da CSV

---
 modules/articoli/src/Import/CSV.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/articoli/src/Import/CSV.php b/modules/articoli/src/Import/CSV.php
index 931be7bf4..32df24933 100644
--- a/modules/articoli/src/Import/CSV.php
+++ b/modules/articoli/src/Import/CSV.php
@@ -273,10 +273,12 @@ class CSV extends CSVImporter
         $articolo = null;
         // Ricerca sulla base della chiave primaria se presente
         if (!empty($primary_key)) {
-            $articolo = Articolo::where($primary_key, $record[$primary_key])->first();
+            $articolo = Articolo::where($primary_key, $record[$primary_key])->withTrashed()->first();
         }
         if (empty($articolo)) {
             $articolo = Articolo::build($record['codice'], $record['descrizione'], $categoria, $sottocategoria);
+        } else {
+            $articolo->restore();
         }
 
         $articolo->idiva_vendita = $aliquota->id;

From 505dd7b145e46e20f4a8a733cac9cd85685da48b Mon Sep 17 00:00:00 2001
From: loviuz <loviuz@gmail.com>
Date: Thu, 9 Dec 2021 16:41:26 +0100
Subject: [PATCH 2/2] Fix salvataggio categorie durante import articoli da CSV

---
 modules/articoli/src/Import/CSV.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/articoli/src/Import/CSV.php b/modules/articoli/src/Import/CSV.php
index 32df24933..2f3fc8635 100644
--- a/modules/articoli/src/Import/CSV.php
+++ b/modules/articoli/src/Import/CSV.php
@@ -301,6 +301,8 @@ class CSV extends CSVImporter
             'um' => $record['um'],
             'barcode' => $record['barcode'],
             'id_fornitore' => $record['id_fornitore'],
+            'id_categoria' => $categoria->id,
+            'id_sottocategoria' => $sottocategoria->id,
             'ubicazione' => $record['ubicazione'],
             'note' => $record['note'],
         ]);