From abcf12c3d749821fb9faad476349eaf590b911b2 Mon Sep 17 00:00:00 2001
From: jekkos <jeroen.peelaerts@gmail.com>
Date: Wed, 3 Jul 2019 19:43:27 +0200
Subject: [PATCH] Change newlines into html breaks (invoice template)

---
 application/controllers/Sales.php         | 9 +++++----
 application/views/sales/invoice.php       | 4 ++--
 application/views/sales/invoice_email.php | 8 ++++----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/application/controllers/Sales.php b/application/controllers/Sales.php
index 309bcbb3a..7800965ab 100644
--- a/application/controllers/Sales.php
+++ b/application/controllers/Sales.php
@@ -520,7 +520,7 @@ class Sales extends Secure_Controller
 		$employee_info = $this->Employee->get_info($employee_id);
 		$data['employee'] = $employee_info->first_name . ' ' . mb_substr($employee_info->last_name, 0, 1);
 
-		$data['company_info'] = implode("<br/>", array(
+		$data['company_info'] = implode("\n", array(
 			$this->config->item('address'),
 			$this->config->item('phone')
 		));
@@ -888,7 +888,7 @@ class Sales extends Secure_Controller
 			$data['customer_address'] = $customer_info->address_1;
 			if(!empty($customer_info->zip) || !empty($customer_info->city))
 			{
-				$data['customer_location'] = $customer_info->zip . ' ' . $customer_info->city . ', ' . $customer_info->state;
+				$data['customer_location'] = $customer_info->zip . ' ' . $customer_info->city . "\n" . $customer_info->state;
 			}
 			else
 			{
@@ -913,11 +913,12 @@ class Sales extends Secure_Controller
 				$data['customer_total'] = empty($cust_stats) ? 0 : $cust_stats->total;
 			}
 
-			$data['customer_info'] = implode("<br/>", array(
+			$data['customer_info'] = implode("\n", array(
 				$data['customer'],
 				$data['customer_address'],
 				$data['customer_location']
 			));
+
 			if($data['customer_account_number'])
 			{
 				$data['customer_info'] .= "\n" . $this->lang->line('sales_account_number') . ": " . $data['customer_account_number'];
@@ -988,7 +989,7 @@ class Sales extends Secure_Controller
 		$data['quote_number'] = $sale_info['quote_number'];
 		$data['sale_status'] = $sale_info['sale_status'];
 
-		$data['company_info'] = implode("<br/>", array(
+		$data['company_info'] = implode("\n", array(
 			$this->config->item('address'),
 			$this->config->item('phone')
 		));
diff --git a/application/views/sales/invoice.php b/application/views/sales/invoice.php
index 80d616b8a..c327fb7db 100755
--- a/application/views/sales/invoice.php
+++ b/application/views/sales/invoice.php
@@ -51,7 +51,7 @@ $(document).ready(function()
 			if(isset($customer))
 			{
 			?>
-				<div id="customer"><?php echo $customer_info ?></div>
+				<div id="customer"><?php echo nl2br($customer_info) ?></div>
 			<?php
 			}
 			?>
@@ -79,7 +79,7 @@ $(document).ready(function()
 	</div>
 
 	<div id="block2">
-		<div id="company-title"><?php echo $company_info ?></div>
+		<div id="company-title"><?php echo nl2br($company_info) ?></div>
 		<table id="meta">
 			<tr>
 				<td class="meta-head"><?php echo $this->lang->line('sales_invoice_number');?> </td>
diff --git a/application/views/sales/invoice_email.php b/application/views/sales/invoice_email.php
index f5d308506..3ef212b11 100644
--- a/application/views/sales/invoice_email.php
+++ b/application/views/sales/invoice_email.php
@@ -28,14 +28,14 @@
 				?>
 			</td>
 			<td id="customer-title">
-				<div id="customer"><?php if(isset($customer)) { echo $customer_info; } ?></div>
+				<div id="customer"><?php if(isset($customer)) { echo nl2br($customer_info); } ?></div>
 			</td>
 		</tr>
 		<tr>
 			<td id="company-title">
 				<div id="company">
 				<?php echo $this->config->item('company'); ?><br/>
-				<?php echo $company_info; ?>
+				<?php echo nl2br($company_info); ?>
 				</div>
 			</td>
 			<td id="meta">
@@ -139,8 +139,8 @@
 	<div id="terms">
 		<div id="sale_return_policy">
 			<h5>
-				<textarea rows="5" cols="6"><?php echo nl2br($this->config->item('payment_message')); ?></textarea>
-				<textarea rows="5" cols="6"><?php echo $this->lang->line('sales_comments') . ': ' . (empty($comments) ? $this->config->item('invoice_default_comments') : $comments); ?></textarea>
+				<div><?php echo nl2br($this->config->item('payment_message')); ?></div>
+				<div><?php echo $this->lang->line('sales_comments') . ': ' . (empty($comments) ? $this->config->item('invoice_default_comments') : $comments); ?></div>
 			</h5>
 			<?php echo nl2br($this->config->item('return_policy')); ?>
 		</div>