...

2024-07-20 15:52:29 +03:30
parent b3adcb4132
commit cb8c69d81b
4 changed files with 141 additions and 104 deletions
--- a/Back/Controllers/TaxPayerController.cs
+++ b/Back/Controllers/TaxPayerController.cs
@@ -49,20 +49,20 @@ namespace Back.Controllers
                if (!result.PatternID.HasValue || result.PatternID == 0)
                    return BadRequest(new List<string> { "ابتدا برای این صورتحساب الگو در نظر بگیرید" });

-                if (result.invoiceType == InvoiceType.Bidding)
-                    return BadRequest(new List<string> { "صورتحساب در وضعیت پیش نویس نمیتواند ارسال شود" });
+                //if (result.invoiceType == InvoiceType.Bidding)
+                //    return BadRequest(new List<string> { "صورتحساب در وضعیت پیش نویس نمیتواند ارسال شود" });

-                if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(result))
-                    return BadRequest(new List<string> { "این صورتحساب قبلا به سازمان ارسال شده" });
+                //if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(result))
+                //    return BadRequest(new List<string> { "این صورتحساب قبلا به سازمان ارسال شده" });

-                if ((result.invoiceType == InvoiceType.BackFrmSale || result.invoiceType == InvoiceType.Repair)
-                    && !result.BillReference.HasValue)
-                    return BadRequest(new List<string> { "در وضعیت برگشت از فروش و اصلاحی باید صورتحساب مرجع وجود داشته باشد" });
+                //if ((result.invoiceType == InvoiceType.BackFrmSale || result.invoiceType == InvoiceType.Repair)
+                //    && !result.BillReference.HasValue)
+                //    return BadRequest(new List<string> { "در وضعیت برگشت از فروش و اصلاحی باید صورتحساب مرجع وجود داشته باشد" });


-                if ((result.invoiceType == InvoiceType.BackFrmSale || result.invoiceType == InvoiceType.Repair)
-                    && !await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(result.invoice))
-                    return BadRequest(new List<string> { "در وضعیت برگشت از فروش و اصلاحی باید صورتحساب مرجع به سامانه مودیان ارسال شده باشد" });
+                //if ((result.invoiceType == InvoiceType.BackFrmSale || result.invoiceType == InvoiceType.Repair)
+                //    && !await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(result.invoice))
+                //    return BadRequest(new List<string> { "در وضعیت برگشت از فروش و اصلاحی باید صورتحساب مرجع به سامانه مودیان ارسال شده باشد" });



@@ -80,6 +80,25 @@ namespace Back.Controllers
            if (result == null)
                return BadRequest(new List<string> { "صورتحساب یافت نشد" });

+            else
+            {
+                if (result.invoiceType == InvoiceType.Bidding)
+                    return BadRequest(new List<string> { "صورتحساب در وضعیت پیش نویس نمیتواند آماده ارسال شود" });
+
+                if (await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(result))
+                    return BadRequest(new List<string> { "این صورتحساب قبلا به سازمان ارسال شده" });
+
+                if ((result.invoiceType == InvoiceType.BackFrmSale || result.invoiceType == InvoiceType.Repair)
+                    && !result.BillReference.HasValue)
+                    return BadRequest(new List<string> { "در وضعیت برگشت از فروش و اصلاحی باید صورتحساب مرجع وجود داشته باشد" });
+
+
+                if ((result.invoiceType == InvoiceType.BackFrmSale || result.invoiceType == InvoiceType.Repair)
+                    && !await _servTaxPayer.ExistSuccessfulorSendorpendingInvoice(result.invoice))
+                    return BadRequest(new List<string> { "در وضعیت برگشت از فروش و اصلاحی باید صورتحساب مرجع به سامانه مودیان ارسال شده باشد" });
+
+            }
+

            return Ok(await _servTaxPayer.PreparationInvoiceBeforeSending(item, result));
        }
