Added Setup products to Preorder

application/Preorder/PreorderController.php

@@ -45,7 +45,7 @@ class PreorderController extends mfBaseController {
     if($filter['campaign_id']) {
       $campaign_id = $filter['campaign_id'];
       if(is_numeric($campaign_id) && $campaign_id > 0) {
-        $campaign = new Preordercampaign($campaign);
+        $campaign = new Preordercampaign($campaign_id);
         $this->layout()->set("campaign", $campaign);
       }
       
@@ -54,8 +54,6 @@ class PreorderController extends mfBaseController {
     //var_dump($campaign_filter);exit;
     $preorders = PreorderModel::search($campaign_filter);
     $this->layout()->set("preorders", $preorders);
-    
-    
   }
   
   private function getPreparedFilter($filter) {
@@ -149,6 +147,7 @@ class PreorderController extends mfBaseController {
     $data['building_id'] = $r->building_id;
     $data['termination_id'] = ($r->termination_id) ? $r->termination_id : null;
     $data['product_id'] = $r->product_id;
+    $data['setup_product_id'] = $r->setup_product_id;
     
     switch($r->type) {
       case "interest":