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

Update index.blade.php

Browse Source
This commit is contained in:
sausin 2018-12-14 11:23:15 +05:30 committed by GitHub
parent 7fb5fa4d41
commit 20b51c9179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/views/common/dashboard/index.blade.php
View File

@ -252,8 +252,8 @@
@push('scripts') @push('scripts')
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
var start = moment().startOf('year'); var start = moment('{{ $financial_start }}');
var end = moment().endOf('year'); var end = moment('{{ $financial_start }}').add('1', 'years').subtract('1', 'days');
function cb(start, end) { function cb(start, end) {
$('#cashflow-range span').html(start.format('D MMM YYYY') + ' - ' + end.format('D MMM YYYY')); $('#cashflow-range span').html(start.format('D MMM YYYY') + ' - ' + end.format('D MMM YYYY'));
@ -263,8 +263,8 @@
startDate: start, startDate: start,
endDate: end, endDate: end,
ranges: { ranges: {
'{{ trans("reports.this_year") }}': [moment().startOf('year'), moment().endOf('year')], '{{ trans("reports.this_year") }}': [start, end],
'{{ trans("reports.previous_year") }}': [moment().subtract(1, 'year').startOf('year'), moment().subtract(1, 'year').endOf('year')], '{{ trans("reports.previous_year") }}': [moment('{{ $financial_start }}').subtract(1, 'year'), moment('{{ $financial_start }}').subtract('1', 'days')],
'{{ trans("reports.this_quarter") }}': [moment().subtract(2, 'months').startOf('month'), moment().endOf('month')], '{{ trans("reports.this_quarter") }}': [moment().subtract(2, 'months').startOf('month'), moment().endOf('month')],
'{{ trans("reports.previous_quarter") }}': [moment().subtract(5, 'months').startOf('month'), moment().subtract(3, 'months').endOf('month')], '{{ trans("reports.previous_quarter") }}': [moment().subtract(5, 'months').startOf('month'), moment().subtract(3, 'months').endOf('month')],
'{{ trans("reports.last_12_months") }}': [moment().subtract(11, 'months').startOf('month'), moment().endOf('month')] '{{ trans("reports.last_12_months") }}': [moment().subtract(11, 'months').startOf('month'), moment().endOf('month')]
@ -330,8 +330,8 @@
function getRange(picker) { function getRange(picker) {
ranges = { ranges = {
'{{ trans("reports.this_year") }}': 'this_year', '{{ trans("reports.this_year") }}': 'custom',
'{{ trans("reports.previous_year") }}': 'previous_year', '{{ trans("reports.previous_year") }}': 'custom',
'{{ trans("reports.this_quarter") }}': 'this_quarter', '{{ trans("reports.this_quarter") }}': 'this_quarter',
'{{ trans("reports.previous_quarter") }}': 'previous_quarter', '{{ trans("reports.previous_quarter") }}': 'previous_quarter',
'{{ trans("reports.last_12_months") }}': 'last_12_months' '{{ trans("reports.last_12_months") }}': 'last_12_months'
@ -346,4 +346,4 @@
return range; return range;
} }
</script> </script>
@endpush @endpush