caboose-cms 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dabc8440a00b08aee9e2ceb2ffb8e6819b158dc
-  data.tar.gz: 5e6b0d5322f4df017c088b0b6d506c4a1b40a61a
+  metadata.gz: 26d5cc03f095f6a467229dda391c16f4962178e2
+  data.tar.gz: d64140a217254a3448a187fcfb45f65b4cf88901
 SHA512:
-  metadata.gz: 1d03c1a05647cbe03f8984007c0ac8825dd2f6b40d4c9ff8819d0207ac6db200450f360ba9ceb0930796a6f62bd8a3b27827b588a1f00e9faadc2e7d97ec78e2
-  data.tar.gz: ef60e51198a90e17a537cdc3381ddb51b3463ec1495faafbd9683a5c7fb48929cc5205d80e29e33879dc70e8a0c1ed80086b86f323ee1922f0eb4b4dc45cc688
+  metadata.gz: 5621d9560cbdb4e1c3afdcc9d5bb54f4b2b67008f63df9588ad0cafffde2eee6e9615610a72f17615c254722a396c80c4752ae4427ac8d0347ec066e31551795
+  data.tar.gz: 2cfde0d9ec65389b5d93fb9e85d19a5f5f6fe5a93771890eec23ed9d46bb1d97119599636aa639d4feb0cd0c04b6b0bf4ef5ff5194a99b4df22e41e46e97296b

data/app/controllers/caboose/checkout_controller.rb

@@ -203,12 +203,13 @@ module Caboose
               return
             end
             ot = Caboose::InvoiceTransaction.create(
-              :invoice_id       => @invoice.id,
-              :transaction_id   => c.id,
-              :transaction_type => c.captured ? Caboose::InvoiceTransaction::TYPE_AUTHCAP : Caboose::InvoiceTransaction::TYPE_AUTHORIZE,     
-              :amount           => c.amount/100.0,              
-              :date_processed   => DateTime.now.utc,              
-              :success          => c.status == 'succeeded'
+              :invoice_id        => @invoice.id,
+              :transaction_id    => c.id,
+              :transaction_type  => c.captured ? Caboose::InvoiceTransaction::TYPE_AUTHCAP : Caboose::InvoiceTransaction::TYPE_AUTHORIZE,
+              :payment_processor => sc.pp_name,
+              :amount            => c.amount/100.0,              
+              :date_processed    => DateTime.now.utc,              
+              :success           => c.status == 'succeeded'
             )                        
         end
         

data/app/models/caboose/invoice.rb

@@ -306,14 +306,15 @@ module Caboose
           #  response = transaction.prior_auth_capture(t.transaction_id, self.total)
           #  
           #  ot = Caboose::InvoiceTransaction.create(
-          #    :invoice_id       => self.id,
-          #    :date_processed   => DateTime.now.utc,
-          #    :transaction_type => InvoiceTransaction::TYPE_CAPTURE,
-          #    :amount           => self.total,        
-          #    :success          => response.response_code && response.response_code == '1',            
-          #    :transaction_id   => response.transaction_id,
-          #    :auth_code        => response.authorization_code,
-          #    :response_code    => response.response_code
+          #    :invoice_id        => self.id,
+          #    :date_processed    => DateTime.now.utc,
+          #    :transaction_type  => InvoiceTransaction::TYPE_CAPTURE,
+          #    :payment_processor => sc.pp_name,
+          #    :amount            => self.total,        
+          #    :success           => response.response_code && response.response_code == '1',            
+          #    :transaction_id    => response.transaction_id,
+          #    :auth_code         => response.authorization_code,
+          #    :response_code     => response.response_code
           #  )
           #  if ot.success
           #    self.date_captured = DateTime.now.utc
@@ -343,7 +344,8 @@ module Caboose
                 InvoiceTransaction.create(
                   :invoice_id => self.id,
                   :transaction_id => bt.id,
-                  :transaction_type => InvoiceTransaction::TYPE_CAPTURE, 
+                  :transaction_type => InvoiceTransaction::TYPE_CAPTURE,
+                  :payment_processor => sc.pp_name,
                   :amount => bt.amount / 100,                
                   :date_processed => DateTime.strptime(bt.created.to_s, '%s'),
                   :success => bt.status == 'succeeded' || bt.status == 'pending'
@@ -380,6 +382,7 @@ module Caboose
           :invoice_id => self.id,
           :date_processed => DateTime.now.utc,
           :transaction_type => InvoiceTransaction::TYPE_VOID,
+          :payment_processor => sc.pp_name,
           :amount => self.total
         )
         
