diff --git a/EveryThing/Pages/Invoices/Print.cshtml b/EveryThing/Pages/Invoices/Print.cshtml
index c35c9c3..2fc223b 100644
--- a/EveryThing/Pages/Invoices/Print.cshtml
+++ b/EveryThing/Pages/Invoices/Print.cshtml
@@ -173,6 +173,9 @@
@Model.Translation.Price
|
+
+ @Model.Translation.Discount
+ |
@Model.Translation.Amount
|
@@ -222,6 +225,7 @@
|| Model.Invoice.Type == Models.Invoice.Invoice.InvoiceType.BuyersOrder)
{
@Html.DisplayFor(x => item.Price) |
+ @Html.DisplayFor(x => item.Discount)% |
@Html.DisplayFor(x => item.TotalValue) |
}
else if (Model.Invoice.Type == Models.Invoice.Invoice.InvoiceType.Order)
diff --git a/EveryThing/Pages/Invoices/Print.cshtml.cs b/EveryThing/Pages/Invoices/Print.cshtml.cs
index de65249..02c0d05 100644
--- a/EveryThing/Pages/Invoices/Print.cshtml.cs
+++ b/EveryThing/Pages/Invoices/Print.cshtml.cs
@@ -42,6 +42,7 @@ namespace EveryThing.Pages.Invoices
public string Article { get; set; } = "Artikel";
public string Quantity { get; set; } = "Količina";
public string Price { get; set; } = "Cena";
+ public string Discount { get; set; } = "Rabat";
public string Amount { get; set; } = "Znesek";
public string Dimensions { get; set; } = "Dimenzije";
public string Total { get; set; } = "Skupaj";
@@ -301,6 +302,7 @@ namespace EveryThing.Pages.Invoices
OrderNumber = invoiceState == Invoice.InvoiceState.Offer ? "Anfrage No." : "Bestellnummer",
Price = "Preis(€)",
Quantity = "Menge(Stk)",
+ Discount = "Rabatt",
SwiftBic = "SWIFT/BIC",
Total = "Gesamtsumme",
Project = "Projekt",
diff --git a/EveryThing/Pages/Projects/DetailsPartItem.cshtml b/EveryThing/Pages/Projects/DetailsPartItem.cshtml
index 48e11ad..b775b49 100644
--- a/EveryThing/Pages/Projects/DetailsPartItem.cshtml
+++ b/EveryThing/Pages/Projects/DetailsPartItem.cshtml
@@ -1,7 +1,11 @@
@using System.Globalization
@model EveryThing.Models.Project.ProjectPartItem
-
+@{
+ var hasNote = !string.IsNullOrWhiteSpace(Model.Note);
+}
+
+
@if(Model.Status != Models.Project.ProjectPartItemStatus.Shipped)
{
@@ -18,6 +22,10 @@
@Html.DisplayFor(modelItem => Model.IdItemFk)
}
+ @if (hasNote)
+ {
+
+ }
@(Model.ProjectPartNumberFormatted)
|
diff --git a/EveryThing/Pages/Projects/Edit.cshtml b/EveryThing/Pages/Projects/Edit.cshtml
index 7379ed6..1214ddf 100644
--- a/EveryThing/Pages/Projects/Edit.cshtml
+++ b/EveryThing/Pages/Projects/Edit.cshtml
@@ -13,6 +13,10 @@
border-top: none;
}
+ .project-part-item-has-note {
+ background-color: #fff8e1;
+ }
+
.tab-panel-invoices{
height: 490px;
overflow-y: auto;
|