Skip to content

Commit 9fe7102

Browse files
feat: aggiunto controllo per record allegati predefiniti
1 parent e825f25 commit 9fe7102

3 files changed

Lines changed: 5 additions & 15 deletions

File tree

mail.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
}
164164

165165
// Ottieni gli allegati dalle categorie associate al template
166-
$template_uploads = $template->uploads;
166+
$template_uploads = $template->uploads($id_record);
167167
if (!empty($template_uploads)) {
168168
$uploads = array_merge($uploads, $template_uploads->pluck('id')->toArray());
169169
$uploads = array_unique($uploads);

modules/emails/src/Mail.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ protected function resetFromTemplate()
279279
}
280280

281281
// Inclusione allegati predefiniti
282-
$uploads = $template->uploads;
282+
$uploads = $template->uploads($this->id_record);
283283
foreach ($uploads as $upload) {
284284
$this->addUpload($upload['id']);
285285
}

modules/emails/src/Template.php

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,24 +86,13 @@ public function categories()
8686
{
8787
return $this->belongsToMany(Categoria::class, 'em_files_categories_template', 'id_template', 'id_category');
8888
}
89-
90-
/**
91-
* Accessor che ottiene dinamicamente gli uploads in base alle categorie selezionate.
92-
* Questo metodo viene chiamato quando si accede a $template->uploads come proprietà.
93-
*
94-
* @return \Illuminate\Support\Collection
95-
*/
96-
public function getUploadsAttribute()
97-
{
98-
return $this->getUploadsFromCategories();
99-
}
100-
89+
10190
/**
10291
* Ottiene tutti gli allegati associati alle categorie del template.
10392
*
10493
* @return \Illuminate\Support\Collection
10594
*/
106-
public function getUploadsFromCategories()
95+
public function uploads($id_record = null)
10796
{
10897
$uploads = [];
10998

@@ -116,6 +105,7 @@ public function getUploadsFromCategories()
116105
if ($this->id_module) {
117106
$files = \Models\Upload::where('id_category', $category->id)
118107
->where('id_module', $this->id_module)
108+
->where('id_record', $id_record)
119109
->get();
120110

121111
$uploads = array_merge($uploads, $files->all());

0 commit comments

Comments
 (0)