From f9a8642909cb8f2880bc67c81d4d0c4e803f5ea3 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Tue, 18 Mar 2014 23:25:54 +0200
Subject: [PATCH] Bug fixes

---
 app/controllers/AccountController.php | 2 +-
 app/views/accounts/payments.blade.php | 2 +-
 app/views/invoices/edit.blade.php     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 81b69709a058..0022b9d0971c 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -442,7 +442,7 @@ class AccountController extends \BaseController {
 			
 			foreach ($fields as $field => $details)
 			{
-				if (!in_array($field, ['testMode', 'developerMode', 'headerImageUrl', 'solutionType', 'landingPage']))
+				if (!in_array($field, ['testMode', 'developerMode', 'headerImageUrl', 'solutionType', 'landingPage', 'brandName']))
 				{
 					$rules[$gateway->id.'_'.$field] = 'required';
 				}				
diff --git a/app/views/accounts/payments.blade.php b/app/views/accounts/payments.blade.php
index ed8a8f92a408..eb17821f213d 100755
--- a/app/views/accounts/payments.blade.php
+++ b/app/views/accounts/payments.blade.php
@@ -32,7 +32,7 @@
 		<div id="gateway_{{ $gateway->id }}_div" style="display: none">
 			@foreach ($gateway->fields as $field => $details)
 
-				@if ($field == 'solutionType' || $field == 'landingPage')
+				@if (in_array($field, ['solutionType', 'landingPage', 'headerImageUrl', 'brandName']))
 					{{-- do nothing --}}
 				@elseif ($field == 'testMode' || $field == 'developerMode') 
 					{{-- Former::checkbox($gateway->id.'_'.$field)->label(Utils::toSpaceCase($field))->text('Enable') --}}				
diff --git a/app/views/invoices/edit.blade.php b/app/views/invoices/edit.blade.php
index e4bd8783e01a..9d6cde00eb62 100755
--- a/app/views/invoices/edit.blade.php
+++ b/app/views/invoices/edit.blade.php
@@ -578,8 +578,8 @@
 		
 		@if (file_exists($account->getLogoPath()))
 			invoice.image = "{{ HTML::image_data($account->getLogoPath()) }}";
-			invoice.imageWidth = {{ $account->getLogoWidth() * (72/96) }};
-			invoice.imageHeight = {{ $account->getLogoHeight() * (72/96) }};
+			invoice.imageWidth = {{ $account->getLogoWidth() }};
+			invoice.imageHeight = {{ $account->getLogoHeight() }};
 		@endif