Jingga/oms-SalesAnalysis
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-SalesAnalysis.git synced 2026-02-15 10:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-05-16 02:14:55 +00:00
parent 78a0bcf52e
commit 03646a67a6
11 changed files with 46 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Controller/BackendController.php
View File

@ -367,7 +367,7 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/SalesAnalysis/Theme/Backend/analysis-rep-ytd'); $view->setTemplate('/Modules/SalesAnalysis/Theme/Backend/analysis-rep-ytd');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005401001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005401001, $request, $response);
$view->data['nav-sub'] = $this->app->moduleManager->get('Navigation')->createNavigationMidSub(1005407001, $request, $response); $view->data['nav-sub'] = $this->app->moduleManager->get('Navigation')->createNavigationMidSub(1005407001, $request, $response);
$businessStart = 1; $businessStart = 1;
@ -445,7 +445,7 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/SalesAnalysis/Theme/Backend/analysis-rep-mtd'); $view->setTemplate('/Modules/SalesAnalysis/Theme/Backend/analysis-rep-mtd');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005401001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005401001, $request, $response);
$view->data['nav-sub'] = $this->app->moduleManager->get('Navigation')->createNavigationMidSub(1005407001, $request, $response); $view->data['nav-sub'] = $this->app->moduleManager->get('Navigation')->createNavigationMidSub(1005407001, $request, $response);
$businessStart = 1; $businessStart = 1;
@ -523,7 +523,7 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/SalesAnalysis/Theme/Backend/analysis-rep-monthly'); $view->setTemplate('/Modules/SalesAnalysis/Theme/Backend/analysis-rep-monthly');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005401001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005401001, $request, $response);
$view->data['nav-sub'] = $this->app->moduleManager->get('Navigation')->createNavigationMidSub(1005407001, $request, $response); $view->data['nav-sub'] = $this->app->moduleManager->get('Navigation')->createNavigationMidSub(1005407001, $request, $response);
$businessStart = 1; $businessStart = 1;
@ -539,7 +539,7 @@ final class BackendController extends Controller
$view->data['endCurrent'] = $endCurrent; $view->data['endCurrent'] = $endCurrent;
$view->data['startComparison'] = $startComparison; $view->data['startComparison'] = $startComparison;
$view->data['endComparison'] = $endComparison; $view->data['endComparison'] = $endComparison;
$view->data['endCurrentIndex'] = $endCurrentIndex; $view->data['endCurrentIndex'] = $endCurrentIndex;
$view->data['historyStart'] = $historyStart; $view->data['historyStart'] = $historyStart;
$view->data['salesRep'] = ModelsSalesRepMapper::getAll() $view->data['salesRep'] = ModelsSalesRepMapper::getAll()
@ -548,7 +548,6 @@ final class BackendController extends Controller
->where('unit', $this->app->unitId) ->where('unit', $this->app->unitId)
->executeGetArray(); ->executeGetArray();
[ [
$mtdCurrent, $mtdCurrent,
$ytdCurrent, $ytdCurrent,
@ -599,7 +598,7 @@ final class BackendController extends Controller
$view = new View($this->app->l11nManager, $request, $response); $view = new View($this->app->l11nManager, $request, $response);
$view->setTemplate('/Modules/SalesAnalysis/Theme/Backend/analysis-rep-annually'); $view->setTemplate('/Modules/SalesAnalysis/Theme/Backend/analysis-rep-annually');
$view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005401001, $request, $response); $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1005401001, $request, $response);
$view->data['nav-sub'] = $this->app->moduleManager->get('Navigation')->createNavigationMidSub(1005407001, $request, $response); $view->data['nav-sub'] = $this->app->moduleManager->get('Navigation')->createNavigationMidSub(1005407001, $request, $response);
$businessStart = 1; $businessStart = 1;
@ -623,7 +622,6 @@ final class BackendController extends Controller
->where('unit', $this->app->unitId) ->where('unit', $this->app->unitId)
->executeGetArray(); ->executeGetArray();
[ [
$view->data['mtdPYClientRep'], $view->data['mtdPYClientRep'],
$view->data['mtdAClientRep'], $view->data['mtdAClientRep'],

48
Models/ItemMapper.php
View File

@ -135,17 +135,17 @@ class ItemMapper extends DataMapperFactory
if ($monthIndex === $endCurrentIndex) { if ($monthIndex === $endCurrentIndex) {
if ($period === 1) { if ($period === 1) {
$mtdPYItemAttribute['segment'][$result['segment']] = $temp; $mtdPYItemAttribute['segment'][$result['segment']] = $temp;
$mtdPYItemAttribute['section'][$result['section']] = $temp; $mtdPYItemAttribute['section'][$result['section']] = $temp;
$mtdPYItemAttribute['sales_group'][$result['sales_group']] = $temp; $mtdPYItemAttribute['sales_group'][$result['sales_group']] = $temp;
$mtdPYItemAttribute['product_group'][$result['product_group']] = $temp; $mtdPYItemAttribute['product_group'][$result['product_group']] = $temp;
$mtdPYItemAttribute['product_type'][$result['product_type']] = $temp; $mtdPYItemAttribute['product_type'][$result['product_type']] = $temp;
} else { } else {
$mtdAItemAttribute['segment'][$result['segment']] = $temp; $mtdAItemAttribute['segment'][$result['segment']] = $temp;
$mtdAItemAttribute['section'][$result['section']] = $temp; $mtdAItemAttribute['section'][$result['section']] = $temp;
$mtdAItemAttribute['sales_group'][$result['sales_group']] = $temp; $mtdAItemAttribute['sales_group'][$result['sales_group']] = $temp;
$mtdAItemAttribute['product_group'][$result['product_group']] = $temp; $mtdAItemAttribute['product_group'][$result['product_group']] = $temp;
$mtdAItemAttribute['product_type'][$result['product_type']] = $temp; $mtdAItemAttribute['product_type'][$result['product_type']] = $temp;
} }
} }
@ -221,27 +221,27 @@ class ItemMapper extends DataMapperFactory
} }
if ($period === 1) { if ($period === 1) {
$ytdPYItemAttribute['segment'][$result['segment']]['net_sales'] += $temp['net_sales']; $ytdPYItemAttribute['segment'][$result['segment']]['net_sales'] += $temp['net_sales'];
$ytdPYItemAttribute['segment'][$result['segment']]['net_profit'] += $temp['net_profit']; $ytdPYItemAttribute['segment'][$result['segment']]['net_profit'] += $temp['net_profit'];
$ytdPYItemAttribute['section'][$result['section']]['net_sales'] += $temp['net_sales']; $ytdPYItemAttribute['section'][$result['section']]['net_sales'] += $temp['net_sales'];
$ytdPYItemAttribute['section'][$result['section']]['net_profit'] += $temp['net_profit']; $ytdPYItemAttribute['section'][$result['section']]['net_profit'] += $temp['net_profit'];
$ytdPYItemAttribute['sales_group'][$result['sales_group']]['net_sales'] += $temp['net_sales']; $ytdPYItemAttribute['sales_group'][$result['sales_group']]['net_sales'] += $temp['net_sales'];
$ytdPYItemAttribute['sales_group'][$result['sales_group']]['net_profit'] += $temp['net_profit']; $ytdPYItemAttribute['sales_group'][$result['sales_group']]['net_profit'] += $temp['net_profit'];
$ytdPYItemAttribute['product_group'][$result['product_group']]['net_sales'] += $temp['net_sales']; $ytdPYItemAttribute['product_group'][$result['product_group']]['net_sales'] += $temp['net_sales'];
$ytdPYItemAttribute['product_group'][$result['product_group']]['net_profit'] += $temp['net_profit']; $ytdPYItemAttribute['product_group'][$result['product_group']]['net_profit'] += $temp['net_profit'];
$ytdPYItemAttribute['product_type'][$result['product_type']]['net_sales'] += $temp['net_sales']; $ytdPYItemAttribute['product_type'][$result['product_type']]['net_sales'] += $temp['net_sales'];
$ytdPYItemAttribute['product_type'][$result['product_type']]['net_profit'] += $temp['net_profit']; $ytdPYItemAttribute['product_type'][$result['product_type']]['net_profit'] += $temp['net_profit'];
} else { } else {
$ytdAItemAttribute['segment'][$result['segment']]['net_sales'] += $temp['net_sales']; $ytdAItemAttribute['segment'][$result['segment']]['net_sales'] += $temp['net_sales'];
$ytdAItemAttribute['segment'][$result['segment']]['net_profit'] += $temp['net_profit']; $ytdAItemAttribute['segment'][$result['segment']]['net_profit'] += $temp['net_profit'];
$ytdAItemAttribute['section'][$result['section']]['net_sales'] += $temp['net_sales']; $ytdAItemAttribute['section'][$result['section']]['net_sales'] += $temp['net_sales'];
$ytdAItemAttribute['section'][$result['section']]['net_profit'] += $temp['net_profit']; $ytdAItemAttribute['section'][$result['section']]['net_profit'] += $temp['net_profit'];
$ytdAItemAttribute['sales_group'][$result['sales_group']]['net_sales'] += $temp['net_sales']; $ytdAItemAttribute['sales_group'][$result['sales_group']]['net_sales'] += $temp['net_sales'];
$ytdAItemAttribute['sales_group'][$result['sales_group']]['net_profit'] += $temp['net_profit']; $ytdAItemAttribute['sales_group'][$result['sales_group']]['net_profit'] += $temp['net_profit'];
$ytdAItemAttribute['product_group'][$result['product_group']]['net_sales'] += $temp['net_sales']; $ytdAItemAttribute['product_group'][$result['product_group']]['net_sales'] += $temp['net_sales'];
$ytdAItemAttribute['product_group'][$result['product_group']]['net_profit'] += $temp['net_profit']; $ytdAItemAttribute['product_group'][$result['product_group']]['net_profit'] += $temp['net_profit'];
$ytdAItemAttribute['product_type'][$result['product_type']]['net_sales'] += $temp['net_sales']; $ytdAItemAttribute['product_type'][$result['product_type']]['net_sales'] += $temp['net_sales'];
$ytdAItemAttribute['product_type'][$result['product_type']]['net_profit'] += $temp['net_profit']; $ytdAItemAttribute['product_type'][$result['product_type']]['net_profit'] += $temp['net_profit'];
} }
} }
} }

