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

Revert "Fix scelta allegato durante l'invio email" 

This reverts commit ae17680838.
This commit is contained in:
Fabio Lovato 2020-03-31 19:52:58 +02:00 committed by Thomas Zilio
parent 9a4a674afa
commit 0820cd3189
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions.php
View File

@ -229,6 +229,12 @@ elseif (post('op') == 'send-email') {
// Conferma di lettura
$mail->read_notify = post('read_notify');
// Stampe da allegare
$prints = post('prints');
foreach ($prints as $print) {
$mail->addPrint($print);
}
// Allegati originali
$files = post('uploads');
foreach ($files as $file) {
@ -238,7 +244,7 @@ elseif (post('op') == 'send-email') {
$mail->save();
// Invio mail istantaneo
$email = EmailNotification::build($mail, post('prints'));
$email = EmailNotification::build($mail);
$email_success = $email->send();
if ($email_success) {

9
src/Notifications/EmailNotification.php
View File

@ -73,16 +73,16 @@ class EmailNotification extends PHPMailer implements NotificationInterface
$this->WordWrap = 78;
}
public static function build(Mail $mail, $prints = null, $exceptions = null)
public static function build(Mail $mail, $exceptions = null)
{
$result = new self($mail->account->id, $exceptions);
$result->setMail($mail, $prints);
$result->setMail($mail);
return $result;
}
public function setMail($mail, $prints)
public function setMail($mail)
{
$this->mail = $mail;
@ -105,8 +105,9 @@ class EmailNotification extends PHPMailer implements NotificationInterface
}
// Stampe
$prints = $mail->prints;
foreach ($prints as $print) {
$this->addPrint($print, $mail->id_record);
$this->addPrint($print['id'], $mail->id_record);
}
// Conferma di lettura