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

Merge branch 'fronkdev' into 'master'

Browse Source 
RML Billing

See merge request fronk/thetool!1264
This commit is contained in:
Frank Schubert
2025-04-25 09:53:30 +00:00
parent a0457d9af2 982cbabbf6
commit e6dca2cbb5
7 changed files with 224 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/PreorderBillingInvoice/PreorderBillingInvoice.php
View File

@@ -171,9 +171,9 @@ RML Infrastruktur GmbH";
}
$tpl = new Layout();
$tpl->setTemplate("Emailtemplates/preorder-invoice/rml/invoice-email");
$tpl->setTemplate("Emailtemplates/preorder-invoice/rml/invoice-email.html");
if($this->owner_id) {
$tpl->setTemplate("Emailtemplates/preorder-invoice/rml/invoice-email-anb");
$tpl->setTemplate("Emailtemplates/preorder-invoice/rml/invoice-email-anb.html");
}
$pdf_vars = [
@@ -208,7 +208,7 @@ RML Infrastruktur GmbH";
} else {
$email = new Emailnotification();
$email->setSubject($subject);
$email->setBody($body);
$email->setHtmlBody($body);
$email->setFrom($from, $from_name);
$email->setTo($to);
$email->setHeader("X-".MFAPPNAME."-Iid", $this->id);

6
application/PreorderBillingInvoice/PreorderBillingInvoiceController.php
View File

@@ -797,6 +797,7 @@ class PreorderBillingInvoiceController extends mfBaseController {
mkdir($csv_path, 0777, true);
}
$filename = "thetool-bmd-person-export-".$today->format("Y-m-d_H-i-s").".csv";
$export_filename = "personenkonten.csv";
$filepath = "$csv_path/$filename";
if(file_put_contents($filepath, $csv) === false) {
$this->layout()->setFlash("Fehler beim Erstellen des BMD-Exports", "error");
@@ -814,7 +815,7 @@ class PreorderBillingInvoiceController extends mfBaseController {
// copy csv file to bmd export transfer directory
$transfer_path = $netowner_config["bmd-export-transfer-path"];
$transfer_file = "$transfer_path/$filename";
$transfer_file = "$transfer_path/$export_filename";
$this->log->debug(__METHOD__.": Copying $filepath to $transfer_file");
if(!copy($filepath, $transfer_file)) {
$this->layout()->setFlash("Fehler beim Kopieren des BMD-Exports", "error");
@@ -913,6 +914,7 @@ class PreorderBillingInvoiceController extends mfBaseController {
mkdir($csv_path, 0777, true);
}
$filename = "thetool-bmd-invoice-export-".$today->format("Y-m-d_H-i-s").".csv";
$export_filename = "buchungen.csv";
$filepath = "$csv_path/$filename";
if(file_put_contents($filepath, $csv) === false) {
$this->layout()->setFlash("Fehler beim Erstellen des BMD-Exports", "error");
@@ -963,7 +965,7 @@ class PreorderBillingInvoiceController extends mfBaseController {
// copy csv file to bmd export transfer directory
$transfer_path = $netowner_config["bmd-export-transfer-path"];
$transfer_file = "$transfer_path/$filename";
$transfer_file = "$transfer_path/$export_filename";
$this->log->debug(__METHOD__.": Copying $filepath to $transfer_file");
if(!copy($filepath, $transfer_file)) {
$this->layout()->setFlash("Fehler beim Kopieren des BMD-Exports", "error");