Skip to content
This repository was archived by the owner on Sep 12, 2024. It is now read-only.

Commit 611f8d7

Browse files
committed
Merge branch 'release/2.0.2'
2 parents d607c52 + 188345d commit 611f8d7

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

CHANGELOG.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ Versioning](https://semver.org/spec/v2.0.0.html).
99

1010
## [Unreleased]
1111

12+
## [2.0.2] - 2023-02-27
13+
14+
### Changed
15+
16+
- Fixed check for company
17+
1218
## [2.0.1] - 2023-02-27
1319

1420
### Changed
@@ -184,7 +190,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
184190

185191
- [KON-361](https://github.com/aakb/kontrolgruppen/pull/81): Changed datepicker
186192

187-
[Unreleased]: https://github.com/itk-dev/kontrolgruppen/compare/2.0.1...HEAD
193+
[Unreleased]: https://github.com/itk-dev/kontrolgruppen/compare/2.0.2...HEAD
194+
[2.0.2]: https://github.com/itk-dev/kontrolgruppen/compare/2.0.1...2.0.2
188195
[2.0.1]: https://github.com/itk-dev/kontrolgruppen/compare/2.0.0...2.0.1
189196
[2.0.0]: https://github.com/itk-dev/kontrolgruppen/compare/1.12.2...2.0.0
190197
[1.12.2]: https://github.com/itk-dev/kontrolgruppen/compare/1.12.0...1.12.2

core/Export/KL/Export.php

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use DoctrineBatchUtils\BatchProcessing\SimpleBatchIteratorAggregate;
1616
use Exception;
1717
use Kontrolgruppen\CoreBundle\Entity\Process;
18+
use Kontrolgruppen\CoreBundle\Entity\ProcessClientPerson;
1819
use Kontrolgruppen\CoreBundle\Entity\ProcessStatus;
1920
use Kontrolgruppen\CoreBundle\Export\AbstractExport;
2021
use Kontrolgruppen\CoreBundle\Service\EconomyService;
@@ -174,12 +175,17 @@ private function getNewRow(Process $process, $serviceName)
174175
$forwardedTo = $process->getForwardedToAuthorities();
175176
$forwardedTo = \count($forwardedTo) > 0 ? $forwardedTo[0] : null;
176177

178+
$client = $process->getProcessClient();
179+
$clientHasOwnCompany = $client instanceof ProcessClientPerson
180+
? $client->getHasOwnCompany()
181+
: null;
182+
177183
return [
178184
'caseNumber' => $process->getCaseNumber(),
179185
'channel' => $process->getChannel() ? $process->getChannel()->getName() : null,
180186
'processType' => $process->getProcessType() ? $process->getProcessType()->getName() : null,
181187
'service' => $serviceName,
182-
'clientHasOwnCompany' => $this->formatBooleanYesNoNull($process->getProcessClient()->getHasOwnCompany()),
188+
'clientHasOwnCompany' => $this->formatBooleanYesNoNull($clientHasOwnCompany),
183189
'performedCompanyCheck' => $this->formatBooleanYesNoNull($process->getPerformedCompanyCheck()),
184190
'repaymentSum' => 0.0,
185191
'futureSavingsSum' => 0.0,

0 commit comments

Comments
 (0)