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

Fixed recurring list page actions..

Browse Source
This commit is contained in:
Cüneyt Şentürk 2023-08-24 12:09:55 +03:00
parent aa1251a1c6
commit c5c6bb2755
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,7 +502,12 @@ class Transaction extends Model
} catch (\Exception $e) {} } catch (\Exception $e) {}
try { try {
if ($this->is_splittable && empty($this->document_id) && empty($this->recurring) && $this->isNotTransferTransaction()) { if (
$this->is_splittable
&& empty($this->document_id)
&& empty($this->recurring)
&& $this->isNotTransferTransaction()
) {
$connect = [ $connect = [
'type' => 'button', 'type' => 'button',
'title' => trans('general.connect'), 'title' => trans('general.connect'),

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

@ -540,7 +540,12 @@ class Document extends Model
]; ];
} catch (\Exception $e) {} } catch (\Exception $e) {}
if ($this->status != 'paid' && (empty($this->transactions->count()) || (! empty($this->transactions->count()) && $this->paid != $this->amount))) { if (
$this->status != 'paid'
&& ! str_contains($this->type, 'recurring')
&& (empty($this->transactions->count())
|| (! empty($this->transactions->count()) && $this->paid != $this->amount))
) {
try { try {
if ($this->totals->count()) { if ($this->totals->count()) {
$actions[] = [ $actions[] = [