caboose-cms 0.5.169 → 0.5.170

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjcyYjYzMjY4OTE5NGI3ODc0OTBiNjIyZTk1ZDUxMjc4ZThhNTBlNw==
+    NzAwYTBkNTk5NjJjYzI1ZTM2ODFlYTk3YWE5NDBhMDRiNzEzMjg4ZQ==
   data.tar.gz: !binary |-
-    MjBjMjc4M2JlZjYwYTBhZjFiZDIyNjc0ZjA4MmVmOGYyY2M5NGNmNQ==
+    YTM3YTc5ZGQ4MDk2OTdhZGQ5YWFjYmMzZDFmMWZiY2RmNzA3MGUxOQ==
 SHA512:
   metadata.gz: !binary |-
-    YmJhYzJlN2RlMDVhZWRkNTFkMjM1NDhhMTRiZjdlMmY2ZTZkOGJlNzhkMjQy
-    Mjg1MDhmNjZhODVmOTQ5NzcwOGRlMjIwMGJhMWNiNTNhNmM2MjcwY2NlNDA1
-    ZGFkOGM3MTY3MTMxY2IwMmZjNTAxMjQ1YTAzY2I1N2NlZDQ0YzU=
+    MWRlZTYxMjU2OTBmMjUwZDAwZDg2MjYyMDM1ZGY5ZjM4NDhlODEzZjY3MDlm
+    MDhiNGI0NjZkNzdhZDc0OGM3YzQ5ZjM0MTFhYTNhMTJmMjEwMzU2NmVkMzgw
+    NzlmMGM0Y2I4NzhhMWQ0ZTgzYzUzOWMzN2IwN2QxNzU1NTZiMWE=
   data.tar.gz: !binary |-
-    NWE4ZmVjMDU2NTVhODQ3NzE2ODBkMTJmNGFjMDBkOThmM2JiYjBhNTkwMjA4
-    M2E5NWE5ZGUwNWZlYWI5MTQ0NjRmNWVlNDQ1ZDYwZjAyMWZlY2RhMzE1MzUw
-    ODM1MTgyNjUzZGRiY2FmMGI1MzZjYTYwODAxYmM2M2E5MDAxMTI=
+    NWM1YWY5NDVmZDc0ZjYzOTUwMDRmYmE0NmQ0Y2RlNWMyNzU1ZDVmYjg0NmM0
+    MTZiZmQ4OGY0ZWFlZDkxMDhmNjUyZDRjNjkwNjhhN2FmNjNiZGU1MDgyZjM5
+    MmU2N2MxYWJkZWY2NTcxMTE5YWE5MjAwMDg5NGU1NzY5Njc2NmY=

data/app/assets/javascripts/caboose/my_account_edit_order.js

@@ -17,12 +17,13 @@ MyAccountOrderController.prototype = {
     $(document).ready(function() { that.refresh(); });
   },
   
-  refresh: function()
+  refresh: function(after)
   {
     var that = this;
     that.refresh_order(function() {
       $('#order_table').html("<p class='loading'>Getting order...</p>");
-      that.print();       
+      that.print();
+      if (after) after();
     });    
   },
   
@@ -110,7 +111,7 @@ MyAccountOrderController.prototype = {
       .append($('<td/>').attr('valign', 'top').attr('id', 'shipping_address' ).append(that.noneditable_shipping_address()))      
       .append($('<td/>').attr('valign', 'top').attr('id', 'billing_address'  ).append(that.noneditable_billing_address()))        
       .append($('<td/>').attr('valign', 'top').attr('align', 'center').append($('<p/>').html(capitalize_first_letter(that.order.status))))
-      .append($('<td/>').attr('valign', 'top').attr('align', 'center').append(fstatus))      
+      .append($('<td/>').attr('valign', 'top').attr('id', 'financial_status' ).attr('align', 'center').append(fstatus))      
     );
     return table;  
   },
@@ -447,10 +448,16 @@ MyAccountOrderController.prototype = {
   
   payment_relay_handler: function(resp)
   {
+    var that = this;
     console.log('RELAY');
     console.log(resp);
     if (resp.success == true)
-      controller.refresh();
+    {
+      $('#payment_form').empty();
+      $('#payment_message').empty().html("<p class='success'>Your payment has been processed successfully.</p>");
+      setTimeout(function() { $('#payment_message').empty() }, 5000);
+      that.refresh();
+    }
     else if (resp.error)  
       $('#payment_message').html("<p class='note error'>" + resp.error + "</p>");
     else

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.169'
+  VERSION = '0.5.170'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.169
+  version: 0.5.170
 platform: ruby
 authors:
 - William Barry