croatia 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e22a48f786d2268182526ab25ca8ef664847694e843b164afdbf38214f937bc
-  data.tar.gz: 8c36543cca8688fdccda47197ebc5b66f5554b3342629e04e03cafe528aaa88e
+  metadata.gz: 950fcecdaee0439b153f3bccc88c0dcc1bd65707200d6f88b7c08729752d0384
+  data.tar.gz: 56d5d0073b5059d2a70767ff82be379c92183f16a37bfcbb318c576cccc3b797
 SHA512:
-  metadata.gz: 93126e3a11b8e23414a3bf6b3ab051aeb47092380022b4a978b0f478c693ff5d62bb143f478bb6f55464c4a1a92d8df77890b3bff6332c8934f109ce05e86851
-  data.tar.gz: 840c3dd7f3ef96143bb5c694237fba3d4c6f7270a2aadb4e270746c0787bcd170c8ae193d83ace677c216f44a26357bc414e8888603b61a8f424ba8337ab2c0b
+  metadata.gz: b6388cb5613f183c1bbea376ab1eb2975b9e6f90c00c98c1e272a94a69ca19819b509aadc86d27fd63f1bf194b9597b5d391598015366294dbf6c1cbebdea306
+  data.tar.gz: 8f27f7baabdbb619e7b3048fc34f204b7279137437e0983de40492b5e5af2c1b23ba80c03e01b3c471a035756bfc7d6cb5106a147534e4a372220b46328a3ca0

data/lib/croatia/fiscalizer/xml_builder.rb

@@ -5,9 +5,20 @@ require "rexml/document"
 module Croatia::Fiscalizer::XMLBuilder
   TNS = "http://www.apis-it.hr/fin/2012/types/f73"
   XSI = "http://www.w3.org/2001/XMLSchema-instance"
+  SEQUENCE_MARK = {
+    register: "N", # N - sequential by register
+    business_location: "P" # P - sequential by business location
+  }.freeze
+  PAYMENT_METHODS = {
+    cash: "G", # G - gotovina
+    card: "K", # K - kartica
+    check: "C", # C - ček
+    transfer: "T", # T - prijenos
+    other: "O" # O - ostalo
+  }.freeze
 
   class << self
