Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for bank transactions:

Browse Source
This commit is contained in:
David Bomba 2022-09-14 16:48:56 +10:00
parent 8d91b7d85f
commit 73acc1b7d5
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BaseController.php
View File

@ -449,7 +449,7 @@ class BaseController extends Controller
} }
}, },
'company.bank_transactions'=> function ($query) use ($updated_at, $user) { 'company.bank_transactions'=> function ($query) use ($updated_at, $user) {
$query->whereNotNull('updated_at'); $query->where('updated_at', '>=', $updated_at);
if (! $user->isAdmin()) { if (! $user->isAdmin()) {
$query->where('bank_transactions.user_id', $user->id); $query->where('bank_transactions.user_id', $user->id);

2
app/Jobs/Bank/ProcessBankTransactions.php
View File

@ -109,6 +109,8 @@ class ProcessBankTransactions implements ShouldQueue
'company_id' => $company->id, 'company_id' => $company->id,
'user_id' => $user_id, 'user_id' => $user_id,
'bank_integration_id' => $this->bank_integration->id, 'bank_integration_id' => $this->bank_integration->id,
'created_at' => now(),
'updated_at' => now(),
]) ])
); );

7
app/Transformers/CompanyTransformer.php
View File

@ -67,7 +67,6 @@ class CompanyTransformer extends EntityTransformer
* @var array * @var array
*/ */
protected $availableIncludes = [ protected $availableIncludes = [
'bank_transactions',
'documents', 'documents',
'users', 'users',
'designs', 'designs',
@ -104,6 +103,7 @@ class CompanyTransformer extends EntityTransformer
'recurring_expenses', 'recurring_expenses',
'purchase_orders', 'purchase_orders',
'bank_integrations', 'bank_integrations',
'bank_transactions',
]; ];
/** /**
@ -226,10 +226,7 @@ class CompanyTransformer extends EntityTransformer
public function includeBankTransactions(Company $company) public function includeBankTransactions(Company $company)
{ {
$transformer = new BankTransactionTransformer($this->serializer); $transformer = new BankTransactionTransformer($this->serializer);
nlog("GEET");
nlog($company->bank_transactions()->count());
return $this->includeCollection($company->bank_transactions, $transformer, BankTransaction::class); return $this->includeCollection($company->bank_transactions, $transformer, BankTransaction::class);
} }