From b6ebaeafa99ebece9db05377186912510d6d405b Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 21 Jun 2021 16:34:37 +0300 Subject: [PATCH 1/4] Long text edited for banking --- resources/views/banking/accounts/index.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php index 24df6f215..aaa38c65c 100644 --- a/resources/views/banking/accounts/index.blade.php +++ b/resources/views/banking/accounts/index.blade.php @@ -30,11 +30,11 @@ {{ Form::bulkActionAllGroup() }} - @sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) - @sortablelink('number', trans('accounts.number')) - @sortablelink('opening_balance', trans('accounts.current_balance')) + @sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['rel' => 'nofollow']) + @sortablelink('number', trans('accounts.number')) + @sortablelink('opening_balance', trans('accounts.current_balance')) @sortablelink('enabled', trans('general.enabled')) - {{ trans('general.actions') }} + {{ trans('general.actions') }} @@ -44,10 +44,10 @@ {{ Form::bulkActionGroup($item->id, $item->name) }} - {{ $item->name }} - {{ $item->number }} - @money($item->balance, $item->currency_code, true) - + {{ $item->name }} + {{ $item->number }} + @money($item->balance, $item->currency_code, true) + @if (user()->can('update-banking-accounts')) {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }} @else From 4f1185ed59f7640dba8c28ef71e2892489b570ba Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 21 Jun 2021 16:34:59 +0300 Subject: [PATCH 2/4] Ejected last commit --- resources/views/banking/accounts/index.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php index aaa38c65c..24df6f215 100644 --- a/resources/views/banking/accounts/index.blade.php +++ b/resources/views/banking/accounts/index.blade.php @@ -30,11 +30,11 @@ {{ Form::bulkActionAllGroup() }} - @sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['rel' => 'nofollow']) - @sortablelink('number', trans('accounts.number')) - @sortablelink('opening_balance', trans('accounts.current_balance')) + @sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) + @sortablelink('number', trans('accounts.number')) + @sortablelink('opening_balance', trans('accounts.current_balance')) @sortablelink('enabled', trans('general.enabled')) - {{ trans('general.actions') }} + {{ trans('general.actions') }} @@ -44,10 +44,10 @@ {{ Form::bulkActionGroup($item->id, $item->name) }} - {{ $item->name }} - {{ $item->number }} - @money($item->balance, $item->currency_code, true) - + {{ $item->name }} + {{ $item->number }} + @money($item->balance, $item->currency_code, true) + @if (user()->can('update-banking-accounts')) {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }} @else From e9b5c42a839f1bb14e9970e9636e5359d2619fe0 Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 21 Jun 2021 16:35:39 +0300 Subject: [PATCH 3/4] Banking item list edited --- resources/views/banking/accounts/index.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/banking/accounts/index.blade.php b/resources/views/banking/accounts/index.blade.php index 24df6f215..aaa38c65c 100644 --- a/resources/views/banking/accounts/index.blade.php +++ b/resources/views/banking/accounts/index.blade.php @@ -30,11 +30,11 @@ {{ Form::bulkActionAllGroup() }} - @sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['class' => 'col-aka', 'rel' => 'nofollow']) - @sortablelink('number', trans('accounts.number')) - @sortablelink('opening_balance', trans('accounts.current_balance')) + @sortablelink('name', trans('general.name'), ['filter' => 'active, visible'], ['rel' => 'nofollow']) + @sortablelink('number', trans('accounts.number')) + @sortablelink('opening_balance', trans('accounts.current_balance')) @sortablelink('enabled', trans('general.enabled')) - {{ trans('general.actions') }} + {{ trans('general.actions') }} @@ -44,10 +44,10 @@ {{ Form::bulkActionGroup($item->id, $item->name) }} - {{ $item->name }} - {{ $item->number }} - @money($item->balance, $item->currency_code, true) - + {{ $item->name }} + {{ $item->number }} + @money($item->balance, $item->currency_code, true) + @if (user()->can('update-banking-accounts')) {{ Form::enabledGroup($item->id, $item->name, $item->enabled) }} @else From 63ea36354f657475add433e5ce29d00a57183c8b Mon Sep 17 00:00:00 2001 From: Burak Civan Date: Mon, 21 Jun 2021 18:03:33 +0300 Subject: [PATCH 4/4] Long text controlled for item page --- resources/views/banking/reconciliations/index.blade.php | 2 +- resources/views/banking/transactions/index.blade.php | 2 +- resources/views/banking/transfers/index.blade.php | 6 +++--- resources/views/purchases/payments/index.blade.php | 2 +- resources/views/purchases/vendors/index.blade.php | 2 +- resources/views/sales/customers/index.blade.php | 2 +- resources/views/sales/revenues/index.blade.php | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/banking/reconciliations/index.blade.php b/resources/views/banking/reconciliations/index.blade.php index e9e3e494f..a432d9583 100644 --- a/resources/views/banking/reconciliations/index.blade.php +++ b/resources/views/banking/reconciliations/index.blade.php @@ -45,7 +45,7 @@ {{ Form::bulkActionGroup($item->id, $item->account->name) }} @date($item->created_at) - {{ $item->account->name }} + {{ $item->account->name }} @date($item->started_at) - @date($item->ended_at) @money($item->closing_balance, $item->account->currency_code, true) diff --git a/resources/views/banking/transactions/index.blade.php b/resources/views/banking/transactions/index.blade.php index bc382a465..52b2558f7 100644 --- a/resources/views/banking/transactions/index.blade.php +++ b/resources/views/banking/transactions/index.blade.php @@ -56,7 +56,7 @@ @money($item->amount, $item->currency_code, true) {{ $item->type_title }} {{ $item->category->name }} - {{ $item->account->name }} + {{ $item->account->name }} {{ $item->description }} @endforeach diff --git a/resources/views/banking/transfers/index.blade.php b/resources/views/banking/transfers/index.blade.php index de69651de..e8b5f17b9 100644 --- a/resources/views/banking/transfers/index.blade.php +++ b/resources/views/banking/transfers/index.blade.php @@ -53,9 +53,9 @@ {{ Form::bulkActionGroup($item->id, $item->expense_transaction->account->name) }} @date($item->expense_transaction->paid_at) - {{ $item->expense_transaction->account->name }} - {{ $item->income_transaction->account->name }} - @money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true) + {{ $item->expense_transaction->account->name }} + {{ $item->income_transaction->account->name }} + @money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true)
{{ $item->name }} diff --git a/resources/views/sales/customers/index.blade.php b/resources/views/sales/customers/index.blade.php index 097ef6b45..98fe0a7ba 100644 --- a/resources/views/sales/customers/index.blade.php +++ b/resources/views/sales/customers/index.blade.php @@ -47,7 +47,7 @@ {{ Form::bulkActionGroup($item->id, $item->name) }} - + {{ $item->name }} diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php index 3f2be78a6..3d1a065a6 100644 --- a/resources/views/sales/revenues/index.blade.php +++ b/resources/views/sales/revenues/index.blade.php @@ -78,7 +78,7 @@ @endif {{ $item->category->name }} - {{ $item->account->name }} + {{ $item->account->name }}