<modification>
	<id>OC-Extensions.com - HTML EMAIL</id>
	<version>1.0</version>
	<vqmver>1.0.8</vqmver>
	<author>oc-extensions.com</author>

	<file name="catalog/model/account/customer.php">
		<operation error="log">
			<search position="before"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$this->load->model('tool/html_email');
			
			$html = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $subject, $message);			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before" index="1"><![CDATA[$mail->setText(html_entity_decode($message, ENT_QUOTES, 'UTF-8'));]]></search>
			<add><![CDATA[
			$mail->setHtml($html);			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before"><![CDATA[// Send to main admin email if new account email is enabled]]></search>
			<add><![CDATA[
			$mail->setHtml('');			
			]]></add>
		</operation>
	</file>
	
	<file name="catalog/model/affiliate/affiliate.php">
		<operation error="log">
			<search position="before"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$this->load->model('tool/html_email');
			
			$html = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $subject, $message);			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before" index="1"><![CDATA[$mail->setText(html_entity_decode($message, ENT_QUOTES, 'UTF-8'));]]></search>
			<add><![CDATA[
			$mail->setHtml($html);			
			]]></add>
		</operation> 
	</file>
	
	<file name="catalog/model/checkout/order.php">
		<operation error="log">
			<search position="before"><![CDATA[if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/mail/order.tpl')) {]]></search>
			<add><![CDATA[
			$template->data['table_border_color'] = $this->config->get('html_email_main_table_border_color');		
			$template->data['table_header_bg'] = $this->config->get('html_email_main_table_header_bg');		
			$template->data['table_header_text_color'] = $this->config->get('html_email_main_table_header_text_color');		
			$template->data['table_body_bg'] = $this->config->get('html_email_main_table_body_bg');		
			$template->data['table_body_text_color'] = $this->config->get('html_email_main_table_body_text_color');		
			]]></add>
		</operation>
		<operation error="log">
			<search position="replace" offset="4"><![CDATA[if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/mail/order.tpl')) {]]></search>
			<add><![CDATA[
			if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/mail/html_email_order.tpl')) {
				$html = $template->fetch($this->config->get('config_template') . '/template/mail/html_email_order.tpl');
			} else {
				$html = $template->fetch('default/template/mail/html_email_order.tpl');
			}			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before"><![CDATA[// Text Mail]]></search>
			<add><![CDATA[
			$this->load->model('tool/html_email');
			
			$html = $this->model_tool_html_email->getHTMLEmail($order_info['language_id'], $subject, $html, 'html');			
			]]></add>
		</operation>
	</file>
	
	<file name="catalog/model/checkout/voucher.php">
		<operation error="log">
			<search position="replace" offset="4"><![CDATA[if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/mail/voucher.tpl')) {]]></search>
			<add><![CDATA[
			if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/mail/html_email_voucher.tpl')) {
				$html = $template->fetch($this->config->get('config_template') . '/template/mail/html_email_voucher.tpl');
			} else {
				$html = $template->fetch('default/template/mail/html_email_voucher.tpl');
			}			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$this->load->model('tool/html_email');
			
			$subject = html_entity_decode(sprintf($language->get('text_subject'), $voucher['from_name']), ENT_QUOTES, 'UTF-8');
			
			$html = $this->model_tool_html_email->getHTMLEmail($order_info['language_id'], $subject, $html, 'html');			
			]]></add>
		</operation>
	</file>
	
	<file name="admin/model/sale/customer.php">
		<operation error="log">
			<search position="before" index="1"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$subject = html_entity_decode(sprintf($this->language->get('text_approve_subject'), $store_name), ENT_QUOTES, 'UTF-8');
			
			$this->load->model('tool/html_email');
			
			$html = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $subject, $message);			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before" index="1"><![CDATA[$mail->setText(html_entity_decode($message, ENT_QUOTES, 'UTF-8'));]]></search>
			<add><![CDATA[
			$mail->setHtml($html);			
			]]></add>
		</operation>
		
		<operation error="log">
			<search position="before" index="2"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$subject = html_entity_decode(sprintf($this->language->get('text_transaction_subject'), $this->config->get('config_name')), ENT_QUOTES, 'UTF-8');
			
			$this->load->model('tool/html_email');
			
			$html = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $subject, $message);			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before" index="2"><![CDATA[$mail->setText(html_entity_decode($message, ENT_QUOTES, 'UTF-8'));]]></search>
			<add><![CDATA[
			$mail->setHtml($html);			
			]]></add>
		</operation>	

		<operation error="log">
			<search position="before" index="3"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$subject = html_entity_decode(sprintf($this->language->get('text_reward_subject'), $store_name), ENT_QUOTES, 'UTF-8');
			
			$this->load->model('tool/html_email');
			
			$html = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $subject, $message);			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before" index="3"><![CDATA[$mail->setText(html_entity_decode($message, ENT_QUOTES, 'UTF-8'));]]></search>
			<add><![CDATA[
			$mail->setHtml($html);			
			]]></add>
		</operation>
	</file>
	
	<file name="admin/model/sale/affiliate.php">
		<operation error="log">
			<search position="before" index="1"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$subject = html_entity_decode(sprintf($this->language->get('text_approve_subject'), $this->config->get('config_name')), ENT_QUOTES, 'UTF-8');
			
			$this->load->model('tool/html_email');
			
			$html = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $subject, $message);			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before" index="1"><![CDATA[$mail->setText(html_entity_decode($message, ENT_QUOTES, 'UTF-8'));]]></search>
			<add><![CDATA[
			$mail->setHtml($html);			
			]]></add>
		</operation>
		
		<operation error="log">
			<search position="before" index="2"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$subject = html_entity_decode(sprintf($this->language->get('text_transaction_subject'), $this->config->get('config_name')), ENT_QUOTES, 'UTF-8');
			
			$this->load->model('tool/html_email');
			
			$html = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $subject, $message);			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before" index="2"><![CDATA[$mail->setText(html_entity_decode($message, ENT_QUOTES, 'UTF-8'));]]></search>
			<add><![CDATA[
			$mail->setHtml($html);			
			]]></add>
		</operation>	
	</file>
	
	<file name="admin/model/sale/order.php">
		<operation error="log">
			<search position="before"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[	
			$this->load->model('tool/html_email');
			
			$html = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $subject, $message);			
			]]></add>
		</operation>
		<operation error="log">
			<search position="before"><![CDATA[$mail->setText(html_entity_decode($message, ENT_QUOTES, 'UTF-8'));]]></search>
			<add><![CDATA[
			$mail->setHtml($html);			
			]]></add>
		</operation>
	</file>
	
	<file name="admin/model/sale/voucher.php">
		<operation error="log">
			<search position="before" index="1"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$this->load->model('tool/html_email');
			
			$subject = html_entity_decode(sprintf($language->get('text_subject'), $voucher_info['from_name']), ENT_QUOTES, 'UTF-8');
			
			$html = $this->model_tool_html_email->getHTMLEmail($order_info['language_id'], $subject, $template->fetch('mail/html_email_voucher.tpl'), 'html');			
			]]></add>
		</operation>
		
		<operation error="log">
			<search position="before" index="2"><![CDATA[$mail = new Mail();]]></search>
			<add><![CDATA[
			$this->load->model('tool/html_email');
			
			$subject = html_entity_decode(sprintf($this->language->get('text_subject'), $voucher_info['from_name']), ENT_QUOTES, 'UTF-8');
			
			$html = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $subject, $template->fetch('mail/html_email_voucher.tpl'), 'html');			
			]]></add>
		</operation>
		
		<operation error="log">
			<search position="replace"><![CDATA[$mail->setHtml($template->fetch('mail/voucher.tpl'));]]></search>
			<add><![CDATA[
			$mail->setHtml($html);	
			]]></add>
		</operation>
	</file>
	
	<file name="admin/controller/sale/contact.php">
		<operation error="log">
			<search position="replace" offset="6"><![CDATA[$message  = '<html dir="ltr" lang="en">' . "\n";]]></search>
			<add><![CDATA[	
			$this->load->model('tool/html_email');
			
			$message = $this->model_tool_html_email->getHTMLEmail($this->config->get('config_language_id'), $this->request->post['subject'], html_entity_decode($this->request->post['message'], ENT_QUOTES, 'UTF-8'), 'html');			
			]]></add>
		</operation>
	</file>
	
</modification>