Browse Source

Merge branch 'master' of ssh://gitea.spawntree.de:1122/spawntree/matsen-tool-be

master
Florian Eisenmenger 1 year ago
parent
commit
705bd0af65
2 changed files with 20 additions and 9 deletions
  1. +8
    -0
      src/DataFixtures/AppFixtures.php
  2. +12
    -9
      src/State/SaleSummaryStateProvider.php

+ 8
- 0
src/DataFixtures/AppFixtures.php View File

@@ -44,6 +44,14 @@ class AppFixtures extends Fixture
} }
} }


$documentPath = $projectRoot . '/public/media/';
$files = glob($documentPath . '*');
foreach ($files as $file) {
if (is_file($file)) {
unlink($file);
}
}

MediaObjectUserFactory::createMany(20); MediaObjectUserFactory::createMany(20);
$adminD = UserFactory::createOne( $adminD = UserFactory::createOne(
[ [


+ 12
- 9
src/State/SaleSummaryStateProvider.php View File

@@ -51,16 +51,19 @@ class SaleSummaryStateProvider implements ProviderInterface
/** @var User $user */ /** @var User $user */
foreach ($users as $user) { foreach ($users as $user) {
$sales = $user->getSales(); $sales = $user->getSales();
$salesSummary = new SaleSummary();
$salesSummary->owner = $this->microMapper->map($user, UserApi::class);
$salesSummary->ownerName = $user->getFirstName() . ' ' . $user->getLastName();
$salesSummary->turnover = 0;
$salesSummary->profit = 0;
foreach ($sales as $sale) {
$salesSummary->turnover += $sale->getTurnover();
$salesSummary->profit += $sale->getProfit();
if (count($sales) > 0) {
$salesSummary = new SaleSummary();
$salesSummary->owner = $this->microMapper->map($user, UserApi::class);
$salesSummary->ownerName = $user->getFirstName() . ' ' . $user->getLastName();
$salesSummary->turnover = 0;
$salesSummary->profit = 0;
foreach ($sales as $sale) {
$salesSummary->turnover += $sale->getTurnover();
$salesSummary->profit += $sale->getProfit();
}
$salesSummaries[] = $salesSummary;
} }
$salesSummaries[] = $salesSummary;
} }
return $salesSummaries; return $salesSummaries;
} }


Loading…
Cancel
Save