jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added option to delete invoice template (#294)

Browse Source
This commit is contained in:
Kevin Papst
2018-09-02 11:36:04 +02:00
committed by GitHub
parent 6fb6a16246
commit 9f6079ad8a
21 changed files with 281 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Controller/Admin/ActivityController.php
View File

@@ -115,7 +115,7 @@ class ActivityController extends AbstractController
$entityManager->remove($activity);
$entityManager->flush();
$this->flashSuccess('action.deleted_successfully');
$this->flashSuccess('action.delete.success');
return $this->redirectToRoute('admin_activity');
}
@@ -146,7 +146,7 @@ class ActivityController extends AbstractController
$entityManager->persist($activity);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
if ($editForm->has('create_more') && $editForm->get('create_more')->getData() === true) {
$newActivity = new Activity();

4
src/Controller/Admin/CustomerController.php
View File

@@ -95,7 +95,7 @@ class CustomerController extends AbstractController
$entityManager->persist($customer);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
return $this->redirectToRoute('admin_customer');
}
@@ -132,7 +132,7 @@ class CustomerController extends AbstractController
$entityManager->remove($customer);
$entityManager->flush();
$this->flashSuccess('action.deleted_successfully');
$this->flashSuccess('action.delete.success');
return $this->redirectToRoute('admin_customer');
}

4
src/Controller/Admin/ProjectController.php
View File

@@ -109,7 +109,7 @@ class ProjectController extends AbstractController
$entityManager->remove($project);
$entityManager->flush();
$this->flashSuccess('action.deleted_successfully');
$this->flashSuccess('action.delete.success');
return $this->redirectToRoute('admin_project');
}
@@ -137,7 +137,7 @@ class ProjectController extends AbstractController
$entityManager->persist($project);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
if ($editForm->has('create_more') && $editForm->get('create_more')->getData() === true) {
$newProject = new Project();

4
src/Controller/Admin/TimesheetController.php
View File

@@ -132,9 +132,9 @@ class TimesheetController extends AbstractController
$entityManager->remove($entry);
$entityManager->flush();
$this->flashSuccess('action.deleted_successfully');
$this->flashSuccess('action.delete.success');
} catch (\Exception $ex) {
$this->flashError('action.deleted.error', ['%reason%' => $ex->getMessage()]);
$this->flashError('action.delete.error', ['%reason%' => $ex->getMessage()]);
}
return $this->redirectToRoute('admin_timesheet_paginated', ['page' => $request->get('page')]);

4
src/Controller/Admin/UserController.php
View File

@@ -102,7 +102,7 @@ class UserController extends AbstractController
$entityManager->persist($user);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
if ($editForm->get('create_more')->getData() !== true) {
return $this->redirectToRoute('user_profile_edit', ['username' => $user->getUsername()]);
@@ -149,7 +149,7 @@ class UserController extends AbstractController
$entityManager->remove($userToDelete);
$entityManager->flush();
$this->flashSuccess('action.deleted_successfully');
$this->flashSuccess('action.delete.success');
return $this->redirectToRoute('admin_user');
}

75
src/Controller/InvoiceController.php
View File

