From 39b3dee0500e38b729120d08a06f9327c7119a00 Mon Sep 17 00:00:00 2001 From: wvengen Date: Thu, 20 Jun 2013 17:17:15 +0200 Subject: [PATCH] do not show empty fields on fax pdf (closes foodcoops/foodsoft#108) --- app/documents/order_fax.rb | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/app/documents/order_fax.rb b/app/documents/order_fax.rb index 0caaaa4e..a553456c 100644 --- a/app/documents/order_fax.rb +++ b/app/documents/order_fax.rb @@ -20,11 +20,17 @@ class OrderFax < OrderPdf move_down 5 text "#{contact[:zip_code]} #{contact[:city]}", size: 9, align: :right move_down 5 - text "#{I18n.t('simple_form.labels.supplier.customer_number')}: #{@order.supplier.try(:customer_number)}", size: 9, align: :right - move_down 5 - text "#{I18n.t('simple_form.labels.supplier.phone')}: #{contact[:phone]}", size: 9, align: :right - move_down 5 - text "#{I18n.t('simple_form.labels.supplier.email')}: #{contact[:email]}", size: 9, align: :right + unless @order.supplier.try(:customer_number).blank? + text "#{I18n.t('simple_form.labels.supplier.customer_number')}: #{@order.supplier[:customer_number]}", size: 9, align: :right + move_down 5 + end + 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 # Recipient @@ -32,8 +38,10 @@ class OrderFax < OrderPdf text @order.name move_down 5 text @order.supplier.try(:address).to_s - move_down 5 - text "#{I18n.t('simple_form.labels.supplier.fax')}: #{@order.supplier.try(:fax)}" + unless @order.supplier.try(:fax).blank? + move_down 5 + text "#{I18n.t('simple_form.labels.supplier.fax')}: #{@order.supplier[:fax]}" + end end move_down 5 @@ -42,8 +50,10 @@ class OrderFax < OrderPdf move_down 10 text "#{I18n.t('simple_form.labels.delivery.delivered_on')}:" move_down 10 - text "#{I18n.t('simple_form.labels.supplier.contact_person')}: #{@order.supplier.try(:contact_person)}" - move_down 10 + unless @order.supplier.try(:contact_person).blank? + text "#{I18n.t('simple_form.labels.supplier.contact_person')}: #{@order.supplier[:contact_person]}" + move_down 10 + end # Articles data = [I18n.t('documents.order_fax.rows')]