Merge pull request #219 from AdTechMedia/stage

Stage to master 2017-06-16
MitocGroup · Jun 16, 2017 · d6def19 · d6def19
2 parents f35f47f + 0a87731
commit d6def19
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/component/ads-blocking-losses/handler.py b/component/ads-blocking-losses/handler.py
@@ -178,7 +178,7 @@ def send_email_report(event, context):
 
         # Fix mailchimp empty field exception
         if event.get('full_name', '').strip():
-            merge_fields['FULL_NAME'] = event['full_name'],
+            merge_fields['FULL_NAME'] = event['full_name']
 
         mailer.mailchimp_send(
             conf=__config['parameters'],

diff --git a/src/adtechmedia-website/frontend/js/calculator.js b/src/adtechmedia-website/frontend/js/calculator.js
@@ -46,7 +46,7 @@ jQuery(function($) {
           data: data,
           success: function (responseContent) {
             var confirmTokenQuery = 'confirm=' + responseContent.id;
-            window.location.href = '/calculator-result?' + confirmTokenQuery;
+            window.location.href = '/calculator-result/?' + confirmTokenQuery;
           }
         });
       })