@@ -458,7 +461,8 @@ module Caboose
                 InvoiceTransaction.create(
                   :invoice_id => self.id,
                   :transaction_id => bt.id,
-                  :transaction_type => InvoiceTransaction::TYPE_CAPTURE, 
+                  :transaction_type => InvoiceTransaction::TYPE_CAPTURE,
+                  :payment_processor => sc.pp_name,
                   :amount => bt.amount / 100,                
                   :date_processed => DateTime.strptime(bt.created.to_s, '%s'),
                   :success => bt.status == 'succeeded' || bt.status == 'pending'
@@ -656,7 +660,8 @@ module Caboose
             auth_trans = InvoiceTransaction.create(
               :invoice_id => self.id,
               :transaction_id => c.id,
-              :transaction_type => c.captured ? InvoiceTransaction::TYPE_AUTHCAP : InvoiceTransaction::TYPE_AUTHORIZE, 
+              :transaction_type => c.captured ? InvoiceTransaction::TYPE_AUTHCAP : InvoiceTransaction::TYPE_AUTHORIZE,
+              :payment_processor => sc.pp_name,
               :amount => c.amount / 100.0,
               :amount_refunded => c.amount_refunded,
               :date_processed => DateTime.strptime(c.created.to_s, '%s'),              
@@ -670,7 +675,8 @@ module Caboose
                 :invoice_id => self.id,
                 :parent_id => auth_trans.id, 
                 :transaction_id => bt.id,
-                :transaction_type => InvoiceTransaction::TYPE_CAPTURE, 
+                :transaction_type => InvoiceTransaction::TYPE_CAPTURE,
+                :payment_processor => sc.pp_name,
                 :amount => bt.amount / 100.0,                
                 :date_processed => DateTime.strptime(bt.created.to_s, '%s'),
                 :success => bt.status == 'succeeded' || bt.status == 'pending'
@@ -684,7 +690,8 @@ module Caboose
                   :invoice_id => self.id,
                   :parent_id => auth_trans.id,
                   :transaction_id => r.id,
-                  :transaction_type => InvoiceTransaction::TYPE_REFUND, 
+                  :transaction_type => InvoiceTransaction::TYPE_REFUND,
+                  :payment_processor => sc.pp_name,
                   :amount => r.amount / 100.0,                
                   :date_processed => DateTime.strptime(r.created.to_s, '%s'),
                   :success => r.status == 'succeeded' || r.status == 'pending'

data/app/models/caboose/invoice_pdf.rb

@@ -38,7 +38,17 @@ module Caboose
     end
     
     def get_card_details
-            
+      
+      #puts "--------------------------------------------------------------------"
+      #puts self.invoice.customer.card_brand      
+      #puts "--------------------------------------------------------------------"
+      
+      if self.invoice.customer.card_brand
+        self.card_type   = self.invoice.customer.card_brand
+        self.card_number = self.invoice.customer.card_last4
+        return
+      end
+                      
       sc = self.invoice.site.store_config
       ot = self.invoice.invoice_transactions.where(:transaction_type => InvoiceTransaction::TYPE_AUTHORIZE, :success => true).first
       
@@ -57,6 +67,11 @@ module Caboose
             self.card_type = ""
             self.card_number = ""
           end
+        
+        when 'stripe'
+          
+          self.card_type   = self.invoice.customer.card_brand
+          self.card_number = self.invoice.customer.card_last4
           
       end
             

data/app/models/caboose/invoice_transaction.rb

@@ -1,3 +1,4 @@
+
 module Caboose
   class InvoiceTransaction < ActiveRecord::Base
     self.table_name  = 'store_invoice_transactions'
@@ -7,9 +8,10 @@ module Caboose
     belongs_to :parent, :class_name => 'Caboose::InvoiceTransaction', :foreign_key => :parent_id
     attr_accessible :id,    
       :invoice_id,
-      :parent_id,
+      :parent_id,      
       :transaction_id,
       :transaction_type,
+      :payment_processor,
       :amount,
       :amount_refunded,
       :auth_code,
@@ -74,7 +76,8 @@ module Caboose
               :invoice_id => self.invoice_id,
               :parent_id => self.id,
               :transaction_id => bt.id,
-              :transaction_type => InvoiceTransaction::TYPE_CAPTURE, 
+              :transaction_type => InvoiceTransaction::TYPE_CAPTURE,
+              :payment_processor => sc.pp_name,
               :amount => bt.amount / 100.0,                
               :date_processed => DateTime.strptime(bt.created.to_s, '%s'),
               :success => bt.status == 'succeeded' || bt.status == 'pending'
@@ -126,7 +129,8 @@ module Caboose
                 :invoice_id => self.invoice_id,
                 :parent_id => self.id,
                 :transaction_id => r.id,
-                :transaction_type => InvoiceTransaction::TYPE_REFUND, 
+                :transaction_type => InvoiceTransaction::TYPE_REFUND,
+                :payment_processor => sc.pp_name,
                 :amount => r.amount / 100.0,
                 :date_processed => DateTime.strptime(r.created.to_s, '%s'),
                 :success => r.status == 'succeeded' || r.status == 'pending'

data/app/models/caboose/schema.rb

@@ -392,6 +392,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :parent_id             , :integer  ],
         [ :date_processed        , :datetime ],
         [ :transaction_type      , :string   ],
+        [ :payment_processor     , :string   ],
         [ :amount                , :decimal   , { :precision => 8, :scale => 2 }],
         [ :amount_refunded       , :decimal   , { :precision => 8, :scale => 2 }],
         [ :transaction_id        , :string   ],

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.2'
+  VERSION = '0.8.3'
 end

data/lib/tasks/caboose.rake

@@ -108,7 +108,8 @@ namespace :caboose do
   end
   
   desc "Compare routes in controllers with routes in the routes file"
-  task :compare_routes, [:arg1, :arg2] => :environment do |t, args|    
+  task :compare_routes, [:arg1, :arg2] => :environment do |t, args|
+    # controller, route_file
     Caboose::CommentRoutes.compare_routes(args[:arg1], args[:arg2])
   end
   

metadata

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