dorsale 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a08c491a05f970f39cc2c0a2c41e25aee69ae6e3
-  data.tar.gz: dff69072c21dabbeb8c56c522aae407c05775d13
+  metadata.gz: dc6482c9e48b1a239d3db1ea019a441fc5751eba
+  data.tar.gz: b1dd5c07ba8aba8c9dedd9d2b8aa1089f0d33af5
 SHA512:
-  metadata.gz: 00132ceee7216380b1544086e74389f7280bf5bd733d10fd9b6842ba3a5031995a6a8628cdaeb7f9ab98eac699661a5d54a47758437c5b97138f3216b2724eba
-  data.tar.gz: f16f7989b12051331fa45316a00800c0270e9466224c4cb347322f765e0a9fdacd4f9144b250bb20b803707168a3dc106b70bcce845f644bb6731ba82c2c501c
+  metadata.gz: 4513e5b64c2a19938f4d29c8ba2ab8d82675220bbacfc821ab9a0be736be47052758972d42ca09d772dc24ad7e653ab4cf31afd8695898d0806cd034b1615210
+  data.tar.gz: 7e264cc5fa80580beb3cac6c25a8bfc9c3029f0a119ed64c63a3493f1fc01911a5b687dd7bb2c1475e4def6d715058d6b00a93790da4ef40f43acb2277b21c01

data/app/pdfs/dorsale/billing_machine/invoice_single_vat_pdf.rb

@@ -181,19 +181,25 @@ module Dorsale
             fill_color BLACK
           end
 
+          customer_text = []
+          customer_text << @main_document.customer.name
+          customer_text << @main_document.customer.address.street
+          customer_text <<  @main_document.customer.address.street_bis
+          customer_text << "#{@main_document.customer.address.zip} #{@main_document.customer.address.city}"
+          customer_text << @main_document.customer.address.country
+
+          if @main_document.customer.try(:european_union_vat_number).present?
+            customer_text << @main_document.customer.t(:european_union_vat_number)
+            customer_text << @main_document.customer.european_union_vat_number
+          end
+
+          customer_text = customer_text.select(&:present?).join("\n")
 
           bounding_box [bounds.left + padding, bounds.top - padding], height: bounds.height - padding, width: bounds.width - padding do
-            if @main_document.customer.present?
-              text @main_document.customer.name if @main_document.customer.name.present?
-              text @main_document.customer.address.street if @main_document.customer.address.street.present?
-              text @main_document.customer.address.street_bis if @main_document.customer.address.street_bis.present?
-              text "#{@main_document.customer.address.zip} #{@main_document.customer.address.city}, #{@main_document.customer.address.country}" if @main_document.customer.address.zip.present? || @main_document.customer.address.city.present? || @main_document.customer.address.country.present?
-              text "#{@main_document.customer.t :european_union_vat_number} :\n#{@main_document.customer.european_union_vat_number}" if @main_document.customer.try(:european_union_vat_number).present?
-            end
+            text customer_text
           end
-
         end
-      end
+      end # def build_customer
 
       def build_middle
         left   = bounds.left

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails