Added parsing of variables in the mail

plugins/yetiforce/compose.js

@@ -15,6 +15,7 @@ window.rcmail && rcmail.addEventListener('init', function (evt) {
 				frame_name = 'rcmupload' + ts,
 				frame = rcmail.async_upload_form_frame(frame_name);
 		data._uploadid = ts;
+		console.log(data);
 		jQuery.ajax({
 			url: "?_task=mail&_action=plugin.yetiforce.addFilesToMail&_id=" + rcmail.env.compose_id,
 			type: "POST",
@@ -142,7 +143,7 @@ window.rcmail && rcmail.addEventListener('init', function (evt) {
 					var oldBody = jQuery('#composebody').val();
 					jQuery('#composebody').val(html + oldBody);
 				}
-				if (typeof data.attachments !== 'undefined') {
+				if (typeof data.attachments !== 'undefined' && data.attachments !== null) {
 					rcmail.command('yetiforce.addFilesToMail', data.attachments);
 				}
 			}
@@ -170,14 +171,13 @@ function getMailFromCRM(mailField, moduleName, records) {
 		},
 		success: function (data) {
 			data = JSON.parse(data);
-			if (data.length == 0 ) {
+			if (data.length == 0) {
 				var notifyParams = {
 					text: window.crm.app.vtranslate('NoFindEmailInRecord'),
 					animation: 'show'
 				};
 				window.crm.Vtiger_Helper_Js.showPnotify(notifyParams);
 			} else {
-				console.log(data);
 				var emails = $('#' + mailField).val();
 				if (emails != '' && emails.charAt(emails.length - 1) != ',') {
 					emails = emails + ',';

plugins/yetiforce/yetiforce.php

@@ -599,6 +599,7 @@ protected function loadCurrentUser()
 		$ownerObject->retrieveCurrentUserInfoFromFile($_SESSION['crm']['id']);
 		$this->currentUser = $ownerObject;
 		vglobal('current_user', $ownerObject);
+		App\User::setCurrentUserId($_SESSION['crm']['id']);
 		return true;
 	}
 
@@ -661,15 +662,23 @@ public function getEmailTemplates()
 	 */
 	public function getConntentEmailTemplate()
 	{
-		$recordId = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
+		$templeteId = rcube_utils::get_input_value('id', rcube_utils::INPUT_GPC);
+		$recordId = rcube_utils::get_input_value('record_id', rcube_utils::INPUT_GPC);
+		$moduleName = rcube_utils::get_input_value('select_module', rcube_utils::INPUT_GPC);
 		$currentPath = getcwd();
 		chdir($this->rc->config->get('root_directory'));
 		$this->loadCurrentUser();
-		$mail = App\Mail::getTemplete($recordId);
-		$emailTemplates ['subject'] = $mail['subject'];
-		$emailTemplates ['content'] = $mail['content'];
-		$emailTemplates ['attachments'] = $mail['attachments'];
-		echo App\Json::encode($emailTemplates);
+		$mail = App\Mail::getTemplete($templeteId);
+		if ($recordId) {
+			$textParser = \App\TextParser::getInstanceById($recordId, $moduleName);
+			$mail['subject'] = $textParser->setContent($mail['subject'])->parse()->getContent();
+			$mail['content'] = $textParser->setContent($mail['content'])->parse()->getContent();
+		}
+		echo App\Json::encode([
+			'subject' => $mail['subject'],
+			'content' => $mail['content'],
+			'attachments' => $mail['attachments'],
+		]);
 		chdir($currentPath);
 		exit;
 	}

version.php

@@ -1,5 +1,5 @@
 <?php
 return [
-	'patch' => '2017.01.23',
-	'version' => '0.0.23'
+	'patch' => '2017.01.31',
+	'version' => '0.0.24'
 ];