nova verzija

- ažurirani paketi
framework ažuriran na net10
- standardizovano formatiranje datuma
- broj bankovnog računa prebačen u request kako bi se mogao dinamički mijenjati
- ažurirani deprecated djelovi koda
- dodat poreski datum u sklopu zahtjeva kako bi se pravilno obračunavao poreski datum i godina u broju računa
- rok plaćanje promijenjen iz DateTime u DateOnly

Author: dalrankov

Extensions/XmlDocumentExtensions.cs

@@ -2,6 +2,7 @@
 using System.Security.Cryptography.Xml;
 using System.Xml;
 using System.Xml.Linq;
+#pragma warning disable CS8670 // Object or collection initializer implicitly dereferences possibly null member.
 
 namespace OpenMicroFiscal.Extensions;
 

InvoiceService.cs

@@ -1,4 +1,5 @@
-using System.Security.Cryptography;
+using System.Globalization;
+using System.Security.Cryptography;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Xml;
@@ -7,22 +8,11 @@
 
 namespace OpenMicroFiscal;
 
-public sealed class InvoiceService
+public sealed class InvoiceService(
+    HttpClient httpClient,
+    FiscalizationSettings settings,
+    ProvideCertificate provideCertificate)
 {
-    private readonly HttpClient _httpClient;
-    private readonly ProvideCertificate _provideCertificate;
-    private readonly FiscalizationSettings _settings;
-
-    public InvoiceService(
-        HttpClient httpClient,
-        FiscalizationSettings settings,
-        ProvideCertificate provideCertificate)
-    {
-        _httpClient = httpClient;
-        _settings = settings;
-        _provideCertificate = provideCertificate;
-    }
-
     public async Task<CreateInvoiceResult> CreateInvoiceAsync(
         CreateInvoiceRequest createInvoiceRequest,
         CancellationToken cancellationToken = default)
@@ -58,7 +48,7 @@ public async Task<CreateInvoiceResult> CreateInvoiceAsync(
 
         var currentDateTime = DateTime.UtcNow.WithoutMilliseconds();
 
-        using var certificate = _provideCertificate();
+        using var certificate = provideCertificate();
 
         var (iicSignatureText, iicHashText) = ComputeIic(
             createInvoiceRequest.OrderNumber, currentDateTime, totalPrice, certificate);
@@ -81,42 +71,42 @@ public async Task<CreateInvoiceResult> CreateInvoiceAsync(
                 TypeOfInvoice = TypeOfInvoice.NonCash,
                 IssuedAt = currentDateTime,
                 Number = string.Join("/",
-                    _settings.IssuerBusinessUnitCode,
+                    settings.IssuerBusinessUnitCode,
                     createInvoiceRequest.OrderNumber,
-                    currentDateTime.Year,
-                    _settings.IssuerEnuCode),
+                    createInvoiceRequest.TaxDate.Year,
+                    settings.IssuerEnuCode),
                 OrderNumber = createInvoiceRequest.OrderNumber,
-                EnuCode = _settings.IssuerEnuCode,
+                EnuCode = settings.IssuerEnuCode,
                 IsIssuerInVat = true,
                 TotalPriceWithoutVat = totalPriceWithoutVat,
                 TotalVatAmount = totalVatAmount,
                 TotalPrice = totalPrice,
-                OperatorCode = _settings.IssuerOperatorCode,
-                BusinessUnitCode = _settings.IssuerBusinessUnitCode,
-                SoftwareCode = _settings.IssuerSoftwareCode,
+                OperatorCode = settings.IssuerOperatorCode,
+                BusinessUnitCode = settings.IssuerBusinessUnitCode,
+                SoftwareCode = settings.IssuerSoftwareCode,
                 IssuerInvoiceCodeHash = iicHashText,
                 IssuerInvoiceCodeSignature = iicSignatureText,
-                TaxPeriod = $"{currentDateTime.Month:00}/{currentDateTime.Year}",
+                TaxPeriod = $"{createInvoiceRequest.TaxDate.Month:00}/{createInvoiceRequest.TaxDate.Year}",
                 Note = createInvoiceRequest.Note,
-                BankNumber = _settings.IssuerBankNumber,
-                PayDeadline = createInvoiceRequest.PaymentDeadline.ToString("yyyy-MM-dd"),
+                BankNumber = createInvoiceRequest.BankNumber,
+                PayDeadline = createInvoiceRequest.PaymentDeadline.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture),
                 TotalPriceToPay = Math.Max(totalPrice, 0),
-                PaymentMethods = new List<PaymentMethod>
-                {
-                    new()
+                PaymentMethods =
+                [
+                    new PaymentMethod
                     {
                         Type = createInvoiceRequest.PaymentMethod,
                         Amount = totalPrice
                     }
-                },
+                ],
                 Seller = new Seller
                 {
-                    IdType = _settings.IssuerIdType,
-                    IdNumber = _settings.IssuerIdNumber,
-                    Name = _settings.IssuerName,
-                    Address = _settings.IssuerAddress,
-                    City = _settings.IssuerCity,
-                    Country = _settings.IssuerCountry
+                    IdType = settings.IssuerIdType,
+                    IdNumber = settings.IssuerIdNumber,
+                    Name = settings.IssuerName,
+                    Address = settings.IssuerAddress,
+                    City = settings.IssuerCity,
+                    Country = settings.IssuerCountry
                 },
                 Buyer = createInvoiceRequest.Buyer,
                 Items = invoiceItems,
@@ -149,11 +139,11 @@ public async Task<CreateInvoiceResult> CreateInvoiceAsync(
         var envelopedRequestXmlText = requestXmlDocument.ToEnvelopedXmlText();
 
         using var httpRequest = new StringContent(envelopedRequestXmlText, Encoding.UTF8, "text/xml");
-        using var httpResult = await _httpClient
+        using var httpResult = await httpClient
             .PostAsync("fs-v1", httpRequest, cancellationToken)
             .ConfigureAwait(false);
 
-        var responseXmlText = await httpResult.Content.ReadAsStringAsync().ConfigureAwait(false);
+        var responseXmlText = await httpResult.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
         var responseXmlDocument = new XmlDocument();
         responseXmlDocument.LoadXml(responseXmlText);
 
@@ -173,13 +163,13 @@ public async Task<CreateInvoiceResult> CreateInvoiceAsync(
 
         var urlQueryParams = new Dictionary<string, object>
         {
-            ["tin"] = _settings.IssuerIdNumber,
+            ["tin"] = settings.IssuerIdNumber,
             ["iic"] = iicHashText,
-            ["crtd"] = currentDateTime.ToString("yyyy-MM-ddTHH:mm:ssZ"),
+            ["crtd"] = currentDateTime.ToString("yyyy-MM-ddTHH:mm:ssZ", CultureInfo.InvariantCulture),
             ["ord"] = createInvoiceRequest.OrderNumber,
-            ["bu"] = _settings.IssuerBusinessUnitCode,
-            ["cr"] = _settings.IssuerEnuCode,
-            ["sw"] = _settings.IssuerSoftwareCode,
+            ["bu"] = settings.IssuerBusinessUnitCode,
+            ["cr"] = settings.IssuerEnuCode,
+            ["sw"] = settings.IssuerSoftwareCode,
             ["prc"] = totalPrice.ToFormattedString(2)
         };
 
@@ -191,7 +181,7 @@ public async Task<CreateInvoiceResult> CreateInvoiceAsync(
             EnvelopedRequestXmlText = envelopedRequestXmlText,
             Fic = responseBodyElement["RegisterInvoiceResponse"]!["FIC"]!.InnerText,
             VerificationUrl =
-                $"{UriProvider.GetInvoiceVerificationUri(_settings.Environment)}ic/#/verify?{queryString}",
+                $"{UriProvider.GetInvoiceVerificationUri(settings.Environment)}ic/#/verify?{queryString}",
             InvoiceNumber = request.Invoice.Number,
             Iic = iicHashText,
             TotalPrice = totalPrice,
@@ -206,22 +196,20 @@ public async Task<CreateInvoiceResult> CreateInvoiceAsync(
         X509Certificate2 certificate)
     {
         var iicPlainText = string.Join("|",
-            _settings.IssuerIdNumber,
-            currentDateTime.ToString("yyyy-MM-ddTHH:mm:ssZ"),
+            settings.IssuerIdNumber,
+            currentDateTime.ToString("yyyy-MM-ddTHH:mm:ssZ", CultureInfo.InvariantCulture),
             orderNumber,
-            _settings.IssuerBusinessUnitCode,
-            _settings.IssuerEnuCode,
-            _settings.IssuerSoftwareCode,
+            settings.IssuerBusinessUnitCode,
+            settings.IssuerEnuCode,
+            settings.IssuerSoftwareCode,
             totalPrice.ToFormattedString(2));
 
         var iicSignatureBytes = certificate
             .GetRSAPrivateKey()!
             .SignData(Encoding.UTF8.GetBytes(iicPlainText), HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-        var iicSignatureText = BitConverter.ToString(iicSignatureBytes).Replace("-", string.Empty);
-
-        using var md5 = MD5.Create();
-        var iicHashBytes = md5.ComputeHash(iicSignatureBytes);
-        var iicHashText = BitConverter.ToString(iicHashBytes).Replace("-", string.Empty);
+        var iicSignatureText = Convert.ToHexString(iicSignatureBytes);
+        var iicHashBytes = MD5.HashData(iicSignatureBytes);
+        var iicHashText = Convert.ToHexString(iicHashBytes);
 
         return (iicSignatureText, iicHashText);
     }

Models/CreateInvoiceRequest.cs

@@ -5,11 +5,13 @@ public sealed class CreateInvoiceRequest
     public InvoiceType Type { get; set; }
     public int OrderNumber { get; set; }
     public PaymentMethodType PaymentMethod { get; set; }
-    public DateTime PaymentDeadline { get; set; }
+    public string? BankNumber { get; set; }
+    public DateOnly PaymentDeadline { get; set; }
     public Buyer Buyer { get; set; }
     public IEnumerable<InvoiceItem> Items { get; set; }
     public string? Note { get; set; }
     public OriginalInvoice? Original { get; set; }
+    public DateOnly TaxDate { get; set; }
 
     public sealed class OriginalInvoice
     {

Models/FiscalizationSettings.cs

@@ -9,7 +9,6 @@ public sealed class FiscalizationSettings
     public string IssuerAddress { get; set; }
     public string IssuerCity { get; set; }
     public string IssuerCountry { get; set; }
-    public string? IssuerBankNumber { get; set; }
     public string IssuerBusinessUnitCode { get; set; }
     public string IssuerSoftwareCode { get; set; }
     public string IssuerOperatorCode { get; set; }

OpenMicroFiscal.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <LangVersion>10</LangVersion>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <NoWarn>CS8618</NoWarn>
@@ -24,7 +23,7 @@
         <RepositoryUrl>https://github.com/dalrankov/OpenMicroFiscal</RepositoryUrl>
         <PackageProjectUrl>https://github.com/dalrankov/OpenMicroFiscal</PackageProjectUrl>
 
-        <PackageReleaseNotes>Treća verzija u kojoj je moguće fiskalizovati standardne i korektivne račune. Ispravljena licenca, dodata ikonica paketa.</PackageReleaseNotes>
+        <PackageReleaseNotes>Četvrta verzija u kojoj su ažurirani paketi, framework ažuriran na net10, standardizovano formatiranje datuma, broj bankovnog računa prebačen u request kako bi se mogao dinamički mijenjati, ažurirani deprecated djelovi koda, dodat poreski datum u sklopu zahtjeva kako bi se pravilno obračunavao poreski datum i godina u broju računa, rok plaćanje promijenjen iz DateTime u DateOnly.</PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup>
@@ -35,9 +34,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.2"/>
-        <PackageReference Include="System.Security.Cryptography.Xml" Version="7.0.1"/>
-        <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
+        <PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
     </ItemGroup>
 
 </Project>

README.md

@@ -32,7 +32,6 @@ FiscalizationSettings__IssuerName="TEST DOO"
 FiscalizationSettings__IssuerCountry=MNE
 FiscalizationSettings__IssuerCity=PODGORICA
 FiscalizationSettings__IssuerAddress="ULICA BB"
-FiscalizationSettings__IssuerBankNumber=123-456-789
 FiscalizationSettings__IssuerSoftwareCode=ss123ss123
 FiscalizationSettings__IssuerEnuCode=si747we972
 FiscalizationSettings__IssuerBusinessUnitCode=xx123xx123
@@ -67,7 +66,6 @@ services.AddFiscalization(
         IssuerCountry = "MNE",
         IssuerCity = "PODGORICA",
         IssuerAddress = "ULICA BB",
-        IssuerBankNumber = "123-456-789",
         IssuerSoftwareCode = "ss123ss123",
         IssuerEnuCode = "si747we972",
         IssuerBusinessUnitCode = "xx123xx123",
@@ -100,7 +98,6 @@ var invoiceService = new InvoiceService(
         IssuerCountry = "MNE",
         IssuerCity = "PODGORICA",
         IssuerAddress = "ULICA BB",
-        IssuerBankNumber = "123-456-789",
         IssuerSoftwareCode = "ss123ss123",
         IssuerEnuCode = "si747we972",
         IssuerBusinessUnitCode = "xx123xx123",
@@ -119,6 +116,7 @@ var request = new CreateInvoiceRequest
     Type = InvoiceType.Invoice,
     OrderNumber = 15,
     PaymentMethod = PaymentMethodType.BankTransfer,
+    BankNumber = "123-456-789",
     PaymentDeadline = new DateTime(2022, 02, 25),
     Buyer = new Buyer
     {
@@ -164,6 +162,7 @@ var request = new CreateInvoiceRequest
     Type = InvoiceType.Corrective,
     OrderNumber = 16,
     PaymentMethod = PaymentMethodType.BankTransfer,
+    BankNumber = "123-456-789",
     PaymentDeadline = new DateTime(2022, 02, 25),
     Buyer = new Buyer
     {