caboose-cms 0.5.154 → 0.5.155

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDFjNWI1ZTNlNjM5ZTQ0NGM3NGJkNGI4NzNmOGQ0ZDY0YWU1YzVjZg==
+    ODgyOGM1NGVlNDY1ZmMxOGY3OGFkYjQ1MTU3ODQ5NjdmMmMyYjQyMA==
   data.tar.gz: !binary |-
-    YTdiMWUzOTE5N2ZlNzMyNGFlN2QxM2ExNTUwMWIyODljZWM4MGE5Yw==
+    NWRhNjEwNDQ3YWUzZTEzYjgyYzkyYzM5Mzk5MjE5Njk2NzQwMmFiYQ==
 SHA512:
   metadata.gz: !binary |-
-    MjVhZWEyYzFmZDEyZWViMjk3ODdlZmQ5NmRjMzM5ZTI2YzYwODU5ZTAyYWE1
-    Yzg3OWViNmVjMGMyMDVkNzc0ZmNjYjA4ZGU1Mjg0OTk2ODMwNGVhM2YxNWNh
-    MDEzNzNhZGZmOWEyOTBmNTBhMWE1ZjNjNjE5ZTQzYzIwNmUyOTI=
+    YzBmYTVjYjg0YzYwNjVmMjEwYWI2YmIwOTViZmI3MDU0NDZkNjQ4YjMwNzE1
+    ZWM5MDFkZmRmYjllNjAzNWY1ZDNiMTRhODcxMTE3Zjc3Yjg0ZjAwMzdlNDIw
+    ZWE1MDJmMzM5OTRjNDRiZTcwZThmMzk1ODg4ZTM2ZWY2Mzc1ODI=
   data.tar.gz: !binary |-
-    MWJlZDE3NjA5MGNiNGYxN2YxNjRiZjQzZmIwOGQ1NTU5ZmQwNDlkZTBmMWM0
-    NzI0MjgxNDg1YjZlOWM1MjdmZTVmNjk5NWU1ZGJiM2NmN2U0MTZjMGM3MmVh
-    YjI1YTVmNzU3MjRiODhjNmY0OWEzN2YxNzdiNWY1OTBkOTVmMjM=
+    ODA3ZmQ0MzI0YTA1OWRjMjYwZWFiZDQ3NTBhYmU3MDA3NmQ3NWQ0ZjczNGNk
+    NzEzMjYxNjM3ODE4NjczNjRjMTZhNzQyYmQ2ZDkwMjAxNjVjMGQwOGZmOGZl
+    OWVkZTgzMzU0YWUyMTMxMjE4NTJkMmUzZjZmMmU4ZDE2ZjljMDg=

data/app/models/caboose/pending_orders_pdf.rb

@@ -38,6 +38,7 @@ module Caboose
     def get_card_details(order)      
       sc = order.site.store_config
       ot = order.order_transactions.where(:transaction_type => OrderTransaction::TYPE_AUTHORIZE, :success => true).first
+      return if ot.nil?        
       case sc.pp_name
         when 'authorize.net'
           t = AuthorizeNet::Reporting::Transaction.new(sc.pp_username, sc.pp_password)
@@ -50,7 +51,7 @@ module Caboose
 
     def order_info(order)
       order_info = "Order Number: #{order.id}\n"
