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

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

Browse Source 
fixed emailing error

See merge request fronk/thetool!663
This commit is contained in:
Luca Haid
2024-10-14 06:58:06 +00:00
parent 103a6ba622 08ac981fde
commit 0ea7a93c52
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/WarehouseEShopOrder/WarehouseEShopOrderController.php
View File

@@ -163,7 +163,7 @@ class WarehouseEShopOrderController extends TTCrud {
if ($isDryRun) {
self::returnJson(['success' => true, 'message' => 'E-Mail Body wurde erstellt', 'body' => $body]);
} else {
foreach (["ftth-versand@triotronik.com", "einkauf@xinon.at"] as $emailAddr) {
foreach (["ftth-versand@triotronik.com", "eshop-versand@xinon.at"] as $emailAddr) {
$email = new Emailnotification();
$email->setSubject("Bestellbestätigung Bestellung #$paddedId");
$email->setBody($body);
@@ -361,7 +361,7 @@ class WarehouseEShopOrderController extends TTCrud {
$user = UserModel::getOne($json['createBy']);
foreach (["office@xinon.at", $user->email] as $emailAddr) {
foreach (["eshop-versand@xinon.at", $user->email] as $emailAddr) {
$email = new Emailnotification();
$email->setSubject("Bestellbestätigung Bestellung #$subjectId - Referenz: " . $json['extRef']);
$email->setBody($body);

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}&dryRun=true`)
axios.get(`${window['TT_CONFIG']['BASE_PATH']}/WarehouseEShopOrder/singleOrderEmail?id=${this.singleOrderEmailModalId}`)
.then(response => this.singleOrderEmailModalText = response.data)
.catch(error => window.notify('error', error.response?.data?.message || 'Ein Fehler ist aufgetreten'));
}