@@ -124,7 +124,7 @@ module FPDF_INVOICE MyCell("Firma") if address.company? MyCell(address.company) if address.company? if address.title?: MyCell(address.title+" "+address.name) else MyCell(address.name) end - MyCell(address.street+" "+address.street_number) if address.street? + MyCell(address.street) if address.street? Ln(@lh) MyCell(address.postcode+" "+address.city) if address.postcode? && address.city? MyCell(address.country) if address.country? @@ -135,25 +135,25 @@ module FPDF_INVOICE data = [ [ if address.company?: replace_UTF8(address.company) else '' end, - if address.call_number?: "Tel "+replace_UTF8(address.call_number) else '' end, + if address.phone?: "Tel "+replace_UTF8(address.phone) else '' end, "Bankverbindung:", if address.tax_number?: "Steuernr: "+replace_UTF8(address.tax_number) else '' end ], [ if address.title?: replace_UTF8(address.title+" "+address.name) else replace_UTF8(address.name) end, - if address.fax_number?: "Fax "+replace_UTF8(address.fax_number) else '' end, + if address.fax?: "Fax "+replace_UTF8(address.fax) else '' end, if address.bank_name?: replace_UTF8(address.bank_name) else '' end, "" ], [ - if address.street?: replace_UTF8(address.street+" "+address.street_number) else '' end, + if address.street?: replace_UTF8(address.street) else '' end, if address.email?: replace_UTF8(address.email) else '' end, if address.bank_number?: "BLZ "+replace_UTF8(address.bank_number) else '' end, "" ], [ if address.postcode && address.city?: replace_UTF8(address.postcode+" "+address.city) else '' end, - if address.website_url?: replace_UTF8(address.website_url) else '' end, + if address.website?: replace_UTF8(address.website) else '' end, if address.account_number?: "KTO "+replace_UTF8(address.account_number) else '' end, if address.iban?: "IBAN "+replace_UTF8(address.iban) else '' end ] lib/fpdf/fpdf_invoice.rb @@ -4,15 +4,14 @@ horst_address: title: Herr company: Wollewolle Inc. name: Horst Tester - street: Sonnenallee - street_number: 33 + street: Sonnenallee 38 postcode: 21138 city: Berlin country: Deutschland - call_number: +49 (30) 44 55 33 - fax_number: +49 (30) 44 55 34 + phone: +49 (30) 44 55 33 + fax: +49 (30) 44 55 34 email: horst@wolle-incorporated.de - website_url: http://www.wollewolle-inc.de/ + website: http://www.wollewolle-inc.de/ tax_number: 99/177/55333 account_number: 77 33 11 99 bank_name: Europäische Zentralbank @@ -23,15 +22,14 @@ gabi_address: title: Frau company: Erdnuckel Ltd. name: Gabi Tester - street: Sonnenstraße - street_number: 13 + street: Sonnenstraße 13 postcode: 21144 city: Buxtehude country: Deutschland - call_number: +49 (30) 44 55 44 - fax_number: +49 (30) 44 55 45 + phone: +49 (30) 44 55 44 + fax: +49 (30) 44 55 45 email: gabi@nucknuck.de - website_url: http://www.erdnuckel-ltd.de/ + website: http://www.erdnuckel-ltd.de/ tax_number: 44/122/99933 account_number: 33 66 15 99 bank_name: Spaßkasse Buxtehude test/fixtures/addresses.yml 897f3d31850e40ac90138f724e0e3beb50706385 TomK32 tomk32@tomk32.de http://github.com/TomK32/exabuch/commit/b925cd5786640e5223ced6ef4436d396c70c7052 b925cd5786640e5223ced6ef4436d396c70c7052 2008-05-12T09:11:43-07:00 2008-05-12T09:11:43-07:00 changed attributes names in pdf generator and fixtures to match migration #11 b8d49ee15c5b94b575b7dee015b76d5610e18b76 TomK32 tomk32@tomk32.de