From 1a5617d430cb8de9a7bd1594dca6a9d84f9f790a Mon Sep 17 00:00:00 2001 From: James Cole Date: Thu, 27 Apr 2017 02:56:57 +0200 Subject: [PATCH] Fixes a bug in the new user handler [skip ci] --- app/Http/Controllers/NewUserController.php | 36 +++++++++---------- .../Controllers/NewUserControllerTest.php | 1 - 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/NewUserController.php b/app/Http/Controllers/NewUserController.php index cbecfb9593..478e5830d6 100644 --- a/app/Http/Controllers/NewUserController.php +++ b/app/Http/Controllers/NewUserController.php @@ -112,15 +112,15 @@ class NewUserController extends Controller private function createAssetAccount(NewUserFormRequest $request, AccountRepositoryInterface $repository): bool { $assetAccount = [ - 'name' => $request->get('bank_name'), - 'iban' => null, - 'accountType' => 'asset', - 'virtualBalance' => 0, - 'active' => true, - 'accountRole' => 'defaultAsset', - 'openingBalance' => round($request->input('bank_balance'), 12), - 'openingBalanceDate' => new Carbon, - 'openingBalanceCurrency' => intval($request->input('amount_currency_id_bank_balance')), + 'name' => $request->get('bank_name'), + 'iban' => null, + 'accountType' => 'asset', + 'virtualBalance' => 0, + 'active' => true, + 'accountRole' => 'defaultAsset', + 'openingBalance' => round($request->input('bank_balance'), 12), + 'openingBalanceDate' => new Carbon, + 'currency_id' => intval($request->input('amount_currency_id_bank_balance')), ]; $repository->store($assetAccount); @@ -137,15 +137,15 @@ class NewUserController extends Controller private function createSavingsAccount(NewUserFormRequest $request, AccountRepositoryInterface $repository): bool { $savingsAccount = [ - 'name' => $request->get('bank_name') . ' savings account', - 'iban' => null, - 'accountType' => 'asset', - 'virtualBalance' => 0, - 'active' => true, - 'accountRole' => 'savingAsset', - 'openingBalance' => round($request->input('savings_balance'), 12), - 'openingBalanceDate' => new Carbon, - 'openingBalanceCurrency' => intval($request->input('amount_currency_id_savings_balance')), + 'name' => $request->get('bank_name') . ' savings account', + 'iban' => null, + 'accountType' => 'asset', + 'virtualBalance' => 0, + 'active' => true, + 'accountRole' => 'savingAsset', + 'openingBalance' => round($request->input('savings_balance'), 12), + 'openingBalanceDate' => new Carbon, + 'currency_id' => intval($request->input('amount_currency_id_savings_balance')), ]; $repository->store($savingsAccount); diff --git a/tests/Feature/Controllers/NewUserControllerTest.php b/tests/Feature/Controllers/NewUserControllerTest.php index aa0af56ee0..20215da0e2 100644 --- a/tests/Feature/Controllers/NewUserControllerTest.php +++ b/tests/Feature/Controllers/NewUserControllerTest.php @@ -36,7 +36,6 @@ class NewUserControllerTest extends TestCase $journalRepos->shouldReceive('first')->once()->andReturn(new TransactionJournal); $accountRepos->shouldReceive('count')->andReturn(0); - $this->be($this->emptyUser()); $response = $this->get(route('new-user.index')); $response->assertStatus(200);