From 91fe5b5af85b493985bfa9afb0fb0e201c9b8c7a Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 26 Jan 2024 22:54:00 +0000 Subject: [PATCH] auto fixes + some impl. --- Admin/Routes/Web/Backend.php | 12 +- Theme/Backend/Lang/en.lang.php | 198 +++++++++++++------------- Theme/Backend/analysis-region.tpl.php | 4 +- 3 files changed, 107 insertions(+), 107 deletions(-) diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 409c886..2e22635 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -6,7 +6,7 @@ use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; return [ - '^.*/sales/analysis(\?.*|$)$' => [ + '^.*/sales/analysis(\?.*$|$)' => [ [ 'dest' => '\Modules\SalesAnalysis\Controller\BackendController:viewDashboard', 'verb' => RouteVerb::GET, @@ -18,7 +18,7 @@ return [ ], ], - '^.*/sales/analysis/bill(\?.*|$)$' => [ + '^.*/sales/analysis/bill(\?.*$|$)' => [ [ 'dest' => '\Modules\SalesAnalysis\Controller\BackendController:viewBillAnalysis', 'verb' => RouteVerb::GET, @@ -29,7 +29,7 @@ return [ ], ], ], - '^.*/sales/analysis/rep(\?.*|$)$' => [ + '^.*/sales/analysis/rep(\?.*$|$)' => [ [ 'dest' => '\Modules\SalesAnalysis\Controller\BackendController:viewSalesRepAnalysis', 'verb' => RouteVerb::GET, @@ -40,7 +40,7 @@ return [ ], ], ], - '^.*/sales/analysis/region(\?.*|$)$' => [ + '^.*/sales/analysis/region(\?.*$|$)' => [ [ 'dest' => '\Modules\SalesAnalysis\Controller\BackendController:viewRegionAnalysis', 'verb' => RouteVerb::GET, @@ -51,7 +51,7 @@ return [ ], ], ], - '^.*/sales/analysis/client(\?.*|$)$' => [ + '^.*/sales/analysis/client(\?.*$|$)' => [ [ 'dest' => '\Modules\SalesAnalysis\Controller\BackendController:viewClientAnalysis', 'verb' => RouteVerb::GET, @@ -62,7 +62,7 @@ return [ ], ], ], - '^.*/sales/analysis/item(\?.*|$)$' => [ + '^.*/sales/analysis/item(\?.*$|$)' => [ [ 'dest' => '\Modules\SalesAnalysis\Controller\BackendController:viewItemSalesAnalysis', 'verb' => RouteVerb::GET, diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 1320b8c..c5e5e07 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', - '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', - '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', + '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', + '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', ]]; diff --git a/Theme/Backend/analysis-region.tpl.php b/Theme/Backend/analysis-region.tpl.php index d4c28b4..615376f 100755 --- a/Theme/Backend/analysis-region.tpl.php +++ b/Theme/Backend/analysis-region.tpl.php @@ -661,7 +661,7 @@ echo $this->data['nav']->render(); data['ytdADomesticExport'] as $values) { - $temp[] =$values['net_profit'] / 10000; + $temp[] = $values['net_profit'] / 10000; } echo \implode(',', $temp); ?> @@ -1097,7 +1097,7 @@ echo $this->data['nav']->render(); data['ytdAContinent'] as $values) { - $temp[] =$values['net_profit'] / 10000; + $temp[] = $values['net_profit'] / 10000; } echo \implode(',', $temp); ?>