2
Theme/Backend/Lang/Navigation.de.lang.php
View File

@ -21,5 +21,5 @@ return ['Navigation' => [
'Overview' => 'Übersicht', 'Overview' => 'Übersicht',
'Products' => 'Produkte', 'Products' => 'Produkte',
'Regions' => 'Regionen', 'Regions' => 'Regionen',
'SalesRep' => 'Verkäufer', 'SalesRep' => 'Verkäufer',
]]; ]];

10
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -21,10 +21,10 @@ return ['Navigation' => [
'Overview' => 'Overview', 'Overview' => 'Overview',
'Products' => 'Products', 'Products' => 'Products',
'Regions' => 'Regions', 'Regions' => 'Regions',
'YTD' => 'YTD', 'YTD' => 'YTD',
'MTD' => 'MTD', 'MTD' => 'MTD',
'Monthly' => 'Monthly', 'Monthly' => 'Monthly',
'Annually' => 'Annually', 'Annually' => 'Annually',
'SalesRep' => 'Sales Reps', 'SalesReps' => 'Sales Reps',
'SalesRep' => 'Sales Rep', 'SalesRep' => 'Sales Rep',
]]; ]];

4
Theme/Backend/Lang/de.lang.php
View File

@ -68,6 +68,6 @@ return ['SalesAnalysis' => [
'America' => 'Amerika', 'America' => 'Amerika',
'Oceania' => 'Ozeanien', 'Oceania' => 'Ozeanien',
'Africa' => 'Afrika', 'Africa' => 'Afrika',
'SalesReps' => 'Verkäufer', 'SalesReps' => 'Verkäufer',
'SalesRep' => 'Verkäufer', 'SalesRep' => 'Verkäufer',
]]; ]];

