caboose-cms 0.5.210 → 0.5.211

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGFkYzFmNDk4NWRjNjlmYTM5OGQ0ZjA3NjJjODdiNGMzYjAwODA3NQ==
+    OGM4NTg5NTU1MDNjYjQ2NGMxN2Q0NTQ0YTkwMWJmNTljMjNhOGRiZQ==
   data.tar.gz: !binary |-
-    NGQ4OGU0ZGVlMDYxODM2NTFjMTRkYTBiZWU4Y2E4NTIxZjRhYzc4Mw==
+    NjgzYzc5NTVmMjc0ZGQzZTZkMzY1OWYzZjE3ZDdkZWRhY2FlNjQ5Yg==
 SHA512:
   metadata.gz: !binary |-
-    MWE1YmRhOWUzODMyNDA3ODNmM2M4OTAzYmE5MzJkM2NmNjllNWQ3OTAwOGY1
-    YTBjYWI2NDk3YzE3ZDhjMjcxZGM4NmNlYTk1ZmE1OGM0NjA1NjEyMmMzYzhh
-    YmE0ZTE2NjU5ZDdkMzdlZWRmNDI5NDZmNDVmZmM0Mzc3NzIxODQ=
+    MTE0YmRiNTQzYjgwZGRjYmEzMjI5NWQwY2NkOGMzYTdiNDUwMTRmNmNlMGZk
+    NDEzYzQzNWM4ZmJkZmUyOTc4MjUwZTI5ZDJiZmNlYjg4MjQ2ZDU4OGYxNmEx
+    MDVkYmQ2ZWU0NzI4NmVlMmEzNjU1NmY1MjlkMjg0MDc2OGUzMDc=
   data.tar.gz: !binary |-
-    MWRjODBlN2Y3ZjYzYTkxOGQ2ZmMwMTdiYjY4ODg5YzU2MjA4YzIzZjUzYzA1
-    NzM1YTMwNDc4OGU5OGM5YWUwMzc3ZDc2YWVhZThkNjRhNjc5YTAzZjM4YzYx
-    ODZmNTc0OTNjNGVjMmEwMzFhODMzMTQ1MDdlMTUzYmNhNWYwMWE=
+    NzBkZmY3NTU1YzBjYWZmYzA1NmQ5Y2M3OGExZWVlODdjMmY3MzUyNzZhZWVi
+    ZDEwZjVlMjZhMGEyMTBmMDE2N2MyMTZkZjIyNWJkNjM5YmQzNTU1MWRlZjI3
+    NTEzOTFlZThmYzhlZDBiMWU4OWMwNmQzZTg5YTdiZmVlMzg3YzU=

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

@@ -52,6 +52,7 @@ Caboose.Store.Modules.CheckoutPayment = (function() {
     {    
       $('#message').html("<p class='loading'>Processing payment...</p>");
       $('form#payment').submit();
+      $('#checkout-continue button').hide();
     }
   };
   
@@ -98,5 +99,8 @@ function relay_handler(resp)
   else if (resp.error)  
     $('#message').html("<p class='note error'>" + resp.error + "</p>");
   else
+  {
     $('#message').html("<p class='note error'>There was an error processing your payment.</p>");
+    $('#checkout-continue button').show();
+  }
 }

data/app/controllers/caboose/checkout_controller.rb

@@ -298,13 +298,19 @@ module Caboose
     def authnet_relay
       Caboose.log("Authorize.net relay, order #{params[:x_invoice_id]}")
       
-      if params[:x_invoice_num].nil?
+      if params[:x_invoice_num].nil? || params[:x_invoice_num].strip.length == 0
         Caboose.log("Error: no x_invoice_id in given parameters.")
         render :json => { :error => "Invalid x_invoice_id." }
         return
       end
       
-      order = Caboose::Order.find(params[:x_invoice_num])
+      order = Caboose::Order.where(:id => params[:x_invoice_num].to_i).first
+      if order.nil?
+        Caboose.log("Error: can't find order for x_invoice_num #{params[:x_invoice_num]}.")
+        render :json => { :error => "Invalid x_invoice_id." }
+        return
+      end
+            
       ot = Caboose::OrderTransaction.new(
         :order_id => order.id,
         :date_processed => DateTime.now.utc,

data/app/models/caboose/shipping_calculator.rb

@@ -1,5 +1,5 @@
 require 'active_shipping'
-#include ActiveMerchant::Shipping
+#include ActiveShipping
 
 module Caboose
   class ShippingCalculator

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.210'
+  VERSION = '0.5.211'
 end

metadata

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