From 2e1bf732818652b64a7f539af007de76c2691a1c Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 30 Nov 2022 13:53:50 +0100
Subject: [PATCH] auto set partner_id in new Preorder

---
 Layout/default/Preorder/Form.php            | 12 +++++++++---
 Layout/default/menu.php                     |  7 ++++---
 application/Preorder/PreorderController.php |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php
index 8f48c2f16..ef5ca26c5 100644
--- a/Layout/default/Preorder/Form.php
+++ b/Layout/default/Preorder/Form.php
@@ -74,9 +74,15 @@
                       <div class="col-lg-10">
                         <select class="form-control" name="partner_id" id="partner_id">
                           <option value=""></option>
-                          <?php foreach($partners as $partner): ?>
-                          <option value="<?=$partner->id?>" <?=($preorder->partner_id == $partner->id) ? "selected='selected'" : ""?>><?=$partner->getCompanyOrName()?></option>
-                          <?php endforeach; ?>
+                          <?php if($preorder->id): ?>
+                            <?php foreach($partners as $partner): ?>
+                            <option value="<?=$partner->id?>" <?=($preorder->partner_id == $partner->id) ? "selected='selected'" : ""?>><?=$partner->getCompanyOrName()?></option>
+                            <?php endforeach; ?>
+                          <?php else: ?>
+                            <?php foreach($partners as $partner): ?>
+                            <option value="<?=$partner->id?>" <?=($me->address_id == $partner->id) ? "selected='selected'" : ""?>><?=$partner->getCompanyOrName()?></option>
+                            <?php endforeach; ?>
+                          <?php endif; ?>
                         </select>
                       </div>
                     </div>
diff --git a/Layout/default/menu.php b/Layout/default/menu.php
index 293f7a7ba..2b5cbb204 100644
--- a/Layout/default/menu.php
+++ b/Layout/default/menu.php
@@ -28,12 +28,13 @@
             <li><a href="<?=self::getUrl("Address")?>"><i class="fad fa-user text-info"></i> Personen & Firmen</a></li>
             <li><a href="<?=self::getUrl("Product")?>"><i class="far fa-rectangle-list text-info"></i> Produkte</a></li>
             <li><a href="<?=self::getUrl("Productgroup")?>"><i class="far fa-list-tree text-info"></i> Produktgruppen</a></li>
-            <li><a href="<?=self::getUrl("User")?>"><i class="fad fa-users text-info"></i> Benutzer</a></li>
-            <li class="has-sub-submenu"><a href="<?=self::getUrl("Network")?>"><i class="fad fa-network-wired text-info"></i> Netzgebiete</a></li>
+            
+            <li><a href="<?=self::getUrl("Network")?>"><i class="fad fa-network-wired text-info"></i> Netzgebiete</a></li>
+            <li class="has-sub-submenu"><a href="<?=self::getUrl("User")?>"><i class="fad fa-users text-info"></i> Benutzer</a></li>
             
             <li class="has-sub-submenu font-weight-bold mt-1"><a>Grundstammdaten</a></li>
             <li><a href="<?=self::getUrl("Producttech")?>"><i class="fad fa-microchip text-info"></i> Technologien</a></li>
-            <li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fad fa-gear text-info"></i> ContractConfig</a></li>
+            <!--<li><a href="<?=self::getUrl("Contractconfig")?>"><i class="fad fa-gear text-info"></i> ContractConfig</a></li>-->
 
             
           </ul>
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 19d118214..cd394545a 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -270,7 +270,7 @@ class PreorderController extends mfBaseController {
     $data['price_nne'] = ($r->price_nne) ? Layout::commaToDot($r->price_nne) : 0;
     $data['price_nbe'] = ($r->price_nbe) ? Layout::commaToDot($r->price_nbe) : 0;
     $data['billing_delay'] = ($r->billing_delay) ? $r->billing_delay : 0;
-    
+    //var_dump($r->partner_id);exit;
     if($r->partner_id) {
       $data['partner_id'] = $r->partner_id;
     } else {