From 131330041c3297a3a1e49b4b1f1601097471a7d2 Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Fri, 31 May 2024 00:24:45 +0330 Subject: [PATCH] ... --- Back/Controllers/TaxPayerController.cs | 17 ++++++ Back/Services/servTaxPayer.cs | 22 ++++++- TaxPayerFull/Layout/Lfooter.razor | 4 +- TaxPayerFull/Layout/Lheaderbottom.razor | 2 +- TaxPayerFull/Layout/Lheadertop.razor | 2 +- TaxPayerFull/Layout/PanelNavMenu.razor | 14 +++-- TaxPayerFull/Pages/Home.razor | 5 +- TaxPayerFull/Pages/UserPanel/COD.razor | 3 + TaxPayerFull/Pages/UserPanel/Customer.razor | 3 + TaxPayerFull/Pages/UserPanel/Invoice.razor | 3 + .../Pages/UserPanel/InvoiceItem.razor | 35 +++++++++-- TaxPayerFull/Pages/UserPanel/TaxPayer.razor | 8 +++ .../Pages/UserPanel/TaxPayerInvoiceItem.razor | 60 +++++++++++++++++++ 13 files changed, 163 insertions(+), 15 deletions(-) create mode 100644 Back/Controllers/TaxPayerController.cs create mode 100644 TaxPayerFull/Pages/UserPanel/TaxPayer.razor create mode 100644 TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor diff --git a/Back/Controllers/TaxPayerController.cs b/Back/Controllers/TaxPayerController.cs new file mode 100644 index 0000000..558f358 --- /dev/null +++ b/Back/Controllers/TaxPayerController.cs @@ -0,0 +1,17 @@ +using Back.Services; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace Back.Controllers +{ + [Route("api/[controller]")] + [ApiController] + public class TaxPayerController : ControllerBase + { + private readonly servTaxPayer _servTaxPayer; + public TaxPayerController(servTaxPayer servTaxPayer) + { + _servTaxPayer = servTaxPayer; + } + } +} diff --git a/Back/Services/servTaxPayer.cs b/Back/Services/servTaxPayer.cs index 28f63c8..7bc1d10 100644 --- a/Back/Services/servTaxPayer.cs +++ b/Back/Services/servTaxPayer.cs @@ -2,6 +2,7 @@ using Back.Data.Contracts; using Back.Data.Models; using Microsoft.EntityFrameworkCore; +using Back.Common; namespace Back.Services { @@ -9,10 +10,13 @@ namespace Back.Services { private readonly IAsyncRepository _repoSentTax; private readonly IAsyncRepository _repoPattern; - public servTaxPayer(IAsyncRepository repoSentTax, IAsyncRepository repoPattern) + private readonly IAsyncRepository _invoiceRepo; + public servTaxPayer(IAsyncRepository repoSentTax, IAsyncRepository repoPattern + , IAsyncRepository invoiceRepo) { _repoSentTax = repoSentTax; _repoPattern = repoPattern; + _invoiceRepo = invoiceRepo; } public async Task ExistSuccessfulorSendorpendingInvoiceinCompanyID(int CompanyID) { @@ -34,5 +38,21 @@ namespace Back.Services return await _repoPattern.Get(w=>w.Status).Select(s => new IdName { ID = s.ID, Title = s.Title }).ToListAsync(); } + + public async Task GetInvoice(int CompanyID, int ID) + { + #region AdvancedSearch + var invok = _invoiceRepo + .Get(w => w.CompanyID == CompanyID && w.ID == ID && !w.IsDeleted); + + + #endregion + //----------------------- + return await invok + .Include(inc => inc.invoiceDetails) + .ThenInclude(inc => inc.cODItem) + .ThenInclude(inc => inc.CODUnit) + .FirstOrDefaultAsync(); + } } } diff --git a/TaxPayerFull/Layout/Lfooter.razor b/TaxPayerFull/Layout/Lfooter.razor index ebd058c..6740f48 100644 --- a/TaxPayerFull/Layout/Lfooter.razor +++ b/TaxPayerFull/Layout/Lfooter.razor @@ -70,7 +70,7 @@ stroke="#FF3C82" stroke-width="2" stroke-linecap="round" /> - 09121234567 + 09016940504
  • @@ -99,7 +99,7 @@ stroke="#FF3C82" stroke-width="1.5" stroke-linecap="round" /> - ایران، تهران، آزادی + ایران، تهران
    • diff --git a/TaxPayerFull/Layout/Lheaderbottom.razor b/TaxPayerFull/Layout/Lheaderbottom.razor index f5975ab..d102463 100644 --- a/TaxPayerFull/Layout/Lheaderbottom.razor +++ b/TaxPayerFull/Layout/Lheaderbottom.razor @@ -4,7 +4,7 @@
    diff --git a/TaxPayerFull/Layout/Lheadertop.razor b/TaxPayerFull/Layout/Lheadertop.razor index aee687b..1566036 100644 --- a/TaxPayerFull/Layout/Lheadertop.razor +++ b/TaxPayerFull/Layout/Lheadertop.razor @@ -12,7 +12,7 @@
    - پیشتیبانی: 09121234567 + پیشتیبانی: 09016940504
    diff --git a/TaxPayerFull/Layout/PanelNavMenu.razor b/TaxPayerFull/Layout/PanelNavMenu.razor index 2d63b22..f38d80d 100644 --- a/TaxPayerFull/Layout/PanelNavMenu.razor +++ b/TaxPayerFull/Layout/PanelNavMenu.razor @@ -31,15 +31,21 @@
    صورتحساب
    +
  • + + +
    سامانه مودیان
    +     +
  • متفرقه
    • -
  • +
  • پروفایل
    • -
  • +
  • پشتیبانی
    @@ -51,7 +57,7 @@
    سفارشات
    • *@ -
  • +
  • تنظیمات
    @@ -61,7 +67,7 @@ @code{ - string[] cssActionItem = { "active", "", "", "", "", "", "" }; + string[] cssActionItem = { "active", "", "", "", "", "", "", "" }; } @functions{ diff --git a/TaxPayerFull/Pages/Home.razor b/TaxPayerFull/Pages/Home.razor index 3768595..95aa60d 100644 --- a/TaxPayerFull/Pages/Home.razor +++ b/TaxPayerFull/Pages/Home.razor @@ -1,7 +1,7 @@ @inject Services.localService servlocal; @page "/" -Home +مدیریت کسب و کار @@ -401,9 +401,10 @@ - + + diff --git a/TaxPayerFull/Pages/UserPanel/COD.razor b/TaxPayerFull/Pages/UserPanel/COD.razor index 2222ebe..d7047df 100644 --- a/TaxPayerFull/Pages/UserPanel/COD.razor +++ b/TaxPayerFull/Pages/UserPanel/COD.razor @@ -10,6 +10,9 @@ @* search *@
    +

    + سرویس ها / کالا +

    diff --git a/TaxPayerFull/Pages/UserPanel/Customer.razor b/TaxPayerFull/Pages/UserPanel/Customer.razor index 83a4927..1222a74 100644 --- a/TaxPayerFull/Pages/UserPanel/Customer.razor +++ b/TaxPayerFull/Pages/UserPanel/Customer.razor @@ -10,6 +10,9 @@ @* search *@
    +

    + سرویس ها / مشتری +

    diff --git a/TaxPayerFull/Pages/UserPanel/Invoice.razor b/TaxPayerFull/Pages/UserPanel/Invoice.razor index 0039e1d..cedb9c1 100644 --- a/TaxPayerFull/Pages/UserPanel/Invoice.razor +++ b/TaxPayerFull/Pages/UserPanel/Invoice.razor @@ -12,6 +12,9 @@ @* search *@
    +

    + سرویس ها / صورتحساب +

    diff --git a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor index 4d034b3..bd0b76c 100644 --- a/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/InvoiceItem.razor @@ -12,7 +12,7 @@ - +جزئیات صورتحساب @if (invoice.IsDeleted) @@ -22,6 +22,20 @@
    }
    + @if (InvoiceID.HasValue) + { +

    + سرویس ها / صورتحساب / @invoice?.Title +

    + } + else + { +

    + سرویس ها / صورتحساب / جدید +

    + } + + @* alert *@

    -
    +
    @@ -270,13 +284,24 @@ - + *@ + } }
    + @if (invoice.invoiceType != InvoiceType.Bidding) + { +
    +
    + +
    + } +

    @@ -409,7 +434,9 @@ if (rsp.IsSuccessStatusCode) { invoice = await rsp.Content.ReadFromJsonAsync(); + } + else if(rsp.StatusCode==System.Net.HttpStatusCode.BadRequest) { ShowDangerAlert("صورتحساب مرجع یافت نشد"); diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayer.razor b/TaxPayerFull/Pages/UserPanel/TaxPayer.razor new file mode 100644 index 0000000..183b4f8 --- /dev/null +++ b/TaxPayerFull/Pages/UserPanel/TaxPayer.razor @@ -0,0 +1,8 @@ +سامانه مودیان +@inject HttpClientController hc; +@layout PanelLayout +@page "/TaxPayer" +@using Front.Services +@code { + +} diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor new file mode 100644 index 0000000..4f701e2 --- /dev/null +++ b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor @@ -0,0 +1,60 @@ +@page "/TaxPayerInvoiceItem/{InvoiceID:int}" +@using Front.Services +@using Shared.DTOs +@layout PanelLayout +@inject HttpClientController hc; + + + +آماده سازی صورتحساب + +@code { + private ConfirmDialog dialog = default!; + [Parameter] public int? InvoiceID { get; set; } + List messages = new List(); + [Inject] protected PreloadService PreloadService { get; set; } = default!; + public InvoiceDTO? invoice { get; set; } + // alert + AlertColor alertColor = AlertColor.Primary; + IconName alertIconName = IconName.CheckCircleFill; + bool Hidealert = true; + string alertMessage = ""; + + protected override async Task OnInitializedAsync() + { + await LoadData(); + + await base.OnInitializedAsync(); + } +} +@functions{ + private void ShowSuccessAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Success; + alertIconName = IconName.CheckCircleFill; + alertMessage = msg; + } + private void ShowDangerAlert(string msg) + { + Hidealert = false; + alertColor = AlertColor.Danger; + alertIconName = IconName.ExclamationTriangleFill; + alertMessage = msg; + } + private async Task LoadData() + { + PreloadService.Show(SpinnerColor.Dark); + var rsp = await hc.Get($"Invoice/Get/{InvoiceID}/{true}"); + if (rsp.IsSuccessStatusCode) + { + invoice = await rsp.Content.ReadFromJsonAsync(); + } + else + { + var request = await rsp.Content.ReadFromJsonAsync>(); + ShowDangerAlert(request[0]); + } + PreloadService.Hide(); + } +}