fix: invio mail con allegati

Author: Pek5892

actions.php

@@ -421,8 +421,16 @@
 
     // Allegati originali
     $files = post('uploads');
+
+    // Assicuriamoci che $files sia un array
+    if (!is_array($files)) {
+        $files = $files ? [$files] : [];
+    }
+
     foreach ($files as $file) {
-        $mail->addUpload($file);
+        if (!empty($file)) {
+            $mail->addUpload($file);
+        }
     }
 
     // Salvataggio email nella coda di invio

mail.php

@@ -157,18 +157,24 @@
         </div>';
 
 $uploads = [];
+
 if ($smtp['pec'] == 1 && $module->name == 'Fatture di vendita') {
-    $uploads = $dbo->fetchArray('SELECT zz_files.id FROM zz_files LEFT JOIN zz_files_categories ON zz_files.id_category = zz_files_categories.id WHERE zz_files.id_module = '.prepare($module['id']).' AND zz_files.id_record = '.prepare($id_record).' AND zz_files_categories.name = \'Fattura Elettronica\'');
-    $uploads = array_column($uploads, 'id');
+    $pec_uploads = $dbo->fetchArray('SELECT zz_files.id FROM zz_files LEFT JOIN zz_files_categories ON zz_files.id_category = zz_files_categories.id WHERE zz_files.id_module = '.prepare($module['id']).' AND zz_files.id_record = '.prepare($id_record).' AND (zz_files_categories.name = \'Fattura Elettronica\' OR zz_files_categories.name = \'Fattura elettronica\')');
+    $uploads = array_merge($uploads, array_column($pec_uploads, 'id'));
 }
 
-// Ottieni gli allegati dalle categorie associate al template
 $template_uploads = $template->uploads($id_record);
 if (!empty($template_uploads)) {
     $uploads = array_merge($uploads, $template_uploads->pluck('id')->toArray());
-    $uploads = array_unique($uploads);
 }
 
+if (empty($template->categories) && empty($uploads)) {
+    $all_document_uploads = $dbo->fetchArray('SELECT `id` FROM `zz_files` WHERE `id_module` = '.prepare($id_module).' AND `id_record` = '.prepare($id_record));
+    $uploads = array_merge($uploads, array_column($all_document_uploads, 'id'));
+}
+
+$uploads = array_unique($uploads);
+
 // Allegati
 echo '
 

modules/emails/src/Mail.php

@@ -72,6 +72,10 @@ public function addUpload($file_id, $name = null)
     {
         $file = Upload::find($file_id);
 
+        if (!$file) {
+            return false;
+        }
+
         // duplica il file
         $upload = $file->copia([
             'id_module' => \Models\Module::where('name', 'Stato email')->first()->id,
@@ -81,6 +85,8 @@ public function addUpload($file_id, $name = null)
         $name = $name ?: $file->name;
 
         $this->attachments()->attach($upload->id, ['id_email' => $this->id, 'name' => $name, 'type' => 'file']);
+
+        return true;
     }
 
     public function resetUploads()
@@ -102,12 +108,12 @@ public function addPrint($print_id, $name = null)
     {
         // Genera la stampa come PDF
         $print = \Prints::render($print_id, $this->id_record, null, true);
-        
+
         // Ottieni il modulo "Coda d'invio"
         $id_module = \Models\Module::where("name", "Stato email")->first()->id;
 
         $name = $name ?: $print['name'];
-        
+
         // Salva il file nella tabella zz_files
         $upload = \Uploads::upload($print['pdf'], [
             'name' => $name,
@@ -116,7 +122,7 @@ public function addPrint($print_id, $name = null)
             'id_module' => $id_module,
             'id_record' => $this->id,
         ]);
-        
+
         // Collega il file alla tabella em_email_attachment
         $this->attachments()->attach($upload->id, ['id_email' => $this->id, 'name' => $name, 'type' => 'print']);
     }