Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Order invoice price incl tax check (PDF) (#293)

jithendraprasad99995c293aefb8c1
diff --git a/src/Web/Grand.Web/Views/PdfTemplates/OrderPdfTemplate.cshtml b/src/Web/Grand.Web/Views/PdfTemplates/OrderPdfTemplate.cshtml
index 93230dd46..aa2255856 100644
--- a/src/Web/Grand.Web/Views/PdfTemplates/OrderPdfTemplate.cshtml
+++ b/src/Web/Grand.Web/Views/PdfTemplates/OrderPdfTemplate.cshtml
@@ -8,7 +8,6 @@
@inject Grand.Business.Core.Interfaces.Checkout.Payments.IPaymentService _paymentService
@inject Grand.Business.Core.Interfaces.Common.Directory.ICurrencyService _currencyService
@inject Grand.Business.Core.Interfaces.Checkout.GiftVouchers.IGiftVoucherService _giftVoucherService
-
@{
var logoPicture = await _pictureService.GetPictureById(_pdfSettings.LogoPictureId);
var logoExists = logoPicture != null;
@@ -54,10 +53,11 @@
}
@foreach (var order in Model.Item1)
{
+ var priceIncludesTax = order.CustomerTaxDisplayTypeId == TaxDisplayType.IncludingTax;
var store = await _storeService.GetStoreById(order.StoreId);
if (!string.IsNullOrEmpty(_pdfSettings.InvoiceHeaderText))
{
- <div>@_pdfSettings.InvoiceHeaderText</div>
+ <div> @Html.Raw(@_pdfSettings.InvoiceHeaderText)</div>
}
<h2>@store.CompanyName</h2>
if (logoExists)
@@ -87,6 +87,7 @@
string paymentMethodStr = paymentMethod != null ? paymentMethod.FriendlyName : order.PaymentMethodSystemName;
}
<li>@(string.Format(_translationService.GetResource("PDFInvoice.PaymentMethod", order.CustomerLanguageId), paymentMethodStr))</li>
+ @await Component.InvokeAsync("Widget", new { widgetZone = "pdf_payment_method_below", additionalData = @order.Id })
</ul>
}
</td>
@@ -133,9 +134,9 @@
<small>@(Html.Raw(item.AttributeDescription))</small>
}
</td>
- <td>@item.UnitPriceInclTax</td>
+ <td>@if(priceIncludesTax){@item.UnitPriceInclTax}else{@item.UnitPriceExclTax}</td>
<td>@item.Quantity</td>
- <td>@item.PriceInclTax</td>
+ <td>@if(priceIncludesTax){@item.PriceInclTax}else{@item.PriceExclTax}</td>
</tr>
}
</table>
@@ -145,16 +146,16 @@
<hr />
<div class="right">
<ul style="list-style-type:none">
- <li>@(_translationService.GetResource("PDFInvoice.Sub-Total", order.CustomerLanguageId)) @order.OrderSubtotalInclTax @order.CustomerCurrencyCode</li>
- @if (order.OrderSubTotalDiscountInclTax > 0)
+ <li>@(_translationService.GetResource("PDFInvoice.Sub-Total", order.CustomerLanguageId))@if(priceIncludesTax){ @order.OrderSubtotalInclTax}else{ @order.OrderSubtotalExclTax} @order.CustomerCurrencyCode</li>
+ @if (order.OrderSubTotalDiscountInclTax > 0||order.OrderSubTotalDiscountExclTax > 0)
{
- <li>@(_translationService.GetResource("PDFInvoice.Discount", order.CustomerLanguageId)) @order.OrderSubTotalDiscountInclTax @order.CustomerCurrencyCode</li>
+ <li>@(_translationService.GetResource("PDFInvoice.Discount", order.CustomerLanguageId)) @if(priceIncludesTax){ @order.OrderSubTotalDiscountInclTax}else{ @order.OrderSubTotalDiscountExclTax} @order.CustomerCurrencyCode</li>
}
- @if (order.PaymentMethodAdditionalFeeInclTax > 0)
+ @if (order.PaymentMethodAdditionalFeeInclTax > 0 ||order.PaymentMethodAdditionalFeeExclTax > 0)
{
- <li>@(_translationService.GetResource("PDFInvoice.PaymentmethodAdditionalFee", order.CustomerLanguageId)) @order.PaymentMethodAdditionalFeeInclTax @order.CustomerCurrencyCode</li>
+ <li>@(_translationService.GetResource("PDFInvoice.PaymentmethodAdditionalFee", order.CustomerLanguageId)) @if(priceIncludesTax){@order.PaymentMethodAdditionalFeeInclTax}else{ @order.PaymentMethodAdditionalFeeExclTax} @order.CustomerCurrencyCode</li>
}
- <li>@(_translationService.GetResource("PDFInvoice.Shipping", order.CustomerLanguageId)) @order.OrderShippingInclTax @order.CustomerCurrencyCode</li>
+ <li>@(_translationService.GetResource("PDFInvoice.Shipping", order.CustomerLanguageId)) @if(priceIncludesTax){@order.OrderShippingInclTax}else{ @order.PaymentMethodAdditionalFeeExclTax} @order.OrderShippingExclTax @order.CustomerCurrencyCode</li>
@if (order.OrderDiscount > 0)
{
<li>@(_translationService.GetResource("PDFInvoice.Discount", order.CustomerLanguageId)) @order.OrderDiscount @order.CustomerCurrencyCode</li>
@@ -179,7 +180,7 @@
if (!string.IsNullOrEmpty(_pdfSettings.InvoiceFooterText))
{
<footer class="footer">
- @_pdfSettings.InvoiceFooterText
+ @Html.Raw(@_pdfSettings.InvoiceFooterText)
</footer>
}
if (Model.Item1.Count - 1 > i)