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

fixed multiple stuff

Browse Source
This commit is contained in:
Luca Haid
2025-04-23 13:32:39 +02:00
parent b9ce99d710
commit 092e9c558a
6 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
application/ConstructionConsentOwner/ConstructionConsentOwnerController.php
View File

@@ -156,6 +156,50 @@ class ConstructionConsentOwnerController extends mfBaseController
}
protected function deleteFileAction() {
// display errors
ini_set('display_errors', 1);
ini_set('display_startup_errors', 1);
error_reporting(E_ALL);
$id = $this->request->id;
$file = new ConstructionConsentOwnerFile($id);
if(!$file->id) {
$this->layout()->setFlash("Datei nicht gefunden!", "error");
$this->redirect("ConstructionConsent");
}
$owner = new ConstructionConsentOwner($file->constructionconsentowner_id);
if(!$owner->id) {
$this->layout()->setFlash("Besitzer nicht gefunden!", "error");
$this->redirect("ConstructionConsent");
}
$consent = $owner->consent;
if(!$consent->id) {
$this->layout()->setFlash("Zustimmungserklärung nicht gefunden!", "error");
$this->redirect("ConstructionConsent");
}
$project = new ConstructionConsentProject($consent->constructionconsentproject_id);
if(!$project->id) {
$this->layout()->setFlash("Zustimmungserklärungsprojekt nicht gefunden!", "error");
$this->redirect("ConstructionConsent");
}
if (!in_array($project->id, $this->constructionConsentProjects)) {
$this->layout()->setFlash("Sie sind nicht berechtigt, diese Zustimmungserklärung zu bearbeiten", "error");
$this->redirect("ConstructionConsent");
}
$file->file->delete();
$file->delete();
$this->layout()->setFlash("Datei gelöscht!", "success");
$this->redirect("ConstructionConsent", "View", ["id" => $owner->constructionconsent_id]);
}
protected function apiAction() {
$do = $this->request->do;
$data = [];

22
application/WarehouseEShopOrder/WarehouseEShopOrderController.php
View File

@@ -343,7 +343,7 @@ class WarehouseEShopOrderController extends TTCrud {
$id = WarehouseEShopOrderModel::create(['status' => 'new',
'extRef' => $json['extRef'],
'deliveryMode' => $json['deliveryMode'],
'deliveryAddressAdditional' => $json['deliveryAddressAdditional'],
'deliveryAddressAdditional' => $json['deliveryAddressAdditional'] ?? '',
'deliveryAddressName' => $json['deliveryAddressName'],
'deliveryAddressLine' => $json['deliveryAddressLine'],
'deliveryAddressPLZ' => $json['deliveryAddressPLZ'],
@@ -388,21 +388,19 @@ class WarehouseEShopOrderController extends TTCrud {
$user = UserModel::getOne($json['createBy']);
foreach (["eshop-versand@xinon.at", $user->email] as $emailAddr) {
$email = new Emailnotification();
$email->setSubject("Bestellbestätigung Bestellung #$subjectId - Referenz: " . $json['extRef']);
$email->setBody($body);
$email->setFrom(TT_OUTGOING_EMAIL_2FA, TT_OUTGOING_EMAIL_2FA);
$email->setTo($emailAddr);
$email->send();
}
if ($_SERVER['HTTP_HOST'] !== 'localhost')
foreach (["eshop-versand@xinon.at", $user->email] as $emailAddr) {
$email = new Emailnotification();
$email->setSubject("Bestellbestätigung Bestellung #$subjectId - Referenz: " . $json['extRef']);
$email->setBody($body);
$email->setFrom(TT_OUTGOING_EMAIL_2FA, TT_OUTGOING_EMAIL_2FA);
$email->setTo($emailAddr);
$email->send();
}
self::returnJson(['success' => true,
'message' => $this->infoMessages['create'],
'id' => $id]);
$json['id'] = $id;
die(json_encode($json));
}
protected function beforeCreate(): bool {

2
application/WarehouseEShopOrder/WarehouseEShopOrderModel.php
View File

@@ -19,7 +19,7 @@ class WarehouseEShopOrderModel extends TTCrudBaseModel {
public string $status;
public string $deliveryMode;
public string $deliveryAddressName;
public string $deliveryAddressAdditional;
public ?string $deliveryAddressAdditional;
public string $deliveryAddressLine;
public string $deliveryAddressPLZ;
public string $deliveryAddressCity;