fixed utf8 encoding in email
This commit is contained in:
@@ -88,7 +88,8 @@ class WarehouseEShopOrderController extends TTCrud {
|
||||
// $email->setTo('ftth-versand@triotronik.com');
|
||||
$email->setTo('luca.haid@xinon.eu');
|
||||
$csvContent = $this->CSVExportNewOrdersMarkAcceptedAction(true, [$id]);
|
||||
$email->addAttachment(null, $csvContent, "Bestellung_$paddedId.csv", "text/csv");
|
||||
$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']);
|
||||
}
|
||||
@@ -222,7 +223,19 @@ class WarehouseEShopOrderController extends TTCrud {
|
||||
}
|
||||
|
||||
if (empty($orders)) {
|
||||
self::returnJson(['success' => false, 'message' => 'Keine neuen Bestellungen']);
|
||||
$msg = '';
|
||||
switch (count($orderIds)) {
|
||||
case 0:
|
||||
$msg = 'Keine neuen Bestellungen';
|
||||
break;
|
||||
case 1:
|
||||
$msg = 'Keine neue Bestellung mit dieser ID gefunden';
|
||||
break;
|
||||
default:
|
||||
$msg = 'Keine neuen Bestellungen mit diesen IDs gefunden';
|
||||
break;
|
||||
}
|
||||
self::returnJson(['success' => false, 'message' => $msg]);
|
||||
die();
|
||||
}
|
||||
|
||||
|
||||
@@ -69,6 +69,7 @@ Vue.component('warehouse-e-shop-order', {
|
||||
} else {
|
||||
window.notify('error', 'Ein Fehler ist aufgetreten');
|
||||
}
|
||||
await this.$refs.table.$refs.table.fetchData();
|
||||
},
|
||||
async createCSVExportAndMarkAsAccepted() {
|
||||
const response = await axios.post(`${window['TT_CONFIG']['BASE_PATH']}/WarehouseEShopOrder/CSVExportNewOrdersMarkAccepted`);
|
||||
|
||||
Reference in New Issue
Block a user