-      order_info << "Order Date: #{order.date_created.strftime('%d %b %Y %H:%M:%S %p')}\n"
+      order_info << "Order Date: #{order.date_created ? order.date_created.strftime('%d %b %Y %H:%M:%S %p') : ''}\n"
       order_info << "Status: #{order.status.capitalize}\n"
       tbl = []
       tbl << [
@@ -65,41 +66,55 @@ module Caboose
       c = order.customer
       ba = order.billing_address
       billed_to = []
-      billed_to << [
-        { :content => "Name", :border_width => 0 },
-        { :content => "#{ba.first_name} #{ba.last_name}", :border_width => 0}
-      ]
-      billed_to << [
-        { :content => "Address", :border_width => 0 },
-        { :content => "#{ba.address1}" + (ba.address2.blank? ? '' : "\n#{ba.address2}") + "\n#{ba.city}, #{ba.state} #{ba.zip}", :border_width => 0}
-      ]
-      billed_to << [
-        { :content => "Email", :border_width => 0 },
-        { :content => "#{c.email}", :border_width => 0}
-      ]
-      billed_to << [
-        { :content => "Phone", :border_width => 0 },
-        { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
-      ]
-      
+      if ba
+        billed_to << [
+          { :content => "Name", :border_width => 0 },
+          { :content => "#{ba.first_name} #{ba.last_name}", :border_width => 0}
+        ]
+        billed_to << [
+          { :content => "Address", :border_width => 0 },
+          { :content => "#{ba.address1}" + (ba.address2.blank? ? '' : "\n#{ba.address2}") + "\n#{ba.city}, #{ba.state} #{ba.zip}", :border_width => 0}
+        ]
+        billed_to << [
+          { :content => "Email", :border_width => 0 },
+          { :content => "#{c.email}", :border_width => 0}
+        ]
+        billed_to << [
+          { :content => "Phone", :border_width => 0 },
+          { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
+        ]
+      else
+        billed_to << [{ :content => "Name"    , :border_width => 0 }]
+        billed_to << [{ :content => "Address" , :border_width => 0 }]
+        billed_to << [{ :content => "Email"   , :border_width => 0 }]
+        billed_to << [{ :content => "Phone"   , :border_width => 0 }]
+      end
+              
       sa = order.shipping_address
       shipped_to = []
-      shipped_to << [
-        { :content => "Name", :border_width => 0 },
-        { :content => "#{sa.first_name} #{sa.last_name}", :border_width => 0}
-      ]
-      shipped_to << [
-        { :content => "Address", :border_width => 0 },
-        { :content => "#{sa.address1}" + (sa.address2.blank? ? '' : "\n#{sa.address2}") + "\n#{sa.city}, #{sa.state} #{sa.zip}", :border_width => 0}
-      ]
-      shipped_to << [
-        { :content => "Email", :border_width => 0 },
-        { :content => "#{c.email}", :border_width => 0}
-      ]
-      shipped_to << [
-        { :content => "Phone", :border_width => 0 },
-        { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
-      ]
+      if sa
+        shipped_to << [
+          { :content => "Name", :border_width => 0 },
+          { :content => "#{sa.first_name} #{sa.last_name}", :border_width => 0}
+        ]
+        shipped_to << [
+          { :content => "Address", :border_width => 0 },
+          { :content => "#{sa.address1}" + (sa.address2.blank? ? '' : "\n#{sa.address2}") + "\n#{sa.city}, #{sa.state} #{sa.zip}", :border_width => 0}
+        ]
+        shipped_to << [
+          { :content => "Email", :border_width => 0 },
+          { :content => "#{c.email}", :border_width => 0}
+        ]
+        shipped_to << [
+          { :content => "Phone", :border_width => 0 },
+          { :content => "#{self.formatted_phone(c.phone)}", :border_width => 0}
+        ]
+      else
+        shipped_to << [{ :content => "Name"    , :border_width => 0 }]
+        shipped_to << [{ :content => "Address" , :border_width => 0 }]
+        shipped_to << [{ :content => "Email"   , :border_width => 0 }]
+        shipped_to << [{ :content => "Phone"   , :border_width => 0 }]
+      end
 
       tbl = []
       tbl << [
@@ -202,30 +217,40 @@ module Caboose
       tbl2 = []
       tbl3 = []
 
-      tbl2 << [
-        { :content => "Card Type", :width => 127, :border_width => 0 },
-        { :content => self.card_type, :width => 128, :border_width => 0 }
-      ]
-      tbl2 << [
-        { :content => "Transaction ID", :width => 127, :border_width => 0 },
-        { :content => trans.transaction_id.to_s, :width => 128, :border_width => 0 }
-      ]
-      tbl2 << [
-        { :content => "Gateway Response", :width => 127, :border_width => 0},
-        { :content => trans.response_code.to_s, :width => 128, :border_width => 0  }
-      ]
-      tbl3 << [
-        { :content => "Card Number", :width => 127, :border_width => 0},
-        { :content => "XXXX XXXX XXXX " + self.card_number, :width => 128, :border_width => 0 }
-      ]
-      tbl3 << [
-        { :content => "Transaction Time", :width => 127, :border_width => 0},
-        { :content => trans.date_processed.strftime("%d %b %Y %H:%M:%S %p"), :width => 128, :border_width => 0  }
-      ]
-      tbl3 << [
-        { :content => "Payment Process", :width => 127, :border_width => 0},
-        { :content => trans.success ? "Successful" : "Failed", :width => 128, :border_width => 0  }
-      ]
+      if trans
+        tbl2 << [
+          { :content => "Card Type", :width => 127, :border_width => 0 },
+          { :content => self.card_type, :width => 128, :border_width => 0 }
+        ]
+        tbl2 << [
+          { :content => "Transaction ID", :width => 127, :border_width => 0 },
+          { :content => trans.transaction_id.to_s, :width => 128, :border_width => 0 }
+        ]
+        tbl2 << [
+          { :content => "Gateway Response", :width => 127, :border_width => 0},
+          { :content => trans.response_code.to_s, :width => 128, :border_width => 0  }
+        ]
+        tbl3 << [
+          { :content => "Card Number", :width => 127, :border_width => 0},
+          { :content => "XXXX XXXX XXXX " + self.card_number, :width => 128, :border_width => 0 }
+        ]
+        tbl3 << [
+          { :content => "Transaction Time", :width => 127, :border_width => 0},
+          { :content => trans.date_processed.strftime("%d %b %Y %H:%M:%S %p"), :width => 128, :border_width => 0  }
+        ]
+        tbl3 << [
+          { :content => "Payment Process", :width => 127, :border_width => 0},
+          { :content => trans.success ? "Successful" : "Failed", :width => 128, :border_width => 0  }
+        ]
+      else
+        tbl2 << [{ :content => "Card Type"        , :width => 127, :border_width => 0}]          
+        tbl2 << [{ :content => "Transaction ID"   , :width => 127, :border_width => 0}]          
+        tbl2 << [{ :content => "Gateway Response" , :width => 127, :border_width => 0}]          
+        tbl3 << [{ :content => "Card Number"      , :width => 127, :border_width => 0}]          
+        tbl3 << [{ :content => "Transaction Time" , :width => 127, :border_width => 0}]          
+        tbl3 << [{ :content => "Payment Process"  , :width => 127, :border_width => 0}]                  
+      end
+      
       tbl << [
         { :content => "Authorization Details", :colspan => 2, :font_style => :bold }
       ]

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.154'
+  VERSION = '0.5.155'
 end

metadata

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