From f59848c4361e77c9c42c004b689a650b3c4019d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 15 Mar 2023 17:24:43 +0300
Subject: [PATCH] Fixed document and transaction recurring started_at issue (
 #8669n1gwv )

---
 app/Models/Banking/Transaction.php | 10 ++++++++--
 app/Models/Document/Document.php   | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php
index 07aadff7b..d64a8b4e7 100644
--- a/app/Models/Banking/Transaction.php
+++ b/app/Models/Banking/Transaction.php
@@ -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
diff --git a/app/Models/Document/Document.php b/app/Models/Document/Document.php
index 4a0694ac8..6e06e3f3c 100644
--- a/app/Models/Document/Document.php
+++ b/app/Models/Document/Document.php
@@ -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');
+                    });
     }
 
     /**