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

replaced revenues/payments with transactions

Browse Source
This commit is contained in:
denisdulici
2019-11-27 12:08:36 +03:00
parent e4d0de0677
commit 3a15c1d615
28 changed files with 139 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Widgets/IncomesByCategory.php
View File

@@ -30,14 +30,14 @@ class IncomesByCategory extends AbstractWidget
$incomes_amount = $open_invoice = $overdue_invoice = 0;
// Get categories
$categories = Category::with(['invoices', 'revenues'])->type(['income'])->enabled()->get();
$categories = Category::with(['invoices', 'income_transacions'])->type(['income'])->enabled()->get();
foreach ($categories as $category) {
$amount = 0;
// Revenues
foreach ($category->revenues as $revenue) {
$amount += $revenue->getAmountConvertedToDefault();
// Transactions
foreach ($category->income_transacions as $transacion) {
$amount += $transacion->getAmountConvertedToDefault();
}
$incomes_amount += $amount;
@@ -151,14 +151,14 @@ class IncomesByCategory extends AbstractWidget
$incomes_amount = $open_invoice = $overdue_invoice = 0;
// Get categories
$categories = Category::with(['invoices', 'revenues'])->type(['income'])->enabled()->get();
$categories = Category::with(['invoices', 'income_transacions'])->type(['income'])->enabled()->get();
foreach ($categories as $category) {
$amount = 0;
// Revenues
foreach ($category->revenues as $revenue) {
$amount += $revenue->getAmountConvertedToDefault();
// Transactions
foreach ($category->income_transacions as $transacion) {
$amount += $transacion->getAmountConvertedToDefault();
}
$incomes_amount += $amount;