-    def invoice_request(invoice:, message_id:, timezone: Croatia::Invoice::Fiscalizer::TZ)
+    def invoice_request(invoice:, message_id:, specific_purpose: nil, subsequent_delivery: false, timezone: Croatia::Fiscalizer::TZ)
       REXML::Document.new.tap do |doc|
         envelope = doc.add_element("tns:RacunZahtjev", {
           "xmlns:tns" => TNS,
@@ -23,6 +34,23 @@ module Croatia::Fiscalizer::XMLBuilder
           payload.add_element("tns:Oib").text = invoice.seller.pin
           payload.add_element("tns:USustPdv").text = invoice.seller.pays_vat ? "true" : "false"
           payload.add_element("tns:DatVrijeme").text = timezone.to_local(invoice.issue_date).strftime("%d.%m.%YT%H:%M:%S")
+          payload.add_element("tns:OznSlijed").text = SEQUENCE_MARK[invoice.sequential_by]
+
+          payload.add_element("tns:BrRac").tap do |invoice_number|
+            invoice_number.add_element("tns:BrOznRac").text = invoice.sequential_number.to_s
+            invoice_number.add_element("tns:OznPosPr").text = invoice.business_location_identifier.to_s
+            invoice_number.add_element("tns:OznNapUr").text = invoice.register_identifier.to_s
+          end
+
+          # TODO: Add taxes
+
+          payload.add_element("tns:IznosUkupno").text = invoice.total.to_f.to_s
+          payload.add_element("tns:NacinPlac").text = PAYMENT_METHODS[invoice.payment_method]
+          payload.add_element("tns:OibOper").text = invoice.issuer.pin
+          payload.add_element("tns:ZastKod").text = invoice.issuer_protection_code
+          payload.add_element("tns:NakDost").text = subsequent_delivery ? "true" : "false"
+          payload.add_element("tns:ParagonBrRac").text = invoice.number
+          payload.add_element("tns:SpecNamj").text = specific_purpose if specific_purpose
         end
       end
     end

data/lib/croatia/fiscalizer.rb

@@ -4,11 +4,13 @@ require "digest/md5"
 require "openssl"
 require "securerandom"
 require "tzinfo"
+require "uri"
 
 class Croatia::Fiscalizer
   autoload :XMLBuilder, "croatia/fiscalizer/xml_builder"
 
   TZ = TZInfo::Timezone.get("Europe/Zagreb")
+  QR_CODE_BASE_URL = "https://porezna.gov.hr/rn"
 
   attr_reader :certificate
 
@@ -20,11 +22,8 @@ class Croatia::Fiscalizer
   end
 
   def fiscalize(invoice:, message_id: SecureRandom.uuid)
-    document = XMLBuilder.invoice_request(invoice: invoice, message_id: message_id, timezone: TZ)
-
-    # TODO: Implement the fiscalization logic here
-    puts "TODO: Fiscalize invoice #{invoice}"
-    puts "GENERATED XML:\n#{document}"
+    _document = XMLBuilder.invoice_request(invoice: invoice, message_id: message_id, timezone: TZ)
+    raise NotImplementedError, "Fiscalization XML generation is not implemented yet"
   end
 
   def generate_issuer_protection_code(invoice)
@@ -42,6 +41,34 @@ class Croatia::Fiscalizer
     Digest::MD5.hexdigest(signature).downcase
   end
 
+  def generate_verification_qr_code(invoice)
+    Croatia::QRCode.ensure_supported!
+
+    params = {
+      datv: TZ.to_local(invoice.issue_date).strftime("%Y%m%d_%H%M"),
+      izn: invoice.total_cents.to_s
+    }
+
+    if params[:izn].length > 10
+      raise ArgumentError, "Total amount exceeds 10 digits: #{params[:izn]}"
+    end
+
+    if invoice.unique_invoice_identifier
+      params[:jir] = invoice.unique_invoice_identifier
+    else
+      params[:zki] = generate_issuer_protection_code(invoice)
+    end
+
+    if params[:jir].nil? && params[:zki].nil?
+      raise ArgumentError, "Either unique_invoice_identifier or issuer_protection_code must be provided"
+    end
+
+    query_string = URI.encode_www_form(params)
+    url = "#{QR_CODE_BASE_URL}?#{query_string}"
+
+    Croatia::QRCode.new(url)
+  end
+
   private
 
     def load_certificate(cert, password)
@@ -50,7 +77,10 @@ class Croatia::Fiscalizer
       elsif cert.is_a?(OpenSSL::PKey::PKey)
         cert
       else
-        cert = File.read(cert) if cert.respond_to?(:to_s) && File.exist?(cert.to_s)
+        begin
+          cert = File.read(cert) if cert.respond_to?(:to_s) && File.exist?(cert.to_s)
+        rescue ArgumentError
+        end
 
         begin
           OpenSSL::PKey.read(cert)

data/lib/croatia/invoice/fiscalizable.rb

@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-require "uri"
-
 module Croatia::Invoice::Fiscalizable
-  QR_CODE_BASE_URL = "https://porezna.gov.hr/rn"
-
   def self.included(base)
     base.include InstanceMethods
   end
@@ -26,34 +22,9 @@ module Croatia::Invoice::Fiscalizable
     end
 
     def fiscalization_qr_code(**options)
-      Croatia::QRCode.ensure_supported!
-
-      params = {
-        datv: issue_date.strftime("%Y%m%d_%H%M"),
-        izn: total_cents.to_s
-      }
-
-      if params[:izn].length > 10
-        raise ArgumentError, "Total amount exceeds 10 digits: #{params[:izn]}"
-      end
-
-      uii = options[:unique_invoice_identifier] || unique_invoice_identifier
-
-      if uii
-        params[:jir] = uii
-      elsif !params[:zki]
-        ipc = issuer_protection_code(**options)
-        params[:zki] = ipc
-      end
-
-      if (params[:jir] && params[:zki]) || (params[:jir].nil? && params[:zki].nil?)
-        raise ArgumentError, "Either unique_invoice_identifier or issuer_protection_code must be provided"
-      end
-
-      query_string = URI.encode_www_form(params)
-      url = "#{QR_CODE_BASE_URL}?#{query_string}"
-
-      Croatia::QRCode.new(url)
+      Croatia::Fiscalizer
+        .new(**options)
+        .generate_verification_qr_code(self)
     end
   end
 end

data/lib/croatia/invoice/payable.rb

@@ -11,7 +11,7 @@ module Croatia::Invoice::Payable
         raise ArgumentError, "Both buyer and seller must be set before generating a payment barcode"
       end
 
-      description ||= "Racun #{number}"
+      description ||= "Račun #{number}"
 
       options = {
         currency: currency,

data/lib/croatia/invoice.rb

@@ -10,7 +10,6 @@ class Croatia::Invoice
   autoload :Party, "croatia/invoice/party"
   autoload :Tax, "croatia/invoice/tax"
   autoload :LineItem, "croatia/invoice/line_item"
-  autoload :Fiscalizer, "croatia/invoice/fiscalizer"
 
   include Croatia::Enum
   include Fiscalizable
@@ -27,16 +26,13 @@ class Croatia::Invoice
     :sequential_number, # redni broj racuna
     :unique_invoice_identifier # jir
 
-  enum :payment_method, {
-    cash: "G",
-    card: "K",
-    check: "C",
-    transfer: "T",
-    other: "O"
-  }.freeze, allow_nil: true, prefix: :payment_method
+  enum :payment_method, %i[ cash card check transfer other ].freeze, allow_nil: true, prefix: :payment_method
+  enum :sequential_by, %i[ register business_location ].freeze, allow_nil: true, prefix: :sequential_by
 
   def initialize(**options)
     self.line_items = options.delete(:line_items) { [] }
+    self.payment_method = :card
+    self.sequential_by = :register
 
     options.each do |key, value|
       public_send("#{key}=", value)

data/lib/croatia/pdf417.rb

@@ -4,11 +4,11 @@ class Croatia::PDF417
   def self.ensure_supported!
     return if supported?
 
-    raise LoadError, "PDF417 library is not loaded. Please ensure you have the pdf-417 gem installed."
+    raise LoadError, "Zint library is not loaded. Please ensure you have the ruby-zint gem installed and required."
   end
 
   def self.supported?
-    defined?(PDF417)
+    defined?(Zint)
   end
 
   attr_reader :data, :options
@@ -19,36 +19,17 @@ class Croatia::PDF417
   end
 
   def to_svg(**options)
-    ary = bar
+    vec = barcode.to_vector
 
-    unless ary
-      raise ArgumentError, "Data is not valid for PDF417 encoding"
-    end
-
-    options[:x_scale] ||= 1
-    options[:y_scale] ||= 1
-    options[:margin]  ||= 10
-
-    full_width  = (ary.first.size * options[:x_scale]) + (options[:margin] * 2)
-    full_height = (ary.size       * options[:y_scale]) + (options[:margin] * 2)
-
-    dots = ary.map { |l| l.chars.map { |c| c == "1" } }
+    foreground_color = options[:foreground_color] || "black"
+    background_color = options[:background_color] || "white"
 
     svg = []
-    svg << %Q(<?xml version="1.0" standalone="no"?>)
-    svg << %Q(<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="#{full_width}" height="#{full_height}">)
-    svg << %Q(<rect width="100%" height="100%" fill="white" />)
+    svg << %Q(<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="#{vec.width.to_i}" height="#{vec.height.to_i}" viewBox="0 0 #{vec.width.to_i} #{vec.height.to_i}">)
+    svg << %Q(<rect width="#{vec.width.to_i}" height="#{vec.height.to_i}" fill="#{background_color}" />)
 
-    y = options[:margin]
-    dots.each do |line|
-      x = options[:margin]
-      line.each do |bar|
-        if bar
-          svg << %Q(<rect x="#{x}" y="#{y}" width="#{options[:x_scale]}" height="#{options[:y_scale]}" fill="black" />)
-        end
-        x += options[:x_scale]
-      end
-      y += options[:y_scale]
+    vec.each_rectangle do |rect|
+      svg << %Q(<rect x="#{rect.x.to_i}" y="#{rect.y.to_i}" width="#{rect.width.to_i}" height="#{rect.height.to_i}" fill="#{foreground_color}" />)
     end
 
     svg << "</svg>"
@@ -56,16 +37,12 @@ class Croatia::PDF417
   end
 
   def to_png(**options)
-    barcode.to_png(**options)
+    barcode.to_memory_file(extension: ".png")
   end
 
   private
 
     def barcode
-      @barcode ||= PDF417.new(data).tap(&:generate)
-    end
-
-    def bar
-      barcode.instance_variable_get(:@bar)
+      @barcode ||= Zint::Barcode.new(**options, value: data, symbology: Zint::BARCODE_PDF417)
     end
 end

data/lib/croatia/qr_code.rb

@@ -4,7 +4,7 @@ class Croatia::QRCode
   def self.ensure_supported!
     return if supported?
 
-    raise LoadError, "RQRCode library is not loaded. Please ensure you have the rqrcode gem installed."
+    raise LoadError, "RQRCode library is not loaded. Please ensure you have the rqrcode gem installed and required."
   end
 
   def self.supported?

data/lib/croatia/umcn.rb

@@ -2,29 +2,190 @@
 
 # JMBG - Jedinstveni Matični Broj Građana
 # UMCN - Unique Master Citizen Number
-module Croatia::UMCN
+class Croatia::UMCN
+  WEIGHTS = [ 7, 6, 5, 4, 3, 2, 7, 6, 5, 4, 3, 2 ]
+  REGION_CODES = {
+    # Special / Foreign
+    0 => "Yugoslavia",
+    1 => "Foreigner in BiH",
+    2 => "Foreigner in Montenegro",
+    3 => "Foreigner in Croatia",
+    4 => "Foreigner in North Macedonia",
+    5 => "Foreigner in Slovenia",
+    6 => "Foreigner in Serbia",
+    7 => "Foreigner in Vojvodina",
+    8 => "Foreigner in Kosovo",
+    9 => "Yugoslavia",
+
+    # Bosnia and Herzegovina (10–19)
+    10 => "Banja Luka",
+    11 => "Bihac",
+    12 => "Doboj",
+    13 => "Gorazde",
+    14 => "Livno",
+    15 => "Mostar",
+    16 => "Prijedor",
+    17 => "Sarajevo",
+    18 => "Tuzla",
+    19 => "Zenica",
+
+    # Montenegro (21–29)
+    21 => "Podgorica",
+    22 => "Bar",
+    23 => "Budva",
+    24 => "Herceg Novi",
+    25 => "Cetinje",
+    26 => "Niksic",
+    27 => "Berane",
+    28 => "Bijelo Polje",
+    29 => "Pljevlja",
+
+    # Croatia (30–39)
+    30 => "Slavonia",
+    31 => "Podravina",
+    32 => "Medimurje",
+    33 => "Zagreb",
+    34 => "Kordun",
+    35 => "Lika",
+    36 => "Istria",
+    37 => "Banovina",
+    38 => "Dalmatia",
+    39 => "Zagorje",
+
+    # North Macedonia (41–49)
+    41 => "Bitola",
+    42 => "Kumanovo",
+    43 => "Ohrid",
+    44 => "Prilep",
+    45 => "Skopje",
+    46 => "Strumica",
+    47 => "Tetovo",
+    48 => "Veles",
+    49 => "Stip",
+
+    # Slovenia (50)
+    50 => "Slovenia",
+
+    # Serbia (70–79)
+    70 => "Serbia Abroad",
+    71 => "Belgrade",
+    72 => "Sumadija",
+    73 => "Nis",
+    74 => "Morava",
+    75 => "Zajecar",
+    76 => "Podunavlje",
+    77 => "Kolubara",
+    78 => "Kraljevo",
+    79 => "Uzice",
+
+    # Vojvodina (80–89)
+    80 => "Novi Sad",
+    81 => "Sombor",
+    82 => "Subotica",
+    83 => "Zrenjanin",
+    84 => "Kikinda",
+    85 => "Pancevo",
+    86 => "Vrbas",
+    87 => "Sremska Mitrovica",
+    88 => "Ruma",
+    89 => "Backa Topola",
+
+    # Kosovo (90–99)
+    90 => "Pristina",
+    91 => "Prizren",
+    92 => "Pec",
+    93 => "Djakovica",
+    94 => "Mitrovica",
+    95 => "Gnjilane",
+    96 => "Ferizaj",
+    97 => "Decan",
+    98 => "Klina",
+    99 => "Malisevo"
+  }.freeze
+
+
+  attr_accessor :birthday, :region_code, :sequence_number, :checkusm
+
   def self.valid?(umcn)
-    return false unless umcn =~ /\A\d{13}\Z/
+    return false if umcn.nil?
+    return false unless umcn.match?(/\A\d{13}\Z/)
+
+    parse(umcn).checksum == umcn.strip[-1].to_i
+  rescue Date::Error, ArgumentError
+    false
+  end
 
+  def self.parse(umcn)
     digits = umcn.chars.map(&:to_i)
 
     day = digits[0..1].join.to_i
     month = digits[2..3].join.to_i
     year = digits[4..6].join.to_i
-    century = case digits[4]
+    millenium = case digits[4]
     when 0 then 2000
-    when 9 then 1800
-    else 1900
+    else 1000
+    end
+    full_year = millenium + year
+
+    birthday = Date.new(full_year, month, day)
+    region_code = digits[7..8].join.to_i
+    sequence_number = digits[9..11].join.to_i
+
+    new(birthday: birthday, region_code: region_code, sequence_number: sequence_number)
+  end
+
+  def initialize(birthday:, region_code:, sequence_number:)
+    @birthday = birthday
+    @region_code = region_code
+    @sequence_number = sequence_number
+  end
+
+  def region_code=(value)
+    value = value.to_i
+
+    if REGION_CODES.key?(value)
+      @region_code = value
+    else
+      raise ArgumentError, "Invalid region code: #{value}"
     end
-    full_year = century + year
+  end
 
-    return false unless Date.valid_date?(full_year, month, day)
+  def sequence_number=(value)
+    value = value.to_i
+
+    if value < 0 || value > 999
+      raise ArgumentError, "Sequence number must be between 0 and 999"
+    end
+
+    @sequence_number = value
+  end
 
-    weights = [ 7, 6, 5, 4, 3, 2, 7, 6, 5, 4, 3, 2 ]
-    sum = digits[0..11].each_with_index.sum { |d, i| d * weights[i] }
+  def sex
+    sequence_number <= 499 ? :male : :female
+  end
+
+  def region_of_birth
+    REGION_CODES[region_code]
+  end
+
+  def to_s
+    parts = []
+    parts << birthday.strftime("%d%m")
+    parts << format("%03d", birthday.year % 1000)
+    parts << format("%02d", region_code)
+    parts << format("%03d", sequence_number)
+
+    digits = parts.join.chars.map(&:to_i)
+    sum = digits.each_with_index.sum { |digit, i| digit * WEIGHTS[i] }
     mod = sum % 11
-    checksum = mod == 0 || mod == 1 ? 0 : 11 - mod
 
-    digits[12] == checksum
+    checksum = (mod == 0 || mod == 1) ? 0 : (11 - mod)
+
+    parts << checksum.to_s
+    parts.join
+  end
+
+  def checksum
+    to_s[-1].to_i
   end
 end

data/lib/croatia/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Croatia
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: croatia
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Stanko K.R.
 bindir: exe
 cert_chain: []
-date: 2025-06-03 00:00:00.000000000 Z
+date: 2025-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openssl