From 3d0536876b14c535cc38fb62e191afb57acb9bcb Mon Sep 17 00:00:00 2001 From: Siddhant Rajagopalan Date: Sun, 17 Aug 2014 20:54:56 +0530 Subject: [PATCH] dedupe email working --- CRM/Mailing/Info.php | 9 ++++++-- js/angular-newMailing.js | 9 +++++--- partials/crmMailingType/content.html | 29 ++++---------------------- partials/crmMailingType/recipient.html | 2 +- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php index 1c41f981d0..c699923398 100644 --- a/CRM/Mailing/Info.php +++ b/CRM/Mailing/Info.php @@ -79,7 +79,11 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info { )); $mailGrp = civicrm_api3('MailingGroup','get', array()); $mailTokens = civicrm_api3('Mailing', 'get_token', array( 'usage' => 'Mailing')); - + $fromAddress = civicrm_api3('OptionGroup', 'get', array( + 'sequential' => 1, + 'name' => "from_email_address", + 'api.OptionValue.get' => array(), + )); CRM_Core_Resources::singleton()->addSetting(array( @@ -93,7 +97,8 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info { 'emailAdd' => array_values($emailAdd['values']), 'mailGrp' => array_values($mailGrp['values']), 'mailTokens' => array_values($mailTokens), - 'contactid' => $contactID + 'contactid' => $contactID, + 'fromAddress' => array_values($fromAddress['values'][0]['api.OptionValue.get']['values']) ), )); return $result; diff --git a/js/angular-newMailing.js b/js/angular-newMailing.js index de0eaeeabb..5cbbc5d523 100644 --- a/js/angular-newMailing.js +++ b/js/angular-newMailing.js @@ -35,7 +35,7 @@ } else { //created_id has been set to my id. Does not save without created_id. Needs to made generic based on the user - return {visibility: "Public Pages", url_tracking:"1", forward_replies:"0", auto_responder:"0", open_tracking:"1", + return {visibility: "Public Pages", url_tracking:"1",dedupe_email:"1", forward_replies:"0", auto_responder:"0", open_tracking:"1" }; } } @@ -57,7 +57,8 @@ $scope.mailNameList = _.pluck(CRM.crmCaseType.civiMails, 'name'); $scope.groupNamesList = CRM.crmMailing.groupNames; $scope.headerfooter = CRM.crmMailing.headerfooterList; - $scope.eMailing = CRM.crmMailing.emailAdd; + $scope.fromAddress = CRM.crmMailing.fromAddress; + console.log($scope.fromAddress); $scope.tmpList = CRM.crmMailing.mesTemplate; $scope.mailingGrp = CRM.crmMailing.mailGrp; $scope.user_id = CRM.crmMailing.contactid; @@ -468,6 +469,7 @@ approver_id: $scope.currentMailing.approver_id, approval_status_id: $scope.currentMailing.approval_status_id, approval_date: $scope.currentMailing.approval_date, + dedupe_email: $scope.currentMailing.dedupe_email }, true); //var result = crmApi('Mailing', 'create', $scope.currentMailing, true); @@ -525,7 +527,8 @@ approver_id: $scope.currentMailing.approver_id, approval_status_id: $scope.currentMailing.approval_status_id, approval_date: $scope.currentMailing.approval_date, - }, + dedupe_email: $scope.currentMailing.dedupe_email + }, true); //var result = crmApi('Mailing', 'create', $scope.currentMailing, true); result.success(function(data) { diff --git a/partials/crmMailingType/content.html b/partials/crmMailingType/content.html index 60e6d09403..2a92059548 100644 --- a/partials/crmMailingType/content.html +++ b/partials/crmMailingType/content.html @@ -1,6 +1,6 @@
@@ -9,7 +9,7 @@ Required Variables: cool_api and currentMailing and eMailing From E-mail Address - @@ -17,7 +17,7 @@ Required Variables: cool_api and currentMailing and eMailing Reply to E-mail Address - @@ -47,13 +47,6 @@ Required Variables: cool_api and currentMailing and eMailing - - I want to - Compose on screen - - Upload Content - -
@@ -73,25 +66,11 @@ Required Variables: cool_api and currentMailing and eMailing
- - - -
-   Save Template -
- - - +