diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json old mode 100644 new mode 100755 diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php old mode 100644 new mode 100755 diff --git a/Admin/Installer.php b/Admin/Installer.php old mode 100644 new mode 100755 diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php old mode 100644 new mode 100755 diff --git a/Admin/Status.php b/Admin/Status.php old mode 100644 new mode 100755 diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php old mode 100644 new mode 100755 diff --git a/Admin/Updater.php b/Admin/Updater.php old mode 100644 new mode 100755 diff --git a/Controller/BackendController.php b/Controller/BackendController.php old mode 100644 new mode 100755 diff --git a/Controller/Controller.js b/Controller/Controller.js old mode 100644 new mode 100755 diff --git a/Controller/Controller.php b/Controller/Controller.php old mode 100644 new mode 100755 diff --git a/Models/ClientMapper.php b/Models/ClientMapper.php old mode 100644 new mode 100755 diff --git a/Models/GeneralMapper.php b/Models/GeneralMapper.php old mode 100644 new mode 100755 index afdd720..964568d --- a/Models/GeneralMapper.php +++ b/Models/GeneralMapper.php @@ -163,8 +163,8 @@ class GeneralMapper extends DataMapperFactory $oldIndex = 1; // @todo: this calculation doesn't consider the start of the fiscal year - $period = ((((int) $results[0]['salesyear']) - ((int) $historyStart->format('Y'))) * 12 - - ((int) $results[0]['salesmonth']) + ((int) $historyStart->format('m'))) / 12 + 1; + $period = (int) (((((int) $results[0]['salesyear']) - ((int) $historyStart->format('Y'))) * 12 + - ((int) $results[0]['salesmonth']) + ((int) $historyStart->format('m'))) / 12 + 1); foreach ($results as $result) { $monthIndex = SmartDateTime::calculateMonthIndex((int) $result['salesmonth'], $businessStart); diff --git a/Models/ItemMapper.php b/Models/ItemMapper.php old mode 100644 new mode 100755 diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php old mode 100644 new mode 100755 diff --git a/Models/RegionMapper.php b/Models/RegionMapper.php old mode 100644 new mode 100755 index b454837..db145c2 --- a/Models/RegionMapper.php +++ b/Models/RegionMapper.php @@ -147,8 +147,8 @@ class RegionMapper extends DataMapperFactory $oldIndex = 1; // @todo: this calculation doesn't consider the start of the fiscal year - $period = ((((int) $results[0]['salesyear']) - ((int) $historyStart->format('Y'))) * 12 - - ((int) $results[0]['salesmonth']) + ((int) $historyStart->format('m'))) / 12 + 1; + $period = (int) (((((int) $results[0]['salesyear']) - ((int) $historyStart->format('Y'))) * 12 + - ((int) $results[0]['salesmonth']) + ((int) $historyStart->format('m'))) / 12 + 1); foreach ($results as $result) { $monthIndex = SmartDateTime::calculateMonthIndex((int) $result['salesmonth'], $businessStart); @@ -324,8 +324,8 @@ class RegionMapper extends DataMapperFactory $oldIndex = 1; // @todo: this calculation doesn't consider the start of the fiscal year - $period = ((((int) $results[0]['salesyear']) - ((int) $historyStart->format('Y'))) * 12 - - ((int) $results[0]['salesmonth']) + ((int) $historyStart->format('m'))) / 12 + 1; + $period = (int) (((((int) $results[0]['salesyear']) - ((int) $historyStart->format('Y'))) * 12 + - ((int) $results[0]['salesmonth']) + ((int) $historyStart->format('m'))) / 12 + 1); foreach ($results as $result) { $monthIndex = SmartDateTime::calculateMonthIndex((int) $result['salesmonth'], $businessStart); diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/analysis-bill.tpl.php b/Theme/Backend/analysis-bill.tpl.php index 5901c1e..e1d8bf1 100755 --- a/Theme/Backend/analysis-bill.tpl.php +++ b/Theme/Backend/analysis-bill.tpl.php @@ -12,9 +12,6 @@ */ declare(strict_types=1); -/* @todo: single month/quarter/fiscal year/calendar year */ -/* @todo: time range (<= 12 month = monthly view; else annual view/comparison) */ - /** * @var \phpOMS\Views\View $this */ diff --git a/Theme/Backend/analysis-client.tpl.php b/Theme/Backend/analysis-client.tpl.php index 7b1fd60..60ee069 100755 --- a/Theme/Backend/analysis-client.tpl.php +++ b/Theme/Backend/analysis-client.tpl.php @@ -12,12 +12,6 @@ */ declare(strict_types=1); -use phpOMS\Localization\Money; -use phpOMS\Utils\RnG\Name; - -/* @todo: single month/quarter/fiscal year/calendar year */ -/* @todo: time range (<= 12 month = monthly view; else annual view/comparison) */ - /** * @var \phpOMS\Views\View $this */ diff --git a/Theme/Backend/analysis-overview-dashboard.tpl.php b/Theme/Backend/analysis-overview-dashboard.tpl.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/analysis-overview-data.tpl.php b/Theme/Backend/analysis-overview-data.tpl.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/analysis-products-dashboard.tpl.php b/Theme/Backend/analysis-products-dashboard.tpl.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/analysis-products-data.tpl.php b/Theme/Backend/analysis-products-data.tpl.php old mode 100644 new mode 100755 diff --git a/Theme/Backend/analysis-region.tpl.php b/Theme/Backend/analysis-region.tpl.php index 21ca1cc..093a8f9 100755 --- a/Theme/Backend/analysis-region.tpl.php +++ b/Theme/Backend/analysis-region.tpl.php @@ -15,9 +15,6 @@ declare(strict_types=1); use phpOMS\Localization\ISO3166CharEnum; use phpOMS\Localization\ISO3166NameEnum; -/* @todo: single month/quarter/fiscal year/calendar year */ -/* @todo: time range (<= 12 month = monthly view; else annual view/comparison) */ - /** * @var \phpOMS\Views\View $this */ diff --git a/Theme/Backend/analysis-rep.tpl.php b/Theme/Backend/analysis-rep.tpl.php index 0789c90..4307330 100755 --- a/Theme/Backend/analysis-rep.tpl.php +++ b/Theme/Backend/analysis-rep.tpl.php @@ -12,9 +12,6 @@ */ declare(strict_types=1); -/* @todo: single month/quarter/fiscal year/calendar year */ -/* @todo: time range (<= 12 month = monthly view; else annual view/comparison) */ - /** * @var \phpOMS\Views\View $this */ diff --git a/img/module_teaser_small.png b/img/module_teaser_small.png old mode 100644 new mode 100755 diff --git a/info.json b/info.json old mode 100644 new mode 100755