From 17443a3d4f21d4781ffae92be9e63a7269a4b7b3 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Mon, 13 Jun 2016 18:33:40 +0100
Subject: [PATCH] Fixed ugly invoice issue (#442) and added company name in
 invoices always

---
 application/views/sales/invoice.php       | 10 +++-------
 application/views/sales/invoice_email.php | 19 ++++++-------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php
index 01b1d0633..e40c2ef5b 100755
--- a/application/views/sales/invoice.php
+++ b/application/views/sales/invoice.php
@@ -58,19 +58,15 @@ $(document).ready(function()
 		</div>
 
         <div id="logo">
-	        <?php if ($this->Appconfig->get('company_logo') == '') 
+	        <?php if($this->Appconfig->get('company_logo') != '') 
 	        { 
-	        ?>
-				<div id="company_name"><?php echo $this->config->item('company'); ?></div>
-			<?php 
-			}
-			else 
-			{ 
 			?>
 				<img id="image" src="<?php echo base_url('uploads/' . $this->Appconfig->get('company_logo')); ?>" alt="company_logo" />			
 			<?php
 			}
 			?>
+			<div>&nbsp</div>
+			<div id="company_name"><?php echo $this->config->item('company'); ?></div>
         </div>
 	</div>
 
diff --git a/application/views/sales/invoice_email.php b/application/views/sales/invoice_email.php
index fd00f9cfe..8c702700c 100644
--- a/application/views/sales/invoice_email.php
+++ b/application/views/sales/invoice_email.php
@@ -19,14 +19,8 @@ if (isset($error_message))
 	<table id="info">
 		<tr>
 			<td id="logo">
-		        <?php if($this->Appconfig->get('company_logo') == '') 
+		        <?php if($this->Appconfig->get('company_logo') != '') 
 		        { 
-		        ?>
-					<div id="company_name"><?php echo $this->config->item('company'); ?></div>
-				<?php 
-				}
-				else 
-				{ 
 				?>
 					<img id="image" src="<?php echo 'uploads/' . $this->Appconfig->get('company_logo'); ?>" alt="company_logo" />			
 				<?php
@@ -34,15 +28,14 @@ if (isset($error_message))
 				?>
 			</td>
 			<td id="customer-title">
-				<pre><?php if(isset($customer))
-				{
-					echo $customer_info;
-				}
-				?></pre>
+	            <pre><?php if(isset($customer)) { echo $customer_info; } ?></pre>
 			</td>
 		</tr>
 		<tr>
-	       	<td id="company-title"><pre><?php echo $company_info; ?></pre></td>
+	       	<td id="company-title">
+	            <pre><?php echo $this->config->item('company'); ?></pre>
+	            <pre><?php echo $company_info; ?></pre>
+			</td>
 	        <td id="meta">
 	        	<table align="right">
 	            <tr>