From 37a91e63e5dee17a9a691753e0fba36a69554903 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 20 Aug 2024 15:37:57 +0200
Subject: [PATCH] Fixed productchange for partners

---
 application/Address/AddressController.php          | 14 +++++++++++++-
 application/Order/OrderController.php              |  2 +-
 .../pages/OrderProductchange/OrderProductchange.js |  5 +++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/application/Address/AddressController.php b/application/Address/AddressController.php
index 4e0085f0d..2c5c3e647 100644
--- a/application/Address/AddressController.php
+++ b/application/Address/AddressController.php
@@ -524,7 +524,19 @@ class AddressController extends mfBaseController {
   private function findAddressApi() {
     $search = trim($this->request->q);
     $autocomplete = $this->request->autocomplete;
-    
+
+    if($autocomplete && $this->request->searchedID) {
+        $address = new Address($this->request->searchedID);
+        if($address->id) {
+            $result = [
+                'value' => $address->id,
+                'text' => str_replace("'", "\\'", str_replace(["\n", "\r"], " ",$address->getCompanyOrName()))." (".$address->zip." ".$address->city.", ".$address->street.")".(($address->customer_number) ? " [".$address->customer_number."]" : "")
+            ];
+            $results[] = $result;
+            $this->returnJson($results);
+        }
+    }
+
     $po = 1;
     $role = false;
     // if searching for billingaddress, set role and parents_only to 0
diff --git a/application/Order/OrderController.php b/application/Order/OrderController.php
index c4c373d9a..d1ca339a8 100644
--- a/application/Order/OrderController.php
+++ b/application/Order/OrderController.php
@@ -539,7 +539,7 @@ class OrderController extends mfBaseController {
           }
 
           if($contract->termination_id) {
-              if(!in_array($contract->termination->network_id, $my_network_ids)) {
+              if(!in_array($contract->termination->building->network_id, $my_network_ids)) {
                   $this->layout()->setFlash("Keine Berechtigung", "error");
                   $this->redirect("Order", "addUpgrade", ["owner_id" => $contract->owner_id]);
               }
diff --git a/public/js/pages/OrderProductchange/OrderProductchange.js b/public/js/pages/OrderProductchange/OrderProductchange.js
index 8854eec28..c5949ac4a 100644
--- a/public/js/pages/OrderProductchange/OrderProductchange.js
+++ b/public/js/pages/OrderProductchange/OrderProductchange.js
@@ -7,7 +7,7 @@ Vue.component('OrderProductchange', {
           <div class="col">
             
             <p class="alert alert-purple">Wählen Sie den Vertragsinhaber aus, um die aktiven Produkte anzuzeigen.<br />
-            Produktwechsel sollten immer mit dem Hauptprodukt durchgeführt werden. Dies ist fast immer das Internetzugangsprodukt.</p>
+              Produktwechsel sollten immer mit dem <strong>Hauptprodukt</strong> durchgeführt werden. Dies ist fast immer das <strong>Internetzugangsprodukt</strong>.</p>
 
             <tt-autocomplete :api-url="window['TT_CONFIG']['ADDRESS_API_URL'] + '?do=findAddress'"
                              v-model="owner_id" label="Vertragsinhaber suchen" placeholder="Tippen zum Suchen..."></tt-autocomplete>
@@ -25,7 +25,8 @@ Vue.component('OrderProductchange', {
                   disable-filtering ref="contractTable">
 
                 <template v-slot:actions="{ row }">
-                  <a :href="window['TT_CONFIG']['ORDER_PRODUCTCHANGE_URL'] + '?contract_id=' + row.id"
+                  <a v-if="!row.product_name.match(/Service Pauschale/i) && row.billing_period > 0"
+                      :href="window['TT_CONFIG']['ORDER_PRODUCTCHANGE_URL'] + '?contract_id=' + row.id"
                      class="btn btn-purple"><i class="fas fa-fw fa-square-up"></i> Produktwechsel erstellen</a>
                 </template>
                 <template v-slot:billing_period="{ row }">