diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0ccd537..81a57a8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Get Version id: get_version run: | - VERSION=$(grep -oP '(?<=).*(?=)' Zatca.EGS/Zatca.EGS.csproj) + VERSION=$(grep -oP '(?<=).*(?=)' ZatcaEGS/ZatcaEGS.csproj) echo "version=$VERSION" >> $GITHUB_OUTPUT - name: Create Release id: create_release @@ -62,18 +62,18 @@ jobs: - name: List Directory Contents run: ls -R - name: Restore dependencies - run: dotnet restore Zatca.EGS/Zatca.EGS.csproj + run: dotnet restore ZatcaEGS/ZatcaEGS.csproj - name: Build - run: dotnet build Zatca.EGS/Zatca.EGS.csproj --configuration Release --no-restore + run: dotnet build ZatcaEGS/ZatcaEGS.csproj --configuration Release --no-restore - name: Publish - run: dotnet publish Zatca.EGS/Zatca.EGS.csproj -c Release -o ./publish -r ${{ matrix.runtime }} --self-contained false + run: dotnet publish ZatcaEGS/ZatcaEGS.csproj -c Release -o ./publish -r ${{ matrix.runtime }} --self-contained false - name: Create macOS App Bundle if: matrix.os == 'macos-latest' run: | mkdir -p ZatcaEGS.app/Contents/{MacOS,Resources} - cp Zatca.EGS/wwwroot/images/apple-icon.icns ZatcaEGS.app/Contents/Resources/ + cp ZatcaEGS/wwwroot/images/apple-icon.icns ZatcaEGS.app/Contents/Resources/ echo -e "\n\n\n\n CFBundleExecutable\n ZatcaEGS\n CFBundleIconFile\n apple-icon\n\n" > ZatcaEGS.app/Contents/Info.plist - cp ./publish/Zatca.EGS ZatcaEGS.app/Contents/MacOS/ZatcaEGS + cp ./publish/ZatcaEGS ZatcaEGS.app/Contents/MacOS/ZatcaEGS chmod +x ZatcaEGS.app/Contents/MacOS/ZatcaEGS - name: Zip Release uses: thedoctor0/zip-release@master diff --git a/Zatca.EGS/Zatca.EGS.csproj b/Zatca.EGS/Zatca.EGS.csproj deleted file mode 100644 index 34ec0b0..0000000 --- a/Zatca.EGS/Zatca.EGS.csproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - net8.0 - disable - enable - win-x64;linux-x64;osx-x64 - apple-icon.png - wwwroot\favicon.ico - AnyCPU - - - - 24.09.06.0001 - 24.09.06.0001 - - - - - - - - - - - - - - - - - - - True - True - Resources.resx - - - - - - ResXFileCodeGenerator - Resources.Designer.cs - - - - - - PreserveNewest - - - Always - - - - diff --git a/Zatca.eInvoice.Test/Program.cs b/Zatca.eInvoice.Test/Program.cs index b1e4d1e..b0c9a38 100644 --- a/Zatca.eInvoice.Test/Program.cs +++ b/Zatca.eInvoice.Test/Program.cs @@ -12,8 +12,8 @@ public class ZatcaService private const string ComplianceCSIDUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/compliance"; private const string ProductionCSIDUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/production/csids"; private const string ComplianceCheckUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/compliance/invoices"; - private const string ReportingUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/invoices/reporting/single"; - private const string ClearanceUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/invoices/clearance/single"; + //private const string ReportingUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/invoices/reporting/single"; + //private const string ClearanceUrl = "https://gw-fatoora.zatca.gov.sa/e-invoicing/developer-portal/invoices/clearance/single"; private readonly HttpClient _httpClient; @@ -102,7 +102,7 @@ public async Task OnboardingDevice() } - public async Task CreateSignedInvoice(string CSIDBinaryToken, string EcSecp256k1Privkeypem) + public static async Task CreateInvoiceXml(string CSIDBinaryToken, string EcSecp256k1Privkeypem) { try { @@ -406,17 +406,17 @@ public class SignedInvoiceResult public string RequestApi { get; set; } } -public class ZatcaRequestApi -{ - [JsonProperty("uuid")] - public string Uuid { get; set; } +//public class ZatcaRequestApi +//{ +// [JsonProperty("uuid")] +// public string Uuid { get; set; } - [JsonProperty("invoiceHash")] - public string InvoiceHash { get; set; } +// [JsonProperty("invoiceHash")] +// public string InvoiceHash { get; set; } - [JsonProperty("invoice")] - public string Invoice { get; set; } -} +// [JsonProperty("invoice")] +// public string Invoice { get; set; } +//} public class ServerResult { @@ -547,8 +547,8 @@ static async Task Main(string[] args) //Console.WriteLine($"PCSID Secret:\n{result.PCSIDSecret} \n\n"); //// Step 2: Create Signed Invoice - ////var signedInvoiceResult = await zatcaService.CreateSignedInvoice(result.PCSIDBinaryToken, result.PrivateKey); - //var signedInvoiceResult = await zatcaService.CreateSignedInvoice(result.CCSIDBinaryToken, result.PrivateKey); + ////var signedInvoiceResult = await zatcaService.CreateInvoiceXml(result.PCSIDBinaryToken, result.PrivateKey); + //var signedInvoiceResult = await zatcaService.CreateInvoiceXml(result.CCSIDBinaryToken, result.PrivateKey); //Console.WriteLine("Signed Invoice Result:\n\n"); ////Console.WriteLine($"Base64 Signed Invoice:\n{signedInvoiceResult.Base64SignedInvoice} \n"); diff --git a/ZatcaEGS.sln b/ZatcaEGS.sln index 5de472d..e3bf9bb 100644 --- a/ZatcaEGS.sln +++ b/ZatcaEGS.sln @@ -7,7 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zatca.eInvoice", "Zatca.eIn EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zatca.eInvoice.Test", "Zatca.eInvoice.Test\Zatca.eInvoice.Test.csproj", "{2D1BCAFB-BB8F-4D44-A8D5-0889153DC1E3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Zatca.EGS", "Zatca.EGS\Zatca.EGS.csproj", "{89BD9AFD-AF48-4DA9-A7D6-25CE05A537A8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZatcaEGS", "ZatcaEGS\ZatcaEGS.csproj", "{89BD9AFD-AF48-4DA9-A7D6-25CE05A537A8}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Zatca.EGS/.config/dotnet-tools.json b/ZatcaEGS/.config/dotnet-tools.json similarity index 100% rename from Zatca.EGS/.config/dotnet-tools.json rename to ZatcaEGS/.config/dotnet-tools.json diff --git a/Zatca.EGS/Controllers/DisclaimerController.cs b/ZatcaEGS/Controllers/DisclaimerController.cs similarity index 97% rename from Zatca.EGS/Controllers/DisclaimerController.cs rename to ZatcaEGS/Controllers/DisclaimerController.cs index a1a1489..d89826b 100644 --- a/Zatca.EGS/Controllers/DisclaimerController.cs +++ b/ZatcaEGS/Controllers/DisclaimerController.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace Zatca.EGS.Controllers +namespace ZatcaEGS.Controllers { public class DisclaimerController : Controller { diff --git a/Zatca.EGS/Controllers/HomeController.cs b/ZatcaEGS/Controllers/HomeController.cs similarity index 89% rename from Zatca.EGS/Controllers/HomeController.cs rename to ZatcaEGS/Controllers/HomeController.cs index ec44d49..1405296 100644 --- a/Zatca.EGS/Controllers/HomeController.cs +++ b/ZatcaEGS/Controllers/HomeController.cs @@ -1,8 +1,8 @@ using Microsoft.AspNetCore.Mvc; using System.Diagnostics; -using Zatca.EGS.Models; +using ZatcaEGS.Models; -namespace Zatca.EGS.Controllers +namespace ZatcaEGS.Controllers { public class HomeController : Controller { diff --git a/Zatca.EGS/Controllers/RelayController.cs b/ZatcaEGS/Controllers/RelayController.cs similarity index 99% rename from Zatca.EGS/Controllers/RelayController.cs rename to ZatcaEGS/Controllers/RelayController.cs index bd200dd..c5ac502 100644 --- a/Zatca.EGS/Controllers/RelayController.cs +++ b/ZatcaEGS/Controllers/RelayController.cs @@ -3,12 +3,12 @@ using System.Net.Http.Headers; using System.Text; using System.Xml.Serialization; -using Zatca.EGS.Helpers; -using Zatca.EGS.Models; +using ZatcaEGS.Helpers; +using ZatcaEGS.Models; using Zatca.eInvoice; using Zatca.eInvoice.Models; -namespace Zatca.EGS.Controllers +namespace ZatcaEGS.Controllers { [ApiController] public class RelayController : Controller diff --git a/Zatca.EGS/Controllers/WizardController.cs b/ZatcaEGS/Controllers/WizardController.cs similarity index 99% rename from Zatca.EGS/Controllers/WizardController.cs rename to ZatcaEGS/Controllers/WizardController.cs index 5ebf036..0bdabcc 100644 --- a/Zatca.EGS/Controllers/WizardController.cs +++ b/ZatcaEGS/Controllers/WizardController.cs @@ -5,13 +5,13 @@ using System.Net.Http.Headers; using System.Net.Mime; using System.Text; -using Zatca.EGS.Helpers; -using Zatca.EGS.Models; +using ZatcaEGS.Helpers; +using ZatcaEGS.Models; using Zatca.eInvoice; using Zatca.eInvoice.Helpers; using Zatca.eInvoice.Models; -namespace Zatca.EGS.Controllers +namespace ZatcaEGS.Controllers { public class WizardController : Controller { @@ -140,7 +140,7 @@ public async Task GenerateCustomFieldAsync([FromBody] AccessToken string apiKey = token.ApiSecret; // Load JSON data from resources - byte[] jsonDataBytes = Zatca.EGS.Properties.Resources.cfData; + byte[] jsonDataBytes = ZatcaEGS.Properties.Resources.cfData; string jsonData = Encoding.UTF8.GetString(jsonDataBytes); try diff --git a/Zatca.EGS/CreateLinuxServices.sh b/ZatcaEGS/CreateLinuxServices.sh similarity index 91% rename from Zatca.EGS/CreateLinuxServices.sh rename to ZatcaEGS/CreateLinuxServices.sh index 92fb362..af7aae6 100644 --- a/Zatca.EGS/CreateLinuxServices.sh +++ b/ZatcaEGS/CreateLinuxServices.sh @@ -13,7 +13,7 @@ check_dotnet() { # Fungsi untuk memberikan izin eksekusi set_permissions() { - chmod +x Zatca.EGS + chmod +x ZatcaEGS echo "Izin eksekusi diberikan ke ZatcaEGS" } @@ -21,10 +21,10 @@ set_permissions() { run_app() { if [ "$1" == "service" ]; then echo "Menjalankan ZatcaEGS sebagai layanan..." - sudo ./Zatca.EGS + sudo ./ZatcaEGS else echo "Menjalankan ZatcaEGS dalam mode interaktif..." - ./Zatca.EGS + ./ZatcaEGS fi } @@ -37,7 +37,7 @@ Description=Zatca EGS Service After=network.target [Service] -ExecStart=$(pwd)/Zatca.EGS +ExecStart=$(pwd)/ZatcaEGS WorkingDirectory=$(pwd) User=$(whoami) Restart=always @@ -49,7 +49,7 @@ EOL echo "Mengaktifkan dan memulai layanan ZatcaEGS..." sudo systemctl enable zatca-egs.service sudo systemctl start zatca-egs.service - echo "Layanan Zatca.EGS telah diaktifkan dan dijalankan." + echo "Layanan ZatcaEGS telah diaktifkan dan dijalankan." } # Main script diff --git a/Zatca.EGS/CreateWindowsServices.bat b/ZatcaEGS/CreateWindowsServices.bat similarity index 97% rename from Zatca.EGS/CreateWindowsServices.bat rename to ZatcaEGS/CreateWindowsServices.bat index 7d4594e..59c05d3 100644 --- a/Zatca.EGS/CreateWindowsServices.bat +++ b/ZatcaEGS/CreateWindowsServices.bat @@ -3,7 +3,7 @@ setlocal REM Set the path to the executable and service name set "serviceName=ZatcaEGS" -set "binPath=%~dp0Zatca.EGS.exe" +set "binPath=%~dp0ZatcaEGS.exe" REM Check if the service already exists sc query %serviceName% >nul 2>&1 diff --git a/Zatca.EGS/Extensions/DisclaimerMiddleware.cs b/ZatcaEGS/Extensions/DisclaimerMiddleware.cs similarity index 95% rename from Zatca.EGS/Extensions/DisclaimerMiddleware.cs rename to ZatcaEGS/Extensions/DisclaimerMiddleware.cs index 3a9f67e..239a604 100644 --- a/Zatca.EGS/Extensions/DisclaimerMiddleware.cs +++ b/ZatcaEGS/Extensions/DisclaimerMiddleware.cs @@ -1,4 +1,4 @@ -//namespace Zatca.EGS.Extensions +//namespace ZatcaEGS.Extensions //{ // public class DisclaimerMiddleware // { @@ -24,7 +24,7 @@ // } //} -namespace Zatca.EGS.Extensions +namespace ZatcaEGS.Extensions { public class DisclaimerMiddleware { diff --git a/Zatca.EGS/Helpers/ComplianceTest.cs b/ZatcaEGS/Helpers/ComplianceTest.cs similarity index 99% rename from Zatca.EGS/Helpers/ComplianceTest.cs rename to ZatcaEGS/Helpers/ComplianceTest.cs index 6006af3..b2cc2d5 100644 --- a/Zatca.EGS/Helpers/ComplianceTest.cs +++ b/ZatcaEGS/Helpers/ComplianceTest.cs @@ -1,10 +1,10 @@ using System.Text; -using Zatca.EGS.Models; +using ZatcaEGS.Models; using Zatca.eInvoice; using Zatca.eInvoice.Helpers; using Zatca.eInvoice.Models; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public class ComplianceTest { diff --git a/Zatca.EGS/Helpers/DocumentFormatter.cs b/ZatcaEGS/Helpers/DocumentFormatter.cs similarity index 98% rename from Zatca.EGS/Helpers/DocumentFormatter.cs rename to ZatcaEGS/Helpers/DocumentFormatter.cs index 1193be7..fff88e7 100644 --- a/Zatca.EGS/Helpers/DocumentFormatter.cs +++ b/ZatcaEGS/Helpers/DocumentFormatter.cs @@ -5,7 +5,7 @@ using System.Xml; using System.Xml.Linq; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public static class DocumentFormatter { diff --git a/Zatca.EGS/Helpers/GuidValidationAttribute.cs b/ZatcaEGS/Helpers/GuidValidationAttribute.cs similarity index 96% rename from Zatca.EGS/Helpers/GuidValidationAttribute.cs rename to ZatcaEGS/Helpers/GuidValidationAttribute.cs index ce0abd5..4dcb44b 100644 --- a/Zatca.EGS/Helpers/GuidValidationAttribute.cs +++ b/ZatcaEGS/Helpers/GuidValidationAttribute.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using System.Text.RegularExpressions; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public class GuidValidationAttribute : ValidationAttribute { diff --git a/Zatca.EGS/Helpers/JsonParser.cs b/ZatcaEGS/Helpers/JsonParser.cs similarity index 99% rename from Zatca.EGS/Helpers/JsonParser.cs rename to ZatcaEGS/Helpers/JsonParser.cs index f38500c..501ee85 100644 --- a/Zatca.EGS/Helpers/JsonParser.cs +++ b/ZatcaEGS/Helpers/JsonParser.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json.Linq; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public class JsonParser { diff --git a/Zatca.EGS/Helpers/ObjectCompressor.cs b/ZatcaEGS/Helpers/ObjectCompressor.cs similarity index 98% rename from Zatca.EGS/Helpers/ObjectCompressor.cs rename to ZatcaEGS/Helpers/ObjectCompressor.cs index f3522c6..1ea11ce 100644 --- a/Zatca.EGS/Helpers/ObjectCompressor.cs +++ b/ZatcaEGS/Helpers/ObjectCompressor.cs @@ -2,7 +2,7 @@ using System.IO.Compression; using System.Text; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public static class ObjectCompressor { diff --git a/Zatca.EGS/Helpers/QrCodeDecoder.cs b/ZatcaEGS/Helpers/QrCodeDecoder.cs similarity index 99% rename from Zatca.EGS/Helpers/QrCodeDecoder.cs rename to ZatcaEGS/Helpers/QrCodeDecoder.cs index bcc7bf5..697d6e5 100644 --- a/Zatca.EGS/Helpers/QrCodeDecoder.cs +++ b/ZatcaEGS/Helpers/QrCodeDecoder.cs @@ -1,6 +1,6 @@ using System.Text; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public class QrCodeDecoder { diff --git a/Zatca.EGS/Helpers/RellayToInvoiceMapper.cs b/ZatcaEGS/Helpers/RellayToInvoiceMapper.cs similarity index 99% rename from Zatca.EGS/Helpers/RellayToInvoiceMapper.cs rename to ZatcaEGS/Helpers/RellayToInvoiceMapper.cs index d243271..05abc17 100644 --- a/Zatca.EGS/Helpers/RellayToInvoiceMapper.cs +++ b/ZatcaEGS/Helpers/RellayToInvoiceMapper.cs @@ -1,10 +1,10 @@ using Microsoft.VisualBasic; -using Zatca.EGS.Models; +using ZatcaEGS.Models; using Zatca.eInvoice.Helpers; using Zatca.eInvoice.Models; -using static Zatca.EGS.Helpers.VATInfoHelper; +using static ZatcaEGS.Helpers.VATInfoHelper; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public class RelayToInvoiceMapper { diff --git a/Zatca.EGS/Helpers/UrlHelper.cs b/ZatcaEGS/Helpers/UrlHelper.cs similarity index 97% rename from Zatca.EGS/Helpers/UrlHelper.cs rename to ZatcaEGS/Helpers/UrlHelper.cs index 4bb4f01..d99ac25 100644 --- a/Zatca.EGS/Helpers/UrlHelper.cs +++ b/ZatcaEGS/Helpers/UrlHelper.cs @@ -1,7 +1,7 @@  -using Zatca.EGS.Models; +using ZatcaEGS.Models; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public static class UrlHelper { diff --git a/Zatca.EGS/Helpers/VATInfoHelper.cs b/ZatcaEGS/Helpers/VATInfoHelper.cs similarity index 99% rename from Zatca.EGS/Helpers/VATInfoHelper.cs rename to ZatcaEGS/Helpers/VATInfoHelper.cs index 75c8c0e..01802b0 100644 --- a/Zatca.EGS/Helpers/VATInfoHelper.cs +++ b/ZatcaEGS/Helpers/VATInfoHelper.cs @@ -1,5 +1,5 @@  -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public class VATInfo { diff --git a/Zatca.EGS/Helpers/VersionHelper.cs b/ZatcaEGS/Helpers/VersionHelper.cs similarity index 92% rename from Zatca.EGS/Helpers/VersionHelper.cs rename to ZatcaEGS/Helpers/VersionHelper.cs index 113f997..18686e0 100644 --- a/Zatca.EGS/Helpers/VersionHelper.cs +++ b/ZatcaEGS/Helpers/VersionHelper.cs @@ -1,7 +1,7 @@ using System.Diagnostics; using System.Reflection; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public static class VersionHelper { diff --git a/Zatca.EGS/Helpers/ZatcaReference.cs b/ZatcaEGS/Helpers/ZatcaReference.cs similarity index 99% rename from Zatca.EGS/Helpers/ZatcaReference.cs rename to ZatcaEGS/Helpers/ZatcaReference.cs index f5716f6..d0c4025 100644 --- a/Zatca.EGS/Helpers/ZatcaReference.cs +++ b/ZatcaEGS/Helpers/ZatcaReference.cs @@ -2,9 +2,9 @@ using Newtonsoft.Json.Linq; using System.Net.Http.Headers; using System.Text; -using Zatca.EGS.Models; +using ZatcaEGS.Models; -namespace Zatca.EGS.Helpers +namespace ZatcaEGS.Helpers { public class ZatcaReference { diff --git a/Zatca.EGS/Models/ApprovedInvoice.cs b/ZatcaEGS/Models/ApprovedInvoice.cs similarity index 97% rename from Zatca.EGS/Models/ApprovedInvoice.cs rename to ZatcaEGS/Models/ApprovedInvoice.cs index 6fd6fd3..279216b 100644 --- a/Zatca.EGS/Models/ApprovedInvoice.cs +++ b/ZatcaEGS/Models/ApprovedInvoice.cs @@ -1,8 +1,8 @@ using System.ComponentModel.DataAnnotations; -using Zatca.EGS.Helpers; +using ZatcaEGS.Helpers; using Zatca.eInvoice.Helpers; -namespace Zatca.EGS.Models +namespace ZatcaEGS.Models { public class ApprovedInvoice { diff --git a/Zatca.EGS/Models/CertificateInfo.cs b/ZatcaEGS/Models/CertificateInfo.cs similarity index 99% rename from Zatca.EGS/Models/CertificateInfo.cs rename to ZatcaEGS/Models/CertificateInfo.cs index 4279a9d..0a20d8c 100644 --- a/Zatca.EGS/Models/CertificateInfo.cs +++ b/ZatcaEGS/Models/CertificateInfo.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Zatca.eInvoice.Helpers; -namespace Zatca.EGS.Models +namespace ZatcaEGS.Models { public class CertificateInfo { diff --git a/Zatca.EGS/Models/ErrorViewModel.cs b/ZatcaEGS/Models/ErrorViewModel.cs similarity index 96% rename from Zatca.EGS/Models/ErrorViewModel.cs rename to ZatcaEGS/Models/ErrorViewModel.cs index 2f8d3f2..70405ea 100644 --- a/Zatca.EGS/Models/ErrorViewModel.cs +++ b/ZatcaEGS/Models/ErrorViewModel.cs @@ -1,4 +1,4 @@ -namespace Zatca.EGS.Models +namespace ZatcaEGS.Models { public class ErrorViewModel { diff --git a/Zatca.EGS/Models/ManagerCustomField.cs b/ZatcaEGS/Models/ManagerCustomField.cs similarity index 98% rename from Zatca.EGS/Models/ManagerCustomField.cs rename to ZatcaEGS/Models/ManagerCustomField.cs index 9cb4c11..98a6b55 100644 --- a/Zatca.EGS/Models/ManagerCustomField.cs +++ b/ZatcaEGS/Models/ManagerCustomField.cs @@ -1,4 +1,4 @@ -namespace Zatca.EGS.Models +namespace ZatcaEGS.Models { public static class ManagerCustomField { diff --git a/Zatca.EGS/Models/PartyTaxInfo.cs b/ZatcaEGS/Models/PartyTaxInfo.cs similarity index 95% rename from Zatca.EGS/Models/PartyTaxInfo.cs rename to ZatcaEGS/Models/PartyTaxInfo.cs index 442428e..193aa39 100644 --- a/Zatca.EGS/Models/PartyTaxInfo.cs +++ b/ZatcaEGS/Models/PartyTaxInfo.cs @@ -1,4 +1,4 @@ -namespace Zatca.EGS.Models +namespace ZatcaEGS.Models { public class PartyTaxInfo { diff --git a/Zatca.EGS/Models/RelayData.cs b/ZatcaEGS/Models/RelayData.cs similarity index 99% rename from Zatca.EGS/Models/RelayData.cs rename to ZatcaEGS/Models/RelayData.cs index 9aa90fc..5c8f3ab 100644 --- a/Zatca.EGS/Models/RelayData.cs +++ b/ZatcaEGS/Models/RelayData.cs @@ -1,9 +1,9 @@  using Newtonsoft.Json; -using Zatca.EGS.Helpers; +using ZatcaEGS.Helpers; using Zatca.eInvoice.Helpers; -namespace Zatca.EGS.Models +namespace ZatcaEGS.Models { public class RelayData { diff --git a/Zatca.EGS/Models/ServerResult.cs b/ZatcaEGS/Models/ServerResult.cs similarity index 99% rename from Zatca.EGS/Models/ServerResult.cs rename to ZatcaEGS/Models/ServerResult.cs index ec8109d..c69f2a4 100644 --- a/Zatca.EGS/Models/ServerResult.cs +++ b/ZatcaEGS/Models/ServerResult.cs @@ -1,6 +1,6 @@ using Newtonsoft.Json; -namespace Zatca.EGS.Models +namespace ZatcaEGS.Models { //public class ZatcaRequestApi //{ diff --git a/Zatca.EGS/Program.cs b/ZatcaEGS/Program.cs similarity index 99% rename from Zatca.EGS/Program.cs rename to ZatcaEGS/Program.cs index 3fc6a12..506963f 100644 --- a/Zatca.EGS/Program.cs +++ b/ZatcaEGS/Program.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Runtime.InteropServices; using System.Text.Json.Serialization; -using Zatca.EGS.Extensions; +using ZatcaEGS.Extensions; var builder = WebApplication.CreateBuilder(args); diff --git a/Zatca.EGS/Properties/Resources.Designer.cs b/ZatcaEGS/Properties/Resources.Designer.cs similarity index 95% rename from Zatca.EGS/Properties/Resources.Designer.cs rename to ZatcaEGS/Properties/Resources.Designer.cs index 3b94c89..7ef7093 100644 --- a/Zatca.EGS/Properties/Resources.Designer.cs +++ b/ZatcaEGS/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace Zatca.EGS.Properties { +namespace ZatcaEGS.Properties { using System; @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Zatca.EGS.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ZatcaEGS.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/Zatca.EGS/Properties/Resources.resx b/ZatcaEGS/Properties/Resources.resx similarity index 100% rename from Zatca.EGS/Properties/Resources.resx rename to ZatcaEGS/Properties/Resources.resx diff --git a/Zatca.EGS/Properties/ServiceDependencies/ZatcaEGS - Web Deploy/profile.arm.json b/ZatcaEGS/Properties/ServiceDependencies/ZatcaEGS - Web Deploy/profile.arm.json similarity index 100% rename from Zatca.EGS/Properties/ServiceDependencies/ZatcaEGS - Web Deploy/profile.arm.json rename to ZatcaEGS/Properties/ServiceDependencies/ZatcaEGS - Web Deploy/profile.arm.json diff --git a/Zatca.EGS/Properties/launchSettings.json b/ZatcaEGS/Properties/launchSettings.json similarity index 100% rename from Zatca.EGS/Properties/launchSettings.json rename to ZatcaEGS/Properties/launchSettings.json diff --git a/ZatcaEGS/UpdateVersion.ps1 b/ZatcaEGS/UpdateVersion.ps1 new file mode 100644 index 0000000..219b1e7 --- /dev/null +++ b/ZatcaEGS/UpdateVersion.ps1 @@ -0,0 +1,32 @@ +$projectFile = "ZatcaEGS.csproj" # Replace with your actual .csproj filename +[xml]$xmlContent = Get-Content $projectFile + +$currentDate = Get-Date +$year = $currentDate.ToString("yy") +$month = $currentDate.ToString("MM") +$day = $currentDate.ToString("dd") + +$propertyGroup = $xmlContent.Project.PropertyGroup | Where-Object { $_.AssemblyVersion -and $_.FileVersion } + +if ($propertyGroup) { + $currentVersion = [Version]$propertyGroup.AssemblyVersion + $currentDateVersion = "{0}.{1}.{2}" -f $year, $month, $day + + if ($currentVersion.Major.ToString("00") + $currentVersion.Minor.ToString("00") + $currentVersion.Build.ToString("00") -eq $currentDateVersion.Replace(".", "")) { + # Same day, increment revision + $newRevision = $currentVersion.Revision + 1 + } else { + # New day, reset revision + $newRevision = 1 + } + + $newVersion = "{0}.{1}.{2}.{3:D4}" -f $year, $month, $day, $newRevision + + $propertyGroup.AssemblyVersion = $newVersion + $propertyGroup.FileVersion = $newVersion + + $xmlContent.Save($projectFile) + Write-Output "Version updated to $newVersion" +} else { + Write-Output "PropertyGroup with AssemblyVersion and FileVersion not found in $projectFile" +} diff --git a/Zatca.EGS/Views/Disclaimer/Index.cshtml b/ZatcaEGS/Views/Disclaimer/Index.cshtml similarity index 100% rename from Zatca.EGS/Views/Disclaimer/Index.cshtml rename to ZatcaEGS/Views/Disclaimer/Index.cshtml diff --git a/Zatca.EGS/Views/Home/Index.cshtml b/ZatcaEGS/Views/Home/Index.cshtml similarity index 100% rename from Zatca.EGS/Views/Home/Index.cshtml rename to ZatcaEGS/Views/Home/Index.cshtml diff --git a/Zatca.EGS/Views/Relay/Certificate.cshtml b/ZatcaEGS/Views/Relay/Certificate.cshtml similarity index 100% rename from Zatca.EGS/Views/Relay/Certificate.cshtml rename to ZatcaEGS/Views/Relay/Certificate.cshtml diff --git a/Zatca.EGS/Views/Relay/Index.cshtml b/ZatcaEGS/Views/Relay/Index.cshtml similarity index 99% rename from Zatca.EGS/Views/Relay/Index.cshtml rename to ZatcaEGS/Views/Relay/Index.cshtml index fc006c2..5aa7db8 100644 --- a/Zatca.EGS/Views/Relay/Index.cshtml +++ b/ZatcaEGS/Views/Relay/Index.cshtml @@ -1,4 +1,4 @@ -@using Zatca.EGS.Helpers +@using ZatcaEGS.Helpers @using Newtonsoft.Json @using System.Xml.Linq @using System.Text diff --git a/Zatca.EGS/Views/Relay/Info.cshtml b/ZatcaEGS/Views/Relay/Info.cshtml similarity index 100% rename from Zatca.EGS/Views/Relay/Info.cshtml rename to ZatcaEGS/Views/Relay/Info.cshtml diff --git a/Zatca.EGS/Views/Shared/Error.cshtml b/ZatcaEGS/Views/Shared/Error.cshtml similarity index 100% rename from Zatca.EGS/Views/Shared/Error.cshtml rename to ZatcaEGS/Views/Shared/Error.cshtml diff --git a/Zatca.EGS/Views/Shared/_Layout.cshtml b/ZatcaEGS/Views/Shared/_Layout.cshtml similarity index 99% rename from Zatca.EGS/Views/Shared/_Layout.cshtml rename to ZatcaEGS/Views/Shared/_Layout.cshtml index 6fc1f19..22985eb 100644 --- a/Zatca.EGS/Views/Shared/_Layout.cshtml +++ b/ZatcaEGS/Views/Shared/_Layout.cshtml @@ -1,4 +1,4 @@ -@using Zatca.EGS.Helpers +@using ZatcaEGS.Helpers diff --git a/Zatca.EGS/Views/Shared/_ValidationScriptsPartial.cshtml b/ZatcaEGS/Views/Shared/_ValidationScriptsPartial.cshtml similarity index 100% rename from Zatca.EGS/Views/Shared/_ValidationScriptsPartial.cshtml rename to ZatcaEGS/Views/Shared/_ValidationScriptsPartial.cshtml diff --git a/Zatca.EGS/Views/Wizard/Index.cshtml b/ZatcaEGS/Views/Wizard/Index.cshtml similarity index 99% rename from Zatca.EGS/Views/Wizard/Index.cshtml rename to ZatcaEGS/Views/Wizard/Index.cshtml index 9b800c5..f2a9637 100644 --- a/Zatca.EGS/Views/Wizard/Index.cshtml +++ b/ZatcaEGS/Views/Wizard/Index.cshtml @@ -1,5 +1,5 @@ @using Zatca.eInvoice.Helpers -@model Zatca.EGS.Models.CertificateInfo +@model ZatcaEGS.Models.CertificateInfo @{ ViewData["Title"] = "Device Setup"; diff --git a/Zatca.EGS/Views/_ViewImports.cshtml b/ZatcaEGS/Views/_ViewImports.cshtml similarity index 55% rename from Zatca.EGS/Views/_ViewImports.cshtml rename to ZatcaEGS/Views/_ViewImports.cshtml index 40d9dc8..f93372e 100644 --- a/Zatca.EGS/Views/_ViewImports.cshtml +++ b/ZatcaEGS/Views/_ViewImports.cshtml @@ -1,4 +1,4 @@ -@using Zatca.EGS -@using Zatca.EGS.Models +@using ZatcaEGS +@using ZatcaEGS.Models @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/Zatca.EGS/Views/_ViewStart.cshtml b/ZatcaEGS/Views/_ViewStart.cshtml similarity index 100% rename from Zatca.EGS/Views/_ViewStart.cshtml rename to ZatcaEGS/Views/_ViewStart.cshtml diff --git a/Zatca.EGS/appsettings.json b/ZatcaEGS/appsettings.json similarity index 100% rename from Zatca.EGS/appsettings.json rename to ZatcaEGS/appsettings.json diff --git a/Zatca.EGS/cfData.json b/ZatcaEGS/cfData.json similarity index 100% rename from Zatca.EGS/cfData.json rename to ZatcaEGS/cfData.json diff --git a/Zatca.EGS/wwwroot/css/site.css b/ZatcaEGS/wwwroot/css/site.css similarity index 100% rename from Zatca.EGS/wwwroot/css/site.css rename to ZatcaEGS/wwwroot/css/site.css diff --git a/Zatca.EGS/wwwroot/favicon.ico b/ZatcaEGS/wwwroot/favicon.ico similarity index 100% rename from Zatca.EGS/wwwroot/favicon.ico rename to ZatcaEGS/wwwroot/favicon.ico diff --git a/Zatca.EGS/wwwroot/images/apple-icon.icns b/ZatcaEGS/wwwroot/images/apple-icon.icns similarity index 100% rename from Zatca.EGS/wwwroot/images/apple-icon.icns rename to ZatcaEGS/wwwroot/images/apple-icon.icns diff --git a/Zatca.EGS/wwwroot/images/apple-icon.png b/ZatcaEGS/wwwroot/images/apple-icon.png similarity index 100% rename from Zatca.EGS/wwwroot/images/apple-icon.png rename to ZatcaEGS/wwwroot/images/apple-icon.png diff --git a/Zatca.EGS/wwwroot/images/logo.png b/ZatcaEGS/wwwroot/images/logo.png similarity index 100% rename from Zatca.EGS/wwwroot/images/logo.png rename to ZatcaEGS/wwwroot/images/logo.png diff --git a/Zatca.EGS/wwwroot/js/color-modes.js b/ZatcaEGS/wwwroot/js/color-modes.js similarity index 100% rename from Zatca.EGS/wwwroot/js/color-modes.js rename to ZatcaEGS/wwwroot/js/color-modes.js diff --git a/Zatca.EGS/wwwroot/js/qrcode.js b/ZatcaEGS/wwwroot/js/qrcode.js similarity index 100% rename from Zatca.EGS/wwwroot/js/qrcode.js rename to ZatcaEGS/wwwroot/js/qrcode.js diff --git a/Zatca.EGS/wwwroot/js/site.js b/ZatcaEGS/wwwroot/js/site.js similarity index 100% rename from Zatca.EGS/wwwroot/js/site.js rename to ZatcaEGS/wwwroot/js/site.js diff --git a/Zatca.EGS/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt b/ZatcaEGS/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt similarity index 100% rename from Zatca.EGS/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt rename to ZatcaEGS/wwwroot/lib/jquery-validation-unobtrusive/LICENSE.txt diff --git a/Zatca.EGS/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js b/ZatcaEGS/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js similarity index 100% rename from Zatca.EGS/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js rename to ZatcaEGS/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js diff --git a/Zatca.EGS/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/ZatcaEGS/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js similarity index 100% rename from Zatca.EGS/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js rename to ZatcaEGS/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js diff --git a/Zatca.EGS/wwwroot/lib/jquery-validation/LICENSE.md b/ZatcaEGS/wwwroot/lib/jquery-validation/LICENSE.md similarity index 100% rename from Zatca.EGS/wwwroot/lib/jquery-validation/LICENSE.md rename to ZatcaEGS/wwwroot/lib/jquery-validation/LICENSE.md diff --git a/Zatca.EGS/wwwroot/lib/jquery-validation/dist/additional-methods.js b/ZatcaEGS/wwwroot/lib/jquery-validation/dist/additional-methods.js similarity index 100% rename from Zatca.EGS/wwwroot/lib/jquery-validation/dist/additional-methods.js rename to ZatcaEGS/wwwroot/lib/jquery-validation/dist/additional-methods.js diff --git a/Zatca.EGS/wwwroot/lib/jquery-validation/dist/additional-methods.min.js b/ZatcaEGS/wwwroot/lib/jquery-validation/dist/additional-methods.min.js similarity index 100% rename from Zatca.EGS/wwwroot/lib/jquery-validation/dist/additional-methods.min.js rename to ZatcaEGS/wwwroot/lib/jquery-validation/dist/additional-methods.min.js diff --git a/Zatca.EGS/wwwroot/lib/jquery-validation/dist/jquery.validate.js b/ZatcaEGS/wwwroot/lib/jquery-validation/dist/jquery.validate.js similarity index 100% rename from Zatca.EGS/wwwroot/lib/jquery-validation/dist/jquery.validate.js rename to ZatcaEGS/wwwroot/lib/jquery-validation/dist/jquery.validate.js diff --git a/Zatca.EGS/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js b/ZatcaEGS/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js similarity index 100% rename from Zatca.EGS/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js rename to ZatcaEGS/wwwroot/lib/jquery-validation/dist/jquery.validate.min.js