shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed recurring template end button issue ( #866au7m2v )

Browse Source
This commit is contained in:
Cüneyt Şentürk
2023-08-24 12:21:15 +03:00
parent c5c6bb2755
commit e1b47a6f8a
4 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Models/Banking/Transaction.php
View File

@@ -610,17 +610,19 @@ class Transaction extends Model
} catch (\Exception $e) {} } catch (\Exception $e) {}
} }
} else { } else {
try { if ($this->recurring && $this->recurring->status != 'ended') {
$actions[] = [ try {
'title' => trans('general.end'), $actions[] = [
'icon' => 'block', 'title' => trans('general.end'),
'url' => route($prefix. '.end', $this->id), 'icon' => 'block',
'permission' => 'update-banking-transactions', 'url' => route($prefix. '.end', $this->id),
'attributes' => [ 'permission' => 'update-banking-transactions',
'id' => 'index-line-actions-end-' . $this->type . '-' . $this->id, 'attributes' => [
], 'id' => 'index-line-actions-end-' . $this->type . '-' . $this->id,
]; ],
} catch (\Exception $e) {} ];
} catch (\Exception $e) {}
}
} }
return $actions; return $actions;

24
app/Models/Document/Document.php
View File

@@ -672,17 +672,19 @@ class Document extends Model
]; ];
} catch (\Exception $e) {} } catch (\Exception $e) {}
} else { } else {
try { if ($this->recurring && $this->recurring->status != 'ended') {
$actions[] = [ try {
'title' => trans('general.end'), $actions[] = [
'icon' => 'block', 'title' => trans('general.end'),
'url' => route($prefix. '.end', $this->id), 'icon' => 'block',
'permission' => 'update-' . $group . '-' . $permission_prefix, 'url' => route($prefix. '.end', $this->id),
'attributes' => [ 'permission' => 'update-' . $group . '-' . $permission_prefix,
'id' => 'index-line-actions-end-' . $this->type . '-' . $this->id, 'attributes' => [
], 'id' => 'index-line-actions-end-' . $this->type . '-' . $this->id,
]; ],
} catch (\Exception $e) {} ];
} catch (\Exception $e) {}
}
} }
return $actions; return $actions;

2
resources/views/components/documents/show/more-buttons.blade.php
View File

@@ -98,7 +98,7 @@
@stack('end_button_start') @stack('end_button_start')
@if (! $hideEnd && $document->recurring) @if (! $hideEnd && $document->recurring && $document->recurring->status != 'ended')
<x-dropdown.link href="{{ route($endRoute, $document->id) }}" id="show-more-actions-end-{{ $document->type }}"> <x-dropdown.link href="{{ route($endRoute, $document->id) }}" id="show-more-actions-end-{{ $document->type }}">
{{ trans('recurring.end') }} {{ trans('recurring.end') }}
</x-dropdown.link> </x-dropdown.link>

2
resources/views/components/transactions/show/more-buttons.blade.php
View File

@@ -107,7 +107,7 @@
@stack('button_end_start') @stack('button_end_start')
@if (! $hideButtonEnd) @if (! $hideButtonEnd && $transaction->recurring && $transaction->recurring->status != 'ended')
<x-dropdown.link href="{{ route($routeButtonEnd, $transaction->id) }}" id="show-more-actions-end-{{ $transaction->type }}"> <x-dropdown.link href="{{ route($routeButtonEnd, $transaction->id) }}" id="show-more-actions-end-{{ $transaction->type }}">
{{ trans('recurring.end') }} {{ trans('recurring.end') }}
</x-dropdown.link> </x-dropdown.link>