From 6aee72c4dd8947795a22c9c5daa356158bbb3266 Mon Sep 17 00:00:00 2001
From: valentina <pek5892@gmail.com>
Date: Mon, 9 Sep 2024 12:25:31 +0200
Subject: [PATCH] Fix importazione anagrafiche

---
 src/Models/Upload.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Models/Upload.php b/src/Models/Upload.php
index 97ab220df..221ec5c55 100755
--- a/src/Models/Upload.php
+++ b/src/Models/Upload.php
@@ -74,11 +74,13 @@ class Upload extends Model
         $model = new static();
 
         // Informazioni di base
-        $name = $data['name'] ?? $name;
-        $name ??= basename($source);
-        $original_name = basename($source) ?? $name;
-        $category = $data['category'] ?? $category;
+        if (empty($name)) {
+            $name = $data['name'] ?? ($source['name'] ?? $source);
+        }
 
+        $original_name = $source['name'] ?? $name;
+        $category = $data['category'] ?? $category;
+        
         // Nome e categoria dell'allegato
         $model->name = !empty($name) ? $name : $original_name;
         $model->category = $category;