Fix: stripe payment without coupon.

dblock · Jun 30, 2016 · 422cd63 · 422cd63
1 parent e0c1714
commit 422cd63
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/public/css/agency.css b/public/css/agency.css
@@ -160,3 +160,4 @@ section img { max-width: 100%; }
 a.sponsor img { margin: 15px; }
 .up { color: #33CC00; }
 .down { color: #FF6600; }
+.has-error { color: #FF6600; }
diff --git a/public/js/playplay.js b/public/js/playplay.js
@@ -3,6 +3,7 @@ var PlayPlay = {};
 $(document).ready(function() {
 
   PlayPlay.message = function(text) {
+    $('#messages').removeClass('has-error');
     $('#messages').fadeOut('slow', function() {
       $('#messages').fadeIn('slow').html(text)
     });
@@ -30,5 +31,6 @@ $(document).ready(function() {
     }
 
     PlayPlay.message(message || xhr.statusText || xhr.responseText || 'Unexpected Error');
+    $('#messages').addClass('has-error');
   };
 });
diff --git a/public/upgrade.html.erb b/public/upgrade.html.erb
@@ -81,16 +81,21 @@
             image: '/img/<%= game ? game.name : 'pong' %>.png',
             locale: 'auto',
             token: function(token) {
+              data = {
+                stripe_email: token.email,
+                stripe_token: token.id,
+                stripe_token_type: token.type,
+                team_id: team.id
+              };
+
+              if (coupon.code) {
+                data.stripe_coupon = coupon.code;
+              };
+
               $.ajax({
                 type: 'POST',
                 url: '/api/subscriptions',
-                data: {
-                  stripe_email: token.email,
-                  stripe_token: token.id,
-                  stripe_token_type: token.type,
-                  stripe_coupon: coupon.code,
-                  team_id: team.id
-                },
+                data: data,
                 success: function(data) {
                   PlayPlay.message('Team <b>' + team.name + '</b> successfully upgraded to premium <b>' + team.game + '</b>.<br><br>Thank you for your support!');
                   $('#subscribeButton').remove();