From 5a57398f81250bcfbbec63293cbed9cbdad2fee8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 17:54:11 +0100 Subject: [PATCH 001/150] New tests. --- app/Http/Controllers/PiggyBankController.php | 4 + .../Controllers/PreferencesController.php | 2 +- app/Http/Controllers/ProfileController.php | 11 +- app/Http/Requests/PiggyBankFormRequest.php | 6 +- app/Http/breadcrumbs.php | 25 +++ app/Repositories/User/UserRepository.php | 12 ++ .../User/UserRepositoryInterface.php | 8 + resources/views/piggy-banks/add-mobile.twig | 2 +- .../views/piggy-banks/remove-mobile.twig | 2 +- routes/web.php | 1 + tests/TestCase.php | 9 + .../Controllers/NewUserControllerTest.php | 20 ++- .../Controllers/PiggyBankControllerTest.php | 160 ++++++++++-------- .../Controllers/PreferencesControllerTest.php | 54 +++--- .../Controllers/ProfileControllerTest.php | 59 ++++--- 15 files changed, 223 insertions(+), 152 deletions(-) diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 7239ba309a..d1feb427eb 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -24,6 +24,7 @@ use Illuminate\Support\Collection; use Input; use Log; use Preferences; +use Response; use Session; use Steam; use URL; @@ -243,6 +244,8 @@ class PiggyBankController extends Controller /** * @param PiggyBankRepositoryInterface $repository + * + * @return \Illuminate\Http\JsonResponse */ public function order(PiggyBankRepositoryInterface $repository) { @@ -257,6 +260,7 @@ class PiggyBankController extends Controller $repository->setOrder(intval($id), ($order + 1)); } } + return Response::json(['result' => 'ok']); } /** diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index e8ddd70eb3..a3654bb031 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -150,7 +150,7 @@ class PreferencesController extends Controller // custom fiscal year $customFiscalYear = intval($request->get('customFiscalYear')) === 1; - $fiscalYearStart = date('m-d', strtotime($request->get('fiscalYearStart'))); + $fiscalYearStart = date('m-d', strtotime(strval($request->get('fiscalYearStart')))); Preferences::set('customFiscalYear', $customFiscalYear); Preferences::set('fiscalYearStart', $fiscalYearStart); diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 8f8fbc6b07..3399c84644 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -83,11 +83,12 @@ class ProfileController extends Controller } /** - * @param ProfileFormRequest $request + * @param ProfileFormRequest $request + * @param UserRepositoryInterface $repository * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\View\View + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function postChangePassword(ProfileFormRequest $request) + public function postChangePassword(ProfileFormRequest $request, UserRepositoryInterface $repository) { // old, new1, new2 if (!Hash::check($request->get('current_password'), auth()->user()->password)) { @@ -103,9 +104,7 @@ class ProfileController extends Controller } // update the user with the new password. - auth()->user()->password = bcrypt($request->get('new_password')); - auth()->user()->save(); - + $repository->changePassword(auth()->user(), $request->get('new_password')); Session::flash('success', strval(trans('firefly.password_changed'))); return redirect(route('profile.index')); diff --git a/app/Http/Requests/PiggyBankFormRequest.php b/app/Http/Requests/PiggyBankFormRequest.php index 69c11d70b2..684ad148d9 100644 --- a/app/Http/Requests/PiggyBankFormRequest.php +++ b/app/Http/Requests/PiggyBankFormRequest.php @@ -42,8 +42,8 @@ class PiggyBankFormRequest extends Request 'startdate' => new Carbon, 'account_id' => intval($this->get('account_id')), 'targetamount' => round($this->get('targetamount'), 2), - 'targetdate' => strlen($this->get('targetdate')) > 0 ? new Carbon($this->get('targetdate')) : null, - 'note' => trim($this->get('note')), + 'targetdate' => strlen(strval($this->get('targetdate'))) > 0 ? new Carbon($this->get('targetdate')) : null, + 'note' => trim(strval($this->get('note'))), ]; } @@ -64,7 +64,7 @@ class PiggyBankFormRequest extends Request 'name' => $nameRule, 'account_id' => 'required|belongsToUser:accounts', 'targetamount' => 'required|min:0.01', - 'amount_currency_id_targetamount' => 'exists:transaction_currencies,id', + 'amount_currency_id_targetamount' => 'required|exists:transaction_currencies,id', 'startdate' => 'date', 'targetdate' => $targetDateRule, 'order' => 'integer|min:1', diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 5b99d097ee..7f35b095b7 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -413,7 +413,22 @@ Breadcrumbs::register( 'piggy-banks.show', function (BreadCrumbGenerator $breadcrumbs, PiggyBank $piggyBank) { $breadcrumbs->parent('piggy-banks.index'); $breadcrumbs->push(e($piggyBank->name), route('piggy-banks.show', [$piggyBank->id])); +} +); +Breadcrumbs::register( + 'piggy-banks.add-money-mobile', function (BreadCrumbGenerator $breadcrumbs, PiggyBank $piggyBank) { + $breadcrumbs->parent('piggy-banks.show', $piggyBank); + $breadcrumbs->push(trans('firefly.add_money_to_piggy', ['name' => $piggyBank->name]), route('piggy-banks.add-money-mobile', [$piggyBank->id])); +} +); + +Breadcrumbs::register( + 'piggy-banks.remove-money-mobile', function (BreadCrumbGenerator $breadcrumbs, PiggyBank $piggyBank) { + $breadcrumbs->parent('piggy-banks.show', $piggyBank); + $breadcrumbs->push( + trans('firefly.remove_money_from_piggy_title', ['name' => $piggyBank->name]), route('piggy-banks.remove-money-mobile', [$piggyBank->id]) + ); } ); @@ -513,6 +528,16 @@ Breadcrumbs::register( } ); +/** + * New user Controller + */ +Breadcrumbs::register( + 'new-user.index', function (BreadCrumbGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.getting_started'), route('new-user.index')); +} +); + /** * Rules */ diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index f33171c1e4..1f206f89a7 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -148,4 +148,16 @@ class UserRepository implements UserRepositoryInterface return $return; } + + /** + * @param User $user + * @param string $password + * + * @return mixed + */ + public function changePassword(User $user, string $password) + { + $user->password = bcrypt($password); + $user->save(); + } } diff --git a/app/Repositories/User/UserRepositoryInterface.php b/app/Repositories/User/UserRepositoryInterface.php index 66283a9ba0..93e34a7a14 100644 --- a/app/Repositories/User/UserRepositoryInterface.php +++ b/app/Repositories/User/UserRepositoryInterface.php @@ -41,6 +41,14 @@ interface UserRepositoryInterface */ public function attachRole(User $user, string $role): bool; + /** + * @param User $user + * @param string $password + * + * @return mixed + */ + public function changePassword(User $user, string $password); + /** * Returns a count of all users. * diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twig index 29460b3e47..1212641bf4 100644 --- a/resources/views/piggy-banks/add-mobile.twig +++ b/resources/views/piggy-banks/add-mobile.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }} {% endblock %} {% block content %} diff --git a/resources/views/piggy-banks/remove-mobile.twig b/resources/views/piggy-banks/remove-mobile.twig index 9b1574983a..d70ade101e 100644 --- a/resources/views/piggy-banks/remove-mobile.twig +++ b/resources/views/piggy-banks/remove-mobile.twig @@ -1,6 +1,6 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, piggyBank) }} {% endblock %} {% block content %} diff --git a/routes/web.php b/routes/web.php index 4573eb6696..515573629e 100755 --- a/routes/web.php +++ b/routes/web.php @@ -457,6 +457,7 @@ Route::group( Route::get('', ['uses' => 'ProfileController@index', 'as' => 'index']); Route::get('change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'change-password']); Route::get('delete-account', ['uses' => 'ProfileController@deleteAccount', 'as' => 'delete-account']); + Route::post('delete-account', ['uses' => 'ProfileController@postDeleteAccount', 'as' => 'delete-account.post']); Route::post('change-password', ['uses' => 'ProfileController@postChangePassword', 'as' => 'change-password.post']); } diff --git a/tests/TestCase.php b/tests/TestCase.php index b4003cb46a..f0aed4568b 100755 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -94,6 +94,15 @@ abstract class TestCase extends Illuminate\Foundation\Testing\TestCase } + /** + * @return User + */ + public function emptyUser() + { + $user = User::find(2); + + return $user; + } /** * @return User diff --git a/tests/acceptance/Controllers/NewUserControllerTest.php b/tests/acceptance/Controllers/NewUserControllerTest.php index dd51e1fa8c..7c98ec5583 100644 --- a/tests/acceptance/Controllers/NewUserControllerTest.php +++ b/tests/acceptance/Controllers/NewUserControllerTest.php @@ -31,10 +31,10 @@ class NewUserControllerTest extends TestCase */ public function testIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->emptyUser()); + $this->call('get', route('new-user.index')); + $this->assertResponseStatus(200); + $this->see('
    '); } /** @@ -42,10 +42,14 @@ class NewUserControllerTest extends TestCase */ public function testSubmit() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $data = [ + 'bank_name' => 'New bank', + 'bank_balance' => 100, + ]; + $this->be($this->emptyUser()); + $this->call('post', route('new-user.submit'), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); } } diff --git a/tests/acceptance/Controllers/PiggyBankControllerTest.php b/tests/acceptance/Controllers/PiggyBankControllerTest.php index 9ad18fb30c..66e2dce67c 100644 --- a/tests/acceptance/Controllers/PiggyBankControllerTest.php +++ b/tests/acceptance/Controllers/PiggyBankControllerTest.php @@ -8,6 +8,7 @@ * * See the LICENSE file for details. */ +use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; /** @@ -28,182 +29,191 @@ class PiggyBankControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::add - * Implement testAdd(). */ public function testAdd() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('piggy-banks.add', [1])); + $this->assertResponseStatus(200); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::addMobile - * Implement testAddMobile(). */ public function testAddMobile() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('piggy-banks.add-money-mobile', [1])); + $this->assertResponseStatus(200); + $this->see('
      '); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::create - * Implement testCreate(). */ public function testCreate() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('piggy-banks.create')); + $this->assertResponseStatus(200); + $this->see('
        '); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::delete - * Implement testDelete(). */ public function testDelete() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('piggy-banks.delete', [1])); + $this->assertResponseStatus(200); + $this->see('
          '); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::destroy - * Implement testDestroy(). */ public function testDestroy() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $repository->shouldReceive('destroy')->andReturn(true); + + $this->session(['piggy-banks.delete.url' => 'http://localhost']); + $this->be($this->user()); + $this->call('post', route('piggy-banks.destroy', [2])); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::edit - * Implement testEdit(). */ public function testEdit() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('piggy-banks.edit', [1])); + $this->assertResponseStatus(200); + $this->see('
            '); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::index - * Implement testIndex(). */ public function testIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('piggy-banks.index')); + $this->assertResponseStatus(200); + $this->see('
              '); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::order - * Implement testOrder(). */ public function testOrder() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('post', route('piggy-banks.order', [1, 2])); + $this->assertResponseStatus(200); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::postAdd - * Implement testPostAdd(). */ public function testPostAdd() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $data = ['amount' => 1]; + $this->be($this->user()); + $this->call('post', route('piggy-banks.add', [1]), $data); + $this->assertResponseStatus(302); + $this->assertRedirectedToRoute('piggy-banks.index'); + $this->assertSessionHas('success'); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::postRemove - * Implement testPostRemove(). */ public function testPostRemove() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $data = ['amount' => 1]; + $this->be($this->user()); + $this->call('post', route('piggy-banks.remove', [1]), $data); + $this->assertResponseStatus(302); + $this->assertRedirectedToRoute('piggy-banks.index'); + $this->assertSessionHas('success'); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::remove - * Implement testRemove(). */ public function testRemove() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('piggy-banks.remove', [1])); + $this->assertResponseStatus(200); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::removeMobile - * Implement testRemoveMobile(). */ public function testRemoveMobile() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('piggy-banks.remove-money-mobile', [1])); + $this->assertResponseStatus(200); + $this->see('
                '); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::show - * Implement testShow(). */ public function testShow() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('piggy-banks.show', [1])); + $this->assertResponseStatus(200); + $this->see('
                  '); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::store - * Implement testStore(). */ public function testStore() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->session(['piggy-banks.create.url' => 'http://localhost']); + $data = [ + 'name' => 'Piggy ' . rand(999, 10000), + 'targetamount' => 100, + 'account_id' => 2, + 'amount_currency_id_targetamount' => 1, + + ]; + $this->be($this->user()); + $this->call('post', route('piggy-banks.store'), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); } /** * @covers \FireflyIII\Http\Controllers\PiggyBankController::update - * Implement testUpdate(). */ public function testUpdate() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->session(['piggy-banks.edit.url' => 'http://localhost']); + $data = [ + 'name' => 'Updated Piggy ' . rand(999, 10000), + 'targetamount' => 100, + 'account_id' => 2, + 'amount_currency_id_targetamount' => 1, + + ]; + $this->be($this->user()); + $this->call('post', route('piggy-banks.update', [3]), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); } } diff --git a/tests/acceptance/Controllers/PreferencesControllerTest.php b/tests/acceptance/Controllers/PreferencesControllerTest.php index 25c39e2a3f..3cd9698735 100644 --- a/tests/acceptance/Controllers/PreferencesControllerTest.php +++ b/tests/acceptance/Controllers/PreferencesControllerTest.php @@ -28,61 +28,51 @@ class PreferencesControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\PreferencesController::code - * Implement testCode(). */ public function testCode() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('preferences.code')); + $this->assertResponseStatus(200); + $this->see('
                    '); } /** * @covers \FireflyIII\Http\Controllers\PreferencesController::deleteCode - * Implement testDeleteCode(). */ public function testDeleteCode() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('preferences.delete-code')); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + $this->assertSessionHas('info'); + $this->assertRedirectedToRoute('preferences.index'); } /** * @covers \FireflyIII\Http\Controllers\PreferencesController::index - * Implement testIndex(). */ public function testIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } - - /** - * @covers \FireflyIII\Http\Controllers\PreferencesController::postCode - * Implement testPostCode(). - */ - public function testPostCode() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('preferences.index')); + $this->assertResponseStatus(200); + $this->see('
                      '); } /** * @covers \FireflyIII\Http\Controllers\PreferencesController::postIndex - * Implement testPostIndex(). */ public function testPostIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $data = [ + 'fiscalYearStart' => '2016-01-01' + ]; + $this->be($this->user()); + $this->call('post', route('preferences.update'), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + $this->assertRedirectedToRoute('preferences.index'); } } diff --git a/tests/acceptance/Controllers/ProfileControllerTest.php b/tests/acceptance/Controllers/ProfileControllerTest.php index c9d53bca71..f11a4556a0 100644 --- a/tests/acceptance/Controllers/ProfileControllerTest.php +++ b/tests/acceptance/Controllers/ProfileControllerTest.php @@ -8,6 +8,7 @@ * * See the LICENSE file for details. */ +use FireflyIII\Repositories\User\UserRepositoryInterface; /** @@ -28,61 +29,69 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::changePassword - * Implement testChangePassword(). */ public function testChangePassword() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('profile.change-password')); + $this->assertResponseStatus(200); + $this->see('
                        '); } /** * @covers \FireflyIII\Http\Controllers\ProfileController::deleteAccount - * Implement testDeleteAccount(). */ public function testDeleteAccount() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('profile.delete-account')); + $this->assertResponseStatus(200); + $this->see('
                          '); } /** * @covers \FireflyIII\Http\Controllers\ProfileController::index - * Implement testIndex(). */ public function testIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('profile.index')); + $this->assertResponseStatus(200); + $this->see('
                            '); } /** * @covers \FireflyIII\Http\Controllers\ProfileController::postChangePassword - * Implement testPostChangePassword(). */ public function testPostChangePassword() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('changePassword'); + + $data = [ + 'current_password' => 'james', + 'new_password' => 'james2', + 'new_password_confirmation' => 'james2', + ]; + $this->be($this->user()); + $this->call('post', route('profile.change-password.post'), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); } /** * @covers \FireflyIII\Http\Controllers\ProfileController::postDeleteAccount - * Implement testPostDeleteAccount(). */ public function testPostDeleteAccount() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('destroy'); + $data = [ + 'password' => 'james', + ]; + $this->be($this->user()); + $this->call('post', route('profile.delete-account.post'), $data); + $this->assertResponseStatus(302); + $this->assertRedirectedToRoute('index'); } } From 5c28adf266fec167630aff43179b14f92c32a725 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 18:16:41 +0100 Subject: [PATCH 002/150] New tests. [skip ci] --- app/Http/breadcrumbs.php | 49 +++++++++++++-- resources/lang/en_US/firefly.php | 8 +-- resources/views/reports/audit/report.twig | 2 +- resources/views/reports/budget/month.twig | 2 +- resources/views/reports/category/month.twig | 2 +- resources/views/reports/default/month.twig | 2 +- .../views/reports/default/multi-year.twig | 2 +- resources/views/reports/default/year.twig | 2 +- .../Controllers/ReportControllerTest.php | 63 +++++++++---------- 9 files changed, 81 insertions(+), 51 deletions(-) diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 7f35b095b7..7f62296c49 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -515,16 +515,53 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'reports.report', function (BreadCrumbGenerator $breadcrumbs, Carbon $start, Carbon $end, $reportType, $accountIds) { + 'reports.report.audit', function (BreadCrumbGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { $breadcrumbs->parent('reports.index'); $monthFormat = (string)trans('config.month_and_day'); - $title = (string)trans( - 'firefly.report_' . $reportType, - ['start' => $start->formatLocalized($monthFormat), 'end' => $end->formatLocalized($monthFormat)] - ); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_audit', ['start' => $startString, 'end' => $endString]); - $breadcrumbs->push($title, route('reports.report', [$reportType, $start->format('Ymd'), $end->format('Ymd'), $accountIds])); + $breadcrumbs->push($title, route('reports.report.audit', [$accountIds, $start->format('Ymd'), $end->format('Ymd')])); +} +); +Breadcrumbs::register( + 'reports.report.budget', function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $budgetIds, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_budget', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.budget', [$accountIds, $budgetIds, $start->format('Ymd'), $end->format('Ymd')])); +} +); + +Breadcrumbs::register( + 'reports.report.category', function (BreadCrumbGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_category', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.category', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')])); +} +); + +Breadcrumbs::register( + 'reports.report.default', function (BreadCrumbGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_default', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.default', [$accountIds, $start->format('Ymd'), $end->format('Ymd')])); } ); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 226834da8a..5b9ba90e21 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -632,10 +632,10 @@ return [ 'errors' => 'Errors', // reports: - 'report_default' => 'Default financial report for :start until :end', - 'report_audit' => 'Transaction history overview for :start until :end', - 'report_category' => 'Category report for :start until :end', - 'report_budget' => 'Budget report for :start until :end', + 'report_default' => 'Default financial report between :start and :end', + 'report_audit' => 'Transaction history overview between :start and :end', + 'report_category' => 'Category report between :start and :end', + 'report_budget' => 'Budget report between :start and :end', 'quick_link_reports' => 'Quick links', 'quick_link_default_report' => 'Default financial report', 'quick_link_audit_report' => 'Transaction history overview', diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig index ef8b1af2dc..762406c3c0 100644 --- a/resources/views/reports/audit/report.twig +++ b/resources/views/reports/audit/report.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, reportType, accountIds) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, start, end) }} {% endblock %} {% block content %} diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig index d8623ebf32..73e030e106 100644 --- a/resources/views/reports/budget/month.twig +++ b/resources/views/reports/budget/month.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, budgetIds, start, end) }} {% endblock %} {% block content %} diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig index 679793d770..f01c9a5395 100644 --- a/resources/views/reports/category/month.twig +++ b/resources/views/reports/category/month.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, categoryIds, start, end) }} {% endblock %} {% block content %} diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig index 352f5a2d1c..22a7ebe73d 100644 --- a/resources/views/reports/default/month.twig +++ b/resources/views/reports/default/month.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, reportType, accountIds) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, start, end) }} {% endblock %} {% block content %} diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig index 527eb84740..7b70416735 100644 --- a/resources/views/reports/default/multi-year.twig +++ b/resources/views/reports/default/multi-year.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, reportType, accountIds) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, start, end) }} {% endblock %} {% block content %} diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig index aad882010d..bea5536237 100644 --- a/resources/views/reports/default/year.twig +++ b/resources/views/reports/default/year.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, start, end, reportType, accountIds) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, accountIds, start, end) }} {% endblock %} {% block content %} diff --git a/tests/acceptance/Controllers/ReportControllerTest.php b/tests/acceptance/Controllers/ReportControllerTest.php index 5ce19e0e61..d975bb4581 100644 --- a/tests/acceptance/Controllers/ReportControllerTest.php +++ b/tests/acceptance/Controllers/ReportControllerTest.php @@ -8,6 +8,8 @@ * * See the LICENSE file for details. */ +use FireflyIII\Generator\Report\Audit\MonthReportGenerator as AuditGenerator; +use FireflyIII\Generator\Report\ReportGeneratorInterface; /** @@ -28,85 +30,76 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::auditReport - * Implement testAuditReport(). */ public function testAuditReport() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('reports.report.audit', [1, '20160101', '20160131'])); + $this->assertResponseStatus(200); + $this->see('
                              '); } /** * @covers \FireflyIII\Http\Controllers\ReportController::budgetReport - * Implement testBudgetReport(). */ public function testBudgetReport() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('reports.report.budget', [1, 1, '20160101', '20160131'])); + $this->assertResponseStatus(200); + $this->see('
                                '); } /** * @covers \FireflyIII\Http\Controllers\ReportController::categoryReport - * Implement testCategoryReport(). */ public function testCategoryReport() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('reports.report.category', [1, 1, '20160101', '20160131'])); + $this->assertResponseStatus(200); + $this->see('
                                  '); } /** * @covers \FireflyIII\Http\Controllers\ReportController::defaultReport - * Implement testDefaultReport(). */ public function testDefaultReport() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('reports.report.default', [1, '20160101', '20160131'])); + $this->assertResponseStatus(200); + $this->see('
                                    '); } /** * @covers \FireflyIII\Http\Controllers\ReportController::index - * Implement testIndex(). */ public function testIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('reports.index')); + $this->assertResponseStatus(200); + $this->see('
                                      '); } /** * @covers \FireflyIII\Http\Controllers\ReportController::options - * Implement testOptions(). */ public function testOptions() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('reports.options', ['default'])); + $this->assertResponseStatus(200); } /** * @covers \FireflyIII\Http\Controllers\ReportController::postIndex - * Implement testPostIndex(). */ public function testPostIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('post', route('reports.index.post')); + $this->assertResponseStatus(302); } } From 57f81ee4c81a17a5600e7eec5170dac3c764c70c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 18:21:29 +0100 Subject: [PATCH 003/150] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 8da6423cd9..9cc7d21fc3 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -632,10 +632,10 @@ return [ 'errors' => 'Fouten', // reports: - 'report_default' => 'Standaard financieel rapport (:start tot :end)', - 'report_audit' => 'Transactiehistorie-overzicht van :start tot :end', - 'report_category' => 'Categorierapport van :start tot :end', - 'report_budget' => 'Budgetrapport van :start tot en met :end', + 'report_default' => 'Default financial report between :start and :end', + 'report_audit' => 'Transaction history overview between :start and :end', + 'report_category' => 'Category report between :start and :end', + 'report_budget' => 'Budget report between :start and :end', 'quick_link_reports' => 'Snelle links', 'quick_link_default_report' => 'Standaard financieel rapport', 'quick_link_audit_report' => 'Transactiehistorie-overzicht', From 8ab0d5fc48385c263d7b5c1968e56ea0c1c4c264 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 18:21:40 +0100 Subject: [PATCH 004/150] New translations --- resources/lang/pt_BR/firefly.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 71fb3492b6..7f37dc32cf 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -632,10 +632,10 @@ return [ 'errors' => 'Erros', // reports: - 'report_default' => 'Relatório financeiro padrão de :start até :end', - 'report_audit' => 'Visão geral do histórico de transação de :start até :end', - 'report_category' => 'Category report for :start until :end', - 'report_budget' => 'Budget report for :start until :end', + 'report_default' => 'Default financial report between :start and :end', + 'report_audit' => 'Transaction history overview between :start and :end', + 'report_category' => 'Category report between :start and :end', + 'report_budget' => 'Budget report between :start and :end', 'quick_link_reports' => 'Ligações rápidas', 'quick_link_default_report' => 'Relatório financeiro padrão', 'quick_link_audit_report' => 'Visão geral do histórico de transação', From 71c08cfe0c7e902e50209b82759b11c221d8bbca Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 18:21:48 +0100 Subject: [PATCH 005/150] New translations --- resources/lang/zh_HK/firefly.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 7d587786c5..775ca7d7e4 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -632,10 +632,10 @@ return [ 'errors' => 'Errors', // reports: - 'report_default' => 'Default financial report for :start until :end', - 'report_audit' => 'Transaction history overview for :start until :end', - 'report_category' => 'Category report for :start until :end', - 'report_budget' => 'Budget report for :start until :end', + 'report_default' => 'Default financial report between :start and :end', + 'report_audit' => 'Transaction history overview between :start and :end', + 'report_category' => 'Category report between :start and :end', + 'report_budget' => 'Budget report between :start and :end', 'quick_link_reports' => 'Quick links', 'quick_link_default_report' => 'Default financial report', 'quick_link_audit_report' => 'Transaction history overview', From a5d86536c38174564f599729f00e35c40099fb3a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 18:21:52 +0100 Subject: [PATCH 006/150] New translations --- resources/lang/zh_TW/firefly.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 6e9d309c22..dd4437aed6 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -632,10 +632,10 @@ return [ 'errors' => 'Errors', // reports: - 'report_default' => 'Default financial report for :start until :end', - 'report_audit' => 'Transaction history overview for :start until :end', - 'report_category' => 'Category report for :start until :end', - 'report_budget' => 'Budget report for :start until :end', + 'report_default' => 'Default financial report between :start and :end', + 'report_audit' => 'Transaction history overview between :start and :end', + 'report_category' => 'Category report between :start and :end', + 'report_budget' => 'Budget report between :start and :end', 'quick_link_reports' => 'Quick links', 'quick_link_default_report' => 'Default financial report', 'quick_link_audit_report' => 'Transaction history overview', From 0b02d294f4eeab1fdf4f0c414d314b34139e1328 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 18:22:00 +0100 Subject: [PATCH 007/150] New translations --- resources/lang/fr_FR/firefly.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 9bd76c4595..4379397bf9 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -632,10 +632,10 @@ return [ 'errors' => 'Erreurs', // reports: - 'report_default' => 'Rapport financier par défaut du :start au :end', - 'report_audit' => 'Historique des transactions du :start au :end', - 'report_category' => 'Category report for :start until :end', - 'report_budget' => 'Budget report for :start until :end', + 'report_default' => 'Default financial report between :start and :end', + 'report_audit' => 'Transaction history overview between :start and :end', + 'report_category' => 'Category report between :start and :end', + 'report_budget' => 'Budget report between :start and :end', 'quick_link_reports' => 'Liens rapides', 'quick_link_default_report' => 'Rapport financier par défaut', 'quick_link_audit_report' => 'Historique des transactions', From 944a78807c605a9967440ebd0d679ed0fc5df087 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 18:22:05 +0100 Subject: [PATCH 008/150] New translations --- resources/lang/de_DE/firefly.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 8dd703474f..e9e49f72fa 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -633,10 +633,10 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'errors' => 'Fehler', // reports: - 'report_default' => 'Standard Finanzbericht für :start bis :end', - 'report_audit' => 'Transaction history overview for :start until :end', - 'report_category' => 'Category report for :start until :end', - 'report_budget' => 'Budget report for :start until :end', + 'report_default' => 'Default financial report between :start and :end', + 'report_audit' => 'Transaction history overview between :start and :end', + 'report_category' => 'Category report between :start and :end', + 'report_budget' => 'Budget report between :start and :end', 'quick_link_reports' => 'Schnellzugriff', 'quick_link_default_report' => 'Standard Finanzbericht', 'quick_link_audit_report' => 'Transaktionshistorie', From 20a6e0170c52e896585b640b83de1c4fb5af410f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 18:22:10 +0100 Subject: [PATCH 009/150] New translations --- resources/lang/hr_HR/firefly.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 7d587786c5..775ca7d7e4 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -632,10 +632,10 @@ return [ 'errors' => 'Errors', // reports: - 'report_default' => 'Default financial report for :start until :end', - 'report_audit' => 'Transaction history overview for :start until :end', - 'report_category' => 'Category report for :start until :end', - 'report_budget' => 'Budget report for :start until :end', + 'report_default' => 'Default financial report between :start and :end', + 'report_audit' => 'Transaction history overview between :start and :end', + 'report_category' => 'Category report between :start and :end', + 'report_budget' => 'Budget report between :start and :end', 'quick_link_reports' => 'Quick links', 'quick_link_default_report' => 'Default financial report', 'quick_link_audit_report' => 'Transaction history overview', From 8deb92c3e5a2ae70986724406e050a6ead49f91f Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 19:34:03 +0100 Subject: [PATCH 010/150] More tests. --- app/Http/Controllers/CategoryController.php | 1 - app/Http/Controllers/RuleController.php | 23 ++- app/Http/breadcrumbs.php | 12 +- .../Controllers/CategoryControllerTest.php | 2 +- .../Chart/CategoryControllerTest.php | 9 + .../Controllers/PreferencesControllerTest.php | 11 +- .../Controllers/RuleControllerTest.php | 176 ++++++++++++------ 7 files changed, 155 insertions(+), 79 deletions(-) diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index e832f3245d..835ab48c09 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -262,7 +262,6 @@ class CategoryController extends Controller $journals = $collector->getPaginatedJournals(); $journals->setPath('categories/show/' . $category->id . '/' . $date); - return view('categories.show-by-date', compact('category', 'journals', 'hideCategory', 'subTitle', 'carbon')); } diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 6a1d606af1..409484b59e 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -22,6 +22,7 @@ use FireflyIII\Models\RuleTrigger; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\Rules\TransactionMatcher; +use Illuminate\Http\Request; use Input; use Preferences; use Response; @@ -87,7 +88,7 @@ class RuleController extends Controller // put previous url in session if not redirect from store (not "create another"). if (session('rules.rule.create.fromStore') !== true) { - Session::put('rules.rule.create.url', URL::previous()); + Session::put('rules.create.url', URL::previous()); } Session::forget('rules.rule.create.fromStore'); Session::flash('gaEventCategory', 'rules'); @@ -110,7 +111,7 @@ class RuleController extends Controller $subTitle = trans('firefly.delete_rule', ['title' => $rule->title]); // put previous url in session - Session::put('rules.rule.delete.url', URL::previous()); + Session::put('rules.delete.url', URL::previous()); Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'delete-rule'); @@ -135,7 +136,7 @@ class RuleController extends Controller Preferences::mark(); - return redirect(session('rules.rule.delete.url')); + return redirect(session('rules.delete.url')); } /** @@ -179,7 +180,7 @@ class RuleController extends Controller // put previous url in session if not redirect from store (not "return_to_edit"). if (session('rules.rule.edit.fromUpdate') !== true) { - Session::put('rules.rule.edit.url', URL::previous()); + Session::put('rules.edit.url', URL::previous()); } Session::forget('rules.rule.edit.fromUpdate'); Session::flash('gaEventCategory', 'rules'); @@ -203,14 +204,15 @@ class RuleController extends Controller } /** + * @param Request $request * @param RuleRepositoryInterface $repository * @param Rule $rule * * @return \Illuminate\Http\JsonResponse */ - public function reorderRuleActions(RuleRepositoryInterface $repository, Rule $rule) + public function reorderRuleActions(Request $request, RuleRepositoryInterface $repository, Rule $rule) { - $ids = Input::get('actions'); + $ids = $request->get('actions'); if (is_array($ids)) { $repository->reorderRuleActions($rule, $ids); } @@ -220,14 +222,15 @@ class RuleController extends Controller } /** + * @param Request $request * @param RuleRepositoryInterface $repository * @param Rule $rule * * @return \Illuminate\Http\JsonResponse */ - public function reorderRuleTriggers(RuleRepositoryInterface $repository, Rule $rule) + public function reorderRuleTriggers(Request $request, RuleRepositoryInterface $repository, Rule $rule) { - $ids = Input::get('triggers'); + $ids = $request->get('triggers'); if (is_array($ids)) { $repository->reorderRuleTriggers($rule, $ids); } @@ -260,7 +263,7 @@ class RuleController extends Controller } // redirect to previous URL. - return redirect(session('rules.rule.create.url')); + return redirect(session('rules.create.url')); } @@ -347,7 +350,7 @@ class RuleController extends Controller } // redirect to previous URL. - return redirect(session('rules.rule.edit.url')); + return redirect(session('rules.edit.url')); } private function createDefaultRule() diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index 7f62296c49..dec743e7c6 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -586,21 +586,21 @@ Breadcrumbs::register( ); Breadcrumbs::register( - 'rules.rule.create', function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) { + 'rules.create', function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) { $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.make_new_rule', ['title' => $ruleGroup->title]), route('rules.rule.create', [$ruleGroup])); + $breadcrumbs->push(trans('firefly.make_new_rule', ['title' => $ruleGroup->title]), route('rules.create', [$ruleGroup])); } ); Breadcrumbs::register( - 'rules.rule.edit', function (BreadCrumbGenerator $breadcrumbs, Rule $rule) { + 'rules.edit', function (BreadCrumbGenerator $breadcrumbs, Rule $rule) { $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.rule.edit', [$rule])); + $breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule])); } ); Breadcrumbs::register( - 'rules.rule.delete', function (BreadCrumbGenerator $breadcrumbs, Rule $rule) { + 'rules.delete', function (BreadCrumbGenerator $breadcrumbs, Rule $rule) { $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.delete_rule', ['title' => $rule->title]), route('rules.rule.delete', [$rule])); + $breadcrumbs->push(trans('firefly.delete_rule', ['title' => $rule->title]), route('rules.delete', [$rule])); } ); Breadcrumbs::register( diff --git a/tests/acceptance/Controllers/CategoryControllerTest.php b/tests/acceptance/Controllers/CategoryControllerTest.php index 0d4c0c25d9..856f6b44c8 100644 --- a/tests/acceptance/Controllers/CategoryControllerTest.php +++ b/tests/acceptance/Controllers/CategoryControllerTest.php @@ -168,7 +168,7 @@ class CategoryControllerTest extends TestCase $this->be($this->user()); $this->changeDateRange($this->user(), $range); - $this->call('GET', route('categories.show', [1, '2015-01-01'])); + $this->call('GET', route('categories.show.date', [1, '2015-01-01'])); $this->assertResponseStatus(200); $this->see('
                                        '); } diff --git a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php index 13d91768ad..3504ad79d5 100644 --- a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php +++ b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php @@ -11,6 +11,8 @@ namespace Chart; +use Carbon\Carbon; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; use TestCase; /** @@ -37,6 +39,13 @@ class CategoryControllerTest extends TestCase */ public function testAll(string $range) { + $catRepository = $this->mock(CategoryRepositoryInterface::class); + + $catRepository->shouldReceive('spentInPeriod')->andReturn('0'); + $catRepository->shouldReceive('earnedInPeriod')->andReturn('0'); + $catRepository->shouldReceive('firstUseDate')->andReturn(new Carbon); + + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $this->call('get', route('chart.category.all', [1])); diff --git a/tests/acceptance/Controllers/PreferencesControllerTest.php b/tests/acceptance/Controllers/PreferencesControllerTest.php index 3cd9698735..782453bd0d 100644 --- a/tests/acceptance/Controllers/PreferencesControllerTest.php +++ b/tests/acceptance/Controllers/PreferencesControllerTest.php @@ -67,8 +67,17 @@ class PreferencesControllerTest extends TestCase public function testPostIndex() { $data = [ - 'fiscalYearStart' => '2016-01-01' + 'fiscalYearStart' => '2016-01-01', + 'frontPageAccounts' => [], + 'viewRange' => '1M', + 'customFiscalYear' => 0, + 'showDepositsFrontpage' => 0, + 'transactionPageSize' => 100, + 'twoFactorAuthEnabled' => 0, + 'language' => 'en_US', + 'tj' => [], ]; + $this->be($this->user()); $this->call('post', route('preferences.update'), $data); $this->assertResponseStatus(302); diff --git a/tests/acceptance/Controllers/RuleControllerTest.php b/tests/acceptance/Controllers/RuleControllerTest.php index 174803647b..41ad37571c 100644 --- a/tests/acceptance/Controllers/RuleControllerTest.php +++ b/tests/acceptance/Controllers/RuleControllerTest.php @@ -8,6 +8,8 @@ * * See the LICENSE file for details. */ +use FireflyIII\Models\Rule; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; /** @@ -28,145 +30,199 @@ class RuleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleController::create - * Implement testCreate(). */ public function testCreate() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rules.create', [1])); + $this->assertResponseStatus(200); + $this->see('
                                          '); } /** * @covers \FireflyIII\Http\Controllers\RuleController::delete - * Implement testDelete(). */ public function testDelete() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rules.delete', [1])); + $this->assertResponseStatus(200); + $this->see('
                                            '); } /** * @covers \FireflyIII\Http\Controllers\RuleController::destroy - * Implement testDestroy(). */ public function testDestroy() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('destroy'); + + $this->session(['rules.delete.url' => 'http://localhost']); + $this->be($this->user()); + $this->call('post', route('rules.destroy', [1])); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); } /** * @covers \FireflyIII\Http\Controllers\RuleController::down - * Implement testDown(). */ public function testDown() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rules.down', [1])); + $this->assertResponseStatus(302); + $this->assertRedirectedToRoute('rules.index'); } /** * @covers \FireflyIII\Http\Controllers\RuleController::edit - * Implement testEdit(). */ public function testEdit() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rules.edit', [1])); + $this->assertResponseStatus(200); + $this->see('
                                              '); } /** * @covers \FireflyIII\Http\Controllers\RuleController::index - * Implement testIndex(). */ public function testIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rules.index')); + $this->assertResponseStatus(200); + $this->see('
                                                '); } /** * @covers \FireflyIII\Http\Controllers\RuleController::reorderRuleActions - * Implement testReorderRuleActions(). */ public function testReorderRuleActions() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $data = [ + 'triggers' => [1, 2, 3], + ]; + + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('reorderRuleActions'); + + $this->be($this->user()); + $this->call('post', route('rules.reorder-actions', [1]), $data); + $this->assertResponseStatus(200); } /** * @covers \FireflyIII\Http\Controllers\RuleController::reorderRuleTriggers - * Implement testReorderRuleTriggers(). */ public function testReorderRuleTriggers() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $data = [ + 'triggers' => [1, 2, 3], + ]; + + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('reorderRuleTriggers'); + + $this->be($this->user()); + $this->call('post', route('rules.reorder-triggers', [1]), $data); + $this->assertResponseStatus(200); } /** * @covers \FireflyIII\Http\Controllers\RuleController::store - * Implement testStore(). */ public function testStore() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->session(['rules.create.url' => 'http://localhost']); + $data = [ + 'rule_group_id' => 1, + 'active' => 1, + 'title' => 'A', + 'trigger' => 'store-journal', + 'description' => 'D', + 'rule-trigger' => [ + 1 => 'from_account_starts', + ], + 'rule-trigger-value' => [ + 1 => 'B', + ], + 'rule-action' => [ + 1 => 'set_category', + ], + 'rule-action-value' => [ + 1 => 'C', + ], + ]; + + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('store')->andReturn(new Rule); + + $this->be($this->user()); + $this->call('post', route('rules.store', [1]), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); } /** + * This actually hits an error and not the actually code but OK. + * * @covers \FireflyIII\Http\Controllers\RuleController::testTriggers - * Implement testTestTriggers(). */ public function testTestTriggers() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rules.test-triggers', [1])); + $this->assertResponseStatus(200); } /** * @covers \FireflyIII\Http\Controllers\RuleController::up - * Implement testUp(). */ public function testUp() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rules.up', [1])); + $this->assertResponseStatus(302); + $this->assertRedirectedToRoute('rules.index'); } /** * @covers \FireflyIII\Http\Controllers\RuleController::update - * Implement testUpdate(). */ public function testUpdate() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $data = [ + 'rule_group_id' => 1, + 'title' => 'Your first default rule', + 'trigger' => 'store-journal', + 'active' => 1, + 'description' => 'This rule is an example. You can safely delete it.', + 'rule-trigger' => [ + 1 => 'description_is', + ], + 'rule-trigger-value' => [ + 1 => 'something', + ], + 'rule-action' => [ + 1 => 'prepend_description', + ], + 'rule-action-value' => [ + 1 => 'Bla bla', + ], + ]; + $this->session(['rules.edit.url' => 'http://localhost']); + + $repository = $this->mock(RuleRepositoryInterface::class); + $repository->shouldReceive('update'); + + $this->be($this->user()); + $this->call('post', route('rules.update', [1]), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); } } From 83b404d01e4bef291eb21e1fe37673ac4256c8d4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 21:04:53 +0100 Subject: [PATCH 011/150] More tests. --- app/Http/Controllers/RuleController.php | 16 +-- app/Http/Controllers/RuleGroupController.php | 28 ++-- app/Http/breadcrumbs.php | 23 ++-- resources/lang/en_US/firefly.php | 1 + .../Controllers/RuleGroupControllerTest.php | 125 +++++++++++------- 5 files changed, 113 insertions(+), 80 deletions(-) diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 409484b59e..0216496be6 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -87,10 +87,10 @@ class RuleController extends Controller $subTitle = trans('firefly.make_new_rule', ['title' => $ruleGroup->title]); // put previous url in session if not redirect from store (not "create another"). - if (session('rules.rule.create.fromStore') !== true) { + if (session('rules.create.fromStore') !== true) { Session::put('rules.create.url', URL::previous()); } - Session::forget('rules.rule.create.fromStore'); + Session::forget('rules.create.fromStore'); Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'create-rule'); @@ -179,10 +179,10 @@ class RuleController extends Controller $subTitle = trans('firefly.edit_rule', ['title' => $rule->title]); // put previous url in session if not redirect from store (not "return_to_edit"). - if (session('rules.rule.edit.fromUpdate') !== true) { + if (session('rules.edit.fromUpdate') !== true) { Session::put('rules.edit.url', URL::previous()); } - Session::forget('rules.rule.edit.fromUpdate'); + Session::forget('rules.edit.fromUpdate'); Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'edit-rule'); @@ -257,9 +257,9 @@ class RuleController extends Controller if (intval(Input::get('create_another')) === 1) { // set value so create routine will not overwrite URL: - Session::put('rules.rule.create.fromStore', true); + Session::put('rules.create.fromStore', true); - return redirect(route('rules.rule.create', [$ruleGroup]))->withInput(); + return redirect(route('rules.create', [$ruleGroup]))->withInput(); } // redirect to previous URL. @@ -344,9 +344,9 @@ class RuleController extends Controller if (intval(Input::get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: - Session::put('rules.rule.edit.fromUpdate', true); + Session::put('rules.edit.fromUpdate', true); - return redirect(route('rules.rule.edit', [$rule->id]))->withInput(['return_to_edit' => 1]); + return redirect(route('rules.edit', [$rule->id]))->withInput(['return_to_edit' => 1]); } // redirect to previous URL. diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index f1ab10422b..6f0a136a1d 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -62,10 +62,10 @@ class RuleGroupController extends Controller $subTitle = trans('firefly.make_new_rule_group'); // put previous url in session if not redirect from store (not "create another"). - if (session('rules.rule-group.create.fromStore') !== true) { - Session::put('rules.rule-group.create.url', URL::previous()); + if (session('rule-groups.create.fromStore') !== true) { + Session::put('rule-groups.create.url', URL::previous()); } - Session::forget('rules.rule-group.create.fromStore'); + Session::forget('rule-groups.create.fromStore'); Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'create-rule-group'); @@ -86,7 +86,7 @@ class RuleGroupController extends Controller unset($ruleGroupList[$ruleGroup->id]); // put previous url in session - Session::put('rules.rule-group.delete.url', URL::previous()); + Session::put('rule-groups.delete.url', URL::previous()); Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'delete-rule-group'); @@ -113,7 +113,7 @@ class RuleGroupController extends Controller Preferences::mark(); - return redirect(session('rules.rule-group.delete.url')); + return redirect(session('rule-groups.delete.url')); } /** @@ -140,10 +140,10 @@ class RuleGroupController extends Controller $subTitle = trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]); // put previous url in session if not redirect from store (not "return_to_edit"). - if (session('rules.rule-group.edit.fromUpdate') !== true) { - Session::put('rules.rule-group.edit.url', URL::previous()); + if (session('rule-groups.edit.fromUpdate') !== true) { + Session::put('rule-groups.edit.url', URL::previous()); } - Session::forget('rules.rule-group.edit.fromUpdate'); + Session::forget('rule-groups.edit.fromUpdate'); Session::flash('gaEventCategory', 'rules'); Session::flash('gaEventAction', 'edit-rule-group'); @@ -220,13 +220,13 @@ class RuleGroupController extends Controller if (intval(Input::get('create_another')) === 1) { // set value so create routine will not overwrite URL: - Session::put('rules.rule-group.create.fromStore', true); + Session::put('rule-groups.create.fromStore', true); - return redirect(route('rules.rule-group.create'))->withInput(); + return redirect(route('rule-groups.create'))->withInput(); } // redirect to previous URL. - return redirect(session('rules.rule-group.create.url')); + return redirect(session('rule-groups.create.url')); } /** @@ -265,13 +265,13 @@ class RuleGroupController extends Controller if (intval(Input::get('return_to_edit')) === 1) { // set value so edit routine will not overwrite URL: - Session::put('rules.rule-group.edit.fromUpdate', true); + Session::put('rule-groups.edit.fromUpdate', true); - return redirect(route('rules.rule-group.edit', [$ruleGroup->id]))->withInput(['return_to_edit' => 1]); + return redirect(route('rule-groups.edit', [$ruleGroup->id]))->withInput(['return_to_edit' => 1]); } // redirect to previous URL. - return redirect(session('rules.rule-group.edit.url')); + return redirect(session('rule-groups.edit.url')); } } diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php index dec743e7c6..339855c695 100644 --- a/app/Http/breadcrumbs.php +++ b/app/Http/breadcrumbs.php @@ -604,29 +604,36 @@ Breadcrumbs::register( } ); Breadcrumbs::register( - 'rules.rule-group.create', function (BreadCrumbGenerator $breadcrumbs) { + 'rule-groups.create', function (BreadCrumbGenerator $breadcrumbs) { $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.make_new_rule_group'), route('rules.rule-group.create')); + $breadcrumbs->push(trans('firefly.make_new_rule_group'), route('rule-groups.create')); } ); Breadcrumbs::register( - 'rules.rule-group.edit', function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) { + 'rule-groups.edit', function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) { $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]), route('rules.rule-group.edit', [$ruleGroup])); + $breadcrumbs->push(trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.edit', [$ruleGroup])); } ); Breadcrumbs::register( - 'rules.rule-group.delete', function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) { + 'rule-groups.delete', function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) { $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]), route('rules.rule-group.delete', [$ruleGroup])); + $breadcrumbs->push(trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.delete', [$ruleGroup])); } ); Breadcrumbs::register( - 'rules.rule-group.select_transactions', function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) { + 'rule-groups.select-transactions', function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) { + $breadcrumbs->parent('rules.index'); + $breadcrumbs->push(trans('firefly.rule_group_select_transactions', ['title' => $ruleGroup->title]), route('rule-groups.select-transactions', [$ruleGroup])); +} +); + +Breadcrumbs::register( + 'rule-groups.select_transactions', function (BreadCrumbGenerator $breadcrumbs, RuleGroup $ruleGroup) { $breadcrumbs->parent('rules.index'); $breadcrumbs->push( - trans('firefly.execute_group_on_existing_transactions', ['title' => $ruleGroup->title]), route('rules.rule-group.select_transactions', [$ruleGroup]) + trans('firefly.execute_group_on_existing_transactions', ['title' => $ruleGroup->title]), route('rule-groups.select_transactions', [$ruleGroup]) ); } ); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 5b9ba90e21..fb82d0af87 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -194,6 +194,7 @@ return [ 'warning_no_matching_transactions' => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.', 'warning_no_valid_triggers' => 'No valid triggers provided.', 'execute_on_existing_transactions' => 'Execute for existing transactions', + 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions', 'execute_on_existing_transactions_intro' => 'When a rule or group has been changed or added, you can execute it for existing transactions', 'execute_on_existing_transactions_short' => 'Existing transactions', 'executed_group_on_existing_transactions' => 'Executed group ":title" for existing transactions', diff --git a/tests/acceptance/Controllers/RuleGroupControllerTest.php b/tests/acceptance/Controllers/RuleGroupControllerTest.php index 586e4002bf..b61a95409e 100644 --- a/tests/acceptance/Controllers/RuleGroupControllerTest.php +++ b/tests/acceptance/Controllers/RuleGroupControllerTest.php @@ -8,6 +8,9 @@ * * See the LICENSE file for details. */ +use Carbon\Carbon; +use FireflyIII\Models\RuleGroup; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; /** @@ -28,121 +31,143 @@ class RuleGroupControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::create - * Implement testCreate(). */ public function testCreate() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rule-groups.create')); + $this->assertResponseStatus(200); + $this->see('
                                                  '); } /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::delete - * Implement testDelete(). */ public function testDelete() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rule-groups.delete', [1])); + $this->assertResponseStatus(200); + $this->see('
                                                    '); } /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::destroy - * Implement testDestroy(). */ public function testDestroy() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $repository->shouldReceive('destroy'); + + $this->session(['rule-groups.delete.url' => 'http://localhost']); + $this->be($this->user()); + $this->call('post', route('rule-groups.destroy', [1])); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + $this->assertRedirectedToRoute('index'); } /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::down - * Implement testDown(). */ public function testDown() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rule-groups.down', [1])); + $this->assertResponseStatus(302); + $this->assertRedirectedToRoute('rules.index'); } /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::edit - * Implement testEdit(). */ public function testEdit() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rule-groups.edit', [1])); + $this->assertResponseStatus(200); + $this->see('
                                                      '); } /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::execute - * Implement testExecute(). */ public function testExecute() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->session(['first' => new Carbon('2010-01-01')]); + $data = [ + 'accounts' => [1], + 'start_date' => '2010-01-02', + 'end_date' => '2010-01-02', + ]; + $this->be($this->user()); + $this->call('post', route('rule-groups.execute', [1]), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); + $this->assertRedirectedToRoute('rules.index'); } /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::selectTransactions - * Implement testSelectTransactions(). */ public function testSelectTransactions() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rule-groups.select-transactions', [1])); + $this->assertResponseStatus(200); + $this->see('
                                                        '); } /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::store - * Implement testStore(). */ public function testStore() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->session(['rule-groups.create.url' => 'http://localhost']); + $data = [ + 'title' => 'A', + 'description' => '', + ]; + + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $repository->shouldReceive('store')->andReturn(new RuleGroup); + $repository->shouldReceive('find')->andReturn(new RuleGroup); + + $this->be($this->user()); + $this->call('post', route('rule-groups.store', [1]), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); } /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::up - * Implement testUp(). */ public function testUp() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('rule-groups.up', [1])); + $this->assertResponseStatus(302); + $this->assertRedirectedToRoute('rules.index'); } /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::update - * Implement testUpdate(). */ public function testUpdate() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $data = [ + 'title' => 'C', + 'description' => 'XX', + ]; + $this->session(['rule-groups.edit.url' => 'http://localhost']); + + $repository = $this->mock(RuleGroupRepositoryInterface::class); + $repository->shouldReceive('update'); + $repository->shouldReceive('find')->andReturn(new RuleGroup); + + $this->be($this->user()); + $this->call('post', route('rule-groups.update', [1]), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); } } From b581d8ecb703748fc5af3178247d6772f8199316 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 21:11:18 +0100 Subject: [PATCH 012/150] New translations --- resources/lang/pt_BR/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 7f37dc32cf..5c725f1e38 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -194,6 +194,7 @@ return [ 'warning_no_matching_transactions' => 'Nenhuma transação correspondente encontrada. Por favor note que por motivos de desempenho, apenas as últimas :num_transactions transações tenham sido verificadas.', 'warning_no_valid_triggers' => 'Sem gatilhos válidos fornecidos.', 'execute_on_existing_transactions' => 'Executar transações existentes', + 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions', 'execute_on_existing_transactions_intro' => 'Quando uma regra ou um grupo for alterado ou adicionado, você pode executá-lo para transações existentes', 'execute_on_existing_transactions_short' => 'Transações existentes', 'executed_group_on_existing_transactions' => 'Executado o grupo ":title" para transações existentes', From 77aa36163d9f21ab67e88d68874e21ea02a863a5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 21:11:38 +0100 Subject: [PATCH 013/150] New translations --- resources/lang/zh_HK/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 775ca7d7e4..7fea774d2b 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -194,6 +194,7 @@ return [ 'warning_no_matching_transactions' => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.', 'warning_no_valid_triggers' => 'No valid triggers provided.', 'execute_on_existing_transactions' => 'Execute for existing transactions', + 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions', 'execute_on_existing_transactions_intro' => 'When a rule or group has been changed or added, you can execute it for existing transactions', 'execute_on_existing_transactions_short' => 'Existing transactions', 'executed_group_on_existing_transactions' => 'Executed group ":title" for existing transactions', From ea2779cf9a8e2f32c14a36c643d0b55ec2af3455 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 21:11:41 +0100 Subject: [PATCH 014/150] New translations --- resources/lang/zh_TW/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index dd4437aed6..bd95d83674 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -194,6 +194,7 @@ return [ 'warning_no_matching_transactions' => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.', 'warning_no_valid_triggers' => 'No valid triggers provided.', 'execute_on_existing_transactions' => 'Execute for existing transactions', + 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions', 'execute_on_existing_transactions_intro' => 'When a rule or group has been changed or added, you can execute it for existing transactions', 'execute_on_existing_transactions_short' => 'Existing transactions', 'executed_group_on_existing_transactions' => 'Executed group ":title" for existing transactions', From 876a24586f539e8db9ae105b3205d082e89f3c51 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 21:11:47 +0100 Subject: [PATCH 015/150] New translations --- resources/lang/fr_FR/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 4379397bf9..11ff42a328 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -194,6 +194,7 @@ return [ 'warning_no_matching_transactions' => 'Aucunes opérations correspondantes trouvées. Veuillez noter que pour des raisons de performances, seule les dernières :num_transactions opérations ont été vérifiées.', 'warning_no_valid_triggers' => 'Aucun déclencheurs valide fourni.', 'execute_on_existing_transactions' => 'Exécuter des opérations existantes', + 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions', 'execute_on_existing_transactions_intro' => 'Lorsqu’une règle ou un groupe a été modifié ou ajouté, vous pouvez l’exécuter pour des opérations existantes', 'execute_on_existing_transactions_short' => 'Opérations existantes', 'executed_group_on_existing_transactions' => 'Exécution groupe « : titre » pour les transactions existantes', From a752ea489ca4ddf525a67f59ee709788d420cd26 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 21:11:51 +0100 Subject: [PATCH 016/150] New translations --- resources/lang/de_DE/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index e9e49f72fa..e405a8c927 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -194,6 +194,7 @@ return [ 'warning_no_matching_transactions' => 'Keine übereinstimmenden Überweisungen gefunden. Aus Kapazitätgründen werden nur die letzten :num_transactions Überweisungen überprüft.', 'warning_no_valid_triggers' => 'Keine gültigen Trigger gefunden.', 'execute_on_existing_transactions' => 'Führe für bestehende Überweisungen aus', + 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions', 'execute_on_existing_transactions_intro' => 'Wenn eine Regel oder eine Gruppe geändert oder hinzugefügt wurde, können Sie für bestehende Überweisungen ausgeführt werden', 'execute_on_existing_transactions_short' => 'Bestehende Überweisungen', 'executed_group_on_existing_transactions' => 'Regelgruppe ":title" wurde für bestehende Überweisungen ausgeführt', From d733c9ed142c9d9b4842abd2c5c26f1c89de1157 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 21:11:57 +0100 Subject: [PATCH 017/150] New translations --- resources/lang/hr_HR/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 775ca7d7e4..7fea774d2b 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -194,6 +194,7 @@ return [ 'warning_no_matching_transactions' => 'No matching transactions found. Please note that for performance reasons, only the last :num_transactions transactions have been checked.', 'warning_no_valid_triggers' => 'No valid triggers provided.', 'execute_on_existing_transactions' => 'Execute for existing transactions', + 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions', 'execute_on_existing_transactions_intro' => 'When a rule or group has been changed or added, you can execute it for existing transactions', 'execute_on_existing_transactions_short' => 'Existing transactions', 'executed_group_on_existing_transactions' => 'Executed group ":title" for existing transactions', From 0a82ed901e871ad2173e4b9cd3d253a6bf0fbe46 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 21:12:00 +0100 Subject: [PATCH 018/150] New translations --- resources/lang/nl_NL/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 9cc7d21fc3..efea3bfdb1 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -194,6 +194,7 @@ return [ 'warning_no_matching_transactions' => 'Niks gevonden in je laatste :num_transactions transacties.', 'warning_no_valid_triggers' => 'Geen geldige triggers gevonden.', 'execute_on_existing_transactions' => 'Toepassen op bestaande transacties', + 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions', 'execute_on_existing_transactions_intro' => 'Wanneer een regel of groep is veranderd of toegevoegd, kun je hem hier uitvoeren voor bestaande transacties', 'execute_on_existing_transactions_short' => 'Bestaande transacties', 'executed_group_on_existing_transactions' => 'Regelgroep ":title" is uitgevoerd op bestaande transacties', From 6b6a799206346ce749c8f0f449f48ed47f28a7fb Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 18 Dec 2016 21:41:01 +0100 Subject: [PATCH 019/150] Translated --- resources/lang/fr_FR/auth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/fr_FR/auth.php b/resources/lang/fr_FR/auth.php index 5d833b3d68..7fc7beebaa 100644 --- a/resources/lang/fr_FR/auth.php +++ b/resources/lang/fr_FR/auth.php @@ -22,7 +22,7 @@ return [ | */ - 'failed' => 'These credentials do not match our records.', - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + 'failed' => 'Ces identifiants n\'ont aucune correspondance.', + 'throttle' => 'Trop de tentatives de connexion. Veuillez essayer à nouveau dans :seconds secondes.', ]; \ No newline at end of file From b1764478ecca7306600640bee8ad081fd25899ea Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 10:11:53 +0100 Subject: [PATCH 020/150] Translated --- resources/lang/fr_FR/breadcrumbs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php index 2b371073db..5211db8cfe 100644 --- a/resources/lang/fr_FR/breadcrumbs.php +++ b/resources/lang/fr_FR/breadcrumbs.php @@ -34,7 +34,7 @@ return [ 'create_transfer' => 'Creer un nouveau virement', 'edit_journal' => 'Éditer la transaction ":description"', 'delete_journal' => 'Supprimer la transaction ":description"', - 'tags' => 'Tags', + 'tags' => 'Mots-clés', 'createTag' => 'Créer un nouveau tag', 'edit_tag' => 'Éditer le tag ":tag"', 'delete_tag' => 'Supprimer le tag ":tag"', From 7fffebf6df4fa52200925c75931d496f1c96275c Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 10:21:22 +0100 Subject: [PATCH 021/150] New translations --- resources/lang/fr_FR/csv.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index 37f1a5728d..1757479204 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -14,7 +14,7 @@ declare(strict_types = 1); return [ 'import_configure_title' => 'Configurer l\'import', - 'import_configure_intro' => 'Il y a des options pour l\'import CSV. Veuillez indiquer si votre fichier CSV contient les en-têtes dans la première colonne, et quel est le format de la date de votre champs date. Cela peut nécessiter quelques essais. Le délimiteur de champ est généralement un «, », mais pourrait également être un « ; ». Cochez cette case avec soin.', + 'import_configure_intro' => 'Il y a des options pour l\'import CSV. Veuillez indiquer si votre fichier CSV contient les en-têtes dans la première colonne, et quel est le format des dates de vos champs date. Cela peut nécessiter quelques essais. Le délimiteur de champ est généralement un « , », mais pourrait également être un « ; ». Cochez cette case avec soin.', 'import_configure_form' => 'Basic CSV import options', 'header_help' => 'Cochez cette case si la première ligne de votre fichier CSV contient les entêtes des colonnes', 'date_help' => 'Le format de la date et de l’heure dans votre fichier CSV. Utiliser les formats comme indiqué sur cette page. La valeur par défaut va extraire les dates qui ressemblent à ceci: :dateExample.', @@ -34,7 +34,7 @@ return [ 'store_column_roles' => 'Continuer l\'import', 'do_not_map' => '(Ne pas mapper)', 'map_title' => 'Lier les données importées aux données Firefly III', - 'map_text' => 'In the following tables, the left value shows you information found in your uploaded CSV file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', + 'map_text' => 'Dans les tableaux suivants, la valeur gauche vous montre des informations trouvées dans votre fichier CSV téléchargé. C’est votre rôle de mapper cette valeur, si possible, une valeur déjà présente dans votre base de données. Firefly s’en tiendra à ce mappage. Si il n’y a pas de valeur correspondante, ou vous ne souhaitez pas la valeur spécifique de la carte, ne sélectionnez rien.', 'field_value' => 'Valeur du champ', 'field_mapped_to' => 'Mappé à', @@ -68,11 +68,11 @@ return [ 'column_opposing-id' => 'Compte destination(ID correspondant Firefly)', 'column_external-id' => 'Identifiant externe', 'column_opposing-name' => 'Compte destination (nom)', - 'column_rabo-debet-credit' => 'Rabobank specific debet/credit indicator', - 'column_ing-debet-credit' => 'ING specific debet/credit indicator', + 'column_rabo-debet-credit' => 'Indicateur spécifique débit/crédit à Rabobank', + 'column_ing-debet-credit' => 'Indicateur spécifique débit/crédit à ING', 'column_sepa-ct-id' => 'SEPA Credit Transfer end-to-end ID', 'column_sepa-ct-op' => 'SEPA Credit Transfer opposing account', - 'column_sepa-db' => 'SEPA Direct Debet', + 'column_sepa-db' => 'SEPA débit immédiat', 'column_tags-comma' => 'Tags (séparé par des virgules)', 'column_tags-space' => 'Tags(séparé par des espaces)', 'column_account-number' => 'Compte d’actif (numéro de compte)', From 286b1848d9fcc76bac69a6b911426773d29c31fd Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 10:31:15 +0100 Subject: [PATCH 022/150] New translations --- resources/lang/fr_FR/csv.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index 1757479204..f8182ede91 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -17,9 +17,9 @@ return [ 'import_configure_intro' => 'Il y a des options pour l\'import CSV. Veuillez indiquer si votre fichier CSV contient les en-têtes dans la première colonne, et quel est le format des dates de vos champs date. Cela peut nécessiter quelques essais. Le délimiteur de champ est généralement un « , », mais pourrait également être un « ; ». Cochez cette case avec soin.', 'import_configure_form' => 'Basic CSV import options', 'header_help' => 'Cochez cette case si la première ligne de votre fichier CSV contient les entêtes des colonnes', - 'date_help' => 'Le format de la date et de l’heure dans votre fichier CSV. Utiliser les formats comme indiqué sur cette page. La valeur par défaut va extraire les dates qui ressemblent à ceci: :dateExample.', + 'date_help' => 'Le format de la date et de l’heure dans votre fichier CSV. Utiliser les formats comme indiqué sur cette page. La valeur par défaut va analyser les dates ressemblant à ceci: :dateExample.', 'delimiter_help' => 'Choisissez le délimiteur de champ qui est utilisé dans votre fichier d’entrée. Si vous n’êtes pas certain, la virgule est l’option la plus sûre.', - 'import_account_help' => 'Si votre fichier CSV ne contient AUCUNE informations concernant vos compte(s) actif, utilisez cette liste déroulante pour choisir à quel compte les opérations contenues dans le CSV font référence.', + 'import_account_help' => 'Si votre fichier CSV ne contient AUCUNE information concernant vos compte(s) actif, utilisez cette liste déroulante pour choisir à quel compte les opérations contenues dans le CSV font référence.', 'upload_not_writeable' => 'La case grise contient un chemin d’accès. Il devrait être accessible en écriture. Veuillez vous en assurer.', // roles From 436c034fdd8b0eb0815a072e84696e111f71ba33 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 11:51:37 +0100 Subject: [PATCH 023/150] New translations --- resources/lang/fr_FR/csv.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index f8182ede91..2da66f7da6 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -20,19 +20,19 @@ return [ 'date_help' => 'Le format de la date et de l’heure dans votre fichier CSV. Utiliser les formats comme indiqué sur cette page. La valeur par défaut va analyser les dates ressemblant à ceci: :dateExample.', 'delimiter_help' => 'Choisissez le délimiteur de champ qui est utilisé dans votre fichier d’entrée. Si vous n’êtes pas certain, la virgule est l’option la plus sûre.', 'import_account_help' => 'Si votre fichier CSV ne contient AUCUNE information concernant vos compte(s) actif, utilisez cette liste déroulante pour choisir à quel compte les opérations contenues dans le CSV font référence.', - 'upload_not_writeable' => 'La case grise contient un chemin d’accès. Il devrait être accessible en écriture. Veuillez vous en assurer.', + 'upload_not_writeable' => 'Le champ grisé contient un chemin d’accès. Il devrait être accessible en écriture. Veuillez vous en assurer.', // roles 'column_roles_title' => 'Définir le rôle des colonnes', 'column_roles_table' => 'Tableau', 'column_name' => 'Nom de colonne', - 'column_example' => 'Exemple', + 'column_example' => 'Données d’exemple de colonne', 'column_role' => 'Sens de la donnée', 'do_map_value' => 'Mapper ces valeurs', 'column' => 'Colonne', 'no_example_data' => 'Pas de données disponibles', 'store_column_roles' => 'Continuer l\'import', - 'do_not_map' => '(Ne pas mapper)', + 'do_not_map' => '(ne pas mapper)', 'map_title' => 'Lier les données importées aux données Firefly III', 'map_text' => 'Dans les tableaux suivants, la valeur gauche vous montre des informations trouvées dans votre fichier CSV téléchargé. C’est votre rôle de mapper cette valeur, si possible, une valeur déjà présente dans votre base de données. Firefly s’en tiendra à ce mappage. Si il n’y a pas de valeur correspondante, ou vous ne souhaitez pas la valeur spécifique de la carte, ne sélectionnez rien.', From 40cc32fc5a4891cf6f2f668516c9233e76d06ea8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 17:15:31 +0100 Subject: [PATCH 024/150] Updated favicon. --- public/android-chrome-144x144.png | Bin 3603 -> 0 bytes public/android-chrome-192x192.png | Bin 4807 -> 14879 bytes public/android-chrome-36x36.png | Bin 1032 -> 0 bytes public/android-chrome-48x48.png | Bin 1307 -> 0 bytes public/android-chrome-512x512.png | Bin 0 -> 31871 bytes public/android-chrome-72x72.png | Bin 1867 -> 0 bytes public/android-chrome-96x96.png | Bin 2449 -> 0 bytes public/android-chrome-manifest.json | 41 ------------- public/apple-touch-icon-114x114.png | Bin 2088 -> 0 bytes public/apple-touch-icon-120x120.png | Bin 2205 -> 0 bytes public/apple-touch-icon-144x144.png | Bin 2666 -> 0 bytes public/apple-touch-icon-152x152.png | Bin 2782 -> 0 bytes public/apple-touch-icon-180x180.png | Bin 3298 -> 0 bytes public/apple-touch-icon-57x57.png | Bin 1155 -> 0 bytes public/apple-touch-icon-60x60.png | Bin 1195 -> 0 bytes public/apple-touch-icon-72x72.png | Bin 1393 -> 0 bytes public/apple-touch-icon-76x76.png | Bin 1460 -> 0 bytes public/apple-touch-icon-precomposed.png | Bin 4747 -> 0 bytes public/apple-touch-icon.png | Bin 3298 -> 10757 bytes public/browserconfig.xml | 7 +-- public/favicon-16x16.png | Bin 608 -> 1457 bytes public/favicon-194x194.png | Bin 4837 -> 0 bytes public/favicon-32x32.png | Bin 941 -> 2325 bytes public/favicon-96x96.png | Bin 2449 -> 0 bytes public/favicon.ico | Bin 15086 -> 15086 bytes public/manifest.json | 58 +++++-------------- public/mstile-144x144.png | Bin 3582 -> 0 bytes public/mstile-150x150.png | Bin 3554 -> 10455 bytes public/mstile-310x150.png | Bin 3828 -> 0 bytes public/mstile-310x310.png | Bin 7630 -> 0 bytes public/mstile-70x70.png | Bin 2468 -> 0 bytes public/safari-pinned-tab.svg | 74 +++++++++++++----------- resources/views/partials/favicons.twig | 24 ++------ 33 files changed, 62 insertions(+), 142 deletions(-) delete mode 100644 public/android-chrome-144x144.png delete mode 100644 public/android-chrome-36x36.png delete mode 100644 public/android-chrome-48x48.png create mode 100644 public/android-chrome-512x512.png delete mode 100644 public/android-chrome-72x72.png delete mode 100644 public/android-chrome-96x96.png delete mode 100644 public/android-chrome-manifest.json delete mode 100644 public/apple-touch-icon-114x114.png delete mode 100644 public/apple-touch-icon-120x120.png delete mode 100644 public/apple-touch-icon-144x144.png delete mode 100644 public/apple-touch-icon-152x152.png delete mode 100644 public/apple-touch-icon-180x180.png delete mode 100644 public/apple-touch-icon-57x57.png delete mode 100644 public/apple-touch-icon-60x60.png delete mode 100644 public/apple-touch-icon-72x72.png delete mode 100644 public/apple-touch-icon-76x76.png delete mode 100644 public/apple-touch-icon-precomposed.png delete mode 100644 public/favicon-194x194.png delete mode 100644 public/favicon-96x96.png delete mode 100644 public/mstile-144x144.png delete mode 100644 public/mstile-310x150.png delete mode 100644 public/mstile-310x310.png delete mode 100644 public/mstile-70x70.png diff --git a/public/android-chrome-144x144.png b/public/android-chrome-144x144.png deleted file mode 100644 index 0fbc935ef5611eb1be5c2768df52ad1fb822e658..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3603 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 V55H%4HSa6}fH1K%t}}Ea{tsFUcSryL diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png index fb8549caefb1450087e75870675b06d844da29ec..e0c3f93dd292afa6b5734702cb7c8fb07c2ff5fb 100644 GIT binary patch literal 14879 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 diff --git a/public/android-chrome-36x36.png b/public/android-chrome-36x36.png deleted file mode 100644 index c101427bd709a6d0970a2500873497ac4b0d4091..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1032 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTOS+@4BLl<6e(pbstU$g(vPY0F z14ES>14Ba#1H&(%P{RubhEf9thF1v;3|2E37{m+a>{XE)7O>#0h5T3jz$jev;#m*Gdx`!Lp+Ypy%v};HC5*L z$Mf5a&-bLfjJn-4$4GYaRj+oZhrZ%>d3H_s;HIw=#L1D+s|@*tb7omJHfAcU(qdY3x)kHoK60#kH7hl?IZPdV&TC( z+Ih$G_e+PrMs80I6mMGgcPiVIi|v}O zCO7)_)Q8WDu&l~;-(J_5xBJ5k#{VaNx(2O1BfTfn!mP$E?<7m-BKzERV!_W3&xkNe zkK6QQ@uY+!)3Us|_f3?z@H+i{WkPegt^UWE?^V}HtSxixE{rKq>bo!0GgUit>$PF6?-gqi>A%b)$heP>)Ko9(Jtp|d;A`H7tJUCVQ8P4GdT7n^)frdS1R-pY0H zq;1rb-lfc`sb_YwM_rj|G?8zMUvp&nMvbq$<(C?F8RW2Sd9PYjujnh{tGt# zITpovW!d>y=LMHHzql}k?aE_K%k7JtbTu@VG1@LZIai~!T_rB`L93fJWDW|V{p$XpA!X^<^b5_xX|^R|kMlAoLI zmo$FmJ6c?KrE-4At(5pu{k+B8d9y@WgyWnR+t$UDrNmzjk6W()zuc2UZ4Xo5F>RlV zrRj4&wXM~jZPYxeaA|v%zNFy`nQKx9Its;Wa@Sm9+~Se{c@|^z)|n;eCdkM1)>oVE zPP}y|>+Uc9E1rM8O;C}t1SVV664!{5l*E!$tK_0oAjM#0U}&amV5Dng5MpRyWnyAw zVxVncXk}pV>Vz~X+aNUL=BH$)RpQn#d+OqyKn>wlArU1(iRB6fMfqu&IjIUIl?AB^ znFS@u3=9=>9)IHDC=AokIOTu(jOWuJ24-b$y<~1-Wnu5hBFw@HE)6D!Q<#-EhbWxB oaplC3Ge=~Ou%B-5Sm33{@Jd{;RG<|Mp00i_>zopr01OVW;{X5v diff --git a/public/android-chrome-48x48.png b/public/android-chrome-48x48.png deleted file mode 100644 index 3817a33ab751abf353d68aa38077d8eb24788ffe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1307 zcmV+$1?2jPP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 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 literal 0 HcmV?d00001 diff --git a/public/android-chrome-72x72.png b/public/android-chrome-72x72.png deleted file mode 100644 index 92ae9f437bd363ebd99f28bead3fdd57a5a704ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1867 zcmZ`)X*e6`8vTR_68lakVyCqvgvVC3#1blqT`_jah(Q`-X|HB#E7~VjiLFsoOBb!3 zqM1&LS}SPlMvK*J3(*V^w<2lKhArebKd7X=imDl`w={(r8J}f0Md9*98t)g zKOi9{oQG>?CWR!H; zs%h+ge+S_L66@`O1BXS7$wxvZndTXG8UVQB4~T#owwlm{(eOTQus0AT1rsBRbj6BMxnV<9D+_$3y~}Z#5lWuk6Vz6*n(7&N%r2?I?Ka7-Z_;P)@{nNl6+wwfv!twQfVGW5Gf9$sS8feQqo^$Gsb!$BivGf za#firSCtulDK1I$UyUmyl317{HD>vBou+wr;0!}n%ReS^;z-RI^&7gN)UR zL^PJw7x5k_(%q*R>$UN|IkN~hb;*E~^*r|-ae}wHLRyHvr@l1rPGP=YdJ?3tV>6DI zp%%xyy|emU33;oSi_M)T#fg@uV~YMwmKQ93TKW8Vb%CozPB&`{&-Ae3ZQG{KT)4Y! z(>AlM;C|3`mH4@%`ge#Qce(5Po?fS1K$T5b)i80Zxi&e!nqcZS`*Mn~lDMZE)HCM% z=1j0(fu>>5!@HWjj@DaWZg@eTuC#kpHFWYCT=}q2@=r1*4KV3TYQDx_#dDz3?dgTm zd3-o{?xYXi+qUpG^qyeO&xy>39_>>3CeG78@Ht;Gd38dIq?6%dk9SF`Lv7}Dg-c>< ztHBUC;M21z(=JCyFyv{H4)E_+8VE6Ha&`%ZyjTXP#4HL2Q5q9FC(;+DhppTWB$gz| zLNcuflX6{)$}<)WcP*?}4K7L>c7{FG$Yxc_t`CXx_gJFY{n01e14an@ED@|%6SaX*F=V;5u(ztu=iXrKJbCu z?zpG`*z>)0vVMJtbDRp`Zk>Z{ECiuoSu(_yvO?@MT#g~HcV4z%?N_HKUp$=}W-J790% zG*uH^HtI*h>&sxWM@2{U)Dhv5rzGPm*K>+yixP?YT|FkJCKYd;te~D^ZinD8ApF<9 zn9okgL=m~=Td`VW@FHpB;&mtZ&;lpVvV?={sSX&gvG>dKd`vJ3(uUoIUI;MWs+I{n zYIyeP`1YIS+}pfP1ybQ?feV}XDXPhvV^KMG8hR&A3Wye3EJa%6x-y9Vmg*m(X7Y3j zDLEB{zmt|C{&3P?(8XHeyDfb(pOb&`ySa-iQb;MG4OdjLko^Ho(IZTw&AFf%9pmaA zveV6ndemWXLTxJ0^LYGdmyaSWRYBSE@5TNvNP1rc%dPO)Y^i~FdBlg!IVksr$qSYs zw`{%mc1L09s>zs@d}Y!jmThM6mGCwyM$25|Fm0}FEqJPvQl{0zU=Sc+W6zc}-d^QJ4GkL$BkV zVN=aw%ol=8#2;VUiY?=m><+>zHK!*K7k519$on_GU0Soh`OD8wlLa)6Va6FwY zs;%o_pe2W1>p?=QCSKrBBaMz_=d$+)a_!AVFljqdk&RKxNtf@k-+9-pIhgA9%`1*u zc-b;Ksd z>7ecNK%<%iW9M^0Z}|S`ay*!{}Ty z#b{5JVz`)Cbn`WL2a|a90Q{Tg>Q-_SBP#}38TB3377L);My)Nv%dby!3#G-!&=Tz8 zs0l&>7HEvMDcZu+0v(94vBP5Ru;^oGj2#;Naa8li=lLg)k{VA=%>Ms@tE|R8VIU+Y zFqB4&$wZ}5QxnOQ1QabhEdfPNqs0M`#a`V(NTdfF8IAi+Oyb`Xfv7IrEDo-ytLR;> zB&vwQ(XoT^qPm@ds0se_(V@wqBSWwWx@WzY8ThCwPup>^VhJk%-i?5}?-G6fe=l<= Axc~qF diff --git a/public/android-chrome-96x96.png b/public/android-chrome-96x96.png deleted file mode 100644 index 3602979589725e4b940849be7135cffc7dfd6a31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2449 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 Mi50r`l3Uz=0h_UBW&i*H diff --git a/public/android-chrome-manifest.json b/public/android-chrome-manifest.json deleted file mode 100644 index b07eb63253..0000000000 --- a/public/android-chrome-manifest.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "My app", - "icons": [ - { - "src": "\/android-chrome-36x36.png", - "sizes": "36x36", - "type": "image\/png", - "density": "0.75" - }, - { - "src": "\/android-chrome-48x48.png", - "sizes": "48x48", - "type": "image\/png", - "density": "1.0" - }, - { - "src": "\/android-chrome-72x72.png", - "sizes": "72x72", - "type": "image\/png", - "density": "1.5" - }, - { - "src": "\/android-chrome-96x96.png", - "sizes": "96x96", - "type": "image\/png", - "density": "2.0" - }, - { - "src": "\/android-chrome-144x144.png", - "sizes": "144x144", - "type": "image\/png", - "density": "3.0" - }, - { - "src": "\/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image\/png", - "density": "4.0" - } - ] -} diff --git a/public/apple-touch-icon-114x114.png b/public/apple-touch-icon-114x114.png deleted file mode 100644 index 498ea65bd1ed349f968168bc2af6d3dde375520b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2088 zcmV+@2-o+CP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 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 diff --git a/public/apple-touch-icon-180x180.png b/public/apple-touch-icon-180x180.png deleted file mode 100644 index c0f50f32f5b47efb9ded666e6e20e7c53098f3a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3298 zcmZ`*X*ARi7ye}pA^UDfBxWYdG-_r03sUzc)aon zMoJe0Dn~snByb*^LhQU?^jMt-8uZ_(IN8Axi62_~0e~r12dRb%nA!Li_)LFF7}$~@ zbar0gxh|fvnD*(j)sTsr>LT~8{RMBR^y8$@IbGOgqX|8A-OcK1NgH$=tvEPsL6vY@}2zvmCdJfmZ(RrnZT z=Hp!?grT>()EDv3MIlkL5*v7We=Z-U;!qI8dbDe^Cm%j36eev!`_P+3phK?4><2}< zp6ZerO4M6xjq8QSooNkPea=q4CeFlaD>fQ^o(X|IMh$Z!hK`u!-;jV@$iu@u={EnP zi&WLd(q#=f)8e1Fyo2PbVP8HXo0|I?~7yY}M*HDCHVGzc$q0el?@nzK?L*WQHMlmCfq?5Fd^? z<4&$&ciQKfezDgvdhvgg=QaeoXZUb>*VrJ>{DlsJCQ!lz!@CX}FGveGS!Al$#nJos&WgEqfX55x_dMi0#%Mk%`*$OR4lRqrCUn+MJHlsP<-pWelvjMyfDR zwNm-k4H%7cM(#1HhtYYuk*OAaocD*!xM#w-Qx?zdl@n+Oq#}@GD)8^QI_7AH5Sff(uL{*Mdr&lPjP9Q0b@-5K??@MnJ~R4^)k^Dk z%pSyMiYk|F)Xfrip6pyzD=X}|NNKP%qAYrRtAWIW%14sFlkC%zcd4$BSj&9fWifSC zZ7beyrA7?|_=xh
                                                          &%hVgbAFQ5rLPfG)^iNfP3I#$Z}Wg24ESxMugC@2A3r7R-3 zDzvY@u&~d=!!8f_ZbXMR->{nLNR5}9Y_t=HG@Sj++kE2;bcfZ`6M`&#eSE%nZH4XM zD{C2&P5hN^NFCA?3zp~o`;moW&Gw$?F88!mP^dxl>-bq)@E;O)gzaWE|L|ASd0Exz zfV;W}4gYi~cx-DECBafk{)jcN<5zkdGmb)dJ&Rq%x?-&>0()mWORVng{8bV)aIwG@ zdJcTxZqDCF4^Gitg}(NGN10|~=-R7oJw=*%=RDe0*HqQaCE<)iEZ>QRvuORkx5WYi zQ(gM4*$9Vw3K{DD9b&()HIO^IHW-X{7VkpY;H6n_9{)qh^U7}0=5&iCou>z~%}|ED zx=-&49~FziP6|-Gh}ks;{d!Oer++vlLN04NyQov9v4385F->4h9ky*ID7`Bv21dfB z{|dRlXwNET8dxM2KXk^&?)-3z#^eRx`-Ewj{rpEo7~#-1tCq0-?xE(dSYEU`^1-(G zCy##XPaU)ZyJ~kHyx{N~*ZHJfW__Kj9$D7S?T8R2cd?mxer>$r*^D3?bF;bK8h8E<&Rx3rvZ{rf*pzrm0 zTjscMUj|lPV$S%hcK5r2QkQDGsQK?IBEh6q(ovm*g|R8)G5&d&5pNL4%C)<3ZLOtP z%*S|{6twHE0J@U%A9&MD3i9SN+F@d7?X2h=!)?Utpk1R;5+6A{}HQGxU8B#bm@%x*T) zV;{*sg-g)no4e#19no^RUDpkxuJk6F(N|)19(gb#T7ugfi17>dNA%p&zT_}RBu$V> zaO3F>Z@n*U;!zi0`>JUC$S^A6w7hT4a|8UDa>&pztvR-#aK$E1+-?x zAdoF5R^#ME99S(NuDp&LO^igQKSIY)j>($YlmQKvSE&b5+c&SlDT}HC4)`PZG0#KG zkT(fu^VIu6)9@cXYJxN8V9Vu762@)G37k4MJm@2;tT0HI6!Y3(wr;>6)Nw=tKV*rk z>G4xqFtKnJ9s}DxZIV8|n(r0sROW##4#bQ(CEPEL(4xu04+~AWNkt%U>{#Mj;s z^9q>@6hFpWVbxwh_;c?#28TB(G}-bfIUE1U{n0p$T#~0@e%?bgX)YLlyzRCcI{kcQ z&sBo%(lA=`==-1`L3ARkJ|EXl3xabRG=&EF$sP566Ff%gF_>9AgEO2>uueACAG4XF z(r60YDKR(U+3jWwgx_sxldl8T4}LJ;M9h*((%5T1E!O3~-kI52NS;(FVoVsx{P5YC zt^fp%KIv`CW+i#P4^Vh#6Vgp5zFd1({Gh%QRqtQ%U2m4dekBA7Y1Qmh4(n-hg$|B6 z$~_-VOW3!TZhl?kCwl}f+uBx47^)}-|GYiap`7cV(c#L_KB29q~jyot)%XR+_su zXgcZRRWP6j1=2LXd2@c#?&oj)&3KVTk&vcMWU_=|Y?c)GYfMT=kqz0e|VURWmp2*_XBxpLXt zOj2^laG0pGYz$C~F+rV}IK(*gGB~L@M3CXI9%pK?dX&iU^!Pw8u~)E{emGpaNEZsM X@~~ld?%#fSu>#Q1FhEw{w~zcUvk diff --git a/public/apple-touch-icon-57x57.png b/public/apple-touch-icon-57x57.png deleted file mode 100644 index 414e32f2ee42a14a1901a39991ce03a663638cd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1155 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 diff --git a/public/apple-touch-icon-76x76.png b/public/apple-touch-icon-76x76.png deleted file mode 100644 index 47bd65a56d47828265739f2b88c2b2682c90d5f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1460 zcmV;l1xxygP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 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 QF-riHh($ delta 3138 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 diff --git a/public/browserconfig.xml b/public/browserconfig.xml index 6d6066d3f2..3e2ccfb6aa 100644 --- a/public/browserconfig.xml +++ b/public/browserconfig.xml @@ -2,11 +2,8 @@ - - - - - #da532c + + #2d89ef diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png index 496df9f39aea57182e7082bbb2bf8c9c7067688b..a53c31ccf4587dcfb5e91accf5155cb57acb384e 100644 GIT binary patch delta 1242 zcmZvaX;4#F6o7+Npaa%v9rUGAN3>ET2}_g;sAN`1 zV%RE+q3j_fM0Tu+I6`9p+fXbRWRWx=gs@bCQ?x93^uE@gz3;sH&N=tobI$$l(|y!x zosYIMN1;%TxSb&d_THRr$wA+Q`jW4P03Rtmbh8(CnMY<7#L~H!h^avr7y;yrkl36H zf;tXUKqaOI(s`HC3ga&G$;o#p@wbR!DFI+tiXb{Jhe&1zrrq#stU9%&b^>{r`7sP$ zguMRb@)MVJ6%KfSnEIUKZxe3{nY@zkR+TQBoL=0T(utZKRxHgClmsox9e}x^!md0z zsBhg%%?>XVXAUWXCmwoCDcs-44;tF-CL5rU8i>XvWfUhG`oi?B`!&^jUe-dB5{QvU zP2m$YZTR)47(?5>R}Ih~QfN#BH7o9FT0E9I?Tm^8%L;ptK2g%Pc;U)aP0wI4pMH_Q#` z_0JdPUrfIqD3fuO>K4^NYrg14T}RQ2vF^IgqO`(zaE9;iF>|Xko@=_woA^ZySvBni zSBn#A99|^chg{6;?4Vx%d&(UW;6FN{)Qt5kE{x3U9_U;4KIxa`RIod{E4TVEa32<& zQYtUYEKjBL$fjNlfH9%%1+>Hu?rL?<7W8Vsud-DzGc#zI{RLdX<38z)GDfL1tGnjd zWWyeS9Z=lb+8S@u^`JN?6o(ZYfc$+Zf)O^ENXSeuA~OlGZy&ZanoRKeLf#I7(F8Af z5{zpbFuY6v5%Aw@|0yQ$F~XbRSth_H7=}%VhQx!h34hT3RS?fC9^cguM(@it&RgZQ zX@+T`iZ~JkS}=?9KkGA?sr@+~7#}D5g)>p8j8Nn?(+HNY1E(eH+_%1#I-6ae+Bm!V zyNrN6yU+QY3WbI#!uUqFVmI{OVd-?R>l?f`@i0;29{cd z*zfm{u;2b58LqeHv|96A&9;a6#H!1^Y46JAQPZCl1`nxiuz2R&KqZ0Gb2{Af%68vF zR0~^;FRw&>Q9+mAThG0VaX*Ug==iGnf_v(!%-u_ozE0a=gXZ(avWO>z1qaXO9s1JY&?9l(KDHmlZ_p!!@k}xti*Nre zX0H6#0ZPA%Bi70JFb>n)Ad@yp?wg}5&QrYUi)>s`o*5c)!{gjML*0&fx#7KzevNT; z^Ky0d6rbBw)NO`7`G1Rk>nqIwIGW`f#tKP_VX-3_R1}-dc8*V^F)5MBROci{tnkf= K&x=;flKugO42nPi delta 387 zcmdnU{eWeHBnJxv1H;x|=C39y+SM~KC3(BMF#K=tKeHbw%vs8StN)Ex*E`rzr}7@~2$^n$JaVMdXo50~FE3039rUFECoktL+O zJ3nFLZF+9Eye=UoY}M-f%W5TEwd>vDqh(CrUutOSlIw~N z4=!2w?o?5^^N|_q?DM9|?)qzbSl8k3@*dsDM%%4%<~~0KjGk}I+{)~^{*h7B|He%% zGp65jIJ9Nbnvm7Exz0#@RZxDiR@TEPdeW5bZ)2{m+2HxtHzmUH@YXKjO6yfj?nP&x zx0uv;TW?N0(Gt6S)mc^hCC@DkR3H52pS+tzQo_JU*T^8m(89{Z#LC!G+rZGuz@T($ T`1#3ia7eP8cwao(i8UVpf^D6R diff --git a/public/favicon-194x194.png b/public/favicon-194x194.png deleted file mode 100644 index 25d5884833261c329fe86d572cf9538c51f9ca41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4837 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 Ch1}l& diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png index c729437261223a29f0b9a4b5062a4d2645200625..da1a8b0f371b988faee384c495d8cabae3ebd14a 100644 GIT binary patch delta 2116 zcmV-K2)p;K2bB_#83+ad0047(di0SYKYs>dOGiWi{{a60|De66lK=n!32;bRa{vH* zQ~&^cQ~}kF?|uLP00(qQO+^Rb3=R9M5Mm)nmV)e**jb-H_| zXJ#*6doS2tW8*dJ7+6>bD+D591kP1TBBY4CM3M3y@lT*UCCWdLm*go?Bt)W+3x6O1 zk-;DgnApaKU04U~wRhKh^UkGvy3aY4hn~HR*MbS>Pvt``s^}-FAoB`lS>`jP1RP z;enxzJ+FS-qpAS(RBDXx8>7Fc?|*Z_-fo3ky_vjwf+voClclv4{`Bf|G}DBUfgy}B zpq&>5RvR~{w;DV)`3)uyO)!0BhCjddH?ns2#Q^}sQJF9diA!aS7)Az$cXPH}B;Mn1#JUITqX6QT1t7q@v zZl3t+aS-91sef~Iaqf#!pgRQs4~*T%!}lCxM^8V23DBDn03yNzWA`$)=KvqgUgE{K zUnaNq%L7o9{#qYHI|gyy0e^}Sv+>o$A7$2%H@Swl6JCD+lqqH<*fqeFI{A%zKYj^s=XzrKOJA-{^3U8 z5mdX1C;;{XzW@#ZKYs&OHkA;i8dn(~JxDdKvDT{d>HHN$gj!ssTq?8HtYeJOQ|Y1J zYG9q^%Jr)q?}bA<6OIhFjMLB6gA>5lfET)?c;C<-Ms^Mp1rgtS=mamGeg)?pj~{)M z9X#;U=0VtMTv*`{(LB2=rfSchA-e6E^)V+A>pDW^m5( z#)Z>3bqK=wOBboP>KGI9NZ;#zWLFY+Zm<8UP%cMets&3-X2%r>gTi8gTF z5U``x&-WiX!Qp*}_~6rN7FMp)&NG4_pcIr@TYsxdshw*%E^8PBh!_FIIj>okk)&NupaU-2sv`+IOC&ZBw0#sa{^<;PR&XC#*{j3o3!0l z=`^d(h%Uubc$sCJ?L!sO&PWlLv6TvaQug!eCfKqF~z?|~!i9~s@?#<~)fN{}kj zY$3*=#-K$4Q16TI0#b>w<#Lg8K*c~{5F<#IV_OM@if#p9#E{vH^Or92+{x#ex%QuJ z14k4hy*+3Y;#G^fZf8iAW1PbngH|i}N`D0j0!*odluDQ|C~T!|e6t14L6+Yn#b3Ge zZXQ4SC=08LJpaZEoS8ny!QBToXMTm;iiRPkw->BMokM*w!D(P13=w0HEW>6we*LKT z;4D~&2?BhrTI_YDVBhdwh6jeI##Q>NyXt51S5zl>OAB**c@X5d?oI*mW~jGg%BBISO7li0w5yHEzk3pQ~$W_qzlS) zwpVtBYkDxcW~}pF9PWJjARy_f5l)BUE%kZeSaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQZkJ_B#xz4V>{ delta 722 zcmV;@0xkWO60HZ283+Ub007x@vVV~wKYs#ZOGiWi|A&vvzW@LL32;bRa{vGf6951U z69E94oEQKA00(qQO+^Rb0u&M~C;YODQ2+n}JxN4CR7l5_)k|#5Q547V&$QEOr>#ee zK@;y(qr@XZ#49%TR@g`+#8Sj7RzxIXX=P_)OAyb9h37)zU8yQ6A*4*HXsfNx^ncp? zB`x!xcFx`1{C?ka?m7Q^{}dM~`+btr<)W2ix7CLp39BizB;FLju_zI)oS{1VKNr5RKQo)xIzP$nrcQW#f3(4$wvM*%aj<7e| z2=*D&;i;2WsZ}1|frJgtd23LYa}HV*?KjwLnW=?e?mwpR%rkWGKmop!9|##3FfuJN zFjO%(Iy5voGdU|TF*-0Xb(L4olTZj57%(y|GB8vzI65>mIx{&dFflqXFa*f&bCaeB EZ`&+L0ssI2 diff --git a/public/favicon-96x96.png b/public/favicon-96x96.png deleted file mode 100644 index 555cb24669a4855cb0b339dab89430a3c4ac5027..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2449 zcmZ`*X*|>m7ycW=46=-|D+VcL8=91D&^u%>#Ed;Zxfse05m)hU=w*b9N}SZhXa79GXM~m2mps1DefBpgdzc8)g1uz@&Q0H zsJPYEfHMHyvb>4`j#C~Cc5)bBkhyaR00_YUEiRz2Sc)S;C|H~+^oCK9f1}pFZ0WJ+7RIK5(oG7fcwe& z`qR;PU)hf$V@^JP|77N~9B@{yJ{1+>{P7>|i6CKMaia6>ygLn>r$}Mpq_E1^wY{Ou zIVx#yW3WABbCVr1#2#w@`O7dwu5(Afllw-t>b?whMakqLbT*n{Ib+F1*>Hn*eKX0IiV_ddzt3zH>%D&3J) zmS|*pe&B+QxMWAEJSpjgHDAULe8(VZPTR1+Q`k{5k8yUT2+mf}!C%<%SHI~c4-;g! zML$@b?<(#4v+=bft+VY~ zlcbIF(mN9VlfZy=`!uK>vE`Z&mT!xL6I-kfc?&TsNTnM}^~q7{ou#+wF+8Cz=yzGs zMqf|HzbwRxe0g;xw!MB8qWkqCNc{SXMe6=Yg)qM%Wpw=_h=vi~^kh}M_|r67@73Bx z5N^WvAn=UUp`VY)pK_v{oewi}H_rx)y%>8g@cSUPUm6tSKpV@)ZjRpvQX}pgi>qSZ z%^cMS9)+d%WBTX$kitt$WyLa`dDlm6*u3L=1P$}8a%aSZ@`cZp_EmR*Oj*# zaBYn<{j69(OjJmueFI-~vRo0P3Oi1`6HXdNt$syIOtDTLmyi3}Qx9DVV|Ps7kEI zb7Lt~DEJ=MVjEUQFPWzvS1B7y6E_~?z7I%>mz0o(Rt|r?PziwqhE3JQ>-$eLx!G43 zr3+0-cLw=feFy_?cK*s=l(IG#ntwvoMuYE6OFQXA&K^eN)j;B1ncwjr`gae&RDo0V zd+=&fO>SpJZPxaP+h?D$(xy^|Xn@Qk<`qO!fq_}xPbkV(mrlD-F_Pj`xA;jjy0@j& znD*CYYn9iq5d>7M9v+fmT$$1*)<$$vZoSsu_3NG$L(~6J_1MSp^9I3@)Vsw>^{GWK z+4)`a&2g?6GJ^{KkY?|mj-|)^EyV>-(zrDw(oe~>P3jCVbcFsk-GpT>9i);Uo~XZ( z9o1M1uM^FTM|M||8|_-`4KxSQ!y=iGf0pds3nK3Pe7^b1qJS z+xlYPo4oSgR(V*bg zO;vO};P;YkYF)64c0*lfQo+7XHH$VX8Fi8ZmSVG7&#ppIX(mxl#I(6O+P;5dpQhj0 z_#)KtZgrQNU6|;Jo?FI*0JE69Q{2*hlQ+jPK3SRf>n+e2%M3*xQ)* z_8|2xrArl3T$ZTV(dJ!hfO3b)?#jSDY~yH<%tT&nTnZe_Zv6(yG4g3BoAH=TSPr}cH8v*IRqpbu6xOifu#p2c5FwD#%d+Rqle z1&RTaLsk}oM)PWTm)PH#n=+*B;0}gtxmh9VT+E}zz~H8zDz_Ld)WcI=$S~kc{Xs`RCD>;lA`=5PSSg)UH{2Lo>rQl!x;3FmYeYL>o-3A70{H3bn(PT{D;D6 zG`zzYAbhTF``CJFxGkdOzO__PqX2H}rrStZAo=UrHM`m;jiG%j-l?`iKQ2)-c7x$@ z%lY%FsAV<{e_CoD_;|Ty!pKrx5VNv$$9k++h2B%YsAjB;#{ZoKnZg(dz;>cqHtwQyg_&`n_P@3$eL8Khx#1>GGWX zpiD7!qIeQ1UV0wEUK{|lky<+HNNsg(Bth%49tx#*L01*2rH4d@<~R=jk0Ia>PckX; z{~N&lo1C};I7ShiD0akfL{RV_B(lF3f)W|zg&+q}JOCh~`0I}o(Ay3wDomS!LF}R( zz^x>p;UNH5f?LwXxZwy)9ID%sTd9eF7+_8G_YC%&?12o#nLoDB09GYolpj|v=5S5` NSW|0E-4*wQ{{leMXfOZ( diff --git a/public/favicon.ico b/public/favicon.ico index 78c3c142f3dbcf149d0a8373916b310e741a6cc0..c111de1c1e992878f802992545a8ebe65d9744c3 100644 GIT binary patch literal 15086 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 diff --git a/public/manifest.json b/public/manifest.json index 5881f59e5c..b5ff26d4f1 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,45 +1,17 @@ { - "name": "Firefly III", - "short_name": "Firefly III", - "icons": [ - { - "src": "\/android-chrome-36x36.png", - "sizes": "36x36", - "type": "image\/png", - "density": 0.75 - }, - { - "src": "\/android-chrome-48x48.png", - "sizes": "48x48", - "type": "image\/png", - "density": 1 - }, - { - "src": "\/android-chrome-72x72.png", - "sizes": "72x72", - "type": "image\/png", - "density": 1.5 - }, - { - "src": "\/android-chrome-96x96.png", - "sizes": "96x96", - "type": "image\/png", - "density": 2 - }, - { - "src": "\/android-chrome-144x144.png", - "sizes": "144x144", - "type": "image\/png", - "density": 3 - }, - { - "src": "\/android-chrome-192x192.png", - "sizes": "192x192", - "type": "image\/png", - "density": 4 - } - ], - "start_url": "/", - "display": "standalone", - "orientation": "portrait" + "name": "Firefly III", + "icons": [ + { + "src": "\/android-chrome-192x192.png", + "sizes": "192x192", + "type": "image\/png" + }, + { + "src": "\/android-chrome-512x512.png", + "sizes": "512x512", + "type": "image\/png" + } + ], + "theme_color": "#ffffff", + "display": "standalone" } diff --git a/public/mstile-144x144.png b/public/mstile-144x144.png deleted file mode 100644 index d27ae1b177e68c1e547d4cd68235ce4d06cadb58..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3582 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 Bbou}Q diff --git a/public/mstile-150x150.png b/public/mstile-150x150.png index e03a93a3fc44119fb83985a24119ef8d675e0b88..426408fac6a4297c45a08a4805ca526b8812af4d 100644 GIT binary patch literal 10455 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 delta 3396 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¯t_}jdM$l$_TES8+CS2A2rHQUBQccg) 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 diff --git a/public/mstile-70x70.png b/public/mstile-70x70.png deleted file mode 100644 index 3f334b60a3c0a8c45a239732aa23c98cdf534fbc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2468 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 VhwWJE=O3K_u+{{0z2)`z{{YuRS?~Y= diff --git a/public/safari-pinned-tab.svg b/public/safari-pinned-tab.svg index 5803c22658..cfa922579b 100644 --- a/public/safari-pinned-tab.svg +++ b/public/safari-pinned-tab.svg @@ -9,40 +9,44 @@ Created by potrace 1.11, written by Peter Selinger 2001-2013 - + + + + diff --git a/resources/views/partials/favicons.twig b/resources/views/partials/favicons.twig index ed268ec7f2..7a5181af0b 100644 --- a/resources/views/partials/favicons.twig +++ b/resources/views/partials/favicons.twig @@ -1,18 +1,6 @@ - - - - - - - - - - - - - - - - - - + + + + + + \ No newline at end of file From e2ad38d3e0148c385cf96dc46b2adc071ced6fa2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 17:24:15 +0100 Subject: [PATCH 025/150] Expand read me [skip ci] --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b6a4297b78..66fe6b6d2b 100644 --- a/README.md +++ b/README.md @@ -31,4 +31,6 @@ Firefly works on the principle that if you know where you're money is going, you Firefly is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/). +If you like Firefly and if it helps you save lots of money, why not send me [a dime for every dollar saved](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2ZMV952UUSCLU&lc=NL&item_name=Development%20of%20Firefly¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted) (this is a joke, although the Paypal form works just fine, try it!) + If you want to contact me, please open an issue or [email me](mailto:thegrumpydictator@gmail.com). From f172151252ce92139980463d8c10822606b63254 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 17:31:23 +0100 Subject: [PATCH 026/150] Expand read me [skip ci] --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 66fe6b6d2b..4f041801e1 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -# Firefly III [![Requires PHP7](https://img.shields.io/badge/php-7.0-red.svg)](https://secure.php.net/downloads.php#v7.0.4) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) +# Firefly III: A personal finances manager -[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=master)](https://travis-ci.org/JC5/firefly-iii) +[![Requires PHP7](https://img.shields.io/badge/php-7.0-red.svg)](https://secure.php.net/downloads.php#v7.0.4) [![Latest Stable Version](https://poser.pugx.org/grumpydictator/firefly-iii/v/stable)](https://packagist.org/packages/grumpydictator/firefly-iii) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/JC5/firefly-iii/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/JC5/firefly-iii/?branch=master) -## A personal finances manager +[![Build Status](https://travis-ci.org/JC5/firefly-iii.svg?branch=master)](https://travis-ci.org/JC5/firefly-iii) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) [![The index of Firefly III](https://i.nder.be/hurdhgyg/400)](https://i.nder.be/h2b37243) [![The account overview of Firefly III](https://i.nder.be/hnkfkdpr/400)](https://i.nder.be/hv70pbwc) @@ -31,6 +31,6 @@ Firefly works on the principle that if you know where you're money is going, you Firefly is pretty awesome. [You can read more about Firefly III, and its features, on the Github Pages](https://firefly-iii.github.io/). -If you like Firefly and if it helps you save lots of money, why not send me [a dime for every dollar saved](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=2ZMV952UUSCLU&lc=NL&item_name=Development%20of%20Firefly¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted) (this is a joke, although the Paypal form works just fine, try it!) +If you like Firefly and if it helps you save lots of money, why not send me [a dime for every dollar saved](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=44UKUT455HUFA) (this is a joke, although the Paypal form works just fine, try it!) If you want to contact me, please open an issue or [email me](mailto:thegrumpydictator@gmail.com). From 42f752949508ab94f03bc456103b94b87b127fa5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 20:01:50 +0100 Subject: [PATCH 027/150] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index efea3bfdb1..987a3e2493 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -194,7 +194,7 @@ return [ 'warning_no_matching_transactions' => 'Niks gevonden in je laatste :num_transactions transacties.', 'warning_no_valid_triggers' => 'Geen geldige triggers gevonden.', 'execute_on_existing_transactions' => 'Toepassen op bestaande transacties', - 'rule_group_select_transactions' => 'Execute rule group ":title" on existing transactions', + 'rule_group_select_transactions' => 'Regelgroep ":title" uitvoeren op bestaande transacties', 'execute_on_existing_transactions_intro' => 'Wanneer een regel of groep is veranderd of toegevoegd, kun je hem hier uitvoeren voor bestaande transacties', 'execute_on_existing_transactions_short' => 'Bestaande transacties', 'executed_group_on_existing_transactions' => 'Regelgroep ":title" is uitgevoerd op bestaande transacties', @@ -633,10 +633,10 @@ return [ 'errors' => 'Fouten', // reports: - 'report_default' => 'Default financial report between :start and :end', - 'report_audit' => 'Transaction history overview between :start and :end', - 'report_category' => 'Category report between :start and :end', - 'report_budget' => 'Budget report between :start and :end', + 'report_default' => 'Standaard financieel rapport (:start tot :end)', + 'report_audit' => 'Transactiehistorie-overzicht van :start tot :end', + 'report_category' => 'Categorierapport van :start tot :end', + 'report_budget' => 'Budgetrapport van :start tot :end', 'quick_link_reports' => 'Snelle links', 'quick_link_default_report' => 'Standaard financieel rapport', 'quick_link_audit_report' => 'Transactiehistorie-overzicht', From e2e54d342a204684e41afcab80622ed8f53bb4bf Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 20:21:14 +0100 Subject: [PATCH 028/150] This completes all controller acceptance tests --- .../Controllers/SearchControllerTest.php | 17 +++- .../Controllers/TagControllerTest.php | 91 +++++++++++-------- .../Controllers/TransactionControllerTest.php | 51 ++++++----- 3 files changed, 90 insertions(+), 69 deletions(-) diff --git a/tests/acceptance/Controllers/SearchControllerTest.php b/tests/acceptance/Controllers/SearchControllerTest.php index 8bc0f55566..68b1b97636 100644 --- a/tests/acceptance/Controllers/SearchControllerTest.php +++ b/tests/acceptance/Controllers/SearchControllerTest.php @@ -8,6 +8,8 @@ * * See the LICENSE file for details. */ +use FireflyIII\Support\Search\SearchInterface; +use Illuminate\Support\Collection; /** @@ -32,9 +34,16 @@ class SearchControllerTest extends TestCase */ public function testIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $search = $this->mock(SearchInterface::class); + $search->shouldReceive('setLimit')->once(); + $search->shouldReceive('searchTransactions')->andReturn(new Collection)->withArgs([['test']])->once(); + $search->shouldReceive('searchBudgets')->andReturn(new Collection)->withArgs([['test']])->once(); + $search->shouldReceive('searchTags')->andReturn(new Collection)->withArgs([['test']])->once(); + $search->shouldReceive('searchCategories')->andReturn(new Collection)->withArgs([['test']])->once(); + $search->shouldReceive('searchAccounts')->andReturn(new Collection)->withArgs([['test']])->once(); + $this->be($this->user()); + $this->call('get', route('search.index') . '?q=test'); + $this->assertResponseStatus(200); + $this->see('
                                                            '); } } diff --git a/tests/acceptance/Controllers/TagControllerTest.php b/tests/acceptance/Controllers/TagControllerTest.php index 362578276d..4a7717d528 100644 --- a/tests/acceptance/Controllers/TagControllerTest.php +++ b/tests/acceptance/Controllers/TagControllerTest.php @@ -8,6 +8,8 @@ * * See the LICENSE file for details. */ +use FireflyIII\Models\Tag; +use FireflyIII\Repositories\Tag\TagRepositoryInterface; /** @@ -28,97 +30,106 @@ class TagControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TagController::create - * Implement testCreate(). */ public function testCreate() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('GET', route('tags.create')); + $this->assertResponseStatus(200); + $this->see('
                                                              '); } /** * @covers \FireflyIII\Http\Controllers\TagController::delete - * Implement testDelete(). */ public function testDelete() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('GET', route('tags.delete', [1])); + $this->assertResponseStatus(200); + $this->see('
                                                                '); } /** * @covers \FireflyIII\Http\Controllers\TagController::destroy - * Implement testDestroy(). */ public function testDestroy() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $repository = $this->mock(TagRepositoryInterface::class); + $repository->shouldReceive('destroy'); + + $this->be($this->user()); + $this->call('post', route('tags.destroy', [1])); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); } /** * @covers \FireflyIII\Http\Controllers\TagController::edit - * Implement testEdit(). */ public function testEdit() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('GET', route('tags.edit', [1])); + $this->assertResponseStatus(200); + $this->see('
                                                                  '); } /** * @covers \FireflyIII\Http\Controllers\TagController::index - * Implement testIndex(). */ public function testIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('GET', route('tags.index')); + $this->assertResponseStatus(200); + $this->see('
                                                                    '); } /** * @covers \FireflyIII\Http\Controllers\TagController::show - * Implement testShow(). */ public function testShow() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('GET', route('tags.show', [1])); + $this->assertResponseStatus(200); + $this->see('
                                                                      '); } /** * @covers \FireflyIII\Http\Controllers\TagController::store - * Implement testStore(). */ public function testStore() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->session(['tags.create.url' => 'http://localhost']); + $data = [ + 'tag' => 'Hello new tag' . rand(999, 10000), + 'tagMode' => 'nothing', + ]; + $this->be($this->user()); + $this->call('post', route('tags.store'), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); } /** * @covers \FireflyIII\Http\Controllers\TagController::update - * Implement testUpdate(). */ public function testUpdate() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->session(['tags.edit.url' => 'http://localhost']); + $data = [ + 'tag' => 'Hello updated tag' . rand(999, 10000), + 'tagMode' => 'nothing', + ]; + $repository = $this->mock(TagRepositoryInterface::class); + $repository->shouldReceive('update'); + $repository->shouldReceive('find')->andReturn(new Tag); + + $this->be($this->user()); + $this->call('post', route('tags.update', [1]), $data); + $this->assertResponseStatus(302); + $this->assertSessionHas('success'); } } diff --git a/tests/acceptance/Controllers/TransactionControllerTest.php b/tests/acceptance/Controllers/TransactionControllerTest.php index aa97b8b7a4..d5e596fd60 100644 --- a/tests/acceptance/Controllers/TransactionControllerTest.php +++ b/tests/acceptance/Controllers/TransactionControllerTest.php @@ -28,61 +28,62 @@ class TransactionControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TransactionController::index - * Implement testIndex(). */ public function testIndex() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + + $this->be($this->user()); + $this->call('get', route('transactions.index', ['transfer'])); + $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                                                                        '); } /** * @covers \FireflyIII\Http\Controllers\TransactionController::indexAll - * Implement testIndexAll(). */ public function testIndexAll() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('transactions.index.all', ['transfer'])); + $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                                                                          '); } /** * @covers \FireflyIII\Http\Controllers\TransactionController::indexByDate - * Implement testIndexByDate(). */ public function testIndexByDate() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('transactions.index.date', ['transfer', '2016-01-01'])); + $this->assertResponseStatus(200); + // has bread crumb + $this->see('
                                                                            '); } /** * @covers \FireflyIII\Http\Controllers\TransactionController::reorder - * Implement testReorder(). */ public function testReorder() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $data = [ + 'items' => [], + ]; + $this->be($this->user()); + $this->call('post', route('transactions.reorder'), $data); + $this->assertResponseStatus(200); } /** * @covers \FireflyIII\Http\Controllers\TransactionController::show - * Implement testShow(). */ public function testShow() { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); + $this->be($this->user()); + $this->call('get', route('transactions.show', [1])); + $this->assertResponseStatus(200); + $this->see('
                                                                              '); } } From 9a309f32fa79674e8943574e9c53615078db260d Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 20:36:28 +0100 Subject: [PATCH 029/150] This fixes #478 --- app/Support/Search/Search.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Support/Search/Search.php b/app/Support/Search/Search.php index a3da570829..f9a36ff572 100644 --- a/app/Support/Search/Search.php +++ b/app/Support/Search/Search.php @@ -16,6 +16,7 @@ namespace FireflyIII\Support\Search; use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; use FireflyIII\Models\Budget; use FireflyIII\Models\Category; use FireflyIII\Models\Tag; @@ -56,7 +57,9 @@ class Search implements SearchInterface */ public function searchAccounts(array $words): Collection { - $accounts = $this->user->accounts()->get(); + $accounts = $this->user->accounts() + ->accountTypeIn([AccountType::DEFAULT, AccountType::ASSET, AccountType::EXPENSE, AccountType::REVENUE, AccountType::BENEFICIARY]) + ->get(); /** @var Collection $result */ $result = $accounts->filter( function (Account $account) use ($words) { From 2c5cdb8780ebe3f2d94ad793eb7b9378c4137419 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 20:46:24 +0100 Subject: [PATCH 030/150] Clarify chart details [skip ci] --- app/Http/Controllers/Chart/BudgetController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 4fcb736e0f..e212ee6d89 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -386,7 +386,7 @@ class BudgetController extends Controller } $amount = $repetition->amount; $left = bccomp(bcadd($amount, $expenses), '0') < 1 ? '0' : bcadd($amount, $expenses); - $spent = bccomp(bcadd($amount, $expenses), '0') < 1 ? bcmul($amount, '-1') : $expenses; + $spent = $expenses; $overspent = bccomp(bcadd($amount, $expenses), '0') < 1 ? bcadd($amount, $expenses) : '0'; $return[] = [ 'name' => $name, @@ -454,8 +454,8 @@ class BudgetController extends Controller $array = [ 'name' => strval(trans('firefly.no_budget')), 'repetition_left' => '0', - 'repetition_overspent' => '0', - 'spent' => $sum, + 'repetition_overspent' => $sum, + 'spent' => '0', ]; return $array; From fc0ad622ebe42af1429eeb093da11db9e82a9775 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 20:47:26 +0100 Subject: [PATCH 031/150] Clarify chart details [skip ci] --- app/Http/Controllers/Chart/BudgetController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index e212ee6d89..9284ff2bf4 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -204,7 +204,7 @@ class BudgetController extends Controller } // for no budget: $row = $this->spentInPeriodWithout($start, $end); - if (bccomp($row['spent'], '0') !== 0 || bccomp($row['repetition_left'], '0') !== 0) { + if (bccomp($row['repetition_overspent'], '0') !== 0) { $chartData[0]['entries'][$row['name']] = bcmul($row['spent'], '-1'); $chartData[1]['entries'][$row['name']] = $row['repetition_left']; $chartData[2]['entries'][$row['name']] = bcmul($row['repetition_overspent'], '-1'); From 116e19ec064a0051dbdb23abd800df177bdd0db8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 21:07:22 +0100 Subject: [PATCH 032/150] These routines fix #477 --- app/Http/Controllers/AccountController.php | 27 ++++++++++++------- app/Http/Controllers/BillController.php | 11 ++++++-- app/Http/Controllers/BudgetController.php | 10 +++++-- app/Http/Controllers/CategoryController.php | 11 ++++++-- app/Http/Controllers/PiggyBankController.php | 12 ++++++--- .../Transaction/SingleController.php | 13 ++++++--- 6 files changed, 61 insertions(+), 23 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 2372e7e101..78eb0ccac2 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -124,17 +124,24 @@ class AccountController extends Controller */ public function destroy(ARI $repository, Account $account) { - $type = $account->accountType->type; - $typeName = config('firefly.shortNamesByFullName.' . $type); - $name = $account->name; - $moveTo = $repository->find(intval(Input::get('move_account_before_delete'))); + $type = $account->accountType->type; + $typeName = config('firefly.shortNamesByFullName.' . $type); + $name = $account->name; + $accountId = $account->id; + $moveTo = $repository->find(intval(Input::get('move_account_before_delete'))); $repository->destroy($account, $moveTo); Session::flash('success', strval(trans('firefly.' . $typeName . '_deleted', ['name' => $name]))); Preferences::mark(); - return redirect(session('accounts.delete.url')); + $uri = session('accounts.delete.url'); + if (!(strpos($uri, sprintf('accounts/show/%s', $accountId)) === false)) { + // uri would point back to account + $uri = route('accounts.index', [$typeName]); + } + + return redirect($uri); } /** @@ -236,11 +243,11 @@ class AccountController extends Controller $subTitle = $account->name; $range = Preferences::get('viewRange', '1M')->data; - $start = session('start', Navigation::startOfPeriod(new Carbon, $range)); - $end = session('end', Navigation::endOfPeriod(new Carbon, $range)); - $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); - $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); - $chartUri = route('chart.account.single', [$account->id]); + $start = session('start', Navigation::startOfPeriod(new Carbon, $range)); + $end = session('end', Navigation::endOfPeriod(new Carbon, $range)); + $page = intval(Input::get('page')) === 0 ? 1 : intval(Input::get('page')); + $pageSize = intval(Preferences::get('transactionPageSize', 50)->data); + $chartUri = route('chart.account.single', [$account->id]); // grab those journals: $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit($pageSize)->setPage($page); $journals = $collector->getPaginatedJournals(); diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 4cccbdeba3..5e3b3a09ef 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -99,13 +99,20 @@ class BillController extends Controller */ public function destroy(BillRepositoryInterface $repository, Bill $bill) { - $name = $bill->name; + $name = $bill->name; + $billId = $bill->id; $repository->destroy($bill); Session::flash('success', strval(trans('firefly.deleted_bill', ['name' => $name]))); Preferences::mark(); - return redirect(session('bills.delete.url')); + $uri = session('bills.delete.url'); + if (!(strpos($uri, sprintf('bills/show/%s', $billId)) === false)) { + // uri would point back to bill + $uri = route('bills.index'); + } + + return redirect($uri); } /** diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 9605e0b8c6..a1ef39d63c 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -134,15 +134,21 @@ class BudgetController extends Controller public function destroy(Budget $budget, BudgetRepositoryInterface $repository) { - $name = $budget->name; + $name = $budget->name; + $budgetId = $budget->id; $repository->destroy($budget); Session::flash('success', strval(trans('firefly.deleted_budget', ['name' => e($name)]))); Preferences::mark(); + $uri = session('budgets.delete.url'); + if (!(strpos($uri, sprintf('budgets/show/%s', $budgetId)) === false)) { + // uri would point back to budget + $uri = route('budgets.index'); + } - return redirect(session('budgets.delete.url')); + return redirect($uri); } /** diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 835ab48c09..4d7a67e64c 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -98,13 +98,20 @@ class CategoryController extends Controller public function destroy(CRI $repository, Category $category) { - $name = $category->name; + $name = $category->name; + $categoryId = $category->id; $repository->destroy($category); Session::flash('success', strval(trans('firefly.deleted_category', ['name' => e($name)]))); Preferences::mark(); - return redirect(session('categories.delete.url')); + $uri = session('categories.delete.url'); + if (!(strpos($uri, sprintf('categories/show/%s', $categoryId)) === false)) { + // uri would point back to category + $uri = route('categories.index'); + } + + return redirect($uri); } /** diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index d1feb427eb..5d494b5985 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -150,13 +150,18 @@ class PiggyBankController extends Controller */ public function destroy(PiggyBankRepositoryInterface $repository, PiggyBank $piggyBank) { - - Session::flash('success', strval(trans('firefly.deleted_piggy_bank', ['name' => e($piggyBank->name)]))); Preferences::mark(); + $piggyBankId = $piggyBank->id; $repository->destroy($piggyBank); - return redirect(session('piggy-banks.delete.url')); + $uri = session('piggy-banks.delete.url'); + if (!(strpos($uri, sprintf('piggy-banks/show/%s', $piggyBankId)) === false)) { + // uri would point back to piggy bank + $uri = route('piggy-banks.index'); + } + + return redirect($uri); } /** @@ -260,6 +265,7 @@ class PiggyBankController extends Controller $repository->setOrder(intval($id), ($order + 1)); } } + return Response::json(['result' => 'ok']); } diff --git a/app/Http/Controllers/Transaction/SingleController.php b/app/Http/Controllers/Transaction/SingleController.php index 98ba1458de..96915dae35 100644 --- a/app/Http/Controllers/Transaction/SingleController.php +++ b/app/Http/Controllers/Transaction/SingleController.php @@ -153,16 +153,21 @@ class SingleController extends Controller if ($this->isOpeningBalance($transactionJournal)) { return $this->redirectToAccount($transactionJournal); } - - $type = TransactionJournal::transactionTypeStr($transactionJournal); + $journalId = $transactionJournal->id; + $type = TransactionJournal::transactionTypeStr($transactionJournal); Session::flash('success', strval(trans('firefly.deleted_' . strtolower($type), ['description' => e($transactionJournal->description)]))); $repository->delete($transactionJournal); Preferences::mark(); - // redirect to previous URL: - return redirect(session('transactions.delete.url')); + $uri = session('transactions.delete.url'); + if (!(strpos($uri, sprintf('transactions/show/%s', $journalId)) === false)) { + // uri would point back to transaction + $uri = route('transactions.index', [strtolower($type)]); + } + + return redirect($uri); } /** From 9239815ce6a86d629dc0fec963267db764bb8ea2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 19 Dec 2016 21:07:38 +0100 Subject: [PATCH 033/150] Tiny view update. --- resources/views/budgets/show.twig | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig index e7a552c29f..85f8c12f7c 100644 --- a/resources/views/budgets/show.twig +++ b/resources/views/budgets/show.twig @@ -11,15 +11,11 @@

                                                                              {{ 'overview'|_ }}

                                                                              - -
                                                                              +
                                                                              - -
                                                                              - {% include 'list.journals-tasker' with {sorting:true} %} + {% include 'list.journals-tasker' with {sorting:true, hideBills:true, hideBudgets: true} %}

                                                                              From e08e7b2c9b48f76b506aa3a5df3a380840a397f3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 07:13:37 +0100 Subject: [PATCH 056/150] Speed up some tests. --- composer.json | 3 +- phpunit.xml | 3 ++ routes/web.php | 2 +- .../Controllers/AccountControllerTest.php | 13 ++++++- .../Chart/BudgetControllerTest.php | 12 ++++++- .../Chart/CategoryControllerTest.php | 34 ++++++++++++++++++- 6 files changed, 62 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 7deaaacb03..27a784e1bf 100755 --- a/composer.json +++ b/composer.json @@ -47,7 +47,8 @@ "symfony/css-selector": "3.1.*", "symfony/dom-crawler": "3.1.*", "barryvdh/laravel-debugbar": "2.*", - "barryvdh/laravel-ide-helper": "2.*" + "barryvdh/laravel-ide-helper": "2.*", + "johnkary/phpunit-speedtrap": "^1.0" }, "autoload": { "classmap": [ diff --git a/phpunit.xml b/phpunit.xml index 478d78f2b6..5e3d64c04c 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -8,6 +8,9 @@ convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="true"> + + + ./tests diff --git a/routes/web.php b/routes/web.php index 515573629e..e053bf6acd 100755 --- a/routes/web.php +++ b/routes/web.php @@ -287,7 +287,7 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'Chart', 'prefix' => 'chart/category', 'as' => 'chart.category.'], function () { - Route::get('frontpage', ['uses' => 'CategoryController@frontpage']); + Route::get('frontpage', ['uses' => 'CategoryController@frontpage', 'as' => 'frontpage']); Route::get('period/{category}', ['uses' => 'CategoryController@currentPeriod', 'as' => 'current']); Route::get('period/{category}/{date}', ['uses' => 'CategoryController@specificPeriod', 'as' => 'specific']); Route::get('all/{category}', ['uses' => 'CategoryController@all', 'as' => 'all']); diff --git a/tests/acceptance/Controllers/AccountControllerTest.php b/tests/acceptance/Controllers/AccountControllerTest.php index 4120968399..fb03855828 100644 --- a/tests/acceptance/Controllers/AccountControllerTest.php +++ b/tests/acceptance/Controllers/AccountControllerTest.php @@ -8,8 +8,11 @@ * * See the LICENSE file for details. */ +use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Account\AccountTaskerInterface; +use Illuminate\Pagination\LengthAwarePaginator; /** @@ -105,10 +108,18 @@ class AccountControllerTest extends TestCase public function testShow(string $range) { - $tasker = $this->mock(\FireflyIII\Repositories\Account\AccountTaskerInterface::class); + $tasker = $this->mock(AccountTaskerInterface::class); $tasker->shouldReceive('amountOutInPeriod')->withAnyArgs()->andReturn('-1'); $tasker->shouldReceive('amountInInPeriod')->withAnyArgs()->andReturn('1'); + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $this->call('GET', route('accounts.show', [1])); diff --git a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php index a42033a4ef..dd9b49586b 100644 --- a/tests/acceptance/Controllers/Chart/BudgetControllerTest.php +++ b/tests/acceptance/Controllers/Chart/BudgetControllerTest.php @@ -11,6 +11,8 @@ namespace Chart; +use Carbon\Carbon; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use TestCase; /** @@ -37,6 +39,11 @@ class BudgetControllerTest extends TestCase */ public function testBudget(string $range) { + $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $budgetRepository->shouldReceive('firstUseDate')->andReturn(new Carbon('2015-01-01')); + $budgetRepository->shouldReceive('spentInPeriod')->andReturn('-100'); + + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $this->call('get', route('chart.budget.budget', [1])); @@ -51,9 +58,12 @@ class BudgetControllerTest extends TestCase */ public function testBudgetLimit(string $range) { + $budgetRepository = $this->mock(BudgetRepositoryInterface::class); + $budgetRepository->shouldReceive('spentInPeriod')->andReturn('-100'); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.budget.budget', [1,1])); + $this->call('get', route('chart.budget.budget-limit', [1,1])); $this->assertResponseStatus(200); } diff --git a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php index 3504ad79d5..06af5d366c 100644 --- a/tests/acceptance/Controllers/Chart/CategoryControllerTest.php +++ b/tests/acceptance/Controllers/Chart/CategoryControllerTest.php @@ -12,7 +12,9 @@ namespace Chart; use Carbon\Carbon; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use Illuminate\Support\Collection; use TestCase; /** @@ -54,12 +56,22 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::currentPeriod + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::makePeriodChart * @dataProvider dateRangeProvider * * @param string $range */ public function testCurrentPeriod(string $range) { + // this is actually for makePeriodChart + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $categoryRepository = $this->mock(CategoryRepositoryInterface::class); + $account = $this->user()->accounts()->where('account_type_id', 5)->first(); + $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); + $categoryRepository->shouldReceive('earnedInPeriod')->andReturn('0'); + + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $this->call('get', route('chart.category.current', [1])); @@ -74,9 +86,21 @@ class CategoryControllerTest extends TestCase */ public function testFrontpage(string $range) { + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $categoryRepository = $this->mock(CategoryRepositoryInterface::class); + $category = $this->user()->categories()->first(); + $account = $this->user()->accounts()->where('account_type_id', 5)->first(); + // get one category + $categoryRepository->shouldReceive('getCategories')->andReturn(new Collection([$category])); + // get one account + $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + // always return zero + $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); + $categoryRepository->shouldReceive('spentInPeriodWithoutCategory')->andReturn('0'); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); - $this->call('get', route('chart.category.current', [1])); + $this->call('get', route('chart.category.frontpage', [1])); $this->assertResponseStatus(200); } @@ -102,12 +126,20 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::specificPeriod + * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::makePeriodChart * @dataProvider dateRangeProvider * * @param string $range */ public function testSpecificPeriod(string $range) { + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $categoryRepository = $this->mock(CategoryRepositoryInterface::class); + $account = $this->user()->accounts()->where('account_type_id', 5)->first(); + $accountRepository->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])); + $categoryRepository->shouldReceive('spentInPeriod')->andReturn('0'); + $categoryRepository->shouldReceive('earnedInPeriod')->andReturn('0'); + $this->be($this->user()); $this->changeDateRange($this->user(), $range); $this->call('get', route('chart.category.specific', ['1', '2012-01-01'])); From 54b33a0b69decf6edd17315ce4fee62a83e251ca Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 07:13:49 +0100 Subject: [PATCH 057/150] Removed views no longer used. --- resources/views/list/journals-tiny.twig | 17 --- resources/views/list/journals.twig | 140 ------------------ resources/views/popup/list/journals.twig | 86 ----------- .../reports/partials/journals-audit.twig | 136 ----------------- 4 files changed, 379 deletions(-) delete mode 100644 resources/views/list/journals-tiny.twig delete mode 100644 resources/views/list/journals.twig delete mode 100644 resources/views/popup/list/journals.twig delete mode 100644 resources/views/reports/partials/journals-audit.twig diff --git a/resources/views/list/journals-tiny.twig b/resources/views/list/journals-tiny.twig deleted file mode 100644 index d748294eb5..0000000000 --- a/resources/views/list/journals-tiny.twig +++ /dev/null @@ -1,17 +0,0 @@ -

                                                                              - {% for journal in transactions %} - - {{ journal|typeIcon }} - {{ journal.description }} - - {{ journal|formatJournal }} - - - {% endfor %} -
                                                                              diff --git a/resources/views/list/journals.twig b/resources/views/list/journals.twig deleted file mode 100644 index 45d5005fb8..0000000000 --- a/resources/views/list/journals.twig +++ /dev/null @@ -1,140 +0,0 @@ -{{ journals.render|raw }} - -{% if journals.count == 0 %} -

                                                                              - {{ 'nothing_to_display'|_ }} -

                                                                              -{% endif %} - -{% if journals.count > 0 %} - - - - - - - - - - - - {% if not hideBudgets %} - - {% endif %} - - - {% if not hideCategories %} - - {% endif %} - - - {% if not hideBills %} - - {% endif %} - - - - {% for journal in journals %} - - - - - - - - - - - - {% if not hideBudgets %} - - {% endif %} - - - {% if not hideCategories %} - - {% endif %} - - - {% if not hideBills %} - - {% endif %} - - {% endfor %} - -
                                                                              {{ trans('list.description') }}{{ trans('list.amount') }}
                                                                              - {{ journal.description }} - {% if journal.attachments|length > 0 %} - - {% endif %} - {% if journal.count_transactions > 2 %} - - {% endif %} - - - {% if not accountPerspective and not budgetPerspective %} - {{ journal|formatJournal }} - {% endif %} - - {% if accountPerspective %} - {{ formatAccountPerspective(journal, accountPerspective)|raw }} - {% endif %} - - {% if budgetPerspective %} - {{ formatBudgetPerspective(journal, budgetPerspective)|raw }} - {% endif %} -
                                                                              - -
                                                                              -
                                                                              - {{ journals.render|raw }} -
                                                                              -
                                                                              - -{% endif %} \ No newline at end of file diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twig deleted file mode 100644 index 17d314ef89..0000000000 --- a/resources/views/popup/list/journals.twig +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - {% if not hideSource %} - - {% endif %} - {% if not hideDestination %} - - {% endif %} - - {% if not hideBudget %} - - {% endif %} - - - {% if not hideCategory %} - - {% endif %} - - - - - {% for journal in journals %} - - - - - - - {% if not hideSource %} - - {% endif %} - {% if not hideDestination %} - - {% endif %} - - - {% if not hideBudget %} - - {% endif %} - - - {% if not hideCategory %} - - {% endif %} - - {% endfor %} - - - - - - - -
                                                                               {{ trans('list.description') }}{{ trans('list.amount') }}
                                                                              - {{ journal.description }} - - {% if not accountPerspective %} - {{ journal|formatJournal }} - {% else %} - {{ formatAccountPerspective(journal, accountPerspective)|raw }} - {% endif %} -
                                                                              {{ 'sum'|_ }}:{{ sum|formatAmount }}
                                                                              - -{{ journals.render|raw }} diff --git a/resources/views/reports/partials/journals-audit.twig b/resources/views/reports/partials/journals-audit.twig deleted file mode 100644 index 117d16bfbb..0000000000 --- a/resources/views/reports/partials/journals-audit.twig +++ /dev/null @@ -1,136 +0,0 @@ -{{ journals.render|raw }} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% for journal in journals %} - - - - - - - - - - - - - - - - - - - - - - - - - - {% if journal.bill_id %} - - {% else %} - - {% endif %} - - - - - - - - - - - {% endfor %} - -
                                                                                {{ trans('list.description') }}{{ trans('list.balance_before') }}{{ trans('list.amount') }}{{ trans('list.balance_after') }}{{ trans('list.date') }}{{ trans('list.book_date') }}{{ trans('list.process_date') }}{{ trans('list.interest_date') }}{{ trans('list.due_date') }}{{ trans('list.payment_date') }}{{ trans('list.invoice_date') }}{{ trans('list.from') }}{{ trans('list.to') }}{{ trans('list.bill') }}{{ trans('list.internal_reference') }}{{ trans('list.notes') }}{{ trans('list.create_date') }}{{ trans('list.update_date') }}
                                                                              -
                                                                              - -
                                                                              -                                                                               		{{ journal|typeIcon }}{{ journal.description }} - {{ journal.before|formatAmount }}{{ journal|formatJournal }}{{ journal.after|formatAmount }}{{ journal.date.formatLocalized(monthAndDayFormat) }} - {% if journal.hasMeta('book_date') %} - {{ journal.getMeta('book_date').formatLocalized(monthAndDayFormat) }} - {% endif %} - - {% if journal.hasMeta('process_date') %} - {{ journal.getMeta('process_date').formatLocalized(monthAndDayFormat) }} - {% endif %} - - {% if journal.hasMeta('interest_date') %} - {{ journal.getMeta('interest_date').formatLocalized(monthAndDayFormat) }} - {% endif %} - - {% if journal.hasMeta('due_date') %} - {{ journal.getMeta('due_date').formatLocalized(monthAndDayFormat) }} - {% endif %} - - {% if journal.hasMeta('payment_date') %} - {{ journal.getMeta('payment_date').formatLocalized(monthAndDayFormat) }} - {% endif %} - - {% if journal.hasMeta('invoice_date') %} - {{ journal.getMeta('invoice_date').formatLocalized(monthAndDayFormat) }} - {% endif %} - - {{ sourceAccount(journal)|raw }} - - {{ destinationAccount(journal)|raw }} - - {{ journalBudgets(journal)|raw }} - - {{ journalCategories(journal)|raw }} -  {{ journal.bill.name }}  - {% if journal.hasMeta('internal_reference') %} - {{ journal.getMeta('internal_reference') }} - {% endif %} - - {% if journal.hasMeta('notes') %} - {{ journal.getMeta('notes')|nl2br }} - {% endif %} - - {{ journal.created_at.formatLocalized(dateTimeFormat) }} - - {{ journal.updated_at.formatLocalized(dateTimeFormat) }} -
                                                                              - -{{ journals.render|raw }} From 0feeac9160f3f2d84ef7077898f50263673a0713 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 15:24:16 +0100 Subject: [PATCH 058/150] Removed some unused imports [skip ci] --- app/Http/Controllers/Auth/RegisterController.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index b56978153a..23deaaf46d 100755 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -22,11 +22,8 @@ use FireflyIII\Http\Controllers\Controller; use FireflyIII\User; use Illuminate\Foundation\Auth\RegistersUsers; use Illuminate\Http\Request; -use Illuminate\Mail\Message; use Log; -use Mail; use Session; -use Swift_TransportException; use Validator; /** From 9859052c4d7e64dee0b7df32e9fc266758adf1d4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 16:36:56 +0100 Subject: [PATCH 059/150] Code for issue #489 --- app/Http/Controllers/BudgetController.php | 171 ++++++++---------- app/Http/Controllers/HomeController.php | 1 + app/Http/Requests/BudgetIncomeRequest.php | 42 +++++ app/Models/AvailableBudget.php | 49 +++++ app/Repositories/Budget/BudgetRepository.php | 50 +++++ .../Budget/BudgetRepositoryInterface.php | 20 ++ app/User.php | 9 + .../2016_12_22_150431_changes_for_v430.php | 44 +++++ public/js/ff/budgets/index.js | 8 +- resources/views/budgets/income.twig | 5 +- resources/views/budgets/index.twig | 54 +++--- 11 files changed, 321 insertions(+), 132 deletions(-) create mode 100644 app/Http/Requests/BudgetIncomeRequest.php create mode 100644 app/Models/AvailableBudget.php create mode 100644 database/migrations/2016_12_22_150431_changes_for_v430.php diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index a1ef39d63c..70def0eec3 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -15,10 +15,10 @@ namespace FireflyIII\Http\Controllers; use Amount; use Carbon\Carbon; -use Config; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Http\Requests\BudgetFormRequest; +use FireflyIII\Http\Requests\BudgetIncomeRequest; use FireflyIII\Models\AccountType; use FireflyIII\Models\Budget; use FireflyIII\Models\LimitRepetition; @@ -26,8 +26,6 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Support\Collection; use Input; -use Log; -use Navigation; use Preferences; use Response; use Session; @@ -42,6 +40,9 @@ use View; class BudgetController extends Controller { + /** @var BudgetRepositoryInterface */ + private $repository; + /** * */ @@ -55,6 +56,7 @@ class BudgetController extends Controller function ($request, $next) { View::share('title', trans('firefly.budgets')); View::share('mainTitleIcon', 'fa-tasks'); + $this->repository = app(BudgetRepositoryInterface::class); return $next($request); } @@ -73,14 +75,8 @@ class BudgetController extends Controller /** @var Carbon $start */ $start = session('start', Carbon::now()->startOfMonth()); /** @var Carbon $end */ - $end = session('end', Carbon::now()->endOfMonth()); - $viewRange = Preferences::get('viewRange', '1M')->data; - - // is custom view range? - if (session('is_custom_range') === true) { - $viewRange = 'custom'; - } - + $end = session('end', Carbon::now()->endOfMonth()); + $viewRange = Preferences::get('viewRange', '1M')->data; $limitRepetition = $repository->updateLimitAmount($budget, $start, $end, $viewRange, $amount); if ($amount == 0) { $limitRepetition = null; @@ -173,82 +169,27 @@ class BudgetController extends Controller } /** - * @param BudgetRepositoryInterface $repository - * @param AccountRepositoryInterface $accountRepository - * * @return View - * */ - public function index(BudgetRepositoryInterface $repository, AccountRepositoryInterface $accountRepository) + public function index() { - $repository->cleanupBudgets(); + $this->repository->cleanupBudgets(); - $budgets = $repository->getActiveBudgets(); - $inactive = $repository->getInactiveBudgets(); - $spent = '0'; - $budgeted = '0'; - $range = Preferences::get('viewRange', '1M')->data; - $repeatFreq = Config::get('firefly.range_to_repeat_freq.' . $range); - - if (session('is_custom_range') === true) { - $repeatFreq = 'custom'; - } - - /** @var Carbon $start */ - $start = session('start', new Carbon); - /** @var Carbon $end */ + $budgets = $this->repository->getActiveBudgets(); + $inactive = $this->repository->getInactiveBudgets(); + $start = session('start', new Carbon); $end = session('end', new Carbon); - $key = 'budgetIncomeTotal' . $start->format('Ymd') . $end->format('Ymd'); - $budgetIncomeTotal = Preferences::get($key, 1000)->data; - $period = Navigation::periodShow($start, $range); $periodStart = $start->formatLocalized($this->monthAndDayFormat); $periodEnd = $end->formatLocalized($this->monthAndDayFormat); - $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]); - $startAsString = $start->format('Y-m-d'); - $endAsString = $end->format('Y-m-d'); - Log::debug('Now at /budgets'); - - // loop the budgets: - /** @var Budget $budget */ - foreach ($budgets as $budget) { - Log::debug(sprintf('Now at budget #%d ("%s")', $budget->id, $budget->name)); - $budget->spent = $repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end); - $allRepetitions = $repository->getAllBudgetLimitRepetitions($start, $end); - $otherRepetitions = new Collection; - - /** @var LimitRepetition $repetition */ - foreach ($allRepetitions as $repetition) { - if ($repetition->budget_id == $budget->id) { - if ($repetition->budgetLimit->repeat_freq == $repeatFreq - && $repetition->startdate->format('Y-m-d') == $startAsString - && $repetition->enddate->format('Y-m-d') == $endAsString - ) { - // do something - $budget->currentRep = $repetition; - continue; - } - $otherRepetitions->push($repetition); - } - } - $budget->otherRepetitions = $otherRepetitions; - - if (!is_null($budget->currentRep) && !is_null($budget->currentRep->id)) { - $budgeted = bcadd($budgeted, $budget->currentRep->amount); - } - $spent = bcadd($spent, $budget->spent); - - } - - - $defaultCurrency = Amount::getDefaultCurrency(); + $budgetInformation = $this->collectBudgetInformation($budgets, $start, $end); + $defaultCurrency = Amount::getDefaultCurrency(); + $available = $this->repository->getAvailableBudget($defaultCurrency, $start, $end); + $spent = array_sum(array_column($budgetInformation, 'spent')); + $budgeted = array_sum(array_column($budgetInformation, 'budgeted')); return view( - 'budgets.index', compact( - 'periodStart', 'periodEnd', - 'period', 'range', 'budgetIncomeTotal', - 'defaultCurrency', 'inactive', 'budgets', - 'spent', 'budgeted' - ) + 'budgets.index', + compact('available', 'periodStart', 'periodEnd', 'budgetInformation', 'defaultCurrency', 'inactive', 'budgets', 'spent', 'budgeted') ); } @@ -280,16 +221,14 @@ class BudgetController extends Controller /** * @return \Illuminate\Http\RedirectResponse */ - public function postUpdateIncome() + public function postUpdateIncome(BudgetIncomeRequest $request) { - $range = Preferences::get('viewRange', '1M')->data; - /** @var Carbon $date */ - $date = session('start', new Carbon); - $start = Navigation::startOfPeriod($date, $range); - $end = Navigation::endOfPeriod($start, $range); - $key = 'budgetIncomeTotal' . $start->format('Ymd') . $end->format('Ymd'); + $start = session('start', new Carbon); + $end = session('end', new Carbon); + $defaultCurrency = Amount::getDefaultCurrency(); + $amount = $request->get('amount'); - Preferences::set($key, intval(Input::get('amount'))); + $this->repository->setAvailableBudget($defaultCurrency, $start, $end, $amount); Preferences::mark(); return redirect(route('budgets.index')); @@ -430,19 +369,57 @@ class BudgetController extends Controller */ public function updateIncome() { - $range = Preferences::get('viewRange', '1M')->data; - $format = strval(trans('config.month_and_day')); + $start = session('start', new Carbon); + $end = session('end', new Carbon); + $defaultCurrency = Amount::getDefaultCurrency(); + $available = $this->repository->getAvailableBudget($defaultCurrency, $start, $end); - /** @var Carbon $date */ - $date = session('start', new Carbon); - $start = Navigation::startOfPeriod($date, $range); - $end = Navigation::endOfPeriod($start, $range); - $key = 'budgetIncomeTotal' . $start->format('Ymd') . $end->format('Ymd'); - $amount = Preferences::get($key, 1000); - $displayStart = $start->formatLocalized($format); - $displayEnd = $end->formatLocalized($format); - return view('budgets.income', compact('amount', 'displayStart', 'displayEnd')); + return view('budgets.income', compact('available', 'start', 'end')); + } + + /** + * @param Collection $budgets + * @param Carbon $start + * @param Carbon $end + * + * @return array + */ + private function collectBudgetInformation(Collection $budgets, Carbon $start, Carbon $end): array + { + // get account information + $accountRepository = app(AccountRepositoryInterface::class); + $accounts = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET, AccountType::CASH]); + $return = []; + /** @var Budget $budget */ + foreach ($budgets as $budget) { + $budgetId = $budget->id; + $return[$budgetId] = [ + 'spent' => $this->repository->spentInPeriod(new Collection([$budget]), $accounts, $start, $end), + 'budgeted' => '0', + 'currentRep' => false, + ]; + $allRepetitions = $this->repository->getAllBudgetLimitRepetitions($start, $end); + $otherRepetitions = new Collection; + + // get all the limit repetitions relevant between start and end and examine them: + /** @var LimitRepetition $repetition */ + foreach ($allRepetitions as $repetition) { + if ($repetition->budget_id == $budget->id) { + if ($repetition->startdate->isSameDay($start) && $repetition->enddate->isSameDay($end) + ) { + $return[$budgetId]['currentRep'] = $repetition; + $return[$budgetId]['budgeted'] = $repetition->amount; + continue; + } + // otherwise it's just one of the many relevant repetitions: + $otherRepetitions->push($repetition); + } + } + $return[$budgetId]['otherRepetitions'] = $otherRepetitions; + } + + return $return; } } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 6882a0f14a..9a4b2bf7f5 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -63,6 +63,7 @@ class HomeController extends Controller // a possible problem with the budgets. if ($label === strval(trans('firefly.everything')) || $label === strval(trans('firefly.customRange'))) { $isCustomRange = true; + Preferences::set('viewRange', 'custom'); Log::debug('Range is now marked as "custom".'); } diff --git a/app/Http/Requests/BudgetIncomeRequest.php b/app/Http/Requests/BudgetIncomeRequest.php new file mode 100644 index 0000000000..e8c2c93e39 --- /dev/null +++ b/app/Http/Requests/BudgetIncomeRequest.php @@ -0,0 +1,42 @@ +check(); + } + + /** + * @return array + */ + public function rules() + { + return [ + 'amount' => 'numeric|required|min:0', + ]; + } +} diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php new file mode 100644 index 0000000000..6916052c81 --- /dev/null +++ b/app/Models/AvailableBudget.php @@ -0,0 +1,49 @@ +belongsTo('FireflyIII\Models\TransactionCurrency'); + } + + /** + * @return BelongsTo + */ + public function user(): BelongsTo + { + return $this->belongsTo('FireflyIII\User'); + } +} \ No newline at end of file diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index f4633d5ec3..b672444fbd 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -17,10 +17,12 @@ use Carbon\Carbon; use FireflyIII\Events\StoredBudgetLimit; use FireflyIII\Events\UpdatedBudgetLimit; use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Models\AvailableBudget; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; use FireflyIII\Models\LimitRepetition; use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\User; @@ -210,6 +212,27 @@ class BudgetRepository implements BudgetRepositoryInterface return $set; } + /** + * @param TransactionCurrency $currency + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function getAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end): string + { + $amount = '0'; + $availableBudget = $this->user->availableBudgets() + ->where('transaction_currency_id', $currency->id) + ->where('start_date', $start->format('Y-m-d')) + ->where('end_date', $end->format('Y-m-d'))->first(); + if (!is_null($availableBudget)) { + $amount = strval($availableBudget->amount); + } + + return $amount; + } + /** * This method is being used to generate the budget overview in the year/multi-year report. Its used * in both the year/multi-year budget overview AND in the accompanying chart. @@ -322,6 +345,33 @@ class BudgetRepository implements BudgetRepositoryInterface return $result; } + /** + * @param TransactionCurrency $currency + * @param Carbon $start + * @param Carbon $end + * @param string $amount + * + * @return bool + */ + public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): bool + { + $availableBudget = $this->user->availableBudgets() + ->where('transaction_currency_id', $currency->id) + ->where('start_date', $start->format('Y-m-d')) + ->where('end_date', $end->format('Y-m-d'))->first(); + if (is_null($availableBudget)) { + $availableBudget = new AvailableBudget; + $availableBudget->user()->associate($this->user); + $availableBudget->transactionCurrency()->associate($currency); + $availableBudget->start_date = $start; + $availableBudget->end_date = $end; + } + $availableBudget->amount = $amount; + $availableBudget->save(); + + return true; + } + /** * @param Collection $budgets * @param Collection $accounts diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 30633beff9..8d04c7bff6 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -16,6 +16,7 @@ namespace FireflyIII\Repositories\Budget; use Carbon\Carbon; use FireflyIII\Models\Budget; use FireflyIII\Models\BudgetLimit; +use FireflyIII\Models\TransactionCurrency; use Illuminate\Support\Collection; /** @@ -90,6 +91,15 @@ interface BudgetRepositoryInterface */ public function getAllBudgetLimitRepetitions(Carbon $start, Carbon $end): Collection; + /** + * @param TransactionCurrency $currency + * @param Carbon $start + * @param Carbon $end + * + * @return string + */ + public function getAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end): string; + /** * * @param Collection $budgets @@ -120,6 +130,16 @@ interface BudgetRepositoryInterface */ public function getNoBudgetPeriodReport(Collection $accounts, Carbon $start, Carbon $end): array; + /** + * @param TransactionCurrency $currency + * @param Carbon $start + * @param Carbon $end + * @param string $amount + * + * @return bool + */ + public function setAvailableBudget(TransactionCurrency $currency, Carbon $start, Carbon $end, string $amount): bool; + /** * @param Collection $budgets * @param Collection $accounts diff --git a/app/User.php b/app/User.php index ba57a8ce47..763d33d92c 100755 --- a/app/User.php +++ b/app/User.php @@ -51,6 +51,15 @@ class User extends Authenticatable */ protected $table = 'users'; + + /** + * @return HasMany + */ + public function availableBudgets(): HasMany + { + return $this->hasMany('FireflyIII\Models\AvailableBudget'); + } + /** * @return HasMany */ diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php new file mode 100644 index 0000000000..bf98ad68dc --- /dev/null +++ b/database/migrations/2016_12_22_150431_changes_for_v430.php @@ -0,0 +1,44 @@ +increments('id'); + $table->timestamps(); + $table->softDeletes(); + $table->integer('user_id', false, true); + $table->integer('transaction_currency_id', false, true); + $table->decimal('amount', 14, 4); + $table->date('start_date'); + $table->date('end_date'); + + + $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade'); + $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('available_budgets'); + } +} diff --git a/public/js/ff/budgets/index.js b/public/js/ff/budgets/index.js index c8ca145734..ce0103ef1a 100644 --- a/public/js/ff/budgets/index.js +++ b/public/js/ff/budgets/index.js @@ -1,5 +1,3 @@ -/* globals $, budgeted:true, currencySymbol, budgetIncomeTotal, columnChart, budgetedMuch, budgetedPercentage, token, budgetID, repetitionID, spent, lineChart */ - function drawSpentBar() { "use strict"; if ($('.spentBar').length > 0) { @@ -23,19 +21,19 @@ function drawBudgetedBar() { "use strict"; if ($('.budgetedBar').length > 0) { - var budgetedMuch = budgeted > budgetIncomeTotal; + var budgetedMuch = budgeted > available; // recalculate percentage: var pct; if (budgetedMuch) { // budgeted too much. - pct = (budgetIncomeTotal / budgeted) * 100; + pct = (available / budgeted) * 100; $('.budgetedBar .progress-bar-warning').css('width', pct + '%'); $('.budgetedBar .progress-bar-danger').css('width', (100 - pct) + '%'); $('.budgetedBar .progress-bar-info').css('width', 0); } else { - pct = (budgeted / budgetIncomeTotal) * 100; + pct = (budgeted / available) * 100; $('.budgetedBar .progress-bar-warning').css('width', 0); $('.budgetedBar .progress-bar-danger').css('width', 0); $('.budgetedBar .progress-bar-info').css('width', pct + '%'); diff --git a/resources/views/budgets/income.twig b/resources/views/budgets/income.twig index f78cb2c255..28904dc66d 100644 --- a/resources/views/budgets/income.twig +++ b/resources/views/budgets/income.twig @@ -4,7 +4,8 @@
                                                                              @@ -14,7 +15,7 @@
                                                                              {{ getCurrencySymbol()|raw }}
                                                                              - +
                                                                              diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index 691a92638a..3d05cad3a5 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -18,8 +18,8 @@
                                                                              {{ trans('firefly.available_between',{start : periodStart, end: periodEnd }) }}: - {{ budgetIncomeTotal|formatAmount }} + {{ available|formatAmountPlain }}
                                                                              @@ -90,8 +90,8 @@

                                                                              - {% if budget.currentRep.id %} - {{ budget.name }} {% else %} {{ budget.name }} @@ -122,20 +122,16 @@
                                                                              {{ defaultCurrency.symbol|raw }}
                                                                              - - + {% if budgetInformation[budget.id]['currentRep'] %} + {% set repAmount = budgetInformation[budget.id]['currentRep'].amount %} + {% else %} + {% set repAmount = '0' %} + {% endif %} +
                                                                              -
                                                                              @@ -147,21 +143,23 @@ {{ session('end').formatLocalized(monthAndDayFormat) }} - {{ budget.spent|formatAmount }} + + {{ budgetInformation[budget.id]['spent']|formatAmount }} + - {% if budget.otherRepetitions.count > 0 %} + {% if budgetInformation[budget.id]['otherRepetitions'].count > 0 %}
                                                                                - {% for other in budget.otherRepetitions %} - {% if other.id != budget.currentRep.id %} -
                                                                              • Budgeted - {{ other.amount|formatAmountPlain }} - between - {{ other.startdate.formatLocalized(monthAndDayFormat) }} - and {{ other.enddate.formatLocalized(monthAndDayFormat) }}. -
                                                                                • - {% endif %} + {% for other in budgetInformation[budget.id]['otherRepetitions'] %} +
                                                                              • + + Budgeted + {{ other.amount|formatAmountPlain }} + between + {{ other.startdate.formatLocalized(monthAndDayFormat) }} + and {{ other.enddate.formatLocalized(monthAndDayFormat) }}. +
                                                                                • {% endfor %}
                                                                              @@ -206,7 +204,7 @@ // budgeted data: var budgeted = {{ budgeted }}; - var budgetIncomeTotal = {{ budgetIncomeTotal }}; + var available = {{ available }}; From cabdf4e38068b66a2457ffc40974f2b0fb93009a Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 16:55:27 +0100 Subject: [PATCH 060/150] This might fix the missing stack trace. [skip ci] --- resources/views/emails/error-html.twig | 2 +- resources/views/emails/error-text.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/emails/error-html.twig b/resources/views/emails/error-html.twig index e20947ee04..2bed85d1d7 100644 --- a/resources/views/emails/error-html.twig +++ b/resources/views/emails/error-html.twig @@ -40,6 +40,6 @@

                                                                              The full stacktrace is below:

                                                                              - {{ stacktrace|nl2br }} + {{ stackTrace|nl2br }}

                                                                              {% include 'emails.footer-html' %} \ No newline at end of file diff --git a/resources/views/emails/error-text.twig b/resources/views/emails/error-text.twig index 5293cc5566..0de3c61a21 100644 --- a/resources/views/emails/error-text.twig +++ b/resources/views/emails/error-text.twig @@ -25,5 +25,5 @@ https://github.com/JC5/firefly-iii/issues/new The full stacktrace is below: -{{ stacktrace }} +{{ stackTrace }} {% include 'emails.footer-text' %} \ No newline at end of file From 284db7f90b66bef74d8aa45cf92960aa608db6c4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 17:04:41 +0100 Subject: [PATCH 061/150] Fixed some small display issues. --- app/Http/Controllers/BudgetController.php | 2 +- app/Http/Controllers/HomeController.php | 2 +- app/Jobs/MailError.php | 2 +- resources/views/budgets/index.twig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 70def0eec3..77d6ecb164 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -83,7 +83,7 @@ class BudgetController extends Controller } Preferences::mark(); - return Response::json(['name' => $budget->name, 'repetition' => $limitRepetition ? $limitRepetition->id : 0]); + return Response::json(['name' => $budget->name, 'repetition' => $limitRepetition ? $limitRepetition->id : 0, 'amount' => $amount]); } diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 9a4b2bf7f5..5f19c79c32 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -63,7 +63,7 @@ class HomeController extends Controller // a possible problem with the budgets. if ($label === strval(trans('firefly.everything')) || $label === strval(trans('firefly.customRange'))) { $isCustomRange = true; - Preferences::set('viewRange', 'custom'); + //Preferences::set('viewRange', 'custom'); Log::debug('Range is now marked as "custom".'); } diff --git a/app/Jobs/MailError.php b/app/Jobs/MailError.php index 883443f9a7..44e1ec89b5 100644 --- a/app/Jobs/MailError.php +++ b/app/Jobs/MailError.php @@ -81,7 +81,7 @@ class MailError extends Job implements ShouldQueue ['emails.error-html', 'emails.error-text'], $args, function (Message $message) use ($email) { if ($email != 'mail@example.com') { - $message->to($email, $email)->subject('Caught an error in Firely III.'); + $message->to($email, $email)->subject('Caught an error in Firely III'); } } ); diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index 3d05cad3a5..f837687845 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -129,7 +129,7 @@ {% set repAmount = '0' %} {% endif %}

                                                                              From e76075e29f962bcf9a0af360d434d6595edbbd7a Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 18:19:50 +0100 Subject: [PATCH 062/150] Various small fixes. --- app/Support/ExpandedForm.php | 7 +++++++ app/Support/Twig/Journal.php | 4 ++-- tests/acceptance/Controllers/BudgetControllerTest.php | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index 2b6a2f0486..50e3398f26 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -503,6 +503,13 @@ class ExpandedForm $currencies = Amt::getAllCurrencies(); unset($options['currency']); unset($options['placeholder']); + + // make sure value is formatted nicely: + if (!is_null($value) && $value !== '') { + $value = round($value, 2); + } + + $html = view('form.' . $view, compact('defaultCurrency', 'currencies', 'classes', 'name', 'label', 'value', 'options'))->render(); return $html; diff --git a/app/Support/Twig/Journal.php b/app/Support/Twig/Journal.php index e98f0ee070..65aac8e818 100644 --- a/app/Support/Twig/Journal.php +++ b/app/Support/Twig/Journal.php @@ -16,6 +16,7 @@ namespace FireflyIII\Support\Twig; use Amount; use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; use FireflyIII\Models\Budget as ModelBudget; use FireflyIII\Models\Category; use FireflyIII\Models\TransactionJournal; @@ -142,7 +143,7 @@ class Journal extends Twig_Extension $array = []; /** @var Account $entry */ foreach ($list as $entry) { - if ($entry->accountType->type == 'Cash account') { + if ($entry->accountType->type == AccountType::CASH) { $array[] = '(cash)'; continue; } @@ -153,7 +154,6 @@ class Journal extends Twig_Extension $cache->store($result); return $result; - } ); } diff --git a/tests/acceptance/Controllers/BudgetControllerTest.php b/tests/acceptance/Controllers/BudgetControllerTest.php index 06d86c3bd1..cef5c1cb2e 100644 --- a/tests/acceptance/Controllers/BudgetControllerTest.php +++ b/tests/acceptance/Controllers/BudgetControllerTest.php @@ -129,10 +129,10 @@ class BudgetControllerTest extends TestCase public function testPostUpdateIncome() { $data = [ - 'amount' => 200, + 'amount' => '200', ]; $this->be($this->user()); - $this->call('post', route('budgets.income.post', [1]), $data); + $this->call('post', route('budgets.income.post'), $data); $this->assertResponseStatus(302); } From 3753901e384ca2292eaf12fedd24ff08453b2c8b Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 18:26:16 +0100 Subject: [PATCH 063/150] Expand flush routine because of issues. [skip ci] --- app/Http/Controllers/HomeController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 5f19c79c32..0cc0aa6e48 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -108,7 +108,7 @@ class HomeController extends Controller $journal->save(); } } - + Session::forget(['start','end','viewRange','range','is_custom_range']); Session::clear(); Artisan::call('cache:clear'); From 13e56b7249a54669271278b6b2281c3a15661260 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 19:17:33 +0100 Subject: [PATCH 064/150] Can handle account number, but do nothing with it. --- app/Import/ImportEntry.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Import/ImportEntry.php b/app/Import/ImportEntry.php index cd3f48b402..3486e588ca 100644 --- a/app/Import/ImportEntry.php +++ b/app/Import/ImportEntry.php @@ -97,6 +97,9 @@ class ImportEntry case 'account-iban': case 'account-name': $this->setObject('asset-account', $convertedValue, $certainty); + break; + case 'account-number': + break; case 'opposing-number': case 'opposing-iban': From 14a0de6b6af0db697450353c15d3f6b1a667ca64 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 19:18:35 +0100 Subject: [PATCH 065/150] This should fix account-number. --- app/Import/ImportEntry.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/Import/ImportEntry.php b/app/Import/ImportEntry.php index 3486e588ca..fba65e99d4 100644 --- a/app/Import/ImportEntry.php +++ b/app/Import/ImportEntry.php @@ -96,10 +96,8 @@ class ImportEntry case 'account-id': case 'account-iban': case 'account-name': - $this->setObject('asset-account', $convertedValue, $certainty); - break; case 'account-number': - + $this->setObject('asset-account', $convertedValue, $certainty); break; case 'opposing-number': case 'opposing-iban': From b6aa79bb3806dc717225d7fa69c262de99a482ce Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 19:42:45 +0100 Subject: [PATCH 066/150] Various code cleanup. Removed executable flags, added newlines. --- app/Console/Kernel.php | 0 app/Events/DeletedUser.php | 2 +- app/Events/RequestedNewPassword.php | 2 +- app/Exceptions/Handler.php | 0 app/Export/ProcessorInterface.php | 2 +- app/Generator/Chart/Basic/ChartJsGenerator.php | 2 +- app/Generator/Chart/Basic/GeneratorInterface.php | 2 +- app/Generator/Report/Audit/MonthReportGenerator.php | 2 +- app/Generator/Report/Audit/MultiYearReportGenerator.php | 2 +- app/Generator/Report/Audit/YearReportGenerator.php | 2 +- app/Generator/Report/Budget/MonthReportGenerator.php | 2 +- app/Generator/Report/Budget/MultiYearReportGenerator.php | 2 +- app/Generator/Report/Budget/YearReportGenerator.php | 2 +- app/Generator/Report/Category/MonthReportGenerator.php | 2 +- app/Generator/Report/Category/MultiYearReportGenerator.php | 2 +- app/Generator/Report/Category/YearReportGenerator.php | 2 +- app/Generator/Report/ReportGeneratorFactory.php | 2 +- app/Generator/Report/ReportGeneratorInterface.php | 2 +- app/Generator/Report/Standard/MonthReportGenerator.php | 2 +- app/Generator/Report/Standard/MultiYearReportGenerator.php | 2 +- app/Generator/Report/Standard/YearReportGenerator.php | 2 +- app/Generator/Report/Support.php | 2 +- app/Helpers/Collector/JournalCollector.php | 2 +- app/Helpers/Collector/JournalCollectorInterface.php | 2 +- app/Http/Controllers/AccountController.php | 3 +-- app/Http/Controllers/Auth/ForgotPasswordController.php | 0 app/Http/Controllers/Auth/LoginController.php | 0 app/Http/Controllers/Auth/RegisterController.php | 0 app/Http/Controllers/Auth/ResetPasswordController.php | 0 app/Http/Controllers/Chart/BudgetReportController.php | 2 +- app/Http/Controllers/Chart/CategoryReportController.php | 2 +- app/Http/Controllers/Controller.php | 0 app/Http/Controllers/Report/BalanceController.php | 2 +- app/Http/Controllers/Report/BudgetController.php | 2 +- app/Http/Controllers/Report/CategoryController.php | 2 +- app/Http/Controllers/Report/OperationsController.php | 2 +- app/Http/Controllers/Transaction/ConvertController.php | 2 +- app/Http/Kernel.php | 0 app/Http/Middleware/EncryptCookies.php | 0 app/Http/Middleware/RedirectIfAuthenticated.php | 0 app/Http/Middleware/VerifyCsrfToken.php | 0 app/Import/Converter/TagSplit.php | 2 +- app/Models/AvailableBudget.php | 2 +- app/Providers/AppServiceProvider.php | 0 app/Providers/AuthServiceProvider.php | 0 app/Providers/BroadcastServiceProvider.php | 0 app/Providers/EventServiceProvider.php | 0 app/Providers/RouteServiceProvider.php | 0 app/Support/ChartColour.php | 2 +- app/User.php | 0 bootstrap/app.php | 0 bootstrap/autoload.php | 0 bootstrap/cache/.gitignore | 0 config/auth.php | 0 config/broadcasting.php | 0 config/cache.php | 0 config/compile.php | 0 config/database.php | 0 config/filesystems.php | 0 config/mail.php | 0 config/queue.php | 0 config/services.php | 0 config/session.php | 0 config/view.php | 0 database/.gitignore | 0 database/factories/ModelFactory.php | 0 database/migrations/.gitkeep | 0 database/seeds/.gitkeep | 0 database/seeds/DatabaseSeeder.php | 0 resources/views/emails/confirm-account-html.twig | 2 +- resources/views/emails/confirm-account-text.twig | 2 +- resources/views/emails/error-html.twig | 2 +- resources/views/emails/error-text.twig | 2 +- resources/views/emails/footer-html.twig | 2 +- resources/views/emails/header-html.twig | 2 +- resources/views/emails/locked-out-text.twig | 2 +- resources/views/emails/password-html.twig | 2 +- resources/views/emails/password-text.twig | 2 +- resources/views/emails/registered-text.twig | 2 +- resources/views/reports/budget/month.twig | 2 +- resources/views/reports/category/month.twig | 2 +- resources/views/reports/default/year.twig | 2 +- resources/views/reports/options/no-options.twig | 2 +- resources/views/reports/partials/budget-period.twig | 2 +- resources/views/search/index.twig | 2 +- resources/views/transactions/index-all.twig | 2 +- resources/views/transactions/index-date.twig | 2 +- resources/views/vendor/.gitkeep | 0 tests/ExampleTest.php | 0 tests/TestCase.php | 0 tests/acceptance/Controllers/HomeControllerTest.php | 0 tests/unit/Models/TransactionTypeTest.php | 0 92 files changed, 51 insertions(+), 52 deletions(-) mode change 100755 => 100644 app/Console/Kernel.php mode change 100755 => 100644 app/Exceptions/Handler.php mode change 100755 => 100644 app/Http/Controllers/Auth/ForgotPasswordController.php mode change 100755 => 100644 app/Http/Controllers/Auth/LoginController.php mode change 100755 => 100644 app/Http/Controllers/Auth/RegisterController.php mode change 100755 => 100644 app/Http/Controllers/Auth/ResetPasswordController.php mode change 100755 => 100644 app/Http/Controllers/Controller.php mode change 100755 => 100644 app/Http/Kernel.php mode change 100755 => 100644 app/Http/Middleware/EncryptCookies.php mode change 100755 => 100644 app/Http/Middleware/RedirectIfAuthenticated.php mode change 100755 => 100644 app/Http/Middleware/VerifyCsrfToken.php mode change 100755 => 100644 app/Providers/AppServiceProvider.php mode change 100755 => 100644 app/Providers/AuthServiceProvider.php mode change 100755 => 100644 app/Providers/BroadcastServiceProvider.php mode change 100755 => 100644 app/Providers/EventServiceProvider.php mode change 100755 => 100644 app/Providers/RouteServiceProvider.php mode change 100755 => 100644 app/User.php mode change 100755 => 100644 bootstrap/app.php mode change 100755 => 100644 bootstrap/autoload.php mode change 100755 => 100644 bootstrap/cache/.gitignore mode change 100755 => 100644 config/auth.php mode change 100755 => 100644 config/broadcasting.php mode change 100755 => 100644 config/cache.php mode change 100755 => 100644 config/compile.php mode change 100755 => 100644 config/database.php mode change 100755 => 100644 config/filesystems.php mode change 100755 => 100644 config/mail.php mode change 100755 => 100644 config/queue.php mode change 100755 => 100644 config/services.php mode change 100755 => 100644 config/session.php mode change 100755 => 100644 config/view.php mode change 100755 => 100644 database/.gitignore mode change 100755 => 100644 database/factories/ModelFactory.php mode change 100755 => 100644 database/migrations/.gitkeep mode change 100755 => 100644 database/seeds/.gitkeep mode change 100755 => 100644 database/seeds/DatabaseSeeder.php mode change 100755 => 100644 resources/views/vendor/.gitkeep mode change 100755 => 100644 tests/ExampleTest.php mode change 100755 => 100644 tests/TestCase.php mode change 100755 => 100644 tests/acceptance/Controllers/HomeControllerTest.php mode change 100755 => 100644 tests/unit/Models/TransactionTypeTest.php diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php old mode 100755 new mode 100644 diff --git a/app/Events/DeletedUser.php b/app/Events/DeletedUser.php index 2670b2c48a..80ab5d58ce 100644 --- a/app/Events/DeletedUser.php +++ b/app/Events/DeletedUser.php @@ -35,4 +35,4 @@ class DeletedUser extends Event { $this->email = $email; } -} \ No newline at end of file +} diff --git a/app/Events/RequestedNewPassword.php b/app/Events/RequestedNewPassword.php index 7956cc8613..52919a646b 100644 --- a/app/Events/RequestedNewPassword.php +++ b/app/Events/RequestedNewPassword.php @@ -43,4 +43,4 @@ class RequestedNewPassword extends Event $this->ipAddress = $ipAddress; } -} \ No newline at end of file +} diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php old mode 100755 new mode 100644 diff --git a/app/Export/ProcessorInterface.php b/app/Export/ProcessorInterface.php index 364f4730d4..459cbf6276 100644 --- a/app/Export/ProcessorInterface.php +++ b/app/Export/ProcessorInterface.php @@ -64,4 +64,4 @@ interface ProcessorInterface * @return Collection */ public function getFiles(): Collection; -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Basic/ChartJsGenerator.php b/app/Generator/Chart/Basic/ChartJsGenerator.php index a4a4caa8c1..c9b13a873c 100644 --- a/app/Generator/Chart/Basic/ChartJsGenerator.php +++ b/app/Generator/Chart/Basic/ChartJsGenerator.php @@ -134,4 +134,4 @@ class ChartJsGenerator implements GeneratorInterface return $chartData; } -} \ No newline at end of file +} diff --git a/app/Generator/Chart/Basic/GeneratorInterface.php b/app/Generator/Chart/Basic/GeneratorInterface.php index 8299851822..8b4b90af8a 100644 --- a/app/Generator/Chart/Basic/GeneratorInterface.php +++ b/app/Generator/Chart/Basic/GeneratorInterface.php @@ -70,4 +70,4 @@ interface GeneratorInterface */ public function singleSet(string $setLabel, array $data): array; -} \ No newline at end of file +} diff --git a/app/Generator/Report/Audit/MonthReportGenerator.php b/app/Generator/Report/Audit/MonthReportGenerator.php index cc31219d9e..a5f30e9a10 100644 --- a/app/Generator/Report/Audit/MonthReportGenerator.php +++ b/app/Generator/Report/Audit/MonthReportGenerator.php @@ -153,4 +153,4 @@ class MonthReportGenerator implements ReportGeneratorInterface return $this; } -} \ No newline at end of file +} diff --git a/app/Generator/Report/Audit/MultiYearReportGenerator.php b/app/Generator/Report/Audit/MultiYearReportGenerator.php index 6d9e2857b8..f8baa6e66f 100644 --- a/app/Generator/Report/Audit/MultiYearReportGenerator.php +++ b/app/Generator/Report/Audit/MultiYearReportGenerator.php @@ -24,4 +24,4 @@ class MultiYearReportGenerator extends MonthReportGenerator /** * Doesn't do anything different. */ -} \ No newline at end of file +} diff --git a/app/Generator/Report/Audit/YearReportGenerator.php b/app/Generator/Report/Audit/YearReportGenerator.php index 915aef0d4a..b44bae8820 100644 --- a/app/Generator/Report/Audit/YearReportGenerator.php +++ b/app/Generator/Report/Audit/YearReportGenerator.php @@ -25,4 +25,4 @@ class YearReportGenerator extends MonthReportGenerator /** * Doesn't do anything different. */ -} \ No newline at end of file +} diff --git a/app/Generator/Report/Budget/MonthReportGenerator.php b/app/Generator/Report/Budget/MonthReportGenerator.php index a2512f3a72..085fb9bfe8 100644 --- a/app/Generator/Report/Budget/MonthReportGenerator.php +++ b/app/Generator/Report/Budget/MonthReportGenerator.php @@ -244,4 +244,4 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $result; } -} \ No newline at end of file +} diff --git a/app/Generator/Report/Budget/MultiYearReportGenerator.php b/app/Generator/Report/Budget/MultiYearReportGenerator.php index 3d92def9f3..b3820f88dd 100644 --- a/app/Generator/Report/Budget/MultiYearReportGenerator.php +++ b/app/Generator/Report/Budget/MultiYearReportGenerator.php @@ -24,4 +24,4 @@ class MultiYearReportGenerator extends MonthReportGenerator /** * Doesn't do anything different. */ -} \ No newline at end of file +} diff --git a/app/Generator/Report/Budget/YearReportGenerator.php b/app/Generator/Report/Budget/YearReportGenerator.php index 0f76de9b07..30f51e599c 100644 --- a/app/Generator/Report/Budget/YearReportGenerator.php +++ b/app/Generator/Report/Budget/YearReportGenerator.php @@ -25,4 +25,4 @@ class YearReportGenerator extends MonthReportGenerator /** * Doesn't do anything different. */ -} \ No newline at end of file +} diff --git a/app/Generator/Report/Category/MonthReportGenerator.php b/app/Generator/Report/Category/MonthReportGenerator.php index 410fd29346..53aa790e28 100644 --- a/app/Generator/Report/Category/MonthReportGenerator.php +++ b/app/Generator/Report/Category/MonthReportGenerator.php @@ -325,4 +325,4 @@ class MonthReportGenerator extends Support implements ReportGeneratorInterface return $result; } -} \ No newline at end of file +} diff --git a/app/Generator/Report/Category/MultiYearReportGenerator.php b/app/Generator/Report/Category/MultiYearReportGenerator.php index 2f663c3925..62b0e32af9 100644 --- a/app/Generator/Report/Category/MultiYearReportGenerator.php +++ b/app/Generator/Report/Category/MultiYearReportGenerator.php @@ -24,4 +24,4 @@ class MultiYearReportGenerator extends MonthReportGenerator /** * Doesn't do anything different. */ -} \ No newline at end of file +} diff --git a/app/Generator/Report/Category/YearReportGenerator.php b/app/Generator/Report/Category/YearReportGenerator.php index 038ab47ed6..a118c4c5b0 100644 --- a/app/Generator/Report/Category/YearReportGenerator.php +++ b/app/Generator/Report/Category/YearReportGenerator.php @@ -25,4 +25,4 @@ class YearReportGenerator extends MonthReportGenerator /** * Doesn't do anything different. */ -} \ No newline at end of file +} diff --git a/app/Generator/Report/ReportGeneratorFactory.php b/app/Generator/Report/ReportGeneratorFactory.php index 0323d56c46..9dbf45ed43 100644 --- a/app/Generator/Report/ReportGeneratorFactory.php +++ b/app/Generator/Report/ReportGeneratorFactory.php @@ -57,4 +57,4 @@ class ReportGeneratorFactory } throw new FireflyException(sprintf('Cannot generate report. There is no "%s"-report for period "%s".', $type, $period)); } -} \ No newline at end of file +} diff --git a/app/Generator/Report/ReportGeneratorInterface.php b/app/Generator/Report/ReportGeneratorInterface.php index ad46c0646a..593d318f10 100644 --- a/app/Generator/Report/ReportGeneratorInterface.php +++ b/app/Generator/Report/ReportGeneratorInterface.php @@ -64,4 +64,4 @@ interface ReportGeneratorInterface */ public function setStartDate(Carbon $date): ReportGeneratorInterface; -} \ No newline at end of file +} diff --git a/app/Generator/Report/Standard/MonthReportGenerator.php b/app/Generator/Report/Standard/MonthReportGenerator.php index 5905e12815..113b777c91 100644 --- a/app/Generator/Report/Standard/MonthReportGenerator.php +++ b/app/Generator/Report/Standard/MonthReportGenerator.php @@ -106,4 +106,4 @@ class MonthReportGenerator implements ReportGeneratorInterface return $this; } -} \ No newline at end of file +} diff --git a/app/Generator/Report/Standard/MultiYearReportGenerator.php b/app/Generator/Report/Standard/MultiYearReportGenerator.php index 3437283426..5dab371d6b 100644 --- a/app/Generator/Report/Standard/MultiYearReportGenerator.php +++ b/app/Generator/Report/Standard/MultiYearReportGenerator.php @@ -103,4 +103,4 @@ class MultiYearReportGenerator implements ReportGeneratorInterface return $this; } -} \ No newline at end of file +} diff --git a/app/Generator/Report/Standard/YearReportGenerator.php b/app/Generator/Report/Standard/YearReportGenerator.php index 545084909f..f3297e35df 100644 --- a/app/Generator/Report/Standard/YearReportGenerator.php +++ b/app/Generator/Report/Standard/YearReportGenerator.php @@ -103,4 +103,4 @@ class YearReportGenerator implements ReportGeneratorInterface return $this; } -} \ No newline at end of file +} diff --git a/app/Generator/Report/Support.php b/app/Generator/Report/Support.php index 56ee7e981c..1f71ad182a 100644 --- a/app/Generator/Report/Support.php +++ b/app/Generator/Report/Support.php @@ -88,4 +88,4 @@ class Support return $result; } -} \ No newline at end of file +} diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 76f66a0019..601e593d12 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -726,4 +726,4 @@ class JournalCollector implements JournalCollectorInterface return $query; } -} \ No newline at end of file +} diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php index 320fcab93b..b3307ebac0 100644 --- a/app/Helpers/Collector/JournalCollectorInterface.php +++ b/app/Helpers/Collector/JournalCollectorInterface.php @@ -173,4 +173,4 @@ interface JournalCollectorInterface * @return JournalCollectorInterface */ public function withoutCategory(): JournalCollectorInterface; -} \ No newline at end of file +} diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index d906c5ce5d..eea03cbac5 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -199,8 +199,7 @@ class AccountController extends Controller */ public function index(ARI $repository, string $what) { - $what = $what ?? 'asset'; - + $what = $what ?? 'asset'; $subTitle = trans('firefly.' . $what . '_accounts'); $subTitleIcon = config('firefly.subIconsByIdentifier.' . $what); $types = config('firefly.accountTypesByIdentifier.' . $what); diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index e053189066..a48037b6a6 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -289,4 +289,4 @@ class BudgetReportController extends Controller return $grouped; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index 003648218c..d241d27ef8 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -427,4 +427,4 @@ class CategoryReportController extends Controller return $grouped; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php old mode 100755 new mode 100644 diff --git a/app/Http/Controllers/Report/BalanceController.php b/app/Http/Controllers/Report/BalanceController.php index 664217472a..9dadfa608d 100644 --- a/app/Http/Controllers/Report/BalanceController.php +++ b/app/Http/Controllers/Report/BalanceController.php @@ -57,4 +57,4 @@ class BalanceController extends Controller return $result; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Report/BudgetController.php b/app/Http/Controllers/Report/BudgetController.php index a541a7a8bb..bc4d026631 100644 --- a/app/Http/Controllers/Report/BudgetController.php +++ b/app/Http/Controllers/Report/BudgetController.php @@ -120,4 +120,4 @@ class BudgetController extends Controller return $data; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index 0d5f3e3f07..3222083051 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -170,4 +170,4 @@ class CategoryController extends Controller } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Report/OperationsController.php b/app/Http/Controllers/Report/OperationsController.php index 3282e98d80..a30954ec7b 100644 --- a/app/Http/Controllers/Report/OperationsController.php +++ b/app/Http/Controllers/Report/OperationsController.php @@ -241,4 +241,4 @@ class OperationsController extends Controller return $expenses; } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/Transaction/ConvertController.php b/app/Http/Controllers/Transaction/ConvertController.php index f83a317229..ebeec3b1d3 100644 --- a/app/Http/Controllers/Transaction/ConvertController.php +++ b/app/Http/Controllers/Transaction/ConvertController.php @@ -244,4 +244,4 @@ class ConvertController extends Controller } -} \ No newline at end of file +} diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/EncryptCookies.php b/app/Http/Middleware/EncryptCookies.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php old mode 100755 new mode 100644 diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php old mode 100755 new mode 100644 diff --git a/app/Import/Converter/TagSplit.php b/app/Import/Converter/TagSplit.php index 53d3fc1d1c..cc99561663 100644 --- a/app/Import/Converter/TagSplit.php +++ b/app/Import/Converter/TagSplit.php @@ -82,4 +82,4 @@ class TagSplit return $set; } -} \ No newline at end of file +} diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 6916052c81..330cc0821f 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -46,4 +46,4 @@ class AvailableBudget extends Model { return $this->belongsTo('FireflyIII\User'); } -} \ No newline at end of file +} diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php old mode 100755 new mode 100644 diff --git a/app/Support/ChartColour.php b/app/Support/ChartColour.php index 5ae8f881c0..c04b75b28e 100644 --- a/app/Support/ChartColour.php +++ b/app/Support/ChartColour.php @@ -53,4 +53,4 @@ class ChartColour return sprintf('rgba(%d, %d, %d, 0.7)', $row[0], $row[1], $row[2]); } -} \ No newline at end of file +} diff --git a/app/User.php b/app/User.php old mode 100755 new mode 100644 diff --git a/bootstrap/app.php b/bootstrap/app.php old mode 100755 new mode 100644 diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php old mode 100755 new mode 100644 diff --git a/bootstrap/cache/.gitignore b/bootstrap/cache/.gitignore old mode 100755 new mode 100644 diff --git a/config/auth.php b/config/auth.php old mode 100755 new mode 100644 diff --git a/config/broadcasting.php b/config/broadcasting.php old mode 100755 new mode 100644 diff --git a/config/cache.php b/config/cache.php old mode 100755 new mode 100644 diff --git a/config/compile.php b/config/compile.php old mode 100755 new mode 100644 diff --git a/config/database.php b/config/database.php old mode 100755 new mode 100644 diff --git a/config/filesystems.php b/config/filesystems.php old mode 100755 new mode 100644 diff --git a/config/mail.php b/config/mail.php old mode 100755 new mode 100644 diff --git a/config/queue.php b/config/queue.php old mode 100755 new mode 100644 diff --git a/config/services.php b/config/services.php old mode 100755 new mode 100644 diff --git a/config/session.php b/config/session.php old mode 100755 new mode 100644 diff --git a/config/view.php b/config/view.php old mode 100755 new mode 100644 diff --git a/database/.gitignore b/database/.gitignore old mode 100755 new mode 100644 diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php old mode 100755 new mode 100644 diff --git a/database/migrations/.gitkeep b/database/migrations/.gitkeep old mode 100755 new mode 100644 diff --git a/database/seeds/.gitkeep b/database/seeds/.gitkeep old mode 100755 new mode 100644 diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php old mode 100755 new mode 100644 diff --git a/resources/views/emails/confirm-account-html.twig b/resources/views/emails/confirm-account-html.twig index a42e243d11..9dacd4e6a5 100644 --- a/resources/views/emails/confirm-account-html.twig +++ b/resources/views/emails/confirm-account-html.twig @@ -17,4 +17,4 @@

                                                                              You should be redirected to the index page right away. The link expires in about four hours.

                                                                              -{% include 'emails.footer-html' %} \ No newline at end of file +{% include 'emails.footer-html' %} diff --git a/resources/views/emails/confirm-account-text.twig b/resources/views/emails/confirm-account-text.twig index 8b5dbc9a6d..ca8f3a1e1b 100644 --- a/resources/views/emails/confirm-account-text.twig +++ b/resources/views/emails/confirm-account-text.twig @@ -8,4 +8,4 @@ PLEASE verify that this activation link goes to the Firefly III installation you {{ route }} You should be redirected to the index page right away. The link expires in about four hours. -{% include 'emails.footer-text' %} \ No newline at end of file +{% include 'emails.footer-text' %} diff --git a/resources/views/emails/error-html.twig b/resources/views/emails/error-html.twig index 2bed85d1d7..fa7a6e1829 100644 --- a/resources/views/emails/error-html.twig +++ b/resources/views/emails/error-html.twig @@ -42,4 +42,4 @@

                                                                              {{ stackTrace|nl2br }}

                                                                              -{% include 'emails.footer-html' %} \ No newline at end of file +{% include 'emails.footer-html' %} diff --git a/resources/views/emails/error-text.twig b/resources/views/emails/error-text.twig index 0de3c61a21..9f299a377e 100644 --- a/resources/views/emails/error-text.twig +++ b/resources/views/emails/error-text.twig @@ -26,4 +26,4 @@ https://github.com/JC5/firefly-iii/issues/new The full stacktrace is below: {{ stackTrace }} -{% include 'emails.footer-text' %} \ No newline at end of file +{% include 'emails.footer-text' %} diff --git a/resources/views/emails/footer-html.twig b/resources/views/emails/footer-html.twig index c058fcc605..6f4f219380 100644 --- a/resources/views/emails/footer-html.twig +++ b/resources/views/emails/footer-html.twig @@ -10,4 +10,4 @@

                                                                              - \ No newline at end of file + diff --git a/resources/views/emails/header-html.twig b/resources/views/emails/header-html.twig index af1f37648b..f3a4e8edc7 100644 --- a/resources/views/emails/header-html.twig +++ b/resources/views/emails/header-html.twig @@ -7,4 +7,4 @@

                                                                              Hi there, -

                                                                              \ No newline at end of file +

                                                                              diff --git a/resources/views/emails/locked-out-text.twig b/resources/views/emails/locked-out-text.twig index 6d5b1bc41c..81b3e54796 100644 --- a/resources/views/emails/locked-out-text.twig +++ b/resources/views/emails/locked-out-text.twig @@ -1,3 +1,3 @@ {% include 'emails.header-text' %} Firefly III has just locked out somebody trying to login with email address {{ email }}. -{% include 'emails.footer-text' %} \ No newline at end of file +{% include 'emails.footer-text' %} diff --git a/resources/views/emails/password-html.twig b/resources/views/emails/password-html.twig index a285167b6b..07e4e0a80a 100644 --- a/resources/views/emails/password-html.twig +++ b/resources/views/emails/password-html.twig @@ -10,4 +10,4 @@

                                                                              {{ url }}

                                                                              -{% include 'emails.footer-html' %} \ No newline at end of file +{% include 'emails.footer-html' %} diff --git a/resources/views/emails/password-text.twig b/resources/views/emails/password-text.twig index 3e64fe199a..0e67dd735b 100644 --- a/resources/views/emails/password-text.twig +++ b/resources/views/emails/password-text.twig @@ -4,4 +4,4 @@ Somebody tried to reset your password. If it was you, please follow the link bel PLEASE verify that the link actually goes to the Firefly III you expect it to go! {{ url }} -{% include 'emails.footer-text' %} \ No newline at end of file +{% include 'emails.footer-text' %} diff --git a/resources/views/emails/registered-text.twig b/resources/views/emails/registered-text.twig index 1fd9db6eb8..8c2aa00143 100644 --- a/resources/views/emails/registered-text.twig +++ b/resources/views/emails/registered-text.twig @@ -18,4 +18,4 @@ https://github.com/JC5/firefly-iii/wiki/First-use http://jc5.github.io/firefly-iii//description/ The registration has been created from IP {{ ip }} -{% include 'emails.footer-text' %} \ No newline at end of file +{% include 'emails.footer-text' %} diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig index 73e030e106..dca1cc27b8 100644 --- a/resources/views/reports/budget/month.twig +++ b/resources/views/reports/budget/month.twig @@ -261,4 +261,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig index f01c9a5395..76df238013 100644 --- a/resources/views/reports/category/month.twig +++ b/resources/views/reports/category/month.twig @@ -400,4 +400,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig index bea5536237..328536ef03 100644 --- a/resources/views/reports/default/year.twig +++ b/resources/views/reports/default/year.twig @@ -193,4 +193,4 @@ {% endblock %} {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/reports/options/no-options.twig b/resources/views/reports/options/no-options.twig index c5fbcb501f..0563b9dca3 100644 --- a/resources/views/reports/options/no-options.twig +++ b/resources/views/reports/options/no-options.twig @@ -1,3 +1,3 @@

                                                                              {{ 'report_has_no_extra_options'|_ }} -

                                                                              \ No newline at end of file +

                                                                              diff --git a/resources/views/reports/partials/budget-period.twig b/resources/views/reports/partials/budget-period.twig index e7774f2461..86d5f98aed 100644 --- a/resources/views/reports/partials/budget-period.twig +++ b/resources/views/reports/partials/budget-period.twig @@ -35,4 +35,4 @@ {% endfor %} - \ No newline at end of file + diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig index e2e3a76ffe..e166a612c7 100644 --- a/resources/views/search/index.twig +++ b/resources/views/search/index.twig @@ -113,4 +113,4 @@ {% block styles %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/transactions/index-all.twig b/resources/views/transactions/index-all.twig index 270afeb6d1..3d63c4e0b1 100644 --- a/resources/views/transactions/index-all.twig +++ b/resources/views/transactions/index-all.twig @@ -20,4 +20,4 @@ {% endblock %} {% block scripts %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/transactions/index-date.twig b/resources/views/transactions/index-date.twig index 8250e832f7..149aeeeb27 100644 --- a/resources/views/transactions/index-date.twig +++ b/resources/views/transactions/index-date.twig @@ -20,4 +20,4 @@ {% endblock %} {% block scripts %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/resources/views/vendor/.gitkeep b/resources/views/vendor/.gitkeep old mode 100755 new mode 100644 diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php old mode 100755 new mode 100644 diff --git a/tests/TestCase.php b/tests/TestCase.php old mode 100755 new mode 100644 diff --git a/tests/acceptance/Controllers/HomeControllerTest.php b/tests/acceptance/Controllers/HomeControllerTest.php old mode 100755 new mode 100644 diff --git a/tests/unit/Models/TransactionTypeTest.php b/tests/unit/Models/TransactionTypeTest.php old mode 100755 new mode 100644 From 90d58c5c393d671daacda6ebcdd93b2065e33694 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 19:51:49 +0100 Subject: [PATCH 067/150] Update test scripts [skip ci] --- phpunit.coverage.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ phpunit.xml | 21 +++++++++++++++------ test.sh | 18 +++++++++++++----- 3 files changed, 70 insertions(+), 11 deletions(-) create mode 100755 phpunit.coverage.xml diff --git a/phpunit.coverage.xml b/phpunit.coverage.xml new file mode 100755 index 0000000000..75e3afd143 --- /dev/null +++ b/phpunit.coverage.xml @@ -0,0 +1,42 @@ + + + + + ./tests/acceptance + + + ./tests/unit + + + + + + + + + + ./app + + + vendor/ + + + + + + + + + + + + diff --git a/phpunit.xml b/phpunit.xml index 5e3d64c04c..d439428075 100755 --- a/phpunit.xml +++ b/phpunit.xml @@ -7,19 +7,28 @@ convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" + beStrictAboutOutputDuringTests="true" stopOnFailure="true"> - - - - - ./tests + + ./tests/acceptance + + + ./tests/unit + + + + + - + ./app + + vendor/ + diff --git a/test.sh b/test.sh index b1e52c6932..6e6e8065c7 100755 --- a/test.sh +++ b/test.sh @@ -12,8 +12,9 @@ testflag='' coverageflag='' acceptancetestclass='' verbalflag='' +testsuite='' -while getopts 'vcrta:' flag; do +while getopts 'vcrta:s:' flag; do case "${flag}" in r) resetestflag='true' @@ -25,12 +26,17 @@ while getopts 'vcrta:' flag; do coverageflag='true' ;; v) - verbalflag=' -v' + verbalflag=' -v --debug' + echo "Will be verbal about it" ;; a) acceptancetestclass=./tests/acceptance/$OPTARG echo "Will only run acceptance test $OPTARG" ;; + s) + testsuite="--testsuite $OPTARG" + echo "Will only run test suite '$OPTARG'" + ;; *) error "Unexpected option ${flag}" ;; esac done @@ -85,11 +91,13 @@ else if [[ $coverageflag == "" ]] then - echo "Must run PHPUnit without coverage" - phpunit --stop-on-error $verbalflag $acceptancetestclass + echo "Must run PHPUnit without coverage:" + echo "phpunit --stop-on-error $verbalflag $acceptancetestclass $testsuite" + phpunit --stop-on-error $verbalflag $acceptancetestclass $testsuite else echo "Must run PHPUnit with coverage" - phpunit --stop-on-error $verbalflag --configuration phpunit.coverage.xml $acceptancetestclass + echo "phpunit --stop-on-error $verbalflag --configuration phpunit.coverage.xml $acceptancetestclass $testsuite" + phpunit --stop-on-error $verbalflag --configuration phpunit.coverage.xml $acceptancetestclass $testsuite fi fi From 8fb9577660edd6cff5758bc795b2ce3a34804671 Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 22 Dec 2016 21:45:04 +0100 Subject: [PATCH 068/150] Add some debug, fix balance report bug. --- app/Helpers/Report/BalanceReportHelper.php | 10 +++++++- app/Repositories/Budget/BudgetRepository.php | 26 ++++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/app/Helpers/Report/BalanceReportHelper.php b/app/Helpers/Report/BalanceReportHelper.php index acd623a2a9..18cdd71acc 100644 --- a/app/Helpers/Report/BalanceReportHelper.php +++ b/app/Helpers/Report/BalanceReportHelper.php @@ -26,6 +26,7 @@ use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use Illuminate\Database\Query\JoinClause; use Illuminate\Support\Collection; +use Log; /** * Class BalanceReportHelper @@ -59,19 +60,23 @@ class BalanceReportHelper implements BalanceReportHelperInterface */ public function getBalanceReport(Collection $accounts, Carbon $start, Carbon $end): Balance { + Log::debug('Start of balance report'); $balance = new Balance; $header = new BalanceHeader; $limitRepetitions = $this->budgetRepository->getAllBudgetLimitRepetitions($start, $end); foreach ($accounts as $account) { + Log::debug(sprintf('Add account %s to headers.', $account->name)); $header->addAccount($account); } /** @var LimitRepetition $repetition */ foreach ($limitRepetitions as $repetition) { $budget = $this->budgetRepository->find($repetition->budget_id); - $line = $this->createBalanceLine($budget, $repetition, $accounts); + Log::debug(sprintf('Create balance line for budget #%d ("%s") and repetition #%d', $budget->id, $budget->name, $repetition->id)); + $line = $this->createBalanceLine($budget, $repetition, $accounts); $balance->addBalanceLine($line); } + Log::debug('Create rest of the things.'); $noBudgetLine = $this->createNoBudgetLine($accounts, $start, $end); $coveredByTagLine = $this->createTagsBalanceLine($accounts, $start, $end); $leftUnbalancedLine = $this->createLeftUnbalancedLine($noBudgetLine, $coveredByTagLine); @@ -81,9 +86,12 @@ class BalanceReportHelper implements BalanceReportHelperInterface $balance->addBalanceLine($leftUnbalancedLine); $balance->setBalanceHeader($header); + Log::debug('Clear unused budgets.'); // remove budgets without expenses from balance lines: $balance = $this->removeUnusedBudgets($balance); + Log::debug('Return report.'); + return $balance; } diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index b672444fbd..92645343aa 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -203,9 +203,24 @@ class BudgetRepository implements BudgetRepositoryInterface { $query = LimitRepetition::leftJoin('budget_limits', 'limit_repetitions.budget_limit_id', '=', 'budget_limits.id') ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') - ->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00')) - ->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00')) - ->where('budgets.user_id', $this->user->id); + ->where( + function (Builder $q1) use ($start, $end) { + $q1->where( + function (Builder $q2) use ($start, $end) { + $q2->where('limit_repetitions.enddate', '>=', $start->format('Y-m-d 00:00:00')); + $q2->where('limit_repetitions.enddate', '<=', $end->format('Y-m-d 00:00:00')); + } + ) + ->orWhere( + function (Builder $q3) use ($start, $end) { + $q3->where('limit_repetitions.startdate', '>=', $start->format('Y-m-d 00:00:00')); + $q3->where('limit_repetitions.startdate', '<=', $end->format('Y-m-d 00:00:00')); + } + ); + } + ) + ->where('budgets.user_id', $this->user->id) + ->whereNull('budgets.deleted_at'); $set = $query->get(['limit_repetitions.*', 'budget_limits.budget_id']); @@ -383,10 +398,11 @@ class BudgetRepository implements BudgetRepositoryInterface public function spentInPeriod(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end): string { // collect amount of transaction journals, which is easy: - $budgetIds = $budgets->pluck('id')->toArray(); + $budgetIds = $budgets->pluck('id')->toArray(); + $accountIds = $accounts->pluck('id')->toArray(); - Log::debug('spentInPeriod: Now in spentInPeriod for these budgets: ', $budgetIds); + Log::debug(sprintf('spentInPeriod: Now in spentInPeriod for these budgets (%d): ', count($budgetIds)), $budgetIds); Log::debug('spentInPeriod: and these accounts: ', $accountIds); Log::debug(sprintf('spentInPeriod: Start date is "%s", end date is "%s"', $start->format('Y-m-d'), $end->format('Y-m-d'))); From bf0744e03a7b47c5f6930d1b2cd679fad74602c3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:02:45 +0100 Subject: [PATCH 069/150] Updated some copyright notices [skip ci] --- app/Console/Commands/Import.php | 4 +- app/Http/Controllers/Auth/LoginController.php | 4 +- .../Controllers/Auth/PasswordController.php | 4 +- .../Controllers/Report/CategoryController.php | 1 - app/Http/Requests/RuleGroupFormRequest.php | 7 --- app/Models/RuleAction.php | 7 --- app/Repositories/User/UserRepository.php | 5 +- app/Rules/Factory/ActionFactory.php | 7 --- config/upgrade.php | 10 --- ...10_09_150037_expand_transactions_table.php | 1 - .../2016_10_22_075804_changes_for_v410.php | 2 +- .../2016_11_24_210552_changes_for_v420.php | 1 - .../2016_12_22_150431_changes_for_v430.php | 1 - database/seeds/TestDataSeeder.php | 6 +- public/css/firefly.css | 10 +++ public/index.php | 13 ++-- public/js/ff/bills/show.js | 10 +++ public/js/ff/budgets/index.js | 10 +++ public/js/ff/budgets/show.js | 10 +++ public/js/ff/categories/index.js | 11 +++- public/js/ff/categories/show-by-date.js | 10 +++ public/js/ff/categories/show.js | 10 +++ public/js/ff/charts.defaults.js | 10 +++ public/js/ff/charts.js | 61 +++++++++++++++++-- public/js/ff/export/index.js | 8 +-- public/js/ff/firefly.js | 11 +++- public/js/ff/guest.js | 10 +++ public/js/ff/help.js | 10 +++ public/js/ff/import/status.js | 8 +-- public/js/ff/index.js | 10 ++- public/js/ff/piggy-banks/index.js | 9 ++- public/js/ff/piggy-banks/show.js | 8 +-- public/js/ff/reports/audit/all.js | 8 +-- public/js/ff/reports/default/all.js | 7 ++- public/js/ff/reports/default/month.js | 11 +++- public/js/ff/reports/default/multi-year.js | 10 +++ public/js/ff/reports/default/year.js | 10 ++- public/js/ff/reports/index.js | 11 +++- public/js/ff/rules/create-edit.js | 6 +- public/js/ff/rules/create.js | 11 ++-- public/js/ff/rules/edit.js | 6 +- public/js/ff/rules/index.js | 8 +-- public/js/ff/split/journal/from-store.js | 8 +-- public/js/ff/tags/create.js | 11 +++- public/js/ff/tags/edit.js | 11 +++- public/js/ff/tags/index.js | 11 +++- public/js/ff/transactions/create-edit.js | 8 ++- public/js/ff/transactions/create.js | 7 ++- public/js/ff/transactions/edit.js | 7 ++- public/js/ff/transactions/list.js | 10 ++- routes/api.php | 7 ++- routes/console.php | 7 ++- 52 files changed, 338 insertions(+), 126 deletions(-) diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index 2e36d3d417..c339958641 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -70,7 +70,9 @@ class Import extends Command $handler = new CommandHandler($this); $monolog->pushHandler($handler); - $result = ImportProcedure::runImport($job); + $importProcedure = new ImportProcedure; + + $result = $importProcedure->runImport($job); /** diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 06faf92d07..4eb2782162 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -53,9 +53,9 @@ class LoginController extends Controller /** * Handle a login request to the application. * - * @param \Illuminate\Http\Request $request + * @param Request $request * - * @return \Illuminate\Http\Response + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response */ public function login(Request $request) { diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 02a4757bc2..f49857ba67 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -26,8 +26,8 @@ use Illuminate\Support\Facades\Password; * * @package FireflyIII\Http\Controllers\Auth * @method getEmailSubject() - * @method getSendResetLinkEmailSuccessResponse() - * @method getSendResetLinkEmailFailureResponse() + * @method getSendResetLinkEmailSuccessResponse(string $response) + * @method getSendResetLinkEmailFailureResponse(string $response) */ class PasswordController extends Controller { diff --git a/app/Http/Controllers/Report/CategoryController.php b/app/Http/Controllers/Report/CategoryController.php index 3222083051..730deeaece 100644 --- a/app/Http/Controllers/Report/CategoryController.php +++ b/app/Http/Controllers/Report/CategoryController.php @@ -15,7 +15,6 @@ namespace FireflyIII\Http\Controllers\Report; use Carbon\Carbon; -use FireflyIII\Helpers\Report\ReportHelperInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Category; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; diff --git a/app/Http/Requests/RuleGroupFormRequest.php b/app/Http/Requests/RuleGroupFormRequest.php index 9fa09fdefa..b5420c5ce5 100644 --- a/app/Http/Requests/RuleGroupFormRequest.php +++ b/app/Http/Requests/RuleGroupFormRequest.php @@ -10,13 +10,6 @@ */ declare(strict_types = 1); -/** - * RuleGroupFormRequest.php - * Copyright (C) 2016 thegrumpydictator@gmail.com - * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. - */ namespace FireflyIII\Http\Requests; diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 11a40ef6a6..6a5cc3a45b 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -10,13 +10,6 @@ */ declare(strict_types = 1); -/** - * RuleAction.php - * Copyright (C) 2016 thegrumpydictator@gmail.com - * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. - */ namespace FireflyIII\Models; diff --git a/app/Repositories/User/UserRepository.php b/app/Repositories/User/UserRepository.php index 1f206f89a7..6e38137f9c 100644 --- a/app/Repositories/User/UserRepository.php +++ b/app/Repositories/User/UserRepository.php @@ -153,11 +153,12 @@ class UserRepository implements UserRepositoryInterface * @param User $user * @param string $password * - * @return mixed + * @return bool */ - public function changePassword(User $user, string $password) + public function changePassword(User $user, string $password): bool { $user->password = bcrypt($password); $user->save(); + return true; } } diff --git a/app/Rules/Factory/ActionFactory.php b/app/Rules/Factory/ActionFactory.php index a73c1c23b2..9bbdb7468d 100644 --- a/app/Rules/Factory/ActionFactory.php +++ b/app/Rules/Factory/ActionFactory.php @@ -10,13 +10,6 @@ */ declare(strict_types = 1); -/** - * ActionFactory.php - * Copyright (C) 2016 Robert Horlings - * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. - */ namespace FireflyIII\Rules\Factory; diff --git a/config/upgrade.php b/config/upgrade.php index 82a97f50a0..a36422fe29 100644 --- a/config/upgrade.php +++ b/config/upgrade.php @@ -11,16 +11,6 @@ declare(strict_types = 1); - -/** - * upgrade.php - * Copyright (C) 2016 thegrumpydictator@gmail.com - * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. - */ - - return [ 'text' => [ '3.7' => 'Because of the upgrade to Laravel 5.2, several manual changes must be made to your Firefly III installation. ' . diff --git a/database/migrations/2016_10_09_150037_expand_transactions_table.php b/database/migrations/2016_10_09_150037_expand_transactions_table.php index 933bca5545..e8dddca676 100644 --- a/database/migrations/2016_10_09_150037_expand_transactions_table.php +++ b/database/migrations/2016_10_09_150037_expand_transactions_table.php @@ -11,7 +11,6 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; /** * Class ExpandTransactionsTable diff --git a/database/migrations/2016_10_22_075804_changes_for_v410.php b/database/migrations/2016_10_22_075804_changes_for_v410.php index eee0d11372..ce56932066 100644 --- a/database/migrations/2016_10_22_075804_changes_for_v410.php +++ b/database/migrations/2016_10_22_075804_changes_for_v410.php @@ -11,7 +11,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; + /** * Class ChangesForV410 diff --git a/database/migrations/2016_11_24_210552_changes_for_v420.php b/database/migrations/2016_11_24_210552_changes_for_v420.php index 14d8b6d7a9..a2ebc4c2ee 100644 --- a/database/migrations/2016_11_24_210552_changes_for_v420.php +++ b/database/migrations/2016_11_24_210552_changes_for_v420.php @@ -11,7 +11,6 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\Schema; /** * Class ChangesForV420 diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php index bf98ad68dc..d019dd0d8e 100644 --- a/database/migrations/2016_12_22_150431_changes_for_v430.php +++ b/database/migrations/2016_12_22_150431_changes_for_v430.php @@ -1,6 +1,5 @@ - */ - /* |-------------------------------------------------------------------------- | Register The Auto Loader diff --git a/public/js/ff/bills/show.js b/public/js/ff/bills/show.js index ba12284cd3..3964f90dcb 100644 --- a/public/js/ff/bills/show.js +++ b/public/js/ff/bills/show.js @@ -1,3 +1,13 @@ +/* + * show.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + /* global comboChart, billID */ $(function () { diff --git a/public/js/ff/budgets/index.js b/public/js/ff/budgets/index.js index ce0103ef1a..95a4eca219 100644 --- a/public/js/ff/budgets/index.js +++ b/public/js/ff/budgets/index.js @@ -1,3 +1,13 @@ +/* + * index.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + function drawSpentBar() { "use strict"; if ($('.spentBar').length > 0) { diff --git a/public/js/ff/budgets/show.js b/public/js/ff/budgets/show.js index 8a538bfbcd..1e7fb668dc 100644 --- a/public/js/ff/budgets/show.js +++ b/public/js/ff/budgets/show.js @@ -1,3 +1,13 @@ +/* + * show.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; diff --git a/public/js/ff/categories/index.js b/public/js/ff/categories/index.js index 6bfe805c1f..ca8ef07e42 100644 --- a/public/js/ff/categories/index.js +++ b/public/js/ff/categories/index.js @@ -1,4 +1,13 @@ -/* globals $, categoryID, columnChart, categoryDate */ +/* + * index.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; }); \ No newline at end of file diff --git a/public/js/ff/categories/show-by-date.js b/public/js/ff/categories/show-by-date.js index 931316b0d7..6b5ee6b775 100644 --- a/public/js/ff/categories/show-by-date.js +++ b/public/js/ff/categories/show-by-date.js @@ -1,3 +1,13 @@ +/* + * show-by-date.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; columnChart(specific, 'period-specific-period'); diff --git a/public/js/ff/categories/show.js b/public/js/ff/categories/show.js index 4d668bad25..9d14bc1377 100644 --- a/public/js/ff/categories/show.js +++ b/public/js/ff/categories/show.js @@ -1,3 +1,13 @@ +/* + * show.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; columnChart(all, 'all'); diff --git a/public/js/ff/charts.defaults.js b/public/js/ff/charts.defaults.js index f763bb6c15..bbcce69ccb 100644 --- a/public/js/ff/charts.defaults.js +++ b/public/js/ff/charts.defaults.js @@ -1,3 +1,13 @@ +/* + * charts.defaults.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + var defaultChartOptions = { scales: { xAxes: [ diff --git a/public/js/ff/charts.js b/public/js/ff/charts.js index 080ac4c93f..e8e3afd674 100644 --- a/public/js/ff/charts.js +++ b/public/js/ff/charts.js @@ -2,12 +2,12 @@ * charts.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -/* globals $, Chart, currencySymbol,mon_decimal_point ,accounting, mon_thousands_sep, frac_digits, noDataForChart */ - var allCharts = {}; /* @@ -81,6 +81,58 @@ function lineChart(URI, container) { drawAChart(URI, container, chartType, options, colorData); } +/** + * Function to draw a chart with double Y Axes and stacked columns. + * + * @param URI + * @param container + */ +function doubleYChart(URI, container) { + "use strict"; + + var colorData = true; + var options = defaultChartOptions; + options.scales.yAxes = [ + // y axis 0: + { + display: true, + ticks: { + callback: function (tickValue, index, ticks) { + "use strict"; + return accounting.formatMoney(tickValue); + + }, + beginAtZero: true + }, + position: "left", + "id": "y-axis-0" + }, + // and y axis 1: + { + display: true, + ticks: { + callback: function (tickValue, index, ticks) { + "use strict"; + return accounting.formatMoney(tickValue); + + }, + beginAtZero: true + }, + position: "right", + "id": "y-axis-1" + } + + ]; + options.stacked = true; + options.scales.xAxes[0].stacked = true; + console.log(options); + + var chartType = 'line'; + + drawAChart(URI, container, chartType, options, colorData); +} + + /** * * @param URI @@ -107,7 +159,6 @@ function stackedColumnChart(URI, container) { var colorData = true; var options = defaultChartOptions; - options.stacked = true; options.scales.xAxes[0].stacked = true; diff --git a/public/js/ff/export/index.js b/public/js/ff/export/index.js index f4ae67a6b4..eeed44981f 100644 --- a/public/js/ff/export/index.js +++ b/public/js/ff/export/index.js @@ -1,11 +1,11 @@ -/* globals token, jobKey */ - /* * index.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ var intervalId = 0; diff --git a/public/js/ff/firefly.js b/public/js/ff/firefly.js index e57052381a..2b105d4386 100644 --- a/public/js/ff/firefly.js +++ b/public/js/ff/firefly.js @@ -1,4 +1,13 @@ -/* globals token, dateRangeConfig, $, */ +/* + * firefly.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; diff --git a/public/js/ff/guest.js b/public/js/ff/guest.js index 7ba3e6bed9..886d5a1a51 100644 --- a/public/js/ff/guest.js +++ b/public/js/ff/guest.js @@ -1,3 +1,13 @@ +/* + * guest.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; diff --git a/public/js/ff/help.js b/public/js/ff/help.js index 1d6e14e477..536a4c5c2e 100644 --- a/public/js/ff/help.js +++ b/public/js/ff/help.js @@ -1,3 +1,13 @@ +/* + * help.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; $('#help').click(showHelp); diff --git a/public/js/ff/import/status.js b/public/js/ff/import/status.js index 2084858131..0b24c0c7f5 100644 --- a/public/js/ff/import/status.js +++ b/public/js/ff/import/status.js @@ -2,11 +2,11 @@ * status.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -/* globals $, jobImportUrl, jobStartUrl, token, langImportMultiError, langImportSingleError, langImportFatalError, langImportTimeOutError */ - var startedImport = false; var startInterval = 2000; diff --git a/public/js/ff/index.js b/public/js/ff/index.js index b0cc90b70f..27d69d5bc0 100644 --- a/public/js/ff/index.js +++ b/public/js/ff/index.js @@ -1,4 +1,12 @@ -/* globals $, columnChart,showTour, Tour, google, pieChart, stackedColumnChart, billCount */ +/* + * index.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ $(function () { "use strict"; diff --git a/public/js/ff/piggy-banks/index.js b/public/js/ff/piggy-banks/index.js index 39f516b01b..92b64b0af9 100644 --- a/public/js/ff/piggy-banks/index.js +++ b/public/js/ff/piggy-banks/index.js @@ -2,13 +2,12 @@ * index.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -/* globals $, lineChart, token, piggyBankID */ - -// Return a helper with preserved width of cells var fixHelper = function (e, tr) { "use strict"; var $originals = tr.children(); diff --git a/public/js/ff/piggy-banks/show.js b/public/js/ff/piggy-banks/show.js index 72cebea8ff..4c02df137c 100644 --- a/public/js/ff/piggy-banks/show.js +++ b/public/js/ff/piggy-banks/show.js @@ -2,12 +2,12 @@ * show.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -/* globals $, lineChart, piggyBankID */ - $(function () { "use strict"; if (typeof(lineChart) === 'function' && typeof(piggyBankID) !== 'undefined') { diff --git a/public/js/ff/reports/audit/all.js b/public/js/ff/reports/audit/all.js index f9f5a79f41..2c58e0ac54 100644 --- a/public/js/ff/reports/audit/all.js +++ b/public/js/ff/reports/audit/all.js @@ -2,12 +2,12 @@ * all.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -/* globals hideable */ - $(function () { "use strict"; diff --git a/public/js/ff/reports/default/all.js b/public/js/ff/reports/default/all.js index b19187497b..b5e4bf970e 100644 --- a/public/js/ff/reports/default/all.js +++ b/public/js/ff/reports/default/all.js @@ -1,10 +1,11 @@ -/* globals startDate, showOnlyTop, showFullList, endDate, expenseReportUri, accountIds, incExpReportUri,accountReportUri, incomeReportUri */ /* * all.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ $(function () { diff --git a/public/js/ff/reports/default/month.js b/public/js/ff/reports/default/month.js index a150da25cc..2052997a9b 100644 --- a/public/js/ff/reports/default/month.js +++ b/public/js/ff/reports/default/month.js @@ -1,5 +1,12 @@ -/* globals google, categoryReportUri, budgetReportUri, balanceReportUri */ - +/* + * month.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ $(function () { "use strict"; diff --git a/public/js/ff/reports/default/multi-year.js b/public/js/ff/reports/default/multi-year.js index b1f755a8f1..a6a63a1d3d 100644 --- a/public/js/ff/reports/default/multi-year.js +++ b/public/js/ff/reports/default/multi-year.js @@ -1,3 +1,13 @@ +/* + * multi-year.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; drawChart(); diff --git a/public/js/ff/reports/default/year.js b/public/js/ff/reports/default/year.js index 259b9fa18a..9e521ab4fb 100644 --- a/public/js/ff/reports/default/year.js +++ b/public/js/ff/reports/default/year.js @@ -1,4 +1,12 @@ -/* globals google, accountIds, budgetPeriodReportUri, categoryPeriodReportUri */ +/* + * year.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ $(function () { "use strict"; diff --git a/public/js/ff/reports/index.js b/public/js/ff/reports/index.js index 9de3f79b50..f146d78bf3 100644 --- a/public/js/ff/reports/index.js +++ b/public/js/ff/reports/index.js @@ -1,5 +1,12 @@ -/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, year, month, columnChart, lineChart, stackedColumnChart */ - +/* + * index.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ $(function () { "use strict"; diff --git a/public/js/ff/rules/create-edit.js b/public/js/ff/rules/create-edit.js index 9e836eb3d6..98b77e9b4d 100644 --- a/public/js/ff/rules/create-edit.js +++ b/public/js/ff/rules/create-edit.js @@ -2,8 +2,10 @@ * create-edit.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ var triggerCount = 0; diff --git a/public/js/ff/rules/create.js b/public/js/ff/rules/create.js index 857f5b2617..1ad133f9d7 100644 --- a/public/js/ff/rules/create.js +++ b/public/js/ff/rules/create.js @@ -1,14 +1,13 @@ -/* global $, addNewTrigger, addNewAction, actionCount, triggerCount */ /* - * edit.js + * create.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -// make a line. - $(function () { "use strict"; console.log("create"); diff --git a/public/js/ff/rules/edit.js b/public/js/ff/rules/edit.js index c66a905d0c..16191e2ae8 100644 --- a/public/js/ff/rules/edit.js +++ b/public/js/ff/rules/edit.js @@ -2,8 +2,10 @@ * edit.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ $(function () { diff --git a/public/js/ff/rules/index.js b/public/js/ff/rules/index.js index 133f770a98..c8642209e2 100644 --- a/public/js/ff/rules/index.js +++ b/public/js/ff/rules/index.js @@ -1,13 +1,13 @@ -/* global comboChart,token, billID */ /* * index.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -// Return a helper with preserved width of cells var fixHelper = function (e, tr) { "use strict"; var $originals = tr.children(); diff --git a/public/js/ff/split/journal/from-store.js b/public/js/ff/split/journal/from-store.js index 2c5ef2c40c..f0c9d83f62 100644 --- a/public/js/ff/split/journal/from-store.js +++ b/public/js/ff/split/journal/from-store.js @@ -2,12 +2,12 @@ * from-store.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -/* globals globalSum */ - var destAccounts = {}; var srcAccounts = {}; var categories = {}; diff --git a/public/js/ff/tags/create.js b/public/js/ff/tags/create.js index 6ea5731733..77e8224238 100644 --- a/public/js/ff/tags/create.js +++ b/public/js/ff/tags/create.js @@ -1,4 +1,13 @@ -/* globals zoomLevel, token, google, latitude, longitude, doPlaceMarker */ +/* + * create.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; diff --git a/public/js/ff/tags/edit.js b/public/js/ff/tags/edit.js index 6ea5731733..c4f9cd0cfb 100644 --- a/public/js/ff/tags/edit.js +++ b/public/js/ff/tags/edit.js @@ -1,4 +1,13 @@ -/* globals zoomLevel, token, google, latitude, longitude, doPlaceMarker */ +/* + * edit.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; diff --git a/public/js/ff/tags/index.js b/public/js/ff/tags/index.js index 6ea5731733..a24180b4e0 100644 --- a/public/js/ff/tags/index.js +++ b/public/js/ff/tags/index.js @@ -1,4 +1,13 @@ -/* globals zoomLevel, token, google, latitude, longitude, doPlaceMarker */ +/* + * index.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ + $(function () { "use strict"; diff --git a/public/js/ff/transactions/create-edit.js b/public/js/ff/transactions/create-edit.js index 8a83c9968d..ae827d8983 100644 --- a/public/js/ff/transactions/create-edit.js +++ b/public/js/ff/transactions/create-edit.js @@ -2,10 +2,12 @@ * create-edit.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -/* globals what:true, $, doSwitch, txt, middleCrumbName, title,button, middleCrumbUrl, piggiesLength, breadcrumbs */ + $(document).ready(function () { "use strict"; diff --git a/public/js/ff/transactions/create.js b/public/js/ff/transactions/create.js index f3fc98a09c..e059fdf127 100644 --- a/public/js/ff/transactions/create.js +++ b/public/js/ff/transactions/create.js @@ -2,11 +2,12 @@ * create.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -/* globals what:true, $, doSwitch, txt, middleCrumbName, title,button, middleCrumbUrl, piggiesLength, breadcrumbs */ $(document).ready(function () { "use strict"; diff --git a/public/js/ff/transactions/edit.js b/public/js/ff/transactions/edit.js index 62a2b4db14..63390bc3e6 100644 --- a/public/js/ff/transactions/edit.js +++ b/public/js/ff/transactions/edit.js @@ -2,11 +2,12 @@ * edit.js * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ -/* globals $ */ $(document).ready(function () { "use strict"; // no special JS for edit transaction. diff --git a/public/js/ff/transactions/list.js b/public/js/ff/transactions/list.js index 42786654a3..7e87446a48 100644 --- a/public/js/ff/transactions/list.js +++ b/public/js/ff/transactions/list.js @@ -1,4 +1,12 @@ -/* globals $, edit_selected_txt, delete_selected_txt */ +/* + * list.js + * Copyright (C) 2016 thegrumpydictator@gmail.com + * + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. + */ $(document).ready(function () { "use strict"; diff --git a/routes/api.php b/routes/api.php index 5f4cc3f27e..f5c5fdb62b 100755 --- a/routes/api.php +++ b/routes/api.php @@ -3,9 +3,12 @@ * api.php * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ + declare(strict_types = 1); use Illuminate\Http\Request; diff --git a/routes/console.php b/routes/console.php index 6cfd0b721d..f0c08dc0c1 100755 --- a/routes/console.php +++ b/routes/console.php @@ -3,9 +3,12 @@ * console.php * Copyright (C) 2016 thegrumpydictator@gmail.com * - * This software may be modified and distributed under the terms - * of the MIT license. See the LICENSE file for details. + * This software may be modified and distributed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International License. + * + * See the LICENSE file for details. */ + declare(strict_types = 1); /* From 1f1334a1fc85019b27bcf7fae09cc383749908ac Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:20:47 +0100 Subject: [PATCH 070/150] Update chart to show sum --- .../Chart/Basic/ChartJsGenerator.php | 14 +++++- .../Chart/CategoryReportController.php | 49 +++++++++++++++++-- public/js/ff/charts.js | 4 +- public/js/ff/reports/category/month.js | 2 +- 4 files changed, 60 insertions(+), 9 deletions(-) diff --git a/app/Generator/Chart/Basic/ChartJsGenerator.php b/app/Generator/Chart/Basic/ChartJsGenerator.php index c9b13a873c..3f5eb8145c 100644 --- a/app/Generator/Chart/Basic/ChartJsGenerator.php +++ b/app/Generator/Chart/Basic/ChartJsGenerator.php @@ -31,6 +31,8 @@ class ChartJsGenerator implements GeneratorInterface * 0: [ * 'label' => 'label of set', * 'type' => bar or line, optional + * 'yAxisID' => ID of yAxis, optional, will not be included when unused. + * 'fill' => if to fill a line? optional, will not be included when unused. * 'entries' => * [ * 'label-of-entry' => 'value' @@ -39,6 +41,8 @@ class ChartJsGenerator implements GeneratorInterface * 1: [ * 'label' => 'label of another set', * 'type' => bar or line, optional + * 'yAxisID' => ID of yAxis, optional, will not be included when unused. + * 'fill' => if to fill a line? optional, will not be included when unused. * 'entries' => * [ * 'label-of-entry' => 'value' @@ -64,11 +68,19 @@ class ChartJsGenerator implements GeneratorInterface unset($first, $labels); foreach ($data as $set) { - $chartData['datasets'][] = [ + $currentSet = [ 'label' => $set['label'], 'type' => $set['type'] ?? 'line', 'data' => array_values($set['entries']), ]; + if (isset($set['yAxisID'])) { + $currentSet['yAxisID'] = $set['yAxisID']; + } + if (isset($set['fill'])) { + $currentSet['fill'] = $set['fill']; + } + + $chartData['datasets'][] = $currentSet; } return $chartData; diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index d241d27ef8..af6c2c4a75 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -314,14 +314,33 @@ class CategoryReportController extends Controller $chartData[$category->id . '-in'] = [ 'label' => $category->name . ' (' . strtolower(strval(trans('firefly.income'))) . ')', 'type' => 'bar', + 'yAxisID' => 'y-axis-0', 'entries' => [], ]; $chartData[$category->id . '-out'] = [ 'label' => $category->name . ' (' . strtolower(strval(trans('firefly.expenses'))) . ')', 'type' => 'bar', + 'yAxisID' => 'y-axis-0', + 'entries' => [], + ]; + // total in, total out: + $chartData[$category->id . '-total-in'] = [ + 'label' => $category->name . ' (' . strtolower(strval(trans('firefly.sum_of_income'))) . ')', + 'type' => 'line', + 'fill' => false, + 'yAxisID' => 'y-axis-1', + 'entries' => [], + ]; + $chartData[$category->id . '-total-out'] = [ + 'label' => $category->name . ' (' . strtolower(strval(trans('firefly.sum_of_expenses'))) . ')', + 'type' => 'line', + 'fill' => false, + 'yAxisID' => 'y-axis-1', 'entries' => [], ]; } + $sumOfIncome = []; + $sumOfExpense = []; while ($currentStart < $end) { $currentEnd = clone $currentStart; @@ -332,15 +351,35 @@ class CategoryReportController extends Controller /** @var Category $category */ foreach ($categories as $category) { - $labelIn = $category->id . '-in'; - $labelOut = $category->id . '-out'; - // get sum, and get label: - $chartData[$labelIn]['entries'][$label] = $income[$category->id] ?? '0'; - $chartData[$labelOut]['entries'][$label] = $expenses[$category->id] ?? '0'; + $labelIn = $category->id . '-in'; + $labelOut = $category->id . '-out'; + $labelSumIn = $category->id . '-total-in'; + $labelSumOut = $category->id . '-total-out'; + $currentIncome = $income[$category->id] ?? '0'; + $currentExpense = $expenses[$category->id] ?? '0'; + + + // add to sum: + $sumOfIncome[$category->id] = $sumOfIncome[$category->id] ?? '0'; + $sumOfExpense[$category->id] = $sumOfExpense[$category->id] ?? '0'; + $sumOfIncome[$category->id] = bcadd($sumOfIncome[$category->id], $currentIncome); + $sumOfExpense[$category->id] = bcadd($sumOfExpense[$category->id], $currentExpense); + + // add to chart: + $chartData[$labelIn]['entries'][$label] = $currentIncome; + $chartData[$labelOut]['entries'][$label] = $currentExpense; + $chartData[$labelSumIn]['entries'][$label] = $sumOfIncome[$category->id]; + $chartData[$labelSumOut]['entries'][$label] = $sumOfExpense[$category->id]; } $currentStart = clone $currentEnd; $currentStart->addDay(); } + // remove all empty entries to prevent cluttering: + foreach ($chartData as $key => $entry) { + if (array_sum($entry['entries']) == 0) { + unset($chartData[$key]); + } + } $data = $this->generator->multiSet($chartData); $cache->store($data); diff --git a/public/js/ff/charts.js b/public/js/ff/charts.js index e8e3afd674..f49a5cc4a2 100644 --- a/public/js/ff/charts.js +++ b/public/js/ff/charts.js @@ -125,9 +125,9 @@ function doubleYChart(URI, container) { ]; options.stacked = true; options.scales.xAxes[0].stacked = true; - console.log(options); + // console.log(options); - var chartType = 'line'; + var chartType = 'bar'; drawAChart(URI, container, chartType, options, colorData); } diff --git a/public/js/ff/reports/category/month.js b/public/js/ff/reports/category/month.js index cdbe5420b2..607d635205 100644 --- a/public/js/ff/reports/category/month.js +++ b/public/js/ff/reports/category/month.js @@ -36,7 +36,7 @@ function drawChart() { "use strict"; // month view: - stackedColumnChart(mainUri, 'in-out-chart'); + doubleYChart(mainUri, 'in-out-chart'); // draw pie chart of income, depending on "show other transactions too": redrawPieChart('categories-in-pie-chart', categoryIncomeUri); From 315479fcd3851450791183cbb160a6a2d9b12c71 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:24:38 +0100 Subject: [PATCH 071/150] New translations [skip ci] --- resources/lang/en_US/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index fb82d0af87..18c6a81aea 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -91,6 +91,9 @@ return [ 'expenses_by_budget' => 'Expenses by budget', 'income_by_category' => 'Income by category', 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', + 'sum_of_expenses' => 'Sum of expenses', + 'sum_of_income' => 'Sum of income', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'monthly', From b9baa93ae43b9bf71ccfc3fc167eb891ab351565 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:31:36 +0100 Subject: [PATCH 072/150] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 987a3e2493..60bc0408f2 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -91,6 +91,9 @@ return [ 'expenses_by_budget' => 'Uitgaven per budget', 'income_by_category' => 'Inkomsten per categorie', 'cannot_redirect_to_account' => 'Firefly III kan je niet naar de goede pagina doorsturen. Sorry!', + 'sum_of_expenses' => 'Sum of expenses', + 'sum_of_income' => 'Sum of income', + // repeat frequencies: 'repeat_freq_yearly' => 'jaarlijks', 'repeat_freq_monthly' => 'maandelijks', From 7bb549732c5637d9e905c68faa5a74eb95a8e777 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:31:50 +0100 Subject: [PATCH 073/150] New translations --- resources/lang/es_ES/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 7fea774d2b..f8cc20b621 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -91,6 +91,9 @@ return [ 'expenses_by_budget' => 'Expenses by budget', 'income_by_category' => 'Income by category', 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', + 'sum_of_expenses' => 'Sum of expenses', + 'sum_of_income' => 'Sum of income', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'monthly', From 875f19f728b4c8f9701f4504e105bbf746d48c17 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:32:11 +0100 Subject: [PATCH 074/150] New translations --- resources/lang/zh_HK/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 7fea774d2b..f8cc20b621 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -91,6 +91,9 @@ return [ 'expenses_by_budget' => 'Expenses by budget', 'income_by_category' => 'Income by category', 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', + 'sum_of_expenses' => 'Sum of expenses', + 'sum_of_income' => 'Sum of income', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'monthly', From 0b618de44c9f617c29bc1c48d0708f8e18ef09ad Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:32:16 +0100 Subject: [PATCH 075/150] New translations --- resources/lang/zh_TW/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index bd95d83674..861cfd6c43 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -91,6 +91,9 @@ return [ 'expenses_by_budget' => 'Expenses by budget', 'income_by_category' => 'Income by category', 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', + 'sum_of_expenses' => 'Sum of expenses', + 'sum_of_income' => 'Sum of income', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => '每月', From d15d9fdf2ad93f7d229b2256a4b3cb59f093c606 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:32:24 +0100 Subject: [PATCH 076/150] New translations --- resources/lang/hr_HR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 7fea774d2b..f8cc20b621 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -91,6 +91,9 @@ return [ 'expenses_by_budget' => 'Expenses by budget', 'income_by_category' => 'Income by category', 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', + 'sum_of_expenses' => 'Sum of expenses', + 'sum_of_income' => 'Sum of income', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'monthly', From c403dd7490047093bdde5b154f05a1d4d95aab69 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:32:28 +0100 Subject: [PATCH 077/150] New translations --- resources/lang/pt_BR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 5c725f1e38..f5548b58d9 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -91,6 +91,9 @@ return [ 'expenses_by_budget' => 'Despesas pelo orçamento', 'income_by_category' => 'Receitas por categoria', 'cannot_redirect_to_account' => 'Firefly III não pode redirecioná-lo para a página correta. Minhas desculpas.', + 'sum_of_expenses' => 'Sum of expenses', + 'sum_of_income' => 'Sum of income', + // repeat frequencies: 'repeat_freq_yearly' => 'anual', 'repeat_freq_monthly' => 'mensal', From cdbf5653ac29dd94bcc9f507d6d425ffa328a646 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:32:34 +0100 Subject: [PATCH 078/150] New translations --- resources/lang/de_DE/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index e405a8c927..14ceaa482a 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -91,6 +91,9 @@ return [ 'expenses_by_budget' => 'Ausgaben nach Budget', 'income_by_category' => 'Einkommen nach Kategorie', 'cannot_redirect_to_account' => 'Entschuldigung. Firefly III kann Sie nicht zur richtigen Seite weiterleiten.', + 'sum_of_expenses' => 'Sum of expenses', + 'sum_of_income' => 'Sum of income', + // repeat frequencies: 'repeat_freq_yearly' => 'Jährlich', 'repeat_freq_monthly' => 'monatlich', From 186b986e02ef05026bf89f6d861e054f5a0bcd5b Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 07:32:48 +0100 Subject: [PATCH 079/150] New translations --- resources/lang/fr_FR/firefly.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 11ff42a328..bdab15a93b 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -91,6 +91,9 @@ return [ 'expenses_by_budget' => 'Expenses by budget', 'income_by_category' => 'Income by category', 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', + 'sum_of_expenses' => 'Sum of expenses', + 'sum_of_income' => 'Sum of income', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'mensuel', From 9a15decdff5041b1f45da055e98d01529a7ee5c2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 15:02:25 +0100 Subject: [PATCH 080/150] Translated --- resources/lang/nl_NL/firefly.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 60bc0408f2..892f6a1408 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -91,8 +91,8 @@ return [ 'expenses_by_budget' => 'Uitgaven per budget', 'income_by_category' => 'Inkomsten per categorie', 'cannot_redirect_to_account' => 'Firefly III kan je niet naar de goede pagina doorsturen. Sorry!', - 'sum_of_expenses' => 'Sum of expenses', - 'sum_of_income' => 'Sum of income', + 'sum_of_expenses' => 'Som van uitgaven', + 'sum_of_income' => 'Som van inkomsten', // repeat frequencies: 'repeat_freq_yearly' => 'jaarlijks', From cde494d3efee406e6ede1226a78149050ead9034 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 15:52:05 +0100 Subject: [PATCH 081/150] Fixed missing chart data. --- app/Http/Controllers/Chart/BudgetController.php | 4 ++-- app/Http/Controllers/Chart/BudgetReportController.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Chart/BudgetController.php b/app/Http/Controllers/Chart/BudgetController.php index 9284ff2bf4..aa9a737336 100644 --- a/app/Http/Controllers/Chart/BudgetController.php +++ b/app/Http/Controllers/Chart/BudgetController.php @@ -284,8 +284,8 @@ class BudgetController extends Controller foreach (array_keys($periods) as $period) { $label = $periods[$period]; $spent = isset($entries[$budget->id]['entries'][$period]) ? $entries[$budget->id]['entries'][$period] : '0'; - $limit = isset($entries[$period]) ? $budgeted[$period] : 0; - $chartData[0]['entries'][$label] = bcmul($spent, '-1'); + $limit = isset($budgeted[$period]) ? $budgeted[$period] : 0; + $chartData[0]['entries'][$label] = round(bcmul($spent, '-1'), 2); $chartData[1]['entries'][$label] = $limit; } diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index a48037b6a6..530e5b00bb 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -218,7 +218,7 @@ class BudgetReportController extends Controller /** @var Budget $budget */ foreach ($budgets as $budget) { - $chartData[$budget->id]['entries'][$label] = $expenses[$budget->id] ?? '0'; + $chartData[$budget->id]['entries'][$label] = round(($expenses[$budget->id] ?? '0'), 2); } $currentStart = clone $currentEnd; $currentStart->addDay(); From 0e11245cb48968976fe13d2c187259304ae1fe99 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 15:52:12 +0100 Subject: [PATCH 082/150] Fix tests. --- .../Controllers/Chart/CategoryReportController.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index af6c2c4a75..d2ffe572b4 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -375,13 +375,16 @@ class CategoryReportController extends Controller $currentStart->addDay(); } // remove all empty entries to prevent cluttering: + $newSet = []; foreach ($chartData as $key => $entry) { - if (array_sum($entry['entries']) == 0) { - unset($chartData[$key]); + if (!array_sum($entry['entries']) == 0) { + $newSet[$key] = $chartData[$key]; } } - - $data = $this->generator->multiSet($chartData); + if (count($newSet) === 0) { + $newSet = $chartData; + } + $data = $this->generator->multiSet($newSet); $cache->store($data); return Response::json($data); From e15932fe4aa85d71a561c9cb78bdda2fc0db00ac Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:50:26 +0100 Subject: [PATCH 083/150] Make budget report actually more useful. --- .../Chart/BudgetReportController.php | 79 +++++++++++++++++-- .../Models/TransactionJournalSupport.php | 9 ++- resources/lang/en_US/firefly.php | 5 +- 3 files changed, 84 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index 530e5b00bb..2a7be91751 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -20,16 +20,17 @@ use FireflyIII\Generator\Report\Category\MonthReportGenerator; use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Models\Budget; +use FireflyIII\Models\LimitRepetition; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionType; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Support\Collection; +use Log; use Navigation; use Response; - /** * Separate controller because many helper functions are shared. * @@ -195,21 +196,36 @@ class BudgetReportController extends Controller if ($cache->has()) { return Response::json($cache->get()); } - + /** @var BudgetRepositoryInterface $repository */ + $repository = app(BudgetRepositoryInterface::class); $format = Navigation::preferredCarbonLocalizedFormat($start, $end); $function = Navigation::preferredEndOfPeriod($start, $end); $chartData = []; $currentStart = clone $start; + $limits = $repository->getAllBudgetLimitRepetitions($start, $end); // also for ALL budgets. // prep chart data: foreach ($budgets as $budget) { - $chartData[$budget->id] = [ - 'label' => $budget->name, + $chartData[$budget->id] = [ + 'label' => strval(trans('firefly.spent_in_specific_budget', ['budget' => $budget->name])), 'type' => 'bar', 'entries' => [], ]; + $chartData[$budget->id . '-sum'] = [ + 'label' => strval(trans('firefly.sum_of_expenses_in_budget', ['budget' => $budget->name])), + 'type' => 'line', + 'fill' => false, + 'entries' => [], + ]; + $chartData[$budget->id . '-left'] = [ + 'label' => strval(trans('firefly.left_in_budget_limit', ['budget' => $budget->name])), + 'type' => 'line', + 'fill' => false, + 'entries' => [], + ]; } - + $sumOfExpenses = []; + $leftOfLimits = []; while ($currentStart < $end) { $currentEnd = clone $currentStart; $currentEnd = $currentEnd->$function(); @@ -218,7 +234,20 @@ class BudgetReportController extends Controller /** @var Budget $budget */ foreach ($budgets as $budget) { - $chartData[$budget->id]['entries'][$label] = round(($expenses[$budget->id] ?? '0'), 2); + $currentExpenses = $expenses[$budget->id] ?? '0'; + $sumOfExpenses[$budget->id] = $sumOfExpenses[$budget->id] ?? '0'; + $sumOfExpenses[$budget->id] = bcadd($currentExpenses, $sumOfExpenses[$budget->id]); + $chartData[$budget->id]['entries'][$label] = round(bcmul($currentExpenses, '-1'), 2); + $chartData[$budget->id . '-sum']['entries'][$label] = round(bcmul($sumOfExpenses[$budget->id], '-1'), 2); + + $limit = $this->filterLimits($limits, $budget, $currentStart); + if (!is_null($limit->id)) { + $leftOfLimits[$limit->id] = $leftOfLimits[$limit->id] ?? strval($limit->amount); + $leftOfLimits[$limit->id] = bcadd($leftOfLimits[$limit->id], $currentExpenses); + $chartData[$budget->id . '-left']['entries'][$label] = round($leftOfLimits[$limit->id], 2); + } + + } $currentStart = clone $currentEnd; $currentStart->addDay(); @@ -230,6 +259,44 @@ class BudgetReportController extends Controller return Response::json($data); } + /** + * @param $limits + * @param $budget + * @param $currentStart + * + * @return LimitRepetition + */ + private function filterLimits(Collection $limits, Budget $budget, Carbon $date): LimitRepetition + { + Log::debug(sprintf('Start of filterLimits with %d limits.', $limits->count())); + $filtered = $limits->filter( + function (LimitRepetition $limit) use ($budget, $date) { + if ($limit->budget_id !== $budget->id) { + Log::debug(sprintf('LimitRepetition has budget #%d but expecting #%d', $limit->budget_id, $budget->id)); + + return false; + } + if ($date < $limit->startdate || $date > $limit->enddate) { + Log::debug( + sprintf( + 'Date %s is not between %s and %s', + $date->format('Y-m-d'), $limit->startdate->format('Y-m-d'), $limit->enddate->format('Y-m-d') + ) + ); + + return false; + } + + return $limit; + } + ); + if ($filtered->count() === 1) { + return $filtered->first(); + } + + return new LimitRepetition; + } + /** * @param Collection $accounts diff --git a/app/Support/Models/TransactionJournalSupport.php b/app/Support/Models/TransactionJournalSupport.php index 513fec2623..e1d928bef4 100644 --- a/app/Support/Models/TransactionJournalSupport.php +++ b/app/Support/Models/TransactionJournalSupport.php @@ -163,7 +163,9 @@ class TransactionJournalSupport extends Model if ($cache->has()) { return $cache->get(); } - $transactions = $journal->transactions()->where('amount', '>', 0)->orderBy('transactions.account_id')->with('account')->get(); + $transactions = $journal->transactions() + ->whereNull('transactions.deleted_at') + ->where('transactions.amount', '>', 0)->orderBy('transactions.account_id')->with('account')->get(); $list = new Collection; /** @var Transaction $t */ foreach ($transactions as $t) { @@ -255,7 +257,10 @@ class TransactionJournalSupport extends Model if ($cache->has()) { return $cache->get(); } - $transactions = $journal->transactions()->where('amount', '<', 0)->orderBy('transactions.account_id')->with('account')->get(); + $transactions = $journal->transactions() + ->whereNull('transactions.deleted_at') + ->where('transactions.amount', '<', 0) + ->orderBy('transactions.account_id')->with('account')->get(); $list = new Collection; /** @var Transaction $t */ foreach ($transactions as $t) { diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 18c6a81aea..af44a37ef1 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -93,7 +93,10 @@ return [ 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', 'sum_of_expenses' => 'Sum of expenses', 'sum_of_income' => 'Sum of income', - + 'spent_in_specific_budget' => 'Spent in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', + 'left_in_budget_limit' => 'Left to spend according to budgeting', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'monthly', From 017b1a481a34fdf18952f92853736cd491560e3b Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:51:33 +0100 Subject: [PATCH 084/150] Committed bad code. --- app/Support/Models/TransactionJournalSupport.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/Support/Models/TransactionJournalSupport.php b/app/Support/Models/TransactionJournalSupport.php index e1d928bef4..513fec2623 100644 --- a/app/Support/Models/TransactionJournalSupport.php +++ b/app/Support/Models/TransactionJournalSupport.php @@ -163,9 +163,7 @@ class TransactionJournalSupport extends Model if ($cache->has()) { return $cache->get(); } - $transactions = $journal->transactions() - ->whereNull('transactions.deleted_at') - ->where('transactions.amount', '>', 0)->orderBy('transactions.account_id')->with('account')->get(); + $transactions = $journal->transactions()->where('amount', '>', 0)->orderBy('transactions.account_id')->with('account')->get(); $list = new Collection; /** @var Transaction $t */ foreach ($transactions as $t) { @@ -257,10 +255,7 @@ class TransactionJournalSupport extends Model if ($cache->has()) { return $cache->get(); } - $transactions = $journal->transactions() - ->whereNull('transactions.deleted_at') - ->where('transactions.amount', '<', 0) - ->orderBy('transactions.account_id')->with('account')->get(); + $transactions = $journal->transactions()->where('amount', '<', 0)->orderBy('transactions.account_id')->with('account')->get(); $list = new Collection; /** @var Transaction $t */ foreach ($transactions as $t) { From cbc44e82001487bf1abfb42f6d95c0b7e92d2550 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:51:54 +0100 Subject: [PATCH 085/150] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 892f6a1408..8324a8e7fc 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -93,7 +93,10 @@ return [ 'cannot_redirect_to_account' => 'Firefly III kan je niet naar de goede pagina doorsturen. Sorry!', 'sum_of_expenses' => 'Som van uitgaven', 'sum_of_income' => 'Som van inkomsten', - + 'spent_in_specific_budget' => 'Spent in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', + 'left_in_budget_limit' => 'Left to spend according to budgeting', + // repeat frequencies: 'repeat_freq_yearly' => 'jaarlijks', 'repeat_freq_monthly' => 'maandelijks', From beaec9a4c13116488e3ea9e7703026a577d9673d Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:52:11 +0100 Subject: [PATCH 086/150] New translations --- resources/lang/es_ES/firefly.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index f8cc20b621..5b9fc088c8 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -93,7 +93,10 @@ return [ 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', 'sum_of_expenses' => 'Sum of expenses', 'sum_of_income' => 'Sum of income', - + 'spent_in_specific_budget' => 'Spent in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', + 'left_in_budget_limit' => 'Left to spend according to budgeting', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'monthly', From ca9319db34a8ab3aa67ef23fe1b7d02ae760f850 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:52:33 +0100 Subject: [PATCH 087/150] New translations --- resources/lang/zh_HK/firefly.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index f8cc20b621..5b9fc088c8 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -93,7 +93,10 @@ return [ 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', 'sum_of_expenses' => 'Sum of expenses', 'sum_of_income' => 'Sum of income', - + 'spent_in_specific_budget' => 'Spent in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', + 'left_in_budget_limit' => 'Left to spend according to budgeting', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'monthly', From b6c9639948b8cff1987444531471e2945618885b Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:52:39 +0100 Subject: [PATCH 088/150] New translations --- resources/lang/zh_TW/firefly.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 861cfd6c43..5cfd2afc3f 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -93,7 +93,10 @@ return [ 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', 'sum_of_expenses' => 'Sum of expenses', 'sum_of_income' => 'Sum of income', - + 'spent_in_specific_budget' => 'Spent in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', + 'left_in_budget_limit' => 'Left to spend according to budgeting', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => '每月', From 4cade467c617f502243001f23c82a7110bde7c78 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:52:46 +0100 Subject: [PATCH 089/150] New translations --- resources/lang/hr_HR/firefly.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index f8cc20b621..5b9fc088c8 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -93,7 +93,10 @@ return [ 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', 'sum_of_expenses' => 'Sum of expenses', 'sum_of_income' => 'Sum of income', - + 'spent_in_specific_budget' => 'Spent in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', + 'left_in_budget_limit' => 'Left to spend according to budgeting', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'monthly', From e821f5b2b66d35a61d0dfdd2a0b484c137eb6cb7 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:52:51 +0100 Subject: [PATCH 090/150] New translations --- resources/lang/pt_BR/firefly.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index f5548b58d9..3699e21f88 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -93,7 +93,10 @@ return [ 'cannot_redirect_to_account' => 'Firefly III não pode redirecioná-lo para a página correta. Minhas desculpas.', 'sum_of_expenses' => 'Sum of expenses', 'sum_of_income' => 'Sum of income', - + 'spent_in_specific_budget' => 'Spent in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', + 'left_in_budget_limit' => 'Left to spend according to budgeting', + // repeat frequencies: 'repeat_freq_yearly' => 'anual', 'repeat_freq_monthly' => 'mensal', From 82cd0adca62484ea9f2c767c198ab1b885a0715f Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:52:57 +0100 Subject: [PATCH 091/150] New translations --- resources/lang/de_DE/firefly.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 14ceaa482a..79cc0be7ea 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -93,7 +93,10 @@ return [ 'cannot_redirect_to_account' => 'Entschuldigung. Firefly III kann Sie nicht zur richtigen Seite weiterleiten.', 'sum_of_expenses' => 'Sum of expenses', 'sum_of_income' => 'Sum of income', - + 'spent_in_specific_budget' => 'Spent in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', + 'left_in_budget_limit' => 'Left to spend according to budgeting', + // repeat frequencies: 'repeat_freq_yearly' => 'Jährlich', 'repeat_freq_monthly' => 'monatlich', From 70bb8fbc891b0dc6100365471534b0bef837fd83 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 17:53:16 +0100 Subject: [PATCH 092/150] New translations --- resources/lang/fr_FR/firefly.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index bdab15a93b..2c72e4a4e9 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -93,7 +93,10 @@ return [ 'cannot_redirect_to_account' => 'Firefly III cannot redirect you to the correct page. Apologies.', 'sum_of_expenses' => 'Sum of expenses', 'sum_of_income' => 'Sum of income', - + 'spent_in_specific_budget' => 'Spent in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', + 'left_in_budget_limit' => 'Left to spend according to budgeting', + // repeat frequencies: 'repeat_freq_yearly' => 'yearly', 'repeat_freq_monthly' => 'mensuel', From cea170359f6aea295154c7f84f058178bc52ff3a Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 18:34:58 +0100 Subject: [PATCH 093/150] Budget chart. --- .../Chart/BudgetReportController.php | 5 +- public/js/ff/charts.js | 48 +++++++++++++++++++ public/js/ff/reports/budget/month.js | 2 +- resources/views/reports/budget/month.twig | 3 +- 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index 2a7be91751..ae51df4ee0 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -209,18 +209,21 @@ class BudgetReportController extends Controller $chartData[$budget->id] = [ 'label' => strval(trans('firefly.spent_in_specific_budget', ['budget' => $budget->name])), 'type' => 'bar', + 'yAxisID' => 'y-axis-0', 'entries' => [], ]; $chartData[$budget->id . '-sum'] = [ 'label' => strval(trans('firefly.sum_of_expenses_in_budget', ['budget' => $budget->name])), 'type' => 'line', 'fill' => false, + 'yAxisID' => 'y-axis-1', 'entries' => [], ]; $chartData[$budget->id . '-left'] = [ 'label' => strval(trans('firefly.left_in_budget_limit', ['budget' => $budget->name])), - 'type' => 'line', + 'type' => 'bar', 'fill' => false, + 'yAxisID' => 'y-axis-0', 'entries' => [], ]; } diff --git a/public/js/ff/charts.js b/public/js/ff/charts.js index f49a5cc4a2..7180a9c131 100644 --- a/public/js/ff/charts.js +++ b/public/js/ff/charts.js @@ -132,6 +132,54 @@ function doubleYChart(URI, container) { drawAChart(URI, container, chartType, options, colorData); } +/** + * Function to draw a chart with double Y Axes and non stacked columns. + * + * @param URI + * @param container + */ +function doubleYNonStackedChart(URI, container) { + "use strict"; + + var colorData = true; + var options = defaultChartOptions; + options.scales.yAxes = [ + // y axis 0: + { + display: true, + ticks: { + callback: function (tickValue, index, ticks) { + "use strict"; + return accounting.formatMoney(tickValue); + + }, + beginAtZero: true + }, + position: "left", + "id": "y-axis-0" + }, + // and y axis 1: + { + display: true, + ticks: { + callback: function (tickValue, index, ticks) { + "use strict"; + return accounting.formatMoney(tickValue); + + }, + beginAtZero: true + }, + position: "right", + "id": "y-axis-1" + } + + ]; + var chartType = 'bar'; + + drawAChart(URI, container, chartType, options, colorData); +} + + /** * diff --git a/public/js/ff/reports/budget/month.js b/public/js/ff/reports/budget/month.js index 0eeb33fa93..c103e00dff 100644 --- a/public/js/ff/reports/budget/month.js +++ b/public/js/ff/reports/budget/month.js @@ -28,7 +28,7 @@ function drawChart() { "use strict"; // month view: - stackedColumnChart(mainUri, 'in-out-chart'); + doubleYNonStackedChart(mainUri, 'in-out-chart'); // draw pie chart of income, depending on "show other transactions too": redrawPieChart('budgets-out-pie-chart', budgetExpenseUri); diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig index dca1cc27b8..5336f0fd18 100644 --- a/resources/views/reports/budget/month.twig +++ b/resources/views/reports/budget/month.twig @@ -107,10 +107,11 @@

                                                                              {{ 'income_and_expenses'|_ }}

                                                                              + {# Here be a chart with the budget limits as well if relevant.
                                                                              amount spent vs budget limit reps
                                                                              over the entire period the amount spent would rise and the budget limit rep would be like a heart beat jumping up and down
                                                                              - needs to be two axes to work
                                                                              + needs to be two axes to work
                                                                              #}
                                                                              From 9c4d2e8791d476c64356245cdddad7707e93f81c Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 23 Dec 2016 18:48:21 +0100 Subject: [PATCH 094/150] Mention $other in chart cache. [skip ci] --- app/Http/Controllers/Chart/BudgetReportController.php | 2 ++ app/Http/Controllers/Chart/CategoryReportController.php | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/app/Http/Controllers/Chart/BudgetReportController.php b/app/Http/Controllers/Chart/BudgetReportController.php index ae51df4ee0..5ba5e9dd0e 100644 --- a/app/Http/Controllers/Chart/BudgetReportController.php +++ b/app/Http/Controllers/Chart/BudgetReportController.php @@ -84,6 +84,7 @@ class BudgetReportController extends Controller $cache->addProperty($budgets); $cache->addProperty($start); $cache->addProperty($end); + $cache->addProperty($others); if ($cache->has()) { return Response::json($cache->get()); } @@ -140,6 +141,7 @@ class BudgetReportController extends Controller $cache->addProperty($budgets); $cache->addProperty($start); $cache->addProperty($end); + $cache->addProperty($others); if ($cache->has()) { return Response::json($cache->get()); } diff --git a/app/Http/Controllers/Chart/CategoryReportController.php b/app/Http/Controllers/Chart/CategoryReportController.php index d2ffe572b4..be76c938a4 100644 --- a/app/Http/Controllers/Chart/CategoryReportController.php +++ b/app/Http/Controllers/Chart/CategoryReportController.php @@ -83,6 +83,7 @@ class CategoryReportController extends Controller $cache->addProperty($categories); $cache->addProperty($start); $cache->addProperty($end); + $cache->addProperty($others); if ($cache->has()) { return Response::json($cache->get()); } @@ -138,6 +139,7 @@ class CategoryReportController extends Controller $cache->addProperty($accounts); $cache->addProperty($categories); $cache->addProperty($start); + $cache->addProperty($others); $cache->addProperty($end); if ($cache->has()) { return Response::json($cache->get()); @@ -194,6 +196,7 @@ class CategoryReportController extends Controller $cache->addProperty($categories); $cache->addProperty($start); $cache->addProperty($end); + $cache->addProperty($others); if ($cache->has()) { return Response::json($cache->get()); } @@ -250,6 +253,7 @@ class CategoryReportController extends Controller $cache->addProperty($categories); $cache->addProperty($start); $cache->addProperty($end); + $cache->addProperty($others); if ($cache->has()) { return Response::json($cache->get()); } From afe98cda9f14ac260c00d387c802464b49b7c0cc Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 24 Dec 2016 14:43:42 +0100 Subject: [PATCH 095/150] Various code cleanup things and preparation for a new demo user. --- app/Console/Commands/CreateImport.php | 12 +--- app/Console/Commands/Import.php | 60 ++++++++++++------- app/Console/Commands/ScanAttachments.php | 20 +------ ...016_06_16_000000_create_support_tables.php | 39 +----------- .../2016_06_16_000001_create_users_table.php | 4 +- .../2016_06_16_000002_create_main_tables.php | 43 +++---------- .../2016_08_25_091522_changes_for_3101.php | 4 +- .../2016_09_12_121359_fix_nullables.php | 4 +- ...10_09_150037_expand_transactions_table.php | 4 +- .../2016_10_22_075804_changes_for_v410.php | 4 +- .../2016_11_24_210552_changes_for_v420.php | 4 +- .../2016_12_22_150431_changes_for_v430.php | 28 ++++----- database/seeds/PermissionSeeder.php | 6 ++ public/js/ff/split/journal/from-store.js | 4 +- public/manifest.json | 1 - 15 files changed, 79 insertions(+), 158 deletions(-) diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php index 89767b2240..41fd83d762 100644 --- a/app/Console/Commands/CreateImport.php +++ b/app/Console/Commands/CreateImport.php @@ -50,11 +50,10 @@ class CreateImport extends Command } /** - * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped */ public function handle() { - // find the file /** @var UserRepositoryInterface $userRepository */ $userRepository = app(UserRepositoryInterface::class); $file = $this->argument('file'); @@ -67,7 +66,6 @@ class CreateImport extends Command return; } - // try to parse configuration data: $configurationData = json_decode(file_get_contents($configuration)); if (is_null($configurationData)) { $this->error(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd)); @@ -82,21 +80,17 @@ class CreateImport extends Command /** @var ImportJobRepositoryInterface $jobRepository */ $jobRepository = app(ImportJobRepositoryInterface::class, [$user]); - - $job = $jobRepository->create($type); + $job = $jobRepository->create($type); $this->line(sprintf('Created job "%s"...', $job->key)); - // put the file in the proper place: Artisan::call('firefly:encrypt', ['file' => $file, 'key' => $job->key]); $this->line('Stored import data...'); - // store the configuration in the job: $job->configuration = $configurationData; $job->status = 'settings_complete'; $job->save(); $this->line('Stored configuration...'); - // if user wants to run it, do! if ($this->option('start') === true) { $this->line('The import will start in a moment. This process is not visible...'); Log::debug('Go for import!'); @@ -109,10 +103,10 @@ class CreateImport extends Command /** * @return bool + * @SuppressWarnings(PHPMD.CyclomaticComplexity) // it's five exactly. */ private function validArguments(): bool { - // find the file /** @var UserRepositoryInterface $userRepository */ $userRepository = app(UserRepositoryInterface::class); $file = $this->argument('file'); diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index c339958641..c67f39000f 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -18,6 +18,7 @@ use FireflyIII\Import\Logging\CommandHandler; use FireflyIII\Models\ImportJob; use FireflyIII\Models\TransactionJournal; use Illuminate\Console\Command; +use Illuminate\Support\Collection; use Log; /** @@ -69,34 +70,15 @@ class Import extends Command $monolog = Log::getMonolog(); $handler = new CommandHandler($this); $monolog->pushHandler($handler); - $importProcedure = new ImportProcedure; + $result = $importProcedure->runImport($job); - $result = $importProcedure->runImport($job); - - - /** - * @var int $index - * @var TransactionJournal $journal - */ - foreach ($result as $index => $journal) { - if (!is_null($journal->id)) { - $this->line(sprintf('Line #%d has been imported as transaction #%d.', $index, $journal->id)); - continue; - } - $this->error(sprintf('Could not store line #%d', $index)); - } - + // display result to user: + $this->presentResults($result); $this->line('The import has completed.'); // get any errors from the importer: - $extendedStatus = $job->extended_status; - if (isset($extendedStatus['errors']) && count($extendedStatus['errors']) > 0) { - $this->line(sprintf('The following %d error(s) occured during the import:', count($extendedStatus['errors']))); - foreach ($extendedStatus['errors'] as $error) { - $this->error($error); - } - } + $this->presentErrors($job); return; } @@ -122,4 +104,36 @@ class Import extends Command return true; } + + /** + * @param ImportJob $job + */ + private function presentErrors(ImportJob $job) + { + $extendedStatus = $job->extended_status; + if (isset($extendedStatus['errors']) && count($extendedStatus['errors']) > 0) { + $this->line(sprintf('The following %d error(s) occured during the import:', count($extendedStatus['errors']))); + foreach ($extendedStatus['errors'] as $error) { + $this->error($error); + } + } + } + + /** + * @param Collection $result + */ + private function presentResults(Collection $result) + { + /** + * @var int $index + * @var TransactionJournal $journal + */ + foreach ($result as $index => $journal) { + if (!is_null($journal->id)) { + $this->line(sprintf('Line #%d has been imported as transaction #%d.', $index, $journal->id)); + continue; + } + $this->error(sprintf('Could not store line #%d', $index)); + } + } } diff --git a/app/Console/Commands/ScanAttachments.php b/app/Console/Commands/ScanAttachments.php index 04254afb6f..0dc03631f1 100644 --- a/app/Console/Commands/ScanAttachments.php +++ b/app/Console/Commands/ScanAttachments.php @@ -60,42 +60,26 @@ class ScanAttachments extends Command /** @var Attachment $attachment */ foreach ($attachments as $attachment) { $fileName = $attachment->fileName(); - - // try to grab file content: try { $content = $disk->get($fileName); } catch (FileNotFoundException $e) { $this->error(sprintf('Could not find data for attachment #%d', $attachment->id)); continue; } - // try to decrypt content. try { $decrypted = Crypt::decrypt($content); } catch (DecryptException $e) { $this->error(sprintf('Could not decrypt data of attachment #%d', $attachment->id)); continue; } - - // make temp file: $tmpfname = tempnam(sys_get_temp_dir(), 'FireflyIII'); - - // store content in temp file: file_put_contents($tmpfname, $decrypted); - - // get md5 and mime - $md5 = md5_file($tmpfname); - $mime = mime_content_type($tmpfname); - - // update attachment: + $md5 = md5_file($tmpfname); + $mime = mime_content_type($tmpfname); $attachment->md5 = $md5; $attachment->mime = $mime; $attachment->save(); - - $this->line(sprintf('Fixed attachment #%d', $attachment->id)); - - // find file: - } } } diff --git a/database/migrations/2016_06_16_000000_create_support_tables.php b/database/migrations/2016_06_16_000000_create_support_tables.php index 2ff3c650f8..6d0234802c 100644 --- a/database/migrations/2016_06_16_000000_create_support_tables.php +++ b/database/migrations/2016_06_16_000000_create_support_tables.php @@ -21,7 +21,6 @@ class CreateSupportTables extends Migration /** * Reverse the migrations. * - * @return void */ public function down() { @@ -42,56 +41,20 @@ class CreateSupportTables extends Migration /** * Run the migrations. * - * @return void + * @SuppressWarnings(PHPMD.ShortMethodName) */ public function up() { - /* - * account_types - */ $this->createAccountTypeTable(); - /* - * transaction_currencies - */ $this->createCurrencyTable(); - - /* - * transaction_types - */ $this->createTransactionTypeTable(); - - /* - * jobs - */ $this->createJobsTable(); - - /* - * password_resets - */ $this->createPasswordTable(); - - /* - * permissions - */ $this->createPermissionsTable(); - - /* - * roles - */ $this->createRolesTable(); - - /* - * permission_role - */ $this->createPermissionRoleTable(); - - /* - * sessions - */ $this->createSessionsTable(); - $this->createConfigurationTable(); - } /** diff --git a/database/migrations/2016_06_16_000001_create_users_table.php b/database/migrations/2016_06_16_000001_create_users_table.php index 4b3991bd67..0120a485ed 100644 --- a/database/migrations/2016_06_16_000001_create_users_table.php +++ b/database/migrations/2016_06_16_000001_create_users_table.php @@ -21,7 +21,7 @@ class CreateUsersTable extends Migration /** * Run the migrations. * - * @return void + * @SuppressWarnings(PHPMD.ShortMethodName) */ public function up() { @@ -43,8 +43,6 @@ class CreateUsersTable extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { diff --git a/database/migrations/2016_06_16_000002_create_main_tables.php b/database/migrations/2016_06_16_000002_create_main_tables.php index 989fa06e10..ddbcd339bc 100644 --- a/database/migrations/2016_06_16_000002_create_main_tables.php +++ b/database/migrations/2016_06_16_000002_create_main_tables.php @@ -55,6 +55,8 @@ class CreateMainTables extends Migration /** * Run the migrations. + * + * @SuppressWarnings(PHPMD.ShortMethodName) */ public function up() { @@ -89,14 +91,9 @@ class CreateMainTables extends Migration $table->string('name', 1024); $table->decimal('virtual_balance', 14, 4)->nullable(); $table->string('iban', 255)->nullable(); - $table->boolean('active')->default(1); $table->boolean('encrypted')->default(0); - - // link user id to users table $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - - // link account type id to account types table $table->foreign('account_type_id')->references('id')->on('account_types')->onDelete('cascade'); } ); @@ -110,8 +107,6 @@ class CreateMainTables extends Migration $table->integer('account_id', false, true); $table->string('name'); $table->text('data'); - - // link account id to accounts: $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); } ); @@ -183,12 +178,10 @@ class CreateMainTables extends Migration } /** - * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped. */ private function createBudgetTables() { - - if (!Schema::hasTable('budgets')) { Schema::create( 'budgets', function (Blueprint $table) { @@ -199,8 +192,6 @@ class CreateMainTables extends Migration $table->string('name', 1024); $table->boolean('active')->default(1); $table->boolean('encrypted')->default(0); - - // link user id to users table $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); @@ -210,7 +201,6 @@ class CreateMainTables extends Migration if (!Schema::hasTable('budget_limits')) { Schema::create( 'budget_limits', function (Blueprint $table) { - $table->increments('id'); $table->timestamps(); $table->integer('budget_id', false, true); @@ -218,8 +208,6 @@ class CreateMainTables extends Migration $table->decimal('amount', 14, 4); $table->string('repeat_freq', 30); $table->boolean('repeats')->default(0); - - // link budget id to budgets table $table->foreign('budget_id')->references('id')->on('budgets')->onDelete('cascade'); } @@ -234,8 +222,6 @@ class CreateMainTables extends Migration $table->date('startdate'); $table->date('enddate'); $table->decimal('amount', 14, 4); - - // link budget limit id to budget_limitss table $table->foreign('budget_limit_id')->references('id')->on('budget_limits')->onDelete('cascade'); } ); @@ -319,8 +305,6 @@ class CreateMainTables extends Migration $table->integer('order', false, true)->default(0); $table->boolean('active')->default(0); $table->boolean('encrypted')->default(1); - - // link to account_id to accounts $table->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); } ); @@ -335,13 +319,10 @@ class CreateMainTables extends Migration $table->date('startdate')->nullable(); $table->date('targetdate')->nullable(); $table->decimal('currentamount', 14, 4); - $table->foreign('piggy_bank_id')->references('id')->on('piggy_banks')->onDelete('cascade'); - } ); } - } /** @@ -388,7 +369,8 @@ class CreateMainTables extends Migration } /** - * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped. + * @SuppressWarnings(PHPMD.CyclomaticComplexity) // its exactly five */ private function createRuleTables() { @@ -503,7 +485,9 @@ class CreateMainTables extends Migration } /** - * + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) // cannot be helped. + * @SuppressWarnings(PHPMD.NPathComplexity) // cannot be helped + * @SuppressWarnings(PHPMD.CyclomaticComplexity) // its exactly five */ private function createTransactionTables() { @@ -513,26 +497,19 @@ class CreateMainTables extends Migration $table->increments('id'); $table->timestamps(); $table->softDeletes(); - $table->integer('user_id', false, true); $table->integer('transaction_type_id', false, true); $table->integer('bill_id', false, true)->nullable(); $table->integer('transaction_currency_id', false, true); - $table->string('description', 1024); - $table->date('date'); $table->date('interest_date')->nullable(); $table->date('book_date')->nullable(); $table->date('process_date')->nullable(); - $table->integer('order', false, true)->default(0); $table->integer('tag_count', false, true); - $table->boolean('encrypted')->default(1); $table->boolean('completed')->default(1); - - // links to other tables: $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $table->foreign('transaction_type_id')->references('id')->on('transaction_types')->onDelete('cascade'); $table->foreign('bill_id')->references('id')->on('bills')->onDelete('set null'); @@ -550,7 +527,6 @@ class CreateMainTables extends Migration $table->string('name', 255); $table->text('data'); $table->string('hash', 64); - $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade'); } ); @@ -562,7 +538,6 @@ class CreateMainTables extends Migration $table->increments('id'); $table->integer('tag_id', false, true); $table->integer('transaction_journal_id', false, true); - $table->foreign('tag_id')->references('id')->on('tags')->onDelete('cascade'); $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade'); @@ -577,7 +552,6 @@ class CreateMainTables extends Migration $table->increments('id'); $table->integer('budget_id', false, true); $table->integer('transaction_journal_id', false, true); - $table->foreign('budget_id')->references('id')->on('budgets')->onDelete('cascade'); $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade'); } @@ -590,7 +564,6 @@ class CreateMainTables extends Migration $table->increments('id'); $table->integer('category_id', false, true); $table->integer('transaction_journal_id', false, true); - $table->foreign('category_id')->references('id')->on('categories')->onDelete('cascade'); $table->foreign('transaction_journal_id')->references('id')->on('transaction_journals')->onDelete('cascade'); } diff --git a/database/migrations/2016_08_25_091522_changes_for_3101.php b/database/migrations/2016_08_25_091522_changes_for_3101.php index 15a0c54afd..9d0e38a548 100644 --- a/database/migrations/2016_08_25_091522_changes_for_3101.php +++ b/database/migrations/2016_08_25_091522_changes_for_3101.php @@ -20,8 +20,6 @@ class ChangesFor3101 extends Migration { /** * Reverse the migrations. - * - * @return void */ public function down() { @@ -31,7 +29,7 @@ class ChangesFor3101 extends Migration /** * Run the migrations. * - * @return void + * @SuppressWarnings(PHPMD.ShortMethodName) */ public function up() { diff --git a/database/migrations/2016_09_12_121359_fix_nullables.php b/database/migrations/2016_09_12_121359_fix_nullables.php index ff89047969..54033eac70 100644 --- a/database/migrations/2016_09_12_121359_fix_nullables.php +++ b/database/migrations/2016_09_12_121359_fix_nullables.php @@ -21,8 +21,6 @@ class FixNullables extends Migration /** * Reverse the migrations. - * - * @return void */ public function down() { @@ -32,7 +30,7 @@ class FixNullables extends Migration /** * Run the migrations. * - * @return void + * @SuppressWarnings(PHPMD.ShortMethodName) */ public function up() { diff --git a/database/migrations/2016_10_09_150037_expand_transactions_table.php b/database/migrations/2016_10_09_150037_expand_transactions_table.php index e8dddca676..fdb957ba94 100644 --- a/database/migrations/2016_10_09_150037_expand_transactions_table.php +++ b/database/migrations/2016_10_09_150037_expand_transactions_table.php @@ -19,8 +19,6 @@ class ExpandTransactionsTable extends Migration { /** * Reverse the migrations. - * - * @return void */ public function down() { @@ -30,7 +28,7 @@ class ExpandTransactionsTable extends Migration /** * Run the migrations. * - * @return void + * @SuppressWarnings(PHPMD.ShortMethodName) */ public function up() { diff --git a/database/migrations/2016_10_22_075804_changes_for_v410.php b/database/migrations/2016_10_22_075804_changes_for_v410.php index ce56932066..e89daf743d 100644 --- a/database/migrations/2016_10_22_075804_changes_for_v410.php +++ b/database/migrations/2016_10_22_075804_changes_for_v410.php @@ -20,8 +20,6 @@ class ChangesForV410 extends Migration { /** * Reverse the migrations. - * - * @return void */ public function down() { @@ -31,7 +29,7 @@ class ChangesForV410 extends Migration /** * Run the migrations. * - * @return void + * @SuppressWarnings(PHPMD.ShortMethodName) */ public function up() { diff --git a/database/migrations/2016_11_24_210552_changes_for_v420.php b/database/migrations/2016_11_24_210552_changes_for_v420.php index a2ebc4c2ee..308bd6912a 100644 --- a/database/migrations/2016_11_24_210552_changes_for_v420.php +++ b/database/migrations/2016_11_24_210552_changes_for_v420.php @@ -19,8 +19,6 @@ class ChangesForV420 extends Migration { /** * Reverse the migrations. - * - * @return void */ public function down() { @@ -30,7 +28,7 @@ class ChangesForV420 extends Migration /** * Run the migrations. * - * @return void + * @SuppressWarnings(PHPMD.ShortMethodName) */ public function up() { diff --git a/database/migrations/2016_12_22_150431_changes_for_v430.php b/database/migrations/2016_12_22_150431_changes_for_v430.php index d019dd0d8e..a01c462713 100644 --- a/database/migrations/2016_12_22_150431_changes_for_v430.php +++ b/database/migrations/2016_12_22_150431_changes_for_v430.php @@ -1,21 +1,30 @@ increments('id'); $table->timestamps(); $table->softDeletes(); @@ -28,16 +37,7 @@ class ChangesForV430 extends Migration $table->foreign('transaction_currency_id')->references('id')->on('transaction_currencies')->onDelete('cascade'); $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('available_budgets'); + } + ); } } diff --git a/database/seeds/PermissionSeeder.php b/database/seeds/PermissionSeeder.php index 1bf36c21e7..2916470354 100644 --- a/database/seeds/PermissionSeeder.php +++ b/database/seeds/PermissionSeeder.php @@ -29,6 +29,12 @@ class PermissionSeeder extends Seeder $owner->description = 'User runs this instance of FF3'; // optional $owner->save(); + $demo = new Role; + $demo->name ='demo'; + $demo->display_name = 'Demo User'; + $demo->description = 'User is a demo user'; + $demo->save(); + } } diff --git a/public/js/ff/split/journal/from-store.js b/public/js/ff/split/journal/from-store.js index f0c9d83f62..ef3480f827 100644 --- a/public/js/ff/split/journal/from-store.js +++ b/public/js/ff/split/journal/from-store.js @@ -54,7 +54,6 @@ function removeRow(e) { $('table.split-table tbody tr[data-split="' + index + '"]').remove(); - resetSplits(); return false; @@ -171,8 +170,9 @@ function calculateSum() { for (var i = 0; i < set.length; i++) { var current = $(set[i]); sum += (current.val() == "" ? 0 : parseFloat(current.val())); - } + sum = Math.round(sum * 100) / 100; + console.log("Sum is now " + sum); $('.amount-warning').remove(); if (sum != originalSum) { diff --git a/public/manifest.json b/public/manifest.json index 0cbb9a6a89..0b22ea1677 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -14,7 +14,6 @@ "type": "image\/png" } ], - "theme_color": "#ffffff", "display": "standalone", "start_url": "/", "orientation": "portrait" From 9f2729d0ffafec92ad8fcea331406946efeacb44 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 24 Dec 2016 14:48:14 +0100 Subject: [PATCH 096/150] =?UTF-8?q?Removed=20Firefly=E2=80=99s=20ability?= =?UTF-8?q?=20to=20generate=20test=20data.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Support/Migration/TestData.php | 897 ------------------ database/seeds/DatabaseSeeder.php | 1 - database/seeds/TestDataSeeder.php | 57 -- resources/seeds/seed.bill-test.json | 137 --- resources/seeds/seed.import-test.json | 279 ------ resources/seeds/seed.local.json | 1012 --------------------- resources/seeds/seed.split.json | 303 ------- resources/seeds/seed.testing.json | 1207 ------------------------- 8 files changed, 3893 deletions(-) delete mode 100644 app/Support/Migration/TestData.php delete mode 100644 database/seeds/TestDataSeeder.php delete mode 100644 resources/seeds/seed.bill-test.json delete mode 100644 resources/seeds/seed.import-test.json delete mode 100644 resources/seeds/seed.local.json delete mode 100644 resources/seeds/seed.split.json delete mode 100644 resources/seeds/seed.testing.json diff --git a/app/Support/Migration/TestData.php b/app/Support/Migration/TestData.php deleted file mode 100644 index dab024765c..0000000000 --- a/app/Support/Migration/TestData.php +++ /dev/null @@ -1,897 +0,0 @@ -data = $data; - $start = new Carbon; - $start->startOfYear(); - $start->subYears(2); - $end = new Carbon; - - $this->start = $start; - $this->end = $end; - $this->time = $end->format('Y-m-d H:i:s'); - } - - /** - * @param array $data - */ - public static function run(array $data) - { - $seeder = new TestData($data); - $seeder->go(); - } - - /** - * - */ - private function createAccounts() - { - $insert = []; - foreach ($this->data['accounts'] as $account) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $account['user_id'], - 'account_type_id' => $account['account_type_id'], - 'name' => $account['name'], - 'active' => 1, - 'encrypted' => 0, - 'virtual_balance' => 0, - 'iban' => isset($account['iban']) ? Crypt::encrypt($account['iban']) : null, - ]; - } - DB::table('accounts')->insert($insert); - $insert = []; - foreach ($this->data['account-meta'] as $meta) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'account_id' => $meta['account_id'], - 'name' => $meta['name'], - 'data' => $meta['data'], - ]; - } - DB::table('account_meta')->insert($insert); - } - - /** - * - */ - private function createAttachments() - { - $disk = Storage::disk('upload'); - foreach ($this->data['attachments'] as $attachment) { - $data = Crypt::encrypt($attachment['content']); - $attachmentId = DB::table('attachments')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'attachable_id' => $attachment['attachable_id'], - 'attachable_type' => $attachment['attachable_type'], - 'user_id' => $attachment['user_id'], - 'md5' => md5($attachment['content']), - 'filename' => Crypt::encrypt($attachment['filename']), - 'title' => Crypt::encrypt($attachment['title']), - 'description' => Crypt::encrypt($attachment['description']), - 'notes' => Crypt::encrypt($attachment['notes']), - 'mime' => Crypt::encrypt($attachment['mime']), - 'size' => strlen($attachment['content']), - 'uploaded' => 1, - ] - ); - - $disk->put('at-' . $attachmentId . '.data', $data); - } - } - - /** - * - */ - private function createBills() - { - $insert = []; - foreach ($this->data['bills'] as $bill) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $bill['user_id'], - 'name' => Crypt::encrypt($bill['name']), - 'match' => Crypt::encrypt($bill['match']), - 'amount_min' => $bill['amount_min'], - 'amount_max' => $bill['amount_max'], - 'date' => $bill['date'], - 'active' => $bill['active'], - 'automatch' => $bill['automatch'], - 'repeat_freq' => $bill['repeat_freq'], - 'skip' => $bill['skip'], - 'name_encrypted' => 1, - 'match_encrypted' => 1, - ]; - } - DB::table('bills')->insert($insert); - } - - /** - * - */ - private function createBudgets() - { - $insert = []; - foreach ($this->data['budgets'] as $budget) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $budget['user_id'], - 'name' => Crypt::encrypt($budget['name']), - 'encrypted' => 1, - ]; - } - DB::table('budgets')->insert($insert); - - foreach ($this->data['budget-limits'] as $limit) { - $amount = rand($limit['amount_min'], $limit['amount_max']); - $limitId = DB::table('budget_limits')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'budget_id' => $limit['budget_id'], - 'startdate' => $limit['startdate'], - 'amount' => $amount, - 'repeats' => 0, - 'repeat_freq' => $limit['repeat_freq'], - ] - ); - - DB::table('limit_repetitions')->insert( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'budget_limit_id' => $limitId, - 'startdate' => $limit['startdate'], - 'enddate' => Navigation::endOfPeriod(new Carbon($limit['startdate']), $limit['repeat_freq'])->format('Y-m-d'), - 'amount' => $amount, - ] - ); - } - $current = clone $this->start; - while ($current <= $this->end) { - foreach ($this->data['monthly-limits'] as $limit) { - $amount = rand($limit['amount_min'], $limit['amount_max']); - $limitId = DB::table('budget_limits')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'budget_id' => $limit['budget_id'], - 'startdate' => $current->format('Y-m-d'), - 'amount' => $amount, - 'repeats' => 0, - 'repeat_freq' => 'monthly', - ] - ); - - DB::table('limit_repetitions')->insert( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'budget_limit_id' => $limitId, - 'startdate' => $current->format('Y-m-d'), - 'enddate' => Navigation::endOfPeriod($current, 'monthly')->format('Y-m-d'), - 'amount' => $amount, - ] - ); - } - - $current->addMonth(); - } - - } - - /** - * - */ - private function createCategories() - { - $insert = []; - foreach ($this->data['categories'] as $category) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $category['user_id'], - 'name' => Crypt::encrypt($category['name']), - 'encrypted' => 1, - ]; - } - DB::table('categories')->insert($insert); - } - - /** - * - */ - private function createCurrencies() - { - $insert = []; - foreach ($this->data['currencies'] as $job) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'deleted_at' => null, - 'code' => $job['code'], - 'name' => $job['name'], - 'symbol' => $job['symbol'], - ]; - } - DB::table('transaction_currencies')->insert($insert); - } - - /** - * - */ - private function createExportJobs() - { - $insert = []; - $disk = Storage::disk('export'); - foreach ($this->data['export-jobs'] as $job) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $job['user_id'], - 'key' => $job['key'], - 'status' => $job['status'], - ]; - $disk->put($job['key'] . '.zip', 'Nonsense data for "ziP" file.'); - } - DB::table('export_jobs')->insert($insert); - - // store fake export file: - - } - - /** - * - */ - private function createImportJobs() - { - - $disk = Storage::disk('upload'); - $insert = []; - foreach ($this->data['import-jobs'] as $job) { - $insert[] - = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $job['user_id'], - 'file_type' => $job['file_type'], - 'key' => $job['key'], - 'status' => $job['status'], - 'extended_status' => json_encode($job['extended_status']), - 'configuration' => json_encode($job['configuration']), - ]; - - $disk->put($job['key'] . '.upload', Crypt::encrypt('')); - } - DB::table('import_jobs')->insert($insert); - } - - /** - * - */ - private function createJournals() - { - $current = clone $this->start; - $transactions = []; - while ($current <= $this->end) { - $date = $current->format('Y-m-'); - $month = $current->format('F'); - - // run all monthly withdrawals: - foreach ($this->data['monthly-withdrawals'] as $withdrawal) { - $description = str_replace(':month', $month, $withdrawal['description']); - $journalId = DB::table('transaction_journals')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $withdrawal['user_id'], - 'transaction_type_id' => 1, - 'bill_id' => $withdrawal['bill_id'] ?? null, - 'transaction_currency_id' => 1, - 'description' => Crypt::encrypt($description), - 'completed' => 1, - 'date' => $date . $withdrawal['day-of-month'], - 'interest_date' => $withdrawal['interest_date'] ?? null, - 'book_date' => $withdrawal['book_date'] ?? null, - 'process_date' => $withdrawal['process_date'] ?? null, - 'encrypted' => 1, - 'order' => 0, - 'tag_count' => 0, - ] - ); - $amount = (rand($withdrawal['min_amount'] * 100, $withdrawal['max_amount'] * 100)) / 100; - $transactions[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'transaction_journal_id' => $journalId, - 'account_id' => $withdrawal['source_id'], - 'amount' => $amount * -1, - ]; - $transactions[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'transaction_journal_id' => $journalId, - 'account_id' => $withdrawal['destination_id'], - 'amount' => $amount, - ]; - - // link to budget if set. - if (isset($withdrawal['budget_id'])) { - DB::table('budget_transaction_journal')->insert( - [ - 'budget_id' => $withdrawal['budget_id'], - 'transaction_journal_id' => $journalId, - - ] - ); - } - // link to category if set. - if (isset($withdrawal['category_id'])) { - DB::table('category_transaction_journal')->insert( - [ - 'category_id' => $withdrawal['category_id'], - 'transaction_journal_id' => $journalId, - - ] - ); - } - } - - // run all monthly deposits: - foreach ($this->data['monthly-deposits'] as $deposit) { - $description = str_replace(':month', $month, $deposit['description']); - $journalId = DB::table('transaction_journals')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $deposit['user_id'], - 'transaction_type_id' => 2, - 'bill_id' => $deposit['bill_id'] ?? null, - 'transaction_currency_id' => 1, - 'description' => Crypt::encrypt($description), - 'completed' => 1, - 'date' => $date . $deposit['day-of-month'], - 'interest_date' => $deposit['interest_date'] ?? null, - 'book_date' => $deposit['book_date'] ?? null, - 'process_date' => $deposit['process_date'] ?? null, - 'encrypted' => 1, - 'order' => 0, - 'tag_count' => 0, - ] - ); - $amount = (rand($deposit['min_amount'] * 100, $deposit['max_amount'] * 100)) / 100; - $transactions[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'transaction_journal_id' => $journalId, - 'account_id' => $deposit['source_id'], - 'amount' => $amount * -1, - ]; - $transactions[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'transaction_journal_id' => $journalId, - 'account_id' => $deposit['destination_id'], - 'amount' => $amount, - ]; - - // link to category if set. - if (isset($deposit['category_id'])) { - DB::table('category_transaction_journal')->insert( - [ - 'category_id' => $deposit['category_id'], - 'transaction_journal_id' => $journalId, - - ] - ); - } - } - // run all monthly transfers: - foreach ($this->data['monthly-transfers'] as $transfer) { - $description = str_replace(':month', $month, $transfer['description']); - $journalId = DB::table('transaction_journals')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $transfer['user_id'], - 'transaction_type_id' => 3, - 'bill_id' => $transfer['bill_id'] ?? null, - 'transaction_currency_id' => 1, - 'description' => Crypt::encrypt($description), - 'completed' => 1, - 'date' => $date . $transfer['day-of-month'], - 'interest_date' => $transfer['interest_date'] ?? null, - 'book_date' => $transfer['book_date'] ?? null, - 'process_date' => $transfer['process_date'] ?? null, - 'encrypted' => 1, - 'order' => 0, - 'tag_count' => 0, - ] - ); - $amount = (rand($transfer['min_amount'] * 100, $transfer['max_amount'] * 100)) / 100; - $transactions[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'transaction_journal_id' => $journalId, - 'account_id' => $transfer['source_id'], - 'amount' => $amount * -1, - ]; - $transactions[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'transaction_journal_id' => $journalId, - 'account_id' => $transfer['destination_id'], - 'amount' => $amount, - ]; - // link to category if set. - if (isset($transfer['category_id'])) { - DB::table('category_transaction_journal')->insert( - [ - 'category_id' => $transfer['category_id'], - 'transaction_journal_id' => $journalId, - - ] - ); - } - } - DB::table('transactions')->insert($transactions); - $transactions = []; - $current->addMonth(); - } - - - } - - /** - * - */ - private function createMultiDeposits() - { - foreach ($this->data['multi-deposits'] as $deposit) { - $journalId = DB::table('transaction_journals')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $deposit['user_id'], - 'transaction_type_id' => 2, - 'transaction_currency_id' => 1, - 'description' => Crypt::encrypt($deposit['description']), - 'completed' => 1, - 'date' => $deposit['date'], - 'interest_date' => $deposit['interest_date'] ?? null, - 'book_date' => $deposit['book_date'] ?? null, - 'process_date' => $deposit['process_date'] ?? null, - 'encrypted' => 1, - 'order' => 0, - 'tag_count' => 0, - ] - ); - $identifier = 0; - foreach ($deposit['source_ids'] as $index => $source) { - $description = $deposit['description'] . ' (#' . ($index + 1) . ')'; - $amount = $deposit['amounts'][$index]; - $first = DB::table('transactions')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'account_id' => $deposit['destination_id'], - 'transaction_journal_id' => $journalId, - 'description' => $description, - 'amount' => $amount, - 'identifier' => $identifier, - ] - ); - $second = DB::table('transactions')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'account_id' => $source, - 'transaction_journal_id' => $journalId, - 'description' => $description, - 'amount' => $amount * -1, - 'identifier' => $identifier, - ] - ); - $identifier++; - // link first and second to budget and category, if present. - - if (isset($deposit['category_ids'][$index])) { - DB::table('category_transaction')->insert( - [ - 'category_id' => $deposit['category_ids'][$index], - 'transaction_id' => $first, - ] - ); - DB::table('category_transaction')->insert( - [ - 'category_id' => $deposit['category_ids'][$index], - 'transaction_id' => $second, - ] - ); - } - } - } - } - - private function createMultiTransfers() - { - foreach ($this->data['multi-transfers'] as $transfer) { - $journalId = DB::table('transaction_journals')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $transfer['user_id'], - 'transaction_type_id' => 3, - 'transaction_currency_id' => 1, - 'description' => Crypt::encrypt($transfer['description']), - 'completed' => 1, - 'date' => $transfer['date'], - 'interest_date' => $transfer['interest_date'] ?? null, - 'book_date' => $transfer['book_date'] ?? null, - 'process_date' => $transfer['process_date'] ?? null, - 'encrypted' => 1, - 'order' => 0, - 'tag_count' => 0, - ] - ); - $identifier = 0; - foreach ($transfer['destination_ids'] as $index => $destination) { - $description = $transfer['description'] . ' (#' . ($index + 1) . ')'; - $amount = $transfer['amounts'][$index]; - $source = $transfer['source_ids'][$index]; - $first = DB::table('transactions')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'account_id' => $source, - 'transaction_journal_id' => $journalId, - 'description' => $description, - 'amount' => $amount * -1, - 'identifier' => $identifier, - ] - ); - $second = DB::table('transactions')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'account_id' => $destination, - 'transaction_journal_id' => $journalId, - 'description' => $description, - 'amount' => $amount, - 'identifier' => $identifier, - ] - ); - $identifier++; - if (isset($transfer['category_ids'][$index])) { - DB::table('category_transaction')->insert( - [ - 'category_id' => $transfer['category_ids'][$index], - 'transaction_id' => $first, - ] - ); - DB::table('category_transaction')->insert( - [ - 'category_id' => $transfer['category_ids'][$index], - 'transaction_id' => $second, - ] - ); - } - } - } - } - - /** - * - */ - private function createMultiWithdrawals() - { - foreach ($this->data['multi-withdrawals'] as $withdrawal) { - $journalId = DB::table('transaction_journals')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $withdrawal['user_id'], - 'transaction_type_id' => 1, - 'transaction_currency_id' => 1, - 'description' => Crypt::encrypt($withdrawal['description']), - 'completed' => 1, - 'date' => $withdrawal['date'], - 'interest_date' => $withdrawal['interest_date'] ?? null, - 'book_date' => $withdrawal['book_date'] ?? null, - 'process_date' => $withdrawal['process_date'] ?? null, - 'encrypted' => 1, - 'order' => 0, - 'tag_count' => 0, - ] - ); - $identifier = 0; - foreach ($withdrawal['destination_ids'] as $index => $destination) { - $description = $withdrawal['description'] . ' (#' . ($index + 1) . ')'; - $amount = $withdrawal['amounts'][$index]; - $first = DB::table('transactions')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'account_id' => $withdrawal['source_id'], - 'transaction_journal_id' => $journalId, - 'description' => $description, - 'amount' => $amount * -1, - 'identifier' => $identifier, - ] - ); - $second = DB::table('transactions')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'account_id' => $destination, - 'transaction_journal_id' => $journalId, - 'description' => $description, - 'amount' => $amount, - 'identifier' => $identifier, - ] - ); - $identifier++; - // link first and second to budget and category, if present. - if (isset($withdrawal['budget_ids'][$index])) { - DB::table('budget_transaction')->insert( - [ - 'budget_id' => $withdrawal['budget_ids'][$index], - 'transaction_id' => $first, - ] - ); - DB::table('budget_transaction')->insert( - [ - 'budget_id' => $withdrawal['budget_ids'][$index], - 'transaction_id' => $second, - ] - ); - } - - if (isset($withdrawal['category_ids'][$index])) { - DB::table('category_transaction')->insert( - [ - 'category_id' => $withdrawal['category_ids'][$index], - 'transaction_id' => $first, - ] - ); - DB::table('category_transaction')->insert( - [ - 'category_id' => $withdrawal['category_ids'][$index], - 'transaction_id' => $second, - ] - ); - } - } - } - } - - /** - * - */ - private function createPiggyBanks() - { - foreach ($this->data['piggy-banks'] as $piggyBank) { - $piggyId = DB::table('piggy_banks')->insertGetId( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'account_id' => $piggyBank['account_id'], - 'name' => Crypt::encrypt($piggyBank['name']), - 'targetamount' => $piggyBank['targetamount'], - 'startdate' => $piggyBank['startdate'], - 'order' => $piggyBank['order'], - 'encrypted' => 1, - ] - ); - if (isset($piggyBank['currentamount'])) { - DB::table('piggy_bank_repetitions')->insert( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'piggy_bank_id' => $piggyId, - 'startdate' => $piggyBank['startdate'], - 'currentamount' => $piggyBank['currentamount'], - ] - ); - } - } - - foreach ($this->data['piggy-events'] as $event) { - DB::table('piggy_bank_events')->insert( - [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'piggy_bank_id' => $event['piggy_bank_id'], - 'date' => $event['date'], - 'amount' => $event['amount'], - ] - ); - } - } - - /** - * - */ - private function createRules() - { - $insert = []; - foreach ($this->data['rule-groups'] as $group) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $group['user_id'], - 'order' => $group['order'], - 'title' => $group['title'], - 'description' => $group['description'], - 'active' => 1, - ]; - } - DB::table('rule_groups')->insert($insert); - $insert = []; - foreach ($this->data['rules'] as $rule) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $rule['user_id'], - 'rule_group_id' => $rule['rule_group_id'], - 'order' => $rule['order'], - 'active' => $rule['active'], - 'stop_processing' => $rule['stop_processing'], - 'title' => $rule['title'], - 'description' => $rule['description'], - ]; - } - DB::table('rules')->insert($insert); - - $insert = []; - foreach ($this->data['rule-triggers'] as $trigger) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'rule_id' => $trigger['rule_id'], - 'order' => $trigger['order'], - 'active' => $trigger['active'], - 'stop_processing' => $trigger['stop_processing'], - 'trigger_type' => $trigger['trigger_type'], - 'trigger_value' => $trigger['trigger_value'], - ]; - } - DB::table('rule_triggers')->insert($insert); - - $insert = []; - foreach ($this->data['rule-actions'] as $action) { - $insert[] = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'rule_id' => $action['rule_id'], - 'order' => $action['order'], - 'active' => $action['active'], - 'stop_processing' => $action['stop_processing'], - 'action_type' => $action['action_type'], - 'action_value' => $action['action_value'], - ]; - } - DB::table('rule_actions')->insert($insert); - } - - /** - * - */ - private function createTags() - { - $insert = []; - foreach ($this->data['tags'] as $tag) { - $insert[] - = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'user_id' => $tag['user_id'], - 'tag' => Crypt::encrypt($tag['tag']), - 'tagMode' => $tag['tagMode'], - 'date' => $tag['date'] ?? null, - ]; - - } - DB::table('tags')->insert($insert); - } - - /** - * - */ - private function createUsers() - { - $insert = []; - foreach ($this->data['users'] as $user) { - $insert[] - = [ - 'created_at' => $this->time, - 'updated_at' => $this->time, - 'email' => $user['email'], - 'remember_token' => '', - 'password' => bcrypt($user['password']), - ]; - - } - DB::table('users')->insert($insert); - $insert = []; - foreach ($this->data['roles'] as $role) { - $insert[] - = [ - 'user_id' => $role['user_id'], - 'role_id' => $role['role'], - ]; - } - DB::table('role_user')->insert($insert); - } - - /** - * - */ - private function go() - { - $this->createUsers(); - $this->createAccounts(); - $this->createBills(); - $this->createBudgets(); - $this->createCategories(); - $this->createPiggyBanks(); - $this->createRules(); - $this->createTags(); - $this->createJournals(); - $this->createAttachments(); - $this->createMultiWithdrawals(); - $this->createMultiDeposits(); - $this->createMultiTransfers(); - $this->createImportJobs(); - $this->createCurrencies(); - $this->createExportJobs(); - } - -} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 7902ac315b..a92b556f6a 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -28,7 +28,6 @@ class DatabaseSeeder extends Seeder $this->call(TransactionCurrencySeeder::class); $this->call(TransactionTypeSeeder::class); $this->call(PermissionSeeder::class); - $this->call(TestDataSeeder::class); } } diff --git a/database/seeds/TestDataSeeder.php b/database/seeds/TestDataSeeder.php deleted file mode 100644 index c890daaa9b..0000000000 --- a/database/seeds/TestDataSeeder.php +++ /dev/null @@ -1,57 +0,0 @@ -exists($fileName)) { - Log::debug('Now seeding ' . $fileName); - $file = json_decode($disk->get($fileName), true); - - if (is_array($file)) { - // run the file: - TestData::run($file); - - return; - } - Log::error(sprintf('No valid data found (%s) for environment %s', $fileName, $env)); - - return; - - } - Log::error(sprintf('No seed file (%s) for environment %s', $fileName, $env)); - } -} diff --git a/resources/seeds/seed.bill-test.json b/resources/seeds/seed.bill-test.json deleted file mode 100644 index be9d599077..0000000000 --- a/resources/seeds/seed.bill-test.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "users": [ - { - "email": "thegrumpydictator@gmail.com", - "password": "james" - }, - { - "email": "thegrumpydictator+empty@gmail.com", - "password": "james" - }, - { - "email": "thegrumpydictator+deleteme@gmail.com", - "password": "james" - } - ], - "roles": [ - { - "user_id": 1, - "role": 1 - } - ], - "accounts": [ - { - "user_id": 1, - "account_type_id": 3, - "name": "Checking Account", - "iban": "NL11XOLA6707795988" - } - ], - "account-meta": [ - ], - "bills": [ - { - "name": "Some weird weekly bill", - "match": "weird,weekly,bill", - "amount_min": 30, - "amount_max": 35, - "user_id": 1, - "date": "2016-06-12", - "active": 1, - "automatch": 1, - "repeat_freq": "weekly", - "skip": 0 - }, - - - { - "name": "Rent", - "match": "rent,land,lord", - "amount_min": 795, - "amount_max": 805, - "user_id": 1, - "date": "2015-01-02", - "active": 1, - "automatch": 1, - "repeat_freq": "monthly", - "skip": 0 - }, - - { - "name": "Netflix subscription per quarter", - "match": "netflix,subscription", - "amount_min": 36, - "amount_max": 36, - "user_id": 1, - "date": "2016-09-06", - "active": 1, - "automatch": 1, - "repeat_freq": "quarterly", - "skip": 0 - }, - - { - "name": "Travel insurance", - "match": "abn,travel,insurance", - "amount_min": 55, - "amount_max": 62, - "user_id": 1, - "date": "2015-03-04", - "active": 1, - "automatch": 1, - "repeat_freq": "yearly", - "skip": 0 - }, - - { - "name": "Health insurance", - "match": "insurer,insurance,health", - "amount_min": 120, - "amount_max": 140, - "user_id": 1, - "date": "2015-01-07", - "active": 1, - "automatch": 1, - "repeat_freq": "monthly", - "skip": 0 - } - ], - "budgets": [ - ], - "budget-limits": [ - ], - "monthly-limits": [ - ], - "categories": [ - ], - "piggy-banks": [ - ], - "piggy-events": [ - ], - "rule-groups": [ - ], - "rules": [ - ], - "rule-triggers": [ - ], - "rule-actions": [ - ], - "tags": [ - ], - "monthly-deposits": [ - ], - "monthly-transfers": [ - ], - "monthly-withdrawals": [ - ], - "attachments": [ - ], - "multi-withdrawals": [ - ], - "multi-deposits": [ - ], - "multi-transfers": [ - ], - "import-jobs": [], - "currencies": [] -} \ No newline at end of file diff --git a/resources/seeds/seed.import-test.json b/resources/seeds/seed.import-test.json deleted file mode 100644 index 858b255717..0000000000 --- a/resources/seeds/seed.import-test.json +++ /dev/null @@ -1,279 +0,0 @@ -{ - "users": [ - { - "email": "thegrumpydictator@gmail.com", - "password": "james" - } - ], - "roles": [ - { - "user_id": 1, - "role": 1 - } - ], - "accounts": [ - { - "user_id": 1, - "account_type_id": 3, - "name": "ExistingAssetAccount", - "iban": "NL62EXFK3945306779" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "ExistingOpposingAccount", - "iban": "NL79BGWN6303364632" - } - ], - "account-meta": [ - { - "account_id": 1, - "name": "accountNumber", - "data": "\"3945306779\"" - }, - { - "account_id": 2, - "name": "accountNumber", - "data": "\"6303364632\"" - } - ], - "bills": [ - { - "name": "ExistingBill", - "match": "ExistingBill", - "amount_min": 100, - "amount_max": 200, - "user_id": 1, - "date": "2015-01-01", - "active": 1, - "automatch": 1, - "repeat_freq": "monthly", - "skip": 0 - } - ], - "budgets": [ - { - "name": "ExistingBudget", - "user_id": 1 - } - ], - "budget-limits": [], - "monthly-limits": [], - "categories": [ - { - "name": "ExistingCategory", - "user_id": 1 - }, - { - "name": "UnExpected Taxes", - "user_id": 1 - } - ], - "piggy-banks": [], - "piggy-events": [], - "rule-groups": [ - { - "user_id": 1, - "order": 1, - "title": "Default rules", - "description": "All your rules not in a particular group." - }, - { - "user_id": 1, - "order": 2, - "title": "Unexpected rules", - "description": "Group for unexpected rules" - } - ], - "rules": [ - { - "user_id": 1, - "rule_group_id": 1, - "order": 1, - "active": 1, - "stop_processing": 0, - "title": "Your first default rule", - "description": "This rule is an example. You can safely delete it." - }, - { - "user_id": 1, - "rule_group_id": 2, - "order": 1, - "active": 1, - "stop_processing": 0, - "title": "Onverwachte belastingen", - "description": "Triggers on the storage of onverwachte belastingen." - } - ], - "rule-triggers": [ - { - "rule_id": 1, - "order": 1, - "active": 1, - "stop_processing": 0, - "trigger_type": "user_action", - "trigger_value": "store-journal" - }, - { - "rule_id": 1, - "order": 2, - "active": 1, - "stop_processing": 0, - "trigger_type": "description_is", - "trigger_value": "The Man Who Sold the World" - }, - { - "rule_id": 1, - "order": 3, - "active": 1, - "stop_processing": 0, - "trigger_type": "from_account_is", - "trigger_value": "David Bowie" - }, - { - "rule_id": 2, - "order": 1, - "active": 1, - "stop_processing": 0, - "trigger_type": "user_action", - "trigger_value": "store-journal" - }, - { - "rule_id": 2, - "order": 2, - "active": 1, - "stop_processing": 0, - "trigger_type": "description_contains", - "trigger_value": "(on)verwachte" - } - ], - "rule-actions": [ - { - "rule_id": 1, - "order": 1, - "active": 1, - "stop_processing": 0, - "action_type": "prepend_description", - "action_value": "Bought the world from " - }, - { - "rule_id": 1, - "order": 2, - "active": 1, - "stop_processing": 0, - "action_type": "set_category", - "action_value": "Large expenses" - }, - { - "rule_id": 2, - "order": 1, - "active": 1, - "stop_processing": 0, - "action_type": "set_category", - "action_value": "UnExpected Taxes" - } - ], - "tags": [ - { - "user_id": 1, - "tag": "ExistingTag", - "tagMode": "nothing" - }, - { - "user_id": 1, - "tag": "AnotherExistingTag", - "tagMode": "nothing" - } - ], - "monthly-deposits": [], - "monthly-transfers": [], - "monthly-withdrawals": [], - "attachments": [], - "multi-withdrawals": [], - "multi-deposits": [], - "multi-transfers": [], - "import-jobs": [ - { - "user_id": 1, - "key": "testImport", - "file_type": "csv", - "status": "settings_complete", - "extended_status": { - "steps_done": 0, - "total_steps": 0, - "errors": [], - "import_count": 0, - "importTag": 0 - }, - "configuration": { - "has-headers": false, - "date-format": "Ymd", - "delimiter": ",", - "import-account": 1, - "specifics": { - "RabobankDescription": 1 - }, - "column-count": 19, - "column-roles": [ - "account-iban", - "currency-code", - "date-interest", - "rabo-debet-credit", - "amount", - "opposing-iban", - "opposing-name", - "date-book", - "description", - "_ignore", - "description", - "description", - "description", - "description", - "description", - "description", - "sepa-ct-id", - "sepa-ct-op", - "sepa-db" - ], - "column-do-mapping": [ - true, - true, - false, - false, - false, - true, - true, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false - ], - "column-roles-complete": false, - "column-mapping-config": { - "0": [], - "1": { - "EUR": 1 - }, - "5": [], - "6": [] - }, - "column-mapping-complete": false - } - } - ], - "currencies": [ - { - "name": "ExistingCurrency", - "symbol": "#", - "code": "EXI" - } - ] -} \ No newline at end of file diff --git a/resources/seeds/seed.local.json b/resources/seeds/seed.local.json deleted file mode 100644 index bd1d17d784..0000000000 --- a/resources/seeds/seed.local.json +++ /dev/null @@ -1,1012 +0,0 @@ -{ - "users": [ - { - "email": "thegrumpydictator@gmail.com", - "password": "james" - }, - { - "email": "thegrumpydictator+empty@gmail.com", - "password": "james" - }, - { - "email": "thegrumpydictator+deleteme@gmail.com", - "password": "james" - } - ], - "roles": [ - { - "user_id": 1, - "role": 1 - } - ], - "accounts": [ - { - "user_id": 1, - "account_type_id": 3, - "name": "Checking Account", - "iban": "NL11XOLA6707795988" - }, - { - "user_id": 1, - "account_type_id": 3, - "name": "Alternate Checking Account", - "iban": "NL40UKBK3619908726" - }, - { - "user_id": 1, - "account_type_id": 3, - "name": "Savings Account", - "iban": "NL96DZCO4665940223" - }, - { - "user_id": 1, - "account_type_id": 3, - "name": "Shared Checking Account", - "iban": "NL81RCQZ7160379858" - }, - { - "user_id": 1, - "account_type_id": 3, - "name": "Emergency Savings Account", - "iban": "NL38SRMN4325934708" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Adobe" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Google" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Vitens" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Albert Heijn" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "PLUS" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Bakker" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Belastingdienst" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "bol.com" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Cafe Central" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "conrad.nl" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Coolblue" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Shell" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "SixtyFive" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "EightyFour" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Fiftyone" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "DUO" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Etos" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "FEBO" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Greenchoice" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Halfords" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "XS4All" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "iCentre" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Jumper" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Land lord" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Job" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Belastingdienst" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Bank" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "KPN" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Google" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Work SixtyFive" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Work EightyFour" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Work Fiftyone" - }, - { - "user_id": 1, - "account_type_id": 6, - "name": "Opposing for Savings Account" - }, - { - "user_id": 1, - "account_type_id": 6, - "name": "Opposing for Emergency Savings Account" - } - ], - "account-meta": [ - { - "account_id": 1, - "name": "accountRole", - "data": "\"defaultAsset\"" - }, - { - "account_id": 2, - "name": "accountRole", - "data": "\"defaultAsset\"" - }, - { - "account_id": 3, - "name": "accountRole", - "data": "\"savingAsset\"" - }, - { - "account_id": 4, - "name": "accountRole", - "data": "\"sharedAsset\"" - } - ], - "bills": [ - { - "name": "Rent", - "match": "rent,land,lord", - "amount_min": 795, - "amount_max": 805, - "user_id": 1, - "date": "2015-01-01", - "active": 1, - "automatch": 1, - "repeat_freq": "monthly", - "skip": 0 - }, - { - "name": "Health insurance", - "match": "insurer,insurance,health", - "amount_min": 120, - "amount_max": 140, - "user_id": 1, - "date": "2015-01-01", - "active": 1, - "automatch": 1, - "repeat_freq": "monthly", - "skip": 0 - } - ], - "budgets": [ - { - "name": "Groceries", - "user_id": 1 - }, - { - "name": "Bills", - "user_id": 1 - }, - { - "name": "Car", - "user_id": 1 - }, - { - "name": "One Empty Budget", - "user_id": 1 - }, - { - "name": "Another Empty Budget", - "user_id": 1 - }, - { - "name": "Going out", - "user_id": 1 - }, - { - "name": "Multi budget A", - "user_id": 1 - }, - { - "name": "Multi budget B", - "user_id": 1 - }, - { - "name": "Multi budget C", - "user_id": 1 - } - ], - "budget-limits": [ - { - "budget_id": 1, - "startdate": "2016-04-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "daily" - }, - { - "budget_id": 1, - "startdate": "2016-05-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "weekly" - }, - { - "budget_id": 1, - "startdate": "2016-06-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "monthly" - }, - { - "budget_id": 1, - "startdate": "2016-07-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "quarterly" - }, - { - "budget_id": 1, - "startdate": "2016-08-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "half-year" - }, - { - "budget_id": 1, - "startdate": "2016-09-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "yearly" - } - ], - "monthly-limits": [ - { - "budget_id": 1, - "amount_min": 200, - "amount_max": 200 - }, - { - "budget_id": 2, - "amount_min": 1000, - "amount_max": 1000 - }, - { - "budget_id": 3, - "amount_min": 200, - "amount_max": 200 - }, - { - "budget_id": 6, - "amount_min": 100, - "amount_max": 100 - } - ], - "categories": [ - { - "name": "Daily groceries", - "user_id": 1 - }, - { - "name": "Car", - "user_id": 1 - }, - { - "name": "Reimbursements", - "user_id": 1 - }, - { - "name": "Salary", - "user_id": 1 - }, - { - "name": "Bills", - "user_id": 1 - }, - { - "name": "Going out", - "user_id": 1 - }, - { - "name": "Multi category A", - "user_id": 1 - }, - { - "name": "Multi category B", - "user_id": 1 - }, - { - "name": "Multi category C", - "user_id": 1 - } - ], - "piggy-banks": [ - { - "account_id": 3, - "name": "New camera", - "targetamount": 1000, - "startdate": "2015-04-01", - "reminder_skip": 0, - "remind_me": 0, - "order": 1, - "currentamount": 735 - }, - { - "account_id": 3, - "name": "New phone", - "targetamount": 600, - "startdate": "2015-04-01", - "reminder_skip": 0, - "remind_me": 0, - "order": 2, - "currentamount": 333 - }, - { - "account_id": 3, - "name": "New couch", - "targetamount": 500, - "startdate": "2015-04-01", - "reminder_skip": 0, - "remind_me": 0, - "order": 3, - "currentamount": 120 - } - ], - "piggy-events": [ - { - "piggy_bank_id": 1, - "date": "2015-05-01", - "amount": 245 - }, - { - "piggy_bank_id": 1, - "date": "2015-06-02", - "amount": 245 - }, - { - "piggy_bank_id": 1, - "date": "2015-07-03", - "amount": 245 - }, - { - "piggy_bank_id": 2, - "date": "2015-08-04", - "amount": 111 - }, - { - "piggy_bank_id": 2, - "date": "2015-09-05", - "amount": 111 - }, - { - "piggy_bank_id": 2, - "date": "2015-10-06", - "amount": 111 - }, - { - "piggy_bank_id": 3, - "date": "2015-11-07", - "amount": 40 - }, - { - "piggy_bank_id": 3, - "date": "2015-12-08", - "amount": 40 - }, - { - "piggy_bank_id": 3, - "date": "2016-01-09", - "amount": 40 - } - ], - "rule-groups": [ - { - "user_id": 1, - "order": 1, - "title": "Default rules", - "description": "All your rules not in a particular group." - } - ], - "rules": [ - { - "user_id": 1, - "rule_group_id": 1, - "order": 1, - "active": 1, - "stop_processing": 0, - "title": "Your first default rule", - "description": "This rule is an example. You can safely delete it." - } - ], - "rule-triggers": [ - { - "rule_id": 1, - "order": 1, - "active": 1, - "stop_processing": 0, - "trigger_type": "user_action", - "trigger_value": "store-journal" - }, - { - "rule_id": 1, - "order": 2, - "active": 1, - "stop_processing": 0, - "trigger_type": "description_is", - "trigger_value": "The Man Who Sold the World" - }, - { - "rule_id": 1, - "order": 3, - "active": 1, - "stop_processing": 0, - "trigger_type": "from_account_is", - "trigger_value": "David Bowie" - } - ], - "rule-actions": [ - { - "rule_id": 1, - "order": 1, - "active": 1, - "stop_processing": 0, - "action_type": "prepend_description", - "action_value": "Bought the world from " - }, - { - "rule_id": 1, - "order": 2, - "active": 1, - "stop_processing": 0, - "action_type": "set_category", - "action_value": "Large expenses" - } - ], - "tags": [ - { - "user_id": 1, - "tag": "TagJanuary", - "tagMode": "nothing", - "date": "2015-01-01" - }, - { - "user_id": 1, - "tag": "TagFebruary", - "tagMode": "nothing", - "date": "2015-02-02" - }, - { - "user_id": 1, - "tag": "TagMarch", - "tagMode": "nothing", - "date": "2015-03-03" - }, - { - "user_id": 1, - "tag": "TagApril", - "tagMode": "nothing", - "date": "2015-04-04" - }, - { - "user_id": 1, - "tag": "TagMay", - "tagMode": "nothing", - "date": "2015-05-05" - }, - { - "user_id": 1, - "tag": "TagJune", - "tagMode": "nothing", - "date": "2015-06-06" - }, - { - "user_id": 1, - "tag": "TagJuly", - "tagMode": "nothing", - "date": "2015-07-07" - }, - { - "user_id": 1, - "tag": "TagAugust", - "tagMode": "nothing", - "date": "2015-08-08" - }, - { - "user_id": 1, - "tag": "TagSeptember", - "tagMode": "nothing", - "date": "2015-09-09" - }, - { - "user_id": 1, - "tag": "TagOctober", - "tagMode": "nothing", - "date": "2015-10-10" - }, - { - "user_id": 1, - "tag": "TagNovember", - "tagMode": "nothing", - "date": "2015-11-11" - }, - { - "user_id": 1, - "tag": "TagDecember", - "tagMode": "nothing", - "date": "2015-12-12" - } - ], - "monthly-deposits": [ - { - "user_id": 1, - "day-of-month": 24, - "description": "Salary in :month", - "source_id": 30, - "destination_id": 1, - "min_amount": 1500, - "max_amount": 1700, - "category_id": 4 - } - ], - "monthly-transfers": [ - { - "user_id": 1, - "day-of-month": 28, - "description": "Saving money for :month", - "source_id": 1, - "destination_id": 3, - "min_amount": 150, - "max_amount": 150 - } - ], - "monthly-withdrawals": [ - { - "user_id": 1, - "day-of-month": "02", - "description": "Rent for :month", - "source_id": 1, - "destination_id": 29, - "min_amount": 800, - "max_amount": 800, - "category_id": 5, - "budget_id": 2 - }, - { - "user_id": 1, - "day-of-month": "04", - "description": "Water bill :month", - "source_id": 1, - "destination_id": 8, - "min_amount": 8, - "max_amount": 12, - "category_id": 5, - "budget_id": 2 - }, - { - "user_id": 1, - "day-of-month": "06", - "description": "TV bill :month", - "source_id": 1, - "destination_id": 26, - "min_amount": 50, - "max_amount": 60, - "category_id": 5, - "budget_id": 2 - }, - { - "user_id": 1, - "day-of-month": "08", - "description": "Power bill :month", - "source_id": 1, - "destination_id": 24, - "min_amount": 75, - "max_amount": 90, - "category_id": 5, - "budget_id": 2 - }, - { - "user_id": 1, - "day-of-month": "07", - "description": "Bought gas", - "source_id": 1, - "destination_id": 17, - "min_amount": 40, - "max_amount": 50, - "category_id": 2, - "budget_id": 3 - }, - { - "user_id": 1, - "day-of-month": 17, - "description": "Filled the car up again", - "source_id": 1, - "destination_id": 17, - "min_amount": 40, - "max_amount": 50, - "category_id": 2, - "budget_id": 3 - }, - { - "user_id": 1, - "day-of-month": 27, - "description": "Needed gas again", - "source_id": 1, - "destination_id": 17, - "min_amount": 45, - "max_amount": 55, - "category_id": 2, - "budget_id": 3 - }, - { - "user_id": 1, - "day-of-month": "02", - "description": "Groceries", - "source_id": 1, - "destination_id": 9, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": "06", - "description": "Groceries", - "source_id": 1, - "destination_id": 10, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": "08", - "description": "Groceries", - "source_id": 1, - "destination_id": 11, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 11, - "description": "Groceries", - "source_id": 1, - "destination_id": 9, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 15, - "description": "Groceries", - "source_id": 1, - "destination_id": 10, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 19, - "description": "Groceries", - "source_id": 1, - "destination_id": 11, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 23, - "description": "Groceries", - "source_id": 1, - "destination_id": 9, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 26, - "description": "Groceries", - "source_id": 1, - "destination_id": 10, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 13, - "description": "Going out for drinks", - "source_id": 1, - "destination_id": 14, - "min_amount": 15, - "max_amount": 36, - "category_id": 6, - "budget_id": 6 - }, - { - "user_id": 1, - "day-of-month": 26, - "description": "Going out for drinks again", - "source_id": 1, - "destination_id": 14, - "min_amount": 15, - "max_amount": 36, - "category_id": 6, - "budget_id": 6 - } - ], - "attachments": [ - { - "attachable_id": 1, - "attachable_type": "FireflyIII\\Models\\TransactionJournal", - "user_id": 1, - "content": "This is attachment number one.", - "filename": "empty-file.txt", - "title": "Empty file", - "description": "This file is empty", - "notes": "Some notes", - "mime": "text\/plain", - "uploaded": 1 - }, - { - "attachable_id": 2, - "attachable_type": "FireflyIII\\Models\\TransactionJournal", - "user_id": 1, - "content": "This is attachment number two.", - "filename": "empty-file2.txt", - "title": "Empty file", - "description": "This file is empty", - "notes": "Some notes", - "mime": "text\/plain", - "uploaded": 1 - } - ], - "multi-withdrawals": [ - { - "user_id": 1, - "date": "2016-03-12", - "description": "Even multi-withdrawal (50, 50)", - "destination_ids": [ - 18, - 19 - ], - "source_id": 1, - "amounts": [ - 50, - 50 - ], - "category_ids": [ - 7, - 8, - 9 - ], - "budget_ids": [ - 7, - 8, - 9 - ] - }, - { - "user_id": 1, - "date": "2016-05-12", - "description": "Uneven multi-withdrawal (15,34,51)", - "destination_ids": [ - 18, - 19, - 20 - ], - "source_id": 1, - "amounts": [ - 15, - 34, - 51 - ], - "category_ids": [ - 7, - 8, - 9 - ], - "budget_ids": [ - 7, - 8, - 9 - ] - } - ], - "multi-deposits": [ - { - "user_id": 1, - "date": "2016-03-02", - "description": "Even multi-deposit (50, 50)", - "source_ids": [ - 35, - 36 - ], - "destination_id": 1, - "amounts": [ - 50, - 50 - ], - "category_ids": [ - 7, - 8, - 9 - ] - }, - { - "user_id": 1, - "date": "2016-05-02", - "description": "Uneven multi-deposit (15,34,51)", - "source_ids": [ - 35, - 36, - 37 - ], - "destination_id": 1, - "amounts": [ - 15, - 34, - 51 - ], - "category_ids": [ - 7, - 8, - 9 - ] - } - ], - "multi-transfers": [ - { - "user_id": 1, - "date": "2016-01-18", - "description": "Even multi-transfer (50, 50)", - "source_ids": [ - 4, - 4 - ], - "destination_ids": [ - 5, - 5 - ], - "amounts": [ - 50, - 50 - ], - "category_ids": [ - 7, - 8 - ] - }, - { - "user_id": 1, - "date": "2016-03-28", - "description": "Uneven multi-transfer (15,34,51)", - "source_ids": [ - 4, - 4, - 4 - ], - "destination_ids": [ - 5, - 5, - 5 - ], - "amounts": [ - 15, - 34, - 51 - ], - "category_ids": [ - 7, - 8, - 9 - ] - } - ], - "import-jobs": [], - "currencies": [] -} \ No newline at end of file diff --git a/resources/seeds/seed.split.json b/resources/seeds/seed.split.json deleted file mode 100644 index 38fa070988..0000000000 --- a/resources/seeds/seed.split.json +++ /dev/null @@ -1,303 +0,0 @@ -{ - "users": [ - { - "email": "thegrumpydictator@gmail.com", - "password": "james" - } - ], - "roles": [ - { - "user_id": 1, - "role": 1 - } - ], - "accounts": [ - { - "user_id": 1, - "account_type_id": 3, - "name": "Checking Account", - "iban": "NL11XOLA6707795988" - }, - { - "user_id": 1, - "account_type_id": 3, - "name": "Alternate", - "iban": "NL40UKBK3619908726" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "SixtyFive" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "EightyFour" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Fiftyone" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Work SixtyFive" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Work EightyFour" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Work Fiftyone" - } - ], - "account-meta": [ - { - "account_id": 1, - "name": "accountRole", - "data": "\"defaultAsset\"" - }, - { - "account_id": 2, - "name": "accountRole", - "data": "\"defaultAsset\"" - } - ], - "bills": [], - "budgets": [ - { - "name": "Groceries", - "user_id": 1 - }, - { - "name": "Bills", - "user_id": 1 - }, - { - "name": "Car", - "user_id": 1 - } - ], - "budget-limits": [], - "monthly-limits": [ - { - "budget_id": 1, - "amount_min": 200, - "amount_max": 200 - }, - { - "budget_id": 2, - "amount_min": 1000, - "amount_max": 1000 - }, - { - "budget_id": 3, - "amount_min": 200, - "amount_max": 200 - } - ], - "categories": [ - { - "name": "Daily groceries", - "user_id": 1 - }, - { - "name": "Car", - "user_id": 1 - }, - { - "name": "Reimbursements", - "user_id": 1 - } - ], - "piggy-banks": [ - { - "account_id": 2, - "name": "New camera", - "targetamount": 1000, - "startdate": "2015-04-01", - "reminder_skip": 0, - "remind_me": 0, - "order": 1, - "currentamount": 0 - }, - { - "account_id": 2, - "name": "New phone", - "targetamount": 600, - "startdate": "2015-04-01", - "reminder_skip": 0, - "remind_me": 0, - "order": 2, - "currentamount": 0 - }, - { - "account_id": 2, - "name": "New couch", - "targetamount": 500, - "startdate": "2015-04-01", - "reminder_skip": 0, - "remind_me": 0, - "order": 3, - "currentamount": 0 - } - ], - "piggy-events": [], - "rule-groups": [], - "rules": [], - "rule-triggers": [], - "rule-actions": [], - "tags": [], - "monthly-deposits": [], - "monthly-transfers": [], - "monthly-withdrawals": [], - "attachments": [], - "multi-withdrawals": [ - { - "user_id": 1, - "date": "2016-03-12", - "description": "Even multi-withdrawal (50, 50)", - "destination_ids": [ - 3, - 4 - ], - "source_id": 1, - "amounts": [ - 50, - 50 - ], - "category_ids": [ - 1, - 2, - 3 - ], - "budget_ids": [ - 1, - 2, - 3 - ] - }, - { - "user_id": 1, - "date": "2016-05-12", - "description": "Uneven multi-withdrawal (15,34,51)", - "destination_ids": [ - 3, - 4, - 5 - ], - "source_id": 1, - "amounts": [ - 15, - 34, - 51 - ], - "category_ids": [ - 1, - 2, - 3 - ], - "budget_ids": [ - 1, - 2, - 3 - ] - } - ], - "multi-deposits": [ - { - "user_id": 1, - "date": "2016-03-02", - "description": "Even multi-deposit (50, 50)", - "source_ids": [ - 6, - 7 - ], - "destination_id": 1, - "amounts": [ - 50, - 50 - ], - "category_ids": [ - 1, - 2, - 3 - ] - }, - { - "user_id": 1, - "date": "2016-05-02", - "description": "Uneven multi-deposit (15,34,51)", - "source_ids": [ - 6, - 7, - 8 - ], - "destination_id": 1, - "amounts": [ - 15, - 34, - 51 - ], - "category_ids": [ - 1, - 2, - 3 - ] - } - ], - "multi-transfers": [ - { - "user_id": 1, - "date": "2016-01-18", - "description": "Even multi-transfer (50, 50)", - "source_ids": [ - 1, - 1 - ], - "destination_ids": [ - 2, - 2 - ], - "amounts": [ - 50, - 50 - ], - "category_ids": [ - 1, - 2 - ] - }, - { - "user_id": 1, - "date": "2016-05-08", - "description": "Uneven multi-transfer (15,34,51)", - "source_ids": [ - 1, - 1, - 1 - ], - "destination_ids": [ - 2, - 2, - 2 - ], - "amounts": [ - 15, - 34, - 51 - ], - "category_ids": [ - 1, - 2, - 3 - ] - } - ], - "import-jobs": [], - "currencies": [] -} \ No newline at end of file diff --git a/resources/seeds/seed.testing.json b/resources/seeds/seed.testing.json deleted file mode 100644 index acc64281f4..0000000000 --- a/resources/seeds/seed.testing.json +++ /dev/null @@ -1,1207 +0,0 @@ -{ - "users": [ - { - "email": "thegrumpydictator@gmail.com", - "password": "james" - }, - { - "email": "thegrumpydictator+empty@gmail.com", - "password": "james" - }, - { - "email": "thegrumpydictator+deleteme@gmail.com", - "password": "james" - } - ], - "roles": [ - { - "user_id": 1, - "role": 1 - } - ], - "accounts": [ - { - "user_id": 1, - "account_type_id": 3, - "name": "Checking Account", - "iban": "NL11XOLA6707795988" - }, - { - "user_id": 1, - "account_type_id": 3, - "name": "Alternate Checking Account", - "iban": "NL40UKBK3619908726" - }, - { - "user_id": 1, - "account_type_id": 3, - "name": "Savings Account", - "iban": "NL96DZCO4665940223" - }, - { - "user_id": 1, - "account_type_id": 3, - "name": "Shared Checking Account", - "iban": "NL81RCQZ7160379858" - }, - { - "user_id": 1, - "account_type_id": 3, - "name": "Emergency Savings Account", - "iban": "NL38SRMN4325934708" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Adobe" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Google" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Vitens" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Albert Heijn" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "PLUS" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Bakker" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Belastingdienst" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "bol.com" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Cafe Central" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "conrad.nl" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Coolblue" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Shell" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "SixtyFive" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "EightyFour" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Fiftyone" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "DUO" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Etos" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "FEBO" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Greenchoice" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Halfords" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "XS4All" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "iCentre" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Jumper" - }, - { - "user_id": 1, - "account_type_id": 4, - "name": "Land lord" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Job" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Belastingdienst" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Bank" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "KPN" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Google" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Work SixtyFive" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Work EightyFour" - }, - { - "user_id": 1, - "account_type_id": 5, - "name": "Work Fiftyone" - }, - { - "user_id": 1, - "account_type_id": 6, - "name": "Opposing for Savings Account" - }, - { - "user_id": 1, - "account_type_id": 6, - "name": "Opposing for Emergency Savings Account" - } - ], - "account-meta": [ - { - "account_id": 1, - "name": "accountRole", - "data": "\"defaultAsset\"" - }, - { - "account_id": 2, - "name": "accountRole", - "data": "\"defaultAsset\"" - }, - { - "account_id": 3, - "name": "accountRole", - "data": "\"savingAsset\"" - }, - { - "account_id": 4, - "name": "accountRole", - "data": "\"sharedAsset\"" - } - ], - "bills": [ - { - "name": "Some weird weekly bill", - "match": "weird,weekly,bill", - "amount_min": 30, - "amount_max": 35, - "user_id": 1, - "date": "2016-06-12", - "active": 1, - "automatch": 1, - "repeat_freq": "weekly", - "skip": 0 - } - ], - "budgets": [ - { - "name": "Groceries", - "user_id": 1 - }, - { - "name": "Bills", - "user_id": 1 - }, - { - "name": "Car", - "user_id": 1 - }, - { - "name": "One Empty Budget", - "user_id": 1 - }, - { - "name": "Another Empty Budget", - "user_id": 1 - }, - { - "name": "Going out", - "user_id": 1 - }, - { - "name": "Multi budget A", - "user_id": 1 - }, - { - "name": "Multi budget B", - "user_id": 1 - }, - { - "name": "Multi budget C", - "user_id": 1 - } - ], - "budget-limits": [ - { - "budget_id": 1, - "startdate": "2016-04-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "daily" - }, - { - "budget_id": 1, - "startdate": "2016-05-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "weekly" - }, - { - "budget_id": 1, - "startdate": "2016-06-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "monthly" - }, - { - "budget_id": 1, - "startdate": "2016-07-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "quarterly" - }, - { - "budget_id": 1, - "startdate": "2016-08-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "half-year" - }, - { - "budget_id": 1, - "startdate": "2016-09-01", - "amount_min": 100, - "amount_max": 200, - "repeat_freq": "yearly" - } - ], - "monthly-limits": [ - { - "budget_id": 1, - "amount_min": 200, - "amount_max": 200 - }, - { - "budget_id": 2, - "amount_min": 1000, - "amount_max": 1000 - }, - { - "budget_id": 3, - "amount_min": 200, - "amount_max": 200 - }, - { - "budget_id": 6, - "amount_min": 100, - "amount_max": 100 - } - ], - "categories": [ - { - "name": "Daily groceries", - "user_id": 1 - }, - { - "name": "Car", - "user_id": 1 - }, - { - "name": "Reimbursements", - "user_id": 1 - }, - { - "name": "Salary", - "user_id": 1 - }, - { - "name": "Bills", - "user_id": 1 - }, - { - "name": "Going out", - "user_id": 1 - }, - { - "name": "Multi category A", - "user_id": 1 - }, - { - "name": "Multi category B", - "user_id": 1 - }, - { - "name": "Multi category C", - "user_id": 1 - } - ], - "piggy-banks": [ - { - "account_id": 3, - "name": "New camera", - "targetamount": 1000, - "startdate": "2015-04-01", - "reminder_skip": 0, - "remind_me": 0, - "order": 1, - "currentamount": 735 - }, - { - "account_id": 3, - "name": "New phone", - "targetamount": 600, - "startdate": "2015-04-01", - "reminder_skip": 0, - "remind_me": 0, - "order": 2, - "currentamount": 333 - }, - { - "account_id": 3, - "name": "New couch", - "targetamount": 500, - "startdate": "2015-04-01", - "reminder_skip": 0, - "remind_me": 0, - "order": 3, - "currentamount": 120 - } - ], - "piggy-events": [ - { - "piggy_bank_id": 1, - "date": "2015-05-01", - "amount": 245 - }, - { - "piggy_bank_id": 1, - "date": "2015-06-02", - "amount": 245 - }, - { - "piggy_bank_id": 1, - "date": "2015-07-03", - "amount": 245 - }, - { - "piggy_bank_id": 2, - "date": "2015-08-04", - "amount": 111 - }, - { - "piggy_bank_id": 2, - "date": "2015-09-05", - "amount": 111 - }, - { - "piggy_bank_id": 2, - "date": "2015-10-06", - "amount": 111 - }, - { - "piggy_bank_id": 3, - "date": "2015-11-07", - "amount": 40 - }, - { - "piggy_bank_id": 3, - "date": "2015-12-08", - "amount": 40 - }, - { - "piggy_bank_id": 3, - "date": "2016-01-09", - "amount": 40 - } - ], - "rule-groups": [ - { - "user_id": 1, - "order": 1, - "title": "Default rules", - "description": "All your rules not in a particular group." - } - ], - "rules": [ - { - "user_id": 1, - "rule_group_id": 1, - "order": 1, - "active": 1, - "stop_processing": 0, - "title": "Your first default rule", - "description": "This rule is an example. You can safely delete it." - } - ], - "rule-triggers": [ - { - "rule_id": 1, - "order": 1, - "active": 1, - "stop_processing": 0, - "trigger_type": "user_action", - "trigger_value": "store-journal" - }, - { - "rule_id": 1, - "order": 2, - "active": 1, - "stop_processing": 0, - "trigger_type": "description_is", - "trigger_value": "The Man Who Sold the World" - }, - { - "rule_id": 1, - "order": 3, - "active": 1, - "stop_processing": 0, - "trigger_type": "from_account_is", - "trigger_value": "David Bowie" - } - ], - "rule-actions": [ - { - "rule_id": 1, - "order": 1, - "active": 1, - "stop_processing": 0, - "action_type": "prepend_description", - "action_value": "Bought the world from " - }, - { - "rule_id": 1, - "order": 2, - "active": 1, - "stop_processing": 0, - "action_type": "set_category", - "action_value": "Large expenses" - } - ], - "tags": [ - { - "user_id": 1, - "tag": "TagJanuary", - "tagMode": "nothing", - "date": "2015-01-01" - }, - { - "user_id": 1, - "tag": "TagFebruary", - "tagMode": "nothing", - "date": "2015-02-02" - }, - { - "user_id": 1, - "tag": "TagMarch", - "tagMode": "nothing", - "date": "2015-03-03" - }, - { - "user_id": 1, - "tag": "TagApril", - "tagMode": "nothing", - "date": "2015-04-04" - }, - { - "user_id": 1, - "tag": "TagMay", - "tagMode": "nothing", - "date": "2015-05-05" - }, - { - "user_id": 1, - "tag": "TagJune", - "tagMode": "nothing", - "date": "2015-06-06" - }, - { - "user_id": 1, - "tag": "TagJuly", - "tagMode": "nothing", - "date": "2015-07-07" - }, - { - "user_id": 1, - "tag": "TagAugust", - "tagMode": "nothing", - "date": "2015-08-08" - }, - { - "user_id": 1, - "tag": "TagSeptember", - "tagMode": "nothing", - "date": "2015-09-09" - }, - { - "user_id": 1, - "tag": "TagOctober", - "tagMode": "nothing", - "date": "2015-10-10" - }, - { - "user_id": 1, - "tag": "TagNovember", - "tagMode": "nothing", - "date": "2015-11-11" - }, - { - "user_id": 1, - "tag": "TagDecember", - "tagMode": "nothing", - "date": "2015-12-12" - } - ], - "monthly-deposits": [ - { - "user_id": 1, - "day-of-month": 24, - "description": "Salary in :month", - "source_id": 30, - "destination_id": 1, - "min_amount": 1500, - "max_amount": 1700, - "category_id": 4 - } - ], - "monthly-transfers": [ - { - "user_id": 1, - "day-of-month": 28, - "description": "Saving money for :month", - "source_id": 1, - "destination_id": 3, - "min_amount": 150, - "max_amount": 150 - }, - { - "user_id": 1, - "day-of-month": 28, - "description": "Make up for test 1", - "source_id": 4, - "destination_id": 3, - "min_amount": 20, - "max_amount": 20 - } - ], - "monthly-withdrawals": [ - { - "user_id": 1, - "day-of-month": "02", - "description": "Rent for :month", - "source_id": 1, - "destination_id": 29, - "min_amount": 800, - "max_amount": 800, - "category_id": 5, - "budget_id": 2 - }, - { - "user_id": 1, - "day-of-month": "04", - "description": "Water bill :month", - "source_id": 1, - "destination_id": 8, - "min_amount": 8, - "max_amount": 12, - "category_id": 5, - "budget_id": 2 - }, - { - "user_id": 1, - "day-of-month": "06", - "description": "TV bill :month", - "source_id": 1, - "destination_id": 26, - "min_amount": 50, - "max_amount": 60, - "category_id": 5, - "budget_id": 2 - }, - { - "user_id": 1, - "day-of-month": "08", - "description": "Power bill :month", - "source_id": 1, - "destination_id": 24, - "min_amount": 75, - "max_amount": 90, - "category_id": 5, - "budget_id": 2 - }, - { - "user_id": 1, - "day-of-month": "07", - "description": "Bought gas", - "source_id": 1, - "destination_id": 17, - "min_amount": 40, - "max_amount": 50, - "category_id": 2, - "budget_id": 3 - }, - { - "user_id": 1, - "day-of-month": 17, - "description": "Filled the car up again", - "source_id": 1, - "destination_id": 17, - "min_amount": 40, - "max_amount": 50, - "category_id": 2, - "budget_id": 3 - }, - { - "user_id": 1, - "day-of-month": 27, - "description": "Needed gas again", - "source_id": 1, - "destination_id": 17, - "min_amount": 45, - "max_amount": 55, - "category_id": 2, - "budget_id": 3 - }, - { - "user_id": 1, - "day-of-month": "02", - "description": "Groceries", - "source_id": 1, - "destination_id": 9, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": "06", - "description": "Groceries", - "source_id": 1, - "destination_id": 10, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": "08", - "description": "Groceries", - "source_id": 1, - "destination_id": 11, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 11, - "description": "Groceries", - "source_id": 1, - "destination_id": 9, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 15, - "description": "Groceries", - "source_id": 1, - "destination_id": 10, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 19, - "description": "Groceries", - "source_id": 1, - "destination_id": 11, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 23, - "description": "Groceries", - "source_id": 1, - "destination_id": 9, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 26, - "description": "Groceries", - "source_id": 1, - "destination_id": 10, - "min_amount": 15, - "max_amount": 25, - "category_id": 1, - "budget_id": 1 - }, - { - "user_id": 1, - "day-of-month": 13, - "description": "Going out for drinks", - "source_id": 1, - "destination_id": 14, - "min_amount": 15, - "max_amount": 36, - "category_id": 6, - "budget_id": 6 - }, - { - "user_id": 1, - "day-of-month": 26, - "description": "Going out for drinks again", - "source_id": 1, - "destination_id": 14, - "min_amount": 15, - "max_amount": 36, - "category_id": 6, - "budget_id": 6 - }, - { - "user_id": 1, - "day-of-month": "02", - "description": "Test 1 without budget but balancing act.", - "source_id": 3, - "destination_id": 29, - "min_amount": 20, - "max_amount": 20, - "category_id": 5 - }, - { - "user_id": 1, - "day-of-month": "02", - "description": "Test 2 without budget but balancing act.", - "source_id": 3, - "destination_id": 29, - "min_amount": 30, - "max_amount": 30, - "category_id": 5 - } - ], - "attachments": [ - { - "attachable_id": 1, - "attachable_type": "FireflyIII\\Models\\TransactionJournal", - "user_id": 1, - "content": "This is attachment number one.", - "filename": "empty-file.txt", - "title": "Empty file", - "description": "This file is empty", - "notes": "Some notes", - "mime": "text\/plain", - "uploaded": 1 - }, - { - "attachable_id": 2, - "attachable_type": "FireflyIII\\Models\\TransactionJournal", - "user_id": 1, - "content": "This is attachment number two.", - "filename": "empty-file2.txt", - "title": "Empty file", - "description": "This file is empty", - "notes": "Some notes", - "mime": "text\/plain", - "uploaded": 1 - } - ], - "multi-withdrawals": [ - { - "user_id": 1, - "date": "2016-03-12", - "description": "Even multi-withdrawal (50, 50)", - "destination_ids": [ - 18, - 19 - ], - "source_id": 1, - "amounts": [ - 50, - 50 - ], - "category_ids": [ - 7, - 8, - 9 - ], - "budget_ids": [ - 7, - 8, - 9 - ] - }, - { - "user_id": 1, - "date": "2016-05-12", - "description": "Uneven multi-withdrawal (15,34,51)", - "destination_ids": [ - 18, - 19, - 20 - ], - "source_id": 1, - "amounts": [ - 14, - 35, - 51 - ], - "category_ids": [ - 7, - 8, - 9 - ], - "budget_ids": [ - 7, - 8, - 9 - ] - } - ], - "multi-deposits": [ - { - "user_id": 1, - "date": "2016-03-02", - "description": "Even multi-deposit (50, 50)", - "source_ids": [ - 35, - 36 - ], - "destination_id": 1, - "amounts": [ - 50, - 50 - ], - "category_ids": [ - 7, - 8, - 9 - ] - }, - { - "user_id": 1, - "date": "2016-05-02", - "description": "Uneven multi-deposit (15,34,51)", - "source_ids": [ - 35, - 36, - 37 - ], - "destination_id": 1, - "amounts": [ - 14, - 35, - 51 - ], - "category_ids": [ - 7, - 8, - 9 - ] - } - ], - "multi-transfers": [ - { - "user_id": 1, - "date": "2016-03-02", - "description": "Even multi-transfer (50, 50)", - "source_ids": [ - 4, - 4 - ], - "destination_ids": [ - 5, - 5 - ], - "amounts": [ - 50, - 50 - ], - "category_ids": [ - 7, - 8 - ] - }, - { - "user_id": 1, - "date": "2016-05-02", - "description": "Uneven multi-transfer (15,34,51)", - "source_ids": [ - 4, - 4, - 4 - ], - "destination_ids": [ - 5, - 5, - 5 - ], - "amounts": [ - 14, - 35, - 51 - ], - "category_ids": [ - 7, - 8, - 9 - ] - } - ], - "import-jobs": [ - { - "user_id": 1, - "key": "testImport", - "file_type": "csv", - "status": "settings_complete", - "extended_status": { - "steps_done": 0, - "total_steps": 0, - "errors": [], - "import_count": 0, - "importTag": 0 - }, - "configuration": { - "has-headers": false, - "date-format": "Ymd", - "delimiter": ",", - "import-account": 1, - "specifics": { - "RabobankDescription": 1 - }, - "column-count": 19, - "column-roles": [ - "account-iban", - "currency-code", - "date-interest", - "rabo-debet-credit", - "amount", - "opposing-iban", - "opposing-name", - "date-book", - "description", - "_ignore", - "description", - "description", - "description", - "description", - "description", - "description", - "sepa-ct-id", - "sepa-ct-op", - "sepa-db" - ], - "column-do-mapping": [ - true, - true, - false, - false, - false, - true, - true, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false, - false - ], - "column-roles-complete": false, - "column-mapping-config": { - "0": [], - "1": { - "EUR": 1 - }, - "5": [], - "6": [] - }, - "column-mapping-complete": false - } - }, - - { - "user_id": 1, - "key": "complete", - "file_type": "csv", - "status": "settings_complete", - "extended_status": { - "steps_done": 0, - "total_steps": 0, - "errors": [], - "import_count": 0, - "importTag": 0 - }, - "configuration": { - "has-headers": false, - "date-format": "Ymd", - "delimiter": ",", - "import-account": 1 - } - }, - { - "user_id": 1, - "key": "configure", - "file_type": "csv", - "status": "import_status_never_started", - "extended_status": { - "steps_done": 0, - "total_steps": 0, - "errors": [], - "import_count": 0, - "importTag": 0 - }, - "configuration": { - } - }, - { - "user_id": 1, - "key": "settings", - "file_type": "csv", - "status": "import_configuration_saved", - "extended_status": { - "steps_done": 0, - "total_steps": 0, - "errors": [], - "import_count": 0, - "importTag": 0 - }, - "configuration": { - } - }, - { - "user_id": 1, - "key": "p-settings", - "file_type": "csv", - "status": "import_configuration_saved", - "extended_status": { - "steps_done": 0, - "total_steps": 0, - "errors": [], - "import_count": 0, - "importTag": 0 - }, - "configuration": { - } - }, - { - "user_id": 1, - "key": "p-configure", - "file_type": "csv", - "status": "import_status_never_started", - "extended_status": { - "steps_done": 0, - "total_steps": 0, - "errors": [], - "import_count": 0, - "importTag": 0 - }, - "configuration": { - } - }, - { - "user_id": 1, - "key": "finished", - "file_type": "csv", - "status": "import_complete", - "extended_status": { - "steps_done": 0, - "total_steps": 0, - "errors": [], - "import_count": 0, - "importTag": 1 - }, - "configuration": { - } - } - ], - "export-jobs": [ - { - "user_id": 1, - "key": "testExport", - "status": "unknown" - } - ], - "currencies": [] -} \ No newline at end of file From 5b5acba81625e46c5d1bbd707d11a3ef8771922b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 24 Dec 2016 17:36:51 +0100 Subject: [PATCH 097/150] Clean up lots of models. --- app/Models/Account.php | 17 ++++++- app/Models/AccountMeta.php | 13 +++++- app/Models/AccountType.php | 12 +++++ app/Models/Attachment.php | 15 ++++++ app/Models/AvailableBudget.php | 18 +++++++- app/Models/Bill.php | 20 +++++++- app/Models/Budget.php | 24 ++++++++-- app/Models/BudgetLimit.php | 15 +++++- app/Models/Category.php | 24 ++++++++-- app/Models/Configuration.php | 11 +++++ app/Models/ExportJob.php | 9 ++++ app/Models/ImportJob.php | 13 ++++++ app/Models/LimitRepetition.php | 20 ++++++-- app/Models/Note.php | 12 ++++- app/Models/PiggyBank.php | 29 +++++++++--- app/Models/PiggyBankEvent.php | 11 +++++ app/Models/PiggyBankRepetition.php | 14 +++++- app/Models/Preference.php | 10 ++++ app/Models/Role.php | 11 +++++ app/Models/Rule.php | 17 +++++++ app/Models/RuleAction.php | 16 +++++++ app/Models/RuleGroup.php | 16 +++++++ app/Models/RuleTrigger.php | 16 +++++++ app/Models/Tag.php | 19 +++++++- app/Models/Transaction.php | 13 +++++- app/Models/TransactionCurrency.php | 15 ++++-- app/Models/TransactionGroup.php | 46 ------------------- app/Models/TransactionJournal.php | 29 ++++++++++-- app/Models/TransactionJournalMeta.php | 13 +++++- app/Models/TransactionType.php | 12 +++++ .../Account/AccountRepository.php | 5 +- 31 files changed, 427 insertions(+), 88 deletions(-) delete mode 100644 app/Models/TransactionGroup.php diff --git a/app/Models/Account.php b/app/Models/Account.php index bc06e9b665..2d07b89f37 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -36,12 +36,25 @@ class Account extends Model { use SoftDeletes, ValidatingTrait; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'active' => 'boolean', + 'encrypted' => 'boolean', + ]; /** @var array */ protected $dates = ['created_at', 'updated_at', 'deleted_at']; /** @var array */ protected $fillable = ['user_id', 'account_type_id', 'name', 'active', 'virtual_balance', 'iban']; /** @var array */ - protected $hidden = ['virtual_balance_encrypted', 'encrypted']; + protected $hidden = ['encrypted']; protected $rules = [ 'user_id' => 'required|exists:users,id', @@ -184,7 +197,7 @@ class Account extends Model public function getNameAttribute($value): string { - if (intval($this->encrypted) == 1) { + if ($this->encrypted) { return Crypt::decrypt($value); } diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php index d8c08233a5..797058c122 100644 --- a/app/Models/AccountMeta.php +++ b/app/Models/AccountMeta.php @@ -24,7 +24,18 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; class AccountMeta extends Model { - protected $dates = ['created_at', 'updated_at']; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + ]; + /** @var array */ + protected $dates = ['created_at', 'updated_at']; protected $fillable = ['account_id', 'name', 'data']; protected $table = 'account_meta'; diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 0bf346f471..3efa588ada 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -33,6 +33,18 @@ class AccountType extends Model const IMPORT = 'Import account'; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + ]; + + /** @var array */ protected $dates = ['created_at', 'updated_at']; // diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php index eff2095f78..84dfbfc106 100644 --- a/app/Models/Attachment.php +++ b/app/Models/Attachment.php @@ -29,6 +29,21 @@ class Attachment extends Model { use SoftDeletes; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'uploaded' => 'boolean', + ]; + /** @var array */ + protected $dates = ['created_at', 'updated_at', 'deleted_at']; + /** @var array */ protected $fillable = ['attachable_id', 'attachable_type', 'user_id', 'md5', 'filename', 'mime', 'title', 'notes', 'description', 'size', 'uploaded']; /** diff --git a/app/Models/AvailableBudget.php b/app/Models/AvailableBudget.php index 330cc0821f..c96893fbb9 100644 --- a/app/Models/AvailableBudget.php +++ b/app/Models/AvailableBudget.php @@ -27,10 +27,24 @@ class AvailableBudget extends Model { use SoftDeletes; /** @var array */ - protected $dates = ['created_at', 'updated_at', 'deleted_at', 'start_date', 'end_date']; - /** @var array */ protected $fillable = ['user_id', 'transaction_currency_id', 'amount', 'start_date', 'end_date']; + /** @var array */ + protected $dates = ['created_at', 'updated_at', 'deleted_at']; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'start_date' => 'date', + 'end_date' => 'date', + ]; + /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 7c6ca35924..a536caa18e 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -29,8 +29,26 @@ class Bill extends Model { use ValidatingTrait; + /** @var array */ + protected $dates = ['created_at', 'updated_at', 'deleted_at']; - protected $dates = ['created_at', 'updated_at', 'date']; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'date' => 'date', + 'skip' => 'int', + 'automatch' => 'boolean', + 'active' => 'boolean', + 'name_encrypted' => 'boolean', + 'match_encrypted' => 'boolean', + ]; protected $fillable = ['name', 'match', 'amount_min', 'match_encrypted', 'name_encrypted', 'user_id', 'amount_max', 'date', 'repeat_freq', 'skip', 'automatch', 'active',]; diff --git a/app/Models/Budget.php b/app/Models/Budget.php index 8d073fa561..6bca976677 100644 --- a/app/Models/Budget.php +++ b/app/Models/Budget.php @@ -30,7 +30,23 @@ class Budget extends Model use SoftDeletes, ValidatingTrait; - protected $dates = ['created_at', 'updated_at', 'deleted_at', 'startdate', 'enddate']; + /** @var array */ + protected $dates = ['created_at', 'updated_at', 'deleted_at']; + + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'active' => 'boolean', + 'encrypted' => 'boolean', + ]; + protected $fillable = ['user_id', 'name', 'active']; protected $hidden = ['encrypted']; protected $rules = ['name' => 'required|between:1,200',]; @@ -95,7 +111,7 @@ class Budget extends Model public function getNameAttribute($value) { - if (intval($this->encrypted) == 1) { + if ($this->encrypted) { return Crypt::decrypt($value); } @@ -115,8 +131,8 @@ class Budget extends Model */ public function setNameAttribute($value) { - $this->attributes['name'] = Crypt::encrypt($value); - $this->attributes['encrypted'] = true; + $this->attributes['name'] = $value; + $this->attributes['encrypted'] = false; } /** diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php index 86322743bd..622ad9bbc7 100644 --- a/app/Models/BudgetLimit.php +++ b/app/Models/BudgetLimit.php @@ -23,7 +23,20 @@ use Illuminate\Database\Eloquent\Model; class BudgetLimit extends Model { - protected $dates = ['created_at', 'updated_at', 'startdate']; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'startdate' => 'date', + 'repeats' => 'boolean', + ]; + /** @var array */ + protected $dates = ['created_at', 'updated_at']; protected $hidden = ['amount_encrypted']; /** diff --git a/app/Models/Category.php b/app/Models/Category.php index b80e03d1b7..c0db1259b8 100644 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -29,10 +29,26 @@ class Category extends Model { use SoftDeletes, ValidatingTrait; - protected $dates = ['created_at', 'updated_at', 'deleted_at']; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'encrypted' => 'boolean', + ]; + /** @var array */ protected $fillable = ['user_id', 'name']; + /** @var array */ protected $hidden = ['encrypted']; + /** @var array */ protected $rules = ['name' => 'required|between:1,200',]; + /** @var array */ + protected $dates = ['created_at', 'updated_at', 'deleted_at']; /** * @param array $fields @@ -86,7 +102,7 @@ class Category extends Model public function getNameAttribute($value) { - if (intval($this->encrypted) == 1) { + if ($this->encrypted) { return Crypt::decrypt($value); } @@ -99,8 +115,8 @@ class Category extends Model */ public function setNameAttribute($value) { - $this->attributes['name'] = Crypt::encrypt($value); - $this->attributes['encrypted'] = true; + $this->attributes['name'] = $value; + $this->attributes['encrypted'] = false; } /** diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php index 9bbee9e894..b5edf6aced 100644 --- a/app/Models/Configuration.php +++ b/app/Models/Configuration.php @@ -25,6 +25,17 @@ class Configuration extends Model { use SoftDeletes; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + ]; + /** @var array */ protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $table = 'configuration'; diff --git a/app/Models/ExportJob.php b/app/Models/ExportJob.php index 9a3807c728..a0eb58cfed 100644 --- a/app/Models/ExportJob.php +++ b/app/Models/ExportJob.php @@ -23,6 +23,15 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; */ class ExportJob extends Model { + /** @var array */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + ]; + /** @var array */ + protected $dates = ['created_at', 'updated_at']; + /** * @param $value * diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index 01094638e4..b8a7bd27c3 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -27,6 +27,19 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class ImportJob extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + ]; + /** @var array */ + protected $dates = ['created_at', 'updated_at']; + protected $validStatus = [ 'import_status_never_started', // initial state diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php index be87b5accf..9c76eab93f 100644 --- a/app/Models/LimitRepetition.php +++ b/app/Models/LimitRepetition.php @@ -26,6 +26,18 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class LimitRepetition extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'startdate' => 'date', + 'enddate' => 'date', + ]; protected $dates = ['created_at', 'updated_at', 'startdate', 'enddate']; protected $hidden = ['amount_encrypted']; @@ -38,10 +50,10 @@ class LimitRepetition extends Model { if (auth()->check()) { $object = self::where('limit_repetitions.id', $value) - ->leftJoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id') - ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') - ->where('budgets.user_id', auth()->user()->id) - ->first(['limit_repetitions.*']); + ->leftJoin('budget_limits', 'budget_limits.id', '=', 'limit_repetitions.budget_limit_id') + ->leftJoin('budgets', 'budgets.id', '=', 'budget_limits.budget_id') + ->where('budgets.user_id', auth()->user()->id) + ->first(['limit_repetitions.*']); if ($object) { return $object; } diff --git a/app/Models/Note.php b/app/Models/Note.php index 1465008ecf..58600a8073 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -23,10 +23,20 @@ use League\CommonMark\CommonMarkConverter; */ class Note extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + ]; protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $fillable = ['title', 'text']; - /** * @return string */ diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index 2e3f1f01b0..e9b6b4a980 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -29,10 +29,25 @@ class PiggyBank extends Model { use SoftDeletes; - protected $dates = ['created_at', 'updated_at', 'deleted_at', 'startdate', 'targetdate']; - protected $fillable - = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate']; - protected $hidden = ['targetamount_encrypted', 'encrypted']; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'startdate' => 'date', + 'targetdate' => 'date', + 'order' => 'int', + 'active' => 'boolean', + 'encrypted' => 'boolean', + ]; + protected $dates = ['created_at', 'updated_at', 'deleted_at', 'startdate', 'targetdate']; + protected $fillable = ['name', 'account_id', 'order', 'targetamount', 'startdate', 'targetdate']; + protected $hidden = ['targetamount_encrypted', 'encrypted']; /** * @param PiggyBank $value @@ -86,7 +101,7 @@ class PiggyBank extends Model public function getNameAttribute($value) { - if (intval($this->encrypted) == 1) { + if ($this->encrypted) { return Crypt::decrypt($value); } @@ -144,8 +159,8 @@ class PiggyBank extends Model */ public function setNameAttribute($value) { - $this->attributes['name'] = Crypt::encrypt($value); - $this->attributes['encrypted'] = true; + $this->attributes['name'] = $value; + $this->attributes['encrypted'] = false; } /** diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php index ac11ec0d70..be731402ab 100644 --- a/app/Models/PiggyBankEvent.php +++ b/app/Models/PiggyBankEvent.php @@ -23,6 +23,17 @@ use Illuminate\Database\Eloquent\Model; class PiggyBankEvent extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'date' => 'date', + ]; protected $dates = ['created_at', 'updated_at', 'date']; protected $fillable = ['piggy_bank_id', 'transaction_journal_id', 'date', 'amount']; protected $hidden = ['amount_encrypted']; diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index cc1432e31b..8b048879df 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -25,9 +25,21 @@ use Illuminate\Database\Eloquent\Model; class PiggyBankRepetition extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'startdate' => 'date', + 'targetdate' => 'date', + ]; protected $dates = ['created_at', 'updated_at', 'startdate', 'targetdate']; protected $fillable = ['piggy_bank_id', 'startdate', 'targetdate', 'currentamount']; - protected $hidden = ['currentamount_encrypted']; /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 10f38ddd2d..5ec7b943ad 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -27,6 +27,16 @@ use Log; class Preference extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + ]; protected $dates = ['created_at', 'updated_at']; protected $fillable = ['user_id', 'data', 'name', 'data']; diff --git a/app/Models/Role.php b/app/Models/Role.php index 23584fd274..5f1a7c33e9 100644 --- a/app/Models/Role.php +++ b/app/Models/Role.php @@ -23,6 +23,17 @@ use Illuminate\Database\Eloquent\Relations\BelongsToMany; */ class Role extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + ]; + protected $dates = ['created_at', 'updated_at']; /** * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany diff --git a/app/Models/Rule.php b/app/Models/Rule.php index 09f8897326..ad3db4309c 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -26,6 +26,23 @@ class Rule extends Model { use SoftDeletes; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'active' => 'boolean', + 'order' => 'int', + 'stop_processing' => 'boolean', + ]; + /** @var array */ + protected $dates = ['created_at', 'updated_at', 'deleted_at']; + /** * @param Rule $value * diff --git a/app/Models/RuleAction.php b/app/Models/RuleAction.php index 6a5cc3a45b..8817a108dc 100644 --- a/app/Models/RuleAction.php +++ b/app/Models/RuleAction.php @@ -22,6 +22,22 @@ use Illuminate\Database\Eloquent\Model; */ class RuleAction extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'active' => 'boolean', + 'order' => 'int', + 'stop_processing' => 'boolean', + ]; + /** @var array */ + protected $dates = ['created_at', 'updated_at']; + /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index f3dc6abd20..b4be42a160 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -25,6 +25,22 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; class RuleGroup extends Model { use SoftDeletes; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'active' => 'boolean', + 'order' => 'int', + ]; + /** @var array */ + protected $dates = ['created_at', 'updated_at', 'deleted_at']; + protected $fillable = ['user_id', 'order', 'title', 'description', 'active']; diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index 72fe0f76a4..048d1c94fc 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -22,6 +22,22 @@ use Illuminate\Database\Eloquent\Model; */ class RuleTrigger extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'active' => 'boolean', + 'order' => 'int', + 'stop_processing' => 'boolean', + ]; + /** @var array */ + protected $dates = ['created_at', 'updated_at']; + /** * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 6912a47582..769ea2c5af 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -15,6 +15,7 @@ namespace FireflyIII\Models; use Crypt; use FireflyIII\Support\Models\TagSupport; +use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Watson\Validating\ValidatingTrait; @@ -25,11 +26,25 @@ use Watson\Validating\ValidatingTrait; */ class Tag extends TagSupport { - protected $dates = ['created_at', 'updated_at', 'date']; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'date' => 'date', + 'zoomLevel' => 'int', + + ]; + protected $dates = ['created_at', 'updated_at', 'date', 'deleted_at']; protected $fillable = ['user_id', 'tag', 'date', 'description', 'longitude', 'latitude', 'zoomLevel', 'tagMode']; protected $rules = ['tag' => 'required|between:1,200',]; - use ValidatingTrait; + use ValidatingTrait, SoftDeletes; /** * @param array $fields diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 6a93196cfb..cf6a061c74 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -27,6 +27,18 @@ use Watson\Validating\ValidatingTrait; class Transaction extends Model { + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'identifier' => 'int', + ]; protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount', 'identifier']; protected $hidden = ['encrypted']; @@ -37,7 +49,6 @@ class Transaction extends Model 'description' => 'between:0,1024', 'amount' => 'required|numeric', ]; - use SoftDeletes, ValidatingTrait; /** diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index 3e48b6c1d4..aded707d80 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -27,11 +27,20 @@ class TransactionCurrency extends Model { use SoftDeletes, ValidatingTrait; - - protected $dates = ['created_at', 'updated_at', 'deleted_at']; + protected $dates = ['created_at', 'updated_at', 'deleted_at','date']; protected $fillable = ['name', 'code', 'symbol']; protected $rules = ['name' => 'required|between:1,200', 'code' => 'required|between:3,3', 'symbol' => 'required|between:1,12']; - + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + ]; /** * @param TransactionCurrency $currency * diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php deleted file mode 100644 index 46ff2d6e2c..0000000000 --- a/app/Models/TransactionGroup.php +++ /dev/null @@ -1,46 +0,0 @@ -belongsToMany('FireflyIII\Models\TransactionJournal'); - } - - /** - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo - */ - public function user() - { - return $this->belongsTo('FireflyIII\User'); - } - -} diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 56773f7b5c..1cf5faf17f 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -34,6 +34,25 @@ class TransactionJournal extends TransactionJournalSupport { use SoftDeletes, ValidatingTrait; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'date' => 'date', + 'interest_date' => 'date', + 'book_date' => 'date', + 'process_date' => 'date', + 'order' => 'int', + 'tag_count' => 'int', + 'encrypted' => 'boolean', + 'completed' => 'boolean', + ]; /** @var array */ protected $dates = ['created_at', 'updated_at', 'date', 'deleted_at', 'interest_date', 'book_date', 'process_date']; /** @var array */ @@ -65,9 +84,9 @@ class TransactionJournal extends TransactionJournalSupport { if (auth()->check()) { $object = self::where('transaction_journals.id', $value) - ->with('transactionType') - ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') - ->where('user_id', auth()->user()->id)->first(['transaction_journals.*']); + ->with('transactionType') + ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') + ->where('user_id', auth()->user()->id)->first(['transaction_journals.*']); if (!is_null($object)) { return $object; } @@ -352,8 +371,8 @@ class TransactionJournal extends TransactionJournalSupport */ public function setDescriptionAttribute($value) { - $this->attributes['description'] = Crypt::encrypt($value); - $this->attributes['encrypted'] = true; + $this->attributes['description'] = $value; + $this->attributes['encrypted'] = false; } /** diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 2f57d9ad27..6d54430a47 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -26,7 +26,18 @@ class TransactionJournalMeta extends Model { use SoftDeletes; - protected $dates = ['created_at', 'updated_at']; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + ]; + protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $fillable = ['transaction_journal_id', 'name', 'data', 'hash']; protected $table = 'journal_meta'; diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index 9d0e6af288..aceffbd8fb 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -31,6 +31,18 @@ class TransactionType extends Model const TRANSFER = 'Transfer'; const OPENING_BALANCE = 'Opening balance'; + /** + * The attributes that should be casted to native types. + * + * @var array + */ + protected $casts + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + ]; + protected $dates = ['created_at', 'updated_at', 'deleted_at']; /** diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index b3c916e49b..ab2cc761bd 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -343,7 +343,9 @@ class AccountRepository implements AccountRepositoryInterface $account->save(); $this->updateMetadata($account, $data); - $this->updateInitialBalance($account, $data); + if ($this->validOpeningBalanceData($data)) { + $this->updateInitialBalance($account, $data); + } return $account; } @@ -448,7 +450,6 @@ class AccountRepository implements AccountRepositoryInterface 'description' => 'Initial balance for "' . $account->name . '"', 'completed' => true, 'date' => $data['openingBalanceDate'], - 'encrypted' => true, ] ); Log::debug(sprintf('Created new opening balance journal: #%d', $journal->id)); From f2f9f8fbab34a2ff4672ff8df593c69125a6dd91 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 11:50:42 +0100 Subject: [PATCH 098/150] Various bug fixes and extensions to test routine. --- .travis.yml | 2 -- app/Console/Commands/VerifyDatabase.php | 10 +++++----- app/Helpers/Collector/JournalCollector.php | 9 ++++++--- app/Models/Transaction.php | 12 +++++++----- test.sh | 10 ++++++---- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index a8f360bfff..3bc855b12c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,8 +11,6 @@ install: - php artisan clear-compiled - php artisan optimize - php artisan env - - ./test.sh -r - - php artisan env script: - phpunit \ No newline at end of file diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index 1d295abf0f..47b40ca69f 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -124,16 +124,16 @@ class VerifyDatabase extends Command { $set = Budget::leftJoin('budget_limits', 'budget_limits.budget_id', '=', 'budgets.id') ->leftJoin('users', 'budgets.user_id', '=', 'users.id') - ->groupBy(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']) + ->groupBy(['budgets.id', 'budgets.name', 'budgets.encrypted', 'budgets.user_id', 'users.email']) ->whereNull('budget_limits.id') - ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'users.email']); + ->get(['budgets.id', 'budgets.name', 'budgets.user_id', 'budgets.encrypted', 'users.email']); - /** @var stdClass $entry */ + /** @var Budget $entry */ foreach ($set as $entry) { - + $name = $entry->encrypted ? Crypt::decrypt($entry->name) : $entry->name; $line = sprintf( 'Notice: User #%d (%s) has budget #%d ("%s") which has no budget limits.', - $entry->user_id, $entry->email, $entry->id, Crypt::decrypt($entry->name) + $entry->user_id, $entry->email, $entry->id, $name ); $this->line($line); } diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 601e593d12..c874c9949e 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -60,6 +60,7 @@ class JournalCollector implements JournalCollectorInterface 'transaction_types.type as transaction_type_type', 'transaction_journals.bill_id', 'bills.name as bill_name', + 'bills.name_encrypted as bill_name_encrypted', 'transactions.id as id', 'transactions.amount as transaction_amount', 'transactions.description as transaction_description', @@ -180,10 +181,12 @@ class JournalCollector implements JournalCollectorInterface $set->each( function (Transaction $transaction) { $transaction->date = new Carbon($transaction->date); - $transaction->description = intval($transaction->encrypted) === 1 ? Crypt::decrypt($transaction->description) : $transaction->description; - $transaction->bill_name = !is_null($transaction->bill_name) ? Crypt::decrypt($transaction->bill_name) : ''; + $transaction->description = $transaction->encrypted ? Crypt::decrypt($transaction->description) : $transaction->description; + + if (!is_null($transaction->bill_name)) { + $transaction->bill_name = $transaction->bill_name_encrypted ? Crypt::decrypt($transaction->bill_name) : $transaction->bill_name; + } - // optionally decrypted: try { $transaction->opposing_account_name = Crypt::decrypt($transaction->opposing_account_name); } catch (DecryptException $e) { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index cf6a061c74..5b5036d7a0 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -33,11 +33,13 @@ class Transaction extends Model * @var array */ protected $casts - = [ - 'created_at' => 'date', - 'updated_at' => 'date', - 'deleted_at' => 'date', - 'identifier' => 'int', + = [ + 'created_at' => 'date', + 'updated_at' => 'date', + 'deleted_at' => 'date', + 'identifier' => 'int', + 'encrypted' => 'boolean', // model does not have these fields though + 'bill_name_encrypted' => 'boolean', ]; protected $dates = ['created_at', 'updated_at', 'deleted_at']; protected $fillable = ['account_id', 'transaction_journal_id', 'description', 'amount', 'identifier']; diff --git a/test.sh b/test.sh index 6e6e8065c7..befdb1c714 100755 --- a/test.sh +++ b/test.sh @@ -7,7 +7,7 @@ BACKUPENV=./.env.current TESTINGENV=./.env.testing # do something with flags: -resetestflag='' +resetTestFlag='' testflag='' coverageflag='' acceptancetestclass='' @@ -17,7 +17,7 @@ testsuite='' while getopts 'vcrta:s:' flag; do case "${flag}" in r) - resetestflag='true' + resetTestFlag='true' ;; t) testflag='true' @@ -55,7 +55,7 @@ cp $TESTINGENV $ORIGINALENV php artisan cache:clear # reset database (optional) -if [[ $resetestflag == "true" ]] +if [[ $resetTestFlag == "true" ]] then echo "Must reset database" @@ -69,12 +69,14 @@ then # run migration php artisan migrate:refresh --seed + # call test data generation script + $(which php) /sites/FF3/test-data/artisan generate:data testing sqlite # copy new database over backup (resets backup) cp $DATABASE $DATABASECOPY fi # do not reset database (optional) -if [[ $resetestflag == "" ]] +if [[ $resetTestFlag == "" ]] then echo "Will not reset database" fi From b78776e1f7d737adfdde26bcd81cc512ffafa2d1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 11:52:01 +0100 Subject: [PATCH 099/150] =?UTF-8?q?This=20generates=20a=20lot=20of=20loggi?= =?UTF-8?q?ng,=20let=E2=80=99s=20remove=20it.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Support/CacheProperties.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Support/CacheProperties.php b/app/Support/CacheProperties.php index 105115f959..b8e493d134 100644 --- a/app/Support/CacheProperties.php +++ b/app/Support/CacheProperties.php @@ -76,8 +76,6 @@ class CacheProperties public function has(): bool { if (getenv('APP_ENV') == 'testing') { - Log::debug('APP_ENV is testing, cache disabled.'); - return false; } $this->md5(); From 9ca75d134ed8b467b5e1d46dbaff2b875c43bf5c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 12:03:21 +0100 Subject: [PATCH 100/150] This is the test database required to run the tests. --- storage/database/databasecopy.sqlite | Bin 0 -> 295936 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 storage/database/databasecopy.sqlite diff --git a/storage/database/databasecopy.sqlite b/storage/database/databasecopy.sqlite new file mode 100644 index 0000000000000000000000000000000000000000..41f250808b831a6eb5f5fa0499aaf81b57e15b09 GIT binary patch literal 295936 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 Date: Sun, 25 Dec 2016 12:06:17 +0100 Subject: [PATCH 101/150] Make sure database is present in tests. --- .travis.yml | 3 ++- storage/database/.gitignore | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3bc855b12c..bcba948aa5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,13 @@ php: install: - phpenv config-rm xdebug.ini - - composer selfupdate - rm composer.lock - composer update --no-scripts - php artisan clear-compiled - php artisan optimize - php artisan env + - cp .env.testing .env + - mv storage/database/databasecopy.sqlite storage/database/database.sqlite script: - phpunit \ No newline at end of file diff --git a/storage/database/.gitignore b/storage/database/.gitignore index 2f8355d95c..5382885af6 100644 --- a/storage/database/.gitignore +++ b/storage/database/.gitignore @@ -1,3 +1,3 @@ * !.gitignore -!seed.*.json \ No newline at end of file +!databasecopy.sqlite \ No newline at end of file From 7894f1871eace072a22a80e481828f5166c5b65a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 12:23:36 +0100 Subject: [PATCH 102/150] Make sure the attachment tests work. --- app/Http/Controllers/AttachmentController.php | 14 +++----- .../Attachment/AttachmentRepository.php | 34 +++++++++++++++++++ .../AttachmentRepositoryInterface.php | 14 ++++++++ .../Controllers/AttachmentControllerTest.php | 4 +++ 4 files changed, 57 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/AttachmentController.php b/app/Http/Controllers/AttachmentController.php index 126a689b3d..8cf513f267 100644 --- a/app/Http/Controllers/AttachmentController.php +++ b/app/Http/Controllers/AttachmentController.php @@ -95,16 +95,12 @@ class AttachmentController extends Controller * @throws FireflyException * */ - public function download(Attachment $attachment) + public function download(AttachmentRepositoryInterface $repository, Attachment $attachment) { - // create a disk. - $disk = Storage::disk('upload'); - $file = $attachment->fileName(); - - if ($disk->exists($file)) { - + if ($repository->exists($attachment)) { + $content = $repository->getContent($attachment); $quoted = sprintf('"%s"', addcslashes(basename($attachment->filename), '"\\')); - $content = Crypt::decrypt($disk->get($file)); + Log::debug('Send file to user', ['file' => $quoted, 'size' => strlen($content)]); @@ -118,8 +114,8 @@ class AttachmentController extends Controller ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') ->header('Pragma', 'public') ->header('Content-Length', strlen($content)); - } + throw new FireflyException('Could not find the indicated attachment. The file is no longer there.'); } diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 065b5c0167..b1e7bbbe78 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -18,6 +18,7 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Models\Attachment; use FireflyIII\User; use Illuminate\Support\Collection; +use Storage; /** * Class AttachmentRepository @@ -56,6 +57,19 @@ class AttachmentRepository implements AttachmentRepositoryInterface return true; } + /** + * @param Attachment $attachment + * + * @return bool + */ + public function exists(Attachment $attachment): bool + { + /** @var Storage $disk */ + $disk = Storage::disk('upload'); + + return $disk->exists($attachment->fileName()); + } + /** * @return Collection */ @@ -82,6 +96,26 @@ class AttachmentRepository implements AttachmentRepositoryInterface return $query; } + /** + * @param Attachment $attachment + * + * @return string + */ + public function getContent(Attachment $attachment): string + { + // create a disk. + $disk = Storage::disk('upload'); + $file = $attachment->fileName(); + + if ($disk->exists($file)) { + $content = Crypt::decrypt($disk->get($file)); + + return $content; + } + + return ''; + } + /** * @param Attachment $attachment * @param array $data diff --git a/app/Repositories/Attachment/AttachmentRepositoryInterface.php b/app/Repositories/Attachment/AttachmentRepositoryInterface.php index 912dc67190..733e3bd59f 100644 --- a/app/Repositories/Attachment/AttachmentRepositoryInterface.php +++ b/app/Repositories/Attachment/AttachmentRepositoryInterface.php @@ -37,6 +37,20 @@ interface AttachmentRepositoryInterface */ public function get(): Collection; + /** + * @param Attachment $attachment + * + * @return bool + */ + public function exists(Attachment $attachment): bool; + + /** + * @param Attachment $attachment + * + * @return string + */ + public function getContent(Attachment $attachment): string; + /** * @param Carbon $start * @param Carbon $end diff --git a/tests/acceptance/Controllers/AttachmentControllerTest.php b/tests/acceptance/Controllers/AttachmentControllerTest.php index 6f96cf8db5..be401ef04d 100644 --- a/tests/acceptance/Controllers/AttachmentControllerTest.php +++ b/tests/acceptance/Controllers/AttachmentControllerTest.php @@ -58,6 +58,10 @@ class AttachmentControllerTest extends TestCase */ public function testDownload() { + $repository = $this->mock(AttachmentRepositoryInterface::class); + $repository->shouldReceive('exists')->once()->andReturn(true); + $repository->shouldReceive('getContent')->once()->andReturn('This is attachment number one.'); + $this->be($this->user()); $this->call('GET', route('attachments.download', [1])); $this->assertResponseStatus(200); From eefd6141a1508134f5b0bb54e04e88f2425f224b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 12:31:05 +0100 Subject: [PATCH 103/150] Translated --- resources/lang/nl_NL/firefly.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 8324a8e7fc..2be548f108 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -93,9 +93,9 @@ return [ 'cannot_redirect_to_account' => 'Firefly III kan je niet naar de goede pagina doorsturen. Sorry!', 'sum_of_expenses' => 'Som van uitgaven', 'sum_of_income' => 'Som van inkomsten', - 'spent_in_specific_budget' => 'Spent in budget ":budget"', - 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', - 'left_in_budget_limit' => 'Left to spend according to budgeting', + 'spent_in_specific_budget' => 'Uitgegeven in budget ":budget"', + 'sum_of_expenses_in_budget' => 'Totaal uitgegeven in budget ":budget"', + 'left_in_budget_limit' => 'Nog uit te geven volgens budgettering', // repeat frequencies: 'repeat_freq_yearly' => 'jaarlijks', From 82718a74dc3ce9e1c3473e0202fd1e1678c48801 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 12:55:22 +0100 Subject: [PATCH 104/150] Fix tests --- app/Http/Controllers/ExportController.php | 12 ++++--- app/Http/Controllers/ImportController.php | 10 +++--- app/Import/ImportProcedure.php | 2 +- app/Import/ImportProcedureInterface.php | 33 +++++++++++++++++++ app/Providers/FireflyServiceProvider.php | 12 ++----- .../ExportJob/ExportJobRepository.php | 27 +++++++++++++++ .../ExportJobRepositoryInterface.php | 14 ++++++++ .../Controllers/ExportControllerTest.php | 6 +++- .../Controllers/ImportControllerTest.php | 9 +++-- 9 files changed, 101 insertions(+), 24 deletions(-) create mode 100644 app/Import/ImportProcedureInterface.php diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index ef293cf7b7..f081736c93 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -22,6 +22,7 @@ use FireflyIII\Http\Requests\ExportFormRequest; use FireflyIII\Models\AccountType; use FireflyIII\Models\ExportJob; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface as EJRI; use Preferences; use Response; @@ -59,21 +60,22 @@ class ExportController extends Controller * @return \Symfony\Component\HttpFoundation\Response|\Illuminate\Contracts\Routing\ResponseFactory * @throws FireflyException */ - public function download(ExportJob $job) + public function download(ExportJobRepositoryInterface $repository, ExportJob $job) { - $disk = Storage::disk('export'); $file = $job->key . '.zip'; $date = date('Y-m-d \a\t H-i-s'); $name = 'Export job on ' . $date . '.zip'; $quoted = sprintf('"%s"', addcslashes($name, '"\\')); - if (!$disk->exists($file)) { + if (!$repository->exists($job)) { throw new FireflyException('Against all expectations, zip file "' . $file . '" does not exist.'); } + $content = $repository->getContent($job); + $job->change('export_downloaded'); - return response($disk->get($file), 200) + return response($content, 200) ->header('Content-Description', 'File Transfer') ->header('Content-Type', 'application/octet-stream') ->header('Content-Disposition', 'attachment; filename=' . $quoted) @@ -82,7 +84,7 @@ class ExportController extends Controller ->header('Expires', '0') ->header('Cache-Control', 'must-revalidate, post-check=0, pre-check=0') ->header('Pragma', 'public') - ->header('Content-Length', $disk->size($file)); + ->header('Content-Length', strlen($content)); } diff --git a/app/Http/Controllers/ImportController.php b/app/Http/Controllers/ImportController.php index 270afe99d1..7c19bde59e 100644 --- a/app/Http/Controllers/ImportController.php +++ b/app/Http/Controllers/ImportController.php @@ -15,7 +15,7 @@ namespace FireflyIII\Http\Controllers; use Crypt; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Requests\ImportUploadRequest; -use FireflyIII\Import\ImportProcedure; +use FireflyIII\Import\ImportProcedureInterface; use FireflyIII\Import\Setup\SetupInterface; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; @@ -315,13 +315,13 @@ class ImportController extends Controller } /** - * @param ImportJob $job + * @param ImportProcedureInterface $importProcedure + * @param ImportJob $job */ - public function start(ImportJob $job) + public function start(ImportProcedureInterface $importProcedure, ImportJob $job) { set_time_limit(0); if ($job->status == 'settings_complete') { - $importProcedure = new ImportProcedure; $importProcedure->runImport($job); } } @@ -334,7 +334,7 @@ class ImportController extends Controller * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|View */ public function status(ImportJob $job) - { + { // Log::debug('Now in status()', ['job' => $job->key]); if (!$this->jobInCorrectStep($job, 'status')) { return $this->redirectToCorrectStep($job); diff --git a/app/Import/ImportProcedure.php b/app/Import/ImportProcedure.php index dd3878a01b..c535d47fae 100644 --- a/app/Import/ImportProcedure.php +++ b/app/Import/ImportProcedure.php @@ -23,7 +23,7 @@ use Illuminate\Support\Collection; * * @package FireflyIII\Import */ -class ImportProcedure +class ImportProcedure implements ImportProcedureInterface { /** diff --git a/app/Import/ImportProcedureInterface.php b/app/Import/ImportProcedureInterface.php new file mode 100644 index 0000000000..72765aa4ce --- /dev/null +++ b/app/Import/ImportProcedureInterface.php @@ -0,0 +1,33 @@ +app->bind('FireflyIII\Export\ProcessorInterface', 'FireflyIII\Export\Processor'); + $this->app->bind('FireflyIII\Import\ImportProcedureInterface', 'FireflyIII\Import\ImportProcedure'); $this->app->bind('FireflyIII\Repositories\User\UserRepositoryInterface', 'FireflyIII\Repositories\User\UserRepository'); $this->app->bind('FireflyIII\Helpers\Attachments\AttachmentHelperInterface', 'FireflyIII\Helpers\Attachments\AttachmentHelper'); - $this->app->bind('FireflyIII\Generator\Chart\Bill\BillChartGeneratorInterface', 'FireflyIII\Generator\Chart\Bill\ChartJsBillChartGenerator'); - $this->app->bind('FireflyIII\Generator\Chart\Budget\BudgetChartGeneratorInterface', 'FireflyIII\Generator\Chart\Budget\ChartJsBudgetChartGenerator'); - $this->app->bind( - 'FireflyIII\Generator\Chart\Category\CategoryChartGeneratorInterface', 'FireflyIII\Generator\Chart\Category\ChartJsCategoryChartGenerator' - ); - $this->app->bind( - 'FireflyIII\Generator\Chart\PiggyBank\PiggyBankChartGeneratorInterface', 'FireflyIII\Generator\Chart\PiggyBank\ChartJsPiggyBankChartGenerator' - ); - $this->app->bind('FireflyIII\Generator\Chart\Report\ReportChartGeneratorInterface', 'FireflyIII\Generator\Chart\Report\ChartJsReportChartGenerator'); + $this->app->bind('FireflyIII\Helpers\Help\HelpInterface', 'FireflyIII\Helpers\Help\Help'); $this->app->bind('FireflyIII\Helpers\Report\ReportHelperInterface', 'FireflyIII\Helpers\Report\ReportHelper'); $this->app->bind('FireflyIII\Helpers\FiscalHelperInterface', 'FireflyIII\Helpers\FiscalHelper'); - $this->app->bind('FireflyIII\Helpers\Report\AccountReportHelperInterface', 'FireflyIII\Helpers\Report\AccountReportHelper'); $this->app->bind('FireflyIII\Helpers\Report\BalanceReportHelperInterface', 'FireflyIII\Helpers\Report\BalanceReportHelper'); $this->app->bind('FireflyIII\Helpers\Report\BudgetReportHelperInterface', 'FireflyIII\Helpers\Report\BudgetReportHelper'); } diff --git a/app/Repositories/ExportJob/ExportJobRepository.php b/app/Repositories/ExportJob/ExportJobRepository.php index 1aae76d43e..acb8999786 100644 --- a/app/Repositories/ExportJob/ExportJobRepository.php +++ b/app/Repositories/ExportJob/ExportJobRepository.php @@ -17,6 +17,7 @@ use Carbon\Carbon; use FireflyIII\Models\ExportJob; use FireflyIII\User; use Illuminate\Support\Str; +use Storage; /** * Class ExportJobRepository @@ -94,6 +95,19 @@ class ExportJobRepository implements ExportJobRepositoryInterface } + /** + * @param ExportJob $job + * + * @return bool + */ + public function exists(ExportJob $job): bool + { + $disk = Storage::disk('export'); + $file = $job->key . '.zip'; + + return $disk->exists($file); + } + /** * @param string $key * @@ -109,4 +123,17 @@ class ExportJobRepository implements ExportJobRepositoryInterface return $result; } + /** + * @param ExportJob $job + * + * @return string + */ + public function getContent(ExportJob $job): string + { + $disk = Storage::disk('export'); + $file = $job->key . '.zip'; + $content = $disk->get($file); + + return $content; + } } diff --git a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php index c9d6167873..650aac15a6 100644 --- a/app/Repositories/ExportJob/ExportJobRepositoryInterface.php +++ b/app/Repositories/ExportJob/ExportJobRepositoryInterface.php @@ -32,6 +32,13 @@ interface ExportJobRepositoryInterface */ public function create(): ExportJob; + /** + * @param ExportJob $job + * + * @return bool + */ + public function exists(ExportJob $job): bool; + /** * @param string $key * @@ -39,4 +46,11 @@ interface ExportJobRepositoryInterface */ public function findByKey(string $key): ExportJob; + /** + * @param ExportJob $job + * + * @return string + */ + public function getContent(ExportJob $job): string; + } diff --git a/tests/acceptance/Controllers/ExportControllerTest.php b/tests/acceptance/Controllers/ExportControllerTest.php index 97c6fa9325..ee94794c22 100644 --- a/tests/acceptance/Controllers/ExportControllerTest.php +++ b/tests/acceptance/Controllers/ExportControllerTest.php @@ -9,7 +9,7 @@ * See the LICENSE file for details. */ use FireflyIII\Export\Processor; - +use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; /** * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:41. @@ -32,6 +32,10 @@ class ExportControllerTest extends TestCase */ public function testDownload() { + $repository = $this->mock(ExportJobRepositoryInterface::class); + $repository->shouldReceive('exists')->once()->andReturn(true); + $repository->shouldReceive('getContent')->once()->andReturn('Some content beep boop'); + $this->be($this->user()); $this->call('GET', route('export.download', ['testExport'])); $this->assertResponseStatus(200); diff --git a/tests/acceptance/Controllers/ImportControllerTest.php b/tests/acceptance/Controllers/ImportControllerTest.php index bec5fc7dd9..4c4c4dda3d 100644 --- a/tests/acceptance/Controllers/ImportControllerTest.php +++ b/tests/acceptance/Controllers/ImportControllerTest.php @@ -10,7 +10,7 @@ */ use FireflyIII\Import\Setup\CsvSetup; use Illuminate\Http\UploadedFile; - +use FireflyIII\Import\ImportProcedureInterface; /** * Generated by PHPUnit_SkeletonGenerator on 2016-12-10 at 05:51:41. @@ -142,6 +142,11 @@ class ImportControllerTest extends TestCase */ public function testStart() { + /** @var ImportProcedureInterface $procedure */ + $procedure = $this->mock(ImportProcedureInterface::class); + + $procedure->shouldReceive('runImport'); + $this->be($this->user()); $this->call('post', route('import.start', ['complete'])); $this->assertResponseStatus(200); @@ -156,7 +161,7 @@ class ImportControllerTest extends TestCase // complete $this->be($this->user()); $this->call('get', route('import.status', ['complete'])); - $this->assertResponseStatus(302); + $this->assertResponseStatus(200); } /** From bce4e7e2bf0eb882dfdfd4a0d67f1a280b4f6243 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:09:29 +0100 Subject: [PATCH 105/150] Add restrictions for demo accounts. --- app/Http/Controllers/ProfileController.php | 24 ++++++++++++++++++++++ resources/lang/en_US/firefly.php | 2 ++ 2 files changed, 26 insertions(+) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 3399c84644..30b0553d0b 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -51,6 +51,12 @@ class ProfileController extends Controller */ public function changePassword() { + if (auth()->user()->hasRole('demo')) { + Session::flash('info', strval(trans('firefly.cannot_change_demo'))); + + return redirect(route('profile.index')); + } + $title = auth()->user()->email; $subTitle = strval(trans('firefly.change_your_password')); $subTitleIcon = 'fa-key'; @@ -63,6 +69,12 @@ class ProfileController extends Controller */ public function deleteAccount() { + if (auth()->user()->hasRole('demo')) { + Session::flash('info', strval(trans('firefly.cannot_delete_demo'))); + + return redirect(route('profile.index')); + } + $title = auth()->user()->email; $subTitle = strval(trans('firefly.delete_account')); $subTitleIcon = 'fa-trash'; @@ -90,6 +102,12 @@ class ProfileController extends Controller */ public function postChangePassword(ProfileFormRequest $request, UserRepositoryInterface $repository) { + if (auth()->user()->hasRole('demo')) { + Session::flash('info', strval(trans('firefly.cannot_change_demo'))); + + return redirect(route('profile.index')); + } + // old, new1, new2 if (!Hash::check($request->get('current_password'), auth()->user()->password)) { Session::flash('error', strval(trans('firefly.invalid_current_password'))); @@ -118,6 +136,12 @@ class ProfileController extends Controller */ public function postDeleteAccount(UserRepositoryInterface $repository, DeleteAccountFormRequest $request) { + if (auth()->user()->hasRole('demo')) { + Session::flash('info', strval(trans('firefly.cannot_delete_demo'))); + + return redirect(route('profile.index')); + } + // old, new1, new2 if (!Hash::check($request->get('password'), auth()->user()->password)) { Session::flash('error', strval(trans('firefly.invalid_password'))); diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index af44a37ef1..d53f683541 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -96,6 +96,8 @@ return [ 'spent_in_specific_budget' => 'Spent in budget ":budget"', 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', 'left_in_budget_limit' => 'Left to spend according to budgeting', + 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', + 'cannot_delete_demo' => 'You cannot remove the demonstration account.', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From 7e2e1626ac915aa4a133171fe752c1cfa86b9c7a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:11:15 +0100 Subject: [PATCH 106/150] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 2be548f108..fe7fd57b4e 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -96,6 +96,8 @@ return [ 'spent_in_specific_budget' => 'Uitgegeven in budget ":budget"', 'sum_of_expenses_in_budget' => 'Totaal uitgegeven in budget ":budget"', 'left_in_budget_limit' => 'Nog uit te geven volgens budgettering', + 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', + 'cannot_delete_demo' => 'You cannot remove the demonstration account.', // repeat frequencies: 'repeat_freq_yearly' => 'jaarlijks', From 14db016e98a5ed57b402d2c392e11b4b8d712b78 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:11:27 +0100 Subject: [PATCH 107/150] New translations --- resources/lang/es_ES/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 5b9fc088c8..7a94dcb918 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -96,6 +96,8 @@ return [ 'spent_in_specific_budget' => 'Spent in budget ":budget"', 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', 'left_in_budget_limit' => 'Left to spend according to budgeting', + 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', + 'cannot_delete_demo' => 'You cannot remove the demonstration account.', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From 1b6c0d5d869c0b1ab617e744b905b183ea43478a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:11:43 +0100 Subject: [PATCH 108/150] New translations --- resources/lang/zh_HK/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 5b9fc088c8..7a94dcb918 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -96,6 +96,8 @@ return [ 'spent_in_specific_budget' => 'Spent in budget ":budget"', 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', 'left_in_budget_limit' => 'Left to spend according to budgeting', + 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', + 'cannot_delete_demo' => 'You cannot remove the demonstration account.', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From 71ac676b83ab6d559a8fc1d0cc6c8e780c41e6a3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:11:47 +0100 Subject: [PATCH 109/150] New translations --- resources/lang/zh_TW/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 5cfd2afc3f..40c5da1a58 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -96,6 +96,8 @@ return [ 'spent_in_specific_budget' => 'Spent in budget ":budget"', 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', 'left_in_budget_limit' => 'Left to spend according to budgeting', + 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', + 'cannot_delete_demo' => 'You cannot remove the demonstration account.', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From e16ba9ac70773d0638f9d7fe9788bcd02822a125 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:11:53 +0100 Subject: [PATCH 110/150] New translations --- resources/lang/hr_HR/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 5b9fc088c8..7a94dcb918 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -96,6 +96,8 @@ return [ 'spent_in_specific_budget' => 'Spent in budget ":budget"', 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', 'left_in_budget_limit' => 'Left to spend according to budgeting', + 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', + 'cannot_delete_demo' => 'You cannot remove the demonstration account.', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From 1b16e5e216f8dececfebbe60d0b94b0f9ead2d7a Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:11:56 +0100 Subject: [PATCH 111/150] New translations --- resources/lang/pt_BR/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 3699e21f88..79b8913d52 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -96,6 +96,8 @@ return [ 'spent_in_specific_budget' => 'Spent in budget ":budget"', 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', 'left_in_budget_limit' => 'Left to spend according to budgeting', + 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', + 'cannot_delete_demo' => 'You cannot remove the demonstration account.', // repeat frequencies: 'repeat_freq_yearly' => 'anual', From 1046930f29c7a886384bedb57469fd35e150592c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:12:00 +0100 Subject: [PATCH 112/150] New translations --- resources/lang/de_DE/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 79cc0be7ea..f39c19f647 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -96,6 +96,8 @@ return [ 'spent_in_specific_budget' => 'Spent in budget ":budget"', 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', 'left_in_budget_limit' => 'Left to spend according to budgeting', + 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', + 'cannot_delete_demo' => 'You cannot remove the demonstration account.', // repeat frequencies: 'repeat_freq_yearly' => 'Jährlich', From a9b610f367847fc6847efe8cdd4eeac8638bcf35 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:12:12 +0100 Subject: [PATCH 113/150] New translations --- resources/lang/fr_FR/firefly.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 2c72e4a4e9..6cb169b5e4 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -96,6 +96,8 @@ return [ 'spent_in_specific_budget' => 'Spent in budget ":budget"', 'sum_of_expenses_in_budget' => 'Spent total in budget ":budget"', 'left_in_budget_limit' => 'Left to spend according to budgeting', + 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', + 'cannot_delete_demo' => 'You cannot remove the demonstration account.', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From 8f6a271cc0d443d51ed6a15a435ebdd1cffa9c82 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 25 Dec 2016 13:38:30 +0100 Subject: [PATCH 114/150] Add the ability to prefix cache differently. --- .env.example | 1 + config/cache.php | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.env.example b/.env.example index 1333892862..706f519c62 100755 --- a/.env.example +++ b/.env.example @@ -37,6 +37,7 @@ MAIL_ENCRYPTION=null SEND_REGISTRATION_MAIL=true SEND_ERROR_MESSAGE=true SHOW_INCOMPLETE_TRANSLATIONS=false +CACHE_PREFIX=firefly ANALYTICS_ID= SITE_OWNER=mail@example.com diff --git a/config/cache.php b/config/cache.php index 14728ed330..b8bc5dc989 100644 --- a/config/cache.php +++ b/config/cache.php @@ -48,36 +48,36 @@ return [ ], 'database' => [ - 'driver' => 'database', - 'table' => 'cache', + 'driver' => 'database', + 'table' => 'cache', 'connection' => null, ], 'file' => [ 'driver' => 'file', - 'path' => storage_path('framework/cache'), + 'path' => storage_path('framework/cache'), ], 'memcached' => [ - 'driver' => 'memcached', + 'driver' => 'memcached', 'persistent_id' => env('MEMCACHED_PERSISTENT_ID'), - 'sasl' => [ + 'sasl' => [ env('MEMCACHED_USERNAME'), env('MEMCACHED_PASSWORD'), ], - 'options' => [ + 'options' => [ ], - 'servers' => [ + 'servers' => [ [ - 'host' => env('MEMCACHED_HOST', '127.0.0.1'), - 'port' => env('MEMCACHED_PORT', 11211), + 'host' => env('MEMCACHED_HOST', '127.0.0.1'), + 'port' => env('MEMCACHED_PORT', 11211), 'weight' => 100, ], ], ], 'redis' => [ - 'driver' => 'redis', + 'driver' => 'redis', 'connection' => 'default', ], @@ -94,6 +94,6 @@ return [ | */ - 'prefix' => 'firefly', + 'prefix' => env('CACHE_PREFIX', 'firefly'), ]; From 48209d0d22c16d437f249542fa7340ff15d3eb3f Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 08:57:07 +0100 Subject: [PATCH 115/150] Demo user cannot enable two factor auth. --- app/Http/Controllers/HomeController.php | 2 +- app/Http/Controllers/PreferencesController.php | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 0cc0aa6e48..1abee2e11b 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -108,7 +108,7 @@ class HomeController extends Controller $journal->save(); } } - Session::forget(['start','end','viewRange','range','is_custom_range']); + Session::forget(['start', 'end', 'viewRange', 'range', 'is_custom_range']); Session::clear(); Artisan::call('cache:clear'); diff --git a/app/Http/Controllers/PreferencesController.php b/app/Http/Controllers/PreferencesController.php index a3654bb031..93efecf2a8 100644 --- a/app/Http/Controllers/PreferencesController.php +++ b/app/Http/Controllers/PreferencesController.php @@ -166,13 +166,17 @@ class PreferencesController extends Controller Preferences::set('transactionPageSize', 50); } - // two factor auth - $twoFactorAuthEnabled = intval($request->get('twoFactorAuthEnabled')); - $hasTwoFactorAuthSecret = !is_null(Preferences::get('twoFactorAuthSecret')); + $twoFactorAuthEnabled = false; + $hasTwoFactorAuthSecret = false; + if (!auth()->user()->hasRole('demo')) { + // two factor auth + $twoFactorAuthEnabled = intval($request->get('twoFactorAuthEnabled')); + $hasTwoFactorAuthSecret = !is_null(Preferences::get('twoFactorAuthSecret')); - // If we already have a secret, just set the two factor auth enabled to 1, and let the user continue with the existing secret. - if ($hasTwoFactorAuthSecret) { - Preferences::set('twoFactorAuthEnabled', $twoFactorAuthEnabled); + // If we already have a secret, just set the two factor auth enabled to 1, and let the user continue with the existing secret. + if ($hasTwoFactorAuthSecret) { + Preferences::set('twoFactorAuthEnabled', $twoFactorAuthEnabled); + } } // language: From c86aa9cb3fd93d452d3b99359d197ae9e83ea746 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:08:59 +0100 Subject: [PATCH 116/150] =?UTF-8?q?Can=20no=20longer=20reset=20the=20demo?= =?UTF-8?q?=20user=E2=80=99s=20password.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Auth/ForgotPasswordController.php | 37 +++++++++++++++++++ resources/lang/en_US/firefly.php | 1 + 2 files changed, 38 insertions(+) diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 7d6e12b3fc..1b95f56d44 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -13,7 +13,9 @@ declare(strict_types = 1); namespace FireflyIII\Http\Controllers\Auth; use FireflyIII\Http\Controllers\Controller; +use FireflyIII\User; use Illuminate\Foundation\Auth\SendsPasswordResetEmails; +use Illuminate\Http\Request; /** * Class ForgotPasswordController @@ -33,4 +35,39 @@ class ForgotPasswordController extends Controller parent::__construct(); $this->middleware('guest'); } + + /** + * Send a reset link to the given user. + * + * @param Request $request + * + * @return \Illuminate\Http\RedirectResponse + */ + public function sendResetLinkEmail(Request $request) + { + $this->validate($request, ['email' => 'required|email']); + + // verify if the user is not a demo user. If so, we give him back an error. + $user = User::where('email', $request->get('email'))->first(); + if (!is_null($user) && $user->hasRole('demo')) { + return back()->withErrors( + ['email' => trans('firefly.cannot_reset_demo_user')] + ); + } + + $response = $this->broker()->sendResetLink( + $request->only('email') + ); + + if ($response === Password::RESET_LINK_SENT) { + return back()->with('status', trans($response)); + } + + // If an error was returned by the password broker, we will get this message + // translated so we can notify a user of the problem. We'll redirect back + // to where the users came from so they can attempt this process again. + return back()->withErrors( + ['email' => trans($response)] + ); + } } diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index d53f683541..1fb53a93b5 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -98,6 +98,7 @@ return [ 'left_in_budget_limit' => 'Left to spend according to budgeting', 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', 'cannot_delete_demo' => 'You cannot remove the demonstration account.', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From 57d7c1623faef8305e91ed00298d96a8cd1853d0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:11:36 +0100 Subject: [PATCH 117/150] New translations --- resources/lang/es_ES/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index 7a94dcb918..e9d4f2d538 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -98,6 +98,7 @@ return [ 'left_in_budget_limit' => 'Left to spend according to budgeting', 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', 'cannot_delete_demo' => 'You cannot remove the demonstration account.', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From f57ac64dc29c714ebf14057e5d04bcd951785d18 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:11:54 +0100 Subject: [PATCH 118/150] New translations --- resources/lang/zh_HK/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/zh_HK/firefly.php b/resources/lang/zh_HK/firefly.php index 7a94dcb918..e9d4f2d538 100644 --- a/resources/lang/zh_HK/firefly.php +++ b/resources/lang/zh_HK/firefly.php @@ -98,6 +98,7 @@ return [ 'left_in_budget_limit' => 'Left to spend according to budgeting', 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', 'cannot_delete_demo' => 'You cannot remove the demonstration account.', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From e06db9e620d77f91259328bb75e740a2ee53b057 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:11:59 +0100 Subject: [PATCH 119/150] New translations --- resources/lang/zh_TW/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/zh_TW/firefly.php b/resources/lang/zh_TW/firefly.php index 40c5da1a58..bab689aed8 100644 --- a/resources/lang/zh_TW/firefly.php +++ b/resources/lang/zh_TW/firefly.php @@ -98,6 +98,7 @@ return [ 'left_in_budget_limit' => 'Left to spend according to budgeting', 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', 'cannot_delete_demo' => 'You cannot remove the demonstration account.', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From 31cad5de00931799e971280a15fd1cdfd8f1f87d Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:12:05 +0100 Subject: [PATCH 120/150] New translations --- resources/lang/hr_HR/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/hr_HR/firefly.php b/resources/lang/hr_HR/firefly.php index 7a94dcb918..e9d4f2d538 100644 --- a/resources/lang/hr_HR/firefly.php +++ b/resources/lang/hr_HR/firefly.php @@ -98,6 +98,7 @@ return [ 'left_in_budget_limit' => 'Left to spend according to budgeting', 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', 'cannot_delete_demo' => 'You cannot remove the demonstration account.', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From 970ce6cb0d1b3a6ae16b89c3c2676b88691e8c09 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:12:10 +0100 Subject: [PATCH 121/150] New translations --- resources/lang/de_DE/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index f39c19f647..1f95518770 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -98,6 +98,7 @@ return [ 'left_in_budget_limit' => 'Left to spend according to budgeting', 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', 'cannot_delete_demo' => 'You cannot remove the demonstration account.', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', // repeat frequencies: 'repeat_freq_yearly' => 'Jährlich', From 4d5f4cc1c0c0ede92b171e55c61058ff30a3b8f0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:12:14 +0100 Subject: [PATCH 122/150] New translations --- resources/lang/pt_BR/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 79b8913d52..6ff5b76cca 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -98,6 +98,7 @@ return [ 'left_in_budget_limit' => 'Left to spend according to budgeting', 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', 'cannot_delete_demo' => 'You cannot remove the demonstration account.', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', // repeat frequencies: 'repeat_freq_yearly' => 'anual', From 6a21f98ea466b1197d858cffccf8b563a7fdf4bb Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:12:22 +0100 Subject: [PATCH 123/150] New translations --- resources/lang/nl_NL/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index fe7fd57b4e..6e5e8b5fb7 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -98,6 +98,7 @@ return [ 'left_in_budget_limit' => 'Nog uit te geven volgens budgettering', 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', 'cannot_delete_demo' => 'You cannot remove the demonstration account.', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', // repeat frequencies: 'repeat_freq_yearly' => 'jaarlijks', From 9dfaabb5d0b8d7fd6b0428569afde332e4520d96 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:12:28 +0100 Subject: [PATCH 124/150] New translations --- resources/lang/fr_FR/firefly.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 6cb169b5e4..6764415fef 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -98,6 +98,7 @@ return [ 'left_in_budget_limit' => 'Left to spend according to budgeting', 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', 'cannot_delete_demo' => 'You cannot remove the demonstration account.', + 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', // repeat frequencies: 'repeat_freq_yearly' => 'yearly', From 2847e2aff5d2e292f6d7e62ec81313275a6e21c9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:18:45 +0100 Subject: [PATCH 125/150] Code for the demo features. --- .env.example | 3 +++ app/Http/Controllers/Controller.php | 6 +++++- resources/views/auth/login.twig | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 706f519c62..57aceebffb 100755 --- a/.env.example +++ b/.env.example @@ -45,3 +45,6 @@ SITE_OWNER=mail@example.com PUSHER_KEY= PUSHER_SECRET= PUSHER_APP_ID= + +DEMO_USERNAME= +DEMO_PASSWORD= \ No newline at end of file diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 9aaad05724..ade70f5cf9 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -23,6 +23,7 @@ use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Routing\Controller as BaseController; use Session; use View; +use FireflyConfig; /** * Class Controller @@ -49,7 +50,10 @@ class Controller extends BaseController View::share('hideCategories', false); View::share('hideBills', false); View::share('hideTags', false); - + $isDemoSite = FireflyConfig::get('is_demo_site', config('firefly.configuration.is_demo_site'))->data; + View::share('IS_DEMO_SITE', $isDemoSite); + View::share('DEMO_USERNAME', env('DEMO_USERNAME','')); + View::share('DEMO_PASSWORD', env('DEMO_PASSWORD','')); // translations: diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig index 1411157599..f0ab30b5bd 100644 --- a/resources/views/auth/login.twig +++ b/resources/views/auth/login.twig @@ -2,6 +2,18 @@ {% block content %} + {% if IS_DEMO_SITE %} +
                                                                              +
                                                                              +

                                                                              + Welcome to the Firefly III demonstration website!
                                                                              +
                                                                              + To log in, please use email address {{ DEMO_USERNAME }} with password {{ DEMO_PASSWORD }} +

                                                                              +
                                                                              +
                                                                              +{% endif %} + {% if errors.has('email') %}
                                                                              From 648e63628cf9e0881265574c0b5f4799ff65146e Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:33:52 +0100 Subject: [PATCH 126/150] Extra code for demo site. --- resources/views/auth/login.twig | 7 +++---- resources/views/demo/no-demo-text.twig | 3 +++ resources/views/layout/default.twig | 11 ++++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 resources/views/demo/no-demo-text.twig diff --git a/resources/views/auth/login.twig b/resources/views/auth/login.twig index f0ab30b5bd..88353375a6 100644 --- a/resources/views/auth/login.twig +++ b/resources/views/auth/login.twig @@ -1,18 +1,17 @@ {% extends "./layout/guest" %} {% block content %} - {% if IS_DEMO_SITE %}

                                                                              - Welcome to the Firefly III demonstration website!
                                                                              -
                                                                              + Welcome to the Firefly III demonstration website!
                                                                              +
                                                                              To log in, please use email address {{ DEMO_USERNAME }} with password {{ DEMO_PASSWORD }}

                                                                              -{% endif %} + {% endif %} {% if errors.has('email') %}
                                                                              diff --git a/resources/views/demo/no-demo-text.twig b/resources/views/demo/no-demo-text.twig new file mode 100644 index 0000000000..193d1f751e --- /dev/null +++ b/resources/views/demo/no-demo-text.twig @@ -0,0 +1,3 @@ +Sorry, there is no extra demo-explanation text for this page. + +However, the -icon in the top right corner may tell you more. \ No newline at end of file diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index 54dd27bce6..670580a85a 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -112,11 +112,20 @@
                                                                              {% include('partials.page-header') %} {% block breadcrumbs %}{% endblock %} -
                                                                              + {% if IS_DEMO_SITE %} +
                                                                              +
                                                                              +

                                                                              + {% include ['demo.no-demo-text', 'demo.' ~ Route.getCurrentRoute.getName] %} +

                                                                              +
                                                                              +
                                                                              + {% endif %} + {% include('partials.flashes') %} From 1ced4a089d1abc772ec0b727bc163a5a2fcf1657 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:50:28 +0100 Subject: [PATCH 127/150] Update read me [skip ci] --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 4f041801e1..11c105c0a6 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,10 @@ _(You can click on the images for a better view)_ "Firefly III" is a financial manager. It can help you keep track of expenses, income, budgets and everything in between. It even supports credit cards, shared household accounts and savings accounts! It's pretty fancy. You should use it to save and organise money. +## Try it out! + +Try out Firefly III on the [demo site](https://firefly-iii.nder.be/). + ## Installation To install Firefly III, you'll need a web server (preferrably on Linux) and access to the command line. Then, please read the [installation guide](https://firefly-iii.github.io/installation-guide/). From 7ea15761a637ef1651af5e79b2074dfee3a04be3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 09:50:37 +0100 Subject: [PATCH 128/150] Fix tests. --- .../Controllers/Admin/ConfigurationControllerTest.php | 5 ++++- .../Controllers/Auth/ConfirmationControllerTest.php | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php index 0555d656bd..6c3e6f4f44 100644 --- a/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php +++ b/tests/acceptance/Controllers/Admin/ConfigurationControllerTest.php @@ -48,7 +48,7 @@ class ConfigurationControllerTest extends TestCase FireflyConfig::shouldReceive('get')->withArgs(['single_user_mode', true])->once()->andReturn($trueConfig); FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->once()->andReturn($falseConfig); - FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); + FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->times(2)->andReturn($falseConfig); // new settings: FireflyConfig::shouldReceive('get')->withArgs(['mail_for_lockout', false])->once()->andReturn($falseConfig); @@ -69,7 +69,10 @@ class ConfigurationControllerTest extends TestCase */ public function testPostIndex() { + $falseConfig = new Configuration; + $falseConfig->data = false; + FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); FireflyConfig::shouldReceive('set')->withArgs(['single_user_mode', false])->once(); FireflyConfig::shouldReceive('set')->withArgs(['must_confirm_account', false])->once(); FireflyConfig::shouldReceive('set')->withArgs(['is_demo_site', false])->once(); diff --git a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php index d4dd7aff33..c1e5cfa0cb 100644 --- a/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php +++ b/tests/acceptance/Controllers/Auth/ConfirmationControllerTest.php @@ -48,6 +48,11 @@ class ConfirmationControllerTest extends TestCase Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference); Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn(null); + $falseConfig = new Configuration; + $falseConfig->data = false; + + FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); + FireflyConfig::shouldReceive('get')->withArgs(['must_confirm_account', false])->andReturn($trueConfig); $this->be($this->user()); $this->call('GET', route('confirmation_error')); @@ -94,6 +99,11 @@ class ConfirmationControllerTest extends TestCase $falsePreference = new Preference; $falsePreference->data = false; + $falseConfig = new Configuration; + $falseConfig->data = false; + + FireflyConfig::shouldReceive('get')->withArgs(['is_demo_site', false])->once()->andReturn($falseConfig); + Preferences::shouldReceive('get')->withArgs(['user_confirmed_last_mail', 0])->andReturn($timePreference); Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($falsePreference); Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->andReturn(null); From 94e264b6cef32f843a7bd3988ba8cec655e819cb Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:00:40 +0100 Subject: [PATCH 129/150] Expand demo text [skip ci] --- .env.example | 1 + resources/lang/en_US/demo.php | 14 ++++++++++++++ resources/views/demo/no-demo-text.twig | 4 ++-- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 resources/lang/en_US/demo.php diff --git a/.env.example b/.env.example index 57aceebffb..28d87ce566 100755 --- a/.env.example +++ b/.env.example @@ -37,6 +37,7 @@ MAIL_ENCRYPTION=null SEND_REGISTRATION_MAIL=true SEND_ERROR_MESSAGE=true SHOW_INCOMPLETE_TRANSLATIONS=false + CACHE_PREFIX=firefly ANALYTICS_ID= diff --git a/resources/lang/en_US/demo.php b/resources/lang/en_US/demo.php new file mode 100644 index 0000000000..4cb4c2caec --- /dev/null +++ b/resources/lang/en_US/demo.php @@ -0,0 +1,14 @@ + 'Sorry, there is no extra demo-explanation text for this page.', + 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + +]; \ No newline at end of file diff --git a/resources/views/demo/no-demo-text.twig b/resources/views/demo/no-demo-text.twig index 193d1f751e..12c5ad1a64 100644 --- a/resources/views/demo/no-demo-text.twig +++ b/resources/views/demo/no-demo-text.twig @@ -1,3 +1,3 @@ -Sorry, there is no extra demo-explanation text for this page. +{{ trans('demo.no_demo_text')|raw }} -However, the -icon in the top right corner may tell you more. \ No newline at end of file +{{ trans('demo.see_help_icon')|raw }} From 22eb90212d404291273bf9164868d6b6326d11a1 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:11:59 +0100 Subject: [PATCH 130/150] New translations --- resources/lang/zh_HK/demo.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 resources/lang/zh_HK/demo.php diff --git a/resources/lang/zh_HK/demo.php b/resources/lang/zh_HK/demo.php new file mode 100644 index 0000000000..4cb4c2caec --- /dev/null +++ b/resources/lang/zh_HK/demo.php @@ -0,0 +1,14 @@ + 'Sorry, there is no extra demo-explanation text for this page.', + 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + +]; \ No newline at end of file From b0b68d4243715fad133611670b5b8140e1fe45c4 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:12:00 +0100 Subject: [PATCH 131/150] New translations --- resources/lang/zh_TW/demo.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 resources/lang/zh_TW/demo.php diff --git a/resources/lang/zh_TW/demo.php b/resources/lang/zh_TW/demo.php new file mode 100644 index 0000000000..4cb4c2caec --- /dev/null +++ b/resources/lang/zh_TW/demo.php @@ -0,0 +1,14 @@ + 'Sorry, there is no extra demo-explanation text for this page.', + 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + +]; \ No newline at end of file From c0058c51ea2e39e2736e389d1fa029b59a07e6a3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:12:03 +0100 Subject: [PATCH 132/150] New translations --- resources/lang/hr_HR/demo.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 resources/lang/hr_HR/demo.php diff --git a/resources/lang/hr_HR/demo.php b/resources/lang/hr_HR/demo.php new file mode 100644 index 0000000000..4cb4c2caec --- /dev/null +++ b/resources/lang/hr_HR/demo.php @@ -0,0 +1,14 @@ + 'Sorry, there is no extra demo-explanation text for this page.', + 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + +]; \ No newline at end of file From 9e594c60752b308c2d57d4b7cd57687f97327380 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:12:04 +0100 Subject: [PATCH 133/150] New translations --- resources/lang/nl_NL/demo.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 resources/lang/nl_NL/demo.php diff --git a/resources/lang/nl_NL/demo.php b/resources/lang/nl_NL/demo.php new file mode 100644 index 0000000000..4cb4c2caec --- /dev/null +++ b/resources/lang/nl_NL/demo.php @@ -0,0 +1,14 @@ + 'Sorry, there is no extra demo-explanation text for this page.', + 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + +]; \ No newline at end of file From 5e3147ddeb00a133164ea2a663acb0b77995fa8d Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:12:06 +0100 Subject: [PATCH 134/150] New translations --- resources/lang/es_ES/demo.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 resources/lang/es_ES/demo.php diff --git a/resources/lang/es_ES/demo.php b/resources/lang/es_ES/demo.php new file mode 100644 index 0000000000..4cb4c2caec --- /dev/null +++ b/resources/lang/es_ES/demo.php @@ -0,0 +1,14 @@ + 'Sorry, there is no extra demo-explanation text for this page.', + 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + +]; \ No newline at end of file From d95ae53ce2dc8aeac7b2e879f344a6220f109c97 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:12:07 +0100 Subject: [PATCH 135/150] New translations --- resources/lang/pt_BR/demo.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 resources/lang/pt_BR/demo.php diff --git a/resources/lang/pt_BR/demo.php b/resources/lang/pt_BR/demo.php new file mode 100644 index 0000000000..4cb4c2caec --- /dev/null +++ b/resources/lang/pt_BR/demo.php @@ -0,0 +1,14 @@ + 'Sorry, there is no extra demo-explanation text for this page.', + 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + +]; \ No newline at end of file From b32184d5258c8475d5d9b89b78ba7ffe8961570b Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:12:09 +0100 Subject: [PATCH 136/150] New translations --- resources/lang/de_DE/demo.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 resources/lang/de_DE/demo.php diff --git a/resources/lang/de_DE/demo.php b/resources/lang/de_DE/demo.php new file mode 100644 index 0000000000..4cb4c2caec --- /dev/null +++ b/resources/lang/de_DE/demo.php @@ -0,0 +1,14 @@ + 'Sorry, there is no extra demo-explanation text for this page.', + 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + +]; \ No newline at end of file From dc39094975345b04ad1910061cc7f2b5a5911057 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:12:11 +0100 Subject: [PATCH 137/150] New translations --- resources/lang/fr_FR/demo.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 resources/lang/fr_FR/demo.php diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php new file mode 100644 index 0000000000..4cb4c2caec --- /dev/null +++ b/resources/lang/fr_FR/demo.php @@ -0,0 +1,14 @@ + 'Sorry, there is no extra demo-explanation text for this page.', + 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + +]; \ No newline at end of file From 844ab608d4a2a1ec9dbec2bd2d24e55e03e18eda Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:23:47 +0100 Subject: [PATCH 138/150] More demo text [skip ci] --- resources/lang/en_US/demo.php | 4 +++- resources/views/demo/home.twig | 1 + resources/views/demo/index.twig | 1 + resources/views/demo/no-demo-text.twig | 2 +- resources/views/layout/default.twig | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 resources/views/demo/home.twig create mode 100644 resources/views/demo/index.twig diff --git a/resources/lang/en_US/demo.php b/resources/lang/en_US/demo.php index 4cb4c2caec..ed6ae7e543 100644 --- a/resources/lang/en_US/demo.php +++ b/resources/lang/en_US/demo.php @@ -8,7 +8,9 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', + 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + ]; \ No newline at end of file diff --git a/resources/views/demo/home.twig b/resources/views/demo/home.twig new file mode 100644 index 0000000000..84f855689a --- /dev/null +++ b/resources/views/demo/home.twig @@ -0,0 +1 @@ +{{ trans('demo.index', {asset: route('accounts.index', ['asset']), budgets: route('budgets.index'), reports: route('reports.index')})|raw }} \ No newline at end of file diff --git a/resources/views/demo/index.twig b/resources/views/demo/index.twig new file mode 100644 index 0000000000..84f855689a --- /dev/null +++ b/resources/views/demo/index.twig @@ -0,0 +1 @@ +{{ trans('demo.index', {asset: route('accounts.index', ['asset']), budgets: route('budgets.index'), reports: route('reports.index')})|raw }} \ No newline at end of file diff --git a/resources/views/demo/no-demo-text.twig b/resources/views/demo/no-demo-text.twig index 12c5ad1a64..1e7116dc6b 100644 --- a/resources/views/demo/no-demo-text.twig +++ b/resources/views/demo/no-demo-text.twig @@ -1,3 +1,3 @@ -{{ trans('demo.no_demo_text')|raw }} +{{ trans('demo.no_demo_text', {route: Route.getCurrentRoute.getName})|raw }} {{ trans('demo.see_help_icon')|raw }} diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index 670580a85a..58c2d5c7e6 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -120,7 +120,7 @@

                                                                              - {% include ['demo.no-demo-text', 'demo.' ~ Route.getCurrentRoute.getName] %} + {% include ['demo.' ~ Route.getCurrentRoute.getName, 'demo.no-demo-text'] %}

                                                                              From 8c9b6796a1cc2b40c0fbb3d38caeca9d1be339f0 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:31:38 +0100 Subject: [PATCH 139/150] Approved. Step name: Proofread --- resources/lang/nl_NL/firefly.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index 6e5e8b5fb7..44e5b43bff 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -96,9 +96,9 @@ return [ 'spent_in_specific_budget' => 'Uitgegeven in budget ":budget"', 'sum_of_expenses_in_budget' => 'Totaal uitgegeven in budget ":budget"', 'left_in_budget_limit' => 'Nog uit te geven volgens budgettering', - 'cannot_change_demo' => 'You cannot change the password of the demonstration account.', - 'cannot_delete_demo' => 'You cannot remove the demonstration account.', - 'cannot_reset_demo_user' => 'You cannot reset the password of the demonstration account', + 'cannot_change_demo' => 'Je kan het wachtwoord van de demonstratie-account niet wijzigen.', + 'cannot_delete_demo' => 'Je kan de demonstratie-account niet verwijderen.', + 'cannot_reset_demo_user' => 'Je kan het wachtwoord van de demonstratie-account niet resetten', // repeat frequencies: 'repeat_freq_yearly' => 'jaarlijks', From 1a76c606ed86b195124ebd0f906576168454e510 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:31:41 +0100 Subject: [PATCH 140/150] New translations --- resources/lang/zh_HK/demo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/zh_HK/demo.php b/resources/lang/zh_HK/demo.php index 4cb4c2caec..ed6ae7e543 100644 --- a/resources/lang/zh_HK/demo.php +++ b/resources/lang/zh_HK/demo.php @@ -8,7 +8,9 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', + 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + ]; \ No newline at end of file From 909bd11147173b313e7a0c3eadf7b863e548c95b Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:31:42 +0100 Subject: [PATCH 141/150] New translations --- resources/lang/zh_TW/demo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/zh_TW/demo.php b/resources/lang/zh_TW/demo.php index 4cb4c2caec..ed6ae7e543 100644 --- a/resources/lang/zh_TW/demo.php +++ b/resources/lang/zh_TW/demo.php @@ -8,7 +8,9 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', + 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + ]; \ No newline at end of file From cb735b18a94d79802c72b545a895c0b57bd94126 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:31:45 +0100 Subject: [PATCH 142/150] New translations --- resources/lang/hr_HR/demo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/hr_HR/demo.php b/resources/lang/hr_HR/demo.php index 4cb4c2caec..ed6ae7e543 100644 --- a/resources/lang/hr_HR/demo.php +++ b/resources/lang/hr_HR/demo.php @@ -8,7 +8,9 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', + 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + ]; \ No newline at end of file From 1a6067f7aea76142c3e24a2d2f6d6ff699dadf28 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:31:46 +0100 Subject: [PATCH 143/150] New translations --- resources/lang/nl_NL/demo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/nl_NL/demo.php b/resources/lang/nl_NL/demo.php index 4cb4c2caec..ed6ae7e543 100644 --- a/resources/lang/nl_NL/demo.php +++ b/resources/lang/nl_NL/demo.php @@ -8,7 +8,9 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', + 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + ]; \ No newline at end of file From a6ccbcb79558030eeccacbdf9071ca220e8ea848 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:31:47 +0100 Subject: [PATCH 144/150] New translations --- resources/lang/es_ES/demo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/es_ES/demo.php b/resources/lang/es_ES/demo.php index 4cb4c2caec..ed6ae7e543 100644 --- a/resources/lang/es_ES/demo.php +++ b/resources/lang/es_ES/demo.php @@ -8,7 +8,9 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', + 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + ]; \ No newline at end of file From a5789b10851bc0899bfe50cd46e7f01f73468d8a Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:31:48 +0100 Subject: [PATCH 145/150] New translations --- resources/lang/pt_BR/demo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/pt_BR/demo.php b/resources/lang/pt_BR/demo.php index 4cb4c2caec..ed6ae7e543 100644 --- a/resources/lang/pt_BR/demo.php +++ b/resources/lang/pt_BR/demo.php @@ -8,7 +8,9 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', + 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + ]; \ No newline at end of file From d6adbc697af66ab0e2311e498ea1d47c755bfdf8 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:31:49 +0100 Subject: [PATCH 146/150] New translations --- resources/lang/de_DE/demo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/de_DE/demo.php b/resources/lang/de_DE/demo.php index 4cb4c2caec..ed6ae7e543 100644 --- a/resources/lang/de_DE/demo.php +++ b/resources/lang/de_DE/demo.php @@ -8,7 +8,9 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', + 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + ]; \ No newline at end of file From 3883b99c24d0a429747d6f4c8e35a9fe9701ce62 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:31:51 +0100 Subject: [PATCH 147/150] New translations --- resources/lang/fr_FR/demo.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php index 4cb4c2caec..ed6ae7e543 100644 --- a/resources/lang/fr_FR/demo.php +++ b/resources/lang/fr_FR/demo.php @@ -8,7 +8,9 @@ */ return [ - 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', + 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', + 'index' => 'Welcome to Firefly III! On this page you get a quick overview of your finances. For more information, check out Accounts → Asset Accounts and of course the Budgets and Reports pages. Or just take a look around and see where you end up.', + ]; \ No newline at end of file From 5668a3271bea981dfe1c7551490db969e064cb11 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:40:28 +0100 Subject: [PATCH 148/150] Updated change log. --- CHANGELOG.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 107e66c744..c2d14ac49e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,28 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). + +## [4.3.0] - 2015-12-26 +### Added +- New method of keeping track of available budget, see issue #489 +- Support for Spanish +- Firefly III now has an extended demo mode. Will expand further in the future. + + +### Changed +- New favicon +- Import routine no longer gives transactions a description #483 + + +### Removed +- All test data generation code. + +### Fixed +- Removed import accounts from search results #478 +- Redirect after delete will no longer go back to deleted item #477 +- Cannot math #482 +- Fixed bug in virtual balance field #479 + ## [4.2.2] - 2016-12-18 ### Added - New budget report (still a bit of a beta) From 0713273a993ed5ea5f201af8b6e4b62f428eede2 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:45:19 +0100 Subject: [PATCH 149/150] New composer file. --- composer.lock | 253 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 151 insertions(+), 102 deletions(-) diff --git a/composer.lock b/composer.lock index b165ea68f1..2c128e7a1a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a459d7a851be2a23929156fac720aa13", - "content-hash": "19ebf906c75d026c93d83cb8186e5d27", + "content-hash": "38cc0ca42a8c6c518d99045c4bfe5d19", "packages": [ { "name": "bacon/bacon-qr-code", @@ -47,7 +46,7 @@ ], "description": "BaconQrCode is a QR code generator for PHP.", "homepage": "https://github.com/Bacon/BaconQrCode", - "time": "2016-01-09 22:55:35" + "time": "2016-01-09T22:55:35+00:00" }, { "name": "christian-riesen/base32", @@ -101,7 +100,7 @@ "encode", "rfc4648" ], - "time": "2016-05-05 11:49:03" + "time": "2016-05-05T11:49:03+00:00" }, { "name": "classpreloader/classpreloader", @@ -155,7 +154,7 @@ "class", "preload" ], - "time": "2016-09-16 12:50:15" + "time": "2016-09-16T12:50:15+00:00" }, { "name": "davejamesmiller/laravel-breadcrumbs", @@ -204,7 +203,7 @@ "keywords": [ "laravel" ], - "time": "2016-08-28 16:57:03" + "time": "2016-08-28T16:57:03+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -237,7 +236,7 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "time": "2014-10-24 07:27:01" + "time": "2014-10-24T07:27:01+00:00" }, { "name": "doctrine/annotations", @@ -305,7 +304,7 @@ "docblock", "parser" ], - "time": "2016-10-24 11:45:47" + "time": "2016-10-24T11:45:47+00:00" }, { "name": "doctrine/cache", @@ -375,7 +374,7 @@ "cache", "caching" ], - "time": "2016-10-29 11:16:17" + "time": "2016-10-29T11:16:17+00:00" }, { "name": "doctrine/collections", @@ -441,7 +440,7 @@ "collections", "iterator" ], - "time": "2015-04-14 22:21:58" + "time": "2015-04-14T22:21:58+00:00" }, { "name": "doctrine/common", @@ -514,7 +513,7 @@ "persistence", "spl" ], - "time": "2016-11-30 16:50:46" + "time": "2016-11-30T16:50:46+00:00" }, { "name": "doctrine/dbal", @@ -585,7 +584,7 @@ "persistence", "queryobject" ], - "time": "2016-09-09 19:13:33" + "time": "2016-09-09T19:13:33+00:00" }, { "name": "doctrine/inflector", @@ -652,7 +651,7 @@ "singularize", "string" ], - "time": "2015-11-06 14:35:42" + "time": "2015-11-06T14:35:42+00:00" }, { "name": "doctrine/lexer", @@ -706,7 +705,7 @@ "lexer", "parser" ], - "time": "2014-09-09 13:34:57" + "time": "2014-09-09T13:34:57+00:00" }, { "name": "jakub-onderka/php-console-color", @@ -749,7 +748,7 @@ "homepage": "http://www.acci.cz" } ], - "time": "2014-04-08 15:00:19" + "time": "2014-04-08T15:00:19+00:00" }, { "name": "jakub-onderka/php-console-highlighter", @@ -793,7 +792,7 @@ "homepage": "http://www.acci.cz/" } ], - "time": "2015-04-20 18:58:01" + "time": "2015-04-20T18:58:01+00:00" }, { "name": "jeremeamia/SuperClosure", @@ -851,7 +850,7 @@ "serialize", "tokenizer" ], - "time": "2016-12-07 09:37:55" + "time": "2016-12-07T09:37:55+00:00" }, { "name": "laravel/framework", @@ -979,7 +978,7 @@ "framework", "laravel" ], - "time": "2016-10-08 01:51:20" + "time": "2016-10-08T01:51:20+00:00" }, { "name": "laravelcollective/html", @@ -1033,20 +1032,20 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "http://laravelcollective.com", - "time": "2016-08-27 23:52:43" + "time": "2016-08-27T23:52:43+00:00" }, { "name": "league/commonmark", - "version": "0.15.2", + "version": "0.15.3", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "c3b08b911e7344e45b87529eabc8b559d48093d4" + "reference": "c8b43ee5821362216f8e9ac684f0f59de164edcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c3b08b911e7344e45b87529eabc8b559d48093d4", - "reference": "c3b08b911e7344e45b87529eabc8b559d48093d4", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/c8b43ee5821362216f8e9ac684f0f59de164edcc", + "reference": "c8b43ee5821362216f8e9ac684f0f59de164edcc", "shasum": "" }, "require": { @@ -1102,7 +1101,7 @@ "markdown", "parser" ], - "time": "2016-11-22 17:30:29" + "time": "2016-12-19T00:11:43+00:00" }, { "name": "league/csv", @@ -1159,7 +1158,7 @@ "read", "write" ], - "time": "2016-10-27 11:21:24" + "time": "2016-10-27T11:21:24+00:00" }, { "name": "league/flysystem", @@ -1242,7 +1241,7 @@ "sftp", "storage" ], - "time": "2016-10-19 20:38:46" + "time": "2016-10-19T20:38:46+00:00" }, { "name": "monolog/monolog", @@ -1320,7 +1319,7 @@ "logging", "psr-3" ], - "time": "2016-11-26 00:15:39" + "time": "2016-11-26T00:15:39+00:00" }, { "name": "mtdowling/cron-expression", @@ -1364,7 +1363,7 @@ "cron", "schedule" ], - "time": "2016-01-26 21:23:30" + "time": "2016-01-26T21:23:30+00:00" }, { "name": "nesbot/carbon", @@ -1411,7 +1410,7 @@ "datetime", "time" ], - "time": "2015-11-04 20:07:17" + "time": "2015-11-04T20:07:17+00:00" }, { "name": "nikic/php-parser", @@ -1462,7 +1461,7 @@ "parser", "php" ], - "time": "2016-09-16 12:04:44" + "time": "2016-09-16T12:04:44+00:00" }, { "name": "paragonie/random_compat", @@ -1510,7 +1509,7 @@ "pseudorandom", "random" ], - "time": "2016-11-07 23:38:38" + "time": "2016-11-07T23:38:38+00:00" }, { "name": "pragmarx/google2fa", @@ -1571,7 +1570,7 @@ "google2fa", "laravel" ], - "time": "2016-07-18 20:25:04" + "time": "2016-07-18T20:25:04+00:00" }, { "name": "psr/log", @@ -1618,7 +1617,7 @@ "psr", "psr-3" ], - "time": "2016-10-10 12:19:37" + "time": "2016-10-10T12:19:37+00:00" }, { "name": "psy/psysh", @@ -1690,7 +1689,7 @@ "interactive", "shell" ], - "time": "2016-03-09 05:03:14" + "time": "2016-03-09T05:03:14+00:00" }, { "name": "ramsey/uuid", @@ -1772,7 +1771,7 @@ "identifier", "uuid" ], - "time": "2016-11-22 19:21:44" + "time": "2016-11-22T19:21:44+00:00" }, { "name": "rcrowe/twigbridge", @@ -1836,7 +1835,7 @@ "laravel", "twig" ], - "time": "2016-05-01 16:43:38" + "time": "2016-05-01T16:43:38+00:00" }, { "name": "rmccue/requests", @@ -1885,7 +1884,7 @@ "iri", "sockets" ], - "time": "2016-10-13 00:11:37" + "time": "2016-10-13T00:11:37+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -1938,7 +1937,7 @@ "mail", "mailer" ], - "time": "2016-11-24 01:01:23" + "time": "2016-11-24T01:01:23+00:00" }, { "name": "symfony/console", @@ -1999,7 +1998,7 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-12-08 14:58:14" + "time": "2016-12-08T14:58:14+00:00" }, { "name": "symfony/debug", @@ -2056,7 +2055,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-11-15 12:55:20" + "time": "2016-11-15T12:55:20+00:00" }, { "name": "symfony/event-dispatcher", @@ -2116,7 +2115,7 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-10-13 06:29:04" + "time": "2016-10-13T06:29:04+00:00" }, { "name": "symfony/finder", @@ -2165,7 +2164,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-12-13 09:38:21" + "time": "2016-12-13T09:38:21+00:00" }, { "name": "symfony/http-foundation", @@ -2218,7 +2217,7 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-11-27 04:21:07" + "time": "2016-11-27T04:21:07+00:00" }, { "name": "symfony/http-kernel", @@ -2300,7 +2299,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2016-12-13 12:52:10" + "time": "2016-12-13T12:52:10+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -2359,7 +2358,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/polyfill-php56", @@ -2415,7 +2414,7 @@ "portable", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/polyfill-util", @@ -2467,7 +2466,7 @@ "polyfill", "shim" ], - "time": "2016-11-14 01:06:16" + "time": "2016-11-14T01:06:16+00:00" }, { "name": "symfony/process", @@ -2516,7 +2515,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-11-24 01:08:05" + "time": "2016-11-24T01:08:05+00:00" }, { "name": "symfony/routing", @@ -2591,7 +2590,7 @@ "uri", "url" ], - "time": "2016-11-25 12:27:14" + "time": "2016-11-25T12:27:14+00:00" }, { "name": "symfony/translation", @@ -2655,7 +2654,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2016-11-18 21:15:08" + "time": "2016-11-18T21:15:08+00:00" }, { "name": "symfony/var-dumper", @@ -2718,20 +2717,20 @@ "debug", "dump" ], - "time": "2016-12-08 14:58:14" + "time": "2016-12-08T14:58:14+00:00" }, { "name": "twig/twig", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "74f723e542368ca2080b252740be5f1113ebb898" + "reference": "c6ff71094fde15d12398eaba029434b013dc5e59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/74f723e542368ca2080b252740be5f1113ebb898", - "reference": "74f723e542368ca2080b252740be5f1113ebb898", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/c6ff71094fde15d12398eaba029434b013dc5e59", + "reference": "c6ff71094fde15d12398eaba029434b013dc5e59", "shasum": "" }, "require": { @@ -2744,7 +2743,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.29-dev" + "dev-master": "1.30-dev" } }, "autoload": { @@ -2779,7 +2778,7 @@ "keywords": [ "templating" ], - "time": "2016-12-13 17:28:18" + "time": "2016-12-23T11:06:22+00:00" }, { "name": "vlucas/phpdotenv", @@ -2829,7 +2828,7 @@ "env", "environment" ], - "time": "2016-09-01 10:05:43" + "time": "2016-09-01T10:05:43+00:00" }, { "name": "watson/validating", @@ -2879,7 +2878,7 @@ "laravel", "validation" ], - "time": "2016-10-31 21:53:17" + "time": "2016-10-31T21:53:17+00:00" } ], "packages-dev": [ @@ -2935,7 +2934,7 @@ "profiler", "webprofiler" ], - "time": "2016-09-15 14:05:56" + "time": "2016-09-15T14:05:56+00:00" }, { "name": "barryvdh/laravel-ide-helper", @@ -3001,7 +3000,7 @@ "phpstorm", "sublime" ], - "time": "2016-11-15 08:21:23" + "time": "2016-11-15T08:21:23+00:00" }, { "name": "barryvdh/reflection-docblock", @@ -3050,7 +3049,7 @@ "email": "mike.vanriel@naenius.com" } ], - "time": "2016-06-13 19:28:20" + "time": "2016-06-13T19:28:20+00:00" }, { "name": "doctrine/instantiator", @@ -3104,7 +3103,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14 21:17:01" + "time": "2015-06-14T21:17:01+00:00" }, { "name": "fzaninotto/faker", @@ -3152,7 +3151,7 @@ "faker", "fixtures" ], - "time": "2016-04-29 12:21:54" + "time": "2016-04-29T12:21:54+00:00" }, { "name": "hamcrest/hamcrest-php", @@ -3197,7 +3196,57 @@ "keywords": [ "test" ], - "time": "2015-05-11 14:41:42" + "time": "2015-05-11T14:41:42+00:00" + }, + { + "name": "johnkary/phpunit-speedtrap", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/johnkary/phpunit-speedtrap.git", + "reference": "76a26f8a903a9434608cdad2b41c40cd134ea326" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/johnkary/phpunit-speedtrap/zipball/76a26f8a903a9434608cdad2b41c40cd134ea326", + "reference": "76a26f8a903a9434608cdad2b41c40cd134ea326", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*|~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "JohnKary": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Kary", + "email": "john@johnkary.net" + } + ], + "description": "Find slow tests in your PHPUnit test suite", + "homepage": "https://github.com/johnkary/phpunit-speedtrap", + "keywords": [ + "phpunit", + "profile", + "slow" + ], + "time": "2015-09-13T19:01:00+00:00" }, { "name": "maximebf/debugbar", @@ -3258,20 +3307,20 @@ "debug", "debugbar" ], - "time": "2016-09-15 14:01:59" + "time": "2016-09-15T14:01:59+00:00" }, { "name": "mockery/mockery", - "version": "0.9.6", + "version": "0.9.7", "source": { "type": "git", "url": "https://github.com/padraic/mockery.git", - "reference": "65d4ca18e15cb02eeb1e5336f884e46b9b905be0" + "reference": "4de7969f4664da3cef1ccd83866c9f59378c3371" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/padraic/mockery/zipball/65d4ca18e15cb02eeb1e5336f884e46b9b905be0", - "reference": "65d4ca18e15cb02eeb1e5336f884e46b9b905be0", + "url": "https://api.github.com/repos/padraic/mockery/zipball/4de7969f4664da3cef1ccd83866c9f59378c3371", + "reference": "4de7969f4664da3cef1ccd83866c9f59378c3371", "shasum": "" }, "require": { @@ -3323,7 +3372,7 @@ "test double", "testing" ], - "time": "2016-09-30 12:09:40" + "time": "2016-12-19T14:50:55+00:00" }, { "name": "myclabs/deep-copy", @@ -3365,7 +3414,7 @@ "object", "object graph" ], - "time": "2016-10-31 17:19:45" + "time": "2016-10-31T17:19:45+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -3419,7 +3468,7 @@ "reflection", "static analysis" ], - "time": "2015-12-27 11:43:31" + "time": "2015-12-27T11:43:31+00:00" }, { "name": "phpdocumentor/reflection-docblock", @@ -3464,7 +3513,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30 07:12:33" + "time": "2016-09-30T07:12:33+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -3511,7 +3560,7 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25 06:54:22" + "time": "2016-11-25T06:54:22+00:00" }, { "name": "phpspec/prophecy", @@ -3574,20 +3623,20 @@ "spy", "stub" ], - "time": "2016-11-21 14:58:47" + "time": "2016-11-21T14:58:47+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "4.0.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "903fd6318d0a90b4770a009ff73e4a4e9c437929" + "reference": "c14196e64a78570034afd0b7a9f3757ba71c2a0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/903fd6318d0a90b4770a009ff73e4a4e9c437929", - "reference": "903fd6318d0a90b4770a009ff73e4a4e9c437929", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c14196e64a78570034afd0b7a9f3757ba71c2a0a", + "reference": "c14196e64a78570034afd0b7a9f3757ba71c2a0a", "shasum": "" }, "require": { @@ -3637,7 +3686,7 @@ "testing", "xunit" ], - "time": "2016-11-28 16:00:31" + "time": "2016-12-20T15:22:42+00:00" }, { "name": "phpunit/php-file-iterator", @@ -3684,7 +3733,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03 07:40:28" + "time": "2016-10-03T07:40:28+00:00" }, { "name": "phpunit/php-text-template", @@ -3725,7 +3774,7 @@ "keywords": [ "template" ], - "time": "2015-06-21 13:50:34" + "time": "2015-06-21T13:50:34+00:00" }, { "name": "phpunit/php-timer", @@ -3769,7 +3818,7 @@ "keywords": [ "timer" ], - "time": "2016-05-12 18:03:57" + "time": "2016-05-12T18:03:57+00:00" }, { "name": "phpunit/php-token-stream", @@ -3818,7 +3867,7 @@ "keywords": [ "tokenizer" ], - "time": "2016-11-15 14:06:22" + "time": "2016-11-15T14:06:22+00:00" }, { "name": "phpunit/phpunit", @@ -3900,7 +3949,7 @@ "testing", "xunit" ], - "time": "2016-12-13 16:19:44" + "time": "2016-12-13T16:19:44+00:00" }, { "name": "phpunit/phpunit-mock-objects", @@ -3959,7 +4008,7 @@ "mock", "xunit" ], - "time": "2016-12-08 20:27:08" + "time": "2016-12-08T20:27:08+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -4004,7 +4053,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2016-02-13 06:45:14" + "time": "2016-02-13T06:45:14+00:00" }, { "name": "sebastian/comparator", @@ -4068,7 +4117,7 @@ "compare", "equality" ], - "time": "2016-11-19 09:18:40" + "time": "2016-11-19T09:18:40+00:00" }, { "name": "sebastian/diff", @@ -4120,7 +4169,7 @@ "keywords": [ "diff" ], - "time": "2015-12-08 07:14:41" + "time": "2015-12-08T07:14:41+00:00" }, { "name": "sebastian/environment", @@ -4170,7 +4219,7 @@ "environment", "hhvm" ], - "time": "2016-11-26 07:53:53" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", @@ -4237,7 +4286,7 @@ "export", "exporter" ], - "time": "2016-11-19 08:54:04" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", @@ -4288,7 +4337,7 @@ "keywords": [ "global state" ], - "time": "2015-10-12 03:26:01" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/object-enumerator", @@ -4334,7 +4383,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2016-11-19 07:35:10" + "time": "2016-11-19T07:35:10+00:00" }, { "name": "sebastian/recursion-context", @@ -4387,7 +4436,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19 07:33:16" + "time": "2016-11-19T07:33:16+00:00" }, { "name": "sebastian/resource-operations", @@ -4429,7 +4478,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28 20:34:47" + "time": "2015-07-28T20:34:47+00:00" }, { "name": "sebastian/version", @@ -4472,7 +4521,7 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03 07:35:21" + "time": "2016-10-03T07:35:21+00:00" }, { "name": "symfony/class-loader", @@ -4528,7 +4577,7 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2016-11-29 08:26:13" + "time": "2016-11-29T08:26:13+00:00" }, { "name": "symfony/css-selector", @@ -4581,7 +4630,7 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2016-11-03 08:04:31" + "time": "2016-11-03T08:04:31+00:00" }, { "name": "symfony/dom-crawler", @@ -4637,7 +4686,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2016-12-10 14:24:45" + "time": "2016-12-10T14:24:45+00:00" }, { "name": "symfony/yaml", @@ -4692,7 +4741,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-12-10 10:07:06" + "time": "2016-12-10T10:07:06+00:00" }, { "name": "webmozart/assert", @@ -4742,7 +4791,7 @@ "check", "validate" ], - "time": "2016-11-23 20:04:58" + "time": "2016-11-23T20:04:58+00:00" } ], "aliases": [], From ab761696bf89b8378791c53fe4c06e2ff5304630 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 26 Dec 2016 10:45:45 +0100 Subject: [PATCH 150/150] New version indicator. --- config/firefly.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/firefly.php b/config/firefly.php index 1b52715645..ef2ff2280b 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -29,7 +29,7 @@ return [ 'mail_for_blocked_login' => false, ], 'chart' => 'chartjs', - 'version' => '4.2.2', + 'version' => '4.3.0', 'csv_import_enabled' => true, 'maxUploadSize' => 5242880, 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'],