--- a/Back/Services/servInvoice.cs
+++ b/Back/Services/servInvoice.cs
@@ -24,88 +24,92 @@ namespace Back.Services
        {
            #region AdvancedSearch
            var invok = _invoiceRepo
-                .Get(w => w.CompanyID == CompanyID  && w.ID == ID);
+                .Get(w => w.CompanyID == CompanyID && w.ID == ID);
            if (notloaddelete)
            {
-                 invok = invok
-               .Where(w => !w.IsDeleted);
-                 
-            }
+                invok = invok
+              .Where(w => !w.IsDeleted);

+            }
            #endregion
            //-----------------------
-         return await invok
-                .Include(inc => inc.invoiceDetails)
-                  .ThenInclude(inc => inc.cODItem)
-                                       .ThenInclude(inc => inc.CODUnit)
-                                       .Include(inc=>inc.sentTax)
-                //.Include(inc => inc.payments)
-                .Include(inc => inc.pattern)
-                .Select(s => new InvoiceDTO()
-                {
-                  //  ExternalAccessCode=s.ExternalAccessCode,
-                    IsDeleted=s.IsDeleted,
-                    PatternID = s.PatternID,
-                    PatternTitle = s.pattern.Title,
-                    CustomerID = s.CustomerID,
-                    CustomerName = s.Customer.FullName,
-                    ID = s.ID,
-                    InvoiceDate = s.InvoiceDate.ShamciToFormatShamci(),
-                    invoiceTypeTitle = s.invoiceType.GetEnumDisplayName(),
-                    invoiceType = s.invoiceType,
-                    Title = s.Title,
-                    InvoicIssueDate = s.InvoicIssueDate.ShamciToFormatShamci(),
-                    BillReference = s.BillReference,
-                    tbill = s.tbill,
-                    Des = s.Des,
-                    PreparedtoSendtoTax = s.PreparedtoSendtoTax,
-                    tdis = s.tdis,
-                    tvam = s.tvam,
-                    Udate = s.Udate.ShamciToFormatShamci(),
-                    InvoiceSendTaxs=s.sentTax.OrderBy(o => o.ID).Select(s=>new SentTaxDto()
-                    {
-                        Date = s.Date.ShamciToFormatShamci(),
-                        Time = s.Time,
-                        ID = s.ID,
-                        InvoiceID = s.InvoiceID,
-                        SentStatus = s.SentStatus,
-                        InvoiceType= s.InvoiceType,
-                        msgInvoiceType = s.InvoiceType.GetEnumDisplayName(),
-                        msgSentStatus = s.SentStatus.GetEnumDisplayName()
-                    }).ToList(),
-                    items = s.invoiceDetails.OrderBy(o => o.ID).Select(x => new InvoiceItemDTO()
-                    {
-                        ID = x.ID,
-                        CODID = x.CODID,
-                        adis = x.adis,
-                        am = x.am.Value,
-                        dis = x.dis,
-                        fee = x.fee.Value,
-                        mu = x.unitTitle,
-                        sstt = x.sstt,
-                        tsstam = x.tsstam,
-                        vam = x.vam,
-                        vra = x.vra,
-                        prdis = x.prdis
-                    }).ToList(),
-                    payments = new List<InvoicePaymentDTO>() //s.payments.OrderBy(o => o.ID).Select(x => new InvoicePaymentDTO()
-                    //{
-                    //    ID = x.ID,
-                    //    acn = x.acn,
-                    //    iinn = x.acn,
-                    //    pcn = x.acn,
-                    //    pdt = x.pdt,
-                    //    PaymentDateTime=x.PaymentDateTime,
-                    //    pid = x.pid,
-                    //    pmt = x.pmt,
-                    //    pv = x.pv,
-                    //    trmn = x.trmn,
-                    //    trn = x.acn
-                    //}).ToList()
-                    ,
-                })
-                .FirstOrDefaultAsync();
-           
+         
+            return await invok
+   .Include(inc => inc.invoiceDetails)
+     .ThenInclude(inc => inc.cODItem)
+                          .ThenInclude(inc => inc.CODUnit)
+                          .Include(inc => inc.sentTax)
+   //.Include(inc => inc.payments)
+   .Include(inc => inc.pattern)
+          .ThenInclude(inc => inc.BillType)
+   .Select(s => new InvoiceDTO()
+   {
+      
+       IsDeleted = s.IsDeleted,
+       PatternID = s.PatternID,
+       PatternTitle = s.pattern.Title,
+       CustomerID = s.CustomerID,
+       CustomerName = s.Customer.FullName,
+       ID = s.ID,
+       InvoiceDate = s.InvoiceDate.ShamciToFormatShamci(),
+       invoiceTypeTitle = s.invoiceType.GetEnumDisplayName(),
+       invoiceType = s.invoiceType,
+       Title = s.Title,
+       InvoicIssueDate = s.InvoicIssueDate.ShamciToFormatShamci(),
+       BillReference = s.BillReference,
+       tbill = s.tbill,
+       Des = s.Des,
+       PreparedtoSendtoTax = s.PreparedtoSendtoTax,
+       tdis = s.tdis,
+       //
+       tvam = s.tvam,
+       Udate = s.Udate.ShamciToFormatShamci(),
+
+       InvoiceSendTaxs = s.sentTax.OrderBy(o => o.ID).Select(s => new SentTaxDto()
+       {
+           Date = s.Date.ShamciToFormatShamci(),
+           Time = s.Time,
+           ID = s.ID,
+           InvoiceID = s.InvoiceID,
+           SentStatus = s.SentStatus,
+           InvoiceType = s.InvoiceType,
+           msgInvoiceType = s.InvoiceType.GetEnumDisplayName(),
+           msgSentStatus = s.SentStatus.GetEnumDisplayName()
+       }).ToList(),
+       //items = s.invoiceDetails.OrderBy(o => o.ID).Select(x => new InvoiceItemDTO()
+       //{
+       //    ID = x.ID,
+       //    CODID = x.CODID,
+       //    adis = x.adis,
+       //    am = x.am.Value,
+       //    dis = x.dis,
+       //    fee = x.fee.Value,
+       //    mu = x.unitTitle,
+       //    sstt = x.sstt,
+       //    tsstam = x.tsstam,
+       //    vam = x.vam,
+       //    vra = x.vra,
+       //    prdis = x.prdis
+       //}).ToList(),
+       payments = new List<InvoicePaymentDTO>()
+       //s.payments.OrderBy(o => o.ID).Select(x => new InvoicePaymentDTO()
+       //{
+       //    ID = x.ID,
+       //    acn = x.acn,
+       //    iinn = x.acn,
+       //    pcn = x.acn,
+       //    pdt = x.pdt,
+       //    PaymentDateTime=x.PaymentDateTime,
+       //    pid = x.pid,
+       //    pmt = x.pmt,
+       //    pv = x.pv,
+       //    trmn = x.trmn,
+       //    trn = x.acn
+       //}).ToList()
+   })
+   .FirstOrDefaultAsync();
+
+
        }
        public async Task<PagingDto<InvoiceGridDTO>?> GetInvoices(int CompanyID, ItemSerchGetInvoices itemSerch)
        {
@@ -126,10 +130,10 @@ namespace Back.Services
                invok = invok.Where(w => w.Title.Contains(itemSerch.Title));

            if (itemSerch.refInvoiceID != null)
-                invok = invok.Where(w => w.BillReference==itemSerch.refInvoiceID);
+                invok = invok.Where(w => w.BillReference == itemSerch.refInvoiceID);

-            if(itemSerch.CodID != null)
-                invok = invok.Where(w => w.invoiceDetails.Any(wa=>wa.CODID== itemSerch.CodID));
+            if (itemSerch.CodID != null)
+                invok = invok.Where(w => w.invoiceDetails.Any(wa => wa.CODID == itemSerch.CodID));
            //foreach (InputObj item in inputObjs)
            //    invok = invok.Where(ExMethod.GetFunc<Customer>(item.Param, item.Value));

@@ -143,7 +147,7 @@ namespace Back.Services
                .Include(inc => inc.pattern)
                .Select(s => new InvoiceGridDTO()
                {
-                    
+
                    CustomerID = s.CustomerID,
                    CustomerName = s.Customer.FullName,
                    ID = s.ID,
@@ -163,7 +167,7 @@ namespace Back.Services
            return await _invoiceRepo.Get(w => w.ID == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted).AnyAsync();

        }
-    
+
        public async Task<bool> checkFatherInvoiceByInvoiceID(int CompanyID, int InvoiceID)
        {
            return await _invoiceRepo.Get(w => w.BillReference == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted).AnyAsync();
@@ -183,12 +187,12 @@ namespace Back.Services
                        var item = await _invoiceRepo.AddAsync(invoice);
                        return item.ID;
                    }
-                    catch (Exception ex )
+                    catch (Exception ex)
                    {
                        return -1;
-                        
+
                    }
-                   
+
                }

                return -1;
@@ -203,9 +207,9 @@ namespace Back.Services
                catch (Exception ex)
                {
                    return -1;
-                    
+
                }
-             
+
            }

        }
