caboose-cms 0.5.161 → 0.5.162

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTQ1MTU0YjcyN2E4MjYwOGUwYzgzZDNmMTc5NmMxYWViYzNlZmIyZg==
+    YzQ0ZGYxZDUzOWE3ODliMGRmYWM4ZGMwN2E1ZjY2ZjlhMDI5MDMzMg==
   data.tar.gz: !binary |-
-    OTk0Y2NjZmE1M2NkYzgyNTYwM2Y2NzNjMjE0MWE2Y2M0MDkwZWUwNQ==
+    MDhlNmIwZWE3Njc4NDk1MDgwYjlkNjhlZTU5YzJjN2EwYWUxZDA4Ng==
 SHA512:
   metadata.gz: !binary |-
-    YWJlMGU1OGY4YTE3ODcxZWY5MmRiOWVkMTJlNzdhMTI5OTJkZmNmNTEyZjU3
-    MGJkZjUzZjRlMWE2MjdkYTQ5NTU0OWNmMjk3ZTdhNGQzZTNlNTI0YmMwMmM0
-    ZDZmYWY1NzI5MGY1ZDAxMzU0YWMwMDE3ZGRhMWE5ZWM2MjI0YzM=
+    ZDMyY2RjNWNjOWQ4MTFhYzc2YzFhM2EyMjEwZjhhOTFhZjI3YTAwOGQzYzFm
+    M2E1OWY2NzQzZTIxN2U4YjAzNmFlYTY1ODViYTA5ZGU2ZTQ1MWQ1ODgxMmYz
+    Zjg0ODhlZGY5ZWY2YzNmOGU4ZmNjMDU3YzRiNjBhNGM5YjRhMzI=
   data.tar.gz: !binary |-
-    ZjYzYWQ1MmZlMjU4NGEzNDExMTc4ZDJiNGYyZGY4MzA5NzE3OTk0YzYzNGZi
-    NzJjODAxNWUzYWNlYzkwZGIwNTk2YzA4ZDI5NTdkMWM2MmFkYTkyNmY0Y2Iy
-    ZmMyNjQ2NTMxY2M1ZmZlYTkyMGIzZWYxNmI3NTQzYjg2MzNiMDI=
+    NzhlYjYxYjQ5NjRkYWVkODJmYzljMWMyMGZkOWExNmQ4NmQ0ZGVmNWJmZGI2
+    ODczYTNjNjliZjM4OWFiYTQ4YmQ5MjRhMTg5ZWU4MDA2MDQxMjU0Y2NhMThl
+    N2IzNjVmM2FhOTU4ODdiODcxNzUyNzY3YjM5YWQ5MmZhMjdiMTc=

data/app/controllers/caboose/orders_controller.rb

@@ -62,59 +62,61 @@ module Caboose
     def capture_funds
       return if !user_is_allowed('orders', 'edit')
       
-      resp = Caboose::StdClass.new
+      #resp = Caboose::StdClass.new
       order = Order.find(params[:id])