9
Theme/Backend/Lang/en.lang.php
View File

@ -68,9 +68,8 @@ return ['SalesAnalysis' => [
'America' => 'America', 'America' => 'America',
'Oceania' => 'Oceania', 'Oceania' => 'Oceania',
'Africa' => 'Africa', 'Africa' => 'Africa',
'YTD' => 'YTD', 'Monthly' => 'Monthly',
'Monthly' => 'Monthly', 'Annually' => 'Annually',
'Annually' => 'Annually', 'SalesReps' => 'Sales Reps',
'SalesReps' => 'Sales Reps', 'SalesRep' => 'Sales Rep',
'SalesRep' => 'Sales Rep',
]]; ]];

2
Theme/Backend/analysis-rep-annually.tpl.php
View File

@ -12,8 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use phpOMS\Localization\ISO3166CharEnum;
use phpOMS\Localization\ISO3166NameEnum;
use phpOMS\Stdlib\Base\FloatInt; use phpOMS\Stdlib\Base\FloatInt;
/** /**

4
Theme/Backend/analysis-rep-monthly.tpl.php
View File

@ -12,10 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use phpOMS\Localization\ISO3166CharEnum;
use phpOMS\Localization\ISO3166NameEnum;
use phpOMS\Stdlib\Base\FloatInt;
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */

