diff --git a/Layout/default/Preorder/export.csv.php b/Layout/default/Preorder/export.csv.php index f7f364c35..bff9dfc1d 100644 --- a/Layout/default/Preorder/export.csv.php +++ b/Layout/default/Preorder/export.csv.php @@ -98,7 +98,10 @@ while($data = mysqli_fetch_object($res)): if($data->uid == "string") $data->uid = ""; $fcp = ""; - if ($preorder->fcp !== null && !empty($preorder->fcp->name)) $fcp = $preorder->fcp->name; + if ($hausnummer->fcp_id) { + $fcp = ADBRimoFcp::get($hausnummer->fcp_id); + $fcp = $fcp->name; + } ?> "name?>";"extref?>";"name?>";"extref?>";"ucode?>";"";"oaid?>";"";"order_date) ? date("d.m.Y",$data->order_date) : ""?>";"type,"preorder")?>";"code?>";"name?>";"num ?>";;"connection_type,"preorder")?>";"";"meridian?>";"rw?>";"hw?>";"name?>";"hausnummer?>";"plz?>";"name?>";"";"gps_lat?>";"gps_long?>";connection_count?>;"company?>";"uid?>";"firstname?>";"lastname?>";"street?>";"zip?>";"city?>";"phone?>";"email?>";"getCompanyOrName()?>";"ciftoken?>";"cifurl?>";"cifcableurl?>";;;;;"create)?>";"edit)?>" diff --git a/application/Preorderlogistics/PreorderlogisticsController.php b/application/Preorderlogistics/PreorderlogisticsController.php index eee34b7f3..d815575f0 100644 --- a/application/Preorderlogistics/PreorderlogisticsController.php +++ b/application/Preorderlogistics/PreorderlogisticsController.php @@ -87,9 +87,8 @@ class PreorderlogisticsController extends mfBaseController { $installation_kit_status_flag = PreorderStatusflagModel::getFirst(["code" => "145"]); if ($filter['sent'] !== true) { $filter["preorder_status_flags_disabled"] = [$installation_kit_status_flag->id]; - } else { - $filter["preorder_status_flags"] = [$installation_kit_status_flag->id]; } + $pagination['maxItems'] = PreorderModel::countWithLogistics($filter); $preorders = PreorderModel::searchWithLogistics($filter, $pagination);