Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use fiscal year in date range picker #1310

Browse Source
This commit is contained in:
Hillel Coren 2017-02-09 17:13:47 +02:00
parent c9978c1db0
commit 0b791dc9bf
4 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Ninja/Presenters/AccountPresenter.php
View File

@ -2,6 +2,7 @@
namespace App\Ninja\Presenters; namespace App\Ninja\Presenters;
use Carbon;
use Domain; use Domain;
use Laracasts\Presenter\Presenter; use Laracasts\Presenter\Presenter;
use stdClass; use stdClass;
@ -112,4 +113,23 @@ class AccountPresenter extends Presenter
return $data; return $data;
} }
public function dateRangeOptions()
{
$yearStart = Carbon::parse($this->entity->financialYearStart() ?: '2000-01-01');
$month = $yearStart->month - 1;
$year = $yearStart->year;
$lastYear = $year - 1;
$str = '{
"' . trans('texts.last_7_days') . '": [moment().subtract(6, "days"), moment()],
"' . trans('texts.last_30_days') . '": [moment().subtract(29, "days"), moment()],
"' . trans('texts.this_month') . '": [moment().startOf("month"), moment().endOf("month")],
"' . trans('texts.last_month') . '": [moment().subtract(1, "month").startOf("month"), moment().subtract(1, "month").endOf("month")],
"' . trans('texts.this_year') . '": [moment().date(1).month(' . $month . ').year(' . $year . '), moment()],
"' . trans('texts.last_year') . '": [moment().date(1).month(' . $month . ').year(' . $lastYear . '), moment().date(1).month(' . $month . ').year(' . $year . ').subtract(1, "day")],
}';
return $str;
}
} }

3
resources/lang/en/texts.php
View File

@ -2356,7 +2356,8 @@ $LANG = array(
'template' => 'Template', 'template' => 'Template',
'start_of_week_help' => 'Used by <b>date</b> selectors', 'start_of_week_help' => 'Used by <b>date</b> selectors',
'financial_year_start_help' => 'Used by <b>date range</b> selectors', 'financial_year_start_help' => 'Used by <b>date range</b> selectors',
'reports_help' => 'Shift + Click to sort by multple columns, Ctrl + Click to clear the grouping.' 'reports_help' => 'Shift + Click to sort by multple columns, Ctrl + Click to clear the grouping.',
'this_year' => 'This Year',
); );

8
resources/views/dashboard.blade.php
View File

@ -110,13 +110,7 @@
startDate: chartStartDate, startDate: chartStartDate,
endDate: chartEndDate, endDate: chartEndDate,
linkedCalendars: false, linkedCalendars: false,
ranges: { ranges: {!! $account->present()->dateRangeOptions !!}
"{{ trans('texts.last_7_days') }}": [moment().subtract(6, 'days'), moment()],
"{{ trans('texts.last_30_days') }}": [moment().subtract(29, 'days'), moment()],
"{{ trans('texts.this_month') }}": [moment().startOf('month'), moment().endOf('month')],
"{{ trans('texts.last_month') }}": [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
"{{ trans('texts.last_year') }}": [moment().subtract(1, 'year'), moment()],
}
}, cb); }, cb);
cb(chartStartDate, chartEndDate); cb(chartStartDate, chartEndDate);

11
resources/views/reports/chart_builder.blade.php
View File

@ -37,18 +37,13 @@
$('#reportrange').daterangepicker({ $('#reportrange').daterangepicker({
locale: { locale: {
"format": "{{ $account->getMomentDateFormat() }}", format: "{{ $account->getMomentDateFormat() }}",
customRangeLabel: "{{ trans('texts.custom_range') }}",
}, },
startDate: chartStartDate, startDate: chartStartDate,
endDate: chartEndDate, endDate: chartEndDate,
linkedCalendars: false, linkedCalendars: false,
ranges: { ranges: {!! $account->present()->dateRangeOptions !!}
'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract(29, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
'This Year': [moment().startOf('year'), moment().endOf('month')]
}
}, cb); }, cb);
cb(chartStartDate, chartEndDate); cb(chartStartDate, chartEndDate);