8
Theme/Backend/analysis-rep-mtd.tpl.php
View File

@ -12,10 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use phpOMS\Localization\ISO3166CharEnum;
use phpOMS\Localization\ISO3166NameEnum;
use phpOMS\Stdlib\Base\FloatInt;
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
@ -42,7 +38,7 @@ echo $this->data['nav-sub']->render();
$total = ['py' => 0, 'a' => 0]; $total = ['py' => 0, 'a' => 0];
foreach ($this->data['mtdAClientRep'] as $type => $values) : foreach ($this->data['mtdAClientRep'] as $type => $values) :
$total['py'] += $this->data['mtdPYClientRep'][$type]['net_sales'] ?? 0; $total['py'] += $this->data['mtdPYClientRep'][$type]['net_sales'] ?? 0;
$total['a'] += $this->data['mtdAClientRep'][$type]['net_sales'] ?? 0; $total['a'] += $this->data['mtdAClientRep'][$type]['net_sales'] ?? 0;
?> ?>
<tr> <tr>
<td><?= $this->printHtml($this->data['salesRep'][$type]->code); ?> - <?= $this->printHtml($this->data['salesRep'][$type]->main->name1); ?> <?= $this->printHtml($this->data['salesRep'][$type]->main->name2); ?> <td><?= $this->printHtml($this->data['salesRep'][$type]->code); ?> - <?= $this->printHtml($this->data['salesRep'][$type]->main->name1); ?> <?= $this->printHtml($this->data['salesRep'][$type]->main->name2); ?>
@ -86,7 +82,7 @@ echo $this->data['nav-sub']->render();
$total = ['py' => 0, 'a' => 0]; $total = ['py' => 0, 'a' => 0];
foreach ($this->data['mtdAClientRep'] as $type => $values) : foreach ($this->data['mtdAClientRep'] as $type => $values) :
$total['py'] += $this->data['mtdPYClientRep'][$type]['net_profit'] ?? 0; $total['py'] += $this->data['mtdPYClientRep'][$type]['net_profit'] ?? 0;
$total['a'] += $this->data['mtdAClientRep'][$type]['net_profit'] ?? 0; $total['a'] += $this->data['mtdAClientRep'][$type]['net_profit'] ?? 0;
?> ?>
<tr> <tr>
<td><?= $this->printHtml($this->data['salesRep'][$type]->code); ?> - <?= $this->printHtml($this->data['salesRep'][$type]->main->name1); ?> <?= $this->printHtml($this->data['salesRep'][$type]->main->name2); ?> <td><?= $this->printHtml($this->data['salesRep'][$type]->code); ?> - <?= $this->printHtml($this->data['salesRep'][$type]->main->name1); ?> <?= $this->printHtml($this->data['salesRep'][$type]->main->name2); ?>

