qr-bills 1.0.8 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebe1c2b95ed95343f6c469423a8f1771a242f363363b3e15f3057976e1a14c0
-  data.tar.gz: 05c5cad9f08d3a835b73b650fba6226822030287be05880319f9f0d94c3994b0
+  metadata.gz: dbb88b03ca64ef109608926dc972fd7c53f1db3f325e47d652faac6d128ad327
+  data.tar.gz: 2c7443c74f2a307e4b7d93774454131e723fc73b310d0cc613efac3d92a86450
 SHA512:
-  metadata.gz: aa143fa2bd2f6acca9796f15e99464d704292ceae9381805e34c2d07a1378c212fb5453c5efc15293bcb47de32f9e7391755024cfda3e9fbcb65fe3534136bed
-  data.tar.gz: f1297545bb6d81b73c96722a968c5ff78bfacee70b3b507b27432491808e224f3d63e5beb2d57b465f0fa59595fb18c7bab4499cf13c48f0a33afb3dc5fb360f
+  metadata.gz: 64d2bb70d15a823c5cf8fe007d4be5f206e299334eee7f8193eda58249d97356a128c1f2782d58c04d1e835a3e52a401a36ccc10973907893ced49c7b050d7e8
+  data.tar.gz: 1ebf9dbf4363102cb28f4c4b8781b26622f1fe69b4696c2e07fe83caa263cfbf376e566db5196dfa889389458f8e7866a6d5ca21c10e1a5f4b9cc41f44e828d2

data/config/locales/qrbills.en.yml

@@ -14,4 +14,4 @@ en:
     payable_by: payable by
     payable_by_name_addr: payable by (name/address)
     in_favour_of: in favour of
-    name: nom
+    name: name

data/config/locales/qrbills.fr.yml

@@ -14,4 +14,4 @@ fr:
     payable_by: payable par
     payable_by_name_addr: payable par (nom/adresse)
     in_favour_of: en faveur de
-    name: name
+    name: nom

data/lib/qr-bills/qr-html-layout.rb

@@ -33,9 +33,7 @@ module QRHTMLLayout
       layout += "    <div class=\"subtitle payable_to\">#{I18n.t("qrbills.account").capitalize} / #{I18n.t("qrbills.payable_to").capitalize}</div>\n"
       layout += "    <div class=\"qrcontent\">\n"
       layout += "      #{params[:bill_params][:creditor][:iban]}<br/>\n"
-      layout += "      #{params[:bill_params][:creditor][:address][:name]}<br/>\n"
-      layout += "      #{params[:bill_params][:creditor][:address][:line1]} #{params[:bill_params][:creditor][:address][:line2]}<br/>\n"
-      layout += "      #{params[:bill_params][:creditor][:address][:postal_code]} #{params[:bill_params][:creditor][:address][:town]}<br/>\n"
+      layout +=        render_address(params[:bill_params][:creditor][:address])
       layout += "    </div>\n"
       layout += "    <div><br/></div>\n"
 
@@ -49,9 +47,7 @@ module QRHTMLLayout
 
       layout += "    <div class=\"subtitle payable_by\">#{I18n.t("qrbills.payable_by").capitalize}</div>\n"
       layout += "    <div class=\"payable_by\">\n"
-      layout += "      #{params[:bill_params][:debtor][:address][:name]}<br/>\n"
-      layout += "      #{params[:bill_params][:debtor][:address][:line1]} #{params[:bill_params][:debtor][:address][:line2]}<br/>\n"
-      layout += "      #{params[:bill_params][:debtor][:address][:postal_code]} #{params[:bill_params][:debtor][:address][:town]}<br/>\n"
+      layout +=        render_address(params[:bill_params][:debtor][:address])
       layout += "    </div>\n"
 
       layout += "    <div class=\"amount\">\n"
@@ -103,9 +99,7 @@ module QRHTMLLayout
       layout += "      <div class=\"subtitle payable_to\">#{I18n.t("qrbills.account").capitalize} / #{I18n.t("qrbills.payable_to").capitalize}</div>\n"
       layout += "      <div class=\"qrcontent\">\n"
       layout += "        #{params[:bill_params][:creditor][:iban]}<br/>\n"
-      layout += "        #{params[:bill_params][:creditor][:address][:name]}<br/>\n"
-      layout += "        #{params[:bill_params][:creditor][:address][:line1]} #{params[:bill_params][:creditor][:address][:line2]}<br/>\n"
-      layout += "        #{params[:bill_params][:creditor][:address][:postal_code]} #{params[:bill_params][:creditor][:address][:town]}<br/>\n"
+      layout +=          render_address(params[:bill_params][:creditor][:address])
       layout += "      </div>\n"
       layout += "    <div><br/></div>\n"
 
@@ -127,9 +121,7 @@ module QRHTMLLayout
 
       layout += "    <div class=\"subtitle payable_by\">#{I18n.t("qrbills.payable_by").capitalize}</div>\n"
       layout += "      <div class=\"payable_by\">\n"
-      layout += "        #{params[:bill_params][:debtor][:address][:name]}<br/>\n"
-      layout += "        #{params[:bill_params][:debtor][:address][:line1]} #{params[:bill_params][:debtor][:address][:line2]}<br/>\n"
-      layout += "        #{params[:bill_params][:debtor][:address][:postal_code]} #{params[:bill_params][:debtor][:address][:town]}<br/>\n"
+      layout +=          render_address(params[:bill_params][:debtor][:address])
       layout += "      </div>\n"
       layout += "    </div>\n"
       layout += "  </div>\n"
@@ -252,4 +244,13 @@ module QRHTMLLayout
       layout
     end
   end
+
+  def self.render_address(address)
+    case address[:type]
+    when 'S'
+      format("%s<br>\n%s %s<br>\n%s %s<br>\n", address[:name], address[:line1], address[:line2], address[:postal_code], address[:town])
+    when 'K'
+      format("%s<br>\n%s<br>\n%s<br>\n", address[:name], address[:line1], address[:line2])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qr-bills
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.10
 platform: ruby
 authors:
 - Damiano Radice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-22 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n