From 8385e20c538734059c8b6ffaae905a3d8cc335dd Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 15 Oct 2017 12:38:18 +0300 Subject: [PATCH] Clarify gateways vs bank accounts --- app/Http/Controllers/AccountController.php | 3 +++ resources/lang/en/texts.php | 2 +- resources/views/accounts/banks.blade.php | 4 ++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 23e7b5710b54..f03eb9e65fc7 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -431,9 +431,12 @@ class AccountController extends BaseController */ private function showBankAccounts() { + $account = auth()->user()->account; + return View::make('accounts.banks', [ 'title' => trans('texts.bank_accounts'), 'advanced' => ! Auth::user()->hasFeature(FEATURE_EXPENSES), + 'warnPaymentGateway' => ! $account->account_gateways->count(), ]); } diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 466d9d3fd7c5..8c6f7b3fb3bf 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -2481,7 +2481,7 @@ $LANG = array( 'time_hr' => 'hr', 'time_hrs' => 'hrs', 'clear' => 'Clear', - + 'warn_payment_gateway' => 'Note: to accept online payments :link to add a payment gateway.', ); return $LANG; diff --git a/resources/views/accounts/banks.blade.php b/resources/views/accounts/banks.blade.php index bf15e3d3a1da..0d46c21cd80b 100644 --- a/resources/views/accounts/banks.blade.php +++ b/resources/views/accounts/banks.blade.php @@ -4,6 +4,10 @@ @parent @include('accounts.nav', ['selected' => ACCOUNT_BANKS]) +@if (isset($warnPaymentGateway) && $warnPaymentGateway) +
{!! trans('texts.warn_payment_gateway', ['link' => link_to('/gateways/create', trans('texts.click_here'))]) !!}
+@endif + @if (Auth::user()->hasFeature(FEATURE_EXPENSES))
{!! Button::normal(trans('texts.import_ofx'))