loviuz/openstamanager
loviuz
/
openstamanager
mirror of https://github.com/devcode-it/openstamanager.git
1
0
Fork 0
Code Issues Releases Activity

Fix minori sulle stampe

This commit is contained in:
Thomas Zilio 2019-09-19 18:46:07 +02:00
parent be91a84842
commit 82f45aee0c
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/HTMLBuilder/Manager/EmailManager.php
View File

@ -3,6 +3,7 @@
namespace HTMLBuilder\Manager; namespace HTMLBuilder\Manager;
use Modules\Emails\Mail; use Modules\Emails\Mail;
use Modules;
/** /**
* Gestione allegati. * Gestione allegati.
@ -21,8 +22,6 @@ class EmailManager implements ManagerInterface
*/ */
public function manage($options) public function manage($options)
{ {
$database = database();
// Visualizzo il log delle operazioni di invio email // Visualizzo il log delle operazioni di invio email
$emails = Mail::whereRaw('id IN (SELECT id_email FROM zz_operations WHERE id_record = '.prepare($options['id_record']).' AND id_module = '.prepare($options['id_module']).' AND id_email IS NOT NULL)') $emails = Mail::whereRaw('id IN (SELECT id_email FROM zz_operations WHERE id_record = '.prepare($options['id_record']).' AND id_module = '.prepare($options['id_module']).' AND id_email IS NOT NULL)')
->orderByDesc('created_at') ->orderByDesc('created_at')
@ -46,29 +45,29 @@ class EmailManager implements ManagerInterface
<div class="box-body"> <div class="box-body">
<ul>'; <ul>';
foreach ($emails as $operation) { foreach ($emails as $email) {
$receivers = $operation->receivers->pluck('address')->toArray(); $receivers = $email->receivers->pluck('address')->toArray();
$prints = []; $prints = [];
$list = $operation->prints; $list = $email->prints;
foreach ($list as $print) { foreach ($list as $print) {
$prints[] = $print['title']; $prints[] = $print['title'];
} }
$uploads = []; $uploads = [];
$list = $operation->uploads; $list = $email->uploads;
foreach ($list as $upload) { foreach ($list as $upload) {
$uploads[] = $upload['name']; $uploads[] = $upload['name'];
} }
$sent = !empty($operation['sent_at']) ? tr('inviata il _DATE_ alle _HOUR_', [ $sent = !empty($email['sent_at']) ? tr('inviata il _DATE_ alle _HOUR_', [
'_DATE_' => dateFormat($operation['sent_at']), '_DATE_' => dateFormat($email['sent_at']),
'_HOUR_' => timeFormat($operation['sent_at']), '_HOUR_' => timeFormat($email['sent_at']),
]) : tr('in coda di invio'); ]) : tr('in coda di invio');
$descrizione = Modules::link('Stato email', $operation->id_email, tr('Email "_EMAIL_" da _USER_', [ $descrizione = Modules::link('Stato email', $email->id, tr('Email "_EMAIL_" da _USER_', [
'_EMAIL_' => $operation->template->name, '_EMAIL_' => $email->template->name,
'_USER_' => $operation->user->username, '_USER_' => $email->user->username,
])); ]));
$result .= ' $result .= '

2
src/Notifications/EmailNotification.php
View File

@ -99,7 +99,7 @@ class EmailNotification extends PHPMailer implements NotificationInterface
// Allegati // Allegati
$uploads = $mail->uploads; $uploads = $mail->uploads;
foreach ($uploads as $upload) { foreach ($uploads as $upload) {
$this->addUpload($upload); $this->addUpload($upload->id);
} }
// Stampe // Stampe