diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php index c6893a6014..0b4df645ba 100644 --- a/app/Http/Controllers/Popup/ReportController.php +++ b/app/Http/Controllers/Popup/ReportController.php @@ -173,7 +173,10 @@ class ReportController extends Controller /** @var CategoryRepositoryInterface $repository */ $repository = app(CategoryRepositoryInterface::class); $category = $repository->find(intval($attributes['categoryId'])); - $journals = $repository->journalsInPeriod(new Collection([$category]), $attributes['accounts'], [], $attributes['startDate'], $attributes['endDate']); + $types = [TransactionType::WITHDRAWAL, TransactionType::TRANSFER]; + $journals = $repository->journalsInPeriod( + new Collection([$category]), $attributes['accounts'], $types, $attributes['startDate'], $attributes['endDate'] + ); $view = view('popup.report.category-entry', compact('journals', 'category'))->render(); return $view; diff --git a/app/Http/Controllers/Report/InOutController.php b/app/Http/Controllers/Report/InOutController.php new file mode 100644 index 0000000000..7272597820 --- /dev/null +++ b/app/Http/Controllers/Report/InOutController.php @@ -0,0 +1,49 @@ +getIncomeReport($start, $end, $accounts); + $expenses = $helper->getExpenseReport($start, $end, $accounts); + $incomeTopLength = 8; + $expenseTopLength = 8; + + return Response::json( + [ + 'income' => view('reports.partials.income', compact('incomes', 'incomeTopLength'))->render(), + 'expenses' => view('reports.partials.expenses', compact('expenses', 'expenseTopLength'))->render(), + 'incomes_expenses' => view('reports.partials.income-vs-expenses', compact('expenses', 'incomes'))->render(), + ] + ); + } + +} \ No newline at end of file diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index ee09d7e9cd..7a208eafbb 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -22,7 +22,6 @@ use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountTaskerInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; @@ -226,12 +225,7 @@ class ReportController extends Controller */ private function defaultMonth(string $reportType, Carbon $start, Carbon $end, Collection $accounts) { - $incomeTopLength = 8; - $expenseTopLength = 8; - // get report stuff! - $incomes = $this->helper->getIncomeReport($start, $end, $accounts); - $expenses = $this->helper->getExpenseReport($start, $end, $accounts); $budgets = $this->budgetHelper->getBudgetReport($start, $end, $accounts); $categories = $this->helper->getCategoryReport($start, $end, $accounts); $balance = $this->balanceHelper->getBalanceReport($start, $end, $accounts); @@ -247,8 +241,7 @@ class ReportController extends Controller compact( 'start', 'end', 'reportType', 'tags', - 'incomes', 'incomeTopLength', - 'expenses', 'expenseTopLength', + 'incomes', 'budgets', 'balance', 'categories', 'bills', @@ -268,13 +261,8 @@ class ReportController extends Controller private function defaultMultiYear(string $reportType, Carbon $start, Carbon $end, Collection $accounts) { - $incomeTopLength = 8; - $expenseTopLength = 8; - // list of users stuff: $budgets = app(BudgetRepositoryInterface::class)->getActiveBudgets(); $categories = app(CategoryRepositoryInterface::class)->getCategories(); - $incomes = $this->helper->getIncomeReport($start, $end, $accounts); - $expenses = $this->helper->getExpenseReport($start, $end, $accounts); $tags = $this->helper->tagReport($start, $end, $accounts); // and some id's, joined: @@ -288,9 +276,7 @@ class ReportController extends Controller return view( 'reports.default.multi-year', compact( - 'budgets', 'accounts', 'categories', 'start', 'end', 'accountIds', 'reportType', - 'incomes', 'expenses', - 'incomeTopLength', 'expenseTopLength', 'tags' + 'budgets', 'accounts', 'categories', 'start', 'end', 'accountIds', 'reportType', 'tags' ) ); } @@ -305,11 +291,6 @@ class ReportController extends Controller */ private function defaultYear(string $reportType, Carbon $start, Carbon $end, Collection $accounts) { - $incomeTopLength = 8; - $expenseTopLength = 8; - - $incomes = $this->helper->getIncomeReport($start, $end, $accounts); - $expenses = $this->helper->getExpenseReport($start, $end, $accounts); $tags = $this->helper->tagReport($start, $end, $accounts); $budgets = $this->budgetHelper->budgetYearOverview($start, $end, $accounts); @@ -328,8 +309,7 @@ class ReportController extends Controller return view( 'reports.default.year', compact( - 'start', 'incomes', 'reportType', 'accountIds', 'end', - 'expenses', 'incomeTopLength', 'expenseTopLength', 'tags', 'budgets' + 'start', 'reportType', 'accountIds', 'end', 'tags', 'budgets' ) ); } diff --git a/app/Http/Middleware/Range.php b/app/Http/Middleware/Range.php index f64f5939e0..c483088515 100644 --- a/app/Http/Middleware/Range.php +++ b/app/Http/Middleware/Range.php @@ -75,12 +75,24 @@ class Range // set view variables. $this->configureView(); + + // set more view variables: + $this->configureList(); } return $theNext($request); } + /** + * + */ + private function configureList() + { + $pref = Preferences::get('list-length', config('firefly.list_length', 10))->data; + View::share('listLength', $pref); + } + private function configureView() { $pref = Preferences::get('language', config('firefly.default_language', 'en_US')); diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 9a47d6cc8b..6880813805 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -241,6 +241,7 @@ class CategoryRepository implements CategoryRepositoryInterface if (count($types) > 0) { $query->transactionTypes($types); } + if ($accounts->count() > 0) { $accountIds = $accounts->pluck('id')->toArray(); $query->leftJoin('transactions as t', 't.transaction_journal_id', '=', 'transaction_journals.id'); @@ -275,7 +276,7 @@ class CategoryRepository implements CategoryRepositoryInterface } - $second = $query->get(['transaction_journals.*']); + $second = $query->get(['transaction_journals.*','transaction_types.type as transaction_type_type']); $complete = $complete->merge($first); $complete = $complete->merge($second); diff --git a/config/firefly.php b/config/firefly.php index 9f540ab239..be4ee78bfd 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -28,6 +28,7 @@ return [ 'allowedMimes' => ['image/png', 'image/jpeg', 'application/pdf'], 'resend_confirmation' => 3600, 'confirmation_age' => 14400, // four hours + 'list_length' => 10, 'export_formats' => [ 'csv' => 'FireflyIII\Export\Exporter\CsvExporter', diff --git a/public/js/ff/reports/audit/all.js b/public/js/ff/reports/audit/all.js index c57875937c..f9f5a79f41 100644 --- a/public/js/ff/reports/audit/all.js +++ b/public/js/ff/reports/audit/all.js @@ -8,11 +8,6 @@ /* globals hideable */ - -/** - * Created by sander on 01/04/16. - */ - $(function () { "use strict"; diff --git a/public/js/ff/reports/default/all.js b/public/js/ff/reports/default/all.js index e92203fee9..d3a916c725 100644 --- a/public/js/ff/reports/default/all.js +++ b/public/js/ff/reports/default/all.js @@ -1,4 +1,4 @@ -/* globals startDate, endDate, reportType, accountIds */ +/* globals startDate, showOnlyTop, showFullList, endDate, reportType, accountIds, inOutReportUrl, accountReportUrl */ /* * all.js * Copyright (C) 2016 thegrumpydictator@gmail.com @@ -7,10 +7,6 @@ * of the MIT license. See the LICENSE file for details. */ -/** - * Created by sander on 01/04/16. - */ - $(function () { "use strict"; @@ -20,8 +16,62 @@ $(function () { // load the account report, which this report shows: loadAccountReport(); + // load income / expense / difference: + loadInOutReport(); + + // trigger list length things: + listLengthInitial(); + }); +function listLengthInitial() { + "use strict"; + $('.overListLength').hide(); + $('.listLengthTrigger').unbind('click').click(triggerList) +} + +function triggerList(e) { + "use strict"; + var link = $(e.target); + var table = link.parent().parent().parent().parent(); + console.log('data-hidden = ' + table.attr('data-hidden')); + if (table.attr('data-hidden') === 'no') { + // hide all elements, return false. + table.find('.overListLength').hide(); + table.attr('data-hidden', 'yes'); + link.text(showFullList); + return false; + } + // show all, return false + table.find('.overListLength').show(); + table.attr('data-hidden', 'no'); + link.text(showOnlyTop); + + return false; +} + +function loadInOutReport() { + "use strict"; + console.log('Going to grab ' + inOutReportUrl); + $.get(inOutReportUrl).done(placeInOutReport).fail(failInOutReport); +} + +function placeInOutReport(data) { + "use strict"; + $('#incomeReport').removeClass('loading').html(data.income); + $('#expenseReport').removeClass('loading').html(data.expenses); + $('#incomeVsExpenseReport').removeClass('loading').html(data.incomes_expenses); + listLengthInitial(); +} + +function failInOutReport() { + "use strict"; + console.log('Fail in/out report data!'); + $('#incomeReport').removeClass('loading').addClass('general-chart-error'); + $('#expenseReport').removeClass('loading').addClass('general-chart-error'); + $('#incomeVsExpenseReport').removeClass('loading').addClass('general-chart-error'); +} + function loadAccountReport() { "use strict"; $.get(accountReportUrl).done(placeAccountReport).fail(failAccountReport); diff --git a/public/js/ff/reports/default/month.js b/public/js/ff/reports/default/month.js index 22bb92dbc9..e970b554eb 100644 --- a/public/js/ff/reports/default/month.js +++ b/public/js/ff/reports/default/month.js @@ -1,14 +1,9 @@ -/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, expenseRestShow:true, incomeRestShow:true, year, month, hideTheRest, showTheRest, showTheRestExpense, hideTheRestExpense, columnChart, lineChart, stackedColumnChart */ +/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, year, month, columnChart, lineChart, stackedColumnChart */ $(function () { "use strict"; drawChart(); - - // click open the top X income list: - $('#showIncomes').click(showIncomes); - // click open the top X expense list: - $('#showExpenses').click(showExpenses); }); @@ -18,47 +13,4 @@ function drawChart() { // month view: // draw account chart lineChart('chart/account/report/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'account-balances-chart'); -} - - -function showIncomes() { - "use strict"; - if (incomeRestShow) { - // hide everything, make button say "show" - $('#showIncomes').text(showTheRest); - $('.incomesCollapsed').removeClass('in').addClass('out'); - - // toggle: - incomeRestShow = false; - } else { - // show everything, make button say "hide". - $('#showIncomes').text(hideTheRest); - $('.incomesCollapsed').removeClass('out').addClass('in'); - - // toggle: - incomeRestShow = true; - } - - return false; -} - -function showExpenses() { - "use strict"; - if (expenseRestShow) { - // hide everything, make button say "show" - $('#showExpenses').text(showTheRestExpense); - $('.expenseCollapsed').removeClass('in').addClass('out'); - - // toggle: - expenseRestShow = false; - } else { - // show everything, make button say "hide". - $('#showExpenses').text(hideTheRestExpense); - $('.expenseCollapsed').removeClass('out').addClass('in'); - - // toggle: - expenseRestShow = true; - } - - return false; } \ No newline at end of file diff --git a/public/js/ff/reports/default/multi-year.js b/public/js/ff/reports/default/multi-year.js index 984d0e4a72..78845f5100 100644 --- a/public/js/ff/reports/default/multi-year.js +++ b/public/js/ff/reports/default/multi-year.js @@ -1,15 +1,10 @@ -/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, expenseRestShow:true, incomeRestShow:true, year, month, hideTheRest, showTheRest, showTheRestExpense, hideTheRestExpense, columnChart, lineChart, stackedColumnChart */ +/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, year, month, columnChart, lineChart, stackedColumnChart */ $(function () { "use strict"; drawChart(); - // click open the top X income list: - $('#showIncomes').click(showIncomes); - // click open the top X expense list: - $('#showExpenses').click(showExpenses); - }); @@ -158,48 +153,4 @@ function readCookie(name) { function eraseCookie(name) { createCookie(name, "", -1); -} - - - -function showIncomes() { - "use strict"; - if (incomeRestShow) { - // hide everything, make button say "show" - $('#showIncomes').text(showTheRest); - $('.incomesCollapsed').removeClass('in').addClass('out'); - - // toggle: - incomeRestShow = false; - } else { - // show everything, make button say "hide". - $('#showIncomes').text(hideTheRest); - $('.incomesCollapsed').removeClass('out').addClass('in'); - - // toggle: - incomeRestShow = true; - } - - return false; -} - -function showExpenses() { - "use strict"; - if (expenseRestShow) { - // hide everything, make button say "show" - $('#showExpenses').text(showTheRestExpense); - $('.expenseCollapsed').removeClass('in').addClass('out'); - - // toggle: - expenseRestShow = false; - } else { - // show everything, make button say "hide". - $('#showExpenses').text(hideTheRestExpense); - $('.expenseCollapsed').removeClass('out').addClass('in'); - - // toggle: - expenseRestShow = true; - } - - return false; } \ No newline at end of file diff --git a/public/js/ff/reports/default/year.js b/public/js/ff/reports/default/year.js index 54627fc29d..3afa11d242 100644 --- a/public/js/ff/reports/default/year.js +++ b/public/js/ff/reports/default/year.js @@ -1,4 +1,4 @@ -/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, expenseRestShow:true, incomeRestShow:true, year, month, hideTheRest, showTheRest, showTheRestExpense, hideTheRestExpense, columnChart, lineChart, stackedColumnChart */ +/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, year, month, columnChart, lineChart, stackedColumnChart */ var chartDrawn; var budgetChart; @@ -7,10 +7,6 @@ $(function () { chartDrawn = false; drawChart(); - // click open the top X income list: - $('#showIncomes').click(showIncomes); - // click open the top X expense list: - $('#showExpenses').click(showExpenses); }); @@ -86,52 +82,5 @@ function clickBudgetChart(e) { } - // if chart drawn is true, add new data to existing chart. - // console.log('Budget id is ' + budgetId); - // $('#budget_chart').empty(); - // columnChart('chart/budget/period/' + budgetId + '/' + reportType + '/' + startDate + '/' + endDate + '/' + accountIds, 'budget_chart'); - - return false; -} - -function showIncomes() { - "use strict"; - if (incomeRestShow) { - // hide everything, make button say "show" - $('#showIncomes').text(showTheRest); - $('.incomesCollapsed').removeClass('in').addClass('out'); - - // toggle: - incomeRestShow = false; - } else { - // show everything, make button say "hide". - $('#showIncomes').text(hideTheRest); - $('.incomesCollapsed').removeClass('out').addClass('in'); - - // toggle: - incomeRestShow = true; - } - - return false; -} - -function showExpenses() { - "use strict"; - if (expenseRestShow) { - // hide everything, make button say "show" - $('#showExpenses').text(showTheRestExpense); - $('.expenseCollapsed').removeClass('in').addClass('out'); - - // toggle: - expenseRestShow = false; - } else { - // show everything, make button say "hide". - $('#showExpenses').text(hideTheRestExpense); - $('.expenseCollapsed').removeClass('out').addClass('in'); - - // toggle: - expenseRestShow = true; - } - return false; } \ No newline at end of file diff --git a/public/js/ff/reports/index.js b/public/js/ff/reports/index.js index 0419062234..8abb613f25 100644 --- a/public/js/ff/reports/index.js +++ b/public/js/ff/reports/index.js @@ -1,4 +1,4 @@ -/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, expenseRestShow:true, incomeRestShow:true, year, month, hideTheRest, showTheRest, showTheRestExpense, hideTheRestExpense, columnChart, lineChart, stackedColumnChart */ +/* globals google, startDate ,reportURL, endDate , reportType ,accountIds , picker:true, minDate, year, month, columnChart, lineChart, stackedColumnChart */ $(function () { diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 5e3cc55a51..186fe8a8ea 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -604,8 +604,8 @@ return [ 'in' => 'In', 'out' => 'Out', 'topX' => 'top :number', - 'showTheRest' => 'Show everything', - 'hideTheRest' => 'Show only the top :number', + 'show_full_list' => 'Show entire list', + 'show_only_top' => 'Show only top :number', 'sum_of_year' => 'Sum of year', 'sum_of_years' => 'Sum of years', 'average_of_year' => 'Average of year', diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index 960ec20917..376add29e6 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -192,6 +192,9 @@ var mon_thousands_sep = "{{ localeconv.mon_thousands_sep|escape('js') }}"; var frac_digits = {{ localeconv.frac_digits }}; + var showFullList = '{{ trans('firefly.show_full_list') }}'; + var showOnlyTop = '{{ trans('firefly.show_only_top',{number:listLength}) }}'; + diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig index 69f1642d41..05f70e7ab5 100644 --- a/resources/views/reports/default/month.twig +++ b/resources/views/reports/default/month.twig @@ -22,18 +22,13 @@
-
- - {% include 'reports/partials/income.twig' %} +
-
- - {% include 'reports/partials/expenses.twig' %} +
-
- {% include 'reports/partials/income-vs-expenses.twig' %} +
{% include 'reports/partials/tags.twig' %} @@ -84,17 +79,9 @@ var reportType = '{{ reportType }}'; var accountIds = '{{ accountIds }}'; - var incomeTopLength = {{ incomeTopLength }}; - var expenseTopLength = {{ expenseTopLength }}; - var incomeRestShow = false; // starts hidden. - var expenseRestShow = false; // starts hidden. - var showTheRest = '{{ trans('firefly.showTheRest',{number:incomeTopLength}) }}'; - var hideTheRest = '{{ trans('firefly.hideTheRest',{number:incomeTopLength}) }}'; - var showTheRestExpense = '{{ trans('firefly.showTheRest',{number:expenseTopLength}) }}'; - var hideTheRestExpense = '{{ trans('firefly.hideTheRest',{number:expenseTopLength}) }}'; - var accountReportUrl = '{{ route('reports.data.accountReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}'; + var inOutReportUrl = '{{ route('reports.data.inOutReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}'; diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig index b631c35ff3..d77e17636d 100644 --- a/resources/views/reports/default/multi-year.twig +++ b/resources/views/reports/default/multi-year.twig @@ -33,18 +33,13 @@
-
- - {% include 'reports/partials/income.twig' %} +
-
- - {% include 'reports/partials/expenses.twig' %} +
-
- {% include 'reports/partials/income-vs-expenses.twig' %} +
{% include 'reports/partials/tags.twig' %} @@ -165,17 +160,9 @@ var reportType = '{{ reportType }}'; var accountIds = '{{ accountIds }}'; - var incomeTopLength = {{ incomeTopLength }}; - var expenseTopLength = {{ expenseTopLength }}; - var incomeRestShow = false; // starts hidden. - var expenseRestShow = false; // starts hidden. - var showTheRest = '{{ trans('firefly.showTheRest',{number:incomeTopLength}) }}'; - var hideTheRest = '{{ trans('firefly.hideTheRest',{number:incomeTopLength}) }}'; - var showTheRestExpense = '{{ trans('firefly.showTheRest',{number:expenseTopLength}) }}'; - var hideTheRestExpense = '{{ trans('firefly.hideTheRest',{number:expenseTopLength}) }}'; - var accountReportUrl = '{{ route('reports.data.accountReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}'; + var inOutReportUrl = '{{ route('reports.data.inOutReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}'; diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig index 8bf9e86b1f..c65d56d98a 100644 --- a/resources/views/reports/default/year.twig +++ b/resources/views/reports/default/year.twig @@ -33,14 +33,12 @@
- {% include 'reports/partials/income-vs-expenses.twig' %} - +
-
- {% include 'reports/partials/income.twig' %}
-
- {% include 'reports/partials/expenses.twig' %} +
+
+
@@ -125,18 +123,9 @@ var reportType = '{{ reportType }}'; var accountIds = '{{ accountIds }}'; - - var incomeTopLength = {{ incomeTopLength }}; - var expenseTopLength = {{ expenseTopLength }}; - var incomeRestShow = false; // starts hidden. - var expenseRestShow = false; // starts hidden. - var showTheRest = '{{ trans('firefly.showTheRest',{number:incomeTopLength}) }}'; - var hideTheRest = '{{ trans('firefly.hideTheRest',{number:incomeTopLength}) }}'; - var showTheRestExpense = '{{ trans('firefly.showTheRest',{number:expenseTopLength}) }}'; - var hideTheRestExpense = '{{ trans('firefly.hideTheRest',{number:expenseTopLength}) }}'; - var accountReportUrl = '{{ route('reports.data.accountReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}'; + var inOutReportUrl = '{{ route('reports.data.inOutReport', [start.format('Ymd'), end.format('Ymd'), accountIds]) }}'; diff --git a/resources/views/reports/partials/expenses.twig b/resources/views/reports/partials/expenses.twig index 69a3881f9a..a2465c390b 100644 --- a/resources/views/reports/partials/expenses.twig +++ b/resources/views/reports/partials/expenses.twig @@ -6,8 +6,8 @@ {% for expense in expenses.getExpenses %} - {% if loop.index > expenseTopLength %} - + {% if loop.index > listLength %} + {% else %} {% endif %} @@ -32,7 +32,7 @@ {% if expenses.getExpenses|length > expenseTopLength %} {% endif %} diff --git a/resources/views/reports/partials/income.twig b/resources/views/reports/partials/income.twig index 8674c74258..6d47763b9f 100644 --- a/resources/views/reports/partials/income.twig +++ b/resources/views/reports/partials/income.twig @@ -6,8 +6,8 @@
- {{ trans('firefly.showTheRest',{number:incomeTopLength}) }} + {{ trans('firefly.show_full_list',{number:incomeTopLength}) }}
{% for income in incomes.getIncomes %} - {% if loop.index > incomeTopLength %} - + {% if loop.index > listLength %} + {% else %} {% endif %} @@ -23,15 +23,16 @@ {% endif %} + {% endfor %} - {% if incomes.getIncomes|length > incomeTopLength %} + {% if incomes.getIncomes|length > listLength %} {% endif %} diff --git a/routes/web.php b/routes/web.php index c22422058d..c9243d04f2 100755 --- a/routes/web.php +++ b/routes/web.php @@ -317,11 +317,18 @@ Route::group( /** * Report AJAX data Controller: */ + // account report Route::get( - '/reports/data/accountReport/{start_date}/{end_date}/{accountList}', + '/reports/data/account-report/{start_date}/{end_date}/{accountList}', ['uses' => 'Report\AccountController@accountReport', 'as' => 'reports.data.accountReport'] ); + // income report + Route::get( + '/reports/data/in-out-report/{start_date}/{end_date}/{accountList}', + ['uses' => 'Report\InOutController@inOutReport', 'as' => 'reports.data.inOutReport'] + ); + /** * Rules Controller */
{{ income.amount|formatAmount }}
- {{ trans('firefly.showTheRest',{number:incomeTopLength}) }} + {{ trans('firefly.show_full_list',{ number:listLength } ) }}