Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

fixed emailing error

Browse Source
This commit is contained in:
Luca Haid
2024-10-14 09:25:16 +02:00
parent 486d03231b
commit 8d10d56d0a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
application/WarehouseEShopOrder/WarehouseEShopOrderController.php
View File

@@ -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();
}
}

2
public/js/pages/WarehouseEShopOrder/WarehouseEShopOrder.js
View File

@@ -144,7 +144,7 @@ Vue.component('warehouse-e-shop-order', {
this.openSingleOrderEmailModal = !!this.singleOrderEmailModalId;
this.singleOrderEmailModalText = null;
if (this.singleOrderEmailModalId) {
axios.get(`${window['TT_CONFIG']['BASE_PATH']}/WarehouseEShopOrder/singleOrderEmail?id=${this.singleOrderEmailModalId}`)
axios.get(`${window['TT_CONFIG']['BASE_PATH']}/WarehouseEShopOrder/singleOrderEmail?id=${this.singleOrderEmailModalId}&dryRun=true`)
.then(response => this.singleOrderEmailModalText = response.data)
.catch(error => window.notify('error', error.response?.data?.message || 'Ein Fehler ist aufgetreten'));
}