Merge branch 'hotfix/3.7.2.3'

.travis.yml

@@ -7,7 +7,9 @@ php:
   - 7
 
 install:
-  - composer install
+  - composer selfupdate
+  - composer install --no-dev
+  - composer update
   - php artisan env
   - mv -v .env.testing .env
   - php artisan env

app/Helpers/Report/ReportHelper.php

@@ -175,10 +175,13 @@ class ReportHelper implements ReportHelperInterface
         /** @var FiscalHelperInterface $fiscalHelper */
         $fiscalHelper = app('FireflyIII\Helpers\FiscalHelperInterface');
         $start        = clone $date;
-        $end          = Carbon::now();
-        $months       = [];
+        $start->startOfMonth();
+        $end = Carbon::now();
+        $end->endOfMonth();
+        $months = [];
 
         while ($start <= $end) {
+            // current year:
             $year = $fiscalHelper->endOfFiscalYear($start)->year;
 
             if (!isset($months[$year])) {
@@ -193,6 +196,7 @@ class ReportHelper implements ReportHelperInterface
 
             $currentEnd = clone $start;
             $currentEnd->endOfMonth();
+
             $months[$year]['months'][] = [
                 'formatted' => $start->formatLocalized('%B %Y'),
                 'start'     => $start->format('Y-m-d'),
@@ -200,7 +204,10 @@ class ReportHelper implements ReportHelperInterface
                 'month'     => $start->month,
                 'year'      => $year,
             ];
-            $start->addMonth();
+
+            // to make the hop to the next month properly:
+            $start = clone $currentEnd;
+            $start->addDay();
         }
 
         return $months;

app/Http/Controllers/RuleController.php

@@ -341,6 +341,7 @@ class RuleController extends Controller
             $data = [
                 'rule_group_id'       => $repository->getFirstRuleGroup()->id,
                 'stop_processing'     => 0,
+                'user_id'             => Auth::user()->id,
                 'title'               => trans('firefly.default_rule_name'),
                 'description'         => trans('firefly.default_rule_description'),
                 'trigger'             => 'store-journal',
@@ -373,7 +374,7 @@ class RuleController extends Controller
 
         if ($repository->count() === 0) {
             $data = [
-                'user'        => Auth::user()->id,
+                'user_id'        => Auth::user()->id,
                 'title'       => trans('firefly.default_rule_group_name'),
                 'description' => trans('firefly.default_rule_group_description'),
             ];

app/Http/Controllers/RuleGroupController.php

@@ -139,7 +139,7 @@ class RuleGroupController extends Controller
         $data = [
             'title'       => $request->input('title'),
             'description' => $request->input('description'),
-            'user'        => Auth::user()->id,
+            'user_id'     => Auth::user()->id,
         ];
 
         $ruleGroup = $repository->store($data);

app/Repositories/RuleGroup/RuleGroupRepository.php

@@ -170,7 +170,7 @@ class RuleGroupRepository implements RuleGroupRepositoryInterface
 
         $newRuleGroup = new RuleGroup(
             [
-                'user_id'     => $data['user'],
+                'user_id'     => $data['user_id'],
                 'title'       => $data['title'],
                 'description' => $data['description'],
                 'order'       => ($order + 1),

app/Support/Navigation.php

@@ -70,7 +70,7 @@ class Navigation
             '1W'   => 'addWeek', 'week' => 'addWeek', 'weekly' => 'addWeek',
             '1M'   => 'addMonth', 'month' => 'addMonth', 'monthly' => 'addMonth',
             '3M'   => 'addMonths', 'quarter' => 'addMonths', 'quarterly' => 'addMonths', '6M' => 'addMonths', 'half-year' => 'addMonths',
-            'year' => 'addYear', 'yearly' => 'addYear',
+            'year' => 'addYear', 'yearly' => 'addYear', '1Y' => 'addYear',
         ];
         $modifierMap = [
             'quarter'   => 3,
@@ -82,6 +82,20 @@ class Navigation
 
         $subDay = ['week', 'weekly', '1W', 'month', 'monthly', '1M', '3M', 'quarter', 'quarterly', '6M', 'half-year', 'year', 'yearly'];
 
+        // if the range is custom, the end of the period
+        // is another X days (x is the difference between start)
+        // and end added to $theCurrentEnd
+        if ($repeatFreq == 'custom') {
+            /** @var Carbon $tStart */
+            $tStart = session('start', Carbon::now()->startOfMonth());
+            /** @var Carbon $tEnd */
+            $tEnd       = session('end', Carbon::now()->endOfMonth());
+            $diffInDays = $tStart->diffInDays($tEnd);
+            $currentEnd->addDays($diffInDays);
+
+            return $currentEnd;
+        }
+
         if (!isset($functionMap[$repeatFreq])) {
             throw new FireflyException('Cannot do endOfPeriod for $repeat_freq "' . $repeatFreq . '"');
         }
@@ -152,6 +166,7 @@ class Navigation
         $formatMap = [
             '1D'      => '%e %B %Y',
             'daily'   => '%e %B %Y',
+            'custom'  => '%e %B %Y',
             '1W'      => 'Week %W, %Y',
             'week'    => 'Week %W, %Y',
             'weekly'  => 'Week %W, %Y',
@@ -163,6 +178,7 @@ class Navigation
             '1Y'      => '%Y',
             'year'    => '%Y',
             'yearly'  => '%Y',
+            '6M'      => '%B %Y',
 
         ];
 
@@ -198,6 +214,7 @@ class Navigation
             'quarterly' => 'firstOfQuarter',
             'year'      => 'startOfYear',
             'yearly'    => 'startOfYear',
+            '1Y'        => 'startOfYear',
         ];
         if (isset($functionMap[$repeatFreq])) {
             $function = $functionMap[$repeatFreq];
@@ -214,6 +231,11 @@ class Navigation
 
             return $date;
         }
+        if ($repeatFreq === 'custom') {
+            return $date; // the date is already at the start.
+        }
+
+
         throw new FireflyException('Cannot do startOfPeriod for $repeat_freq "' . $repeatFreq . '"');
     }
 
@@ -239,12 +261,15 @@ class Navigation
             '1M'      => 'subMonths',
             'monthly' => 'subMonths',
             'year'    => 'subYears',
+            '1Y'      => 'subYears',
             'yearly'  => 'subYears',
         ];
         $modifierMap = [
             'quarter'   => 3,
+            '3M'        => 3,
             'quarterly' => 3,
             'half-year' => 6,
+            '6M'        => 6,
         ];
         if (isset($functionMap[$repeatFreq])) {
             $function = $functionMap[$repeatFreq];
@@ -258,6 +283,18 @@ class Navigation
 
             return $date;
         }
+        // a custom range requires the session start
+        // and session end to calculate the difference in days.
+        // this is then subtracted from $theDate (* $subtract).
+        if($repeatFreq === 'custom') {
+            /** @var Carbon $tStart */
+            $tStart = session('start', Carbon::now()->startOfMonth());
+            /** @var Carbon $tEnd */
+            $tEnd       = session('end', Carbon::now()->endOfMonth());
+            $diffInDays = $tStart->diffInDays($tEnd);
+            $date->subDays($diffInDays * $subtract);
+            return $date;
+        }
 
         throw new FireflyException('Cannot do subtractPeriod for $repeat_freq "' . $repeatFreq . '"');
     }

config/firefly.php

@@ -2,7 +2,7 @@
 
 return [
     'chart'              => 'chartjs',
-    'version'            => '3.7.0',
+    'version'            => '3.7.2.3',
     'index_periods'      => ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom'],
     'budget_periods'     => ['daily', 'weekly', 'monthly', 'quarterly', 'half-year', 'yearly'],
     'csv_import_enabled' => true,

config/upgrade.php

@@ -10,6 +10,17 @@
 
 return [
     'text' => [
-        '3.7.0' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
-                   'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0'],
+        '3.7.0'   => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+        '3.7.1'   => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+        '3.7.2'   => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+        '3.7.2.1' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+        '3.7.2.2' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+        '3.7.2.3' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' .
+                     'Please follow the instructions on the following page: https://github.com/JC5/firefly-iii/wiki/Upgrade-to-3.7.0',
+    ],
 ];

public/js/reports/index.js

@@ -87,8 +87,8 @@ function preSelectDate(e) {
     "use strict";
     var link = $(e.target);
     var picker = $('#inputDateRange').data('daterangepicker');
-    picker.setStartDate(link.data('start'));
-    picker.setEndDate(link.data('end'));
+    picker.setStartDate(moment(link.data('start'), "YYYY-MM-DD"));
+    picker.setEndDate(moment(link.data('end'), "YYYY-MM-DD"));
     return false;
 
 }