Merge branch 'jansa'

application/controllers/Printer.php

@@ -204,7 +204,7 @@ class Printer extends CI_Controller {
 
 			if(!empty($record_data['letters']))
 			{
-
+				$letter = json_decode(decrypt_data($record_data['letters']));
 			$html = $html.'
 
 			<table style="width:100%">
@@ -222,7 +222,7 @@ class Printer extends CI_Controller {
 						<td style="padding:8px;padding-left: 0px;">
 					
 							<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">
-								'.decrypt_data($record_data['letters']).'
+								'.$letter['certificate']).'
 							</p>
 						</td>
 					</tr>
@@ -661,7 +661,7 @@ class Printer extends CI_Controller {
 			
 			if(!empty($record_data['letters']))
 			{
-
+				$letter = json_decode(decrypt_data($record_data['letters']));
 			$html = $html.'
 
 			<table style="width:100%">
@@ -679,7 +679,7 @@ class Printer extends CI_Controller {
 						<td style="padding:8px;padding-left: 0px;">
 							
 							<p style="margin:0px;padding-top: 10px;padding-bottom:10px;font-size: 13px;">
-								'.decrypt_data($record_data['letters']).'
+								'.$letter['certificate'].'
 							</p>
 						</td>
 					</tr>
@@ -707,7 +707,7 @@ class Printer extends CI_Controller {
 
 	public function print_page($html,$record_id)
 	{
-		print_r($html);exit();
+		//print_r($html);exit();
 		// create new PDF document
 		$pdf = new TCPDF(PDF_PAGE_ORIENTATION, PDF_UNIT, PDF_PAGE_FORMAT, true, 'UTF-8', false);