caboose-cms 0.9.16 → 0.9.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3a31193fe24ebe9ffeab72609a21d7df35017c8
-  data.tar.gz: 9fa9a55dab856d1295fc0f6ceb6b0a3993e8d5f7
+  metadata.gz: 0460458a16ead69cecfbc30ba0421e9600dcca83
+  data.tar.gz: 8186386ddd66fcd395bb577ba283f4bd4e001020
 SHA512:
-  metadata.gz: f729ea726dcd56779c0070419ad503eb1d991e0d2bc8f40b1d2c2eb9302e8d0924ffd252120685f1fc93ca7eaca47cc313cb21ee43ea5ae6b8d02dbfd2b98a22
-  data.tar.gz: 5a94b00cb2ff357235b4da4b7ab811269e645d29449c2f6a4fad25aa6f95a4b74b6a3b3716a272df26cbf731216e649afc0e7032d2380288cba7b3c18c7afb04
+  metadata.gz: 8a3de896671f33f9f5c930e2d0ec5a6b05de6eda6880a29d9f40ffc91b001df09190a597f6b1680eefd0cad94d34787e48f78c78240e20876f75f99bd5f89d2d
+  data.tar.gz: 783d23cc8fed612bb3f7292b0a0e6da8b327d9cd0de1aaad4ac68bdf7d45832d07c5b6c2ee24b009ba4e8311f957ca0fda893ee2250242bf538f47182d1928be

data/app/models/caboose/invoice_pdf.rb

@@ -123,7 +123,7 @@ module Caboose
       shipped_to = []
       if invoice.instore_pickup
         shipped_to << [{ :content => "Name"            , :border_width => 0, :width =>  55 },{ :content => "#{c.first_name} #{c.last_name}"   , :border_width => 0, :width => 200 }]
-        shipped_to << [{ :content => "IN-STORE PICKUP" , :border_width => 0, :width => 255 }]
+        shipped_to << [{ :content => "IN-STORE PICKUP" , :border_width => 0, :width => 255 , :colspan => 2 }]
       else        
         shipped_to << [{ :content => "Name"    , :border_width => 0, :width => 55 },{ :content => sa_name                            , :border_width => 0, :width => 200 }]
         shipped_to << [{ :content => "Address" , :border_width => 0, :width => 55 },{ :content => sa_address                         , :border_width => 0, :width => 200 }]
@@ -165,9 +165,9 @@ module Caboose
       
       invoice.invoice_packages.all.each do |pk|
 
-        carrier = pk.shipping_method.carrier
-        service = pk.shipping_method.service_name
-        package = pk.shipping_package.name
+        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.16'
+  VERSION = '0.9.17'
 end

metadata

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