Modification du traitement des adresses postales pour les rendre optionnelles

[gestion-adh.git] / lib / nos_oignons / receipt.rb

diff --git a/lib/nos_oignons/receipt.rb b/lib/nos_oignons/receipt.rb
index 87869f709a45917bc7876889d163ec008e96ca49..c42333fa6d32556a9f32b741225434e89578ae2f 100644 (file)
--- a/lib/nos_oignons/receipt.rb
+++ b/lib/nos_oignons/receipt.rb
@@ -1,4 +1,20 @@
 #-*- coding: utf-8 -*-
+#
+# Système de gestion des adhésions de Nos oignons
+# Copyright © 2013-2014 Nos oignons <contact@nos-oignons.net>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'prawn'
 require 'prawn/measurement_extensions'
@@ -31,7 +47,7 @@ module NosOignons
     FOOTER_HEIGHT = 25.mm
     DARK_LOGO_COLOR = '57075f'
     FONT_PATH = File.expand_path("../../../share/fonts/OpenSans/OpenSans.ttf", __FILE__)
-    LOGO_PATH = File.expand_path("../../../share/images/nos-oignons.png", __FILE__)
+    LOGO_PATH = File.expand_path("../../../share/images/nos-oignons.jpg", __FILE__)
 
     def generate_header(pdf)
       header_height = pdf.bounds.height / 6
@@ -45,7 +61,7 @@ module NosOignons
         end
       end
       pdf.bounding_box([WINDOW_LEFT - pdf.bounds.absolute_left, pdf.bounds.absolute_top - WINDOW_TOP], :width => WINDOW_WIDTH, :height => WINDOW_BOTTOM - WINDOW_TOP) do
-        pdf.text member.name + "\n" + member.address, :valign => :bottom
+        pdf.text member.name + "\n" + (member.address || ''), :valign => :bottom
       end
     end