From ffaea75c01a260c097d5116189cf4a3fe9dbebf9 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 18 Oct 2016 18:01:33 +0300
Subject: [PATCH] Hide upgrade modal on /account_mgmt

---
 resources/views/accounts/management.blade.php    | 6 ++++++
 resources/views/header.blade.php                 | 4 +++-
 resources/views/partials/upgrade_modal.blade.php | 8 ++------
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/resources/views/accounts/management.blade.php b/resources/views/accounts/management.blade.php
index 0b7b46dbea16..8d1a14482fcb 100644
--- a/resources/views/accounts/management.blade.php
+++ b/resources/views/accounts/management.blade.php
@@ -176,6 +176,12 @@
 </div>
 
 <script type="text/javascript">
+
+	// show plan popupl when clicking 'Upgrade' in navbar
+	function showUpgradeModal() {
+		showChangePlan();
+	}
+
 	function showChangePlan() {
 		$('#changePlanModel').modal('show');
 	}
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 5f9ec992998f..baaf6388caee 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -369,7 +369,9 @@
 
 @section('body')
 
-@include('partials.upgrade_modal')
+@if ( ! Request::is('settings/account_management'))
+  @include('partials.upgrade_modal')
+@endif
 
 <nav class="navbar navbar-default navbar-fixed-top" role="navigation" style="height:60px;">
 
diff --git a/resources/views/partials/upgrade_modal.blade.php b/resources/views/partials/upgrade_modal.blade.php
index eb60fe32e11f..c59b8b3c63bf 100644
--- a/resources/views/partials/upgrade_modal.blade.php
+++ b/resources/views/partials/upgrade_modal.blade.php
@@ -177,12 +177,8 @@
 <script type="text/javascript">
 
   function showUpgradeModal() {
-    @if (Request::is('settings/account_management'))
-      showChangePlan();
-    @else
-      $(window).scrollTop(0);
-      $('#upgrade-modal').fadeIn();
-    @endif
+    $(window).scrollTop(0);
+    $('#upgrade-modal').fadeIn();
   }
 
   function hideUpgradeModal() {