diff --git a/app/Models/Bill.php b/app/Models/Bill.php index 8659be7749..91a5600200 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -28,7 +28,7 @@ use Watson\Validating\ValidatingTrait; class Bill extends Model { - use ValidatingTrait; + use SoftDeletes, ValidatingTrait; /** * The attributes that should be casted to native types. * diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index 62f6747123..ef16f8787b 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -387,7 +387,7 @@ class FireflyValidator extends Validator $exclude = $parameters[2] ?? 0; // get entries from table - $set = DB::table($table)->where('user_id', auth()->user()->id) + $set = DB::table($table)->where('user_id', auth()->user()->id)->whereNull('deleted_at') ->where('id', '!=', $exclude)->get([$field]); foreach ($set as $entry) {