shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #566

Browse Source
This commit is contained in:
denisdulici 2018-10-24 17:32:00 +03:00
parent 8dd23b5419
commit 42f6b00485
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Http/Controllers/Banking/Transactions.php
View File

@ -39,12 +39,12 @@ class Transactions extends Controller
if ($type != 'income') { if ($type != 'income') {
$this->addTransactions(Payment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1)); $this->addTransactions(Payment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1));
$this->addTransactions(BillPayment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1), trans_choice('general.bills', 1)); $this->addTransactions(BillPayment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1));
} }
if ($type != 'expense') { if ($type != 'expense') {
$this->addTransactions(Revenue::collect(['paid_at'=> 'desc']), trans_choice('general.incomes', 1)); $this->addTransactions(Revenue::collect(['paid_at'=> 'desc']), trans_choice('general.incomes', 1));
$this->addTransactions(InvoicePayment::collect(['paid_at'=> 'desc']), trans_choice('general.incomes', 1), trans_choice('general.invoices', 1)); $this->addTransactions(InvoicePayment::collect(['paid_at'=> 'desc']), trans_choice('general.incomes', 1));
} }
$transactions = $this->getTransactions($request); $transactions = $this->getTransactions($request);
@ -57,27 +57,29 @@ class Transactions extends Controller
* *
* @param $items * @param $items
* @param $type * @param $type
* @param $category
*/ */
protected function addTransactions($items, $type, $category = null) protected function addTransactions($items, $type)
{ {
foreach ($items as $item) { foreach ($items as $item) {
$data = [ if (!empty($item->category)) {
$category_name = $item->category->name;
} else {
if ($type == trans_choice('general.incomes', 1)) {
$category_name = $item->invoice->category->name;
} else {
$category_name = $item->bill->category->name;
}
}
$this->transactions[] = (object) [
'paid_at' => $item->paid_at, 'paid_at' => $item->paid_at,
'account_name' => $item->account->name, 'account_name' => $item->account->name,
'type' => $type, 'type' => $type,
'description' => $item->description, 'description' => $item->description,
'amount' => $item->amount, 'amount' => $item->amount,
'currency_code' => $item->currency_code, 'currency_code' => $item->currency_code,
'category_name' => $category_name,
]; ];
if (!is_null($category)) {
$data['category_name'] = $category;
} else {
$data['category_name'] = $item->category->name;
}
$this->transactions[] = (object) $data;
} }
} }