qr-bills 0.3 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0f5417c130ea2bb955adc879dabbc2e93f470c3990bd7b79cc5c9d069a92aca
-  data.tar.gz: 412fd936ffa901e2d83909215c5dfe5e700945d76ae0ca8b3b4e4ea3d48f8740
+  metadata.gz: 5b13afc587aab384d5e9a030f42108e2b9110fcc7990e6f1ae0b7ce94069d04c
+  data.tar.gz: 8052cd236374ecf1bc14ba7f41b7cd42295fc983a3034e3dec39b23af794c862
 SHA512:
-  metadata.gz: a1448d54d8fddc9ae2e11fa8d900fa21f0a2c0d501360a6386636a9650200c53f3b487c0aa05d1acfb8909e2ab816ee57c1c70ce88d08f84ecfe903c1f09883e
-  data.tar.gz: 5787cc90e6a2546736376f7268bc13e044cfd06b0783b4876e77d12ff1d8f465c02cc804377e6cfe64074ac329e3f5025837f5de221d3f2391f6d169d8820209
+  metadata.gz: f513cd9212d3469f6be2b9b254b7fd39fb3b61d712896d90f70250c5e05426d8bf87800940288c699649b19d3ae3cc71d6e17726e9a9ddbc15f49614402291a2
+  data.tar.gz: 455577fd45fcc3fe7be24f14ee32275e2d5e6e8d5257f4c7eeaee184616596f6a5f42c09e72d2fe01fe42d3ccf774a0711e0e60516e46438216fefad453d1967

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

@@ -74,8 +74,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"

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

metadata

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