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

Fixed document and transaction recurring started_at issue ( #8669n1gwv )

Browse Source
This commit is contained in:
Cüneyt Şentürk 2023-03-15 17:24:43 +03:00
parent 19d87562ec
commit f59848c436
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,7 +186,10 @@ class Transaction extends Model
public function scopeIncomeRecurring(Builder $query): Builder
{
return $query->where($this->qualifyColumn('type'), '=', self::INCOME_RECURRING_TYPE);
return $query->where($this->qualifyColumn('type'), '=', self::INCOME_RECURRING_TYPE)
->whereHas('recurring', function (Builder $query) {
$query->whereNull('deleted_at');
});
}
public function scopeExpense(Builder $query): Builder
@ -201,7 +204,10 @@ class Transaction extends Model
public function scopeExpenseRecurring(Builder $query): Builder
{
return $query->where($this->qualifyColumn('type'), '=', self::EXPENSE_RECURRING_TYPE);
return $query->where($this->qualifyColumn('type'), '=', self::EXPENSE_RECURRING_TYPE)
->whereHas('recurring', function (Builder $query) {
$query->whereNull('deleted_at');
});
}
public function scopeIsTransfer(Builder $query): Builder

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

@ -216,7 +216,10 @@ class Document extends Model
public function scopeInvoiceRecurring(Builder $query): Builder
{
return $query->where($this->qualifyColumn('type'), '=', self::INVOICE_RECURRING_TYPE);
return $query->where($this->qualifyColumn('type'), '=', self::INVOICE_RECURRING_TYPE)
->whereHas('recurring', function (Builder $query) {
$query->whereNull('deleted_at');
});
}
public function scopeBill(Builder $query): Builder
@ -226,7 +229,10 @@ class Document extends Model
public function scopeBillRecurring(Builder $query): Builder
{
return $query->where($this->qualifyColumn('type'), '=', self::BILL_RECURRING_TYPE);
return $query->where($this->qualifyColumn('type'), '=', self::BILL_RECURRING_TYPE)
->whereHas('recurring', function (Builder $query) {
$query->whereNull('deleted_at');
});
}
/**