From 50c4b30df2a885590c15eb4dfa27bd59bc6ad36e Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Thu, 5 Apr 2018 08:46:57 +0200
Subject: [PATCH] Hide discount / item if no discount for that item (#1924)

---
 application/views/sales/invoice.php       | 4 ++++
 application/views/sales/invoice_email.php | 4 ++++
 application/views/sales/quote.php         | 4 ++++
 application/views/sales/quote_email.php   | 4 ++++
 public/css/invoice.css                    | 2 +-
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php
index 29992012d..c213cfd02 100755
--- a/application/views/sales/invoice.php
+++ b/application/views/sales/invoice.php
@@ -108,7 +108,9 @@ $(document).ready(function()
 			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
 			<th><?php echo $this->lang->line('sales_price'); ?></th>
 			<th><?php echo $this->lang->line('sales_discount'); ?></th>
+			<?php if ($item['discount'] > 0): ?>
 			<th><?php echo $this->lang->line('sales_customer_discount');?></th>
+			<?php endif; ?>
 			<th><?php echo $this->lang->line('sales_total'); ?></th>
 		</tr>
 
@@ -122,7 +124,9 @@ $(document).ready(function()
 				<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo to_quantity_decimals($item['quantity']); ?></textarea></td>
 				<td><textarea rows="4" cols="6"><?php echo to_currency($item['price']); ?></textarea></td>
 				<td style='text-align:center;'><textarea rows="4" cols="6"><?php echo $item['discount'] . '%'; ?></textarea></td>
+				<?php if ($item['discount'] > 0): ?>
 				<td style='text-align:center;'><textarea rows="4" cols="6"><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></textarea></td>
+				<?php endif; ?>
 				<td style='border-right: solid 1px; text-align:right;'><textarea rows="4" cols="6"><?php echo to_currency($item['discounted_total']); ?></textarea></td>
 			</tr>
 			<?php
diff --git a/application/views/sales/invoice_email.php b/application/views/sales/invoice_email.php
index 942937c00..6d169fd1c 100644
--- a/application/views/sales/invoice_email.php
+++ b/application/views/sales/invoice_email.php
@@ -72,7 +72,9 @@
 			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
 			<th><?php echo $this->lang->line('sales_price'); ?></th>
 			<th><?php echo $this->lang->line('sales_discount'); ?></th>
+			<?php if ($item['discount'] > 0): ?>
 			<th><?php echo $this->lang->line('sales_customer_discount');?></th>
+			<?php endif; ?>
 			<th><?php echo $this->lang->line('sales_total'); ?></th>
 		</tr>
 
@@ -86,7 +88,9 @@
 				<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
 				<td><?php echo to_currency($item['price']); ?></td>
 				<td><?php echo $item['discount'] .'%'; ?></td>
+				<?php if ($item['discount'] > 0): ?>
 				<td><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
+				<?php endif; ?>
 				<td class="total-line"><?php echo to_currency($item['discounted_total']); ?></td>
 			</tr>
 		<?php
diff --git a/application/views/sales/quote.php b/application/views/sales/quote.php
index 40f910ef3..bd49b03b6 100644
--- a/application/views/sales/quote.php
+++ b/application/views/sales/quote.php
@@ -108,7 +108,9 @@ if (isset($error_message))
 			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
 			<th><?php echo $this->lang->line('sales_price'); ?></th>
 			<th><?php echo $this->lang->line('sales_discount'); ?></th>
+			<?php if ($item['discount'] > 0): ?>
 			<th><?php echo $this->lang->line('sales_customer_discount');?></th>
+			<?php endif; ?>
 			<th><?php echo $this->lang->line('sales_total'); ?></th>
 		</tr>
 
@@ -122,7 +124,9 @@ if (isset($error_message))
 				<td style='text-align:center;'><textarea rows="5" cols="6"><?php echo to_quantity_decimals($item['quantity']); ?></textarea></td>
 				<td><textarea rows="4" cols="6"><?php echo to_currency($item['price']); ?></textarea></td>
 				<td style='text-align:center;'><textarea rows="4" cols="6"><?php echo $item['discount'] . '%'; ?></textarea></td>
+				<?php if ($item['discount'] > 0): ?>
 				<td style='text-align:center;'><textarea rows="4" cols="6"><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></textarea></td>
+				<?php endif; ?>
 				<td style='border-right: solid 1px; text-align:right;'><textarea rows="4" cols="6"><?php echo to_currency($item['discounted_total']); ?></textarea></td>
 			</tr>
 
diff --git a/application/views/sales/quote_email.php b/application/views/sales/quote_email.php
index 1e67efb0d..d7dd443ee 100644
--- a/application/views/sales/quote_email.php
+++ b/application/views/sales/quote_email.php
@@ -72,7 +72,9 @@
 			<th><?php echo $this->lang->line('sales_quantity'); ?></th>
 			<th><?php echo $this->lang->line('sales_price'); ?></th>
 			<th><?php echo $this->lang->line('sales_discount'); ?></th>
+			<?php if ($item['discount'] > 0): ?>
 			<th><?php echo $this->lang->line('sales_customer_discount');?></th>
+			<?php endif; ?>
 			<th><?php echo $this->lang->line('sales_total'); ?></th>
 		</tr>
 
@@ -86,7 +88,9 @@
 				<td><?php echo to_quantity_decimals($item['quantity']); ?></td>
 				<td><?php echo to_currency($item['price']); ?></td>
 				<td><?php echo $item['discount'] .'%'; ?></td>
+				<?php if ($item['discount'] > 0): ?>
 				<td><?php echo to_currency($item['discounted_total'] / $item['quantity']); ?></td>
+				<?php endif; ?>
 				<td class="total-line"><?php echo to_currency($item['discounted_total']); ?></td>
 			</tr>
 		<?php
diff --git a/public/css/invoice.css b/public/css/invoice.css
index 9d93dd35c..72dfc6863 100644
--- a/public/css/invoice.css
+++ b/public/css/invoice.css
@@ -27,7 +27,7 @@
 .edit #save-logo, .edit #cancel-logo { display: inline; }
 .edit #image, #save-logo, #cancel-logo, .edit #change-logo, .edit #delete-logo { display: none; }
 #customer-title {  height: 100px; float: right; margin-top:40px;}
-#customer-title textarea { width: 150px; }
+#customer-title textarea { width: 200px; }
 
 /* second row */
 #block2 { overflow: hidden; width: 100%; }