Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 19:54:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Return list of bank transactions

Browse Source
This commit is contained in:
David Bomba 2022-10-24 21:20:29 +11:00
parent c346218c55
commit dfed106ba1
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/BankTransactionController.php
View File

@ -550,9 +550,9 @@ class BankTransactionController extends BaseController
// MatchBankTransactions::dispatch(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()); // MatchBankTransactions::dispatch(auth()->user()->company()->id, auth()->user()->company()->db, $request->all());
$bt = (new MatchBankTransactions(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()))->handle(); $bts = (new MatchBankTransactions(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()))->handle();
return $this->itemResponse($bt); return $this->listResponse($bts);
} }

3
app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php
View File

@ -55,6 +55,9 @@ class MatchBankTransactionRequest extends Request
if(array_key_exists('ninja_category_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['ninja_category_id']) >= 1) if(array_key_exists('ninja_category_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['ninja_category_id']) >= 1)
$inputs['transactions'][$key]['ninja_category_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['ninja_category_id']); $inputs['transactions'][$key]['ninja_category_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['ninja_category_id']);
if(array_key_exists('vendor_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['vendor_id']) >= 1)
$inputs['transactions'][$key]['vendor_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['vendor_id']);
// $input = $this->decodePrimaryKeys($input); // $input = $this->decodePrimaryKeys($input);
} }

16
app/Jobs/Bank/MatchBankTransactions.php
View File

@ -61,6 +61,8 @@ class MatchBankTransactions implements ShouldQueue
private array $attachable_invoices = []; private array $attachable_invoices = [];
public $bts;
/** /**
* Create a new job instance. * Create a new job instance.
*/ */
@ -71,6 +73,7 @@ class MatchBankTransactions implements ShouldQueue
$this->db = $db; $this->db = $db;
$this->input = $input['transactions']; $this->input = $input['transactions'];
$this->categories = collect(); $this->categories = collect();
$this->bts = collect();
} }
@ -149,7 +152,7 @@ class MatchBankTransactions implements ShouldQueue
} }
private function matchInvoicePayment($input) :self private function matchInvoicePayment($input) :self
{ nlog($input); {
$this->bt = BankTransaction::find($input['id']); $this->bt = BankTransaction::find($input['id']);
$_invoices = Invoice::withTrashed()->find($this->getInvoices($input['invoice_ids'])); $_invoices = Invoice::withTrashed()->find($this->getInvoices($input['invoice_ids']));
@ -162,11 +165,13 @@ class MatchBankTransactions implements ShouldQueue
} }
$this->bts->push($this->bt);
return $this; return $this;
} }
private function matchExpense($input) :self private function matchExpense($input) :self
{ nlog($input); {
//if there is a category id, pull it from Yodlee and insert - or just reuse!! //if there is a category id, pull it from Yodlee and insert - or just reuse!!
$this->bt = BankTransaction::find($input['id']); $this->bt = BankTransaction::find($input['id']);
@ -187,6 +192,8 @@ class MatchBankTransactions implements ShouldQueue
$this->bt->status_id = BankTransaction::STATUS_CONVERTED; $this->bt->status_id = BankTransaction::STATUS_CONVERTED;
$this->bt->save(); $this->bt->save();
$this->bts->push($this->bt);
return $this; return $this;
} }
@ -302,8 +309,7 @@ class MatchBankTransactions implements ShouldQueue
if(array_key_exists('ninja_category_id', $input) && (int)$input['ninja_category_id'] > 1){ if(array_key_exists('ninja_category_id', $input) && (int)$input['ninja_category_id'] > 1){
$this->bt->ninja_category_id = $input['ninja_category_id']; $this->bt->ninja_category_id = $input['ninja_category_id'];
$this->bt->save(); $this->bt->save();
nlog("ninja category set");
nlog((int)$input['ninja_category_id']);
return (int)$input['ninja_category_id']; return (int)$input['ninja_category_id'];
} }
@ -316,7 +322,6 @@ class MatchBankTransactions implements ShouldQueue
if($category) if($category)
{ {
nlog("creating category");
$ec = ExpenseCategoryFactory::create($this->bt->company_id, $this->bt->user_id); $ec = ExpenseCategoryFactory::create($this->bt->company_id, $this->bt->user_id);
$ec->bank_category_id = $this->bt->category_id; $ec->bank_category_id = $this->bt->category_id;
$ec->name = $category->highLevelCategoryName; $ec->name = $category->highLevelCategoryName;
@ -325,7 +330,6 @@ class MatchBankTransactions implements ShouldQueue
return $ec->id; return $ec->id;
} }
nlog("hit null");
return null; return null;
} }