@@ -15,6 +15,7 @@ use App\Form\InvoiceTemplateForm;
use App\Form\Toolbar\InvoiceToolbarForm;
use App\Invoice\ServiceInvoice;
use App\Model\InvoiceModel;
use App\Repository\InvoiceTemplateRepository;
use App\Repository\Query\BaseQuery;
use App\Repository\Query\InvoiceQuery;
use App\Repository\Query\TimesheetQuery;
@@ -35,13 +36,25 @@ class InvoiceController extends AbstractController
* @var ServiceInvoice
*/
protected $service;
/**
* @var InvoiceTemplateRepository
*/
protected $invoiceRepository;
/**
* @var TimesheetRepository
*/
protected $timesheetRepository;
/**
* @param ServiceInvoice $service
* @param InvoiceTemplateRepository $invoice
* @param TimesheetRepository $timesheet
*/
public function __construct(ServiceInvoice $service)
public function __construct(ServiceInvoice $service, InvoiceTemplateRepository $invoice, TimesheetRepository $timesheet)
{
$this->service = $service;
$this->invoiceRepository = $invoice;
$this->timesheetRepository = $timesheet;
}
/**
@@ -62,14 +75,6 @@ class InvoiceController extends AbstractController
return $query;
}
/**
* @return \App\Repository\InvoiceTemplateRepository
*/
protected function getRepository()
{
return $this->getDoctrine()->getRepository(InvoiceTemplate::class);
}
/**
* @Route(path="/", name="invoice", methods={"GET", "POST"})
*
@@ -79,7 +84,7 @@ class InvoiceController extends AbstractController
*/
public function indexAction(Request $request)
{
if (!$this->getRepository()->hasTemplate()) {
if (!$this->invoiceRepository->hasTemplate()) {
return $this->redirectToRoute('admin_invoice_template_create');
}
@@ -99,9 +104,7 @@ class InvoiceController extends AbstractController
$query->getBegin()->setTime(0, 0, 0);
$query->getEnd()->setTime(23, 59, 59);
/* @var TimesheetRepository $timeRepo */
$timeRepo = $this->getDoctrine()->getRepository(Timesheet::class);
$queryBuilder = $timeRepo->findByQuery($query);
$queryBuilder = $this->timesheetRepository->findByQuery($query);
$entries = $queryBuilder->getQuery()->getResult();
}
}
@@ -147,7 +150,7 @@ class InvoiceController extends AbstractController
*/
public function listTemplateAction($page)
{
$templates = $this->getRepository()->findByQuery(new BaseQuery());
$templates = $this->invoiceRepository->findByQuery(new BaseQuery());
return $this->render('invoice/templates.html.twig', [
'entries' => $templates,
@@ -156,10 +159,11 @@ class InvoiceController extends AbstractController
}
/**
* @Route(path="/{id}/edit", name="admin_invoice_template_edit", methods={"GET", "POST"})
* @Route(path="/template/{id}/edit", name="admin_invoice_template_edit", methods={"GET", "POST"})
*
* TODO permission
*
* @param InvoiceTemplate $template
* @param Request $request
* @return \Symfony\Component\HttpFoundation\Response
* @throws \Exception
@@ -170,7 +174,7 @@ class InvoiceController extends AbstractController
}
/**
* @Route(path="/create", name="admin_invoice_template_create", methods={"GET", "POST"})
* @Route(path="/template/create", name="admin_invoice_template_create", methods={"GET", "POST"})
*
* TODO permission
*
@@ -180,13 +184,36 @@ class InvoiceController extends AbstractController
*/
public function createTemplateAction(Request $request)
{
if (!$this->getRepository()->hasTemplate()) {
if (!$this->invoiceRepository->hasTemplate()) {
$this->flashWarning('invoice.first_template');
}
return $this->renderTemplateForm(new InvoiceTemplate(), $request);
}
/**
* The route to delete an existing template.
*
* TODO permission
*
* @Route(path="/template/{id}/delete", name="admin_invoice_template_delete", methods={"GET", "POST"})
*
* @param InvoiceTemplate $template
* @param Request $request
* @return \Symfony\Component\HttpFoundation\RedirectResponse|\Symfony\Component\HttpFoundation\Response
*/
public function deleteTemplate(InvoiceTemplate $template, Request $request)
{
try {
$this->invoiceRepository->removeTemplate($template);
$this->flashSuccess('action.delete.success');
} catch (\Exception $ex) {
$this->flashError('action.delete.error', ['%reason%' => $ex->getMessage()]);
}
return $this->redirectToRoute('admin_invoice_template_paginated', ['page' => $request->get('page')]);
}
/**
* @param InvoiceTemplate $template
* @param Request $request
@@ -199,13 +226,13 @@ class InvoiceController extends AbstractController
$editForm->handleRequest($request);
if ($editForm->isSubmitted() && $editForm->isValid()) {
$entityManager = $this->getDoctrine()->getManager();
$entityManager->persist($template);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
return $this->redirectToRoute('admin_invoice_template');
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()]);
}
}
return $this->render('invoice/template_edit.html.twig', [

10
src/Controller/ProfileController.php
View File

@@ -68,7 +68,7 @@ class ProfileController extends AbstractController
$entityManager->persist($profile);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
}
@@ -93,7 +93,7 @@ class ProfileController extends AbstractController
$entityManager->persist($profile);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
}
@@ -118,7 +118,7 @@ class ProfileController extends AbstractController
$entityManager->persist($profile);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
}
@@ -140,7 +140,7 @@ class ProfileController extends AbstractController
$entityManager->persist($profile);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
}
@@ -184,7 +184,7 @@ class ProfileController extends AbstractController
$entityManager->persist($profile);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
return $this->redirectToRoute('user_profile', ['username' => $profile->getUsername()]);
}

4
src/Controller/TimesheetController.php
View File

@@ -169,9 +169,9 @@ class TimesheetController extends AbstractController
$entityManager->remove($entry);
$entityManager->flush();
$this->flashSuccess('action.deleted_successfully');
$this->flashSuccess('action.delete.success');
} catch (\Exception $ex) {
$this->flashError('action.deleted.error', ['%reason%' => $ex->getMessage()]);
$this->flashError('action.delete.error', ['%reason%' => $ex->getMessage()]);
}
return $this->redirectToRoute('timesheet_paginated', ['page' => $request->get('page')]);

4
src/Controller/TimesheetControllerTrait.php
View File

@@ -98,7 +98,7 @@ trait TimesheetControllerTrait
$entityManager->persist($entry);
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
return $this->redirectToRoute($redirectRoute, ['page' => $request->get('page')]);
}
@@ -177,7 +177,7 @@ trait TimesheetControllerTrait
$entityManager->flush();
$this->flashSuccess('action.updated_successfully');
$this->flashSuccess('action.update.success');
return $this->redirectToRoute($redirectRoute);
}