From 41fede2c084ac07b98200e7152f63a95c8e792e8 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 17 May 2022 16:05:39 +0200
Subject: [PATCH] Fixed setup product selection

---
 Layout/default/Preorder/Form.php            | 38 ++++++++++++++-------
 application/Preorder/PreorderController.php |  3 +-
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/Layout/default/Preorder/Form.php b/Layout/default/Preorder/Form.php
index 2abde69dd..c1549d0d3 100644
--- a/Layout/default/Preorder/Form.php
+++ b/Layout/default/Preorder/Form.php
@@ -113,6 +113,19 @@
                   
                   </div>
                   
+                  
+                  <div class="form-group row">
+                      <label class="col-lg-2 col-form-label" for="product_id">Vertriebspartner</label>
+                      <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; ?>
+                        </select>
+                      </div>
+                    </div>
+                  
                   <div id="preorder-form" class="mt-4">
                     <h4>Vorbestellung & Produkt</h4>
                     <div class="form-group row">
@@ -126,18 +139,6 @@
                       </div>
                     </div>
                     
-                    <div class="form-group row">
-                      <label class="col-lg-2 col-form-label" for="product_id">Vertriebspartner</label>
-                      <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; ?>
-                        </select>
-                      </div>
-                    </div>
-                    
                     <input type="hidden" name="setup_product_id" id="setup_product_id" value="<?=$preorder->setup_product_id?>" />
                     
                     <?php if(is_array($campaign->setup_products) && count($campaign->setup_products)): ?>
@@ -324,6 +325,14 @@
       $('#setup-activation').hide();
     <?php endif; ?>
       
+    if($('#type').val() == "provision") {
+      $('#setup-provision').show();
+    }
+    
+    if($('#type').val() == "order") {
+      $('#setup-activation').show();
+    }
+    
     $("#product_id").select2({
       allowClear: true,
       placeholder: ""
@@ -382,10 +391,13 @@
       var pid = 0;
       var price = 0;
       
+      $("#price_setup").val("");
+      
       if(type == "interest") {
         $('#setup-provision').hide();
         $('#setup-activation').hide();
         $('#setup_product_id').val("");
+        $("#price_setup").val("");
       } else if(type == "provision") {
         $('#setup-provision').show();
         $('#setup-activation').hide();
@@ -422,6 +434,8 @@
       $('#setup_product_id').val($("#setup-activation select").val());
       var price = $("#setup-activation select option:selected").data("price");
       $("#price_setup").val(price);
+    } else {
+      $("#price_setup").val("");
     }
   }
 
diff --git a/application/Preorder/PreorderController.php b/application/Preorder/PreorderController.php
index 03fdf2d6d..914a4d5c2 100644
--- a/application/Preorder/PreorderController.php
+++ b/application/Preorder/PreorderController.php
@@ -86,11 +86,12 @@ class PreorderController extends mfBaseController {
     $this->layout()->set("campaign", $campaign);
     
     $products = [];
-    foreach(ProductNetworkModel::search(["network_id" => $network_ids]) as $pn) {
+    foreach(ProductNetworkModel::search(["network_id" => $campaign->network_id]) as $pn) {
       if(!array_key_exists($pn->product_id, $products)) {
         $products[$pn->product_id] = $pn->product;
       }
     }
+    //var_dump($products);exit;
     $this->layout()->set("products", $products);
     
     $partners = AddressModel::search(['addresstype' => ['salespartner']]);