Browse Source

Update view, lang files and flash message

pull/22/head
Nafies Luthfi 7 years ago
parent
commit
a9082de190
  1. 4
      app/Http/Controllers/References/BankAccountsController.php
  2. 2
      resources/lang/de/bank_account.php
  3. 2
      resources/lang/en/bank_account.php
  4. 2
      resources/lang/id/bank_account.php
  5. 13
      resources/views/bank-accounts/index.blade.php
  6. 9
      tests/Feature/References/ManageBankAccountsTest.php

4
app/Http/Controllers/References/BankAccountsController.php

@ -107,11 +107,13 @@ class BankAccountsController extends Controller
{
$bankAccounts = Option::where('key', 'bank_accounts')->first();
if ($bankAccounts && $bankAccounts->value) {
foreach (json_decode($bankAccounts->value, true) as $bankAccountData) {
$bankAccountList = json_decode($bankAccounts->value, true);
foreach ($bankAccountList as $bankAccountData) {
$bankAccount = new BankAccount($bankAccountData);
$bankAccount->save();
}
$bankAccounts->delete();
flash(__('bank_account.imported', ['count' => count($bankAccountList)]), 'success');
}
return back();

2
resources/lang/de/bank_account.php

@ -8,6 +8,8 @@ return [
'back_to_index' => 'Zurück zur Bankverbindunsliste',
// Actions
'import' => 'Import Bank Account',
'imported' => ':count bank account(s) has imported.',
'create' => 'Neue Bankverbindung erstellen',
'created' => 'Neue Bankverbindung wurde erstellt.',
'show' => 'Zeige Bankverbindung Details',

2
resources/lang/en/bank_account.php

@ -8,6 +8,8 @@ return [
'back_to_index' => 'Back to Bank Account list',
// Actions
'import' => 'Import Bank Account',
'imported' => ':count bank account(s) has imported.',
'create' => 'Create new Bank Account',
'created' => 'New Bank Account has been created.',
'show' => 'Show Bank Account detail',

2
resources/lang/id/bank_account.php

@ -8,6 +8,8 @@ return [
'back_to_index' => 'Kembali ke daftar Rekening Bank',
// Actions
'import' => 'Import Rekening Bank',
'imported' => ':count rekening bank telah diimport.',
'create' => 'Input Rekening Bank Baru',
'created' => 'Input Rekening Bank baru telah berhasil.',
'show' => 'Lihat Detail Rekening Bank',

13
resources/views/bank-accounts/index.blade.php

@ -3,17 +3,18 @@
@section('title', trans('bank_account.list'))
@section('content-dashboard')
{!! FormField::formButton(['route' => 'bank-accounts.import'], __('bank_account.import'), ['id' => 'import-bank-accounts']) !!}
<div class="row">
<div class="col-md-8">
@foreach ($bankAccounts as $bankAccount)
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading text-center"><h3 class="panel-title">{{ $bankAccount->name }}</h3></div>
<div class="panel-heading text-center">
<h3 class="panel-title">{{ $bankAccount->name }}</h3>
</div>
<div class="panel-body">
<span class="pull-right">{{ $bankAccount->status }}</span>
<p>{{ trans('bank_account.number') }}:<br><strong class="lead">{{ $bankAccount->number }}</strong></p>
<p>{{ trans('bank_account.account_name') }}:<br><strong class="lead">{{ $bankAccount->account_name }}</strong></p>
<p>{{ __('app.status') }}:<br><strong class="lead">{{ $bankAccount->status }}</strong></p>
@if ($bankAccount->description)
<p>{{ trans('app.description') }}:<br>{{ $bankAccount->description }}</p>
@endif
@ -44,6 +45,12 @@
]) !!}
@endif
@includeWhen(Request::has('action'), 'bank-accounts.forms')
@if (Option::get('bank_accounts'))
{!! FormField::formButton(['route' => 'bank-accounts.import'], __('bank_account.import'), [
'id' => 'import-bank-accounts',
'class' => 'btn btn-primary',
]) !!}
@endif
</div>
</div>
@endsection

9
tests/Feature/References/ManageBankAccountsTest.php

@ -3,7 +3,7 @@
namespace Tests\Feature\References;
use Tests\TestCase;
use Facades\App\Services\Option;
use App\Entities\Options\Option;
use App\Entities\Invoices\BankAccount;
use Illuminate\Foundation\Testing\DatabaseMigrations;
@ -119,14 +119,17 @@ class ManageBankAccountsTest extends TestCase
'description' => 'BankAccount 1 description',
];
Option::set('bank_accounts', json_encode($bankAccounts));
Option::create([
'key' => 'bank_accounts',
'value' => json_encode($bankAccounts),
]);
$this->visit(route('bank-accounts.index'));
$this->seeElement('button', ['id' => 'import-bank-accounts']);
$this->press('import-bank-accounts');
$this->seePageIs(route('bank-accounts.index'));
$this->seeText(__('bank_account.imported', ['count' => 1]));
$this->dontSeeInDatabase('site_options', [
'value' => json_encode($bankAccounts),
]);

Loading…
Cancel
Save