caboose-cms 0.7.32 → 0.7.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf73a0624a9f94e70152332af86b9243830223b4
-  data.tar.gz: 7e0652094da351a6fac5869d5640519a6cd75227
+  metadata.gz: eee3bd393d5eb753c883fd555d241aa3d790640a
+  data.tar.gz: f6fa71d9f3932d75862609bbc75d0b1cc171db97
 SHA512:
-  metadata.gz: 74fdea743f279164ccb14b373dbe6037e12e48a9fbc784df3329395ac65905dbfd40817477d47a1399028d735f6b0c87e4e1f450478effcfba6905236eacd6f3
-  data.tar.gz: 704317bed6f156998edc1eef3c94c2e900ae4ec1b8bcbac30c0ab5434233e050e883c3834e0d5e0e5dc66beab023b6a2965aa85008b62107c6e6f5b55cb8eec0
+  metadata.gz: f57e8f2ec6374e8f43bf3a235415544844fbd250f92c576b629ab802ec740f785314dd7cb36ef843e21a4abfb459983c56c44fea0abcadce65a99ddfdda45e20
+  data.tar.gz: 7ee62db868c39619c6ab397fb733ee4a09962ebdc7c44005683b6fb1eecfbe6abe7a87e4441ed8d7bba116a2ae0455d3d52b6ab5a701077b9802ff06c75d703d

data/app/models/caboose/authnet.rb

@@ -135,6 +135,85 @@ module Caboose
     #  
     #  ap response
     #end
+        
+    def self.sync_order_transactions(site_id, d1, d2)
+              
+      site = Site.find(site_id)
+      sc = site.store_config
+      
+      # Get all the batches in the date period
+      rt = AuthorizeNet::Reporting::Transaction.new(sc.pp_username, sc.pp_password)                      
+      resp = rt.get_settled_batch_list(d1, d2, true)
+      return false if !resp.success?          
+      batch_ids = []
+      batches = resp.batch_list
+      batch_ids = batches.collect{ |batch| batch.id }
+                  
+      orders = {}
+      
+      # Settled transactions
+      batch_ids.each do |batch_id|              
+        rt = AuthorizeNet::Reporting::Transaction.new(sc.pp_username, sc.pp_password)
+        resp = rt.get_transaction_list(batch_id)
+        next if !resp.success?
+        
+        transactions = resp.transactions
+        transactions.each do |t|
+          order_id = t.order.invoice_num
+          orders[order_id] = [] if orders[order_id].nil?
+          orders[order_id] << t
+        end
+      end
+      
+      # Unsettled transactions
+      rt = AuthorizeNet::Reporting::Transaction.new(sc.pp_username, sc.pp_password)
+      resp = rt.get_unsettled_transaction_list
+      if resp.success?        
+        transactions = resp.transactions
+        transactions.each do |t|           
+          order_id = t.order.invoice_num
+          orders[order_id] = [] if orders[order_id].nil?
+          orders[order_id] << t
+        end
+      end
+
+      # Verify all the transactions exist locally
+      orders.each do |order_id, transactions|                        
+        transactions.each do |t|
+          self.verify_order_transaction_exists(t)                                                                
+        end                                
+      end
+      
+      # Update the financial_status and status of all affected orders
+      orders.each do |order_id, transactions|      
+        order = Order.where(:id => order_id).first
+        next if order.nil?
+        order.determine_statuses
+      end                
+    end
     
+    def self.verify_order_transaction_exists(t)
+      
+      order_id = t.order.invoice_num
+      ttype = OrderTransaction.type_from_authnet_status(t.status)
+      
+      ot = OrderTransaction.where(:order_id => order_id, :transaction_id => t.id, :transaction_type => ttype).first
+      if ot   
+        puts "Found order transaction for #{t.id}."
+        return
+      end
+                
+      puts "Creating order transaction for #{t.id}..."      
+      ot = OrderTransaction.create(                      
+        :order_id         => order_id,
+        :transaction_id   => t.id,
+        :transaction_type => ttype,
+        :amount           => t.settle_amount,        
+        :date_processed   => t.submitted_at,        
+        :success          => !(t.status == 'declined')
+      )
+    end
+    
+        
   end
 end

data/app/models/caboose/block.rb

@@ -85,7 +85,8 @@ class Caboose::Block < ActiveRecord::Base
     if b.block_type.field_type == 'file'
       return b.media.file if b.media
       return b.file
-    end    
+    end
+    return "" if b.value.nil? || b.value.strip.length == 0
     view = options && options[:view] ? options[:view] : ActionView::Base.new(ActionController::Base.view_paths)    
     return view.render(:inline => b.value, :locals => options)                    
   end

data/app/models/caboose/order.rb

@@ -422,6 +422,33 @@ module Caboose
       OrdersMailer.configure_for_site(self.site_id).customer_payment_authorization(self).deliver
     end
     
+    def determine_statuses
+      
+      auth    = false
+      capture = false
+      void    = false
+      refund  = false
+      
+      self.order_transactions.each do |ot|
+        auth    = true if ot.transaction_type == OrderTransaction::TYPE_AUTHORIZE && ot.success == true
+        capture = true if ot.transaction_type == OrderTransaction::TYPE_CAPTURE   && ot.success == true
+        void    = true if ot.transaction_type == OrderTransaction::TYPE_VOID      && ot.success == true
+        refund  = true if ot.transaction_type == OrderTransaction::TYPE_REFUND    && ot.success == true
+      end
+      
+      if    refund  then self.financial_status = Order::FINANCIAL_STATUS_REFUNDED
+      elsif void    then self.financial_status = Order::FINANCIAL_STATUS_VOIDED
+      elsif capture then self.financial_status = Order::FINANCIAL_STATUS_CAPTURED
+      elsif auth    then self.financial_status = Order::FINANCIAL_STATUS_AUTHORIZED
+      else               self.financial_status = Order::FINANCIAL_STATUS_PENDING
+      end
+    
+      self.status = Order::STATUS_PENDING if self.status == Order::STATUS_CART && (refund || void || capture || auth) 
+      
+      self.save
+
+    end
+    
   end
 end
 

data/app/models/caboose/order_transaction.rb

@@ -25,6 +25,16 @@ module Caboose
       self.amount = 0.00 if self.amount.nil?        
     end
     
+    def self.type_from_authnet_status(status)
+      case status
+        when 'settledSuccessfully'        then OrderTransaction::TYPE_CAPTURE
+        when 'voided'                     then OrderTransaction::TYPE_VOID
+        when 'declined'                   then OrderTransaction::TYPE_AUTHORIZE
+        when 'authorizedPendingCapture'   then OrderTransaction::TYPE_AUTHORIZE
+        when 'refundSettledSuccessfully'  then OrderTransaction::TYPE_REFUND
+      end
+    end
+    
   end
 end
    

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.32'
+  VERSION = '0.7.33'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.32
+  version: 0.7.33
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2015-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg