Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Hide upgrade modal on /account_mgmt

Browse Source
This commit is contained in:
Hillel Coren 2016-10-18 18:01:33 +03:00
parent 733890ec3f
commit ffaea75c01
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/accounts/management.blade.php
View File

@ -176,6 +176,12 @@
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
// show plan popupl when clicking 'Upgrade' in navbar
function showUpgradeModal() {
showChangePlan();
}
function showChangePlan() { function showChangePlan() {
$('#changePlanModel').modal('show'); $('#changePlanModel').modal('show');
} }

4
resources/views/header.blade.php
View File

@ -369,7 +369,9 @@
@section('body') @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;"> <nav class="navbar navbar-default navbar-fixed-top" role="navigation" style="height:60px;">

4
resources/views/partials/upgrade_modal.blade.php
View File

@ -177,12 +177,8 @@
<script type="text/javascript"> <script type="text/javascript">
function showUpgradeModal() { function showUpgradeModal() {
@if (Request::is('settings/account_management'))
showChangePlan();
@else
$(window).scrollTop(0); $(window).scrollTop(0);
$('#upgrade-modal').fadeIn(); $('#upgrade-modal').fadeIn();
@endif
} }
function hideUpgradeModal() { function hideUpgradeModal() {