caboose-cms 0.9.16 → 0.9.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/models/caboose/invoice_pdf.rb +4 -4
- data/lib/caboose/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 0460458a16ead69cecfbc30ba0421e9600dcca83
|
|
4
|
+
data.tar.gz: 8186386ddd66fcd395bb577ba283f4bd4e001020
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8a3de896671f33f9f5c930e2d0ec5a6b05de6eda6880a29d9f40ffc91b001df09190a597f6b1680eefd0cad94d34787e48f78c78240e20876f75f99bd5f89d2d
|
|
7
|
+
data.tar.gz: 783d23cc8fed612bb3f7292b0a0e6da8b327d9cd0de1aaad4ac68bdf7d45832d07c5b6c2ee24b009ba4e8311f957ca0fda893ee2250242bf538f47182d1928be
|
|
@@ -123,7 +123,7 @@ module Caboose
|
|
|
123
123
|
shipped_to = []
|
|
124
124
|
if invoice.instore_pickup
|
|
125
125
|
shipped_to << [{ :content => "Name" , :border_width => 0, :width => 55 },{ :content => "#{c.first_name} #{c.last_name}" , :border_width => 0, :width => 200 }]
|
|
126
|
-
shipped_to << [{ :content => "IN-STORE PICKUP" , :border_width => 0, :width => 255 }]
|
|
126
|
+
shipped_to << [{ :content => "IN-STORE PICKUP" , :border_width => 0, :width => 255 , :colspan => 2 }]
|
|
127
127
|
else
|
|
128
128
|
shipped_to << [{ :content => "Name" , :border_width => 0, :width => 55 },{ :content => sa_name , :border_width => 0, :width => 200 }]
|
|
129
129
|
shipped_to << [{ :content => "Address" , :border_width => 0, :width => 55 },{ :content => sa_address , :border_width => 0, :width => 200 }]
|
|
@@ -165,9 +165,9 @@ module Caboose
|
|
|
165
165
|
|
|
166
166
|
invoice.invoice_packages.all.each do |pk|
|
|
167
167
|
|
|
168
|
-
carrier = pk.shipping_method.carrier
|
|
169
|
-
service = pk.shipping_method.service_name
|
|
170
|
-
package = pk.shipping_package.name
|
|
168
|
+
carrier = pk.shipping_method ? pk.shipping_method.carrier : ''
|
|
169
|
+
service = pk.shipping_method ? pk.shipping_method.service_name : ''
|
|
170
|
+
package = pk.shipping_package ? pk.shipping_package.name : ''
|
|
171
171
|
|
|
172
172
|
pk.line_items.each_with_index do |li, index|
|
|
173
173
|
options = ''
|
data/lib/caboose/version.rb
CHANGED