Diverse aanpassing nav mail Peter

application/libraries/reports/invoice/InvoiceOverview.php

@@ -19,6 +19,7 @@ class InvoiceOverview {
     private $invoicesTotal;
     private $needInvoice;
     private $projectDetails;
+    private $projectnumber;
 
     public function __construct( $project, $year )
     {
@@ -41,6 +42,8 @@ class InvoiceOverview {
 
     private function handle()
     {
+        $this->setProjectnumber();
+
         $this->setProjectname();
 
         $this->setCustomer();
@@ -60,9 +63,14 @@ class InvoiceOverview {
         $this->setProjectDetails();
     }
 
+    private function setProjectnumber()
+    {
+        $this->projectnumber = $this->project->projectnumber;
+    }
+
     private function setProjectname()
     {
-        $this->projectname = $this->project->projectname . '(' . $this->project->projectnumber . ')';
+        $this->projectname = $this->project->projectname;
     }
 
     private function setCustomer()
@@ -111,6 +119,7 @@ class InvoiceOverview {
     private function setProjectDetails()
     {
         $this->projectDetails = [
+            'projectnumber'           => $this->projectnumber,
             'projectname'             => $this->projectname,
             'customer'                => $this->customer,
             'totalToInvoicingExcl'    => number_format( $this->totalToInvoicingExcl, 0, ',', '.' ),

application/libraries/reports/invoice/Invoices.php

@@ -20,10 +20,16 @@ class Invoices {
     private $invoiceForecasts;
     private $invoiceOverviews = [];
     private $invoiceReport    = [];
+    private $orderType;
+    private $orderDirection;
+    private $archive;
 
-    public function __construct( $year )
+    public function __construct( $year, $orderType, $orderDirection, $archive )
     {
         $this->year = $year;
+        $this->orderType = $orderType;
+        $this->orderDirection = $orderDirection;
+        $this->archive = $archive;
 
         $this->handle();
     }
@@ -44,7 +50,8 @@ class Invoices {
 
     private function setProjects()
     {
-        $this->projects = Project::getProjectsForReport();
+        $this->projects =
+            Project::getProjectsForReport( $this->orderType, $this->orderDirection, $this->archive );
     }
 
     private function loopProjects()