diff --git a/app/Http/Controllers/Banking/Transfers.php b/app/Http/Controllers/Banking/Transfers.php index dc53c8391..e7e42d9c1 100644 --- a/app/Http/Controllers/Banking/Transfers.php +++ b/app/Http/Controllers/Banking/Transfers.php @@ -217,11 +217,12 @@ class Transfers extends Controller $transfer['payment_method'] = $payment->payment_method; $transfer['reference'] = $payment->reference; + $account = Account::find($payment->account_id); $accounts = Account::enabled()->orderBy('name')->pluck('name', 'id'); $payment_methods = Modules::getPaymentMethods(); - $currency = Currency::where('code', '=', setting('general.default_currency', 'USD'))->first(); + $currency = Currency::where('code', '=', $account->currency_code)->first(); return view('banking.transfers.edit', compact('transfer', 'accounts', 'payment_methods', 'currency')); } diff --git a/routes/web.php b/routes/web.php index 497bec472..9c0b5ad0c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -103,9 +103,9 @@ Route::group(['middleware' => 'language'], function () { Route::get('accounts/currency', 'Banking\Accounts@currency')->name('accounts.currency'); Route::get('accounts/{account}/enable', 'Banking\Accounts@enable')->name('accounts.enable'); Route::get('accounts/{account}/disable', 'Banking\Accounts@disable')->name('accounts.disable'); - Route::resource('accounts', 'Banking\Accounts'); + Route::resource('accounts', 'Banking\Accounts', ['middleware' => ['dateformat', 'money']]); Route::resource('transactions', 'Banking\Transactions'); - Route::resource('transfers', 'Banking\Transfers'); + Route::resource('transfers', 'Banking\Transfers', ['middleware' => ['dateformat', 'money']]); }); Route::group(['prefix' => 'reports'], function () {