diff --git a/resources/views/bank-accounts/forms.blade.php b/resources/views/bank-accounts/forms.blade.php
index e9552f5..83b5753 100644
--- a/resources/views/bank-accounts/forms.blade.php
+++ b/resources/views/bank-accounts/forms.blade.php
@@ -1,66 +1,66 @@
-@if (Request::get('action') == 'create')
+@if (request('action') == 'create')
-
{{ trans('bank_account.create') }}
+
{{ __('bank_account.create') }}
{!! Form::open(['route' => 'bank-accounts.store']) !!}
- {!! FormField::text('name', ['required' => true, 'label' => trans('bank_account.name')]) !!}
- {!! FormField::text('number', ['required' => true, 'label' => trans('bank_account.number')]) !!}
- {!! FormField::text('account_name', ['required' => true, 'label' => trans('bank_account.account_name')]) !!}
- {!! FormField::textarea('description', ['label' => trans('bank_account.description')]) !!}
+ {!! FormField::text('name', ['required' => true, 'label' => __('bank_account.name')]) !!}
+ {!! FormField::text('number', ['required' => true, 'label' => __('bank_account.number')]) !!}
+ {!! FormField::text('account_name', ['required' => true, 'label' => __('bank_account.account_name')]) !!}
+ {!! FormField::textarea('description', ['label' => __('bank_account.description')]) !!}
{!! Form::close() !!}
@endif
-@if (Request::get('action') == 'edit' && $editableBankAccount)
+@if (request('action') == 'edit' && $editableBankAccount)
-
{{ trans('bank_account.edit') }}
- {!! Form::model($editableBankAccount, ['route' => ['bank-accounts.update', request('id')], 'method' => 'patch']) !!}
+
{{ __('bank_account.edit') }}
+ {!! Form::model($editableBankAccount, ['route' => ['bank-accounts.update', $editableBankAccount->id], 'method' => 'patch']) !!}
- {!! FormField::text('name', ['required' => true, 'label' => trans('bank_account.name')]) !!}
- {!! FormField::text('number', ['required' => true, 'label' => trans('bank_account.number')]) !!}
- {!! FormField::text('account_name', ['required' => true, 'label' => trans('bank_account.account_name')]) !!}
- {!! FormField::textarea('description', ['label' => trans('bank_account.description')]) !!}
+ {!! FormField::text('name', ['required' => true, 'label' => __('bank_account.name')]) !!}
+ {!! FormField::text('number', ['required' => true, 'label' => __('bank_account.number')]) !!}
+ {!! FormField::text('account_name', ['required' => true, 'label' => __('bank_account.account_name')]) !!}
+ {!! FormField::textarea('description', ['label' => __('bank_account.description')]) !!}
{!! FormField::radios('is_active', [__('app.in_active'), __('app.active')], ['label' => __('app.status')]) !!}
{!! Form::close() !!}
@endif
-@if (Request::get('action') == 'delete' && $editableBankAccount)
+@if (request('action') == 'delete' && $editableBankAccount)
-
{{ trans('bank_account.delete') }}
+
{{ __('bank_account.delete') }}
-
+
{{ $editableBankAccount->name }}
-
+
{{ $editableBankAccount->number }}
-
+
{{ $editableBankAccount->account_name }}
-
+
{{ $editableBankAccount->description }}
{!! $errors->first('bank_account_id', '
:message') !!}
-
{{ trans('app.delete_confirm') }}
+
{{ __('app.delete_confirm') }}
@endif
diff --git a/resources/views/customers/edit.blade.php b/resources/views/customers/edit.blade.php
index 87c5c8c..3603355 100644
--- a/resources/views/customers/edit.blade.php
+++ b/resources/views/customers/edit.blade.php
@@ -1,13 +1,13 @@
@extends('layouts.app')
-@section('title', trans('customer.edit').' '.$customer->name)
+@section('title', __('customer.edit').' '.$customer->name)
@section('content')
@if (Request::has('action'))
@@ -40,9 +40,9 @@