Ready for Beta

1 files changed, 15 insertions, 16 deletions

diff --git a/lib/helpers/mail/mail.js b/lib/helpers/mail/mail.js
index 4a4634f..924ccc5 100644
--- a/lib/helpers/mail/mail.js
+++ b/lib/helpers/mail/mail.js
@@ -115,14 +115,13 @@ function SubscriptionTracking(enable, text, html, substitution_tag) {
   return this
 }
 
-function Ganalytics(enable, utm_source, utm_medium, utm_term, utm_content, utm_campaign, utm_name) {
+function Ganalytics(enable, utm_source, utm_medium, utm_term, utm_content, utm_campaign) {
   this.enable = enable
   this.utm_source = utm_source
   this.utm_medium = utm_medium
   this.utm_term = utm_term
   this.utm_content = utm_content
   this.utm_campaign = utm_campaign
-  this.utm_name = utm_name
 
   this.setEnable = function(enable){
     this.enable = enable
@@ -172,14 +171,6 @@ function Ganalytics(enable, utm_source, utm_medium, utm_term, utm_content, utm_c
     return this.utm_campaign
   }
 
-  this.setUtmName = function(utm_name){
-    this.utm_name = utm_name
-  }
-
-  this.getUtmName = function() {
-    return this.utm_name
-  }
-
   this.toJSON = function () {
     var json = {
       enable: this.getEnable(),
@@ -187,8 +178,7 @@ function Ganalytics(enable, utm_source, utm_medium, utm_term, utm_content, utm_c
       utm_medium: this.getUtmMedium(),
       utm_term: this.getUtmTerm(),
       utm_content: this.getUtmContent(),
-      utm_campaign: this.getUtmCampaign(),
-      utm_name: this.getUtmName()
+      utm_campaign: this.getUtmCampaign()
     }
     return json
   }
@@ -658,7 +648,7 @@ function Personalization() {
     return this.send_at
   }
 
-  toJSON = function() {
+  this.toJSON = function() {
     var json = {
       to: this.getTos(),
       cc: this.getCcs(),
@@ -700,7 +690,7 @@ function Email(email, name) {
 }
 
 // This represents the full request body for a v3 /mail/send/
-function Mail() {
+function Mail(from_email, subject, to_email, content) {
   this.from_email = undefined
   this.personalizations = undefined
   this.subject = undefined
@@ -729,7 +719,7 @@ function Mail() {
     if(this.personalizations == undefined){
       this.personalizations = []
     }
-    this.personalizations.push(personalization.toJSON());
+    this.personalizations.push(personalization);
   }
 
   this.getPersonalizations = function() {
@@ -874,7 +864,16 @@ function Mail() {
     return this.reply_to;
   }
 
-  toJSON = function() {
+  if(from_email && subject && to_email && content){
+    this.setFrom(from_email)
+    var personalization = new Personalization()
+    personalization.addTo(to_email)
+    this.addPersonalization(personalization)
+    this.setSubject(subject)
+    this.addContent(content)
+  }
+
+  this.toJSON = function() {
     var json = {
       from: this.getFrom(),
       personalization: this.getPersonalizations(),