@@ -221,7 +225,7 @@ namespace Back.Services
        {
            return await _invoiceRepo
                .Get(w => w.ID == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted)
-                .Include(inc=>inc.invoiceDetails)
+                .Include(inc => inc.invoiceDetails)
                .FirstOrDefaultAsync();
        }
        public async Task<bool> DeleteInvoice(Invoice item)
--- a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor
+++ b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor
@@ -334,12 +334,16 @@
                }
                else
                {
-                    <Button class="mt-3" Color="ButtonColor.Success" @onclick="OnClickUpdate" Type="ButtonType.Button">
-                        ثبت تغییرات
-                    </Button>
-                    <Button class="mt-3" Color="ButtonColor.Danger" @onclick="ShowConfirmationDeleteAsync" Type="ButtonType.Button">
-                        حذف
-                    </Button>
+                    <div class="d-flex gap-2">
+                        <Dropdown Color="DropdownColor.Info" Direction="DropdownDirection.Dropend">
+                            <DropdownToggleButton>Dropend</DropdownToggleButton>
+                            <DropdownMenu>
+                                <DropdownItem Type="ButtonType.Link" @onclick="OnClickUpdate"> ثبت تغییرات</DropdownItem>
+                                <DropdownItem Type="ButtonType.Link" @onclick="ShowConfirmationDeleteAsync">حذف</DropdownItem>
+                                <DropdownItem Type="ButtonType.Link" @onclick="showFullInvoiceItem">اطلاعات تکمیلی صورتحساب</DropdownItem>
+                            </DropdownMenu>
+                        </Dropdown>
+                        </div>
@*                     <Button class="mt-3" Color="ButtonColor.Primary" @onclick="ShowReport" Type="ButtonType.Button">
                        pdf
                    </Button>
@@ -492,6 +496,13 @@
            hc._nav.NavigateTo($"TaxPayerInvoiceItem/{InvoiceID}");
        }
    }
+    private async Task showFullInvoiceItem()
+    {
+        if (InvoiceID.HasValue)
+        {
+            hc._nav.NavigateTo($"FullInvoiceItem/{InvoiceID}");
+        }
+    }
    private async Task onClickLink()
    {

--- a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor
+++ b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor
@@ -1,4 +1,5 @@
@page "/TaxPayerInvoiceItem/{InvoiceID:int}"
+@page "/FullInvoiceItem/{InvoiceID:int}"
@using Front.Services
@using Shared.DTOs
@layout PanelLayout
@@ -214,6 +215,8 @@
        PreloadService.Show(SpinnerColor.Dark);
        await LoadData();
        PreloadService.Hide();
+
+       var res= hc._nav.Uri.ToString();
        await base.OnParametersSetAsync();

    }