Merge branch 'bugfix/e-shop' into 'master'

fixed emailing error

See merge request fronk/thetool!665
This commit is contained in:
Luca Haid
2024-10-14 07:25:53 +00:00
2 changed files with 5 additions and 2 deletions
@@ -162,20 +162,23 @@ class WarehouseEShopOrderController extends TTCrud {
if ($isDryRun) {
self::returnJson(['success' => true, 'message' => 'E-Mail Body wurde erstellt', 'body' => $body]);
die();
} else {
$csvContent = $this->CSVExportNewOrdersMarkAcceptedAction(true, [$id]);
foreach (["ftth-versand@triotronik.com", "eshop-versand@xinon.at"] as $emailAddr) {
$email = new Emailnotification();
$email->setSubject("Bestellbestätigung Bestellung #$paddedId");
$email->setBody($body);
$email->setFrom(TT_OUTGOING_EMAIL_2FA, TT_OUTGOING_EMAIL_2FA);
$email->setTo($emailAddr);
$csvContent = $this->CSVExportNewOrdersMarkAcceptedAction(true, [$id]);
$csvContent = utf8_decode($csvContent);
$email->addAttachment(null, $csvContent, "Bestellung_$paddedId.csv", "text/csv", "attachment", "base64", "utf-8");
$email->send();
}
self::returnJson(['success' => true, 'message' => 'E-Mail wurde versendet']);
die();
}
}