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

added invoice replacer for currently logged-in user (#2899)

Browse Source
This commit is contained in:
Kevin Papst
2021-11-03 12:00:52 +01:00
committed by GitHub
parent 1b35356f81
commit eb63dae405
3 changed files with 75 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Repository/InvoiceRepository.php
View File

@@ -54,7 +54,7 @@ class InvoiceRepository extends EntityRepository
return $counter > 0;
}
private function getCounterFor(\DateTime $start, \DateTime $end, ?Customer $customer = null): int
private function getCounterFor(\DateTime $start, \DateTime $end, ?Customer $customer = null, ?User $user = null): int
{
$qb = $this->getEntityManager()->createQueryBuilder();
$qb->select('count(i.createdAt) as counter')
@@ -68,7 +68,14 @@ class InvoiceRepository extends EntityRepository
if (null !== $customer) {
$qb
->andWhere($qb->expr()->eq('i.customer', ':customer'))
->setParameter('customer', $customer)
->setParameter('customer', $customer->getId())
;
}
if (null !== $user) {
$qb
->andWhere($qb->expr()->eq('i.user', ':user'))
->setParameter('user', $user->getId())
;
}
@@ -81,34 +88,43 @@ class InvoiceRepository extends EntityRepository
return $result['counter'];
}
public function getCounterForDay(\DateTime $date, ?Customer $customer = null): int
public function getCounterForDay(\DateTime $date, ?Customer $customer = null, ?User $user = null): int
{
$start = (clone $date)->setTime(0, 0, 0);
$end = (clone $date)->setTime(23, 59, 59);
return $this->getCounterFor($start, $end, $customer);
return $this->getCounterFor($start, $end, $customer, $user);
}
public function getCounterForMonth(\DateTime $date, ?Customer $customer = null): int
public function getCounterForMonth(\DateTime $date, ?Customer $customer = null, ?User $user = null): int
{
$start = (clone $date)->setDate((int) $date->format('Y'), (int) $date->format('n'), 1)->setTime(0, 0, 0);
$end = (clone $date)->setDate((int) $date->format('Y'), (int) $date->format('n'), (int) $date->format('t'))->setTime(23, 59, 59);
return $this->getCounterFor($start, $end, $customer);
return $this->getCounterFor($start, $end, $customer, $user);
}
public function getCounterForYear(\DateTime $date, ?Customer $customer = null): int
public function getCounterForYear(\DateTime $date, ?Customer $customer = null, ?User $user = null): int
{
$start = (clone $date)->setDate((int) $date->format('Y'), 1, 1)->setTime(0, 0, 0);
$end = (clone $date)->setDate((int) $date->format('Y'), 12, 31)->setTime(23, 59, 59);
return $this->getCounterFor($start, $end, $customer);
return $this->getCounterFor($start, $end, $customer, $user);
}
public function getCounterForAllTime(?Customer $customer = null): int
public function getCounterForCustomerAllTime(?Customer $customer = null): int
{
if (null !== $customer) {
return $this->count(['customer' => $customer]);
return $this->count(['customer' => $customer->getId()]);
}
return $this->count([]);
}
public function getCounterForUserAllTime(?User $user = null): int
{
if (null !== $user) {
return $this->count(['user' => $user->getId()]);
}
return $this->count([]);