From 4c82d49a0ea98ffa6e9258404711d1dab25d4a82 Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Sun, 11 Aug 2024 20:29:57 +0330 Subject: [PATCH] ... --- Back/Services/servTaxPayer.cs | 4 ++-- TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Back/Services/servTaxPayer.cs b/Back/Services/servTaxPayer.cs index 2630f1d..66636fb 100644 --- a/Back/Services/servTaxPayer.cs +++ b/Back/Services/servTaxPayer.cs @@ -129,7 +129,7 @@ namespace Back.Services var resval = InvoiceItem.GetType().GetProperties().Where(w => w.Name == item.eName).Select(s => s.GetValue(InvoiceItem)).FirstOrDefault(); item.Value = resval == null ? "" : (item.eName == "InvoicIssueDate" || item.eName == "InvoiceDate" || item.eName == "CottageDateOfCustomsDeclaration" ? resval.ToString().ShamciToFormatShamci() :resval.ToString().Split('.').Length==2 ? ((decimal)resval).ToString("N0") : resval.ToString()); item.DefVals = item.InputBox == "fromdb" ? _codingRepo.Get(w => w.FildID == item.FildID).Select(ss => new _TaxPayer.Coding() { ID = ss.Code, Name = ss.Title }).ToList() : new List<_TaxPayer.Coding>(); - item.Des = item.ModeID == 3 ? _specialConditionRepo.Get(w => w.FildID == item.FildID).Select(ss => ss.condition).ToArray() : null; + item.Des = /*item.ModeID == 3 ?*/ _specialConditionRepo.Get(w => w.FildID == item.FildID).Select(ss => ss.condition).ToArray() /*: null*/; } ret.header = new _TaxPayer.Filds() { ID = InvoiceItem.ID, filds = head }; //-------------------body @@ -153,7 +153,7 @@ namespace Back.Services var resval = invoicedetail.GetType().GetProperties().Where(w => w.Name == item.eName).Select(s => s.GetValue(invoicedetail)).FirstOrDefault(); item.Value = resval == null ? "" : resval.ToString().Split('.').Length == 2 ? ((decimal)resval).ToString("N0") : resval.ToString(); item.DefVals = item.InputBox == "fromdb" ? _codingRepo.Get(w => w.FildID == item.FildID).Select(ss => new _TaxPayer.Coding() { ID = ss.Code, Name = ss.Title }).ToList() : new List<_TaxPayer.Coding>(); - item.Des = item.ModeID == 3 ? _specialConditionRepo.Get(w => w.FildID == item.FildID).Select(ss => ss.condition).ToArray() : null; + item.Des = /*item.ModeID == 3 ?*/ _specialConditionRepo.Get(w => w.FildID == item.FildID).Select(ss => ss.condition).ToArray() /*: null*/; diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor index a74da88..a548e04 100644 --- a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor @@ -92,7 +92,7 @@ else { if (item.Des != null && item.Des.Count() > 0 && !FullInvoice) { - شرایط خاص + ... @@ -206,7 +206,7 @@ else { if (itemB.Des != null && itemB.Des.Count() > 0 && !FullInvoice) { - شرایط خاص + ... } else @@ -218,7 +218,7 @@ else { if (itemB.Des != null && itemB.Des.Count() > 0 && !FullInvoice) { - شرایط خاص + ... } else @@ -471,7 +471,7 @@ else { var parameters = new Dictionary(); parameters.Add("Conditions", Conditions); - await modal.ShowAsync(title: $"شرایط خاص برای فیلد {fild}", parameters: parameters); + await modal.ShowAsync(title: $"فیلد {fild}", parameters: parameters); } } }