Merge branch 'fronkdev' into 'master'

Fixed productchange for partners

See merge request fronk/thetool!590

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

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]);
               }