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

Fixes for 1.12 (#4655)

Browse Source 
* fix missing locales
* bump composer packages
* changed translations
* assert timezone on customer
* include user accountNumber in excel export
* improve next customer number calculation
* fix z-index of contextmenu / action dropdown
This commit is contained in:
Kevin Papst
2024-02-22 13:03:09 +01:00
committed by GitHub
parent 36c578452e
commit f016221e8e
28 changed files with 892 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Repository/CustomerRepository.php
View File

@@ -29,7 +29,7 @@ use Doctrine\ORM\Query\Expr\Andx;
use Doctrine\ORM\QueryBuilder;
/**
* @extends \Doctrine\ORM\EntityRepository<Customer>
* @extends EntityRepository<Customer>
*/
class CustomerRepository extends EntityRepository
{
@@ -75,7 +75,7 @@ class CustomerRepository extends EntityRepository
return $this->count([]);
}
private function addPermissionCriteria(QueryBuilder $qb, ?User $user = null, array $teams = [])
private function addPermissionCriteria(QueryBuilder $qb, ?User $user = null, array $teams = []): void
{
$permissions = $this->getPermissionCriteria($qb, $user, $teams);
if ($permissions->count() > 0) {
@@ -249,7 +249,6 @@ class CustomerRepository extends EntityRepository
}
/**
* @param CustomerQuery $query
* @return Customer[]
*/
public function getCustomersForQuery(CustomerQuery $query): iterable
@@ -261,12 +260,7 @@ class CustomerRepository extends EntityRepository
return $paginator->getAll();
}
/**
* @param Customer $delete
* @param Customer|null $replace
* @throws \Doctrine\ORM\Exception\ORMException
*/
public function deleteCustomer(Customer $delete, ?Customer $replace = null)
public function deleteCustomer(Customer $delete, ?Customer $replace = null): void
{
$em = $this->getEntityManager();
$em->beginTransaction();
@@ -308,14 +302,14 @@ class CustomerRepository extends EntityRepository
return $qb->getQuery()->getResult();
}
public function saveComment(CustomerComment $comment)
public function saveComment(CustomerComment $comment): void
{
$entityManager = $this->getEntityManager();
$entityManager->persist($comment);
$entityManager->flush();
}
public function deleteComment(CustomerComment $comment)
public function deleteComment(CustomerComment $comment): void
{
$entityManager = $this->getEntityManager();
$entityManager->remove($comment);