From 7e5d488de737b2efb1529f689db2d20407561ccd Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 23 Nov 2017 13:50:11 +0200
Subject: [PATCH] Working on scheduled reports

---
 app/Http/Controllers/ReportController.php        |  6 ++++--
 resources/views/reports/report_builder.blade.php | 14 ++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index ff6d4d36bcf1..a475cd04f56d 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -115,9 +115,11 @@ class ReportController extends BaseController
                     break;
                 case 'schedule':
                     self::schedule($params, $config);
+                    return redirect('/reports');
                     break;
                 case 'cancel_schedule':
                     self::cancelSchdule();
+                    return redirect('/reports');
                     break;
             }
         } else {
@@ -157,7 +159,7 @@ class ReportController extends BaseController
             $schedule->send_date = Utils::toSqlDate(request('send_date'));
             $schedule->save();
 
-            session()->now('message', trans('texts.created_scheduled_report'));
+            session()->flash('message', trans('texts.created_scheduled_report'));
         }
     }
 
@@ -168,6 +170,6 @@ class ReportController extends BaseController
             ->wherePublicId(request('scheduled_report_id'))
             ->delete();
 
-        session()->now('message', trans('texts.deleted_scheduled_report'));
+        session()->flash('message', trans('texts.deleted_scheduled_report'));
     }
 }
diff --git a/resources/views/reports/report_builder.blade.php b/resources/views/reports/report_builder.blade.php
index 4b7ad5a688a7..ba6f51e9225d 100644
--- a/resources/views/reports/report_builder.blade.php
+++ b/resources/views/reports/report_builder.blade.php
@@ -381,12 +381,14 @@
     }
 
 	function onCancelScheduleClick() {
-		var reportType = $('#report_type').val();
-		$('#action').val('cancel_schedule');
-		$('#frequency').val(frequency);
-		$('#scheduled_report_id').val(scheduledReportMap[reportType]);
-        $('#submitButton').click();
-		$('#action').val('');
+		sweetConfirm(function() {
+			var reportType = $('#report_type').val();
+			$('#action').val('cancel_schedule');
+			$('#frequency').val(frequency);
+			$('#scheduled_report_id').val(scheduledReportMap[reportType]);
+	        $('#submitButton').click();
+			$('#action').val('');
+		});
 	}
 
 	function setFiltersShown() {