refactor landing page layout - refactor class and function names
for order processing
This commit is contained in:
parent
9ed0aad0d5
commit
b5fbf35a30
11 changed files with 39 additions and 50 deletions
|
@ -27,15 +27,15 @@
|
|||
<i class="bi-activity"></i> Sælger Liste
|
||||
</a>
|
||||
</AuthorizeView>
|
||||
<a class="list-group-item list-group-item-action list-group-item-info" href="/sales/orderlist/dk">
|
||||
<i class="bi-door-open"></i> Åbne ordrer
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-action list-group-item-success" href="/office/customers/dk">
|
||||
<i class="bi-phone"></i> Telefon Bestilling
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-action list-group-item-info" href="/catalog/dk">
|
||||
<i class="bi-file-spreadsheet"></i> Produkt Prisliste
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-action list-group-item-danger" href="/sales/orderlist/dk">
|
||||
<i class="bi-door-open"></i> Ubehandlede Bestillinger
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -51,15 +51,15 @@
|
|||
<i class="bi-activity"></i> Sælger Liste
|
||||
</a>
|
||||
</AuthorizeView>
|
||||
<a class="list-group-item list-group-item-action list-group-item-info" href="/sales/orderlist/no">
|
||||
<i class="bi-door-open"></i> Åbne ordrer
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-action list-group-item-success" href="/office/customers/no">
|
||||
<i class="bi-phone"></i> Telefon Bestilling
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-action list-group-item-info" href="/catalog/no">
|
||||
<i class="bi-file-spreadsheet"></i> Produkt Prisliste
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-action list-group-item-danger" href="/sales/orderlist/no">
|
||||
<i class="bi-door-open"></i> Ubehandlede Bestillinger
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -75,15 +75,15 @@
|
|||
<i class="bi-activity"> Sælger Liste</i>
|
||||
</a>
|
||||
</AuthorizeView>
|
||||
<a class="list-group-item list-group-item-action list-group-item-info" href="/sales/orderlist/se">
|
||||
<i class="bi-door-open"></i> Åbne ordrer
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-action list-group-item-success" href="/office/customers/se">
|
||||
<i class="bi-phone"></i> Telefon Bestilling
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-action list-group-item-info" href="/catalog/se">
|
||||
<i class="bi-file-spreadsheet"></i> Produkt Prisliste
|
||||
</a>
|
||||
<a class="list-group-item list-group-item-action list-group-item-danger" href="/sales/orderlist/se">
|
||||
<i class="bi-door-open"></i> Ubehandlede Bestillinger
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
using Wonky.Entity.Views;
|
||||
|
||||
namespace Wonky.Client.HttpRepository;
|
||||
|
||||
public interface IOfficeOpenOrdersRepository
|
||||
{
|
||||
Task<List<OpenOrderListView>> GetOpenOrders();
|
||||
Task<List<OpenOrderListView>> GetOpenOrders(string countryCode);
|
||||
}
|
|
@ -0,0 +1,9 @@
|
|||
using Wonky.Entity.Views;
|
||||
|
||||
namespace Wonky.Client.HttpRepository;
|
||||
|
||||
public interface IOfficeOrderListRepository
|
||||
{
|
||||
Task<List<OfficeOrderListView>> GetOrdersProcessStatusNone();
|
||||
Task<List<OfficeOrderListView>> GetOrdersProcessStatusNone(string countryCode);
|
||||
}
|
|
@ -8,7 +8,7 @@ using Wonky.Entity.Views;
|
|||
|
||||
namespace Wonky.Client.HttpRepository;
|
||||
|
||||
public class OfficeOpenOrdersRepository : IOfficeOpenOrdersRepository
|
||||
public class OfficeOrderListRepository : IOfficeOrderListRepository
|
||||
{
|
||||
private readonly JsonSerializerOptions? _options = new JsonSerializerOptions
|
||||
{
|
||||
|
@ -16,12 +16,12 @@ public class OfficeOpenOrdersRepository : IOfficeOpenOrdersRepository
|
|||
};
|
||||
|
||||
private readonly NavigationManager _navigation;
|
||||
private readonly ILogger<OfficeOpenOrdersRepository> _logger;
|
||||
private readonly ILogger<OfficeOrderListRepository> _logger;
|
||||
private readonly HttpClient _client;
|
||||
private readonly ApiConfig _api;
|
||||
|
||||
public OfficeOpenOrdersRepository(HttpClient client,
|
||||
ILogger<OfficeOpenOrdersRepository> logger,
|
||||
public OfficeOrderListRepository(HttpClient client,
|
||||
ILogger<OfficeOrderListRepository> logger,
|
||||
NavigationManager navigation,
|
||||
IOptions<ApiConfig> configuration)
|
||||
{
|
||||
|
@ -31,22 +31,22 @@ public class OfficeOpenOrdersRepository : IOfficeOpenOrdersRepository
|
|||
_api = configuration.Value;
|
||||
}
|
||||
|
||||
public async Task<List<OpenOrderListView>> GetOpenOrders()
|
||||
public async Task<List<OfficeOrderListView>> GetOrdersProcessStatusNone()
|
||||
{
|
||||
var result = await _client
|
||||
.GetFromJsonAsync<List<OpenOrderListView>>(
|
||||
.GetFromJsonAsync<List<OfficeOrderListView>>(
|
||||
$"{_api.OfficeSales}", _options);
|
||||
|
||||
return result ?? new List<OpenOrderListView>();
|
||||
return result ?? new List<OfficeOrderListView>();
|
||||
|
||||
}
|
||||
|
||||
public async Task<List<OpenOrderListView>> GetOpenOrders(string countryCode)
|
||||
public async Task<List<OfficeOrderListView>> GetOrdersProcessStatusNone(string countryCode)
|
||||
{
|
||||
var result = await _client
|
||||
.GetFromJsonAsync<List<OpenOrderListView>>(
|
||||
.GetFromJsonAsync<List<OfficeOrderListView>>(
|
||||
$"{_api.OfficeSales}/country/{countryCode}", _options);
|
||||
|
||||
return result ?? new List<OpenOrderListView>();
|
||||
return result ?? new List<OfficeOrderListView>();
|
||||
}
|
||||
}
|
|
@ -67,8 +67,8 @@ public partial class CommonReportPrintOrderPage
|
|||
{
|
||||
var current = 0;
|
||||
var orders = Report.ReportItems
|
||||
.Where(x => x is { StatusTypeEnum: "Order", ProcessStatusEnum: "None" } );
|
||||
var count = orders.Count();
|
||||
.Where(x => x is { StatusTypeEnum: "Order", ProcessStatusEnum: "None" } ).ToList();
|
||||
var count = orders.Count;
|
||||
foreach (var item in orders)
|
||||
{
|
||||
Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst");
|
||||
|
@ -88,10 +88,4 @@ public partial class CommonReportPrintOrderPage
|
|||
await JsModule.InvokeVoidAsync("printInvoke");
|
||||
Navigator.NavigateTo(ReturnUrl);
|
||||
}
|
||||
|
||||
/*
|
||||
* await Task.Delay(1000);
|
||||
* JS.InvokeVoidAsync("invokePrint");
|
||||
* InvokeAsync(() => StateHasChanged());
|
||||
*/
|
||||
}
|
||||
|
|
|
@ -60,10 +60,4 @@ public partial class CommonReportPrintSummaryPage
|
|||
|
||||
Navigator.NavigateTo(ReturnUrl);
|
||||
}
|
||||
|
||||
/*
|
||||
* await Task.Delay(1000);
|
||||
* JS.InvokeVoidAsync("invokePrint");
|
||||
* InvokeAsync(() => StateHasChanged());
|
||||
*/
|
||||
}
|
||||
|
|
|
@ -8,11 +8,11 @@ using Wonky.Entity.Views;
|
|||
|
||||
namespace Wonky.Client.Pages;
|
||||
|
||||
public partial class OfficeOpenOrderListPage : IDisposable
|
||||
public partial class OfficeOrderListPage : IDisposable
|
||||
{
|
||||
// #############################################################
|
||||
[Inject] public ILogger<OfficeOpenOrderListPage> Logger { get; set; }
|
||||
[Inject] public IOfficeOpenOrdersRepository OpenOrdersRepo { get; set; }
|
||||
[Inject] public ILogger<OfficeOrderListPage> Logger { get; set; }
|
||||
[Inject] public IOfficeOrderListRepository OrderListRepo { get; set; }
|
||||
[Inject] public HttpInterceptorService Interceptor { get; set; }
|
||||
[Inject] public NavigationManager Navigator { get; set; }
|
||||
|
||||
|
@ -21,14 +21,14 @@ public partial class OfficeOpenOrderListPage : IDisposable
|
|||
|
||||
// #############################################################
|
||||
private bool Working { get; set; } = true;
|
||||
private List<OpenOrderListView> OrderLIst { get; set; } = new();
|
||||
private List<OfficeOrderListView> OrderLIst { get; set; } = new();
|
||||
|
||||
protected override async Task OnParametersSetAsync()
|
||||
{
|
||||
Interceptor.RegisterEvent();
|
||||
Interceptor.RegisterBeforeSendEvent();
|
||||
Logger.LogInformation("---- CountryCode is '{}'", CountryCode);
|
||||
OrderLIst = await OpenOrdersRepo.GetOpenOrders(CountryCode);
|
||||
OrderLIst = await OrderListRepo.GetOrdersProcessStatusNone(CountryCode);
|
||||
|
||||
Working = false;
|
||||
}
|
|
@ -81,7 +81,7 @@ builder.Services.AddScoped<ICountryUserInfoRepository, CountryUserInfoRepository
|
|||
builder.Services.AddScoped<ISupportDocumentRepository, SupportDocumentRepository>();
|
||||
builder.Services.AddScoped<ISupportManagementRepository, SupportManagementRepository>();
|
||||
builder.Services.AddScoped<ICountryActivityRepository, CountryActivityRepository>();
|
||||
builder.Services.AddScoped<IOfficeOpenOrdersRepository, OfficeOpenOrdersRepository>();
|
||||
builder.Services.AddScoped<IOfficeOrderListRepository, OfficeOrderListRepository>();
|
||||
// warehouse repository
|
||||
builder.Services.AddScoped<IOrderProcessRepository, OrderProcessRepository>();
|
||||
// mail service
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"appInfo": {
|
||||
"name": "Wonky Online",
|
||||
"version": "257.0",
|
||||
"version": "258.0",
|
||||
"rc": true,
|
||||
"sandBox": true,
|
||||
"image": "grumpy-coder.png",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
namespace Wonky.Entity.Views;
|
||||
|
||||
public class OpenOrderListView
|
||||
public class OfficeOrderListView
|
||||
{
|
||||
public string CompanyId { get; set; } = "";
|
||||
public string CompanyName { get; set; } = "";
|
||||
|
@ -8,4 +8,5 @@ public class OpenOrderListView
|
|||
public string SalesHeadId { get; set; } = "";
|
||||
public string OrderDate { get; set; } = "";
|
||||
public string SalesRep { get; set; } = "";
|
||||
public string CountryCode { get; set; } = "";
|
||||
}
|
Loading…
Reference in a new issue