From acef0be79c48d9929053548310f404a291107158 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Thu, 11 Jul 2024 21:38:11 +0200
Subject: [PATCH] Changed format for ticket system Cancel Notifcation

---
 .../Emailtemplates/customer/cancel_ticket.php | 20 ++++++++++++++-----
 application/Contract/ContractController.php   |  5 +++--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Layout/default/Emailtemplates/customer/cancel_ticket.php b/Layout/default/Emailtemplates/customer/cancel_ticket.php
index 029cc2711..d104ec7a4 100644
--- a/Layout/default/Emailtemplates/customer/cancel_ticket.php
+++ b/Layout/default/Emailtemplates/customer/cancel_ticket.php
@@ -24,16 +24,26 @@ e-Mail: <?=$owner->email?>
 
 Kundennummer: <?=$owner->customer_number?>
 
+Kunde: <?=str_replace(["\n", "\r"], "", $owner->getCompanyOrName())?>
+
+<?=$url_prefix?><?=self::getUrl("Address", "view", ["id" => $owner->id])?>
+
 
 ### Gekündigte Produkte:
 
-Kunde: [<?=$url_prefix?><?=self::getUrl("Address", "view", ["id" => $owner->id])?>](<?=str_replace(["\n", "\r"], "", $owner->getCompanyOrName())?>)
+<?=date("d.m.Y", $contract->cancel_date)?>: <?=$contract->product_name?>
+
+<?=$contract->matchcode?>
+
+<?=($url_prefix)?><?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>
 
-| Produkt | Matchcode | Kündigungsdatum |
-------------------------------------------
-[<?=($url_prefix)?><?=self::getUrl("Contract", "view", ["contract_id" => $contract->id])?>](<?=$contract->product_name?>) | <?=$contract->matchcode?> | <?=date("d.m.Y", $contract->cancel_date)?> |
 
 <?php foreach($linked_contracts as $link): ?>
-    [<?=$url_prefix?><?=self::getUrl("Contract", "view", ["contract_id" => $link->id])?>](<?=$link->product_name?>) | <?=$link->matchcode?> | <?=date("d.m.Y", $link->cancel_date)?> |
+<?=date("d.m.Y", $link->cancel_date)?>: <?=$link->product_name?>
+
+<?=$link->matchcode?>
+
+<?=$url_prefix?><?=self::getUrl("Contract", "view", ["contract_id" => $link->id])?>
+
 
 <?php endforeach; ?>
diff --git a/application/Contract/ContractController.php b/application/Contract/ContractController.php
index bfcd0f25e..8aab88094 100644
--- a/application/Contract/ContractController.php
+++ b/application/Contract/ContractController.php
@@ -214,12 +214,13 @@ class ContractController extends mfBaseController
                         continue;
                     }
 
-                    $linked_contracts[] = $link_contract;
-
                     $link_contract->cancel_date = $cancel_date->getTimestamp();
                     if(!$link_contract->save()) {
                         $this->layout()->setFlash("Fehler beim Speichern von verlinktem Vertrag", "warning");
                     }
+
+                    if($link_contract->owner_id != $contract->owner_id) continue;
+                    $linked_contracts[] = $link_contract;
                 }
             }
         }