From 8b2fdc3860c6952138a39017c598eea48996f0a9 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 25 Dec 2016 20:22:56 +0200
Subject: [PATCH] Clarify dashboard values

---
 resources/lang/en/texts.php         |  5 +++++
 resources/views/dashboard.blade.php | 28 +++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 1d3e6666336c..faea22758fb4 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2275,6 +2275,11 @@ $LANG = array(
     'invoice_name' => 'Invoice',
     'product_will_create' => 'product will be created',
     'contact_us_response' => 'Your message has been sent',
+    'last_7_days' => 'Last 7 Days',
+    'last_30_days' => 'Last 30 Days',
+    'this_month' => 'This Month',
+    'last_month' => 'Last Month',
+    'custom_range' => 'Custom Range',
 
 );
 
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 180d49b05844..f14f4c2fac90 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -94,25 +94,27 @@
 
             // Initialize date range selector
 
-            function cb(start, end) {
+            function cb(start, end, label) {
                 $('#reportrange span').html(start.format('{{ $account->getMomentDateFormat() }}') + ' - ' + end.format('{{ $account->getMomentDateFormat() }}'));
                 chartStartDate = start;
                 chartEndDate = end;
+				$('.range-label-div').text(label);
                 loadData();
             }
 
             $('#reportrange').daterangepicker({
                 locale: {
-                    "format": "{{ $account->getMomentDateFormat() }}",
+                    format: "{{ $account->getMomentDateFormat() }}",
+					customRangeLabel: "{{ trans('texts.custom_range') }}",
                 },
-                startDate: chartStartDate,
+				startDate: chartStartDate,
                 endDate: chartEndDate,
                 linkedCalendars: false,
                 ranges: {
-                   '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')]
+                   "{{ 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')]
                 }
             }, cb);
 
@@ -206,6 +208,9 @@
         <div class="panel panel-default">
             <div class="panel-body">
                 <div style="overflow:hidden">
+					<div class="range-label-div in-thin pull-right" style="color:#337ab7">
+						{{ trans('texts.last_30_days') }}
+					</div>
                     <div class="in-thin">
                         {{ trans('texts.total_revenue') }}
                     </div>
@@ -233,6 +238,9 @@
             <div class="panel-body">
                 <div style="overflow:hidden">
                     @if (count($expenses))
+						<div class="range-label-div in-thin pull-right" style="color:#337ab7">
+							{{ trans('texts.last_30_days') }}
+						</div>
                         <div class="in-thin">
                             {{ trans('texts.total_expenses') }}
                         </div>
@@ -246,6 +254,9 @@
                             @endforeach
                         </div>
                     @else
+						<div class="range-label-div in-thin pull-right" style="color:#337ab7">
+							{{ trans('texts.last_30_days') }}
+						</div>
                         <div class="in-thin">
                             {{ trans('texts.average_invoice') }}
                         </div>
@@ -273,6 +284,9 @@
         <div class="panel panel-default">
             <div class="panel-body">
                 <div style="overflow:hidden">
+					<div class="range-label-div in-thin pull-right" style="color:#337ab7">
+						{{ trans('texts.last_30_days') }}
+					</div>
                     <div class="in-thin">
                         {{ trans('texts.outstanding') }}
                     </div>