Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

Merge pull request #2801 from FELDSAM-INC/feature/quarters-in-daterange

Browse Source 
DateRangePicker added Quarters
This commit is contained in:
Hillel Coren 2019-04-29 09:45:09 +03:00 committed by GitHub
commit 0c3c72aa8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,6 +169,8 @@ class AccountPresenter extends Presenter
"' . 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.current_quarter') . '": [moment().quarter(chartQuarter).startOf("quarter"), moment().quarter(chartQuarter).endOf("quarter")],
"' . trans('texts.last_quarter') . '": [moment().subtract(1, "quarter").startOf("quarter"), moment().subtract(1, "quarter").endOf("quarter")],
"' . 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")],
}';

2
resources/lang/cs/texts.php
View File

@ -2067,6 +2067,8 @@ $LANG = array(
'last_30_days' => 'Poslední měsíc',
'this_month' => 'Tento měsíc',
'last_month' => 'Last Month',
'current_quarter' => 'Aktuální čtvrtletí',
'last_quarter' => 'Poslední čtvrtletí',
'last_year' => 'Last Year',
'custom_range' => 'Custom Range',
'url' => 'URL',

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

@ -2065,6 +2065,8 @@ $LANG = array(
'last_30_days' => 'Last 30 Days',
'this_month' => 'This Month',
'last_month' => 'Last Month',
'current_quarter' => 'Current Quarter',
'last_quarter' => 'Last Quarter',
'last_year' => 'Last Year',
'custom_range' => 'Custom Range',
'url' => 'URL',

1
resources/views/clients/statement.blade.php
View File

@ -22,6 +22,7 @@
var statementStartDate = moment("{{ $startDate }}");
var statementEndDate = moment("{{ $endDate }}");
var chartQuarter = moment().quarter();
var dateRanges = {!! $account->present()->dateRangeOptions !!};
function getPDFString(cb) {

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

@ -86,6 +86,7 @@
var account = {!! $account !!};
var chartGroupBy = 'day';
var chartCurrencyId = {{ $account->getCurrencyId() }};
var chartQuarter = moment().quarter();
var dateRanges = {!! $account->present()->dateRangeOptions !!};
var chartStartDate;
var chartEndDate;

1
resources/views/reports/emails.blade.php
View File

@ -92,6 +92,7 @@
}
var account = {!! $account !!};
var chartQuarter = moment().quarter();
var dateRanges = {!! $account->present()->dateRangeOptions !!};
var chartStartDate;
var chartEndDate;

1
resources/views/reports/report_builder.blade.php
View File

@ -63,6 +63,7 @@
var chartStartDate = moment("{{ $startDate }}");
var chartEndDate = moment("{{ $endDate }}");
var chartQuarter = moment().quarter();
var dateRanges = {!! $account->present()->dateRangeOptions !!};
function resolveRange(range) {