From 6c8aaadac39f49752196184ac63dbc3b17df3e8a Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Thu, 27 Jun 2024 13:35:06 +0330 Subject: [PATCH] ... --- Back/Controllers/CODController.cs | 2 +- Back/Controllers/CustomerController.cs | 2 +- Back/Validations/AddOrCodValidation.cs | 4 ++-- TaxPayerFull/CUSComponent/CodItem.razor | 22 ++++++++++++++++++-- TaxPayerFull/CUSComponent/CustomerItem.razor | 18 +++++++++++++++- 5 files changed, 41 insertions(+), 7 deletions(-) diff --git a/Back/Controllers/CODController.cs b/Back/Controllers/CODController.cs index c7225d2..a20f894 100644 --- a/Back/Controllers/CODController.cs +++ b/Back/Controllers/CODController.cs @@ -114,7 +114,7 @@ namespace Back.Controllers ////-----change Cod Cod.TaxRate = item.TaxRate; - Cod.Title = item.Title; + //Cod.Title = item.Title; Cod.UnitID = item.UnitID; Cod.ItemTaxID = item.TaxID; Cod.IsDeleted = false; diff --git a/Back/Controllers/CustomerController.cs b/Back/Controllers/CustomerController.cs index e0d8c4a..345d6d6 100644 --- a/Back/Controllers/CustomerController.cs +++ b/Back/Controllers/CustomerController.cs @@ -130,7 +130,7 @@ namespace Back.Controllers cus.CustomerType = item.CustomerType; cus.EconomicCode = item.EconomicCode; cus.Email = item.Email; - cus.FullName = item.FullName; + // cus.FullName = item.FullName; cus.Info = item.Info; cus.MeliCode = item.MeliCode; cus.PassportNumber = item.PassportNumber; diff --git a/Back/Validations/AddOrCodValidation.cs b/Back/Validations/AddOrCodValidation.cs index 574708e..3a3a554 100644 --- a/Back/Validations/AddOrCodValidation.cs +++ b/Back/Validations/AddOrCodValidation.cs @@ -49,8 +49,8 @@ namespace Back.Validations .NotEmpty().WithMessage("واحد اندازه گیزی نمی تواند خالی باشد") ; RuleFor(r => r.Item2.TaxRate) - .NotNull().WithMessage("نرخ مالیات نمی تواند خالی باشد") - .NotEmpty().WithMessage("نرخ مالیات نمی تواند خالی باشد") + //.NotNull().WithMessage("نرخ مالیات نمی تواند خالی باشد") + //.NotEmpty().WithMessage("نرخ مالیات نمی تواند خالی باشد") .Custom((TaxRate, context) => { if (TaxRate > 100) diff --git a/TaxPayerFull/CUSComponent/CodItem.razor b/TaxPayerFull/CUSComponent/CodItem.razor index 752a629..a41def1 100644 --- a/TaxPayerFull/CUSComponent/CodItem.razor +++ b/TaxPayerFull/CUSComponent/CodItem.razor @@ -11,10 +11,28 @@ + @if (Cod.ID != 0) + { +
نکته:
+ + + }
- + @if (Cod.ID != 0) + { + + } + else + { + + } +
@@ -148,7 +166,7 @@ else } public async Task OnClickUpdate() { - if (Cod.UnitID > 0 && Cod.TaxRate > 0 && !string.IsNullOrEmpty(Cod.Title)) + if (Cod.UnitID > 0 && Cod.TaxRate >= 0 && !string.IsNullOrEmpty(Cod.Title)) { var rsp = await hc.Put("Cod/Update", Cod); diff --git a/TaxPayerFull/CUSComponent/CustomerItem.razor b/TaxPayerFull/CUSComponent/CustomerItem.razor index d100437..3f15a74 100644 --- a/TaxPayerFull/CUSComponent/CustomerItem.razor +++ b/TaxPayerFull/CUSComponent/CustomerItem.razor @@ -10,10 +10,26 @@
+ @if (Cus.ID != 0) + { +
نکته:
+ + + }
- + @if (Cus.ID == 0) + { + + } + else + { + + }