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

Merge branch '1.3-dev' of github.com:akaunting/akaunting into 1.3-dev

Browse Source
This commit is contained in:
Batuhan Baş 2018-10-25 10:36:17 +03:00
commit 1c284de86a
2 changed files with 16 additions and 14 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') {
$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') {
$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);
@ -57,27 +57,29 @@ class Transactions extends Controller
*
* @param $items
* @param $type
* @param $category
*/
protected function addTransactions($items, $type, $category = null)
protected function addTransactions($items, $type)
{
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,
'account_name' => $item->account->name,
'type' => $type,
'description' => $item->description,
'amount' => $item->amount,
'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;
}
}

2
resources/lang/en-GB/invoices.php
View File

@ -31,7 +31,7 @@ return [
'mark_sent' => 'Mark Sent',
'download_pdf' => 'Download PDF',
'send_mail' => 'Send Email',
'all_invoices' => 'Login to for all invoices',
'all_invoices' => 'Login to view all invoices',
'status' => [
'draft' => 'Draft',