Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add last year option

Browse Source
This commit is contained in:
Hillel Coren 2016-12-25 23:58:40 +02:00
parent a7858a8561
commit f288915970
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/built.js.map
View File

File diff suppressed because one or more lines are too long

2
resources/assets/js/pdf.pdfmake.js
View File

@ -114,7 +114,7 @@ function GetPdfMake(invoice, javascript, callback) {
// set page size // set page size
dd.pageSize = invoice.account.page_size; dd.pageSize = invoice.account.page_size;
// dd.watermark = 'PAID'; //dd.watermark = {text: 'PAID', color: 'blue', opacity: 0.3};
pdfMake.fonts = {} pdfMake.fonts = {}
fonts = window.invoiceFonts || invoice.invoice_fonts; fonts = window.invoiceFonts || invoice.invoice_fonts;

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

@ -2278,6 +2278,7 @@ $LANG = array(
'last_30_days' => 'Last 30 Days', 'last_30_days' => 'Last 30 Days',
'this_month' => 'This Month', 'this_month' => 'This Month',
'last_month' => 'Last Month', 'last_month' => 'Last Month',
'last_year' => 'Last Year',
'custom_range' => 'Custom Range', 'custom_range' => 'Custom Range',
'url' => 'URL', 'url' => 'URL',
'debug' => 'Debug', 'debug' => 'Debug',

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

@ -114,7 +114,8 @@
"{{ trans('texts.last_7_days') }}": [moment().subtract(6, 'days'), moment()], "{{ trans('texts.last_7_days') }}": [moment().subtract(6, 'days'), moment()],
"{{ trans('texts.last_30_days') }}": [moment().subtract(29, 'days'), moment()], "{{ trans('texts.last_30_days') }}": [moment().subtract(29, 'days'), moment()],
"{{ trans('texts.this_month') }}": [moment().startOf('month'), moment().endOf('month')], "{{ 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_month') }}": [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')],
"{{ trans('texts.last_year') }}": [moment().subtract(1, 'year'), moment()],
} }
}, cb); }, cb);