From 479fd5b05547bb4050e82e0afd6db6547b4a76e8 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 2 Jan 2024 23:34:18 +0000 Subject: [PATCH] update --- Controller/BackendController.php | 11 +- Controller/Controller.js | 8 +- Models/ClientMapper.php | 18 +- Models/GeneralMapper.php | 21 +- Models/ItemMapper.php | 18 +- Models/PermissionCategory.php | 2 +- Models/RegionMapper.php | 38 ++-- Theme/Backend/Lang/en.lang.php | 194 +++++++++--------- Theme/Backend/analysis-client.tpl.php | 8 +- Theme/Backend/analysis-item.tpl.php | 18 +- .../analysis-overview-dashboard.tpl.php | 11 +- Theme/Backend/analysis-region.tpl.php | 68 +++--- Theme/Backend/analysis-rep.tpl.php | 2 +- 13 files changed, 207 insertions(+), 210 deletions(-) diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 437f522..5ce0674 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -21,7 +21,6 @@ use Modules\SalesAnalysis\Models\ItemMapper; use Modules\SalesAnalysis\Models\RegionMapper; use phpOMS\Asset\AssetType; use phpOMS\Contract\RenderableInterface; -use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\Localization\ISO3166CharEnum; use phpOMS\Localization\ISO3166NameEnum; use phpOMS\Localization\ISO3166TwoEnum; @@ -143,7 +142,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -332,7 +331,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -360,7 +359,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -444,7 +443,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response @@ -619,7 +618,7 @@ final class BackendController extends Controller } /** - * Routing end-point for application behaviour. + * Routing end-point for application behavior. * * @param RequestAbstract $request Request * @param ResponseAbstract $response Response diff --git a/Controller/Controller.js b/Controller/Controller.js index 8eccbaf..11b8c79 100755 --- a/Controller/Controller.js +++ b/Controller/Controller.js @@ -42,16 +42,16 @@ omsApp.Modules.SalesAnalysis = class { const data = JSON.parse(chart.getAttribute('data-chart')); if (data.type === 'choropleth') { - const parts = data.mapurl.split('/'); + const parts = data.mapurl.split('/'); const fileName = parts[parts.length - 1]; - const mapName = fileName.replace('.topo.json', ''); + const mapName = fileName.replace('.topo.json', ''); fetch(data.mapurl).then((r) => r.json()).then((d) => { const countries = ChartGeo.topojson.feature(d, d.objects[mapName]).features; data.data.labels = countries.map((c) => c.properties.name); - const vals = {}; + const vals = {}; const length = data.data.datasets[0].data.length; for (let i = 0; i < length; ++i) { vals[data.data.datasets[0].data[i].id] = data.data.datasets[0].data[i].value; @@ -62,7 +62,7 @@ omsApp.Modules.SalesAnalysis = class { )); const myChart = new Chart(chart.getContext('2d'), data); - }); + }); } else { const myChart = new Chart(chart.getContext('2d'), data); } diff --git a/Models/ClientMapper.php b/Models/ClientMapper.php index 4d03645..c2493bf 100755 --- a/Models/ClientMapper.php +++ b/Models/ClientMapper.php @@ -19,7 +19,7 @@ use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\Stdlib\Base\SmartDateTime; /** - * Permision state enum. + * Permission category enum. * * @package Modules\SalesAnalysis\Models * @license OMS License 1.0 @@ -84,10 +84,10 @@ class ClientMapper extends DataMapperFactory $oldIndex = 1; $period = 1; - $mtdAClientAttribute = []; + $mtdAClientAttribute = []; $mtdPYClientAttribute = []; - $ytdAClientAttribute = []; + $ytdAClientAttribute = []; $ytdPYClientAttribute = []; foreach ($results as $result) { @@ -106,7 +106,7 @@ class ClientMapper extends DataMapperFactory // indexed according to the fiscal year $temp = [ - 'net_sales' => (int) $result['netsales'], + 'net_sales' => (int) $result['netsales'], 'net_profit' => (int) $result['netprofit'], ]; @@ -125,13 +125,13 @@ class ClientMapper extends DataMapperFactory if ($monthIndex <= $endCurrentIndex) { if (!isset($ytdPYClientAttribute[$result['clientmgmt_attr_type_name']])) { $ytdPYClientAttribute[$result['clientmgmt_attr_type_name']] = [ - 'net_sales' => 0, + 'net_sales' => 0, 'net_profit' => 0, 'value_l11n' => $result['clientmgmt_attr_value_l11n_title'], ]; $ytdAClientAttribute[$result['clientmgmt_attr_type_name']] = [ - 'net_sales' => 0, + 'net_sales' => 0, 'net_profit' => 0, 'value_l11n' => $result['clientmgmt_attr_value_l11n_title'], ]; @@ -147,11 +147,11 @@ class ClientMapper extends DataMapperFactory } } - return [ + return [ $mtdAClientAttribute, $mtdPYClientAttribute, $ytdAClientAttribute, $ytdPYClientAttribute, - ]; + ]; } -} \ No newline at end of file +} diff --git a/Models/GeneralMapper.php b/Models/GeneralMapper.php index aea75ee..5689922 100755 --- a/Models/GeneralMapper.php +++ b/Models/GeneralMapper.php @@ -19,7 +19,7 @@ use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\Stdlib\Base\SmartDateTime; /** - * Permision state enum. + * Permission category enum. * * @package Modules\SalesAnalysis\Models * @license OMS License 1.0 @@ -64,15 +64,15 @@ class GeneralMapper extends DataMapperFactory $monthlySales = []; for ($i = 1; $i < 3; ++$i) { $monthlySales[$i] = \array_fill(0, 12, [ - 'net_sales' => null, + 'net_sales' => null, 'net_profit' => null, ]); } - $mtdA = ['net_sales' => 0, 'net_profit' => 0]; + $mtdA = ['net_sales' => 0, 'net_profit' => 0]; $mtdPY = ['net_sales' => 0, 'net_profit' => 0]; - $ytdA = ['net_sales' => 0, 'net_profit' => 0]; + $ytdA = ['net_sales' => 0, 'net_profit' => 0]; $ytdPY = ['net_sales' => 0, 'net_profit' => 0]; foreach ($results as $result) { @@ -91,7 +91,7 @@ class GeneralMapper extends DataMapperFactory // indexed according to the fiscal year $monthlySales[$period][$monthIndex - 1] = [ - 'net_sales' => (int) $result['netsales'], + 'net_sales' => (int) $result['netsales'], 'net_profit' => (int) $result['netprofit'], ]; @@ -117,7 +117,7 @@ class GeneralMapper extends DataMapperFactory return [ $mtdA, $mtdPY, $ytdA, $ytdPY, - $monthlySales + $monthlySales, ]; } @@ -126,7 +126,6 @@ class GeneralMapper extends DataMapperFactory \DateTime $endCurrent, int $businessStart = 1 ) : array { - $query = new Builder(self::$db); $query->raw( 'SELECT @@ -151,9 +150,9 @@ class GeneralMapper extends DataMapperFactory $annualSales = []; for ($i = 1; $i < 11; ++$i) { $annualSales[$i] = [ - 'net_sales' => null, + 'net_sales' => null, 'net_profit' => null, - 'year' => $historyStart->format('Y'), + 'year' => $historyStart->format('Y'), ]; $historyStart->smartModify(1); @@ -184,10 +183,10 @@ class GeneralMapper extends DataMapperFactory $annualSales[$period]['net_sales'] ??= 0; $annualSales[$period]['net_profit'] ??= 0; - $annualSales[$period]['net_sales'] += (int) $result['netsales']; + $annualSales[$period]['net_sales'] += (int) $result['netsales']; $annualSales[$period]['net_profit'] += (int) $result['netprofit']; } return $annualSales; } -} \ No newline at end of file +} diff --git a/Models/ItemMapper.php b/Models/ItemMapper.php index c025282..b6801f9 100755 --- a/Models/ItemMapper.php +++ b/Models/ItemMapper.php @@ -19,7 +19,7 @@ use phpOMS\DataStorage\Database\Query\Builder; use phpOMS\Stdlib\Base\SmartDateTime; /** - * Permision state enum. + * Permission category enum. * * @package Modules\SalesAnalysis\Models * @license OMS License 1.0 @@ -86,10 +86,10 @@ class ItemMapper extends DataMapperFactory $oldIndex = 1; $period = 1; - $mtdAItemAttribute = []; + $mtdAItemAttribute = []; $mtdPYItemAttribute = []; - $ytdAItemAttribute = []; + $ytdAItemAttribute = []; $ytdPYItemAttribute = []; foreach ($results as $result) { @@ -108,7 +108,7 @@ class ItemMapper extends DataMapperFactory // indexed according to the fiscal year $temp = [ - 'net_sales' => (int) $result['netsales'], + 'net_sales' => (int) $result['netsales'], 'net_profit' => (int) $result['netprofit'], ]; @@ -127,13 +127,13 @@ class ItemMapper extends DataMapperFactory if ($monthIndex <= $endCurrentIndex) { if (!isset($ytdPYItemAttribute[$result['itemmgmt_attr_type_name']])) { $ytdPYItemAttribute[$result['itemmgmt_attr_type_name']] = [ - 'net_sales' => 0, + 'net_sales' => 0, 'net_profit' => 0, 'value_l11n' => $result['itemmgmt_attr_value_l11n_title'], ]; $ytdAItemAttribute[$result['itemmgmt_attr_type_name']] = [ - 'net_sales' => 0, + 'net_sales' => 0, 'net_profit' => 0, 'value_l11n' => $result['itemmgmt_attr_value_l11n_title'], ]; @@ -149,11 +149,11 @@ class ItemMapper extends DataMapperFactory } } - return [ + return [ $mtdAItemAttribute, $mtdPYItemAttribute, $ytdAItemAttribute, $ytdPYItemAttribute, - ]; + ]; } -} \ No newline at end of file +} diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index 14fff13..0bbc058 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -17,7 +17,7 @@ namespace Modules\SalesAnalysis\Models; use phpOMS\Stdlib\Base\Enum; /** - * Permision state enum. + * Permission category enum. * * @package Modules\SalesAnalysis\Models * @license OMS License 1.0 diff --git a/Models/RegionMapper.php b/Models/RegionMapper.php index 204dbf0..dc3fb8f 100755 --- a/Models/RegionMapper.php +++ b/Models/RegionMapper.php @@ -20,7 +20,7 @@ use phpOMS\Localization\ISO3166TwoEnum; use phpOMS\Stdlib\Base\SmartDateTime; /** - * Permision state enum. + * Permission category enum. * * @package Modules\SalesAnalysis\Models * @license OMS License 1.0 @@ -69,8 +69,8 @@ class RegionMapper extends DataMapperFactory $monthlySales = []; - $mtd = []; - $ytd = []; + $mtd = []; + $ytd = []; foreach ($results as $result) { $monthIndex = SmartDateTime::calculateMonthIndex((int) $result['salesmonth'], $businessStart); @@ -86,7 +86,7 @@ class RegionMapper extends DataMapperFactory for ($i = 1; $i < 3; ++$i) { $monthlySales[$result['address_country']][$i] = \array_fill(1, 12, [ - 'net_sales' => null, + 'net_sales' => null, 'net_profit' => null, ]); } @@ -94,7 +94,7 @@ class RegionMapper extends DataMapperFactory // indexed according to the fiscal year $monthlySales[$result['address_country']][$monthIndex] = [ - 'net_sales' => (int) $result['netsales'], + 'net_sales' => (int) $result['netsales'], 'net_profit' => (int) $result['netprofit'], ]; @@ -167,7 +167,7 @@ class RegionMapper extends DataMapperFactory if (!isset($annualCustomer[$result['address_country']])) { for ($i = 1; $i < 11; ++$i) { $annualCustomer[$result['address_country']][$i] = [ - 'client_count' => 0 + 'client_count' => 0, ]; $historyStart->smartModify(1); @@ -223,10 +223,10 @@ class RegionMapper extends DataMapperFactory $oldIndex = 1; $period = 1; - $mtdAClientCountry = []; + $mtdAClientCountry = []; $mtdPYClientCountry = []; - $ytdAClientCountry = []; + $ytdAClientCountry = []; $ytdPYClientCountry = []; foreach ($results as $result) { @@ -274,7 +274,7 @@ class RegionMapper extends DataMapperFactory if ($period === 1) { $ytdPYClientCountry[$result['address_country']]['client_count'] += $temp['client_count']; } else { - $ytdAClientCountry[$result['address_country']]['client_count'] += $temp['client_count']; + $ytdAClientCountry[$result['address_country']]['client_count'] += $temp['client_count']; } } } @@ -317,7 +317,7 @@ class RegionMapper extends DataMapperFactory $results = $query->execute()->fetchAll(\PDO::FETCH_ASSOC); - $sales = []; + $sales = []; $period = 0; foreach ($results as $result) { @@ -333,9 +333,9 @@ class RegionMapper extends DataMapperFactory if (!isset($sales[$result['address_country']])) { for ($i = 1; $i < 11; ++$i) { $sales[$result['address_country']][$i] = [ - 'net_sales' => 0, + 'net_sales' => 0, 'net_profit' => 0, - 'year' => $period === 0 ? 'PY' : 'A', + 'year' => $period === 0 ? 'PY' : 'A', ]; } } @@ -387,10 +387,10 @@ class RegionMapper extends DataMapperFactory $oldIndex = 1; $period = 1; - $mtdAClientCountry = []; + $mtdAClientCountry = []; $mtdPYClientCountry = []; - $ytdAClientCountry = []; + $ytdAClientCountry = []; $ytdPYClientCountry = []; foreach ($results as $result) { @@ -409,7 +409,7 @@ class RegionMapper extends DataMapperFactory // indexed according to the fiscal year $temp = [ - 'net_sales' => (int) $result['netsales'], + 'net_sales' => (int) $result['netsales'], 'net_profit' => (int) $result['netprofit'], ]; @@ -428,12 +428,12 @@ class RegionMapper extends DataMapperFactory if ($monthIndex <= $endCurrentIndex) { if (!isset($ytdPYClientCountry[$result['address_country']])) { $ytdPYClientCountry[$result['address_country']] = [ - 'net_sales' => 0, + 'net_sales' => 0, 'net_profit' => 0, ]; $ytdAClientCountry[$result['address_country']] = [ - 'net_sales' => 0, + 'net_sales' => 0, 'net_profit' => 0, ]; } @@ -475,7 +475,7 @@ class RegionMapper extends DataMapperFactory foreach ($definitions as $r => $c) { if (\in_array($country, $c)) { foreach ($columns as $column) { - $regions[$r][$column] += $data[$column]; + $regions[$r][$column] += $data[$column]; } $found = true; @@ -484,7 +484,7 @@ class RegionMapper extends DataMapperFactory if (!$found) { foreach ($columns as $column) { - $regions['Other'][$column] += $data[$column]; + $regions['Other'][$column] += $data[$column]; } } } diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 1e3a8ad..1320b8c 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -13,103 +13,103 @@ declare(strict_types=1); return ['SalesAnalysis' => [ - 'ItemAttribute' => 'Item Attribute', + 'ItemAttribute' => 'Item Attribute', 'ClientAttribute' => 'Client Attribute', - 'SalesRegion' => 'Sales Region', - 'Customers' => 'Customers', - 'Months' => 'Months', - 'Total' => 'Total', - 'Year' => 'Year', - 'Month' => 'Month', - 'A' => 'A', - 'PY' => 'PY', - 'B' => 'B', - 'All' => 'All', - 'New' => 'New', - 'Lost' => 'Lost', - 'Product' => 'Product', - 'Continent' => 'Continent', - 'SalesPY' => 'Sales PY', - 'SalesB' => 'Sales B', - 'SalesA' => 'Sales A', - 'ProfitPY' => 'Profit PY', - 'ProfitB' => 'Profit B', - 'ProfitA' => 'Profit A', - 'DiffPY' => 'Δ PY', - 'DiffB' => 'Δ B', - 'Data' => 'Data', - 'Actual' => 'Actual', - 'Budget' => 'Budget', - 'Segment' => 'Segment', - 'Section' => 'Section', - 'Group' => 'Group', - 'Region' => 'Region', - 'Filter' => 'Filter', - 'Country' => 'Country', - 'Category' => 'Category', - 'General' => 'General', - 'MTD' => 'MTD', - 'Other' => 'Other', - 'YTD' => 'YTD', - 'GrossProfit' => 'Gross Profit', - 'SalesProfit' => 'Sales / Profit', - 'monthly' => 'monthly', - 'annually' => 'annually', - 'Profit' => 'Profit', - 'Start' => 'Start', - 'End' => 'End', - 'Sales' => 'Sales', - 'Client' => 'Client', - 'Clients' => 'Clients', - 'Item' => 'Item', - 'World' => 'World', - 'Africa' => 'Africa', - 'America' => 'America', + 'SalesRegion' => 'Sales Region', + 'Customers' => 'Customers', + 'Months' => 'Months', + 'Total' => 'Total', + 'Year' => 'Year', + 'Month' => 'Month', + 'A' => 'A', + 'PY' => 'PY', + 'B' => 'B', + 'All' => 'All', + 'New' => 'New', + 'Lost' => 'Lost', + 'Product' => 'Product', + 'Continent' => 'Continent', + 'SalesPY' => 'Sales PY', + 'SalesB' => 'Sales B', + 'SalesA' => 'Sales A', + 'ProfitPY' => 'Profit PY', + 'ProfitB' => 'Profit B', + 'ProfitA' => 'Profit A', + 'DiffPY' => 'Δ PY', + 'DiffB' => 'Δ B', + 'Data' => 'Data', + 'Actual' => 'Actual', + 'Budget' => 'Budget', + 'Segment' => 'Segment', + 'Section' => 'Section', + 'Group' => 'Group', + 'Region' => 'Region', + 'Filter' => 'Filter', + 'Country' => 'Country', + 'Category' => 'Category', + 'General' => 'General', + 'MTD' => 'MTD', + 'Other' => 'Other', + 'YTD' => 'YTD', + 'GrossProfit' => 'Gross Profit', + 'SalesProfit' => 'Sales / Profit', + 'monthly' => 'monthly', + 'annually' => 'annually', + 'Profit' => 'Profit', + 'Start' => 'Start', + 'End' => 'End', + 'Sales' => 'Sales', + 'Client' => 'Client', + 'Clients' => 'Clients', + 'Item' => 'Item', + 'World' => 'World', + 'Africa' => 'Africa', + 'America' => 'America', 'DomesticExport' => 'Domestic & Export', - 'Oceania' => 'Oceania', - 'Analysis' => 'Analysis', - 'Asia' => 'Asia', - 'Change' => 'Change', - 'ChangeAcc' => 'Change Acc.', - 'Charts' => 'Charts', - 'Comparison' => 'Comparison', - 'Continents' => 'Continents', - 'CurrentMonth' => 'Current Month', - 'CurrentYear' => 'Current Year', - 'CurrentYearAcc' => 'Current Year Acc.', - 'Customers' => 'Customers', - 'Data' => 'Data', - 'Database' => 'Database', - 'Day' => 'Day', - 'Developed' => 'Developed', - 'Developed/Undeveloped' => 'Developed/Undeveloped', - 'Development' => 'Development', - 'Domestic' => 'Domestic', - 'Domestic/Export' => 'Domestic/Export', - 'Employees' => 'Employees', - 'Europe' => 'Europe', - 'Export' => 'Export', - 'Forecast' => 'Forecast', - 'Frequency' => 'Frequency', - 'Interval' => 'Interval', - 'Invoices' => 'Invoices', - 'LastMonth' => 'Last Month', - 'LastYear' => 'Last Year', - 'LastYearAcc' => 'Last Year Acc.', - 'Marketing' => 'Marketing', - 'Misc' => 'Misc', - 'Month' => 'Month', - 'Current' => 'Current', - 'Analyze' => 'Analyze', - 'Overview' => 'Overview', - 'Products' => 'Products', - 'Regions' => 'Regions', - 'To' => 'To', - 'Today' => 'Today', - 'Top10' => 'Top 10', - 'Total' => 'Total', - 'Type' => 'Type', - 'Undeveloped' => 'Undeveloped', - 'Year' => 'Year', - 'Yesterday' => 'Yesterday', + 'Oceania' => 'Oceania', + 'Analysis' => 'Analysis', + 'Asia' => 'Asia', + 'Change' => 'Change', + 'ChangeAcc' => 'Change Acc.', + 'Charts' => 'Charts', + 'Comparison' => 'Comparison', + 'Continents' => 'Continents', + 'CurrentMonth' => 'Current Month', + 'CurrentYear' => 'Current Year', + 'CurrentYearAcc' => 'Current Year Acc.', + 'Customers' => 'Customers', + 'Data' => 'Data', + 'Database' => 'Database', + 'Day' => 'Day', + 'Developed' => 'Developed', + 'Developed/Undeveloped' => 'Developed/Undeveloped', + 'Development' => 'Development', + 'Domestic' => 'Domestic', + 'Domestic/Export' => 'Domestic/Export', + 'Employees' => 'Employees', + 'Europe' => 'Europe', + 'Export' => 'Export', + 'Forecast' => 'Forecast', + 'Frequency' => 'Frequency', + 'Interval' => 'Interval', + 'Invoices' => 'Invoices', + 'LastMonth' => 'Last Month', + 'LastYear' => 'Last Year', + 'LastYearAcc' => 'Last Year Acc.', + 'Marketing' => 'Marketing', + 'Misc' => 'Misc', + 'Month' => 'Month', + 'Current' => 'Current', + 'Analyze' => 'Analyze', + 'Overview' => 'Overview', + 'Products' => 'Products', + 'Regions' => 'Regions', + 'To' => 'To', + 'Today' => 'Today', + 'Top10' => 'Top 10', + 'Total' => 'Total', + 'Type' => 'Type', + 'Undeveloped' => 'Undeveloped', + 'Year' => 'Year', + 'Yesterday' => 'Yesterday', ]]; diff --git a/Theme/Backend/analysis-client.tpl.php b/Theme/Backend/analysis-client.tpl.php index 60ee069..80e0c1a 100755 --- a/Theme/Backend/analysis-client.tpl.php +++ b/Theme/Backend/analysis-client.tpl.php @@ -21,10 +21,10 @@ echo $this->data['nav']->render();
    -
    • -
    • -
    • - +
  • +
  • +
  • +
diff --git a/Theme/Backend/analysis-item.tpl.php b/Theme/Backend/analysis-item.tpl.php index ae24a52..d0f0dbb 100755 --- a/Theme/Backend/analysis-item.tpl.php +++ b/Theme/Backend/analysis-item.tpl.php @@ -21,11 +21,11 @@ echo $this->data['nav']->render();
    -
    • -
    • -
    • -
    • - +
  • +
  • +
  • +
  • +
@@ -36,7 +36,7 @@ echo $this->data['nav']->render();
getHtml('Segment'); ?>
- +
getHtml('Category'); ?> @@ -82,7 +82,7 @@ echo $this->data['nav']->render();
getHtml('Section'); ?>
- +
getHtml('Category'); ?> @@ -128,7 +128,7 @@ echo $this->data['nav']->render();
getHtml('Group'); ?>
- +
getHtml('Category'); ?> @@ -174,7 +174,7 @@ echo $this->data['nav']->render();
getHtml('Type'); ?>
- +
getHtml('Category'); ?> diff --git a/Theme/Backend/analysis-overview-dashboard.tpl.php b/Theme/Backend/analysis-overview-dashboard.tpl.php index eabed68..4493d5a 100755 --- a/Theme/Backend/analysis-overview-dashboard.tpl.php +++ b/Theme/Backend/analysis-overview-dashboard.tpl.php @@ -13,7 +13,6 @@ declare(strict_types=1); use phpOMS\Localization\ISO3166NameEnum; -use phpOMS\Localization\Money; use phpOMS\Uri\UriFactory; /** @@ -239,7 +238,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Month'); ?> @@ -386,7 +385,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Year'); ?> @@ -416,7 +415,7 @@ echo $this->data['nav']->render(); getHtml('ItemAttribute'); ?>
- +
getHtml('Category'); ?> @@ -456,7 +455,7 @@ echo $this->data['nav']->render(); getHtml('ClientAttribute'); ?>
- +
getHtml('Category'); ?> @@ -496,7 +495,7 @@ echo $this->data['nav']->render(); getHtml('Country'); ?>
- +
getHtml('Country'); ?> diff --git a/Theme/Backend/analysis-region.tpl.php b/Theme/Backend/analysis-region.tpl.php index 70ac740..d4c28b4 100755 --- a/Theme/Backend/analysis-region.tpl.php +++ b/Theme/Backend/analysis-region.tpl.php @@ -24,11 +24,11 @@ echo $this->data['nav']->render();
    -
    • -
    • -
    • -
    • - +
  • +
  • +
  • +
  • +
@@ -51,7 +51,7 @@ echo $this->data['nav']->render(); $temp = []; foreach ($this->data['ytdAClientCountry'] as $lang => $values) { $temp[] = '{"id": "' . ISO3166CharEnum::getBy2Code($lang) . '", "value": ' . ($values['net_sales'] / 10000) . '}'; - }; ?> + } ?> ] }] @@ -85,7 +85,7 @@ echo $this->data['nav']->render(); getHtml('Country'); ?>
- +
getHtml('Country'); ?> @@ -273,7 +273,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Month'); ?> @@ -463,7 +463,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Month'); ?> @@ -507,7 +507,7 @@ echo $this->data['nav']->render();
-
getHtml('Sales') ?> (getHtml('YTD'); ?>) - getHtml('DomesticExport') ?>
+
getHtml('Sales'); ?> (getHtml('YTD'); ?>) - getHtml('DomesticExport'); ?>
render(); chevron_right
- +
getHtml('Region'); ?> @@ -582,7 +582,7 @@ echo $this->data['nav']->render(); data['annualDomesticExport'] as $region => $values) : - echo ($first ? '' : ','); + echo($first ? '' : ','); $first = false; ?>{ "label": "printHtml($region); ?>", @@ -614,7 +614,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Region'); ?> @@ -648,7 +648,7 @@ echo $this->data['nav']->render();
-
getHtml('Profit') ?> (getHtml('YTD'); ?>) - getHtml('DomesticExport') ?>
+
getHtml('Profit'); ?> (getHtml('YTD'); ?>) - getHtml('DomesticExport'); ?>
render(); chevron_right
- +
getHtml('Region'); ?> @@ -723,7 +723,7 @@ echo $this->data['nav']->render(); data['annualDomesticExport'] as $region => $values) : - echo ($first ? '' : ','); + echo($first ? '' : ','); $first = false; ?>{ "label": "printHtml($region); ?>", @@ -765,7 +765,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Region'); ?> @@ -799,7 +799,7 @@ echo $this->data['nav']->render();
-
getHtml('Clients') ?> (getHtml('YTD'); ?>) - getHtml('DomesticExport') ?>
+
getHtml('Clients'); ?> (getHtml('YTD'); ?>) - getHtml('DomesticExport'); ?>
render(); chevron_right
- +
getHtml('Region'); ?> @@ -874,7 +874,7 @@ echo $this->data['nav']->render(); data['annualDomesticExportCount'] as $region => $values) : - echo ($first ? '' : ','); + echo($first ? '' : ','); $first = false; ?>{ "label": "printHtml($region); ?>", @@ -906,7 +906,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Region'); ?> @@ -943,7 +943,7 @@ echo $this->data['nav']->render();
-
getHtml('Sales') ?> (getHtml('YTD'); ?>) - getHtml('Continent') ?>
+
getHtml('Sales'); ?> (getHtml('YTD'); ?>) - getHtml('Continent'); ?>
render(); chevron_right
- +
getHtml('Region'); ?> @@ -1018,7 +1018,7 @@ echo $this->data['nav']->render(); data['annualContinent'] as $region => $values) : - echo ($first ? '' : ','); + echo($first ? '' : ','); $first = false; ?>{ "label": "getHtml($region); ?>", @@ -1050,7 +1050,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Region'); ?> @@ -1084,7 +1084,7 @@ echo $this->data['nav']->render();
-
getHtml('Profit') ?> (getHtml('YTD'); ?>) - getHtml('Continent') ?>
+
getHtml('Profit'); ?> (getHtml('YTD'); ?>) - getHtml('Continent'); ?>
render(); chevron_right
- +
getHtml('Region'); ?> @@ -1159,7 +1159,7 @@ echo $this->data['nav']->render(); data['annualContinent'] as $region => $values) : - echo ($first ? '' : ','); + echo($first ? '' : ','); $first = false; ?>{ "label": "getHtml($region); ?>", @@ -1201,7 +1201,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Region'); ?> @@ -1235,7 +1235,7 @@ echo $this->data['nav']->render();
-
getHtml('Clients') ?> (getHtml('YTD'); ?>) - getHtml('Continent') ?>
+
getHtml('Clients'); ?> (getHtml('YTD'); ?>) - getHtml('Continent'); ?>
render(); chevron_right
- +
getHtml('Region'); ?> @@ -1310,7 +1310,7 @@ echo $this->data['nav']->render(); data['annualContinentCount'] as $region => $values) : - echo ($first ? '' : ','); + echo($first ? '' : ','); $first = false; ?>{ "label": "printHtml($region); ?>", @@ -1342,7 +1342,7 @@ echo $this->data['nav']->render(); chevron_right
- +
getHtml('Region'); ?> @@ -1381,7 +1381,7 @@ echo $this->data['nav']->render();
getHtml('Sales'); ?>
- +
getHtml('Region'); ?> diff --git a/Theme/Backend/analysis-rep.tpl.php b/Theme/Backend/analysis-rep.tpl.php index 4307330..5bfd2b2 100755 --- a/Theme/Backend/analysis-rep.tpl.php +++ b/Theme/Backend/analysis-rep.tpl.php @@ -21,7 +21,7 @@ echo $this->data['nav']->render();
    -
    • +