From 1e48a9c17d2deb67b14931c32561529fa33fa05a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 18 Sep 2016 17:06:56 +0300
Subject: [PATCH] Use improve date selector in reports

---
 app/Http/Controllers/ReportController.php     |  9 +--
 resources/lang/en/texts.php                   |  2 +
 .../views/reports/chart_builder.blade.php     | 67 +++++++++++++++++--
 3 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 845168b6ae1b..327ff7e5ee25 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -56,8 +56,8 @@ class ReportController extends BaseController
         if (Input::all()) {
             $reportType = Input::get('report_type');
             $dateField = Input::get('date_field');
-            $startDate = Utils::toSqlDate(Input::get('start_date'), false);
-            $endDate = Utils::toSqlDate(Input::get('end_date'), false);
+            $startDate = date_create(Input::get('start_date'));
+            $endDate = date_create(Input::get('end_date'));
         } else {
             $reportType = ENTITY_INVOICE;
             $dateField = FILTER_INVOICE_DATE;
@@ -75,11 +75,12 @@ class ReportController extends BaseController
         ];
 
         $params = [
-            'startDate' => $startDate->format(Session::get(SESSION_DATE_FORMAT)),
-            'endDate' => $endDate->format(Session::get(SESSION_DATE_FORMAT)),
+            'startDate' => $startDate->format('Y-m-d'),
+            'endDate' => $endDate->format('Y-m-d'),
             'reportTypes' => $reportTypes,
             'reportType' => $reportType,
             'title' => trans('texts.charts_and_reports'),
+            'account' => Auth::user()->account,
         ];
 
         if (Auth::user()->account->hasFeature(FEATURE_REPORTS)) {
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index dc2da788cae9..62ac291ea689 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2129,6 +2129,8 @@ $LANG = array(
     'max' => 'Max',
     'limits_not_met' => 'This invoice does not meet the limits for that payment type.',
 
+    'date_range' => 'Date Range',
+
 );
 
 return $LANG;
diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php
index a8d4f6b724a3..7b6d15bc1347 100644
--- a/resources/views/reports/chart_builder.blade.php
+++ b/resources/views/reports/chart_builder.blade.php
@@ -1,9 +1,52 @@
 @extends('header')
 
+@section('head')
+	@parent
+
+    <script src="{{ asset('js/daterangepicker.min.js') }}" type="text/javascript"></script>
+    <link href="{{ asset('css/daterangepicker.css') }}" rel="stylesheet" type="text/css"/>
+
+@stop
+
 @section('content')
 	@parent
 	@include('accounts.nav', ['selected' => ACCOUNT_REPORTS, 'advanced' => true])
 
+    <script type="text/javascript">
+
+        $(function() {
+
+            var chartStartDate = moment("{{ $startDate }}");
+            var chartEndDate = moment("{{ $endDate }}");
+
+            // Initialize date range selector
+            function cb(start, end) {
+                $('#reportrange span').html(start.format('{{ $account->getMomentDateFormat() }}') + ' - ' + end.format('{{ $account->getMomentDateFormat() }}'));
+                $('#start_date').val(start.format('YYYY-MM-DD'));
+                $('#end_date').val(end.format('YYYY-MM-DD'));
+            }
+
+            $('#reportrange').daterangepicker({
+                locale: {
+                    "format": "{{ $account->getMomentDateFormat() }}",
+                },
+                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')]
+                }
+            }, cb);
+
+            cb(chartStartDate, chartEndDate);
+
+        });
+
+    </script>
+
 
     {!! Former::open()->rules(['start_date' => 'required', 'end_date' => 'required'])->addClass('warn-on-exit') !!}
 
@@ -24,13 +67,25 @@
                 <div class="row">
                     <div class="col-md-6">
 
-            			{!! Former::text('start_date')->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))
-                                ->addGroupClass('start_date')
-            					->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'start_date\')"></i>') !!}
-            			{!! Former::text('end_date')->data_date_format(Session::get(SESSION_DATE_PICKER_FORMAT))
-                                ->addGroupClass('end_date')
-            					->append('<i class="glyphicon glyphicon-calendar" onclick="toggleDatePicker(\'end_date\')"></i>') !!}
+                        <div class="form-group">
+                            <label for="reportrange" class="control-label col-lg-4 col-sm-4">
+                                {{ trans('texts.date_range') }}
+                            </label>
+                            <div class="col-lg-8 col-sm-8">
+                                <div id="reportrange" style="background: #f9f9f9; cursor: pointer; padding: 9px 14px; border: 1px solid #dfe0e1; margin-top: 0px; margin-left:18px">
+                                    <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>&nbsp;
+                                    <span></span> <b class="caret"></b>
+                                </div>
 
+                                <div style="display:none">
+                                    {!! Former::text('start_date') !!}
+                                    {!! Former::text('end_date') !!}
+                                </div>
+                            </div>
+                        </div>
+
+
+                        <p>&nbsp;</p>
                         <p>&nbsp;</p>
                         {!! Former::actions(
                                 Button::primary(trans('texts.export'))->withAttributes(array('onclick' => 'onExportClick()'))->appendIcon(Icon::create('export')),