Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

do not show empty fields on fax pdf (closes foodcoops/foodsoft#108)

Browse source
This commit is contained in:
wvengen 2013-06-20 17:17:15 +02:00
parent e20898c5ee
commit 39b3dee050
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/documents/order_fax.rb
View file

@ -20,11 +20,17 @@ class OrderFax < OrderPdf
move_down 5 move_down 5
text "#{contact[:zip_code]} #{contact[:city]}", size: 9, align: :right text "#{contact[:zip_code]} #{contact[:city]}", size: 9, align: :right
move_down 5 move_down 5
text "#{I18n.t('simple_form.labels.supplier.customer_number')}: #{@order.supplier.try(:customer_number)}", size: 9, align: :right unless @order.supplier.try(:customer_number).blank?
move_down 5 text "#{I18n.t('simple_form.labels.supplier.customer_number')}: #{@order.supplier[:customer_number]}", size: 9, align: :right
text "#{I18n.t('simple_form.labels.supplier.phone')}: #{contact[:phone]}", size: 9, align: :right move_down 5
move_down 5 end
text "#{I18n.t('simple_form.labels.supplier.email')}: #{contact[:email]}", size: 9, align: :right unless contact[:phone].blank?
text "#{I18n.t('simple_form.labels.supplier.phone')}: #{contact[:phone]}", size: 9, align: :right
move_down 5
end
unless contact[:email].blank?
text "#{I18n.t('simple_form.labels.supplier.email')}: #{contact[:email]}", size: 9, align: :right
end
end end
# Recipient # Recipient
@ -32,8 +38,10 @@ class OrderFax < OrderPdf
text @order.name text @order.name
move_down 5 move_down 5
text @order.supplier.try(:address).to_s text @order.supplier.try(:address).to_s
move_down 5 unless @order.supplier.try(:fax).blank?
text "#{I18n.t('simple_form.labels.supplier.fax')}: #{@order.supplier.try(:fax)}" move_down 5
text "#{I18n.t('simple_form.labels.supplier.fax')}: #{@order.supplier[:fax]}"
end
end end
move_down 5 move_down 5
@ -42,8 +50,10 @@ class OrderFax < OrderPdf
move_down 10 move_down 10
text "#{I18n.t('simple_form.labels.delivery.delivered_on')}:" text "#{I18n.t('simple_form.labels.delivery.delivered_on')}:"
move_down 10 move_down 10
text "#{I18n.t('simple_form.labels.supplier.contact_person')}: #{@order.supplier.try(:contact_person)}" unless @order.supplier.try(:contact_person).blank?
move_down 10 text "#{I18n.t('simple_form.labels.supplier.contact_person')}: #{@order.supplier[:contact_person]}"
move_down 10
end
# Articles # Articles
data = [I18n.t('documents.order_fax.rows')] data = [I18n.t('documents.order_fax.rows')]