From 0d6bc850deba4fa96754a0e68d5d30cbc4e33352 Mon Sep 17 00:00:00 2001
From: Jerome Nadaud <jerome.nadaud@prestashop.com>
Date: Mon, 25 Nov 2013 18:24:06 +0100
Subject: [PATCH] // Update datepicker button with period buttons select

---
 admin-dev/themes/default/js/calendar.js              | 12 ++++++++++++
 .../controllers/dashboard/helpers/view/view.tpl      |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/admin-dev/themes/default/js/calendar.js b/admin-dev/themes/default/js/calendar.js
index da16ddcc1..992b8fc1c 100644
--- a/admin-dev/themes/default/js/calendar.js
+++ b/admin-dev/themes/default/js/calendar.js
@@ -179,6 +179,8 @@ function setDayPeriod() {
 	$('#date-start').trigger('change');
 
 	updatePickerFromInput();
+	$('#datepickerFrom').val($("#date-start").val());
+	$('#datepickerTo').val($("#date-end").val());
 	$('button[name="submitDateRange"]').click();
 }
 
@@ -190,6 +192,8 @@ function setPreviousDayPeriod() {
 	$('#date-start').trigger('change');
 
 	updatePickerFromInput();
+	$('#datepickerFrom').val($("#date-start").val());
+	$('#datepickerTo').val($("#date-end").val());
 	$('button[name="submitDateRange"]').click();
 }
 
@@ -201,6 +205,8 @@ function setMonthPeriod() {
 	$('#date-start').trigger('change');	
 
 	updatePickerFromInput();
+	$('#datepickerFrom').val($("#date-start").val());
+	$('#datepickerTo').val($("#date-end").val());
 	$('button[name="submitDateRange"]').click();
 }
 
@@ -213,6 +219,8 @@ function setPreviousMonthPeriod() {
 	$('#date-start').trigger('change');	
 
 	updatePickerFromInput();
+	$('#datepickerFrom').val($("#date-start").val());
+	$('#datepickerTo').val($("#date-end").val());
 	$('button[name="submitDateRange"]').click();
 }
 
@@ -224,6 +232,8 @@ function setYearPeriod() {
 	$('#date-start').trigger('change');
 
 	updatePickerFromInput();
+	$('#datepickerFrom').val($("#date-start").val());
+	$('#datepickerTo').val($("#date-end").val());
 	$('button[name="submitDateRange"]').click();
 }
 
@@ -236,6 +246,8 @@ function setPreviousYearPeriod() {
 	$('#date-start').trigger('change');
 
 	updatePickerFromInput();
+	$('#datepickerFrom').val($("#date-start").val());
+	$('#datepickerTo').val($("#date-end").val());
 	$('button[name="submitDateRange"]').click();
 }
 
diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
index b9c8759ad..48e076708 100644
--- a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl
@@ -69,10 +69,10 @@
 								<button id="datepickerExpand" class="btn btn-default" type="button">
 									<i class="icon-calendar-empty"></i>
 									{l s='From'}
-									<strong class="text-info">{$datepickerFrom|escape}</strong>
-									- {l s='To'}
-									<strong class="text-info">{$datepickerTo|escape}</strong>
-									- 13 Days
+									<strong class="text-info" id="datepicker-from-info">{$datepickerFrom|escape}</strong>
+									{l s='To'}
+									<strong class="text-info" id="datepicker-to-info">{$datepickerTo|escape}</strong>
+									<strong class="text-info" id="datepicker-diff-info"></strong>
 									<i class="icon-caret-down"></i>
 								</button>