Update - Ajout de vérification supplémentaire pour modifier la TVA

sheaft-app · Nov 9, 2020 · 17d6cab · 17d6cab
1 parent 0d412ff
commit 17d6cab
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/Sheaft.Application.Handlers/Commands/ProductCommandsHandler.cs b/Sheaft.Application.Handlers/Commands/ProductCommandsHandler.cs
@@ -106,7 +106,6 @@ public async Task<Result<bool>> Handle(UpdateProductCommand request, Cancellatio
                 entity.SetVat(request.Vat);
                 entity.SetName(request.Name);
                 entity.SetDescription(request.Description);
-                entity.SetVat(request.Vat);
                 entity.SetWholeSalePricePerUnit(request.WholeSalePricePerUnit);
                 entity.SetReference(request.Reference);
                 entity.SetWeight(request.Weight);

diff --git a/Sheaft.Domain/Product.cs b/Sheaft.Domain/Product.cs
@@ -139,7 +139,7 @@ public void SetVat(decimal? newVat)
         {
             if (Producer.NotSubjectToVat)
                 newVat = 0;
-            else if(!newVat.HasValue)
+            else if(!newVat.HasValue || newVat == 0)
                 throw new ValidationException(MessageKind.Product_Vat_Required);
 
             if (newVat < 0)

diff --git a/Sheaft.Web.Manage/Views/Products/Add.cshtml b/Sheaft.Web.Manage/Views/Products/Add.cshtml
@@ -2,10 +2,10 @@
 @{
     ViewData["Title"] = "New Product";
     var vats = new List<SelectListItem> {
-        new SelectListItem("0%", "0"),
-        new SelectListItem("5.5%", "5.5"),
-        new SelectListItem("10%", "10"),
-        new SelectListItem("20%", "20"),
+        new SelectListItem("0%", "0.00"),
+        new SelectListItem("5.5%", "5.50"),
+        new SelectListItem("10%", "10.00"),
+        new SelectListItem("20%", "20.00"),
     };
 
     var units = new List<SelectListItem> {

diff --git a/Sheaft.Web.Manage/Views/Products/Edit.cshtml b/Sheaft.Web.Manage/Views/Products/Edit.cshtml
@@ -2,10 +2,10 @@
 @{
     ViewData["Title"] = "Product details";
     var vats = new List<SelectListItem> {
-        new SelectListItem("0%", "0"),
-        new SelectListItem("5.5%", "5.5"),
-        new SelectListItem("10%", "10"),
-        new SelectListItem("20%", "20"),
+        new SelectListItem("0%", "0.00"),
+        new SelectListItem("5.5%", "5.50"),
+        new SelectListItem("10%", "10.00"),
+        new SelectListItem("20%", "20.00"),
     };
 
     var units = new List<SelectListItem> {