diff --git a/Controller/BackendController.php b/Controller/BackendController.php index bc5a6f2..9f2253e 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -367,7 +367,7 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $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); $businessStart = 1; @@ -445,7 +445,7 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $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); $businessStart = 1; @@ -523,7 +523,7 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $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); $businessStart = 1; @@ -539,7 +539,7 @@ final class BackendController extends Controller $view->data['endCurrent'] = $endCurrent; $view->data['startComparison'] = $startComparison; $view->data['endComparison'] = $endComparison; - $view->data['endCurrentIndex'] = $endCurrentIndex; + $view->data['endCurrentIndex'] = $endCurrentIndex; $view->data['historyStart'] = $historyStart; $view->data['salesRep'] = ModelsSalesRepMapper::getAll() @@ -548,7 +548,6 @@ final class BackendController extends Controller ->where('unit', $this->app->unitId) ->executeGetArray(); - [ $mtdCurrent, $ytdCurrent, @@ -599,7 +598,7 @@ final class BackendController extends Controller $view = new View($this->app->l11nManager, $request, $response); $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); $businessStart = 1; @@ -623,7 +622,6 @@ final class BackendController extends Controller ->where('unit', $this->app->unitId) ->executeGetArray(); - [ $view->data['mtdPYClientRep'], $view->data['mtdAClientRep'], diff --git a/Models/ItemMapper.php b/Models/ItemMapper.php index 147ab71..bfe2119 100755 --- a/Models/ItemMapper.php +++ b/Models/ItemMapper.php @@ -135,17 +135,17 @@ class ItemMapper extends DataMapperFactory if ($monthIndex === $endCurrentIndex) { if ($period === 1) { - $mtdPYItemAttribute['segment'][$result['segment']] = $temp; - $mtdPYItemAttribute['section'][$result['section']] = $temp; - $mtdPYItemAttribute['sales_group'][$result['sales_group']] = $temp; + $mtdPYItemAttribute['segment'][$result['segment']] = $temp; + $mtdPYItemAttribute['section'][$result['section']] = $temp; + $mtdPYItemAttribute['sales_group'][$result['sales_group']] = $temp; $mtdPYItemAttribute['product_group'][$result['product_group']] = $temp; - $mtdPYItemAttribute['product_type'][$result['product_type']] = $temp; + $mtdPYItemAttribute['product_type'][$result['product_type']] = $temp; } else { - $mtdAItemAttribute['segment'][$result['segment']] = $temp; - $mtdAItemAttribute['section'][$result['section']] = $temp; - $mtdAItemAttribute['sales_group'][$result['sales_group']] = $temp; + $mtdAItemAttribute['segment'][$result['segment']] = $temp; + $mtdAItemAttribute['section'][$result['section']] = $temp; + $mtdAItemAttribute['sales_group'][$result['sales_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) { - $ytdPYItemAttribute['segment'][$result['segment']]['net_sales'] += $temp['net_sales']; - $ytdPYItemAttribute['segment'][$result['segment']]['net_profit'] += $temp['net_profit']; - $ytdPYItemAttribute['section'][$result['section']]['net_sales'] += $temp['net_sales']; - $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_profit'] += $temp['net_profit']; + $ytdPYItemAttribute['segment'][$result['segment']]['net_sales'] += $temp['net_sales']; + $ytdPYItemAttribute['segment'][$result['segment']]['net_profit'] += $temp['net_profit']; + $ytdPYItemAttribute['section'][$result['section']]['net_sales'] += $temp['net_sales']; + $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_profit'] += $temp['net_profit']; $ytdPYItemAttribute['product_group'][$result['product_group']]['net_sales'] += $temp['net_sales']; $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_profit'] += $temp['net_profit']; + $ytdPYItemAttribute['product_type'][$result['product_type']]['net_sales'] += $temp['net_sales']; + $ytdPYItemAttribute['product_type'][$result['product_type']]['net_profit'] += $temp['net_profit']; } else { - $ytdAItemAttribute['segment'][$result['segment']]['net_sales'] += $temp['net_sales']; - $ytdAItemAttribute['segment'][$result['segment']]['net_profit'] += $temp['net_profit']; - $ytdAItemAttribute['section'][$result['section']]['net_sales'] += $temp['net_sales']; - $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_profit'] += $temp['net_profit']; + $ytdAItemAttribute['segment'][$result['segment']]['net_sales'] += $temp['net_sales']; + $ytdAItemAttribute['segment'][$result['segment']]['net_profit'] += $temp['net_profit']; + $ytdAItemAttribute['section'][$result['section']]['net_sales'] += $temp['net_sales']; + $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_profit'] += $temp['net_profit']; $ytdAItemAttribute['product_group'][$result['product_group']]['net_sales'] += $temp['net_sales']; $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_profit'] += $temp['net_profit']; + $ytdAItemAttribute['product_type'][$result['product_type']]['net_sales'] += $temp['net_sales']; + $ytdAItemAttribute['product_type'][$result['product_type']]['net_profit'] += $temp['net_profit']; } } } diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index a1380dc..8dabc02 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/Theme/Backend/Lang/Navigation.de.lang.php @@ -21,5 +21,5 @@ return ['Navigation' => [ 'Overview' => 'Übersicht', 'Products' => 'Produkte', 'Regions' => 'Regionen', - 'SalesRep' => 'Verkäufer', + 'SalesRep' => 'Verkäufer', ]]; diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index d466610..a728392 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -21,10 +21,10 @@ return ['Navigation' => [ 'Overview' => 'Overview', 'Products' => 'Products', 'Regions' => 'Regions', - 'YTD' => 'YTD', - 'MTD' => 'MTD', + 'YTD' => 'YTD', + 'MTD' => 'MTD', 'Monthly' => 'Monthly', - 'Annually' => 'Annually', - 'SalesRep' => 'Sales Reps', - 'SalesRep' => 'Sales Rep', + 'Annually' => 'Annually', + 'SalesReps' => 'Sales Reps', + 'SalesRep' => 'Sales Rep', ]]; diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 57ded14..78f2402 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -68,6 +68,6 @@ return ['SalesAnalysis' => [ 'America' => 'Amerika', 'Oceania' => 'Ozeanien', 'Africa' => 'Afrika', - 'SalesReps' => 'Verkäufer', - 'SalesRep' => 'Verkäufer', + 'SalesReps' => 'Verkäufer', + 'SalesRep' => 'Verkäufer', ]]; diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 509a250..8700c9d 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -68,9 +68,8 @@ return ['SalesAnalysis' => [ 'America' => 'America', 'Oceania' => 'Oceania', 'Africa' => 'Africa', - 'YTD' => 'YTD', - 'Monthly' => 'Monthly', - 'Annually' => 'Annually', - 'SalesReps' => 'Sales Reps', - 'SalesRep' => 'Sales Rep', + 'Monthly' => 'Monthly', + 'Annually' => 'Annually', + 'SalesReps' => 'Sales Reps', + 'SalesRep' => 'Sales Rep', ]]; diff --git a/Theme/Backend/analysis-rep-annually.tpl.php b/Theme/Backend/analysis-rep-annually.tpl.php index 4274e05..9ab93b4 100755 --- a/Theme/Backend/analysis-rep-annually.tpl.php +++ b/Theme/Backend/analysis-rep-annually.tpl.php @@ -12,8 +12,6 @@ */ declare(strict_types=1); -use phpOMS\Localization\ISO3166CharEnum; -use phpOMS\Localization\ISO3166NameEnum; use phpOMS\Stdlib\Base\FloatInt; /** diff --git a/Theme/Backend/analysis-rep-monthly.tpl.php b/Theme/Backend/analysis-rep-monthly.tpl.php index b3e29e9..4293a21 100755 --- a/Theme/Backend/analysis-rep-monthly.tpl.php +++ b/Theme/Backend/analysis-rep-monthly.tpl.php @@ -12,10 +12,6 @@ */ declare(strict_types=1); -use phpOMS\Localization\ISO3166CharEnum; -use phpOMS\Localization\ISO3166NameEnum; -use phpOMS\Stdlib\Base\FloatInt; - /** * @var \phpOMS\Views\View $this */ diff --git a/Theme/Backend/analysis-rep-mtd.tpl.php b/Theme/Backend/analysis-rep-mtd.tpl.php index eeeecf6..72cd809 100755 --- a/Theme/Backend/analysis-rep-mtd.tpl.php +++ b/Theme/Backend/analysis-rep-mtd.tpl.php @@ -12,10 +12,6 @@ */ declare(strict_types=1); -use phpOMS\Localization\ISO3166CharEnum; -use phpOMS\Localization\ISO3166NameEnum; -use phpOMS\Stdlib\Base\FloatInt; - /** * @var \phpOMS\Views\View $this */ @@ -42,7 +38,7 @@ echo $this->data['nav-sub']->render(); $total = ['py' => 0, 'a' => 0]; foreach ($this->data['mtdAClientRep'] as $type => $values) : $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; ?> printHtml($this->data['salesRep'][$type]->code); ?> - printHtml($this->data['salesRep'][$type]->main->name1); ?> printHtml($this->data['salesRep'][$type]->main->name2); ?> @@ -86,7 +82,7 @@ echo $this->data['nav-sub']->render(); $total = ['py' => 0, 'a' => 0]; foreach ($this->data['mtdAClientRep'] as $type => $values) : $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; ?> printHtml($this->data['salesRep'][$type]->code); ?> - printHtml($this->data['salesRep'][$type]->main->name1); ?> printHtml($this->data['salesRep'][$type]->main->name2); ?> diff --git a/Theme/Backend/analysis-rep-ytd.tpl.php b/Theme/Backend/analysis-rep-ytd.tpl.php index e6ac1bf..135a047 100755 --- a/Theme/Backend/analysis-rep-ytd.tpl.php +++ b/Theme/Backend/analysis-rep-ytd.tpl.php @@ -12,10 +12,6 @@ */ declare(strict_types=1); -use phpOMS\Localization\ISO3166CharEnum; -use phpOMS\Localization\ISO3166NameEnum; -use phpOMS\Stdlib\Base\FloatInt; - /** * @var \phpOMS\Views\View $this */ @@ -42,7 +38,7 @@ echo $this->data['nav-sub']->render(); $total = ['py' => 0, 'a' => 0]; foreach ($this->data['ytdAClientRep'] as $type => $values) : $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; ?> printHtml($this->data['salesRep'][$type]->code); ?> - printHtml($this->data['salesRep'][$type]->main->name1); ?> printHtml($this->data['salesRep'][$type]->main->name2); ?> @@ -86,7 +82,7 @@ echo $this->data['nav-sub']->render(); $total = ['py' => 0, 'a' => 0]; foreach ($this->data['ytdAClientRep'] as $type => $values) : $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; ?> printHtml($this->data['salesRep'][$type]->code); ?> - printHtml($this->data['salesRep'][$type]->main->name1); ?> printHtml($this->data['salesRep'][$type]->main->name2); ?> diff --git a/info.json b/info.json index ae850a7..42053cf 100755 --- a/info.json +++ b/info.json @@ -12,7 +12,7 @@ }, "creator": { "name": "Jingga", - "website": "jingga.app" + "website": "https://jingga.app" }, "description": "Sales module.", "directory": "SalesAnalysis",