Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Grand.Domain.Shipping;
using Grand.SharedKernel.Extensions;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Logging;
using Scryber;
using Scryber.Components;
using Path = System.IO.Path;
Expand All @@ -21,18 +22,21 @@ public class HtmlToPdfService : IPdfService
private const string ShipmentsTemplate = "~/Views/PdfTemplates/ShipmentPdfTemplate.cshtml";
private readonly IRepository<Download> _downloadRepository;
private readonly ILanguageService _languageService;
private readonly ILogger<HtmlToPdfService> _logger;
private readonly IStoreFilesContext _storeFilesContext;
private readonly IViewRenderService _viewRenderService;
private readonly IWebHostEnvironment _webHostEnvironment;

public HtmlToPdfService(IViewRenderService viewRenderService, IRepository<Download> downloadRepository,
ILanguageService languageService, IStoreFilesContext storeFilesContext, IWebHostEnvironment webHostEnvironment)
ILanguageService languageService, IStoreFilesContext storeFilesContext, IWebHostEnvironment webHostEnvironment,
ILogger<HtmlToPdfService> logger)
{
_viewRenderService = viewRenderService;
_languageService = languageService;
_downloadRepository = downloadRepository;
_storeFilesContext = storeFilesContext;
_webHostEnvironment = webHostEnvironment;
_logger = logger;
}

public async Task PrintOrdersToPdf(Stream stream, IList<Order> orders, string languageId = "",
Expand All @@ -43,9 +47,17 @@ public async Task PrintOrdersToPdf(Stream stream, IList<Order> orders, string la

var html = await _viewRenderService.RenderToStringAsync(OrderTemplate,
new ValueTuple<IList<Order>, string>(orders, vendorId));
TextReader sr = new StringReader(html);
using var doc = Document.ParseDocument(sr, ParseSourceType.DynamicContent);
doc.SaveAsPDF(stream);
try
{
TextReader sr = new StringReader(html);
using var doc = Document.ParseDocument(sr, ParseSourceType.DynamicContent);
doc.SaveAsPDF(stream);
}
catch (Exception ex)
{
_logger.LogError(ex, "Error generating PDF from order HTML. HTML content: {Html}", html);
throw;
Comment thread
KrzysztofPajak marked this conversation as resolved.
}
}

public async Task<string> PrintOrderToPdf(Order order, string languageId, string vendorId = "")
Expand Down Expand Up @@ -78,9 +90,17 @@ public async Task PrintPackagingSlipsToPdf(Stream stream, IList<Shipment> shipme
throw new ArgumentException($"Cannot load language. ID={languageId}");

var html = await _viewRenderService.RenderToStringAsync(ShipmentsTemplate, shipments);
TextReader sr = new StringReader(html);
using var doc = Document.ParseDocument(sr, ParseSourceType.DynamicContent);
doc.SaveAsPDF(stream);
try
{
TextReader sr = new StringReader(html);
using var doc = Document.ParseDocument(sr, ParseSourceType.DynamicContent);
doc.SaveAsPDF(stream);
}
catch (Exception ex)
{
_logger.LogError(ex, "Error generating PDF from shipment HTML. HTML content: {Html}", html);
throw;
Comment thread
KrzysztofPajak marked this conversation as resolved.
}
}

public async Task<string> SaveOrderToBinary(Order order, string languageId, string vendorId = "")
Expand Down
19 changes: 17 additions & 2 deletions src/Web/Grand.Web.Common/ViewRender/ViewRenderService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Microsoft.AspNetCore.Mvc.Rendering;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using Microsoft.AspNetCore.Routing;
using Microsoft.Extensions.Logging;

namespace Grand.Web.Common.ViewRender;

Expand All @@ -15,18 +16,21 @@ namespace Grand.Web.Common.ViewRender;
/// </summary>
public class ViewRenderService : IViewRenderService
{
private readonly ILogger<ViewRenderService> _logger;
private readonly IRazorViewEngine _razorViewEngine;
private readonly IServiceProvider _serviceProvider;
private readonly ITempDataProvider _tempDataProvider;


public ViewRenderService(IRazorViewEngine razorViewEngine,
ITempDataProvider tempDataProvider,
IServiceProvider serviceProvider)
IServiceProvider serviceProvider,
ILogger<ViewRenderService> logger)
{
_razorViewEngine = razorViewEngine;
_tempDataProvider = tempDataProvider;
_serviceProvider = serviceProvider;
_logger = logger;
}


Expand All @@ -53,7 +57,18 @@ public async Task<string> RenderToStringAsync<TModel>(string viewPath, TModel mo
new HtmlHelperOptions()
);

await viewResult.View.RenderAsync(viewContext);
try
{
await viewResult.View.RenderAsync(viewContext);
}
catch (Exception ex)
{
var partialHtmlLength = sw.GetStringBuilder().Length;
_logger.LogError(ex, "Error rendering view '{ViewPath}'. Partial HTML length: {PartialHtmlLength}",
viewPath, partialHtmlLength);
throw;
}

return sw.ToString();
}
}
Loading