diff --git a/app/Http/Controllers/Expenses/Payments.php b/app/Http/Controllers/Expenses/Payments.php index ccbcf2969..c2e7b8da3 100644 --- a/app/Http/Controllers/Expenses/Payments.php +++ b/app/Http/Controllers/Expenses/Payments.php @@ -24,7 +24,7 @@ class Payments extends Controller */ public function index() { - $payments = Payment::with(['account', 'category'])->collect(); + $payments = Payment::with(['vendor', 'account', 'category'])->collect(); $vendors = collect(Vendor::enabled()->pluck('name', 'id')) ->prepend(trans('general.all_type', ['type' => trans_choice('general.vendors', 2)]), ''); diff --git a/modules/OfflinePayment/Resources/views/edit.blade.php b/modules/OfflinePayment/Resources/views/edit.blade.php index 19149ce3b..3c814ff7e 100644 --- a/modules/OfflinePayment/Resources/views/edit.blade.php +++ b/modules/OfflinePayment/Resources/views/edit.blade.php @@ -45,12 +45,12 @@
- +
- - + + @@ -60,7 +60,7 @@ - +
{{ trans('general.name') }}{{ trans('offlinepayment::offlinepayment.code') }}{{ trans('offlinepayment::offlinepayment.order') }}{{ trans('offlinepayment::offlinepayment.code') }}{{ trans('offlinepayment::offlinepayment.order') }} {{ trans('general.actions') }}
{{ $item->name }} {{ $item->code }}{{ $item->order }}{{ $item->order }} diff --git a/resources/views/auth/permissions/index.blade.php b/resources/views/auth/permissions/index.blade.php index e567036df..9c8c79313 100644 --- a/resources/views/auth/permissions/index.blade.php +++ b/resources/views/auth/permissions/index.blade.php @@ -11,28 +11,28 @@ @section('content')
-
+
{!! Form::open(['url' => 'auth/permissions', 'role' => 'form', 'method' => 'GET']) !!}
- {{ trans('general.search') }}: + {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!} {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
- {{ trans('general.show') }}: + {!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
{!! Form::close() !!}
- +
- - - - + + + + @@ -40,12 +40,19 @@ - - + @endforeach diff --git a/resources/views/auth/roles/index.blade.php b/resources/views/auth/roles/index.blade.php index 8e239ce62..6827726d9 100644 --- a/resources/views/auth/roles/index.blade.php +++ b/resources/views/auth/roles/index.blade.php @@ -11,28 +11,28 @@ @section('content')
-
+
{!! Form::open(['url' => 'auth/roles', 'role' => 'form', 'method' => 'GET']) !!}
- {{ trans('general.search') }}: + {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!} {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
- {{ trans('general.show') }}: + {!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
{!! Form::close() !!}
-
@sortablelink('display_name', trans('general.name'))@sortablelink('name', trans('general.code'))@sortablelink('description', trans('general.description')){{ trans('general.actions') }}@sortablelink('display_name', trans('general.name'))@sortablelink('name', trans('general.code')){{ trans('general.actions') }}
{{ $item->display_name }} {{ $item->name }}{{ $item->description }} - {{ trans('general.edit') }} - @permission('update-auth-permissions') - {!! Form::deleteButton($item, 'auth/permissions', '', 'display_name') !!} - @endpermission + +
+ + +
+
- - - - + + + + @@ -40,12 +40,19 @@ - - + @endforeach diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php index 4abf82039..7992ef947 100644 --- a/resources/views/banking/accounts/index.blade.php +++ b/resources/views/banking/accounts/index.blade.php @@ -11,15 +11,15 @@ @section('content')
-
+
{!! Form::open(['url' => 'banking/accounts', 'role' => 'form', 'method' => 'GET']) !!}
- {{ trans('general.search') }}: + {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!} {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
- {{ trans('general.show') }}: + {!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
{!! Form::close() !!} @@ -28,34 +28,41 @@
-
@sortablelink('display_name', trans('general.name'))@sortablelink('name', trans('general.code'))@sortablelink('description', trans('general.description')){{ trans('general.actions') }}@sortablelink('display_name', trans('general.name'))@sortablelink('name', trans('general.code')){{ trans('general.actions') }}
{{ $item->display_name }} {{ $item->name }}{{ $item->description }} - {{ trans('general.edit') }} - @permission('delete-auth-roles') - {!! Form::deleteButton($item, 'auth/roles', '', 'display_name') !!} - @endpermission + +
+ + +
+
- - - - - + + + + + @foreach($accounts as $item) - + - - @endforeach diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index b7e09ec88..6a8935f62 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -5,15 +5,15 @@ @section('content')
-
+
{!! Form::open(['url' => 'banking/transactions', 'role' => 'form', 'method' => 'GET']) !!}
- {{ trans('general.search') }}: + {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!} {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
- {{ trans('general.show') }}: + {!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
{!! Form::close() !!} @@ -22,15 +22,15 @@
-
@sortablelink('name', trans('general.name'))@sortablelink('number', trans('accounts.number'))@sortablelink('opening_balance', trans('accounts.current_balance'))@sortablelink('enabled', trans_choice('general.statuses', 1)){{ trans('general.actions') }}@sortablelink('name', trans('general.name'))@sortablelink('opening_balance', trans('accounts.current_balance')){{ trans('general.actions') }}
{{ $item->name }}{{ $item->number }} @money($item->balance, $item->currency_code, true) + - {{ trans('general.edit') }} - @permission('delete-banking-accounts') - {!! Form::deleteButton($item, 'banking/accounts') !!} - @endpermission + +
+ + +
+
- - - - - - + + + + + + diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php index 34df6ab9a..58e329840 100644 --- a/resources/views/banking/transfers/index.blade.php +++ b/resources/views/banking/transfers/index.blade.php @@ -11,16 +11,16 @@ @section('content')
-
+
{!! Form::open(['url' => 'banking/transfers', 'role' => 'form', 'method' => 'GET']) !!}
- {{ trans('general.search') }}: + {!! Form::select('from_account', $accounts, request('from_account'), ['class' => 'form-control input-filter input-sm']) !!} {!! Form::select('to_account', $accounts, request('to_account'), ['class' => 'form-control input-filter input-sm']) !!} {!! Form::button('  ' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
- {{ trans('general.show') }}: + {!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
{!! Form::close() !!} @@ -29,13 +29,13 @@
-
@sortablelink('paid_at', trans('general.date'))@sortablelink('account.name', trans('accounts.account_name'))@sortablelink('type', trans_choice('general.types', 1))@sortablelink('category.name', trans_choice('general.categories', 1))@sortablelink('description', trans('general.description'))@sortablelink('amount', trans('general.amount'))@sortablelink('paid_at', trans('general.date'))@sortablelink('account.name', trans('accounts.account_name'))@sortablelink('type', trans_choice('general.types', 1))@sortablelink('category.name', trans_choice('general.categories', 1))@sortablelink('description', trans('general.description'))@sortablelink('amount', trans('general.amount'))
+
- - - - + + + + diff --git a/resources/views/companies/companies/index.blade.php b/resources/views/companies/companies/index.blade.php index 2421498f9..294048c46 100644 --- a/resources/views/companies/companies/index.blade.php +++ b/resources/views/companies/companies/index.blade.php @@ -49,7 +49,7 @@ -
@sortablelink('payment.paid_at', trans('general.date'))@sortablelink('payment.name', trans('transfers.from_account'))@sortablelink('revenue.name', trans('transfers.to_account'))@sortablelink('payment.amount', trans('general.amount'))@sortablelink('payment.paid_at', trans('general.date'))@sortablelink('payment.name', trans('transfers.from_account'))@sortablelink('revenue.name', trans('transfers.to_account'))@sortablelink('payment.amount', trans('general.amount'))
+