diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index cdd0a217e0d1..5dc12346c140 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -449,7 +449,7 @@ class BaseController extends Controller } }, 'company.bank_transactions'=> function ($query) use ($updated_at, $user) { - $query->whereNotNull('updated_at'); + $query->where('updated_at', '>=', $updated_at); if (! $user->isAdmin()) { $query->where('bank_transactions.user_id', $user->id); diff --git a/app/Jobs/Bank/ProcessBankTransactions.php b/app/Jobs/Bank/ProcessBankTransactions.php index 57326b5693b8..3c59717b7ecf 100644 --- a/app/Jobs/Bank/ProcessBankTransactions.php +++ b/app/Jobs/Bank/ProcessBankTransactions.php @@ -109,6 +109,8 @@ class ProcessBankTransactions implements ShouldQueue 'company_id' => $company->id, 'user_id' => $user_id, 'bank_integration_id' => $this->bank_integration->id, + 'created_at' => now(), + 'updated_at' => now(), ]) ); diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 5a0ea9f063bf..235e1b8f9573 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -67,7 +67,6 @@ class CompanyTransformer extends EntityTransformer * @var array */ protected $availableIncludes = [ - 'bank_transactions', 'documents', 'users', 'designs', @@ -104,6 +103,7 @@ class CompanyTransformer extends EntityTransformer 'recurring_expenses', 'purchase_orders', 'bank_integrations', + 'bank_transactions', ]; /** @@ -226,10 +226,7 @@ class CompanyTransformer extends EntityTransformer public function includeBankTransactions(Company $company) { $transformer = new BankTransactionTransformer($this->serializer); - - nlog("GEET"); - nlog($company->bank_transactions()->count()); - + return $this->includeCollection($company->bank_transactions, $transformer, BankTransaction::class); }