From 76be93e789932df107d78ab95d9d9d237282dec8 Mon Sep 17 00:00:00 2001
From: Siddhant Rajagopalan <rajgo94@gmail.com>
Date: Thu, 3 Jul 2014 21:51:48 +0530
Subject: [PATCH] from email now working. cool_api not needed

---
 CRM/Mailing/Info.php                 |  6 +++
 js/angular-newMailing.js             |  3 ++
 partials/crmMailingType/content.html | 75 ++--------------------------
 3 files changed, 14 insertions(+), 70 deletions(-)

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index 9ffc634651..0ad2bb5156 100644
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -67,6 +67,11 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     $mailStatus = civicrm_api3('MailingJob', 'get', array());
 		$groupNames = civicrm_api3('Group', 'get', array());
 		$headerfooterList = civicrm_api3('MailingComponent', 'get', array());
+		$emailAdd = civicrm_api3('Email', 'get', array(
+				'sequential' => 1,
+				'return' => "email",
+				'contact_id' => 202,
+				));
 		$mesTemplate = civicrm_api3('MessageTemplate', 'get', array( 'sequential' => 1,
 			'return' => "msg_title",
 			'id' => array('>' => 58),)
@@ -80,6 +85,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
         'groupNames' => array_values($groupNames['values']),
         'headerfooterList' => array_values($headerfooterList['values']),
         'mesTemplate' => array_values($mesTemplate['values']),
+        'emailAdd' => array_values($emailAdd['values']),
         ),
       ));
     return $result;
diff --git a/js/angular-newMailing.js b/js/angular-newMailing.js
index 2b2969e27b..4b2e83a6d7 100644
--- a/js/angular-newMailing.js
+++ b/js/angular-newMailing.js
@@ -66,6 +66,7 @@
 		$scope.mailNameList = _.pluck(CRM.crmCaseType.civiMails, 'name');
 		$scope.groupNamesList = CRM.crmMailing.groupNames;
 		$scope.headerfooter = CRM.crmMailing.headerfooterList;
+		$scope.eMailing = CRM.crmMailing.emailAdd;
 		$scope.tmpList = CRM.crmMailing.mesTemplate;
 		$scope.currentMailing = selectedMail;
 		$scope.testGroup = "";
@@ -206,6 +207,8 @@
 					scheduled_date: $scope.currentMailing.scheduled_date,
 					scheduled_id: $scope.currentMailing.scheduled_id,
 					campaign_id:	$scope.currentMailing.campaign_id,
+					header_id:	$scope.currentMailing.header_id,
+					footer_id:	$scope.currentMailing.footer_id,
 					}, 
 				true);
 				//var result = crmApi('Mailing', 'create', $scope.currentMailing, true);
diff --git a/partials/crmMailingType/content.html b/partials/crmMailingType/content.html
index e48a082853..c13f943003 100644
--- a/partials/crmMailingType/content.html
+++ b/partials/crmMailingType/content.html
@@ -1,9 +1,6 @@
 <!--
 Controller: MailCtrl
-Required Variables: cool_api and currentMailing
-
-Comment lines 8-72 and uncomment from 74 if you want to use the from_email from civiApi
-However this will not be a select option because I could not find the Api to get all the stored from_email addresses
+Required Variables: cool_api and currentMailing and eMailing
 -->
 
 <br>
@@ -12,19 +9,17 @@ However this will not be a select option because I could not find the Api to get
   <tr>
     <td class="label">From E-mail Address</td>
     <td>
-      <select  style="width: 100px" >
+      <select  style="width: 100px" ng-model="currentMailing.from_email" ng-options="frm.email as frm.email for frm in eMailing">
 				<option value="">-none-</option>
-				<option ng-repeat="s in cool_api" value={{s.from_mail}} >{{s.from_mail}}</option>
 			</select>
     </td>
   </tr>
   <tr>
     <td class="label">Reply to E-mail Address</td>
      <td>
-      <select  style="width: 100px" >
-				<option value="">-none-</option>
-				<option ng-repeat="s in cool_api" value={{s.reply_mail}} >{{s.reply_mail}}</option>
-			</select>     
+      <select  style="width: 100px" ng-model="currentMailing.replyto_email" ng-options="frm.email as frm.email for frm in eMailing">
+				<option value="">-none-</option>      
+			</select>   
     </td>
   </tr>   
   <tr>
@@ -71,63 +66,3 @@ However this will not be a select option because I could not find the Api to get
   <div class="crm-accordion-header">Track and Respond</div>
   <div class="crm-accordion-body" ng-include="partialUrl('trackandRespond.html')"></div>
 </div>
-
-<!--<br>
-<table class="form-layout-compressed">
-  <tbody>
-  <tr>
-    <td class="label">From E-mail Address</td>
-    <td>
-      <input type="text" ng-model="currentMailing.from_email"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="label">Reply to E-mail Address</td>
-     <td>
-      <input type="text" ng-model="currentMailing.replyto_email"/>
-    </td>
-  </tr>   
-  <tr>
-    <td class="label">Mailing Subject</td>
-     <td>
-      <input type="text" ng-model="currentMailing.subject"/>
-    </td>
-  </tr>
-  <tr>
-    <td class="label">Use Template</td>
-     <td>
-      <select  style="width: 100px" ng-model="currentMailing.msg_template_id" ng-options="mstemp.id as mstemp.msg_title for mstemp in tmpList| filter:isUserDriven">
-				<option value="">-none-</option>
-			</select>
-    </td>
-  </tr>
-  <tr>
-		<td class="label">I want to</td>
-		<td class="label">Compose on screen</td>
-    <td><input type="radio" ng-model="composeS" value="1" /></td>
-    <td class="label">Upload Content</td>
-    <td><input type="radio" ng-model="composeS" value="0" /></td>
-  </tr>  
-  </tbody>
-</table>  
-<br>
-<div class="crm-accordion-wrapper collapsed" ng-show= "upldChange(composeS)">
-  <div class="crm-accordion-header">Compose on Screen</div>
-  <div class="crm-accordion-body" ng-include="partialUrl('composeonScreen.html')"></div>
-</div>
-<div class="crm-accordion-wrapper collapsed" ng-show= "!(upldChange(composeS))">
-  <div class="crm-accordion-header">Upload Content</div>
-  <div class="crm-accordion-body" ng-include="partialUrl('uploadContent.html')"></div>
-</div>
-<div class="crm-accordion-wrapper collapsed">
-  <div class="crm-accordion-header">Attachments</div>
-  <div class="crm-accordion-body" ng-include="partialUrl('attachments.html')"></div>
-</div>
-<div class="crm-accordion-wrapper collapsed">
-  <div class="crm-accordion-header">Header and Footer</div>
-  <div class="crm-accordion-body" ng-include="partialUrl('headerandFooter.html')"></div>
-</div>
-<div class="crm-accordion-wrapper collapsed">
-  <div class="crm-accordion-header">Track and Respond</div>
-  <div class="crm-accordion-body" ng-include="partialUrl('trackandRespond.html')"></div>
-</div> -->
-- 
2.25.1