From 9b149189fb54736ebe5fb7f1def946fbd57f4a2c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 23 Apr 2014 16:46:52 +0300
Subject: [PATCH] Bug fixes

---
 app/controllers/InvoiceController.php |  1 +
 app/controllers/PaymentController.php |  1 +
 app/views/header.blade.php            |  9 ++++++---
 app/views/payments/payment.blade.php  | 15 +++++++--------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/controllers/InvoiceController.php b/app/controllers/InvoiceController.php
index 190ce3c455a3..6c70eba77bac 100755
--- a/app/controllers/InvoiceController.php
+++ b/app/controllers/InvoiceController.php
@@ -145,6 +145,7 @@ class InvoiceController extends \BaseController {
 		$invoice->is_pro = $client->account->isPro();
 
 		$data = array(
+			'hideHeader' => true,
 			'showBreadcrumbs' => false,
 			'invoice' => $invoice->hidePrivateFields(),
 			'invitation' => $invitation,
diff --git a/app/controllers/PaymentController.php b/app/controllers/PaymentController.php
index 42bce237bc07..f76fd271f297 100755
--- a/app/controllers/PaymentController.php
+++ b/app/controllers/PaymentController.php
@@ -250,6 +250,7 @@ class PaymentController extends \BaseController
 
         $data = [
             'showBreadcrumbs' => false,
+            'hideHeader' => true,
             'invitationKey' => $invitationKey,
             'invoice' => $invoice,
             'client' => $client,
diff --git a/app/views/header.blade.php b/app/views/header.blade.php
index d4f2bf6398c1..00042200225d 100755
--- a/app/views/header.blade.php
+++ b/app/views/header.blade.php
@@ -94,8 +94,8 @@
       </a>	    
     </div>
 
-    @if (Auth::check())
     <div class="collapse navbar-collapse" id="navbar-collapse-1">
+      @if (Auth::check() && !isset($hideHeader))
       <ul class="nav navbar-nav" style="font-weight: bold">
         {{ HTML::nav_link('dashboard', 'dashboard') }}
         {{ HTML::menu_link('client') }}
@@ -178,8 +178,11 @@
           </ul>
         </li>
       </ul>
-      @endif      
-
+      @else
+        <div style="height:60px"/>
+      @endif  
+      
+      
     </div><!-- /.navbar-collapse -->
 
 
diff --git a/app/views/payments/payment.blade.php b/app/views/payments/payment.blade.php
index c5053e798fa3..f597999b0d49 100755
--- a/app/views/payments/payment.blade.php
+++ b/app/views/payments/payment.blade.php
@@ -73,14 +73,13 @@
       {{ Former::text('state')->label('State/Province') }}
       {{ Former::text('postal_code') }}
       
-      <?php if(strtolower($gateway->name) == 'beanstream') { ?>
-		{{ Former::select('country')->addOption('','')->label('Country')
-			->fromQuery($countries, 'name', 'iso_3166_2') }}
-	  	{{ Former::text('phone') }}
-	  	{{ Former::text('email') }}
-	  <?php } ?>
-	  
-	  <?php echo($gateway->name); ?>
+      @if(strtolower($gateway->name) == 'beanstream')
+		    {{ Former::select('country')->addOption('','')->label('Country')
+			       ->fromQuery($countries, 'name', 'iso_3166_2') }}
+	  	  {{ Former::text('phone') }}
+	  	  {{ Former::text('email') }}
+	    @endif
+	  	  
       {{ Former::actions( Button::primary_submit_lg(trans('texts.pay_now') . ' - ' . Utils::formatMoney($invoice->amount, $client->currency_id) )) }}
 
     </div>