From a9140575576a01886749906780be7064063d52fd Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Mon, 22 Jul 2024 14:23:29 +0330 Subject: [PATCH] ... --- Back/Controllers/TaxPayerController.cs | 2 +- Back/Services/servTaxPayer.cs | 1 + .../CUSComponent/SpecialConditions.razor | 22 ++++ .../Pages/UserPanel/TaxPayerInvoiceItem.razor | 103 +++++++++++++++--- 4 files changed, 111 insertions(+), 17 deletions(-) create mode 100644 TaxPayerFull/CUSComponent/SpecialConditions.razor diff --git a/Back/Controllers/TaxPayerController.cs b/Back/Controllers/TaxPayerController.cs index fdbea76..7b65378 100644 --- a/Back/Controllers/TaxPayerController.cs +++ b/Back/Controllers/TaxPayerController.cs @@ -180,7 +180,7 @@ namespace Back.Controllers //صورتحساب مجموع Tbill = result.tbill ?? null, // تسویه روش - Setm = result.setm ?? null, + Setm = result.setm == 0 ? null : result.setm ?? null, //نقدی پرداختی مبلغ Cap = result.cap ?? null, //پرداختی نسیه diff --git a/Back/Services/servTaxPayer.cs b/Back/Services/servTaxPayer.cs index a53c3d0..acf036e 100644 --- a/Back/Services/servTaxPayer.cs +++ b/Back/Services/servTaxPayer.cs @@ -171,6 +171,7 @@ namespace Back.Services { if (item.eName == "indatim" || item.eName == "Indati2m" || item.eName == "cdcd") item.Value = item.Value.Replace("/", ""); + SetValue(item, ref InvoiceItem); } diff --git a/TaxPayerFull/CUSComponent/SpecialConditions.razor b/TaxPayerFull/CUSComponent/SpecialConditions.razor new file mode 100644 index 0000000..71554ae --- /dev/null +++ b/TaxPayerFull/CUSComponent/SpecialConditions.razor @@ -0,0 +1,22 @@ +
+ + + + + + + + @foreach (var item in Conditions) + { + + + + } + + +
متن
@item
+
+ +@code { + [Parameter] public string[] Conditions { get; set; } +} diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor index b9a6e53..15fb088 100644 --- a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor @@ -6,7 +6,8 @@ @inject HttpClientController hc; - + + @if (FullInvoice) { اطلاعات تکمیلی صورتحساب @@ -38,7 +39,7 @@ else } -@if(!FullInvoice) +@if (!FullInvoice) {
@@ -68,20 +69,49 @@ else
@foreach (var item in invoice?.header.filds) { -
+
@if (item.ModeID == 1 && item.InputBox != "autofild") { - + if (item.Des != null && !FullInvoice) + { +
+
+ شرایط خاص +
+
+ +
+
+ } + else + { + + } + } else { - + if (item.Des != null && !FullInvoice) + { +
+
+ شرایط خاص +
+
+ +
+
+ } + else + { + + } } @if (item.InputBox == "fromdb") {