caboose-cms 0.5.141 → 0.5.142

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmIyZDIxZjVkZmY2ZmU3MzdkMDE5NDQzZGU2YTZjZjlkZDE5N2EwZg==
+    NzExN2FjYzAwODdmYjQ2ZDM5NmM4ODg1YjllYjM5ZDRjYzRhMmM3NQ==
   data.tar.gz: !binary |-
-    ZGUwMTkxZjU4OGU3YzY1ZTg4ODA2Y2M0MDZjNzNmNzM0MGY2OWJhNg==
+    ZDc3NDc3YzEyM2VjY2UxNjk0NjdhZTRjNjIyZWI3ZDVlZDlmNWFiZA==
 SHA512:
   metadata.gz: !binary |-
-    ZjBiMTQwY2VkMjdjNjRhZWFiZTE3YTBkMDUzN2JmODcyMzY2OWZjZjc1NGNm
-    ODI5ODQzYTM4NWUwMDM5Y2ZlMWIxMWQ5NDZiMjBjYWEyNWVhNTY5ODgzMDJl
-    ZmQ0ZGIzMWE5ZTI2OTExNjVlYmMwN2IwMjZkYWQ1MDNkMTFlNzQ=
+    MGRlYWNiZGY0NjVjZjMzZGMxNjIxNWY5MjJkMjBmNTM3NzE2NzFmYTU4NTU5
+    YWQ5ZWQ2NjcwMjA4OGVhZWI3YjYzYzgxMmRkM2YyNjJkMTBkN2FiZDczZGNj
+    NzFmMDQ1ZTAxYjdmNWQxZTMzNzk4YTJlMzVmZjIyZmI5Mjk1ZWI=
   data.tar.gz: !binary |-
-    MWI2NzMwMmE2N2ViNzkzMjYzZTk1ZGY1ZjdlZWQ2MDczOGEwODFiMzg5MTg2
-    YjM4ZGUxMGY2ZDg1NDU4YWU2MjAyNTU0NzYwMGMxNjZmMmZhNDAyODQxNDU0
-    YjVjYTQxYjRiOTllMzBjMWM5YWM0MmU3YzAwM2Q1ODJmZmUyZGY=
+    ZjQ3YmI0MmVkZmFjMGRjYTlkMGM0ZjI3MzgyYjcxMjg2ZjMyZTE2MzBmN2Zk
+    YWJjMzBmNzk2OWExMGVhZTRiMDE4NzEyY2IwYjM2N2ViMDQ2OGVjY2I3MDdh
+    YTYwZTQ4MjYyMWMxMTZiZWM2YTE1Nzg2NzA4NmFhMGZhYmRkNTk=

data/app/controllers/caboose/orders_controller.rb

@@ -56,6 +56,59 @@ module Caboose
       @order.calculate
       render :layout => 'caboose/admin'
     end
+
+    # GET /admin/orders/:id/capture
+    def capture_funds
+      return if !user_is_allowed('orders', 'edit')
+      
+      response = 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'
+            
+            response = AuthorizeNet::SIM::Transaction.new(
+              sc.pp_username, 
+              sc.pp_password,
+              order.total,
+              :transaction_type => 'CAPTURE_ONLY',
+              :transaction_id => t.transaction_id
+            )                
+            order.update_attribute(:financial_status, Order::FINANCIAL_STATUS_CAPTURED)
+            resp.success = 'Captured funds successfully'
+          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 => response
+    end
     
     # GET /admin/orders/:id/void
     def admin_void
@@ -250,89 +303,7 @@ module Caboose
         :redirect => '/admin/orders'
       })
     end
-    
-    # GET /admin/orders/:id/capture
-    def capture_funds
-      return if !user_is_allowed('orders', 'edit')
-      
-      response = 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 > order.auth_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'
-            
-            response = AuthorizeNet::SIM::Transaction.new(
-              sc.pp_username, 
-              sc.pp_password,
-              order.total,
-              :transaction_type => 'CAPTURE_ONLY',
-              :transaction_id => t.transaction_id
-            )                
-            order.update_attribute(:financial_status, Order::FINANCIAL_STATUS_CAPTURED)
-            resp.success = 'Captured funds successfully'
-          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 => response
-    end
 
-    # GET /admin/orders/:id/void
-    #def void
-    #  return if !user_is_allowed('orders', 'edit')
-    #
-    #  response = Caboose::StdClass.new({
-    #    'refresh' => nil,
-    #    'error' => nil,
-    #    'success' => nil
-    #  })
-    #
-    #  order = Order.find(params[:id])
-    #
-    #  if order.financial_status == 'captured'
-    #    response.error = "This order has already been captured, you will need to refund instead"
-    #  else
-    #    if order.total < order.amount_discounted || PaymentProcessor.void(order)
-    #      order.financial_status = 'cancelled'
-    #      order.status = 'voided'
-    #      order.save
-    #    
-    #      response.success = "Order voided successfully"
-    #    else
-    #      response.error = "Error voiding order."
-    #    end
-    #  end
-    #
-    #  render json: response
-    #end
-  
     # GET /admin/orders/:id/refund
     # def refund
     #   return if !user_is_allowed('orders', 'edit')

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.141'
+  VERSION = '0.5.142'
 end

metadata

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