qr-bills 0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0f5417c130ea2bb955adc879dabbc2e93f470c3990bd7b79cc5c9d069a92aca
-  data.tar.gz: 412fd936ffa901e2d83909215c5dfe5e700945d76ae0ca8b3b4e4ea3d48f8740
+  metadata.gz: 5858d9367a9a2242c2470ecbf9a78049bc10d204a49879cf56f5b3a030260547
+  data.tar.gz: 9c84b71d8f5dfb153dc30c9f708d5d85e029bf3a9044989d1681e1614d4a61a6
 SHA512:
-  metadata.gz: a1448d54d8fddc9ae2e11fa8d900fa21f0a2c0d501360a6386636a9650200c53f3b487c0aa05d1acfb8909e2ab816ee57c1c70ce88d08f84ecfe903c1f09883e
-  data.tar.gz: 5787cc90e6a2546736376f7268bc13e044cfd06b0783b4876e77d12ff1d8f465c02cc804377e6cfe64074ac329e3f5025837f5de221d3f2391f6d169d8820209
+  metadata.gz: '0693596f364c324de432e87d79bea1b95f5d080ecfc7829cf37dfaf179940162ad56bc867b3adc2b8922c05e2c0f9c2cda2173f209a25dee27bc25a0efa1865b'
+  data.tar.gz: ba6f6ce3d2942ec51424324d9ace9c1e6c1cf2f50f091b9361c5b60fe3560dccb76e3e1864df28f5e2a360d5067ef8b57be4ee48f6d77dc86e397902ce734963

data/config/locales/qrbills.fr.yml

@@ -9,9 +9,9 @@ fr:
     currency: monnaie
     amount: montant
     receipt: récépissé
-    acceptance_point: èpomt de dépôt
+    acceptance_point: point de dépôt
     separate_before_paying_in: à détacher avant le versement
     payable_by: payable par
     payable_by_name_addr: payable par (nom/adresse)
     in_favour_of: en faveur de
-    name: name
+    name: name

data/lib/qr-bills/qr-creditor-reference.rb

@@ -4,6 +4,7 @@ require 'qr-bills/qr-exceptions'
 module QRCreditorReference
   PREFIX = "RF"
 
+  # chars values to calculate the check code
   @char_values = {
     "A": 10,
     "B": 11,
@@ -56,6 +57,8 @@ module QRCreditorReference
     reference_val += @char_values["R".to_sym].to_s + @char_values["F".to_sym].to_s + "00"
 
     # get check code
+    # when performing the validation of the check code (n % 97) 
+    # the remainder must be equal to 1, thus the 98
     check_code = 98 - (reference_val.to_i % 97)
 
     if check_code < 10

data/lib/qr-bills/qr-generator.rb

@@ -69,7 +69,7 @@ module QRGenerator
     payload += "#{params[:bill_params][:additionally_information]}\r\n"
     payload += "EPD\r\n"
     payload += "#{params[:bill_params][:bill_information_coded]}\r\n"
-    payload += "#{params[:bill_params][:alternative_scheme_paramters]}\r\n"
+    payload += "#{params[:bill_params][:alternative_scheme_parameters]}\r\n"
 
     qrcode = RQRCode::QRCode.new(payload)
 

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

@@ -8,6 +8,7 @@ module QRHTMLLayout
   end
 
   def self.html_layout(params)
+    I18n.locale = params[:bill_params][:language]
     layout  = "<div class=\"bill_container\">\n"
     layout += "  <div class=\"receipt_section\">\n"
     layout += "    <div class=\"title\">#{I18n.t("qrbills.receipt").capitalize}</div>\n"
@@ -74,8 +75,8 @@ module QRHTMLLayout
     layout += "        <span class=\"finfo_header\">#{I18n.t("qrbills.name").capitalize} AV1:</span> #{params[:bill_params][:bill_information_coded]}\n"
     end
   
-    if !params[:bill_params][:alternative_scheme_paramters].nil? && !params[:bill_params][:alternative_scheme_paramters].empty?
-    layout += "        <span class=\"finfo_header\">#{I18n.t("qrbills.name").capitalize} AV2:</span> #{params[:bill_params][:alternative_scheme_paramters]}\n"
+    if !params[:bill_params][:alternative_scheme_parameters].nil? && !params[:bill_params][:alternative_scheme_parameters].empty?
+    layout += "        <span class=\"finfo_header\">#{I18n.t("qrbills.name").capitalize} AV2:</span> #{params[:bill_params][:alternative_scheme_parameters]}\n"
     end
 
     layout += "      </div>\n"
@@ -232,4 +233,4 @@ module QRHTMLLayout
 
     return layout
   end
-end
+end

data/lib/qr-bills/qr-params.rb

@@ -24,7 +24,7 @@ module QRParams
         reference: "", # qr reference or creditor reference (iso-11649)
         additionally_information: "",
         bill_information_coded: "",
-        alternative_scheme_paramters: "",
+        alternative_scheme_parameters: "",
         creditor: {
           address: {
             type: "S",
@@ -72,22 +72,54 @@ module QRParams
   end
   
   def self.base_params_valid?(params)
-    # TODO
+    if params[:bill_type] == "" || params[:bill_type] == nil
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: bill type cannot be blank"
+    end
+
+    if params[:qrcode_filepath] == "" || params[:qrcode_filepath] == nil
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: qrcode_filepath cannot be blank"
+    end
+
+    if params[:bill_params][:currency] == "" || params[:bill_params][:currency] == nil
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: currency cannot be blank"
+    end
+
     true
   end
 
   def self.qr_bill_with_qr_reference_valid?(params)
-    # TODO
+    if params[:bill_params][:reference_type] != "QRR"
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: reference type must be 'QRR' for QR bill with standard reference"
+    end
+    
+    if params[:bill_params][:reference] == "" || params[:bill_params][:reference] == nil
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: reference cannot be blank for QR bill with standard reference"
+    end
+
     true
   end
 
   def self.qr_bill_with_creditor_reference_valid?(params)
-    # TODO
+    if params[:bill_params][:reference_type] != "SCOR"
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: reference type must be 'SCOR' for QR bill with (new) creditor reference"
+    end
+    
+    if params[:bill_params][:reference] == "" || params[:bill_params][:reference] == nil
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: reference cannot be blank for QR bill with (new) creditor reference"
+    end
+
     true
   end
 
   def self.qr_bill_without_reference_valid?(params)
-    # TODO
+    if params[:bill_params][:reference_type] != "NON"
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: reference type must be 'NON' for QR bill without reference"
+    end
+    
+    if params[:bill_params][:reference] != ""
+      raise ArgumentError, "#{QRExceptions::INVALID_PARAMETERS}: reference must be blank for QR bill without reference"
+    end
+  
     true
   end
 end

data/lib/qr-bills.rb

@@ -45,6 +45,6 @@ module QRBills
   end
 
   def self.get_qrbill_without_reference_type
-    QRParams::QR_BILL_WITOUTH_REFERENCE
+    QRParams::QR_BILL_WITHOUT_REFERENCE
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qr-bills
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 1.0.4
 platform: ruby
 authors:
 - Damiano Radice
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n