Merge branch 'master' of https://github.com/Rionzagal/MCPackServer

Rionzagal · Oct 30, 2023 · d42334e · d42334e
2 parents 6a398fa + b26b75b
commit d42334e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/MCPackServer/Server/Pages/PurchaseOrdersModule/PurchaseOrdersReport.razor b/MCPackServer/Server/Pages/PurchaseOrdersModule/PurchaseOrdersReport.razor
@@ -138,7 +138,7 @@ else
                         <div style="position: absolute; left: 100px; width: 75px; padding: 5px 0px 0px 5px; ">
                             @ProjectClient.MarketName
                         </div>
-                        <div style="position: absolute; left: 200px; width: 200px; padding: 5px 0px 0px 5px; ">
+                        <div style="position: absolute; left: 200px; width: 200px; padding: 5px 0px 0px 5px; -webkit-line-clamp: 3; -webkit-box-orient: vertical; overflow:hidden;">
                             @OrderProject.Description
                         </div>
                     </div>

diff --git a/MCPackServer/Server/Pages/PurchaseOrdersModule/PurchaseOrdersReport.razor.cs b/MCPackServer/Server/Pages/PurchaseOrdersModule/PurchaseOrdersReport.razor.cs
@@ -80,9 +80,10 @@ protected override async Task OnInitializedAsync()
                         MaterialNumbers.Add((i + 1).ToString());
                         Subtotal += OrderArticles[i].SalePrice * OrderArticles[i].Quantity;
                     }
+                    Subtotal = Math.Round(Subtotal, 2);
                     Discount = Subtotal * (Order.Discount / 100);
-                    Tax = OrderProvider.HasTaxes ? (Subtotal - Discount) * 0.16f : 0;
-                    Total = Subtotal - Discount + Tax;
+                    Tax = Math.Round(OrderProvider.HasTaxes ? (Subtotal - Discount) * 0.16f : 0, 2);
+                    Total = Math.Round(Subtotal - Discount + Tax, 2);
                     NumberOfPages = 1 + OrderArticles.Count / 10;
                     ArticlesPerPage = new();
                     for (int i = 0; i < NumberOfPages; i++)