@@ -82,6 +82,4 @@ |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $this->expectExceptionMessage('Le bouclement a déjà été fait au 2019-12-31 23:59:59'); |
| 85 | - $this->accounting->close($closingDate, $output); |
|
| 86 | - } |
|
| 87 | -} |
|
| 85 | + $this->accounting->close($closingDate, $output |
|
| 88 | 86 | \ No newline at end of file |
@@ -82,6 +82,4 @@ |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $this->expectExceptionMessage('Le bouclement a déjà été fait au 2019-12-31 23:59:59'); |
| 85 | - $this->accounting->close($closingDate, $output); |
|
| 86 | - } |
|
| 87 | -} |
|
| 85 | + $this->accounting->close($closingDate, $output |
|
| 88 | 86 | \ No newline at end of file |
@@ -82,6 +82,4 @@ |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $this->expectExceptionMessage('Le bouclement a déjà été fait au 2019-12-31 23:59:59'); |
| 85 | - $this->accounting->close($closingDate, $output); |
|
| 86 | - } |
|
| 87 | -} |
|
| 85 | + $this->accounting->close($closingDate, $output |
|
| 88 | 86 | \ No newline at end of file |
@@ -82,6 +82,4 @@ |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $this->expectExceptionMessage('Le bouclement a déjà été fait au 2019-12-31 23:59:59'); |
| 85 | - $this->accounting->close($closingDate, $output); |
|
| 86 | - } |
|
| 87 | -} |
|
| 85 | + $this->accounting->close($closingDate, $output |
|
| 88 | 86 | \ No newline at end of file |
@@ -82,6 +82,4 @@ |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | $this->expectExceptionMessage('Le bouclement a déjà été fait au 2019-12-31 23:59:59'); |
| 85 | - $this->accounting->close($closingDate, $output); |
|
| 86 | - } |
|
| 87 | -} |
|
| 85 | + $this->accounting->close($closingDate, $output |
|
| 88 | 86 | \ No newline at end of file |
@@ -27,7 +27,7 @@ |
||
| 27 | 27 | ], |
| 28 | 28 | 'banking' => [ |
| 29 | 29 | 'iban' => 'CH2730000001200061375', // QR-IBAN without spaces (eg: CH7030123036078110002) |
| 30 | - 'paymentTo' => 'PostFinance AG, 3030 Bern', // Bank coordinate the payment will be made to, eg: 'Banque Alternative Suisse SA' |
|
| 30 | + 'paymentTo' => 'PostFinance AG, 3030 Bern', // Bank coordinate the payment will be made to, eg: 'Banque Alternative Suisse SA' |
|
| 31 | 31 | 'paymentFor' => 'Club nautique Ichtus' . PHP_EOL . '2072 St-Blaise', // Name and address of account holder, 2-3 lines separated by \n |
| 32 | 32 | ], |
| 33 | 33 | 'accounting' => [ |
@@ -198,6 +198,4 @@ |
||
| 198 | 198 | |
| 199 | 199 | $count = $this->getEntityManager()->getConnection()->executeStatement($sql); |
| 200 | 200 | |
| 201 | - return $count; |
|
| 202 | - } |
|
| 203 | -} |
|
| 201 | + return $count |
|
| 204 | 202 | \ No newline at end of file |
@@ -198,6 +198,4 @@ |
||
| 198 | 198 | |
| 199 | 199 | $count = $this->getEntityManager()->getConnection()->executeStatement($sql); |
| 200 | 200 | |
| 201 | - return $count; |
|
| 202 | - } |
|
| 203 | -} |
|
| 201 | + return $count |
|
| 204 | 202 | \ No newline at end of file |
@@ -198,6 +198,4 @@ |
||
| 198 | 198 | |
| 199 | 199 | $count = $this->getEntityManager()->getConnection()->executeStatement($sql); |
| 200 | 200 | |
| 201 | - return $count; |
|
| 202 | - } |
|
| 203 | -} |
|
| 201 | + return $count |
|
| 204 | 202 | \ No newline at end of file |
@@ -198,6 +198,4 @@ |
||
| 198 | 198 | |
| 199 | 199 | $count = $this->getEntityManager()->getConnection()->executeStatement($sql); |
| 200 | 200 | |
| 201 | - return $count; |
|
| 202 | - } |
|
| 203 | -} |
|
| 201 | + return $count |
|
| 204 | 202 | \ No newline at end of file |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | */ |
| 69 | 69 | public function getOneById(int $id): Account |
| 70 | 70 | { |
| 71 | - $account = $this->getAclFilter()->runWithoutAcl(fn () => $this->findOneById($id)); |
|
| 71 | + $account = $this->getAclFilter()->runWithoutAcl(fn() => $this->findOneById($id)); |
|
| 72 | 72 | |
| 73 | 73 | if (!$account) { |
| 74 | 74 | throw new Exception('Account #' . $id . ' not found'); |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $user = $user->getOwner(); |
| 96 | 96 | } |
| 97 | 97 | |
| 98 | - $account = $this->getAclFilter()->runWithoutAcl(fn () => $this->findOneByOwner($user)); |
|
| 98 | + $account = $this->getAclFilter()->runWithoutAcl(fn() => $this->findOneByOwner($user)); |
|
| 99 | 99 | |
| 100 | 100 | if (!$account) { |
| 101 | 101 | $account = new Account(); |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | |
| 107 | 107 | $config = $container->get('config'); |
| 108 | 108 | $parentCode = (int) $config['accounting']['customerDepositsAccountCode']; |
| 109 | - $parent = $this->getAclFilter()->runWithoutAcl(fn () => $this->findOneByCode($parentCode)); |
|
| 109 | + $parent = $this->getAclFilter()->runWithoutAcl(fn() => $this->findOneByCode($parentCode)); |
|
| 110 | 110 | |
| 111 | 111 | // Find the max account code, using the liability parent code as prefix |
| 112 | 112 | if (!$this->maxCode) { |
@@ -192,6 +192,4 @@ discard block |
||
| 192 | 192 | |
| 193 | 193 | $count = $this->getEntityManager()->getConnection()->executeStatement($sql); |
| 194 | 194 | |
| 195 | - return $count; |
|
| 196 | - } |
|
| 197 | -} |
|
| 195 | + return $count |
|
| 198 | 196 | \ No newline at end of file |
@@ -304,9 +304,4 @@ |
||
| 304 | 304 | $user->getId(), |
| 305 | 305 | $user->getName(), |
| 306 | 306 | $user->getOwner()->getId(), |
| 307 | - $user->getOwner()->getName() |
|
| 308 | - ) |
|
| 309 | - ); |
|
| 310 | - } |
|
| 311 | - } |
|
| 312 | -} |
|
| 307 | + $user->getOwner |
|
| 313 | 308 | \ No newline at end of file |
@@ -304,9 +304,4 @@ |
||
| 304 | 304 | $user->getId(), |
| 305 | 305 | $user->getName(), |
| 306 | 306 | $user->getOwner()->getId(), |
| 307 | - $user->getOwner()->getName() |
|
| 308 | - ) |
|
| 309 | - ); |
|
| 310 | - } |
|
| 311 | - } |
|
| 312 | -} |
|
| 307 | + $user->getOwner |
|
| 313 | 308 | \ No newline at end of file |
@@ -304,9 +304,4 @@ |
||
| 304 | 304 | $user->getId(), |
| 305 | 305 | $user->getName(), |
| 306 | 306 | $user->getOwner()->getId(), |
| 307 | - $user->getOwner()->getName() |
|
| 308 | - ) |
|
| 309 | - ); |
|
| 310 | - } |
|
| 311 | - } |
|
| 312 | -} |
|
| 307 | + $user->getOwner |
|
| 313 | 308 | \ No newline at end of file |
@@ -304,9 +304,4 @@ |
||
| 304 | 304 | $user->getId(), |
| 305 | 305 | $user->getName(), |
| 306 | 306 | $user->getOwner()->getId(), |
| 307 | - $user->getOwner()->getName() |
|
| 308 | - ) |
|
| 309 | - ); |
|
| 310 | - } |
|
| 311 | - } |
|
| 312 | -} |
|
| 307 | + $user->getOwner |
|
| 313 | 308 | \ No newline at end of file |
@@ -304,9 +304,4 @@ |
||
| 304 | 304 | $user->getId(), |
| 305 | 305 | $user->getName(), |
| 306 | 306 | $user->getOwner()->getId(), |
| 307 | - $user->getOwner()->getName() |
|
| 308 | - ) |
|
| 309 | - ); |
|
| 310 | - } |
|
| 311 | - } |
|
| 312 | -} |
|
| 307 | + $user->getOwner |
|
| 313 | 308 | \ No newline at end of file |
@@ -49,8 +49,4 @@ |
||
| 49 | 49 | EXISTS ( |
| 50 | 50 | SELECT $bookingAlias.id FROM $bookingClass $bookingAlias |
| 51 | 51 | WHERE $bookingAlias.bookable = $alias.id AND $bookingAlias.endDate IS NULL |
| 52 | - HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 53 | - ) |
|
| 54 | - STRING; |
|
| 55 | - } |
|
| 56 | -} |
|
| 52 | + HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 57 | 53 | \ No newline at end of file |
@@ -49,8 +49,4 @@ |
||
| 49 | 49 | EXISTS ( |
| 50 | 50 | SELECT $bookingAlias.id FROM $bookingClass $bookingAlias |
| 51 | 51 | WHERE $bookingAlias.bookable = $alias.id AND $bookingAlias.endDate IS NULL |
| 52 | - HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 53 | - ) |
|
| 54 | - STRING; |
|
| 55 | - } |
|
| 56 | -} |
|
| 52 | + HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 57 | 53 | \ No newline at end of file |
@@ -49,8 +49,4 @@ |
||
| 49 | 49 | EXISTS ( |
| 50 | 50 | SELECT $bookingAlias.id FROM $bookingClass $bookingAlias |
| 51 | 51 | WHERE $bookingAlias.bookable = $alias.id AND $bookingAlias.endDate IS NULL |
| 52 | - HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 53 | - ) |
|
| 54 | - STRING; |
|
| 55 | - } |
|
| 56 | -} |
|
| 52 | + HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 57 | 53 | \ No newline at end of file |
@@ -49,8 +49,4 @@ |
||
| 49 | 49 | EXISTS ( |
| 50 | 50 | SELECT $bookingAlias.id FROM $bookingClass $bookingAlias |
| 51 | 51 | WHERE $bookingAlias.bookable = $alias.id AND $bookingAlias.endDate IS NULL |
| 52 | - HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 53 | - ) |
|
| 54 | - STRING; |
|
| 55 | - } |
|
| 56 | -} |
|
| 52 | + HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 57 | 53 | \ No newline at end of file |
@@ -49,8 +49,4 @@ |
||
| 49 | 49 | EXISTS ( |
| 50 | 50 | SELECT $bookingAlias.id FROM $bookingClass $bookingAlias |
| 51 | 51 | WHERE $bookingAlias.bookable = $alias.id AND $bookingAlias.endDate IS NULL |
| 52 | - HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 53 | - ) |
|
| 54 | - STRING; |
|
| 55 | - } |
|
| 56 | -} |
|
| 52 | + HAVING COUNT($bookingAlias.id) $dqlOperator :$param |
|
| 57 | 53 | \ No newline at end of file |
@@ -19,4 +19,4 @@ |
||
| 19 | 19 | export const localConfig = $json; |
| 20 | 20 | STRING; |
| 21 | 21 | |
| 22 | -file_put_contents('client/app/shared/generated-config.ts', $code); |
|
| 22 | +file_put_contents('client/app/shared/generated-config.ts', $code |
|
| 23 | 23 | \ No newline at end of file |
@@ -19,4 +19,4 @@ |
||
| 19 | 19 | export const localConfig = $json; |
| 20 | 20 | STRING; |
| 21 | 21 | |
| 22 | -file_put_contents('client/app/shared/generated-config.ts', $code); |
|
| 22 | +file_put_contents('client/app/shared/generated-config.ts', $code |
|
| 23 | 23 | \ No newline at end of file |
@@ -19,4 +19,4 @@ |
||
| 19 | 19 | export const localConfig = $json; |
| 20 | 20 | STRING; |
| 21 | 21 | |
| 22 | -file_put_contents('client/app/shared/generated-config.ts', $code); |
|
| 22 | +file_put_contents('client/app/shared/generated-config.ts', $code |
|
| 23 | 23 | \ No newline at end of file |
@@ -19,4 +19,4 @@ |
||
| 19 | 19 | export const localConfig = $json; |
| 20 | 20 | STRING; |
| 21 | 21 | |
| 22 | -file_put_contents('client/app/shared/generated-config.ts', $code); |
|
| 22 | +file_put_contents('client/app/shared/generated-config.ts', $code |
|
| 23 | 23 | \ No newline at end of file |
@@ -19,4 +19,4 @@ |
||
| 19 | 19 | export const localConfig = $json; |
| 20 | 20 | STRING; |
| 21 | 21 | |
| 22 | -file_put_contents('client/app/shared/generated-config.ts', $code); |
|
| 22 | +file_put_contents('client/app/shared/generated-config.ts', $code |
|
| 23 | 23 | \ No newline at end of file |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | private function queueBalanceForEachUsers(array $users): int |
| 119 | 119 | { |
| 120 | 120 | foreach ($users as $user) { |
| 121 | - $bookables = $user->getRunningBookings()->map(fn (Booking $booking) => $booking->getBookable()); |
|
| 121 | + $bookables = $user->getRunningBookings()->map(fn(Booking $booking) => $booking->getBookable()); |
|
| 122 | 122 | |
| 123 | 123 | $this->queueBalance($user, $bookables); |
| 124 | 124 | } |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | |
| 154 | 154 | // Fallback to family owner if any |
| 155 | 155 | if (!$email && $user->getOwner()) { |
| 156 | - $email = $this->userRepository->getAclFilter()->runWithoutAcl(fn () => $user->getOwner()->getEmail()); |
|
| 156 | + $email = $this->userRepository->getAclFilter()->runWithoutAcl(fn() => $user->getOwner()->getEmail()); |
|
| 157 | 157 | |
| 158 | 158 | $this->toFamilyOwner = true; |
| 159 | 159 | } |
@@ -529,7 +529,7 @@ |
||
| 529 | 529 | */ |
| 530 | 530 | public function getRunningBookings(): Collection |
| 531 | 531 | { |
| 532 | - return $this->bookings->filter(fn (Booking $booking) => $booking->getStatus() === BookingStatusType::BOOKED && $booking->getEndDate() === null); |
|
| 532 | + return $this->bookings->filter(fn(Booking $booking) => $booking->getStatus() === BookingStatusType::BOOKED && $booking->getEndDate() === null); |
|
| 533 | 533 | } |
| 534 | 534 | |
| 535 | 535 | /** |
@@ -370,7 +370,7 @@ discard block |
||
| 370 | 370 | } |
| 371 | 371 | |
| 372 | 372 | // Only consider approved and unterminated bookings |
| 373 | - $bookings = $this->getBookings()->filter(fn (Booking $booking): bool => !$booking->getEndDate() && $booking->getStatus() !== BookingStatusType::APPLICATION)->toArray(); |
|
| 373 | + $bookings = $this->getBookings()->filter(fn(Booking $booking): bool => !$booking->getEndDate() && $booking->getStatus() !== BookingStatusType::APPLICATION)->toArray(); |
|
| 374 | 374 | |
| 375 | 375 | return $bookings; |
| 376 | 376 | } |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | return []; |
| 403 | 403 | } |
| 404 | 404 | |
| 405 | - $bookings = $this->getBookings()->filter(fn (Booking $booking): bool => !$booking->getEndDate())->toArray(); |
|
| 405 | + $bookings = $this->getBookings()->filter(fn(Booking $booking): bool => !$booking->getEndDate())->toArray(); |
|
| 406 | 406 | |
| 407 | 407 | return $bookings; |
| 408 | 408 | } |