payola-payments 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 687b1a158e55cc469bc30828b4935396bec9a54e
-  data.tar.gz: 83ef120df1b244def0d9a2e5a096947274ffd404
+  metadata.gz: 8deb29ec575d4faf852d02cc955375825a13fcaa
+  data.tar.gz: 304228ce7fcc032647b7d7121914eca2e02b9d86
 SHA512:
-  metadata.gz: 121077b27aa23f3958a2b158810ab60b2982182fb7245691ac3cef9a80cecda82b393f6d05090232119adaee8d50e3affa86840d27d640efbb7e65e29b6b0b38
-  data.tar.gz: 3052d957372c564914d5430edff374e0416db8dd0add2f8dc8d78f2247e2aee2ef3b0ba787a64544f551a5743acbe310c576a89bdc01498c14daebe7569601a4
+  metadata.gz: 3e294bea2fecf77ae284a312b46692c9fcb956fe21edea5b380bda1a1dd2611249c8e15d095bd5596adaf22c4a7f7ff9dadf915b8bb79c95047e0406478aec95
+  data.tar.gz: 184c3ad6bf4d5d869aa1b4ae1a3b0a3a48d2ed0c4f87d6997b72addbc71abd63c62e2363a94df8144c3655772960ab04dcbc3dc8f2301a514812010d8de001e3

data/app/assets/javascripts/payola/subscription_form_onestep.js

@@ -52,18 +52,22 @@ var PayolaOnestepSubscriptionForm = {
         var handler = function(data) {
             if (data.status === "active") {
                 window.location = base_path + '/confirm_subscription/' + guid;
-            } else if (data.status === "errored") {
-                PayolaOnestepSubscriptionForm.showError(form, data.error);
             } else {
                 setTimeout(function() { PayolaOnestepSubscriptionForm.poll(form, num_retries_left - 1, guid, base_path); }, 500);
             }
         };
+        var errorHandler = function(jqXHR){
+          if(jqXHR.responseJSON.status === "errored"){
+            PayolaSubscriptionForm.showError(form, jqXHR.responseJSON.error);
+          }
+        };
 
         $.ajax({
             type: 'GET',
+            dataType: 'json',
             url: base_path + '/subscription_status/' + guid,
             success: handler,
-            error: handler
+            error: errorHandler
         });
     },
 

data/app/assets/javascripts/payola/subscription_form_twostep.js

@@ -51,18 +51,22 @@ var PayolaSubscriptionForm = {
                 form.append($('<input type="hidden" name="payola_subscription_guid"></input>').val(guid));
                 form.append(PayolaSubscriptionForm.authenticityTokenInput());
                 form.get(0).submit();
-            } else if (data.status === "errored") {
-                PayolaSubscriptionForm.showError(form, data.error);
             } else {
                 setTimeout(function() { PayolaSubscriptionForm.poll(form, num_retries_left - 1, guid, base_path); }, 500);
             }
         };
+        var errorHandler = function(jqXHR){
+          if(jqXHR.responseJSON.status === "errored"){
+            PayolaSubscriptionForm.showError(form, jqXHR.responseJSON.error);
+          }
+        };
 
         $.ajax({
             type: 'GET',
+            dataType: 'json',
             url: base_path + '/subscription_status/' + guid,
             success: handler,
-            error: handler
+            error: errorHandler
         });
     },
 

data/lib/payola/version.rb

@@ -1,3 +1,3 @@
 module Payola
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payola-payments
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Pete Keen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails