diff --git a/Core/Interfaces/IQuoteDom.cs b/Core/Interfaces/IQuoteDom.cs index 346d184..b67234a 100644 --- a/Core/Interfaces/IQuoteDom.cs +++ b/Core/Interfaces/IQuoteDom.cs @@ -18,7 +18,7 @@ namespace Models.Interfaces //Task ExportFilteredQuotesToExcelAsync(QuoteSearchParams searchParams); #endregion #region Guardado completo de presupuesto (encabezado + detalles + roles + ajustes + impuestos) - Task CreateFullQuoteAsync(EQuoteHeader quote, int formSeriesId); + Task<(int Id, string Quotenumber)> CreateFullQuoteAsync(EQuoteHeader quote, int formSeriesId); Task GetDtoByIdAsync(int id); #endregion } diff --git a/Core/Services/QuoteService.cs b/Core/Services/QuoteService.cs index c72b2e4..21d334d 100644 --- a/Core/Services/QuoteService.cs +++ b/Core/Services/QuoteService.cs @@ -40,7 +40,7 @@ namespace Core.Services #endregion #region Guardado completo de presupuesto (encabezado + detalles + roles + ajustes + impuestos) - public async Task CreateFullQuoteAsync(EQuoteHeader quote, int formSeriesId) + public async Task<(int Id, string Quotenumber)> CreateFullQuoteAsync(EQuoteHeader quote, int formSeriesId) { // 1. Validaciones antes de iniciar transacción ValidateQuote(quote); diff --git a/Documents/Templates/Quotes/Template_v1.cshtml b/Documents/Templates/Quotes/Template_v1.cshtml index 3c71ea2..66aef9d 100644 --- a/Documents/Templates/Quotes/Template_v1.cshtml +++ b/Documents/Templates/Quotes/Template_v1.cshtml @@ -159,8 +159,8 @@ Descripción Cantidad - Precio Unitario - Subtotal + Precio Unitario + Subtotal @@ -169,8 +169,8 @@ @item.Description @item.Quantity - @item.UnitPrice.ToString("C", culture) - @item.Total.ToString("C", culture) + @item.UnitPrice.ToString("C", culture) + @item.Total.ToString("C", culture) } @@ -191,7 +191,7 @@ { @tax.TaxName (@tax.TaxRate%) - @tax.TaxAmount.ToString("C", culture) + @tax.TaxAmount.ToString("C", culture) } } @@ -201,13 +201,13 @@ { Ajuste: @adj.Reason - @adj.Amount.ToString("C", culture) + @adj.Amount.ToString("C", culture) } } Total Final - @Model.Total.ToString("C", culture) + @Model.Total.ToString("C", culture) diff --git a/Models/Interfaces/IQuoteRepository.cs b/Models/Interfaces/IQuoteRepository.cs index b1f38da..a906d17 100644 --- a/Models/Interfaces/IQuoteRepository.cs +++ b/Models/Interfaces/IQuoteRepository.cs @@ -10,7 +10,7 @@ namespace Models.Interfaces Task> SearchAsync(int? customerId, string? customerText, string? quoteNumber, int? professionalId, string? professionalText, int? institutionId, string? institutionText, int? patientId, string? patientText, DateTime? issueDateFrom, DateTime? issueDateTo, string? status, int page = 1, int pageSize = 50); #endregion #region Guardado completo de presupuesto (encabezado + detalles + roles + ajustes + impuestos) - Task CreateFullQuoteAsync(EQuoteHeader quote, int formSeriesId); + Task<(int Id, string Quotenumber)> CreateFullQuoteAsync(EQuoteHeader quote, int formSeriesId); Task GetDtoByIdAsync(int id); #endregion } diff --git a/Models/Repositories/PhSQuoteRepository.cs b/Models/Repositories/PhSQuoteRepository.cs index 32dc858..853eab5 100644 --- a/Models/Repositories/PhSQuoteRepository.cs +++ b/Models/Repositories/PhSQuoteRepository.cs @@ -346,7 +346,7 @@ namespace Models.Repositories /// Identificador de la serie de numeración a utilizar. /// Cadena con el número generado del presupuesto. /// - public async Task CreateFullQuoteAsync(EQuoteHeader quote, int formSeriesId) + public async Task<(int Id, string Quotenumber)> CreateFullQuoteAsync(EQuoteHeader quote, int formSeriesId) { using var transaction = await _context.Database.BeginTransactionAsync(); try @@ -361,55 +361,9 @@ namespace Models.Repositories var headerEntity = EntityMapper.MapEntity(quote); _context.PhSQuoteHeaders.Add(headerEntity); - #region Nota: Esta seccion queda para futura modificacion en caso de cambiar CASCADE INSERT de las entidades relacionadas - //// Guardado de Detalles - //if (quote.PhSQuoteDetails?.Any() == true) - //{ - // foreach (var detail in quote.PhSQuoteDetails) - // { - // detail.QuoteheaderId = headerEntity.Id; - // var dbDetail = EntityMapper.MapEntity(detail); - // _context.PhSQuoteDetails.Add(dbDetail); - // } - //} - - //// Guardado de Roles - //if (quote.PhSQuoteRoles?.Any() == true) - //{ - // foreach (var role in quote.PhSQuoteRoles) - // { - // role.QuoteheaderId = headerEntity.Id; - // var dbRole = EntityMapper.MapEntity(role); - // _context.PhSQuoteRoles.Add(dbRole); - // } - //} - - //// Guardado de Ajustes - //if (quote.PhSQuoteAdjustments?.Any() == true) - //{ - // foreach (var adj in quote.PhSQuoteAdjustments) - // { - // adj.QuoteheaderId = headerEntity.Id; - // var dbAdj = EntityMapper.MapEntity(adj); - // _context.PhSQuoteAdjustments.Add(dbAdj); - // } - //} - - //// Guardado de Impuestos - //if (quote.PhSQuoteTaxes?.Any() == true) - //{ - // foreach (var tax in quote.PhSQuoteTaxes) - // { - // tax.QuoteheaderId = headerEntity.Id; - // var dbTax = EntityMapper.MapEntity(tax); - // _context.PhSQuoteTaxes.Add(dbTax); - // } - //} - #endregion - await _context.SaveChangesAsync(); await transaction.CommitAsync(); - return headerEntity.Quotenumber; + return (headerEntity.Id, headerEntity.Quotenumber); ; } catch { diff --git a/Transversal/Transversal.csproj b/Transversal/Transversal.csproj index 441a74d..8738eec 100644 --- a/Transversal/Transversal.csproj +++ b/Transversal/Transversal.csproj @@ -7,7 +7,7 @@ - + diff --git a/phronCare.API/Controllers/Sales/QuoteController.cs b/phronCare.API/Controllers/Sales/QuoteController.cs index 8688be1..b31b6ca 100644 --- a/phronCare.API/Controllers/Sales/QuoteController.cs +++ b/phronCare.API/Controllers/Sales/QuoteController.cs @@ -104,10 +104,9 @@ namespace phronCare.API.Controllers.Sales var formSeriesId = request.FormSeriesId; // Llamada al servicio de negocio - var quoteNumber = await _quoteService.CreateFullQuoteAsync(quote, formSeriesId); - + (int quoteId, string quoteNumber) = await _quoteService.CreateFullQuoteAsync(request.Quote, request.FormSeriesId); // Devolvemos el número generado - return Ok(new { Success = true, QuoteNumber = quoteNumber }); + return Ok(new { Success = true, Id = quoteId, QuoteNumber = quoteNumber }); } catch (ArgumentNullException ex) { diff --git a/phronCare.API/obj/phronCare.API.csproj.nuget.dgspec.json b/phronCare.API/obj/phronCare.API.csproj.nuget.dgspec.json index 5924542..33926db 100644 --- a/phronCare.API/obj/phronCare.API.csproj.nuget.dgspec.json +++ b/phronCare.API/obj/phronCare.API.csproj.nuget.dgspec.json @@ -605,7 +605,7 @@ "dependencies": { "EPPlus": { "target": "Package", - "version": "[8.0.4, )" + "version": "[7.7.2, )" }, "PuppeteerSharp": { "target": "Package", diff --git a/phronCare.API/obj/project.assets.json b/phronCare.API/obj/project.assets.json index aba1d78..b0f00b7 100644 --- a/phronCare.API/obj/project.assets.json +++ b/phronCare.API/obj/project.assets.json @@ -90,15 +90,14 @@ "buildTransitive/net6.0/EntityFramework.targets": {} } }, - "EPPlus/8.0.4": { + "EPPlus/7.7.2": { "type": "package", "dependencies": { - "EPPlus.Interfaces": "8.0.0", + "EPPlus.System.Drawing": "7.7.0", "Microsoft.Extensions.Configuration.Json": "8.0.1", "Microsoft.IO.RecyclableMemoryStream": "3.0.1", "System.ComponentModel.Annotations": "5.0.0", "System.Security.Cryptography.Pkcs": "8.0.1", - "System.Security.Cryptography.Xml": "8.0.2", "System.Text.Encoding.CodePages": "8.0.0" }, "compile": { @@ -112,7 +111,7 @@ } } }, - "EPPlus.Interfaces/8.0.0": { + "EPPlus.Interfaces/7.7.0": { "type": "package", "compile": { "lib/net8.0/EPPlus.Interfaces.dll": {} @@ -121,6 +120,19 @@ "lib/net8.0/EPPlus.Interfaces.dll": {} } }, + "EPPlus.System.Drawing/7.7.0": { + "type": "package", + "dependencies": { + "EPPlus.Interfaces": "7.7.0", + "System.Drawing.Common": "8.0.14" + }, + "compile": { + "lib/net8.0/EPPlus.System.Drawing.dll": {} + }, + "runtime": { + "lib/net8.0/EPPlus.System.Drawing.dll": {} + } + }, "GoogleAuthenticator/3.2.0": { "type": "package", "dependencies": { @@ -1417,23 +1429,23 @@ } } }, - "Microsoft.Win32.SystemEvents/6.0.0": { + "Microsoft.Win32.SystemEvents/8.0.0": { "type": "package", "compile": { - "lib/net6.0/Microsoft.Win32.SystemEvents.dll": { + "lib/net8.0/Microsoft.Win32.SystemEvents.dll": { "related": ".xml" } }, "runtime": { - "lib/net6.0/Microsoft.Win32.SystemEvents.dll": { + "lib/net8.0/Microsoft.Win32.SystemEvents.dll": { "related": ".xml" } }, "build": { - "buildTransitive/netcoreapp3.1/_._": {} + "buildTransitive/net6.0/_._": {} }, "runtimeTargets": { - "runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.dll": { + "runtimes/win/lib/net8.0/Microsoft.Win32.SystemEvents.dll": { "assetType": "runtime", "rid": "win" } @@ -2282,33 +2294,23 @@ } } }, - "System.Drawing.Common/6.0.0": { + "System.Drawing.Common/8.0.14": { "type": "package", "dependencies": { - "Microsoft.Win32.SystemEvents": "6.0.0" + "Microsoft.Win32.SystemEvents": "8.0.0" }, "compile": { - "lib/net6.0/System.Drawing.Common.dll": { - "related": ".xml" + "lib/net8.0/System.Drawing.Common.dll": { + "related": ".pdb;.xml" } }, "runtime": { - "lib/net6.0/System.Drawing.Common.dll": { - "related": ".xml" + "lib/net8.0/System.Drawing.Common.dll": { + "related": ".pdb;.xml" } }, "build": { - "buildTransitive/netcoreapp3.1/_._": {} - }, - "runtimeTargets": { - "runtimes/unix/lib/net6.0/System.Drawing.Common.dll": { - "assetType": "runtime", - "rid": "unix" - }, - "runtimes/win/lib/net6.0/System.Drawing.Common.dll": { - "assetType": "runtime", - "rid": "win" - } + "buildTransitive/net6.0/_._": {} } }, "System.Formats.Asn1/8.0.1": { @@ -3023,25 +3025,6 @@ } } }, - "System.Security.Cryptography.Xml/8.0.2": { - "type": "package", - "dependencies": { - "System.Security.Cryptography.Pkcs": "8.0.1" - }, - "compile": { - "lib/net8.0/System.Security.Cryptography.Xml.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/System.Security.Cryptography.Xml.dll": { - "related": ".xml" - } - }, - "build": { - "buildTransitive/net6.0/_._": {} - } - }, "System.Security.Permissions/6.0.0": { "type": "package", "dependencies": { @@ -3311,7 +3294,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { - "EPPlus": "8.0.4", + "EPPlus": "7.7.2", "PuppeteerSharp": "6.0.0" }, "compile": { @@ -3444,15 +3427,15 @@ "tools/net6.0/any/ef6.runtimeconfig.json" ] }, - "EPPlus/8.0.4": { - "sha512": "eyB9f6Xb2VfM9jVUbo4y3fiQ3a6XHViQ1rD0e6gHgEqTGpmFJu7jg4259NDutsaJ3dDem5GwyxJtehmTb57xRw==", + "EPPlus/7.7.2": { + "sha512": "vG1jVIxVV2v37O+ysjaZw9iFSD+d2/ABKl+XJF//xghUCbhDRYl6DH7C3wXJn4r0qoA4aS+Y/t0jT+8PD0TDtQ==", "type": "package", - "path": "epplus/8.0.4", + "path": "epplus/7.7.2", "files": [ ".nupkg.metadata", ".signature.p7s", "EPPlusLogo.png", - "epplus.8.0.4.nupkg.sha512", + "epplus.7.7.2.nupkg.sha512", "epplus.nuspec", "lib/net35/EPPlus.dll", "lib/net35/EPPlus.xml", @@ -3471,15 +3454,15 @@ "readme.txt" ] }, - "EPPlus.Interfaces/8.0.0": { - "sha512": "EFr/vUbDYK55sxjfUfLUiv7oiz1f6ZLRYMKILHyfnWS019cYX5zJaQ1U3OojRuED8tgEeXX9QeG7Kj/b0XE7hQ==", + "EPPlus.Interfaces/7.7.0": { + "sha512": "vJO30Vzv4aVWKn8JO7THU+Glh1dfx8QjlpEDq47FmxwlMtT6L43EsLrh9h0G72TpNA1+5u9yNHYc5IANOnWbbg==", "type": "package", - "path": "epplus.interfaces/8.0.0", + "path": "epplus.interfaces/7.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", "EPPlusLogo.png", - "epplus.interfaces.8.0.0.nupkg.sha512", + "epplus.interfaces.7.7.0.nupkg.sha512", "epplus.interfaces.nuspec", "lib/net35/EPPlus.Interfaces.dll", "lib/net462/EPPlus.Interfaces.dll", @@ -3491,6 +3474,26 @@ "readme.md" ] }, + "EPPlus.System.Drawing/7.7.0": { + "sha512": "IVqhg8JYcQy11q3ecZ23x07uvJnXk33hu8w5UfVqvEMEuFXBLlU7COGaHG3i7w23uTnoj9eAOnCdSKjLIbcflw==", + "type": "package", + "path": "epplus.system.drawing/7.7.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "EPPlusLogo.png", + "epplus.system.drawing.7.7.0.nupkg.sha512", + "epplus.system.drawing.nuspec", + "lib/net35/EPPlus.System.Drawing.dll", + "lib/net462/EPPlus.System.Drawing.dll", + "lib/net8.0/EPPlus.System.Drawing.dll", + "lib/net9.0/EPPlus.System.Drawing.dll", + "lib/netstandard2.0/EPPlus.System.Drawing.dll", + "lib/netstandard2.1/EPPlus.System.Drawing.dll", + "license.md", + "readme.md" + ] + }, "GoogleAuthenticator/3.2.0": { "sha512": "m+wR3/c6ra2h7gaov7qUDRxOaC6B2/t7H6JsMPTHecvrEJyMz2NsgJqIU4RJwEhOzeauHkKVZDopz3OTo7rpRw==", "type": "package", @@ -5762,32 +5765,38 @@ "version.txt" ] }, - "Microsoft.Win32.SystemEvents/6.0.0": { - "sha512": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==", + "Microsoft.Win32.SystemEvents/8.0.0": { + "sha512": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw==", "type": "package", - "path": "microsoft.win32.systemevents/6.0.0", + "path": "microsoft.win32.systemevents/8.0.0", "files": [ ".nupkg.metadata", ".signature.p7s", "Icon.png", "LICENSE.TXT", "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Win32.SystemEvents.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", "buildTransitive/netcoreapp2.0/Microsoft.Win32.SystemEvents.targets", - "buildTransitive/netcoreapp3.1/_._", - "lib/net461/Microsoft.Win32.SystemEvents.dll", - "lib/net461/Microsoft.Win32.SystemEvents.xml", + "lib/net462/Microsoft.Win32.SystemEvents.dll", + "lib/net462/Microsoft.Win32.SystemEvents.xml", "lib/net6.0/Microsoft.Win32.SystemEvents.dll", "lib/net6.0/Microsoft.Win32.SystemEvents.xml", - "lib/netcoreapp3.1/Microsoft.Win32.SystemEvents.dll", - "lib/netcoreapp3.1/Microsoft.Win32.SystemEvents.xml", + "lib/net7.0/Microsoft.Win32.SystemEvents.dll", + "lib/net7.0/Microsoft.Win32.SystemEvents.xml", + "lib/net8.0/Microsoft.Win32.SystemEvents.dll", + "lib/net8.0/Microsoft.Win32.SystemEvents.xml", "lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll", "lib/netstandard2.0/Microsoft.Win32.SystemEvents.xml", - "microsoft.win32.systemevents.6.0.0.nupkg.sha512", + "microsoft.win32.systemevents.8.0.0.nupkg.sha512", "microsoft.win32.systemevents.nuspec", "runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.dll", "runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.xml", - "runtimes/win/lib/netcoreapp3.1/Microsoft.Win32.SystemEvents.dll", - "runtimes/win/lib/netcoreapp3.1/Microsoft.Win32.SystemEvents.xml", + "runtimes/win/lib/net7.0/Microsoft.Win32.SystemEvents.dll", + "runtimes/win/lib/net7.0/Microsoft.Win32.SystemEvents.xml", + "runtimes/win/lib/net8.0/Microsoft.Win32.SystemEvents.dll", + "runtimes/win/lib/net8.0/Microsoft.Win32.SystemEvents.xml", "useSharedDesignerContext.txt" ] }, @@ -7311,41 +7320,42 @@ "system.diagnostics.tracing.nuspec" ] }, - "System.Drawing.Common/6.0.0": { - "sha512": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", + "System.Drawing.Common/8.0.14": { + "sha512": "whZN2v7udKBlZ0h3OVPozq/JJQAmbwoaje4TU0DSt/zMLAn6UgHSOqeVgkcthhrYmbYU+0eBriYQRI6WiH+w5Q==", "type": "package", - "path": "system.drawing.common/6.0.0", + "path": "system.drawing.common/8.0.14", "files": [ ".nupkg.metadata", ".signature.p7s", "Icon.png", "LICENSE.TXT", "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/System.Drawing.Common.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", "buildTransitive/netcoreapp2.0/System.Drawing.Common.targets", - "buildTransitive/netcoreapp3.1/_._", "lib/MonoAndroid10/_._", "lib/MonoTouch10/_._", - "lib/net461/System.Drawing.Common.dll", - "lib/net461/System.Drawing.Common.xml", + "lib/net462/System.Drawing.Common.dll", + "lib/net462/System.Drawing.Common.pdb", + "lib/net462/System.Drawing.Common.xml", "lib/net6.0/System.Drawing.Common.dll", + "lib/net6.0/System.Drawing.Common.pdb", "lib/net6.0/System.Drawing.Common.xml", - "lib/netcoreapp3.1/System.Drawing.Common.dll", - "lib/netcoreapp3.1/System.Drawing.Common.xml", + "lib/net7.0/System.Drawing.Common.dll", + "lib/net7.0/System.Drawing.Common.pdb", + "lib/net7.0/System.Drawing.Common.xml", + "lib/net8.0/System.Drawing.Common.dll", + "lib/net8.0/System.Drawing.Common.pdb", + "lib/net8.0/System.Drawing.Common.xml", "lib/netstandard2.0/System.Drawing.Common.dll", + "lib/netstandard2.0/System.Drawing.Common.pdb", "lib/netstandard2.0/System.Drawing.Common.xml", "lib/xamarinios10/_._", "lib/xamarinmac20/_._", "lib/xamarintvos10/_._", "lib/xamarinwatchos10/_._", - "runtimes/unix/lib/net6.0/System.Drawing.Common.dll", - "runtimes/unix/lib/net6.0/System.Drawing.Common.xml", - "runtimes/unix/lib/netcoreapp3.1/System.Drawing.Common.dll", - "runtimes/unix/lib/netcoreapp3.1/System.Drawing.Common.xml", - "runtimes/win/lib/net6.0/System.Drawing.Common.dll", - "runtimes/win/lib/net6.0/System.Drawing.Common.xml", - "runtimes/win/lib/netcoreapp3.1/System.Drawing.Common.dll", - "runtimes/win/lib/netcoreapp3.1/System.Drawing.Common.xml", - "system.drawing.common.6.0.0.nupkg.sha512", + "system.drawing.common.8.0.14.nupkg.sha512", "system.drawing.common.nuspec", "useSharedDesignerContext.txt" ] @@ -9052,35 +9062,6 @@ "system.security.cryptography.x509certificates.nuspec" ] }, - "System.Security.Cryptography.Xml/8.0.2": { - "sha512": "aDM/wm0ZGEZ6ZYJLzgqjp2FZdHbDHh6/OmpGfb7AdZ105zYmPn/83JRU2xLIbwgoNz9U1SLUTJN0v5th3qmvjA==", - "type": "package", - "path": "system.security.cryptography.xml/8.0.2", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "Icon.png", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "buildTransitive/net461/System.Security.Cryptography.Xml.targets", - "buildTransitive/net462/_._", - "buildTransitive/net6.0/_._", - "buildTransitive/netcoreapp2.0/System.Security.Cryptography.Xml.targets", - "lib/net462/System.Security.Cryptography.Xml.dll", - "lib/net462/System.Security.Cryptography.Xml.xml", - "lib/net6.0/System.Security.Cryptography.Xml.dll", - "lib/net6.0/System.Security.Cryptography.Xml.xml", - "lib/net7.0/System.Security.Cryptography.Xml.dll", - "lib/net7.0/System.Security.Cryptography.Xml.xml", - "lib/net8.0/System.Security.Cryptography.Xml.dll", - "lib/net8.0/System.Security.Cryptography.Xml.xml", - "lib/netstandard2.0/System.Security.Cryptography.Xml.dll", - "lib/netstandard2.0/System.Security.Cryptography.Xml.xml", - "system.security.cryptography.xml.8.0.2.nupkg.sha512", - "system.security.cryptography.xml.nuspec", - "useSharedDesignerContext.txt" - ] - }, "System.Security.Permissions/6.0.0": { "sha512": "T/uuc7AklkDoxmcJ7LGkyX1CcSviZuLCa4jg3PekfJ7SU0niF0IVTXwUiNVP9DSpzou2PpxJ+eNY2IfDM90ZCg==", "type": "package", diff --git a/phronCare.Test/obj/phronCare.Test.csproj.nuget.dgspec.json b/phronCare.Test/obj/phronCare.Test.csproj.nuget.dgspec.json index 4c4cc59..13d9ce7 100644 --- a/phronCare.Test/obj/phronCare.Test.csproj.nuget.dgspec.json +++ b/phronCare.Test/obj/phronCare.Test.csproj.nuget.dgspec.json @@ -151,7 +151,7 @@ "dependencies": { "EPPlus": { "target": "Package", - "version": "[8.0.4, )" + "version": "[7.7.2, )" }, "PuppeteerSharp": { "target": "Package", diff --git a/phronCare.Test/obj/project.assets.json b/phronCare.Test/obj/project.assets.json index c25f8b4..1321224 100644 --- a/phronCare.Test/obj/project.assets.json +++ b/phronCare.Test/obj/project.assets.json @@ -8,15 +8,14 @@ "build/netstandard1.0/coverlet.collector.targets": {} } }, - "EPPlus/8.0.4": { + "EPPlus/7.7.2": { "type": "package", "dependencies": { - "EPPlus.Interfaces": "8.0.0", + "EPPlus.System.Drawing": "7.7.0", "Microsoft.Extensions.Configuration.Json": "8.0.1", "Microsoft.IO.RecyclableMemoryStream": "3.0.1", "System.ComponentModel.Annotations": "5.0.0", "System.Security.Cryptography.Pkcs": "8.0.1", - "System.Security.Cryptography.Xml": "8.0.2", "System.Text.Encoding.CodePages": "8.0.0" }, "compile": { @@ -30,7 +29,7 @@ } } }, - "EPPlus.Interfaces/8.0.0": { + "EPPlus.Interfaces/7.7.0": { "type": "package", "compile": { "lib/net8.0/EPPlus.Interfaces.dll": {} @@ -39,6 +38,19 @@ "lib/net8.0/EPPlus.Interfaces.dll": {} } }, + "EPPlus.System.Drawing/7.7.0": { + "type": "package", + "dependencies": { + "EPPlus.Interfaces": "7.7.0", + "System.Drawing.Common": "8.0.14" + }, + "compile": { + "lib/net8.0/EPPlus.System.Drawing.dll": {} + }, + "runtime": { + "lib/net8.0/EPPlus.System.Drawing.dll": {} + } + }, "Microsoft.AspNetCore.WebUtilities/2.0.2": { "type": "package", "dependencies": { @@ -606,6 +618,28 @@ "build/netcoreapp3.1/Microsoft.TestPlatform.TestHost.props": {} } }, + "Microsoft.Win32.SystemEvents/8.0.0": { + "type": "package", + "compile": { + "lib/net8.0/Microsoft.Win32.SystemEvents.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Win32.SystemEvents.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + }, + "runtimeTargets": { + "runtimes/win/lib/net8.0/Microsoft.Win32.SystemEvents.dll": { + "assetType": "runtime", + "rid": "win" + } + } + }, "NETStandard.Library/2.0.0": { "type": "package", "dependencies": { @@ -772,6 +806,25 @@ } } }, + "System.Drawing.Common/8.0.14": { + "type": "package", + "dependencies": { + "Microsoft.Win32.SystemEvents": "8.0.0" + }, + "compile": { + "lib/net8.0/System.Drawing.Common.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/System.Drawing.Common.dll": { + "related": ".pdb;.xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "System.Reflection.Metadata/1.6.0": { "type": "package", "compile": { @@ -823,25 +876,6 @@ "buildTransitive/net6.0/_._": {} } }, - "System.Security.Cryptography.Xml/8.0.2": { - "type": "package", - "dependencies": { - "System.Security.Cryptography.Pkcs": "8.0.1" - }, - "compile": { - "lib/net8.0/System.Security.Cryptography.Xml.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/System.Security.Cryptography.Xml.dll": { - "related": ".xml" - } - }, - "build": { - "buildTransitive/net6.0/_._": {} - } - }, "System.Text.Encoding.CodePages/8.0.0": { "type": "package", "compile": { @@ -881,7 +915,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { - "EPPlus": "8.0.4", + "EPPlus": "7.7.2", "PuppeteerSharp": "6.0.0" }, "compile": { @@ -947,15 +981,15 @@ "coverlet.collector.nuspec" ] }, - "EPPlus/8.0.4": { - "sha512": "eyB9f6Xb2VfM9jVUbo4y3fiQ3a6XHViQ1rD0e6gHgEqTGpmFJu7jg4259NDutsaJ3dDem5GwyxJtehmTb57xRw==", + "EPPlus/7.7.2": { + "sha512": "vG1jVIxVV2v37O+ysjaZw9iFSD+d2/ABKl+XJF//xghUCbhDRYl6DH7C3wXJn4r0qoA4aS+Y/t0jT+8PD0TDtQ==", "type": "package", - "path": "epplus/8.0.4", + "path": "epplus/7.7.2", "files": [ ".nupkg.metadata", ".signature.p7s", "EPPlusLogo.png", - "epplus.8.0.4.nupkg.sha512", + "epplus.7.7.2.nupkg.sha512", "epplus.nuspec", "lib/net35/EPPlus.dll", "lib/net35/EPPlus.xml", @@ -974,15 +1008,15 @@ "readme.txt" ] }, - "EPPlus.Interfaces/8.0.0": { - "sha512": "EFr/vUbDYK55sxjfUfLUiv7oiz1f6ZLRYMKILHyfnWS019cYX5zJaQ1U3OojRuED8tgEeXX9QeG7Kj/b0XE7hQ==", + "EPPlus.Interfaces/7.7.0": { + "sha512": "vJO30Vzv4aVWKn8JO7THU+Glh1dfx8QjlpEDq47FmxwlMtT6L43EsLrh9h0G72TpNA1+5u9yNHYc5IANOnWbbg==", "type": "package", - "path": "epplus.interfaces/8.0.0", + "path": "epplus.interfaces/7.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", "EPPlusLogo.png", - "epplus.interfaces.8.0.0.nupkg.sha512", + "epplus.interfaces.7.7.0.nupkg.sha512", "epplus.interfaces.nuspec", "lib/net35/EPPlus.Interfaces.dll", "lib/net462/EPPlus.Interfaces.dll", @@ -994,6 +1028,26 @@ "readme.md" ] }, + "EPPlus.System.Drawing/7.7.0": { + "sha512": "IVqhg8JYcQy11q3ecZ23x07uvJnXk33hu8w5UfVqvEMEuFXBLlU7COGaHG3i7w23uTnoj9eAOnCdSKjLIbcflw==", + "type": "package", + "path": "epplus.system.drawing/7.7.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "EPPlusLogo.png", + "epplus.system.drawing.7.7.0.nupkg.sha512", + "epplus.system.drawing.nuspec", + "lib/net35/EPPlus.System.Drawing.dll", + "lib/net462/EPPlus.System.Drawing.dll", + "lib/net8.0/EPPlus.System.Drawing.dll", + "lib/net9.0/EPPlus.System.Drawing.dll", + "lib/netstandard2.0/EPPlus.System.Drawing.dll", + "lib/netstandard2.1/EPPlus.System.Drawing.dll", + "license.md", + "readme.md" + ] + }, "Microsoft.AspNetCore.WebUtilities/2.0.2": { "sha512": "dvn80+p1AIQKOfJ+VrOhVMUktWRvJs7Zb+UapZGBNSyrCzTsYiXbb9C7Mzw+nGj5UevnLNFcWWc7BUlLMD2qpw==", "type": "package", @@ -1628,6 +1682,41 @@ "microsoft.testplatform.testhost.nuspec" ] }, + "Microsoft.Win32.SystemEvents/8.0.0": { + "sha512": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw==", + "type": "package", + "path": "microsoft.win32.systemevents/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Win32.SystemEvents.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Win32.SystemEvents.targets", + "lib/net462/Microsoft.Win32.SystemEvents.dll", + "lib/net462/Microsoft.Win32.SystemEvents.xml", + "lib/net6.0/Microsoft.Win32.SystemEvents.dll", + "lib/net6.0/Microsoft.Win32.SystemEvents.xml", + "lib/net7.0/Microsoft.Win32.SystemEvents.dll", + "lib/net7.0/Microsoft.Win32.SystemEvents.xml", + "lib/net8.0/Microsoft.Win32.SystemEvents.dll", + "lib/net8.0/Microsoft.Win32.SystemEvents.xml", + "lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll", + "lib/netstandard2.0/Microsoft.Win32.SystemEvents.xml", + "microsoft.win32.systemevents.8.0.0.nupkg.sha512", + "microsoft.win32.systemevents.nuspec", + "runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.dll", + "runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.xml", + "runtimes/win/lib/net7.0/Microsoft.Win32.SystemEvents.dll", + "runtimes/win/lib/net7.0/Microsoft.Win32.SystemEvents.xml", + "runtimes/win/lib/net8.0/Microsoft.Win32.SystemEvents.dll", + "runtimes/win/lib/net8.0/Microsoft.Win32.SystemEvents.xml", + "useSharedDesignerContext.txt" + ] + }, "NETStandard.Library/2.0.0": { "sha512": "7jnbRU+L08FXKMxqUflxEXtVymWvNOrS8yHgu9s6EM8Anr6T/wIX4nZ08j/u3Asz+tCufp3YVwFSEvFTPYmBPA==", "type": "package", @@ -2085,6 +2174,46 @@ "useSharedDesignerContext.txt" ] }, + "System.Drawing.Common/8.0.14": { + "sha512": "whZN2v7udKBlZ0h3OVPozq/JJQAmbwoaje4TU0DSt/zMLAn6UgHSOqeVgkcthhrYmbYU+0eBriYQRI6WiH+w5Q==", + "type": "package", + "path": "system.drawing.common/8.0.14", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/System.Drawing.Common.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/System.Drawing.Common.targets", + "lib/MonoAndroid10/_._", + "lib/MonoTouch10/_._", + "lib/net462/System.Drawing.Common.dll", + "lib/net462/System.Drawing.Common.pdb", + "lib/net462/System.Drawing.Common.xml", + "lib/net6.0/System.Drawing.Common.dll", + "lib/net6.0/System.Drawing.Common.pdb", + "lib/net6.0/System.Drawing.Common.xml", + "lib/net7.0/System.Drawing.Common.dll", + "lib/net7.0/System.Drawing.Common.pdb", + "lib/net7.0/System.Drawing.Common.xml", + "lib/net8.0/System.Drawing.Common.dll", + "lib/net8.0/System.Drawing.Common.pdb", + "lib/net8.0/System.Drawing.Common.xml", + "lib/netstandard2.0/System.Drawing.Common.dll", + "lib/netstandard2.0/System.Drawing.Common.pdb", + "lib/netstandard2.0/System.Drawing.Common.xml", + "lib/xamarinios10/_._", + "lib/xamarinmac20/_._", + "lib/xamarintvos10/_._", + "lib/xamarinwatchos10/_._", + "system.drawing.common.8.0.14.nupkg.sha512", + "system.drawing.common.nuspec", + "useSharedDesignerContext.txt" + ] + }, "System.Reflection.Metadata/1.6.0": { "sha512": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ==", "type": "package", @@ -2179,35 +2308,6 @@ "useSharedDesignerContext.txt" ] }, - "System.Security.Cryptography.Xml/8.0.2": { - "sha512": "aDM/wm0ZGEZ6ZYJLzgqjp2FZdHbDHh6/OmpGfb7AdZ105zYmPn/83JRU2xLIbwgoNz9U1SLUTJN0v5th3qmvjA==", - "type": "package", - "path": "system.security.cryptography.xml/8.0.2", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "Icon.png", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "buildTransitive/net461/System.Security.Cryptography.Xml.targets", - "buildTransitive/net462/_._", - "buildTransitive/net6.0/_._", - "buildTransitive/netcoreapp2.0/System.Security.Cryptography.Xml.targets", - "lib/net462/System.Security.Cryptography.Xml.dll", - "lib/net462/System.Security.Cryptography.Xml.xml", - "lib/net6.0/System.Security.Cryptography.Xml.dll", - "lib/net6.0/System.Security.Cryptography.Xml.xml", - "lib/net7.0/System.Security.Cryptography.Xml.dll", - "lib/net7.0/System.Security.Cryptography.Xml.xml", - "lib/net8.0/System.Security.Cryptography.Xml.dll", - "lib/net8.0/System.Security.Cryptography.Xml.xml", - "lib/netstandard2.0/System.Security.Cryptography.Xml.dll", - "lib/netstandard2.0/System.Security.Cryptography.Xml.xml", - "system.security.cryptography.xml.8.0.2.nupkg.sha512", - "system.security.cryptography.xml.nuspec", - "useSharedDesignerContext.txt" - ] - }, "System.Text.Encoding.CodePages/8.0.0": { "sha512": "OZIsVplFGaVY90G2SbpgU7EnCoOO5pw1t4ic21dBF3/1omrJFpAGoNAVpPyMVOC90/hvgkGG3VFqR13YgZMQfg==", "type": "package", diff --git a/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteCreate.razor b/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteCreate.razor index fafb4fa..b01d7f6 100644 --- a/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteCreate.razor +++ b/phronCare.UIBlazor/Pages/Sales/Quotes/QuoteCreate.razor @@ -313,6 +313,7 @@ private ELookUpItem? _selectedCustomer, _selectedProfessional, _selectedInstitution, _selectedPatient, _selectedPerson; private List _businessUnits = new(); private EExchangeRateHistory? YesterdayRate; + private string returnUrl = "quotes/"; private decimal _netAmount = 0, _taxAmount = 0, _grandTotal = 0; public const int QuoteSeriesId = 1; // Serie de comprobante para presupuestos (talonario Q). @@ -398,11 +399,16 @@ toastService.ShowError(result.ErrorMessage); return; } - ToastParameters _parameters = new ToastParameters(); - _parameters.Add(nameof(PhLinkToast.Comprobante), result.QuoteNumber); - _parameters.Add(nameof(PhLinkToast.Style), "success"); + ToastParameters _parameters = new(); + _parameters.Add(nameof(PhLinkToast.Comprobante), result.QuoteNumber); + _parameters.Add(nameof(PhLinkToast.Style), "success"); + _parameters.Add(nameof(PhLinkToast.OnLinkClick), EventCallback.Factory.Create(this, () => + QuoteService.ExportPdfAsync(result.Id, result.QuoteNumber))); + toastService.ShowToast(_parameters); + Navigation.NavigateTo(returnUrl); } + private async Task AddNewTax() { var parameters = new ModalParameters(); @@ -497,10 +503,6 @@ } private void Cancel() { - ToastParameters _parameters = new ToastParameters(); - _parameters.Add(nameof(PhLinkToast.Comprobante), "Q-00000009"); - _parameters.Add(nameof(PhLinkToast.Style), "lime"); - - toastService.ShowToast(_parameters); + Navigation.NavigateTo(returnUrl); } } diff --git a/phronCare.UIBlazor/Pages/Sales/Quotes/Quotes.razor b/phronCare.UIBlazor/Pages/Sales/Quotes/Quotes.razor index 7532ddd..e8d2779 100644 --- a/phronCare.UIBlazor/Pages/Sales/Quotes/Quotes.razor +++ b/phronCare.UIBlazor/Pages/Sales/Quotes/Quotes.razor @@ -110,7 +110,7 @@ @quote.SalespersonName - + } @@ -378,11 +378,11 @@ _ => "bg-light text-dark" }; - private async void PrintPdf(int quoteId) + private async void PrintPdf(int quoteId, string quoteNumber) { try { - await quoteService.ExportPdfAsync(quoteId); + await quoteService.ExportPdfAsync(quoteId,quoteNumber); } catch (Exception ex) { diff --git a/phronCare.UIBlazor/Services/Sales/Quotes/QuoteService.cs b/phronCare.UIBlazor/Services/Sales/Quotes/QuoteService.cs index f8a500b..d300aff 100644 --- a/phronCare.UIBlazor/Services/Sales/Quotes/QuoteService.cs +++ b/phronCare.UIBlazor/Services/Sales/Quotes/QuoteService.cs @@ -98,7 +98,7 @@ namespace phronCare.UIBlazor.Services.Sales.Quotes /// /// Obtiene el PDF del presupuesto por ID como array de bytes. /// - public async Task ExportPdfAsync(int quoteId) + public async Task ExportPdfAsync(int quoteId, string quoteNumber) { try { @@ -112,9 +112,11 @@ namespace phronCare.UIBlazor.Services.Sales.Quotes var bytes = await response.Content.ReadAsByteArrayAsync(); var base64 = Convert.ToBase64String(bytes); - var fileName = $"Presupuesto_{quoteId}.pdf"; + var fileName = $"{quoteNumber}.pdf"; await _js.InvokeVoidAsync("saveAsFile", fileName, base64); + + } catch (Exception ex) { @@ -128,6 +130,7 @@ namespace phronCare.UIBlazor.Services.Sales.Quotes public class CreateQuoteResult { public bool Success { get; set; } + public int Id { get; set; } public string QuoteNumber { get; set; } = string.Empty; public string ErrorMessage { get; set; } = string.Empty; } diff --git a/phronCare.UIBlazor/Shared/Components/PhLinkToast.razor b/phronCare.UIBlazor/Shared/Components/PhLinkToast.razor index 4289156..c215a1b 100644 --- a/phronCare.UIBlazor/Shared/Components/PhLinkToast.razor +++ b/phronCare.UIBlazor/Shared/Components/PhLinkToast.razor @@ -15,10 +15,14 @@ [Parameter] public string Url { get; set; } = "/"; [Parameter] public string Comprobante { get; set; } = "Ver"; [Parameter] public string Style { get; set; } = "success"; + [Parameter] public EventCallback OnLinkClick { get; set; } - void LinkClicked(MouseEventArgs e) + async void LinkClicked(MouseEventArgs e) { - Navigation.NavigateTo(Url); + if (OnLinkClick.HasDelegate) + await OnLinkClick.InvokeAsync(null); + else + Navigation.NavigateTo(Url); } string GetBackgroundColor() => Style.ToLower() switch diff --git a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json index 4b4a7d1..5a3d552 100644 --- a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json +++ b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json @@ -239,7 +239,7 @@ "dependencies": { "EPPlus": { "target": "Package", - "version": "[8.0.4, )" + "version": "[7.7.2, )" }, "PuppeteerSharp": { "target": "Package", diff --git a/phronCare.UIBlazor/obj/project.assets.json b/phronCare.UIBlazor/obj/project.assets.json index 5a5bb35..cf4203d 100644 --- a/phronCare.UIBlazor/obj/project.assets.json +++ b/phronCare.UIBlazor/obj/project.assets.json @@ -62,15 +62,14 @@ "buildMultiTargeting/Blazored.Typeahead.props": {} } }, - "EPPlus/8.0.4": { + "EPPlus/7.7.2": { "type": "package", "dependencies": { - "EPPlus.Interfaces": "8.0.0", + "EPPlus.System.Drawing": "7.7.0", "Microsoft.Extensions.Configuration.Json": "8.0.1", "Microsoft.IO.RecyclableMemoryStream": "3.0.1", "System.ComponentModel.Annotations": "5.0.0", "System.Security.Cryptography.Pkcs": "8.0.1", - "System.Security.Cryptography.Xml": "8.0.2", "System.Text.Encoding.CodePages": "8.0.0" }, "compile": { @@ -84,7 +83,7 @@ } } }, - "EPPlus.Interfaces/8.0.0": { + "EPPlus.Interfaces/7.7.0": { "type": "package", "compile": { "lib/net8.0/EPPlus.Interfaces.dll": {} @@ -93,6 +92,19 @@ "lib/net8.0/EPPlus.Interfaces.dll": {} } }, + "EPPlus.System.Drawing/7.7.0": { + "type": "package", + "dependencies": { + "EPPlus.Interfaces": "7.7.0", + "System.Drawing.Common": "8.0.14" + }, + "compile": { + "lib/net8.0/EPPlus.System.Drawing.dll": {} + }, + "runtime": { + "lib/net8.0/EPPlus.System.Drawing.dll": {} + } + }, "Microsoft.AspNetCore.Authorization/8.0.6": { "type": "package", "dependencies": { @@ -660,6 +672,28 @@ } } }, + "Microsoft.Win32.SystemEvents/8.0.0": { + "type": "package", + "compile": { + "lib/net8.0/Microsoft.Win32.SystemEvents.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Win32.SystemEvents.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + }, + "runtimeTargets": { + "runtimes/win/lib/net8.0/Microsoft.Win32.SystemEvents.dll": { + "assetType": "runtime", + "rid": "win" + } + } + }, "NETStandard.Library/1.6.1": { "type": "package", "dependencies": { @@ -1177,6 +1211,25 @@ } } }, + "System.Drawing.Common/8.0.14": { + "type": "package", + "dependencies": { + "Microsoft.Win32.SystemEvents": "8.0.0" + }, + "compile": { + "lib/net8.0/System.Drawing.Common.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/System.Drawing.Common.dll": { + "related": ".pdb;.xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "System.Dynamic.Runtime/4.3.0": { "type": "package", "dependencies": { @@ -2013,25 +2066,6 @@ } } }, - "System.Security.Cryptography.Xml/8.0.2": { - "type": "package", - "dependencies": { - "System.Security.Cryptography.Pkcs": "8.0.1" - }, - "compile": { - "lib/net8.0/System.Security.Cryptography.Xml.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/System.Security.Cryptography.Xml.dll": { - "related": ".xml" - } - }, - "build": { - "buildTransitive/net6.0/_._": {} - } - }, "System.Text.Encoding/4.3.0": { "type": "package", "dependencies": { @@ -2255,7 +2289,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { - "EPPlus": "8.0.4", + "EPPlus": "7.7.2", "PuppeteerSharp": "6.0.0" }, "compile": { @@ -2327,15 +2361,14 @@ "buildMultiTargeting/Blazored.Typeahead.props": {} } }, - "EPPlus/8.0.4": { + "EPPlus/7.7.2": { "type": "package", "dependencies": { - "EPPlus.Interfaces": "8.0.0", + "EPPlus.System.Drawing": "7.7.0", "Microsoft.Extensions.Configuration.Json": "8.0.1", "Microsoft.IO.RecyclableMemoryStream": "3.0.1", "System.ComponentModel.Annotations": "5.0.0", "System.Security.Cryptography.Pkcs": "8.0.1", - "System.Security.Cryptography.Xml": "8.0.2", "System.Text.Encoding.CodePages": "8.0.0" }, "compile": { @@ -2349,7 +2382,7 @@ } } }, - "EPPlus.Interfaces/8.0.0": { + "EPPlus.Interfaces/7.7.0": { "type": "package", "compile": { "lib/net8.0/EPPlus.Interfaces.dll": {} @@ -2358,6 +2391,19 @@ "lib/net8.0/EPPlus.Interfaces.dll": {} } }, + "EPPlus.System.Drawing/7.7.0": { + "type": "package", + "dependencies": { + "EPPlus.Interfaces": "7.7.0", + "System.Drawing.Common": "8.0.14" + }, + "compile": { + "lib/net8.0/EPPlus.System.Drawing.dll": {} + }, + "runtime": { + "lib/net8.0/EPPlus.System.Drawing.dll": {} + } + }, "Microsoft.AspNetCore.Authorization/8.0.6": { "type": "package", "dependencies": { @@ -2925,6 +2971,22 @@ } } }, + "Microsoft.Win32.SystemEvents/8.0.0": { + "type": "package", + "compile": { + "lib/net8.0/Microsoft.Win32.SystemEvents.dll": { + "related": ".xml" + } + }, + "runtime": { + "lib/net8.0/Microsoft.Win32.SystemEvents.dll": { + "related": ".xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "NETStandard.Library/1.6.1": { "type": "package", "dependencies": { @@ -3538,6 +3600,25 @@ } } }, + "System.Drawing.Common/8.0.14": { + "type": "package", + "dependencies": { + "Microsoft.Win32.SystemEvents": "8.0.0" + }, + "compile": { + "lib/net8.0/System.Drawing.Common.dll": { + "related": ".pdb;.xml" + } + }, + "runtime": { + "lib/net8.0/System.Drawing.Common.dll": { + "related": ".pdb;.xml" + } + }, + "build": { + "buildTransitive/net6.0/_._": {} + } + }, "System.Dynamic.Runtime/4.3.0": { "type": "package", "dependencies": { @@ -4288,25 +4369,6 @@ } } }, - "System.Security.Cryptography.Xml/8.0.2": { - "type": "package", - "dependencies": { - "System.Security.Cryptography.Pkcs": "8.0.1" - }, - "compile": { - "lib/net8.0/System.Security.Cryptography.Xml.dll": { - "related": ".xml" - } - }, - "runtime": { - "lib/net8.0/System.Security.Cryptography.Xml.dll": { - "related": ".xml" - } - }, - "build": { - "buildTransitive/net6.0/_._": {} - } - }, "System.Text.Encoding/4.3.0": { "type": "package", "dependencies": { @@ -4528,7 +4590,7 @@ "type": "project", "framework": ".NETCoreApp,Version=v8.0", "dependencies": { - "EPPlus": "8.0.4", + "EPPlus": "7.7.2", "PuppeteerSharp": "6.0.0" }, "compile": { @@ -4601,15 +4663,15 @@ "staticwebassets/blazored-typeahead.js" ] }, - "EPPlus/8.0.4": { - "sha512": "eyB9f6Xb2VfM9jVUbo4y3fiQ3a6XHViQ1rD0e6gHgEqTGpmFJu7jg4259NDutsaJ3dDem5GwyxJtehmTb57xRw==", + "EPPlus/7.7.2": { + "sha512": "vG1jVIxVV2v37O+ysjaZw9iFSD+d2/ABKl+XJF//xghUCbhDRYl6DH7C3wXJn4r0qoA4aS+Y/t0jT+8PD0TDtQ==", "type": "package", - "path": "epplus/8.0.4", + "path": "epplus/7.7.2", "files": [ ".nupkg.metadata", ".signature.p7s", "EPPlusLogo.png", - "epplus.8.0.4.nupkg.sha512", + "epplus.7.7.2.nupkg.sha512", "epplus.nuspec", "lib/net35/EPPlus.dll", "lib/net35/EPPlus.xml", @@ -4628,15 +4690,15 @@ "readme.txt" ] }, - "EPPlus.Interfaces/8.0.0": { - "sha512": "EFr/vUbDYK55sxjfUfLUiv7oiz1f6ZLRYMKILHyfnWS019cYX5zJaQ1U3OojRuED8tgEeXX9QeG7Kj/b0XE7hQ==", + "EPPlus.Interfaces/7.7.0": { + "sha512": "vJO30Vzv4aVWKn8JO7THU+Glh1dfx8QjlpEDq47FmxwlMtT6L43EsLrh9h0G72TpNA1+5u9yNHYc5IANOnWbbg==", "type": "package", - "path": "epplus.interfaces/8.0.0", + "path": "epplus.interfaces/7.7.0", "files": [ ".nupkg.metadata", ".signature.p7s", "EPPlusLogo.png", - "epplus.interfaces.8.0.0.nupkg.sha512", + "epplus.interfaces.7.7.0.nupkg.sha512", "epplus.interfaces.nuspec", "lib/net35/EPPlus.Interfaces.dll", "lib/net462/EPPlus.Interfaces.dll", @@ -4648,6 +4710,26 @@ "readme.md" ] }, + "EPPlus.System.Drawing/7.7.0": { + "sha512": "IVqhg8JYcQy11q3ecZ23x07uvJnXk33hu8w5UfVqvEMEuFXBLlU7COGaHG3i7w23uTnoj9eAOnCdSKjLIbcflw==", + "type": "package", + "path": "epplus.system.drawing/7.7.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "EPPlusLogo.png", + "epplus.system.drawing.7.7.0.nupkg.sha512", + "epplus.system.drawing.nuspec", + "lib/net35/EPPlus.System.Drawing.dll", + "lib/net462/EPPlus.System.Drawing.dll", + "lib/net8.0/EPPlus.System.Drawing.dll", + "lib/net9.0/EPPlus.System.Drawing.dll", + "lib/netstandard2.0/EPPlus.System.Drawing.dll", + "lib/netstandard2.1/EPPlus.System.Drawing.dll", + "license.md", + "readme.md" + ] + }, "Microsoft.AspNetCore.Authorization/8.0.6": { "sha512": "H1CSbD7UeSPsrJSUpvbms6SqWMa5y8ch4Rw+gyHh2uztOEb20fTP2r0AUnStn1Q9WYghikiDO5wzkgV+n6KC2Q==", "type": "package", @@ -5761,6 +5843,41 @@ "ref/xamarinwatchos10/_._" ] }, + "Microsoft.Win32.SystemEvents/8.0.0": { + "sha512": "9opKRyOKMCi2xJ7Bj7kxtZ1r9vbzosMvRrdEhVhDz8j8MoBGgB+WmC94yH839NPH+BclAjtQ/pyagvi/8gDLkw==", + "type": "package", + "path": "microsoft.win32.systemevents/8.0.0", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/Microsoft.Win32.SystemEvents.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/Microsoft.Win32.SystemEvents.targets", + "lib/net462/Microsoft.Win32.SystemEvents.dll", + "lib/net462/Microsoft.Win32.SystemEvents.xml", + "lib/net6.0/Microsoft.Win32.SystemEvents.dll", + "lib/net6.0/Microsoft.Win32.SystemEvents.xml", + "lib/net7.0/Microsoft.Win32.SystemEvents.dll", + "lib/net7.0/Microsoft.Win32.SystemEvents.xml", + "lib/net8.0/Microsoft.Win32.SystemEvents.dll", + "lib/net8.0/Microsoft.Win32.SystemEvents.xml", + "lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll", + "lib/netstandard2.0/Microsoft.Win32.SystemEvents.xml", + "microsoft.win32.systemevents.8.0.0.nupkg.sha512", + "microsoft.win32.systemevents.nuspec", + "runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.dll", + "runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.xml", + "runtimes/win/lib/net7.0/Microsoft.Win32.SystemEvents.dll", + "runtimes/win/lib/net7.0/Microsoft.Win32.SystemEvents.xml", + "runtimes/win/lib/net8.0/Microsoft.Win32.SystemEvents.dll", + "runtimes/win/lib/net8.0/Microsoft.Win32.SystemEvents.xml", + "useSharedDesignerContext.txt" + ] + }, "NETStandard.Library/1.6.1": { "sha512": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==", "type": "package", @@ -7317,6 +7434,46 @@ "system.diagnostics.tracing.nuspec" ] }, + "System.Drawing.Common/8.0.14": { + "sha512": "whZN2v7udKBlZ0h3OVPozq/JJQAmbwoaje4TU0DSt/zMLAn6UgHSOqeVgkcthhrYmbYU+0eBriYQRI6WiH+w5Q==", + "type": "package", + "path": "system.drawing.common/8.0.14", + "files": [ + ".nupkg.metadata", + ".signature.p7s", + "Icon.png", + "LICENSE.TXT", + "THIRD-PARTY-NOTICES.TXT", + "buildTransitive/net461/System.Drawing.Common.targets", + "buildTransitive/net462/_._", + "buildTransitive/net6.0/_._", + "buildTransitive/netcoreapp2.0/System.Drawing.Common.targets", + "lib/MonoAndroid10/_._", + "lib/MonoTouch10/_._", + "lib/net462/System.Drawing.Common.dll", + "lib/net462/System.Drawing.Common.pdb", + "lib/net462/System.Drawing.Common.xml", + "lib/net6.0/System.Drawing.Common.dll", + "lib/net6.0/System.Drawing.Common.pdb", + "lib/net6.0/System.Drawing.Common.xml", + "lib/net7.0/System.Drawing.Common.dll", + "lib/net7.0/System.Drawing.Common.pdb", + "lib/net7.0/System.Drawing.Common.xml", + "lib/net8.0/System.Drawing.Common.dll", + "lib/net8.0/System.Drawing.Common.pdb", + "lib/net8.0/System.Drawing.Common.xml", + "lib/netstandard2.0/System.Drawing.Common.dll", + "lib/netstandard2.0/System.Drawing.Common.pdb", + "lib/netstandard2.0/System.Drawing.Common.xml", + "lib/xamarinios10/_._", + "lib/xamarinmac20/_._", + "lib/xamarintvos10/_._", + "lib/xamarinwatchos10/_._", + "system.drawing.common.8.0.14.nupkg.sha512", + "system.drawing.common.nuspec", + "useSharedDesignerContext.txt" + ] + }, "System.Dynamic.Runtime/4.3.0": { "sha512": "SNVi1E/vfWUAs/WYKhE9+qlS6KqK0YVhnlT0HQtr8pMIA8YX3lwy3uPMownDwdYISBdmAF/2holEIldVp85Wag==", "type": "package", @@ -9481,35 +9638,6 @@ "system.security.cryptography.x509certificates.nuspec" ] }, - "System.Security.Cryptography.Xml/8.0.2": { - "sha512": "aDM/wm0ZGEZ6ZYJLzgqjp2FZdHbDHh6/OmpGfb7AdZ105zYmPn/83JRU2xLIbwgoNz9U1SLUTJN0v5th3qmvjA==", - "type": "package", - "path": "system.security.cryptography.xml/8.0.2", - "files": [ - ".nupkg.metadata", - ".signature.p7s", - "Icon.png", - "LICENSE.TXT", - "THIRD-PARTY-NOTICES.TXT", - "buildTransitive/net461/System.Security.Cryptography.Xml.targets", - "buildTransitive/net462/_._", - "buildTransitive/net6.0/_._", - "buildTransitive/netcoreapp2.0/System.Security.Cryptography.Xml.targets", - "lib/net462/System.Security.Cryptography.Xml.dll", - "lib/net462/System.Security.Cryptography.Xml.xml", - "lib/net6.0/System.Security.Cryptography.Xml.dll", - "lib/net6.0/System.Security.Cryptography.Xml.xml", - "lib/net7.0/System.Security.Cryptography.Xml.dll", - "lib/net7.0/System.Security.Cryptography.Xml.xml", - "lib/net8.0/System.Security.Cryptography.Xml.dll", - "lib/net8.0/System.Security.Cryptography.Xml.xml", - "lib/netstandard2.0/System.Security.Cryptography.Xml.dll", - "lib/netstandard2.0/System.Security.Cryptography.Xml.xml", - "system.security.cryptography.xml.8.0.2.nupkg.sha512", - "system.security.cryptography.xml.nuspec", - "useSharedDesignerContext.txt" - ] - }, "System.Text.Encoding/4.3.0": { "sha512": "BiIg+KWaSDOITze6jGQynxg64naAPtqGHBwDrLaCtixsa5bKiR8dpPOHA7ge3C0JJQizJE+sfkz1wV+BAKAYZw==", "type": "package",