-      t = OrderTransaction.where(:order_id => order.id, :transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
-            
-      if order.financial_status == Order::FINANCIAL_STATUS_CAPTURED
-        resp.error = "Funds for this order have already been captured."    
-      elsif order.total > t.amount
-        resp.error = "The order total exceeds the authorized amount."
-      elsif t.nil?
-        resp.error = "This order doesn't seem to be authorized."
-      else
-                        
-        sc = @site.store_config
-        case sc.pp_name
-          when 'authorize.net'
-            transaction = AuthorizeNet::AIM::Transaction.new(sc.pp_username, sc.pp_password)
-            response = transaction.prior_auth_capture(t.transaction_id, order.total)
-                        
-            order.update_attribute(:financial_status, Order::FINANCIAL_STATUS_CAPTURED)
-            resp.success = 'Captured funds successfully'
-
-            ot = Caboose::OrderTransaction.new(
-              :order_id => order.id,
-              :date_processed => DateTime.now.utc,
-              :transaction_type => Caboose::OrderTransaction::TYPE_CAPTURE
-            )
-            ot.success        = response.response_code && response.response_code == '1'            
-            ot.transaction_id = response.transaction_id
-            ot.auth_code      = response.authorization_code
-            ot.response_code  = response.response_code
-            ot.amount         = order.total
-            ot.save
+      resp = order.capture_funds
       
-          when 'payscape'
-            # TODO: Implement capture funds for payscape
-
-        end
-          
-        #if (order.discounts.any? && order.total < order.discounts.first.amount_current) || PaymentProcessor.capture(order)
-        #  order.financial_status = 'captured'
-        #  order.save
-        #  
-        #  if order.discounts.any?
-        #    order.update_attribute(:amount_discounted, order.discounts.first.amount_current)
-        #    order.update_gift_cards
-        #  end
-        #  
-        #  response.success = "Captured funds successfully"
-        #else
-        #  response.error = "Error capturing funds."
-        #end
-        
-      end
+      #t = OrderTransaction.where(:order_id => order.id, :transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
+      #      
+      #if order.financial_status == Order::FINANCIAL_STATUS_CAPTURED
+      #  resp.error = "Funds for this order have already been captured."    
+      #elsif order.total > t.amount
+      #  resp.error = "The order total exceeds the authorized amount."
+      #elsif t.nil?
+      #  resp.error = "This order doesn't seem to be authorized."
+      #else
+      #                  
+      #  sc = @site.store_config
+      #  case sc.pp_name
+      #    when 'authorize.net'
+      #      transaction = AuthorizeNet::AIM::Transaction.new(sc.pp_username, sc.pp_password)
+      #      response = transaction.prior_auth_capture(t.transaction_id, order.total)
+      #                  
+      #      order.update_attribute(:financial_status, Order::FINANCIAL_STATUS_CAPTURED)
+      #      resp.success = 'Captured funds successfully'
+      #
+      #      ot = Caboose::OrderTransaction.new(
+      #        :order_id => order.id,
+      #        :date_processed => DateTime.now.utc,
+      #        :transaction_type => Caboose::OrderTransaction::TYPE_CAPTURE
+      #      )
+      #      ot.success        = response.response_code && response.response_code == '1'            
+      #      ot.transaction_id = response.transaction_id
+      #      ot.auth_code      = response.authorization_code
+      #      ot.response_code  = response.response_code
+      #      ot.amount         = order.total
+      #      ot.save
+      #
+      #    when 'payscape'
+      #      # TODO: Implement capture funds for payscape
+      #
+      #  end
+      #    
+      #  #if (order.discounts.any? && order.total < order.discounts.first.amount_current) || PaymentProcessor.capture(order)
+      #  #  order.financial_status = 'captured'
+      #  #  order.save
+      #  #  
+      #  #  if order.discounts.any?
+      #  #    order.update_attribute(:amount_discounted, order.discounts.first.amount_current)
+      #  #    order.update_gift_cards
+      #  #  end
+      #  #  
+      #  #  response.success = "Captured funds successfully"
+      #  #else
+      #  #  response.error = "Error capturing funds."
+      #  #end
+      #  
+      #end
       
       render :json => resp
     end

data/app/views/caboose/orders/admin_edit.html.erb

@@ -9,11 +9,11 @@
 
 <p>
 <input type='button' value='< Back' onclick="window.location='/admin/orders';" />
-<% if @order.financial_status == Caboose::Order::FINANCIAL_STATUS_AUTHORIZED %>
+<% if @order.financial_status == Caboose::Order::FINANCIAL_STATUS_AUTHORIZED && @order.total > 0.00 %>
   <input type='button' value='Capture Funds' onclick="controller.capture_funds();" />
   <input type='button' value='Void'          onclick="controller.void_order();" />
 <% end %>
-<% if @order.financial_status == Caboose::Order::FINANCIAL_STATUS_CAPTURED %>
+<% if @order.financial_status == Caboose::Order::FINANCIAL_STATUS_CAPTURED && @order.total > 0.00 %>
   <input type='button' value='Refund' onclick="refund_order(<%= @order.id %>);" />
 <% end %>
 <input type='button' value='Resend Confirmation' onclick="resend_confirmation(<%= @order.id %>)" />

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.161'
+  VERSION = '0.5.162'
 end

metadata

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