diff --git a/Documents/Services/DocumentTemplateService.cs b/Documents/Services/DocumentTemplateService.cs index c909d89..321f30f 100644 --- a/Documents/Services/DocumentTemplateService.cs +++ b/Documents/Services/DocumentTemplateService.cs @@ -1,8 +1,6 @@ using Documents.Interfaces; using Documents.Models; using Domain.Dtos; -using System.Reflection; -using System.Text; using Transversal.Interfaces; public class DocumentTemplateService : IDocumentTemplateService @@ -18,6 +16,8 @@ public class DocumentTemplateService : IDocumentTemplateService public async Task GenerateDocumentAsync(DocumentGenerationRequest request) { + //REFACTORIZAR PARA GENERAR DOCUMENTOS DE DIFERENTES TIPOS!! + // Leer logo var logoPath = Path.Combine(Directory.GetCurrentDirectory(), "Resources", "logo.png"); var logoBase64 = GetImageBase64(logoPath); @@ -41,43 +41,3 @@ public class DocumentTemplateService : IDocumentTemplateService return Convert.ToBase64String(imageBytes); } } - - -//using Documents.Interfaces; -//using Documents.Models; -//using System.Reflection; -//using System.Text; -//using Transversal.Interfaces; - -//namespace Documents.Services -//{ -// public class DocumentTemplateService : IDocumentTemplateService -// { -// private readonly ITemplateRenderer _templateRenderer; -// private readonly IPdfGeneratorService _pdfGeneratorService; - -// public DocumentTemplateService( -// ITemplateRenderer templateRenderer, -// IPdfGeneratorService pdfGeneratorService) -// { -// _templateRenderer = templateRenderer; -// _pdfGeneratorService = pdfGeneratorService; -// } - -// public async Task GenerateDocumentAsync(DocumentGenerationRequest request) -// { -// // 👉 Renderizar HTML usando RazorLight -// string html = await _templateRenderer.RenderAsync("Quotes/Template_v1.cshtml", request.Model); -// // 👉 Generar PDF desde el HTML -// return await _pdfGeneratorService.GeneratePdfFromHtmlAsync(html); -// } -// private static string GetImageBase64(string imagePath) -// { -// if (!File.Exists(imagePath)) -// return ""; - -// byte[] imageBytes = File.ReadAllBytes(imagePath); -// return Convert.ToBase64String(imageBytes); -// } -// } -//} diff --git a/Documents/Templates/Quotes/Template_v1.cshtml b/Documents/Templates/Quotes/Template_v1.cshtml index 1985b71..3edd640 100644 --- a/Documents/Templates/Quotes/Template_v1.cshtml +++ b/Documents/Templates/Quotes/Template_v1.cshtml @@ -198,7 +198,7 @@ } } - @if (Model.Adjustments?.Any() == true) +@* @if (Model.Adjustments?.Any() == true) { @foreach (var adj in Model.Adjustments) { @@ -207,7 +207,7 @@ @adj.Amount.ToString("C", culture) } - } + } *@ Total Final @Model.Total.ToString("C", culture) diff --git a/Domain/obj/Domain.csproj.nuget.dgspec.json b/Domain/obj/Domain.csproj.nuget.dgspec.json index d91dbb1..6f68fd4 100644 --- a/Domain/obj/Domain.csproj.nuget.dgspec.json +++ b/Domain/obj/Domain.csproj.nuget.dgspec.json @@ -66,7 +66,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Domain/obj/project.assets.json b/Domain/obj/project.assets.json index 30d1458..8b55ef3 100644 --- a/Domain/obj/project.assets.json +++ b/Domain/obj/project.assets.json @@ -73,7 +73,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Models/obj/Models.csproj.nuget.dgspec.json b/Models/obj/Models.csproj.nuget.dgspec.json index 8caff81..923675c 100644 --- a/Models/obj/Models.csproj.nuget.dgspec.json +++ b/Models/obj/Models.csproj.nuget.dgspec.json @@ -66,7 +66,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -148,7 +148,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Models/obj/project.assets.json b/Models/obj/project.assets.json index 7b510c8..13a1f78 100644 --- a/Models/obj/project.assets.json +++ b/Models/obj/project.assets.json @@ -4098,7 +4098,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Services/obj/Services.csproj.nuget.dgspec.json b/Services/obj/Services.csproj.nuget.dgspec.json index d51662a..4a3b29b 100644 --- a/Services/obj/Services.csproj.nuget.dgspec.json +++ b/Services/obj/Services.csproj.nuget.dgspec.json @@ -80,7 +80,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/Services/obj/project.assets.json b/Services/obj/project.assets.json index 86a51ec..1a8ada1 100644 --- a/Services/obj/project.assets.json +++ b/Services/obj/project.assets.json @@ -1318,7 +1318,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/phronCare.API/obj/phronCare.API.csproj.nuget.dgspec.json b/phronCare.API/obj/phronCare.API.csproj.nuget.dgspec.json index 9c5d300..a6b25fd 100644 --- a/phronCare.API/obj/phronCare.API.csproj.nuget.dgspec.json +++ b/phronCare.API/obj/phronCare.API.csproj.nuget.dgspec.json @@ -76,7 +76,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -163,7 +163,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -229,7 +229,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -311,7 +311,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -479,7 +479,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -559,7 +559,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -639,7 +639,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/phronCare.API/obj/project.assets.json b/phronCare.API/obj/project.assets.json index 173b8a1..7dd1735 100644 --- a/phronCare.API/obj/project.assets.json +++ b/phronCare.API/obj/project.assets.json @@ -9811,7 +9811,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/phronCare.Test/obj/phronCare.Test.csproj.nuget.dgspec.json b/phronCare.Test/obj/phronCare.Test.csproj.nuget.dgspec.json index 4be250c..b6ad43e 100644 --- a/phronCare.Test/obj/phronCare.Test.csproj.nuget.dgspec.json +++ b/phronCare.Test/obj/phronCare.Test.csproj.nuget.dgspec.json @@ -66,7 +66,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -166,7 +166,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -246,7 +246,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/phronCare.Test/obj/project.assets.json b/phronCare.Test/obj/project.assets.json index fe48f62..bcd1d21 100644 --- a/phronCare.Test/obj/project.assets.json +++ b/phronCare.Test/obj/project.assets.json @@ -2503,7 +2503,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json index 32ae6e3..de18641 100644 --- a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json +++ b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.dgspec.json @@ -66,7 +66,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } }, @@ -152,13 +152,13 @@ "Microsoft.NET.ILLink.Tasks": { "suppressParent": "All", "target": "Package", - "version": "[8.0.16, )", + "version": "[8.0.18, )", "autoReferenced": true }, "Microsoft.NET.Sdk.WebAssembly.Pack": { "suppressParent": "All", "target": "Package", - "version": "[9.0.5, )", + "version": "[9.0.7, )", "autoReferenced": true }, "PSC.Blazor.Components.Chartjs": { @@ -180,7 +180,7 @@ "downloadDependencies": [ { "name": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm", - "version": "[8.0.16, 8.0.16]" + "version": "[8.0.18, 8.0.18]" } ], "frameworkReferences": { @@ -188,7 +188,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } }, "runtimes": { @@ -273,7 +273,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } } } diff --git a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.props b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.props index 65a59e4..2d56482 100644 --- a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.props +++ b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.props @@ -33,8 +33,8 @@ - - + + @@ -42,8 +42,8 @@ C:\Users\maski\.nuget\packages\newtonsoft.json\10.0.3 - C:\Users\maski\.nuget\packages\microsoft.net.sdk.webassembly.pack\9.0.5 - C:\Users\maski\.nuget\packages\microsoft.net.illink.tasks\8.0.16 + C:\Users\maski\.nuget\packages\microsoft.net.sdk.webassembly.pack\9.0.7 + C:\Users\maski\.nuget\packages\microsoft.net.illink.tasks\8.0.18 C:\Users\maski\.nuget\packages\microsoft.aspnetcore.components.webassembly.devserver\8.0.6 \ No newline at end of file diff --git a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.targets b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.targets index 0eccd20..bc860cd 100644 --- a/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.targets +++ b/phronCare.UIBlazor/obj/phronCare.UIBlazor.csproj.nuget.g.targets @@ -4,7 +4,7 @@ - + diff --git a/phronCare.UIBlazor/obj/project.assets.json b/phronCare.UIBlazor/obj/project.assets.json index 4e2df4f..ce4db3d 100644 --- a/phronCare.UIBlazor/obj/project.assets.json +++ b/phronCare.UIBlazor/obj/project.assets.json @@ -628,13 +628,13 @@ } } }, - "Microsoft.NET.ILLink.Tasks/8.0.16": { + "Microsoft.NET.ILLink.Tasks/8.0.18": { "type": "package", "build": { "build/Microsoft.NET.ILLink.Tasks.props": {} } }, - "Microsoft.NET.Sdk.WebAssembly.Pack/9.0.5": { + "Microsoft.NET.Sdk.WebAssembly.Pack/9.0.7": { "type": "package", "build": { "build/Microsoft.NET.Sdk.WebAssembly.Pack.props": {}, @@ -2962,13 +2962,13 @@ } } }, - "Microsoft.NET.ILLink.Tasks/8.0.16": { + "Microsoft.NET.ILLink.Tasks/8.0.18": { "type": "package", "build": { "build/Microsoft.NET.ILLink.Tasks.props": {} } }, - "Microsoft.NET.Sdk.WebAssembly.Pack/9.0.5": { + "Microsoft.NET.Sdk.WebAssembly.Pack/9.0.7": { "type": "package", "build": { "build/Microsoft.NET.Sdk.WebAssembly.Pack.props": {}, @@ -5752,10 +5752,10 @@ "microsoft.net.http.headers.nuspec" ] }, - "Microsoft.NET.ILLink.Tasks/8.0.16": { - "sha512": "0H1QaKpVibe++Zx6EYJQGhrpfz2bBPGiQ7Rpsmx8I3+oKv+ZRRIfVfmcj50KuZlhhRE6V02y5bUjP+V2oPM2ng==", + "Microsoft.NET.ILLink.Tasks/8.0.18": { + "sha512": "OiXqr2YIBEV9dsAWEtasK470ALyJ0VxJ9k4MotOxlWV6HeEgrJKYMW4HHj1OCCXvqE0/A25wEKPkpfiBARgDZA==", "type": "package", - "path": "microsoft.net.illink.tasks/8.0.16", + "path": "microsoft.net.illink.tasks/8.0.18", "hasTools": true, "files": [ ".nupkg.metadata", @@ -5769,7 +5769,7 @@ "build/Microsoft.NET.ILLink.Analyzers.props", "build/Microsoft.NET.ILLink.Tasks.props", "build/Microsoft.NET.ILLink.targets", - "microsoft.net.illink.tasks.8.0.16.nupkg.sha512", + "microsoft.net.illink.tasks.8.0.18.nupkg.sha512", "microsoft.net.illink.tasks.nuspec", "tools/net472/ILLink.Tasks.dll", "tools/net472/ILLink.Tasks.dll.config", @@ -5803,10 +5803,10 @@ "useSharedDesignerContext.txt" ] }, - "Microsoft.NET.Sdk.WebAssembly.Pack/9.0.5": { - "sha512": "h1210SGJTqvciPbSMEJjSRa4yc+zCEDeyoc9o3Fc5hScP9v+26INSOMLf4OwNw+oTz4nAwBo+rc5V4FQLWB1pQ==", + "Microsoft.NET.Sdk.WebAssembly.Pack/9.0.7": { + "sha512": "5ehgbqGUERh0JVhTUPwFizw4hIoAglkFk/WMs45djePp16YHP11Vnmx44rOQ3gLW8/aDYN1j+pKdAtcEp4QOcw==", "type": "package", - "path": "microsoft.net.sdk.webassembly.pack/9.0.5", + "path": "microsoft.net.sdk.webassembly.pack/9.0.7", "hasTools": true, "files": [ ".nupkg.metadata", @@ -5837,7 +5837,7 @@ "build/Microsoft.NET.Sdk.WebAssembly.Pack.targets", "build/Wasm.web.config", "build/browser.runtimeconfig.template.json", - "microsoft.net.sdk.webassembly.pack.9.0.5.nupkg.sha512", + "microsoft.net.sdk.webassembly.pack.9.0.7.nupkg.sha512", "microsoft.net.sdk.webassembly.pack.nuspec", "tools/net472/Microsoft.NET.Sdk.WebAssembly.Pack.Tasks.dll", "tools/net472/Microsoft.NET.WebAssembly.Webcil.dll", @@ -10559,8 +10559,8 @@ "Microsoft.AspNetCore.Components.Authorization >= 8.0.6", "Microsoft.AspNetCore.Components.WebAssembly >= 8.0.6", "Microsoft.AspNetCore.Components.WebAssembly.DevServer >= 8.0.6", - "Microsoft.NET.ILLink.Tasks >= 8.0.16", - "Microsoft.NET.Sdk.WebAssembly.Pack >= 9.0.5", + "Microsoft.NET.ILLink.Tasks >= 8.0.18", + "Microsoft.NET.Sdk.WebAssembly.Pack >= 9.0.7", "PSC.Blazor.Components.Chartjs >= 8.0.8", "Transversal >= 1.0.0" ] @@ -10651,13 +10651,13 @@ "Microsoft.NET.ILLink.Tasks": { "suppressParent": "All", "target": "Package", - "version": "[8.0.16, )", + "version": "[8.0.18, )", "autoReferenced": true }, "Microsoft.NET.Sdk.WebAssembly.Pack": { "suppressParent": "All", "target": "Package", - "version": "[9.0.5, )", + "version": "[9.0.7, )", "autoReferenced": true }, "PSC.Blazor.Components.Chartjs": { @@ -10679,7 +10679,7 @@ "downloadDependencies": [ { "name": "Microsoft.NETCore.App.Runtime.Mono.browser-wasm", - "version": "[8.0.16, 8.0.16]" + "version": "[8.0.18, 8.0.18]" } ], "frameworkReferences": { @@ -10687,7 +10687,7 @@ "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.300/PortableRuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\9.0.302/PortableRuntimeIdentifierGraph.json" } }, "runtimes": {