diff --git a/Back/Back.csproj b/Back/Back.csproj index a6bcdd4..52705f9 100644 --- a/Back/Back.csproj +++ b/Back/Back.csproj @@ -35,7 +35,7 @@ - ..\..\..\LocalGit\TaxPayerTools\Service\bin\Debug\Service.dll + ..\..\Dlls\Service.dll diff --git a/Back/Controllers/InvoiceController.cs b/Back/Controllers/InvoiceController.cs index 4e6cbf1..cd79b9c 100644 --- a/Back/Controllers/InvoiceController.cs +++ b/Back/Controllers/InvoiceController.cs @@ -98,10 +98,10 @@ namespace Back.Controllers } [HttpPut("Update")] - public async Task> Update([FromBody] NUInvoiceDTO item) + public async Task> Update([FromBody] NUInvoiceDTO item) { - if (!ModelState.IsValid) - return BadRequest(item); + //if (!ModelState.IsValid) + // return BadRequest(item); //-----GetUserAndCompany var claim = HttpContext.User.Claims.First(c => c.Type == "UserID"); @@ -125,7 +125,7 @@ namespace Back.Controllers if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(invoice)) return BadRequest(new List { "این صورتحساب به سازمان ارسال شده"+'\n'+ "برای تغییر ،صورتحساب را ابطال/اصلاح یا برگشت بزنید"}); - else if (invoice.invoiceType != InvoiceType.BackFrmSale) + else if (invoice.invoiceType == InvoiceType.BackFrmSale) { return BadRequest(new List { "صورتحساب در وضعیت برگشت از فروش نمی تواند ویرایش شود" }); diff --git a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor index 699bd70..e762951 100644 --- a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor @@ -27,8 +27,7 @@
- @if (InvoiceID == 0 || InvoiceID == null ? false : true){ - @if (!invoice.invoiceType.HasValue) { @@ -54,15 +53,8 @@ } - - } - else - { - - } + +
@@ -188,7 +180,7 @@

- @if (invoice.ID == 0) + @if(InvoiceID == 0 || InvoiceID == null) {