mmr/moadiran
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
mmrbnjd
2024-10-15 14:19:54 +03:30
parent 595a9ea5d8
commit fb4e9b5bd5
13 changed files with 257 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
TaxPayerFull/Pages/UserPanel/InvoiceItem.razor
View File

File diff suppressed because one or more lines are too long

15
TaxPayerFull/Pages/UserPanel/Orders.razor
View File

@@ -41,7 +41,12 @@
</div>
<div class="col-auto">
<button @onclick="() => GetOrders(1)" type="submit" class="btn btn-primary">جستجو</button>
<Button Disabled="SpinnerVisible" @onclick="() => GetOrders(1)" Color="ButtonColor.Primary">جستجو</Button>
</div>
<div class="col-md-2">
<Spinner Visible="SpinnerVisible" Color="SpinnerColor.Primary" />
</div>
</div>
</li>
@@ -60,7 +65,7 @@
<div class="row g-3">
<div class="col-auto">
<button type="submit" @onclick="NewOrderItem" class="btn btn-primary">جدید</button>
<Button Disabled="SpinnerVisible" Color="ButtonColor.Primary" @onclick="NewOrderItem">جدید</Button>
</div>
@@ -113,6 +118,7 @@
@layout PanelLayout
@code {
public bool SpinnerVisible { get; set; } = false;
//private Modal stuffmodal = default!;
[Inject] protected PreloadService PreloadService { get; set; } = default!;
ItemSerachOrder itemsearch = new ItemSerachOrder();
@@ -130,10 +136,12 @@
protected override async Task OnInitializedAsync()
{
SpinnerVisible = false;
await base.OnInitializedAsync();
}
protected override async Task OnParametersSetAsync()
{
SpinnerVisible = false;
if (PageIndex == null) PageIndex = 1;
await GetOrders(PageIndex.Value);
await base.OnParametersSetAsync();
@@ -142,6 +150,7 @@
@functions {
public async Task GetOrders(int pi=1)
{
SpinnerVisible = true;
if (ItemSearchOrdertype == 0 || ItemSearchOrdertype == null)
itemsearch.Status = null;
else
@@ -156,7 +165,7 @@
else
ShowDangerAlert("خطایی در بارگیری سفارشات رخ داده");
PreloadService.Hide();
SpinnerVisible = false;
}
private void ShowSuccessAlert(string msg)
{

25
TaxPayerFull/Pages/UserPanel/Profile.razor
View File

@@ -12,12 +12,16 @@
<span class="text-muted fw-light">متفرقه /</span> پروفایل
</h4>
<div class="row">
<div class="col-md-10">
<Alert hidden="@Hidealert" Color="@alertColor" Dismissable="false">
<Icon Name="@alertIconName" class="me-2"></Icon>
@alertMessage
</Alert>
</div>
<div class="col-md-2">
<Spinner Visible="SpinnerVisible" Color="SpinnerColor.Primary" />
</div>
</div>
<div class="row">
<div class="col-md-12">
@@ -36,7 +40,7 @@
<label for="upload" class="btn btn-primary me-2 mb-4" tabindex="0">
<span class="d-none d-sm-block">آپلود تصویر جدید</span>
<i class="bx bx-upload d-block d-sm-none"></i>
<InputFile OnChange="changePic" type="file" id="upload" class="account-file-input" hidden="" accept="image/png, image/jpeg"/>
<InputFile OnChange="changePic" type="file" id="upload" class="account-file-input" hidden="" accept="image/png, image/jpeg"/>
</label>
<p class="text-muted mb-0">JPG، GIF یا PNG مجاز است. حداکثر اندازه @maxFileSize هزار</p>
@@ -70,7 +74,7 @@
<InputText @bind-Value="@changepassModel.renewPass" style="text-align:center;" class="form-control" type="password" id="html5-password-input3" />
</div>
</div>
<button type="submit" class="btn btn-primary">ارسال</button>
<Button Disabled="SpinnerVisible" Type="ButtonType.Submit" Color="ButtonColor.Primary">ارسال</Button>
</EditForm>
</div>
@@ -88,7 +92,7 @@
<span id="basic-icon-default-phone2" class="input-group-text"><i class="bx bx-phone"></i></span>
</div>
</div>
<button type="submit" class="btn btn-primary">ارسال</button>
<Button Disabled="SpinnerVisible" Type="ButtonType.Submit" Color="ButtonColor.Primary">ارسال</Button>
</EditForm>
</div>
@@ -108,7 +112,7 @@
<InputText @bind-Value="@newname" style="text-align:right;" type="text" id="basic-icon-default-company" class="form-control" placeholder="@userinfo.Company.Name" aria-label="@userinfo.Company.Name" aria-describedby="basic-icon-default-company2"/>
</div>
</div>
<button type="submit" class="btn btn-primary">ارسال</button>
<Button Disabled="SpinnerVisible" Type="ButtonType.Submit" Color="ButtonColor.Primary">ارسال</Button>
</EditForm>
</div>
</div>
@@ -120,6 +124,7 @@
@code {
public bool SpinnerVisible { get; set; } = false;
[Parameter]
public string from { get; set; } = "";
@@ -168,6 +173,7 @@
alertMessage = msg;
}
private async Task changepassSubmit(){
SpinnerVisible = true;
var request = await _hc.Post<ChangePasswordDto>("User/ChangePassword", changepassModel);
if (request.IsSuccessStatusCode)
{
@@ -184,9 +190,11 @@
var errors = await request.Content.ReadFromJsonAsync<List<string>>();
ShowDangerAlert(errors[0]);
}
SpinnerVisible = false;
}
private async Task changeUserNameSubmit()
{
SpinnerVisible = true;
if (newUsername != userinfo.UserName)
{
var request = await _hc.Get($"User/ChangeUserName/{newUsername}");
@@ -203,10 +211,11 @@
ShowDangerAlert(errors[0]);
}
}
SpinnerVisible = false;
}
private async Task changeNameSubmit()
{
SpinnerVisible = true;
if (newname != userinfo.Company.Name)
{
var request = await _hc.Get($"Company/ChangeName/{newname}");
@@ -231,9 +240,10 @@
ShowDangerAlert(errors[0]);
}
}
SpinnerVisible = false;
}
private async Task changePic(InputFileChangeEventArgs e){
SpinnerVisible = true;
if (e.GetMultipleFiles()[0].Size <= maxFileSize)
{
string Base64Str = "";
@@ -266,6 +276,7 @@
{
ShowDangerAlert ( "حجم فایل بیشتر از حد مجاز می باشد");
}
SpinnerVisible = false;
}
}

18
TaxPayerFull/Pages/UserPanel/Setting.razor
View File

@@ -12,12 +12,16 @@
<span class="text-muted fw-light">متفرقه /</span> تنظیمات
</h4>
<div class="row">
<div class="col-md-10">
<Alert hidden="@Hidealert" Color="@alertColor" Dismissable="false">
<Icon Name="@alertIconName" class="me-2"></Icon>
@alertMessage
</Alert>
</div>
<div class="col-md-2">
<Spinner Visible="SpinnerVisible" Color="SpinnerColor.Primary" />
</div>
</div>
<div class="row">
<div class="col-md-12">
@@ -45,7 +49,7 @@
</div>
<div class="mt-2">
<button type="submit" class="btn btn-primary">ارسال</button>
<Button Disabled="SpinnerVisible" Type="ButtonType.Submit" Color="ButtonColor.Primary">ارسال</Button>
</div>
@@ -61,7 +65,7 @@
@code {
public bool SpinnerVisible { get; set; } = false;
[SupplyParameterFromForm]
public TaxPayerInfoDto? InfoModel { get; set; }
@@ -102,11 +106,11 @@
alertIconName = IconName.CheckCircleFill;
alertMessage = msg;
}
private async Task Submit()
{
SpinnerVisible = true;
var request = await _hc.Put($"Company/ChangeTaxPayerInfo", InfoModel);
if (request.IsSuccessStatusCode)
{
@@ -128,7 +132,7 @@
ShowDangerAlert(errors[0]);
}
SpinnerVisible = false;
}

19
TaxPayerFull/Pages/UserPanel/TaxPayer.razor
View File

@@ -54,7 +54,7 @@
</select>
</div>
<div class="col-auto">
<button @onclick="() => Load(1)" type="submit" class="btn btn-primary">جستجو</button>
<Button Disabled="SpinnerVisible" @onclick="() => Load(1)" Color="ButtonColor.Primary">جستجو</Button>
</div>
</div>
</li>
@@ -66,11 +66,15 @@
</div>
@* alert *@
<div class="row">
<div class="col-md-10">
<Alert hidden="@Hidealert" Color="@alertColor" Dismissable="false">
<Icon Name="@alertIconName" class="me-2"></Icon>
@alertMessage
</Alert>
</div>
<div class="col-md-2">
<Spinner Visible="SpinnerVisible" Color="SpinnerColor.Primary" />
</div>
</div>
@* data *@
@if (request != null)
@@ -102,6 +106,7 @@
}
@code {
public bool SpinnerVisible { get; set; } = false;
private Modal modal = default!;
[Inject] protected PreloadService PreloadService { get; set; } = default!;
ItemSerchGetSentTax itemsearch = new ItemSerchGetSentTax();
@@ -116,8 +121,14 @@
public int? PageIndex { get; set; }
public Shared.DTOs.PagingDto<SentTaxDto>? request { get; set; }
protected override Task OnInitializedAsync()
{
SpinnerVisible = false;
return base.OnInitializedAsync();
}
protected override async Task OnParametersSetAsync()
{
SpinnerVisible = false;
if (routed.HasValue && routed > 0)
{
ShowSuccessAlert($"صورتحساب شماره {routed} با موفقیت ارسال شد " +'\n'+
@@ -133,6 +144,7 @@
@functions{
public async Task SentTaxItem(int ID)
{
SpinnerVisible = true;
var rsp = await hc.Get($"TaxPayer/GetResult/{ID}");
if (rsp.IsSuccessStatusCode)
{
@@ -150,9 +162,11 @@
var request = await rsp.Content.ReadFromJsonAsync<List<string>>();
ShowDangerAlert(request[0]);
}
SpinnerVisible = false;
}
public async Task Load(int pi)
{
SpinnerVisible = true;
itemsearch.PageSize = 10;
itemsearch.PageIndex = pi;
PreloadService.Show(SpinnerColor.Dark);
@@ -170,6 +184,7 @@
ShowDangerAlert("خطایی در اجرای عملیات رخ داده");
}
PreloadService.Hide();
SpinnerVisible = false;
}
private void ShowSuccessAlert(string msg)
{

23
TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor
View File

@@ -22,11 +22,15 @@ else
@* alert *@
<div class="row">
<div class="col-md-2">
<Alert hidden="@Hidealert" Color="@alertColor" Dismissable="false">
<Icon Name="@alertIconName" class="me-2"></Icon>
@alertMessage
</Alert>
</div>
<div class="col-md-2">
<Spinner Visible="SpinnerVisible" Color="SpinnerColor.Primary" />
</div>
</div>
@if (FullInvoice)
{
@@ -305,11 +309,11 @@ else
<div class="col-auto">
@if (FullInvoice)
{
<button type="submit" @onclick="Send" class="btn btn-primary">ثبت تغییرات</button>
<Button Disabled="SpinnerVisible" Color="ButtonColor.Primary" @onclick="Send">ثبت تغییرات</Button>
}
else
{
<button type="submit" @onclick="Send" class="btn btn-primary">آماده سازی و ارسال</button>
<Button Disabled="SpinnerVisible" Color="ButtonColor.Primary" @onclick="Send">آماده سازی و ارسال</Button>
}
</div>
@@ -322,6 +326,7 @@ else
@code {
public bool SpinnerVisible { get; set; } = false;
string patt = "";
private List<IdName<int>>? Patterns = new List<IdName<int>>();
private List<IdName<int>>? BillTypes = new List<IdName<int>>();
@@ -341,10 +346,12 @@ else
protected override async Task OnParametersSetAsync()
{
SpinnerVisible = true;
PreloadService.Show(SpinnerColor.Dark);
Patterns = await fv.GetPatternsbyinp();
BillTypes = await fv.GetBillTypes();
units = await fv.GetUnitsbyUnitTaxID();
SpinnerVisible = false;
await LoadData();
PreloadService.Hide();
@@ -366,6 +373,7 @@ else
};
public async Task Send()
{
SpinnerVisible = true;
if (!FullInvoice && !await CheckAuth())
{
ShowMessage(ToastType.Danger, "خطا در احراز هویت سازمان مالیاتی");
@@ -421,19 +429,22 @@ else
ShowMessage(ToastType.Danger, request[0]);
}
}
SpinnerVisible = false;
}
public async Task<bool> CheckAuth()
{
SpinnerVisible = true;
var rsp = await hc.Get($"TaxPayer/CheckAuth");
if (rsp.IsSuccessStatusCode)
{
var response = await rsp.Content.ReadFromJsonAsync<bool>();
if (response)
{
SpinnerVisible = false;
return true;
}
}
SpinnerVisible = false;
return false;
}
private void ShowSuccessAlert(string msg)
@@ -452,7 +463,7 @@ else
}
private async Task LoadData()
{
SpinnerVisible = true;
var rsp = await hc.Get($"TaxPayer/GetInvoice/{InvoiceID}");
if (rsp.IsSuccessStatusCode)
{
@@ -463,7 +474,7 @@ else
var request = await rsp.Content.ReadFromJsonAsync<List<string>>();
ShowDangerAlert(request[0]);
}
SpinnerVisible = false;
}
private async Task ShowConditions(string[]? Conditions, string fild)
{

24
TaxPayerFull/Pages/UserPanel/Ticket.razor
View File

@@ -21,8 +21,8 @@
</form>
</BodyTemplate>
<FooterTemplate>
<Button Color="ButtonColor.Secondary" @onclick="OnHideModalClick">Close</Button>
<Button Color="ButtonColor.Primary" @onclick="OnClickNewTicket">ثبت</Button>
<Button Disabled="SpinnerVisible" Color="ButtonColor.Secondary" @onclick="OnHideModalClick">Close</Button>
<Button Disabled="SpinnerVisible" Color="ButtonColor.Primary" @onclick="OnClickNewTicket">ثبت</Button>
</FooterTemplate>
</Modal>
@@ -31,11 +31,15 @@
<span class="text-muted fw-light">متفرقه /</span> پشتیبانی
</h4>
<div class="row">
<div class="col-md-10">
<Alert hidden="@Hidealert" Color="@alertColor" Dismissable="false">
<Icon Name="@alertIconName" class="me-2"></Icon>
@alertMessage
</Alert>
</div>
<div class="col-md-2">
<Spinner Visible="SpinnerVisible" Color="SpinnerColor.Primary" />
</div>
</div>
<div class="row">
<div class="col-md-6">
@@ -56,12 +60,12 @@
</div>
<div class="col-auto">
<button type="submit" @onclick="Submit" class="btn btn-primary">جستجو</button>
<Button Disabled="SpinnerVisible" Color="ButtonColor.Primary" @onclick="Submit">جستجو</Button>
</div>
<div class="col-auto">
<button type="submit" @onclick="OnShowModalClick" class="btn btn-primary">جدید</button>
<Button Disabled="SpinnerVisible" Color="ButtonColor.Primary" @onclick="OnShowModalClick">جدید</Button>
</div>
</div>
@@ -112,7 +116,7 @@
@code {
LTicket child;
public bool SpinnerVisible { get; set; } = false;
private Modal modal = default!;
// alert
AlertColor alertColor = AlertColor.Primary;
@@ -134,6 +138,7 @@
protected override async Task OnParametersSetAsync()
{
SpinnerVisible = false;
if (PageIndex == null) PageIndex = 1;
await Search(PageIndex.Value);
await base.OnParametersSetAsync();
@@ -161,7 +166,8 @@
}
public async Task Search(int pi)
{
SpinnerVisible = true;
var rsp = await hc.Post<ItemSerchGetTicket>("Ticket/GetAll", new ItemSerchGetTicket
{
PageIndex = pi,
@@ -178,6 +184,7 @@
{
ShowDangerAlert("خطایی در اجرای عملیات رخ داده");
}
SpinnerVisible = false;
}
private async Task OnShowModalClick()
{
@@ -189,6 +196,7 @@
}
private async Task OnClickNewTicket()
{
SpinnerVisible = true;
var rsp = await hc.Post<CTicketDto>("Ticket/NewTicket", new CTicketDto
{
CompanyID = userinfo.Company.ID.ToString(),
@@ -206,6 +214,6 @@
ShowDangerAlert("خطایی در اجرای عملیات رخ داده");
}
await modal.HideAsync();
SpinnerVisible = false;
}
}