caboose-cms 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c7ed09c651bd70cb879b25014784b3acc3f8d1c
-  data.tar.gz: 4d0819e40963287c774d8561c059863c8fd6afd6
+  metadata.gz: c32bec44530cdc5f76808682909fd88aaa01f77b
+  data.tar.gz: 0865c9c5f04a41f8e45dc6a2ace2e0bb3e3f99dc
 SHA512:
-  metadata.gz: 794cb19fac1f038300589876aa39774e0dfc7c105b9ec5c46c6eeae80ee8bfae8aa5c187b1d364f859bd44f167cb3d02e28d705849740de0fc22bdf27380298c
-  data.tar.gz: 9432bccdc101e9711904adac6abf3273e2048f7058bafdd500e8a551db4f98bb797e43d91410f38d10aefb9d38b793599c45f67b283f4aece7b61ecd963d6db8
+  metadata.gz: fda2258243f5930f898dac1e72fb26e2be80805912396d555ca198197f615b53a9f456671f1c657c0ab1862b929a0370c896fef4042afe2d3a84a2ca496d2697
+  data.tar.gz: fef9a611187d7874093887dc89779f0b7806bd96c7c92e6217d23db93b645144fdb6ee2c7f1ecb4576dccc91a42bbb5b028d4c79de80c0648cc8d88bdce02c09

data/app/models/caboose/invoice_pdf.rb

@@ -106,9 +106,16 @@ module Caboose
       ]
       
       sa = invoice.shipping_address
-      sa_address = "#{sa.address1}" + (sa.address2.blank? ? '' : "\n#{sa.address2}") + "\n#{sa.city}, #{sa.state} #{sa.zip}"
+      sa_name = sa && sa.first_name ? "#{sa.first_name} #{sa.last_name}" : "#{c.first_name} #{c.last_name}"
+      sa_address = sa ? 
+        (sa.address1 && sa.address1.length > 0 ? "#{sa.address1}\n" : '') + 
+        (sa.address2 && sa.address2.length > 0 ? "#{sa.address2}\n" : '') + 
+        (sa.city     && sa.city.length     > 0 ? "#{sa.city}, "     : '') +
+        (sa.state    && sa.state.length    > 0 ? "#{sa.state} "     : '') +
+        (sa.zip      && sa.zip.length      > 0 ? sa.zip             : '') : ''
+        
       shipped_to = [
-        [{ :content => "Name"    , :border_width => 0, :width => 55 },{ :content => "#{sa.first_name} #{sa.last_name}" , :border_width => 0, :width => 200 }],
+        [{ :content => "Name"    , :border_width => 0, :width => 55 },{ :content => sa_name                            , :border_width => 0, :width => 200 }],
         [{ :content => "Address" , :border_width => 0, :width => 55 },{ :content => sa_address                         , :border_width => 0, :width => 200 }],
         [{ :content => "Email"   , :border_width => 0, :width => 55 },{ :content => "#{c.email}"                       , :border_width => 0, :width => 200 }],
         [{ :content => "Phone"   , :border_width => 0, :width => 55 },{ :content => "#{self.formatted_phone(c.phone)}" , :border_width => 0, :width => 200 }]

data/app/models/caboose/pending_invoices_pdf.rb

@@ -95,19 +95,19 @@ module Caboose
               
       sa = invoice.shipping_address
       shipped_to = []
-      if sa
-        sa_address = "#{sa.address1}" + (sa.address2.blank? ? '' : "\n#{sa.address2}") + "\n#{sa.city}, #{sa.state} #{sa.zip}"
-        shipped_to << [{ :content => "Name"    , :border_width => 0, :width => 55 },{ :content => "#{sa.first_name} #{sa.last_name}" , :border_width => 0, :width => 200 }]
-        shipped_to << [{ :content => "Address" , :border_width => 0, :width => 55 },{ :content => sa_address                         , :border_width => 0, :width => 200 }]
-        shipped_to << [{ :content => "Email"   , :border_width => 0, :width => 55 },{ :content => "#{c.email}"                       , :border_width => 0, :width => 200 }]
-        shipped_to << [{ :content => "Phone"   , :border_width => 0, :width => 55 },{ :content => "#{self.formatted_phone(c.phone)}" , :border_width => 0, :width => 200 }]
-      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
-
+      shipped_to_name = sa && sa.first_name && sa.first_name.length > 0 ? "#{sa.first_name} #{sa.last_name}" : "#{c.first_name} #{c.last_name}"
+      shipped_to_address = sa ? 
+        (sa.address1 && sa.address1.length > 0 ? "#{sa.address1}\n" : '') + 
+        (sa.address2 && sa.address2.length > 0 ? "#{sa.address2}\n" : '') + 
+        (sa.city     && sa.city.length     > 0 ? "#{sa.city}, "     : '') +
+        (sa.state    && sa.state.length    > 0 ? "#{sa.state} "     : '') +
+        (sa.zip      && sa.zip.length      > 0 ? sa.zip             : '') : ''
+      
+      shipped_to << [{ :content => "Name"    , :border_width => 0, :width => 55 },{ :content => shipped_to_name                    , :border_width => 0, :width => 200 }]
+      shipped_to << [{ :content => "Address" , :border_width => 0, :width => 55 },{ :content => shipped_to_address                 , :border_width => 0, :width => 200 }]        
+      shipped_to << [{ :content => "Email"   , :border_width => 0, :width => 55 },{ :content => "#{c.email}"                       , :border_width => 0, :width => 200 }]
+      shipped_to << [{ :content => "Phone"   , :border_width => 0, :width => 55 },{ :content => "#{self.formatted_phone(c.phone)}" , :border_width => 0, :width => 200 }]
+            
       tbl = []
       tbl << [
         { :content => "Shipping Information" , :align => :left, :width => 255, :font_style => :bold },
@@ -142,9 +142,9 @@ module Caboose
       
       invoice.invoice_packages.all.each do |pk|
 
-        carrier = pk.shipping_method ? pk.shipping_method.carrier : nil
-        service = pk.shipping_method ? pk.shipping_method.service_name : nil
-        package = pk.shipping_package ? pk.shipping_package.name : nil
+        carrier = pk.shipping_method  ? pk.shipping_method.carrier      : ''
+        service = pk.shipping_method  ? pk.shipping_method.service_name : ''
+        package = pk.shipping_package ? pk.shipping_package.name        : ''
 
         pk.line_items.each_with_index do |li, index|
           options = ''

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

metadata

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