diff --git a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor index 7cebc7b..24b9323 100644 --- a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor @@ -94,8 +94,6 @@ - - @@ -269,9 +267,11 @@
@if (!invoice.IsDeleted) { - + + + }
@@ -336,29 +336,56 @@ { @if (InvoiceID == 0 || InvoiceID == null) { - +
+ + + +
} else { + +
+ + + + + + - - - - - @* *@ + + + + + + + + + @if (!invoice.IsDeleted && invoice.invoiceType != InvoiceType.Bidding && SendInvoice) + { + + + + + } + + +
+ + } } @@ -367,15 +394,8 @@
- @if (!invoice.IsDeleted && invoice.invoiceType != InvoiceType.Bidding && SendInvoice) - { -
- -
- } - else if (!string.IsNullOrEmpty(invoice.inno)) + + @if (!(!invoice.IsDeleted && invoice.invoiceType != InvoiceType.Bidding && SendInvoice) && !string.IsNullOrEmpty(invoice.inno)) {