8
Theme/Backend/analysis-rep-ytd.tpl.php
View File

@ -12,10 +12,6 @@
*/ */
declare(strict_types=1); declare(strict_types=1);
use phpOMS\Localization\ISO3166CharEnum;
use phpOMS\Localization\ISO3166NameEnum;
use phpOMS\Stdlib\Base\FloatInt;
/** /**
* @var \phpOMS\Views\View $this * @var \phpOMS\Views\View $this
*/ */
@ -42,7 +38,7 @@ echo $this->data['nav-sub']->render();
$total = ['py' => 0, 'a' => 0]; $total = ['py' => 0, 'a' => 0];
foreach ($this->data['ytdAClientRep'] as $type => $values) : foreach ($this->data['ytdAClientRep'] as $type => $values) :
$total['py'] += $this->data['ytdPYClientRep'][$type]['net_sales'] ?? 0; $total['py'] += $this->data['ytdPYClientRep'][$type]['net_sales'] ?? 0;
$total['a'] += $this->data['ytdAClientRep'][$type]['net_sales'] ?? 0; $total['a'] += $this->data['ytdAClientRep'][$type]['net_sales'] ?? 0;
?> ?>
<tr> <tr>
<td><?= $this->printHtml($this->data['salesRep'][$type]->code); ?> - <?= $this->printHtml($this->data['salesRep'][$type]->main->name1); ?> <?= $this->printHtml($this->data['salesRep'][$type]->main->name2); ?> <td><?= $this->printHtml($this->data['salesRep'][$type]->code); ?> - <?= $this->printHtml($this->data['salesRep'][$type]->main->name1); ?> <?= $this->printHtml($this->data['salesRep'][$type]->main->name2); ?>
@ -86,7 +82,7 @@ echo $this->data['nav-sub']->render();
$total = ['py' => 0, 'a' => 0]; $total = ['py' => 0, 'a' => 0];
foreach ($this->data['ytdAClientRep'] as $type => $values) : foreach ($this->data['ytdAClientRep'] as $type => $values) :
$total['py'] += $this->data['ytdPYClientRep'][$type]['net_profit'] ?? 0; $total['py'] += $this->data['ytdPYClientRep'][$type]['net_profit'] ?? 0;
$total['a'] += $this->data['ytdAClientRep'][$type]['net_profit'] ?? 0; $total['a'] += $this->data['ytdAClientRep'][$type]['net_profit'] ?? 0;
?> ?>
<tr> <tr>
<td><?= $this->printHtml($this->data['salesRep'][$type]->code); ?> - <?= $this->printHtml($this->data['salesRep'][$type]->main->name1); ?> <?= $this->printHtml($this->data['salesRep'][$type]->main->name2); ?> <td><?= $this->printHtml($this->data['salesRep'][$type]->code); ?> - <?= $this->printHtml($this->data['salesRep'][$type]->main->name1); ?> <?= $this->printHtml($this->data['salesRep'][$type]->main->name2); ?>

2
info.json
View File

@ -12,7 +12,7 @@
}, },
"creator": { "creator": {
"name": "Jingga", "name": "Jingga",
"website": "jingga.app" "website": "https://jingga.app"
}, },
"description": "Sales module.", "description": "Sales module.",
"directory": "SalesAnalysis", "directory": "SalesAnalysis",