added freelancer invoice template (#254)

src/Controller/InvoiceController.php

@@ -92,23 +92,55 @@ class InvoiceController extends AbstractController
 
         $query = $this->getDefaultQuery();
         $form = $this->getToolbarForm($query);
-
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
             /** @var InvoiceQuery $query */
             $query = $form->getData();
-            $query->setResultType(TimesheetQuery::RESULT_TYPE_QUERYBUILDER);
-
-            if (null !== $query->getCustomer()) {
-                $query->getBegin()->setTime(0, 0, 0);
-                $query->getEnd()->setTime(23, 59, 59);
-
-                $queryBuilder = $this->timesheetRepository->findByQuery($query);
-                $entries = $queryBuilder->getQuery()->getResult();
-            }
+            $entries = $this->getEntries($query);
         }
 
+        $model = $this->prepareModel($query, $entries);
+
+        $action = null;
+        if ($query->getTemplate() !== null) {
+            $action = $this->service->getRendererActionByName($query->getTemplate()->getRenderer());
+        }
+
+        return $this->render('invoice/index.html.twig', [
+            'model' => $model,
+            'action' => $action,
+            'form' => $form->createView(),
+        ]);
+    }
+
+    /**
+     * @param InvoiceQuery $query
+     * @return Timesheet[]
+     */
+    protected function getEntries(InvoiceQuery $query)
+    {
+        if (null === $query->getCustomer()) {
+            return [];
+        }
+
+        $query->setResultType(TimesheetQuery::RESULT_TYPE_QUERYBUILDER);
+        $query->getBegin()->setTime(0, 0, 0);
+        $query->getEnd()->setTime(23, 59, 59);
+
+        $queryBuilder = $this->timesheetRepository->findByQuery($query);
+
+        return $queryBuilder->getQuery()->getResult();
+    }
+
+    /**
+     * @param InvoiceQuery $query
+     * @param array $entries
+     * @return InvoiceModel
+     * @throws \Exception
+     */
+    protected function prepareModel(InvoiceQuery $query, array $entries)
+    {
         $model = new InvoiceModel();
         $model->setQuery($query);
         $model->setEntries($entries);
@@ -129,14 +161,9 @@ class InvoiceController extends AbstractController
             $model->setTemplate($query->getTemplate());
             $model->setCalculator($calculator);
             $model->setNumberGenerator($generator);
-            $action = $this->service->getRendererActionByName($query->getTemplate()->getRenderer());
         }
 
-        return $this->render('invoice/index.html.twig', [
-            'model' => $model,
-            'action' => $action,
-            'form' => $form->createView(),
-        ]);
+        return $model;
     }
 
     /**
@@ -229,6 +256,7 @@ class InvoiceController extends AbstractController
             try {
                 $this->invoiceRepository->saveTemplate($template);
                 $this->flashSuccess('action.update.success');
+
                 return $this->redirectToRoute('admin_invoice_template');
             } catch (\Exception $ex) {
                 $this->flashError('action.update.error', ['%reason%' => $ex->getMessage()]);
@@ -241,28 +269,6 @@ class InvoiceController extends AbstractController
         ]);
     }
 
-    /**
-     * @param InvoiceModel $model
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function invoiceAction(InvoiceModel $model)
-    {
-        return $this->render('invoice/renderer/print.html.twig', [
-            'model' => $model,
-        ]);
-    }
-
-    /**
-     * @param InvoiceModel $model
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function timesheetAction(InvoiceModel $model)
-    {
-        return $this->render('invoice/renderer/timesheet.html.twig', [
-            'model' => $model,
-        ]);
-    }
-
     /**
      * @param InvoiceQuery $query
      * @return \Symfony\Component\Form\FormInterface

src/Controller/InvoicePrintController.php

@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Kimai time-tracking app.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace App\Controller;
+
+use App\Model\InvoiceModel;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
+
+/**
+ * Controller used to print invoices.
+ *
+ * @Security("is_granted('ROLE_TEAMLEAD')")
+ */
+class InvoicePrintController extends AbstractController
+{
+    /**
+     * @param InvoiceModel $model
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function printInvoice(InvoiceModel $model)
+    {
+        return $this->render('invoice/renderer/invoice.html.twig', [
+            'model' => $model,
+        ]);
+    }
+
+    /**
+     * @param InvoiceModel $model
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function printTimesheet(InvoiceModel $model)
+    {
+        return $this->render('invoice/renderer/timesheet.html.twig', [
+            'model' => $model,
+        ]);
+    }
+
+    /**
+     * @param InvoiceModel $model
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function printFreelancer(InvoiceModel $model)
+    {
+        return $this->render('invoice/renderer/freelancer.html.twig', [
+            'model' => $model,
+        ]);
+    }
+}