Fixed ugly invoice issue (#442) and added company name in invoices always

This commit is contained in:
FrancescoUK
2016-06-13 18:33:40 +01:00
parent 9dc7405eaa
commit 17443a3d4f
2 changed files with 9 additions and 20 deletions

View File

@@ -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>

View File

@@ -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>