From dbbb4eb72268ff189454a7541eb565a0100d1dd6 Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Sun, 2 Nov 2014 14:46:18 +0200 Subject: [PATCH] Minor fixes --- README.md | 1 + app/lang/en/texts.php | 3 ++- app/views/dashboard.blade.php | 2 +- app/views/reports/d3.blade.php | 4 ++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 00c2a5dc0d..c19cc46726 100644 --- a/README.md +++ b/README.md @@ -69,6 +69,7 @@ Add public/ to your web server root ### Deleveloper Notes +* The application requires PHP >= 5.4.0 * If you make any changes to the JavaScript files you need to run grunt to create the built files. See Gruntfile.js for more details. * The lookup tables are cached in memory (ie, Currencies, Timezones, Languages, etc). If you add a record to the database you need to clear the cache by uncommenting Cache::flush() in app/routes.php. * If you run into any composer errors try running composer dump-autoload. diff --git a/app/lang/en/texts.php b/app/lang/en/texts.php index 28228cf0fe..678b70bccd 100644 --- a/app/lang/en/texts.php +++ b/app/lang/en/texts.php @@ -457,6 +457,7 @@ return array( 'more_designs_self_host_text' => '', 'buy' => 'Buy', 'bought_designs' => 'Successfully added additional invoice designs', - + + 'sent' => 'sent', ); \ No newline at end of file diff --git a/app/views/dashboard.blade.php b/app/views/dashboard.blade.php index 817732c138..cb8802f27f 100644 --- a/app/views/dashboard.blade.php +++ b/app/views/dashboard.blade.php @@ -37,7 +37,7 @@ {{ $invoicesSent }}
- {{ Utils::pluralize('invoice', $invoicesSent) }} sent + {{ Utils::pluralize('invoice', $invoicesSent) }} {{ trans('texts.sent') }}
diff --git a/app/views/reports/d3.blade.php b/app/views/reports/d3.blade.php index 0be8277a46..003cc95972 100644 --- a/app/views/reports/d3.blade.php +++ b/app/views/reports/d3.blade.php @@ -283,10 +283,14 @@ if (!invoice || invoice.invoice_status_id == 5) { return -1; } + var jsDate = convertToJsDate(invoice.created_at) || new Date().getTime(); return parseInt((new Date().getTime() - convertToJsDate(invoice.created_at)) / (1000*60*60*24)); } function convertToJsDate(isoDate) { + if (!isoDate) { + return false; + } var t = isoDate.split(/[- :]/); return new Date(t[0], t[1]-1, t[2], t[3], t[4], t[5]); }