From 4592e7de5bdd4f3e8139b93b8f0b2e2c054703f1 Mon Sep 17 00:00:00 2001 From: Pek5892 Date: Mon, 25 Mar 2024 09:23:58 +0100 Subject: [PATCH] Fix minori --- plugins/importFE/src/FatturaElettronica.php | 4 ++++ src/Models/Upload.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/importFE/src/FatturaElettronica.php b/plugins/importFE/src/FatturaElettronica.php index a7ce2f745..7d39dad76 100755 --- a/plugins/importFE/src/FatturaElettronica.php +++ b/plugins/importFE/src/FatturaElettronica.php @@ -183,7 +183,11 @@ class FatturaElettronica $extension = '.'.strtolower($allegato['FormatoAttachment']); } + if (preg_match('/\./', $allegato['NomeAttachment'])) { + $original = $allegato['NomeAttachment']; + } else { $original = $allegato['NomeAttachment'].$extension; + } try { \Uploads::upload($content, array_merge($info, [ 'name' => $allegato['NomeAttachment'], diff --git a/src/Models/Upload.php b/src/Models/Upload.php index 073b55629..5e144eea1 100755 --- a/src/Models/Upload.php +++ b/src/Models/Upload.php @@ -79,7 +79,7 @@ class Upload extends Model $category = isset($data['category']) ? $data['category'] : $category; // Nome e categoria dell'allegato - $model->name (!empty($name) ? $name : $original_name); + $model->name = !empty($name) ? $name : $original_name; $model->category = $category; // Nome di origine dell'allegato