From 2d58f0c14f39f2d59593151f69022a4c8453e421 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Sun, 17 Jul 2022 11:56:28 +0200 Subject: [PATCH] wip --- ...> AdminAdvisorCompanyTableComponent.razor} | 0 ...dminAdvisorCompanyTableComponent.razor.cs} | 2 +- ...razor => AdminAdvisorTableComponent.razor} | 6 +- ...cs => AdminAdvisorTableComponent.razor.cs} | 2 +- .../AdminReportTableComponent.razor | 2 +- Wonky.Client/Components/Home.razor | 9 +- .../Components/TopbarNavigation.razor | 2 +- .../AdminReportHttpRepository.cs | 4 +- .../HttpRepository/CompanyHttpRepository.cs | 4 +- .../HttpRepository/ICompanyHttpRepository.cs | 2 +- .../HttpRepository/IUserHttpRepository.cs | 6 +- .../IWarehouseHttpRepository.cs | 10 ++ .../HttpRepository/UserHttpRepository.cs | 12 +- .../HttpRepository/WarehouseHttpRepository.cs | 52 +++++++++ Wonky.Client/Pages/ActivityNewVisitPage.razor | 2 +- .../Pages/ActivityNewVisitPage.razor.cs | 2 +- .../Pages/ActivityTodayListPage.razor | 2 +- ...azor => AdminAdvisorCompanyListPage.razor} | 2 +- ...s => AdminAdvisorCompanyListPage.razor.cs} | 6 +- ...e.razor => AdminAdvisorUserListPage.razor} | 4 +- ...r.cs => AdminAdvisorUserListPage.razor.cs} | 6 +- ...wPage.razor => AdminAdvisorViewPage.razor} | 10 +- ...razor.cs => AdminAdvisorViewPage.razor.cs} | 10 +- .../Pages/AdminOfficeUserListPage.razor.cs | 4 +- .../Pages/AdminOfficeUserViewPage.razor.cs | 2 +- Wonky.Client/Pages/AdminReportListPage.razor | 2 +- Wonky.Client/Pages/AdminReportViewPage.razor | 2 +- .../Pages/AdminReportViewPage.razor.cs | 2 +- ...Page.razor => AdvisorReportListPage.razor} | 0 ...azor.cs => AdvisorReportListPage.razor.cs} | 2 +- ...wPage.razor => AdvisorReportNewPage.razor} | 2 +- ...razor.cs => AdvisorReportNewPage.razor.cs} | 4 +- ...Page.razor => AdvisorReportViewPage.razor} | 2 +- ...azor.cs => AdvisorReportViewPage.razor.cs} | 2 +- Wonky.Client/Pages/CustomerListPage.razor | 2 +- Wonky.Client/Pages/CustomerNewPage.razor | 2 +- Wonky.Client/Pages/CustomerViewPage.razor | 2 +- Wonky.Client/Pages/HelpPage.razor | 2 +- Wonky.Client/Pages/Index.razor | 2 +- Wonky.Client/Pages/ItemCatalogPage.razor | 2 +- Wonky.Client/Pages/KrvItemViewPage.razor | 2 +- .../Pages/LandingPageAdminAdvisers.razor | 8 +- .../Pages/ProductHistoryItemPage.razor | 2 +- .../Pages/ProductHistoryListPage.razor | 2 +- Wonky.Client/Pages/ProductInventoryPage.razor | 2 +- Wonky.Client/Pages/TaskItemListPage.razor | 2 +- .../Pages/WarehouseOrderListPage.razor | 78 +++++++++++++ .../Pages/WarehouseOrderListPage.razor.cs | 66 +++++++++++ .../Pages/WarehouseOrderViewPage.razor | 103 ++++++++++++++++++ .../Pages/WarehouseOrderViewPage.razor.cs | 61 +++++++++++ Wonky.Client/Program.cs | 1 + Wonky.Client/Shared/AuthStateProvider.cs | 8 +- Wonky.Client/Shared/NavMenu.razor | 21 ++-- Wonky.Client/wwwroot/appsettings.json | 12 +- Wonky.Entity/Configuration/ApiConfig.cs | 5 +- Wonky.Entity/DTO/AdminUserInfoDto.cs | 6 +- Wonky.Entity/Views/ReportItemLine.cs | 8 ++ Wonky.Entity/Views/UserInfoView.cs | 6 +- Wonky.Entity/Views/WarehouseOrderView.cs | 46 ++++++++ Wonky.Entity/Views/WarehouseProcess.cs | 14 +++ 60 files changed, 550 insertions(+), 96 deletions(-) rename Wonky.Client/Components/{AdminAdviserCompanyTableComponent.razor => AdminAdvisorCompanyTableComponent.razor} (100%) rename Wonky.Client/Components/{AdminAdviserCompanyTableComponent.razor.cs => AdminAdvisorCompanyTableComponent.razor.cs} (96%) rename Wonky.Client/Components/{AdminAdviserTableComponent.razor => AdminAdvisorTableComponent.razor} (90%) rename Wonky.Client/Components/{AdminAdviserTableComponent.razor.cs => AdminAdvisorTableComponent.razor.cs} (95%) create mode 100644 Wonky.Client/HttpRepository/IWarehouseHttpRepository.cs create mode 100644 Wonky.Client/HttpRepository/WarehouseHttpRepository.cs rename Wonky.Client/Pages/{AdminAdviserCompanyListPage.razor => AdminAdvisorCompanyListPage.razor} (97%) rename Wonky.Client/Pages/{AdminAdviserCompanyListPage.razor.cs => AdminAdvisorCompanyListPage.razor.cs} (96%) rename Wonky.Client/Pages/{AdminAdviserUserListPage.razor => AdminAdvisorUserListPage.razor} (88%) rename Wonky.Client/Pages/{AdminAdviserUserListPage.razor.cs => AdminAdvisorUserListPage.razor.cs} (91%) rename Wonky.Client/Pages/{AdminAdviserViewPage.razor => AdminAdvisorViewPage.razor} (96%) rename Wonky.Client/Pages/{AdminAdviserViewPage.razor.cs => AdminAdvisorViewPage.razor.cs} (93%) rename Wonky.Client/Pages/{AdviserReportListPage.razor => AdvisorReportListPage.razor} (100%) rename Wonky.Client/Pages/{AdviserReportListPage.razor.cs => AdvisorReportListPage.razor.cs} (96%) rename Wonky.Client/Pages/{AdviserReportNewPage.razor => AdvisorReportNewPage.razor} (99%) rename Wonky.Client/Pages/{AdviserReportNewPage.razor.cs => AdvisorReportNewPage.razor.cs} (98%) rename Wonky.Client/Pages/{AdviserReportViewPage.razor => AdvisorReportViewPage.razor} (97%) rename Wonky.Client/Pages/{AdviserReportViewPage.razor.cs => AdvisorReportViewPage.razor.cs} (97%) create mode 100644 Wonky.Client/Pages/WarehouseOrderListPage.razor create mode 100644 Wonky.Client/Pages/WarehouseOrderListPage.razor.cs create mode 100644 Wonky.Client/Pages/WarehouseOrderViewPage.razor create mode 100644 Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs create mode 100644 Wonky.Entity/Views/WarehouseOrderView.cs create mode 100644 Wonky.Entity/Views/WarehouseProcess.cs diff --git a/Wonky.Client/Components/AdminAdviserCompanyTableComponent.razor b/Wonky.Client/Components/AdminAdvisorCompanyTableComponent.razor similarity index 100% rename from Wonky.Client/Components/AdminAdviserCompanyTableComponent.razor rename to Wonky.Client/Components/AdminAdvisorCompanyTableComponent.razor diff --git a/Wonky.Client/Components/AdminAdviserCompanyTableComponent.razor.cs b/Wonky.Client/Components/AdminAdvisorCompanyTableComponent.razor.cs similarity index 96% rename from Wonky.Client/Components/AdminAdviserCompanyTableComponent.razor.cs rename to Wonky.Client/Components/AdminAdvisorCompanyTableComponent.razor.cs index 8f6df369..60e12efd 100644 --- a/Wonky.Client/Components/AdminAdviserCompanyTableComponent.razor.cs +++ b/Wonky.Client/Components/AdminAdvisorCompanyTableComponent.razor.cs @@ -24,7 +24,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components { - public partial class AdminAdviserCompanyTableComponent + public partial class AdminAdvisorCompanyTableComponent { [Parameter] public List Companies { get; set; } = new(); [Parameter] public EventCallback OnDelete { get; set; } diff --git a/Wonky.Client/Components/AdminAdviserTableComponent.razor b/Wonky.Client/Components/AdminAdvisorTableComponent.razor similarity index 90% rename from Wonky.Client/Components/AdminAdviserTableComponent.razor rename to Wonky.Client/Components/AdminAdvisorTableComponent.razor index 8a5d94e1..d114b47f 100644 --- a/Wonky.Client/Components/AdminAdviserTableComponent.razor +++ b/Wonky.Client/Components/AdminAdvisorTableComponent.razor @@ -44,9 +44,9 @@ @user.FullName @user.PhoneNumber @user.Email - Rapporter - Kunder - Rediger + Rapporter + Kunder + Rediger } diff --git a/Wonky.Client/Components/AdminAdviserTableComponent.razor.cs b/Wonky.Client/Components/AdminAdvisorTableComponent.razor.cs similarity index 95% rename from Wonky.Client/Components/AdminAdviserTableComponent.razor.cs rename to Wonky.Client/Components/AdminAdvisorTableComponent.razor.cs index 8031c68c..7201198d 100644 --- a/Wonky.Client/Components/AdminAdviserTableComponent.razor.cs +++ b/Wonky.Client/Components/AdminAdvisorTableComponent.razor.cs @@ -19,7 +19,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class AdminAdviserTableComponent +public partial class AdminAdvisorTableComponent { [Parameter] public List UserList { get; set; } } \ No newline at end of file diff --git a/Wonky.Client/Components/AdminReportTableComponent.razor b/Wonky.Client/Components/AdminReportTableComponent.razor index 08ff6fcb..9594d82d 100644 --- a/Wonky.Client/Components/AdminReportTableComponent.razor +++ b/Wonky.Client/Components/AdminReportTableComponent.razor @@ -41,7 +41,7 @@ @foreach (var report in ReportList) { - +
@report.ReportDate diff --git a/Wonky.Client/Components/Home.razor b/Wonky.Client/Components/Home.razor index 5856c684..079b2633 100644 --- a/Wonky.Client/Components/Home.razor +++ b/Wonky.Client/Components/Home.razor @@ -19,7 +19,7 @@ @using Wonky.Client.Components Inno Web CRM - +
@@ -32,11 +32,16 @@
- +

Administrator

 + + +

Lager

+ +

Supervisor

 \ No newline at end of file diff --git a/Wonky.Client/Components/TopbarNavigation.razor b/Wonky.Client/Components/TopbarNavigation.razor index cff72bfb..8465c0a1 100644 --- a/Wonky.Client/Components/TopbarNavigation.razor +++ b/Wonky.Client/Components/TopbarNavigation.razor @@ -19,7 +19,7 @@
- LOG AF + LOG AF HJÆLP
diff --git a/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs b/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs index 61e1662d..c90494e3 100644 --- a/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs +++ b/Wonky.Client/HttpRepository/AdminReportHttpRepository.cs @@ -47,12 +47,12 @@ public class AdminReportHttpRepository : IAdminReportHttpRepository public async Task> GetReports(string userId) { - return await _client.GetFromJsonAsync>($"{_apiConfig.AdminAdviserUri}/{userId}/reports"); + return await _client.GetFromJsonAsync>($"{_apiConfig.AdminAdvisorUri}/{userId}/reports"); } public async Task GetReport(string userId, string workDate) { - return await _client.GetFromJsonAsync($"{_apiConfig.AdminAdviserUri}/{userId}/reports/{workDate}"); + return await _client.GetFromJsonAsync($"{_apiConfig.AdminAdvisorUri}/{userId}/reports/{workDate}"); } } \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/CompanyHttpRepository.cs b/Wonky.Client/HttpRepository/CompanyHttpRepository.cs index 71334c7a..66cd3a81 100644 --- a/Wonky.Client/HttpRepository/CompanyHttpRepository.cs +++ b/Wonky.Client/HttpRepository/CompanyHttpRepository.cs @@ -80,7 +80,7 @@ public class CompanyHttpRepository : ICompanyHttpRepository return pagingResponse; } - public async Task> GetAdminAdviserCompaniesPaged(string userId, CompanyPagingParams pagingParameters) + public async Task> GetAdminAdvisorCompaniesPaged(string userId, CompanyPagingParams pagingParameters) { var queryString = new Dictionary { @@ -93,7 +93,7 @@ public class CompanyHttpRepository : ICompanyHttpRepository ["hasFolded"] = pagingParameters.HasFolded.ToString() }; var response = await _client - .GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.AdminAdviserUri}/{userId}/companies", queryString)); + .GetAsync(QueryHelpers.AddQueryString($"{_apiConfig.AdminAdvisorUri}/{userId}/companies", queryString)); var content = await response.Content.ReadAsStringAsync(); diff --git a/Wonky.Client/HttpRepository/ICompanyHttpRepository.cs b/Wonky.Client/HttpRepository/ICompanyHttpRepository.cs index 8ec4dce6..4c470582 100644 --- a/Wonky.Client/HttpRepository/ICompanyHttpRepository.cs +++ b/Wonky.Client/HttpRepository/ICompanyHttpRepository.cs @@ -24,7 +24,7 @@ namespace Wonky.Client.HttpRepository; public interface ICompanyHttpRepository { Task> GetCompaniesPaged(CompanyPagingParams pagingParameters); - Task> GetAdminAdviserCompaniesPaged(string userId, CompanyPagingParams pagingParameters); + Task> GetAdminAdvisorCompaniesPaged(string userId, CompanyPagingParams pagingParameters); Task GetCompanyByAccount(string accountNumber); Task GetCompanyById(string companyId); Task CreateCompany(CompanyDto model); diff --git a/Wonky.Client/HttpRepository/IUserHttpRepository.cs b/Wonky.Client/HttpRepository/IUserHttpRepository.cs index 39fd1a73..09e4f751 100644 --- a/Wonky.Client/HttpRepository/IUserHttpRepository.cs +++ b/Wonky.Client/HttpRepository/IUserHttpRepository.cs @@ -20,9 +20,9 @@ namespace Wonky.Client.HttpRepository; public interface IUserHttpRepository { - Task> GetAdvisers(); - Task GetAdviserInfo(string userId); - Task UpdateAdviser(string userId, UserUpdateDto model); + Task> GetAdvisors(); + Task GetAdvisorInfo(string userId); + Task UpdateAdvisor(string userId, UserUpdateDto model); Task> GetAdminUsers(); Task GetAdminUserInfo(string userId); Task UpdateAdminUser(string userId, UserUpdateDto model); diff --git a/Wonky.Client/HttpRepository/IWarehouseHttpRepository.cs b/Wonky.Client/HttpRepository/IWarehouseHttpRepository.cs new file mode 100644 index 00000000..5bf71848 --- /dev/null +++ b/Wonky.Client/HttpRepository/IWarehouseHttpRepository.cs @@ -0,0 +1,10 @@ +using Wonky.Entity.Views; + +namespace Wonky.Client.HttpRepository; + +public interface IWarehouseHttpRepository +{ + Task> GetWarehouseOrderListByStatus(string status); + Task GetWarehouseOrder(string orderId); + Task UpdateWarehouseOrderStatus(WarehouseProcess process); +} \ No newline at end of file diff --git a/Wonky.Client/HttpRepository/UserHttpRepository.cs b/Wonky.Client/HttpRepository/UserHttpRepository.cs index 79cde89a..7d9bc78a 100644 --- a/Wonky.Client/HttpRepository/UserHttpRepository.cs +++ b/Wonky.Client/HttpRepository/UserHttpRepository.cs @@ -47,19 +47,19 @@ public class UserHttpRepository : IUserHttpRepository _api = configuration.Value; } - public async Task> GetAdvisers() + public async Task> GetAdvisors() { - return await _client.GetFromJsonAsync>(_api.AdminAdviserUri); + return await _client.GetFromJsonAsync>(_api.AdminAdvisorUri); } - public async Task GetAdviserInfo(string userId) + public async Task GetAdvisorInfo(string userId) { - return await _client.GetFromJsonAsync($"{_api.AdminAdviserUri}/{userId}"); + return await _client.GetFromJsonAsync($"{_api.AdminAdvisorUri}/{userId}"); } - public async Task UpdateAdviser(string userId, UserUpdateDto model) + public async Task UpdateAdvisor(string userId, UserUpdateDto model) { - await _client.PutAsJsonAsync($"{_api.AdminAdviserUri}/{userId}", model, _options); + await _client.PutAsJsonAsync($"{_api.AdminAdvisorUri}/{userId}", model, _options); } public async Task> GetAdminUsers() diff --git a/Wonky.Client/HttpRepository/WarehouseHttpRepository.cs b/Wonky.Client/HttpRepository/WarehouseHttpRepository.cs new file mode 100644 index 00000000..24b10fd2 --- /dev/null +++ b/Wonky.Client/HttpRepository/WarehouseHttpRepository.cs @@ -0,0 +1,52 @@ +using System.Net.Http.Json; +using System.Text.Json; +using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Options; +using Wonky.Entity.Configuration; +using Wonky.Entity.Views; + +namespace Wonky.Client.HttpRepository; + +public class WarehouseHttpRepository : IWarehouseHttpRepository +{ + private readonly JsonSerializerOptions? _options = new JsonSerializerOptions + { + PropertyNameCaseInsensitive = true + }; + + private readonly NavigationManager _navigation; + private ILogger _logger; + private readonly HttpClient _client; + private readonly ApiConfig _api; + + public WarehouseHttpRepository(HttpClient client, + ILogger logger, + NavigationManager navigation, + IOptions configuration) + { + _client = client; + _logger = logger; + _navigation = navigation; + _api = configuration.Value; + } + + public async Task> GetWarehouseOrderListByDate(string date) + { + return await _client.GetFromJsonAsync>($"{_api.WarehouseUri}?date={date}", _options); + } + + public async Task> GetWarehouseOrderListByStatus(string status) + { + return await _client.GetFromJsonAsync>($"{_api.WarehouseUri}?status={status}", _options); + } + + public async Task GetWarehouseOrder(string orderId) + { + return await _client.GetFromJsonAsync($"{_api.WarehouseUri}/{orderId}", _options); + } + public async Task UpdateWarehouseOrderStatus(WarehouseProcess process) + { + _logger.LogDebug("process => {}", JsonSerializer.Serialize(process)); + await _client.PutAsJsonAsync($"{_api.WarehouseUri}/{process.OrderId}", process, _options); + } +} \ No newline at end of file diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor b/Wonky.Client/Pages/ActivityNewVisitPage.razor index 24304afa..910328a7 100644 --- a/Wonky.Client/Pages/ActivityNewVisitPage.razor +++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor @@ -17,7 +17,7 @@ @page "/companies/{companyId}/activities/new" @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")] @using Wonky.Client.Components
diff --git a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs index 642b42cd..47d303ed 100644 --- a/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs +++ b/Wonky.Client/Pages/ActivityNewVisitPage.razor.cs @@ -126,7 +126,7 @@ public partial class ActivityNewVisitPage : IDisposable _draft.VisitTypeEnum = _company.Account is "" or "NY" ? "new" : "recall"; // permanent identifications - _draft.SalesRep = _ux.Adviser; + _draft.SalesRep = _ux.Advisor; _draft.Account = _company.Account; _draft.VatNumber = _company.VatNumber; _draft.Email = _company.Email; diff --git a/Wonky.Client/Pages/ActivityTodayListPage.razor b/Wonky.Client/Pages/ActivityTodayListPage.razor index 3ea1aaea..b0dcf61a 100644 --- a/Wonky.Client/Pages/ActivityTodayListPage.razor +++ b/Wonky.Client/Pages/ActivityTodayListPage.razor @@ -17,7 +17,7 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")] @page "/activity-today"
diff --git a/Wonky.Client/Pages/AdminAdviserCompanyListPage.razor b/Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor similarity index 97% rename from Wonky.Client/Pages/AdminAdviserCompanyListPage.razor rename to Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor index 0295441c..8b2dab35 100644 --- a/Wonky.Client/Pages/AdminAdviserCompanyListPage.razor +++ b/Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor @@ -16,7 +16,7 @@ *@ @using Wonky.Client.Components -@page "/admin/users/advisers/{CountryCode}/{UserId}/companies" +@page "/admin/users/Advisors/{CountryCode}/{UserId}/companies"
diff --git a/Wonky.Client/Pages/AdminAdviserCompanyListPage.razor.cs b/Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/AdminAdviserCompanyListPage.razor.cs rename to Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor.cs index 4e2f9efe..19387624 100644 --- a/Wonky.Client/Pages/AdminAdviserCompanyListPage.razor.cs +++ b/Wonky.Client/Pages/AdminAdvisorCompanyListPage.razor.cs @@ -23,7 +23,7 @@ using Wonky.Entity.Requests; namespace Wonky.Client.Pages; -public partial class AdminAdviserCompanyListPage : IDisposable +public partial class AdminAdvisorCompanyListPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; @@ -55,14 +55,14 @@ public partial class AdminAdviserCompanyListPage : IDisposable _interceptor.RegisterEvent(); _interceptor.RegisterBeforeSendEvent(); - AdminUserInfo = await _userRepo.GetAdviserInfo(UserId); + AdminUserInfo = await _userRepo.GetAdvisorInfo(UserId); // get companies await GetCompanies(); } private async Task GetCompanies() { - var pagingResponse = await _companyRepo.GetAdminAdviserCompaniesPaged(UserId, _paging); + var pagingResponse = await _companyRepo.GetAdminAdvisorCompaniesPaged(UserId, _paging); _companyList = pagingResponse.Items; _metaData = pagingResponse.MetaData; } diff --git a/Wonky.Client/Pages/AdminAdviserUserListPage.razor b/Wonky.Client/Pages/AdminAdvisorUserListPage.razor similarity index 88% rename from Wonky.Client/Pages/AdminAdviserUserListPage.razor rename to Wonky.Client/Pages/AdminAdvisorUserListPage.razor index 8e40881f..8ad7bb71 100644 --- a/Wonky.Client/Pages/AdminAdviserUserListPage.razor +++ b/Wonky.Client/Pages/AdminAdvisorUserListPage.razor @@ -18,13 +18,13 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin")] -@page "/admin/users/advisers/{CountryCode}" +@page "/admin/users/Advisors/{CountryCode}"

Sælgere

- +
\ No newline at end of file diff --git a/Wonky.Client/Pages/AdminAdviserUserListPage.razor.cs b/Wonky.Client/Pages/AdminAdvisorUserListPage.razor.cs similarity index 91% rename from Wonky.Client/Pages/AdminAdviserUserListPage.razor.cs rename to Wonky.Client/Pages/AdminAdvisorUserListPage.razor.cs index 624b5e10..83b52ce6 100644 --- a/Wonky.Client/Pages/AdminAdviserUserListPage.razor.cs +++ b/Wonky.Client/Pages/AdminAdvisorUserListPage.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class AdminAdviserUserListPage : IDisposable +public partial class AdminAdvisorUserListPage : IDisposable { [Parameter] public string CountryCode { get; set; } = ""; [Inject] private HttpInterceptorService _interceptor { get; set; } @@ -33,8 +33,8 @@ public partial class AdminAdviserUserListPage : IDisposable { _interceptor.RegisterEvent(); _interceptor.RegisterBeforeSendEvent(); - var adviserList = await _userRepo.GetAdvisers(); - _salesReps = adviserList + var AdvisorList = await _userRepo.GetAdvisors(); + _salesReps = AdvisorList .Where(x => x.CountryCode.ToLower() == CountryCode && Convert.ToInt32(x.SalesRep) < 100) .ToList(); } diff --git a/Wonky.Client/Pages/AdminAdviserViewPage.razor b/Wonky.Client/Pages/AdminAdvisorViewPage.razor similarity index 96% rename from Wonky.Client/Pages/AdminAdviserViewPage.razor rename to Wonky.Client/Pages/AdminAdvisorViewPage.razor index 1d831a8a..e92ce6b5 100644 --- a/Wonky.Client/Pages/AdminAdviserViewPage.razor +++ b/Wonky.Client/Pages/AdminAdvisorViewPage.razor @@ -15,7 +15,7 @@ // *@ -@page "/admin/users/advisers/{CountryCode}/{UserId}/view" +@page "/admin/users/Advisors/{CountryCode}/{UserId}/view" @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin")] @@ -26,7 +26,7 @@
@if (AdminUserInfo != null) { - +
@@ -69,7 +69,7 @@ Sælgernr. - @AdminUserInfo.Adviser + @AdminUserInfo.Advisor Landekode @@ -96,10 +96,10 @@
- Tilbage + Tilbage
- Salg + Salg
diff --git a/Wonky.Client/Pages/AdminAdviserViewPage.razor.cs b/Wonky.Client/Pages/AdminAdvisorViewPage.razor.cs similarity index 93% rename from Wonky.Client/Pages/AdminAdviserViewPage.razor.cs rename to Wonky.Client/Pages/AdminAdvisorViewPage.razor.cs index abb92908..825c351d 100644 --- a/Wonky.Client/Pages/AdminAdviserViewPage.razor.cs +++ b/Wonky.Client/Pages/AdminAdvisorViewPage.razor.cs @@ -24,13 +24,13 @@ using Wonky.Entity.DTO; namespace Wonky.Client.Pages; -public partial class AdminAdviserViewPage : IDisposable +public partial class AdminAdvisorViewPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; [Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private IUserHttpRepository _userRepo { get; set; } - [Inject] private ILogger _logger { get; set; } + [Inject] private ILogger _logger { get; set; } [Inject] private NavigationManager _navigator { get; set; } [Inject] private IToastService _toast { get; set; } private AdminUserInfoDto AdminUserInfo { get; set; } = new(); @@ -53,7 +53,7 @@ public partial class AdminAdviserViewPage : IDisposable _interceptor.RegisterEvent(); _interceptor.RegisterBeforeSendEvent(); - AdminUserInfo = await _userRepo.GetAdviserInfo(UserId); + AdminUserInfo = await _userRepo.GetAdvisorInfo(UserId); _updateInfo.Email = AdminUserInfo.Email; _updateInfo.CountryCode = AdminUserInfo.CountryCode; @@ -67,10 +67,10 @@ public partial class AdminAdviserViewPage : IDisposable } - private async Task UpdateAdviser() + private async Task UpdateAdvisor() { _toast.ShowInfo("Sender data til server ..."); - await _userRepo.UpdateAdviser(UserId, _updateInfo); + await _userRepo.UpdateAdvisor(UserId, _updateInfo); } private void PwHandleFieldChanged(object sender, FieldChangedEventArgs e) diff --git a/Wonky.Client/Pages/AdminOfficeUserListPage.razor.cs b/Wonky.Client/Pages/AdminOfficeUserListPage.razor.cs index 7de7cc3d..5a8e4468 100644 --- a/Wonky.Client/Pages/AdminOfficeUserListPage.razor.cs +++ b/Wonky.Client/Pages/AdminOfficeUserListPage.razor.cs @@ -33,8 +33,8 @@ public partial class AdminOfficeUserListPage : IDisposable { _interceptor.RegisterEvent(); _interceptor.RegisterBeforeSendEvent(); - var adviserList = await _userRepo.GetAdminUsers(); - _adminUsers = adviserList + var AdvisorList = await _userRepo.GetAdminUsers(); + _adminUsers = AdvisorList .Where(x => x.CountryCode.ToLower() == CountryCode) .ToList(); } diff --git a/Wonky.Client/Pages/AdminOfficeUserViewPage.razor.cs b/Wonky.Client/Pages/AdminOfficeUserViewPage.razor.cs index fe741b2d..b415cb99 100644 --- a/Wonky.Client/Pages/AdminOfficeUserViewPage.razor.cs +++ b/Wonky.Client/Pages/AdminOfficeUserViewPage.razor.cs @@ -30,7 +30,7 @@ public partial class AdminOfficeUserViewPage : IDisposable [Parameter] public string CountryCode { get; set; } = ""; [Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private IUserHttpRepository _userRepo { get; set; } - [Inject] private ILogger _logger { get; set; } + [Inject] private ILogger _logger { get; set; } [Inject] private NavigationManager _navigator { get; set; } [Inject] private IToastService _toast { get; set; } private AdminUserInfoDto AdminUserInfo { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdminReportListPage.razor b/Wonky.Client/Pages/AdminReportListPage.razor index 83a35011..f26d4841 100644 --- a/Wonky.Client/Pages/AdminReportListPage.razor +++ b/Wonky.Client/Pages/AdminReportListPage.razor @@ -18,7 +18,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin")] -@page "/admin/users/advisers/{CountryCode}/{UserId}/reports" +@page "/admin/users/Advisors/{CountryCode}/{UserId}/reports"
diff --git a/Wonky.Client/Pages/AdminReportViewPage.razor b/Wonky.Client/Pages/AdminReportViewPage.razor index 5a137b96..fa7064e8 100644 --- a/Wonky.Client/Pages/AdminReportViewPage.razor +++ b/Wonky.Client/Pages/AdminReportViewPage.razor @@ -17,7 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@page "/admin/users/advisers/{CountryCode}/{UserId}/reports/{ReportDate}" +@page "/admin/users/Advisors/{CountryCode}/{UserId}/reports/{ReportDate}" @attribute [Authorize(Roles = "Admin")]
diff --git a/Wonky.Client/Pages/AdminReportViewPage.razor.cs b/Wonky.Client/Pages/AdminReportViewPage.razor.cs index 287e0cfe..73f3c20b 100644 --- a/Wonky.Client/Pages/AdminReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdminReportViewPage.razor.cs @@ -72,7 +72,7 @@ public partial class AdminReportViewPage : IDisposable { if (workDate != ReportDate) { - _navigator.NavigateTo($"/admin/users/advisers/{CountryCode}/{UserId}/reports/{workDate}"); + _navigator.NavigateTo($"/admin/users/Advisors/{CountryCode}/{UserId}/reports/{workDate}"); return; } diff --git a/Wonky.Client/Pages/AdviserReportListPage.razor b/Wonky.Client/Pages/AdvisorReportListPage.razor similarity index 100% rename from Wonky.Client/Pages/AdviserReportListPage.razor rename to Wonky.Client/Pages/AdvisorReportListPage.razor diff --git a/Wonky.Client/Pages/AdviserReportListPage.razor.cs b/Wonky.Client/Pages/AdvisorReportListPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/AdviserReportListPage.razor.cs rename to Wonky.Client/Pages/AdvisorReportListPage.razor.cs index bd7ead1a..a776168e 100644 --- a/Wonky.Client/Pages/AdviserReportListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportListPage.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class AdviserReportListPage : IDisposable +public partial class AdvisorReportListPage : IDisposable { [Inject] private IReportHttpRepository _reportRepo { get; set; } [Inject] private HttpInterceptorService _interceptor { get; set; } diff --git a/Wonky.Client/Pages/AdviserReportNewPage.razor b/Wonky.Client/Pages/AdvisorReportNewPage.razor similarity index 99% rename from Wonky.Client/Pages/AdviserReportNewPage.razor rename to Wonky.Client/Pages/AdvisorReportNewPage.razor index 7866c05d..33404b86 100644 --- a/Wonky.Client/Pages/AdviserReportNewPage.razor +++ b/Wonky.Client/Pages/AdvisorReportNewPage.razor @@ -17,7 +17,7 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")] @page "/sales-reports/new" diff --git a/Wonky.Client/Pages/AdviserReportNewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportNewPage.razor.cs similarity index 98% rename from Wonky.Client/Pages/AdviserReportNewPage.razor.cs rename to Wonky.Client/Pages/AdvisorReportNewPage.razor.cs index 50cbe4d2..6bc6d180 100644 --- a/Wonky.Client/Pages/AdviserReportNewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportNewPage.razor.cs @@ -29,14 +29,14 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class AdviserReportNewPage : IDisposable +public partial class AdvisorReportNewPage : IDisposable { [Inject] private HttpInterceptorService _interceptor { get; set; } [Inject] private UserPreferenceService _userPrefs { get; set; } [Inject] private IActivityHttpRepository _activityRepo { get; set; } [Inject] private IReportHttpRepository _reportRepo { get; set; } [Inject] private NavigationManager _navigator { get; set; } - [Inject] private ILogger _logger { get; set; } + [Inject] private ILogger _logger { get; set; } [Inject] private IToastService _toast { get; set; } private EditContext _editContext { get; set; } private ReportDto _report { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdviserReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor similarity index 97% rename from Wonky.Client/Pages/AdviserReportViewPage.razor rename to Wonky.Client/Pages/AdvisorReportViewPage.razor index 3ce15711..958d47ce 100644 --- a/Wonky.Client/Pages/AdviserReportViewPage.razor +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor @@ -18,7 +18,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @page "/sales-reports/view/{ReportDate}" -@attribute [Authorize(Roles = "Adviser,Admin,Supervisor")] +@attribute [Authorize(Roles = "Advisor,Admin,Supervisor")]
diff --git a/Wonky.Client/Pages/AdviserReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs similarity index 97% rename from Wonky.Client/Pages/AdviserReportViewPage.razor.cs rename to Wonky.Client/Pages/AdvisorReportViewPage.razor.cs index 27fdaa8f..e8a4ba72 100644 --- a/Wonky.Client/Pages/AdviserReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs @@ -20,7 +20,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class AdviserReportViewPage +public partial class AdvisorReportViewPage { [Parameter] public string ReportDate { get; set; } [Inject] private IReportHttpRepository _reportRepo { get; set; } diff --git a/Wonky.Client/Pages/CustomerListPage.razor b/Wonky.Client/Pages/CustomerListPage.razor index 5cee3df0..fd4bdd7c 100644 --- a/Wonky.Client/Pages/CustomerListPage.razor +++ b/Wonky.Client/Pages/CustomerListPage.razor @@ -19,7 +19,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")]
diff --git a/Wonky.Client/Pages/CustomerNewPage.razor b/Wonky.Client/Pages/CustomerNewPage.razor index e0793d51..e50d8348 100644 --- a/Wonky.Client/Pages/CustomerNewPage.razor +++ b/Wonky.Client/Pages/CustomerNewPage.razor @@ -19,7 +19,7 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components @using System.Xml -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")]

Opret kunde

diff --git a/Wonky.Client/Pages/CustomerViewPage.razor b/Wonky.Client/Pages/CustomerViewPage.razor index 1f668b0f..f1aa6fdb 100644 --- a/Wonky.Client/Pages/CustomerViewPage.razor +++ b/Wonky.Client/Pages/CustomerViewPage.razor @@ -19,7 +19,7 @@ @using Microsoft.AspNetCore.Components @using Wonky.Client.Components @using Wonky.Client.Helpers -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")] @page "/companies/{CompanyId}" @if (!string.IsNullOrWhiteSpace(_company.Name)) diff --git a/Wonky.Client/Pages/HelpPage.razor b/Wonky.Client/Pages/HelpPage.razor index 62716294..df8ff86b 100644 --- a/Wonky.Client/Pages/HelpPage.razor +++ b/Wonky.Client/Pages/HelpPage.razor @@ -21,7 +21,7 @@ @using Microsoft.AspNetCore.Authorization @page "/info" -@attribute [Authorize(Roles = "Adviser,Admin,Office,Warehouse")] +@attribute [Authorize(Roles = "Advisor,Admin,Office,Warehouse")]
Wonky Logo diff --git a/Wonky.Client/Pages/Index.razor b/Wonky.Client/Pages/Index.razor index 7fe69c47..ebe1efbe 100644 --- a/Wonky.Client/Pages/Index.razor +++ b/Wonky.Client/Pages/Index.razor @@ -21,7 +21,7 @@ @using Wonky.Client.Components; @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Adviser,Admin,Supervisor")] +@attribute [Authorize(Roles = "Advisor,Admin,Supervisor,Office,Warehouse")] diff --git a/Wonky.Client/Pages/ItemCatalogPage.razor b/Wonky.Client/Pages/ItemCatalogPage.razor index 1ecf48f5..986d7a0e 100644 --- a/Wonky.Client/Pages/ItemCatalogPage.razor +++ b/Wonky.Client/Pages/ItemCatalogPage.razor @@ -19,7 +19,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Adviser,Admin")] +@attribute [Authorize(Roles = "Advisor,Admin")]
diff --git a/Wonky.Client/Pages/KrvItemViewPage.razor b/Wonky.Client/Pages/KrvItemViewPage.razor index 0d3d0e2d..9603d279 100644 --- a/Wonky.Client/Pages/KrvItemViewPage.razor +++ b/Wonky.Client/Pages/KrvItemViewPage.razor @@ -17,7 +17,7 @@ @page "/sales-item/{salesItemId}" @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Adviser,Admin")] +@attribute [Authorize(Roles = "Advisor,Admin")]
diff --git a/Wonky.Client/Pages/LandingPageAdminAdvisers.razor b/Wonky.Client/Pages/LandingPageAdminAdvisers.razor index 09f8814f..1de98c6a 100644 --- a/Wonky.Client/Pages/LandingPageAdminAdvisers.razor +++ b/Wonky.Client/Pages/LandingPageAdminAdvisers.razor @@ -17,7 +17,7 @@ @using Microsoft.AspNetCore.Authorization @attribute [Authorize(Roles = "Admin")] -@page "/admin/users/advisers" +@page "/admin/users/Advisors"
@@ -27,9 +27,9 @@
- Danmark - Norge - Sverige + Danmark + Norge + Sverige
diff --git a/Wonky.Client/Pages/ProductHistoryItemPage.razor b/Wonky.Client/Pages/ProductHistoryItemPage.razor index dbbcf3ce..46ed8626 100644 --- a/Wonky.Client/Pages/ProductHistoryItemPage.razor +++ b/Wonky.Client/Pages/ProductHistoryItemPage.razor @@ -17,7 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")] @page "/companies/{CompanyId}/h/p/{Sku}"
diff --git a/Wonky.Client/Pages/ProductHistoryListPage.razor b/Wonky.Client/Pages/ProductHistoryListPage.razor index 641f74f5..a0641387 100644 --- a/Wonky.Client/Pages/ProductHistoryListPage.razor +++ b/Wonky.Client/Pages/ProductHistoryListPage.razor @@ -17,7 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")] @page "/companies/{CompanyId}/h/p"
diff --git a/Wonky.Client/Pages/ProductInventoryPage.razor b/Wonky.Client/Pages/ProductInventoryPage.razor index 079efe90..faa56e6c 100644 --- a/Wonky.Client/Pages/ProductInventoryPage.razor +++ b/Wonky.Client/Pages/ProductInventoryPage.razor @@ -18,7 +18,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization @page "/companies/{CompanyId}/h/i" -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")]
diff --git a/Wonky.Client/Pages/TaskItemListPage.razor b/Wonky.Client/Pages/TaskItemListPage.razor index ab2cc3e8..9d9dcc06 100644 --- a/Wonky.Client/Pages/TaskItemListPage.razor +++ b/Wonky.Client/Pages/TaskItemListPage.razor @@ -17,7 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Adviser")] +@attribute [Authorize(Roles = "Advisor")] @page "/task-items"
diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor b/Wonky.Client/Pages/WarehouseOrderListPage.razor new file mode 100644 index 00000000..c9e1f435 --- /dev/null +++ b/Wonky.Client/Pages/WarehouseOrderListPage.razor @@ -0,0 +1,78 @@ +@using Microsoft.AspNetCore.Authorization +@attribute [Authorize(Roles = "Admin,Warehouse,Office")] +@page "/warehouse/orders" + +
+
+
+ + + + + + + + +
+
+
+ @if (_readyToShip && _orders.Any()) + { + + } +
+
+@if (_orders.Any()) +{ +
+
+
+
+

Ordredato

+
+
+

Kundenavn

+
+
+

Postnr. Bynavn

+
+
+

Status

+
+
+
+ @foreach (var order in _orders) + { + +
+
+ @order.OrderDate +
+
+ @order.Company.Name +
+
+ @order.Company.ZipCode @order.Company.City +
+
+ @switch (order.ProcessStatusEnum.ToLower()) + { + case "none": + Ubehandlet + break; + case "picked": + Plukket + break; + case "packed": + Pakket + break; + case "shipped": + Afsendt + break; + } +
+
+ + } +
+} \ No newline at end of file diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs new file mode 100644 index 00000000..c9323677 --- /dev/null +++ b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs @@ -0,0 +1,66 @@ +using System.Text.Json; +using Microsoft.AspNetCore.Components; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpRepository; +using Wonky.Entity.Views; + +namespace Wonky.Client.Pages; + +public partial class WarehouseOrderListPage : IDisposable +{ + [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private IWarehouseHttpRepository _warehouseRepo { get; set; } + + private string _items { get; set; } + private bool _readyToShip; + + private List _orders { get; set; } + + protected override async Task OnInitializedAsync() + { + _interceptor.RegisterEvent(); + _interceptor.RegisterBeforeSendEvent(); + + await GetOrderStatusNone(); + + _items = JsonSerializer.Serialize(_orders); + } + + private async Task GetOrderStatusNone() + { + _orders = await _warehouseRepo.GetWarehouseOrderListByStatus("none"); + _readyToShip = false; + } + + private async Task GetOrderStatusPicked() + { + _orders = await _warehouseRepo.GetWarehouseOrderListByStatus("picked"); + _readyToShip = false; + } + + private async Task GetOrderStatusPacked() + { + _orders = await _warehouseRepo.GetWarehouseOrderListByStatus("packed"); + _readyToShip = true; + } + + private async Task SetProcessStatusShipped() + { + foreach (var order in _orders) + { + if (order.ProcessStatusEnum.ToLower() != "packed") continue; + var process = new WarehouseProcess + { + OrderId = order.OrderId, + ProcessStatusEnum = "shipped" + }; + await _warehouseRepo.UpdateWarehouseOrderStatus(process); + order.ProcessStatusEnum = "shipped"; + } + } + + public void Dispose() + { + _interceptor.DisposeEvent(); + } +} \ No newline at end of file diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor b/Wonky.Client/Pages/WarehouseOrderViewPage.razor new file mode 100644 index 00000000..781a6071 --- /dev/null +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor @@ -0,0 +1,103 @@ +@using Microsoft.AspNetCore.Authorization +@attribute [Authorize(Roles = "Admin,Warehouse,Office")] +@page "/warehouse/orders/{OrderId}" + +@if (!string.IsNullOrWhiteSpace(_order.OrderDate)) +{ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

@_order.Company.Name

+
Konto@_order.Company.AccountTelefon@_order.Company.Phone
Kunde@_order.Company.NameLev.Navn@_order.DlvName
Adresse@_order.Company.Address1Lev.Adresse@_order.DlvAddress1
Adresse@_order.Company.Address2Lev.Adresse@_order.DlvAddress2
Postnr By@_order.Company.ZipCode @_order.Company.CityLev.Postnr By@_order.DlvZipCity
+ + + + + + + + + + @foreach (var line in _order.Lines) + { + + + + + + } + +
AntalVarenrBeskrivelse
@line.Quantity@line.Sku +
+ + +
+
+ @if (!string.IsNullOrWhiteSpace(_order.OfficeNote)) + { +
+

@_order.OfficeNote

+
+ } +
+
+ Oversigt +
+
+
+
+ @if (_order.ProcessStatusEnum.ToLower() == "none") + { + + } + @if (_order.ProcessStatusEnum.ToLower() == "picked") + { + + } + @if (_order.ProcessStatusEnum.ToLower() == "packed") + { + + } +
+
+} +else +{ +
Ingen data
+} \ No newline at end of file diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs new file mode 100644 index 00000000..df54789d --- /dev/null +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs @@ -0,0 +1,61 @@ +using Microsoft.AspNetCore.Components; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpRepository; +using Wonky.Entity.Views; + +namespace Wonky.Client.Pages; + +public partial class WarehouseOrderViewPage : IDisposable +{ + [Parameter] public string OrderId { get; set; } = ""; + [Inject] private HttpInterceptorService _interceptor { get; set; } + [Inject] private IWarehouseHttpRepository _warehouseRepo { get; set; } + [Inject] private NavigationManager _navigator { get; set; } + + private WarehouseOrderView _order { get; set; } = new(); + + protected override async Task OnParametersSetAsync() + { + _interceptor.RegisterEvent(); + _interceptor.RegisterBeforeSendEvent(); + if (!string.IsNullOrWhiteSpace(OrderId)) + _order = await _warehouseRepo.GetWarehouseOrder(OrderId); + } + + private async Task SetProcessStatusPicked() + { + var process = new WarehouseProcess + { + OrderId = _order.OrderId, + ProcessStatusEnum = "picked" + }; + await _warehouseRepo.UpdateWarehouseOrderStatus(process); + _navigator.NavigateTo("/warehouse/orders"); + } + + private async Task SetProcessStatusPacked() + { + var process = new WarehouseProcess + { + OrderId = _order.OrderId, + ProcessStatusEnum = "packed" + }; + await _warehouseRepo.UpdateWarehouseOrderStatus(process); + _navigator.NavigateTo("/warehouse/orders"); + } + + private async Task SetProcessStatusShipped() + { + var process = new WarehouseProcess + { + OrderId = _order.OrderId, + ProcessStatusEnum = "shipped" + }; + await _warehouseRepo.UpdateWarehouseOrderStatus(process); + } + + public void Dispose() + { + _interceptor.DisposeEvent(); + } +} \ No newline at end of file diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs index e855c39e..1951cf7e 100644 --- a/Wonky.Client/Program.cs +++ b/Wonky.Client/Program.cs @@ -57,6 +57,7 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddBlazoredLocalStorage(); diff --git a/Wonky.Client/Shared/AuthStateProvider.cs b/Wonky.Client/Shared/AuthStateProvider.cs index e72be2ef..081323bd 100644 --- a/Wonky.Client/Shared/AuthStateProvider.cs +++ b/Wonky.Client/Shared/AuthStateProvider.cs @@ -102,14 +102,18 @@ namespace Wonky.Client.Shared var roles = new List(); if (userInfoView.IsAdmin) roles.Add("Admin"); - if (userInfoView.IsAdviser) - roles.Add("Adviser"); + if (userInfoView.IsAdvisor) + roles.Add("Advisor"); if (userInfoView.IsSupervisor) roles.Add("Supervisor"); if(userInfoView.IsEDoc) roles.Add("EDoc"); if (userInfoView.IsEShop) roles.Add("EShop"); + if (userInfoView.IsOffice) + roles.Add("Office"); + if (userInfoView.IsWareHouse) + roles.Add("Warehouse"); return roles; } } diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index 4175aeca..dad04b15 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -45,9 +45,18 @@
+ + +
+ + Ordrer + +
+ +
- + Sælgere
@@ -62,7 +71,8 @@
- + +
@@ -95,13 +105,6 @@ Hjælp
- -
- - Log af - -
- diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index e92047b4..01ea0a30 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.9.15", + "version": "0.9.17", "rc": true, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "innoBaseUrl": "https://dev.innotec.dk", + "innoBaseUrl": "https://staging.innotec.dk", "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=", "glsId": "", "virkUrl": "api/v2/services/virk", @@ -16,14 +16,14 @@ "tokenUri": "token", "userInfoUri": "api/auth/userinfo", "catalogUri": "api/v2/crm/catalog", - "activityUri": "api/v2/crm/advisers/sales", - "reportUri": "api/v2/crm/advisers/reports", - "taskUri": "api/v2/crm/advisers/tasks", + "activityUri": "api/v2/crm/Advisors/sales", + "reportUri": "api/v2/crm/Advisors/reports", + "taskUri": "api/v2/crm/Advisors/tasks", "companyUri": "api/v2/crm/companies", "inventoryUri": "history/inventory", "productUri": "history/products", "syncUri": "history/sync", - "adminAdviserUri": "api/v2/admin/users/advisers", + "adminAdvisorUri": "api/v2/admin/users/Advisors", "adminUserUri": "api/v2/admin/users/office", "adminPasswdUri": "api/v2/admin/users/passwd", "adminReportUri": "reports", diff --git a/Wonky.Entity/Configuration/ApiConfig.cs b/Wonky.Entity/Configuration/ApiConfig.cs index 46cc84e5..d15ba241 100644 --- a/Wonky.Entity/Configuration/ApiConfig.cs +++ b/Wonky.Entity/Configuration/ApiConfig.cs @@ -99,7 +99,7 @@ public class ApiConfig /// /// Application uri for administration of sales representatives /// - public string AdminAdviserUri { get; set; } = ""; + public string AdminAdvisorUri { get; set; } = ""; /// /// Application uri for administration of administrative users @@ -111,7 +111,8 @@ public class ApiConfig /// public string AdminPasswdUri { get; set; } = ""; - + public string WarehouseUri { get; set; } = ""; + // public string KrvVariantsUri { get; set; } = ""; // public string KrvProductsUri { get; set; } = ""; // public string ImageUploadUri { get; set; } = ""; diff --git a/Wonky.Entity/DTO/AdminUserInfoDto.cs b/Wonky.Entity/DTO/AdminUserInfoDto.cs index f8fb13b5..79988b22 100644 --- a/Wonky.Entity/DTO/AdminUserInfoDto.cs +++ b/Wonky.Entity/DTO/AdminUserInfoDto.cs @@ -58,7 +58,7 @@ public class AdminUserInfoDto /// [Required(ErrorMessage = "Sælger identifikation skal angives.")] [MaxLength(50,ErrorMessage = "Der kan højst bruges 20 tegn.")] - public string Adviser { get; set; } = ""; + public string Advisor { get; set; } = ""; /// /// Country name @@ -76,9 +76,9 @@ public class AdminUserInfoDto public bool EmailConfirmed { get; set; } /// - /// Adviser flag + /// Advisor flag /// - public bool IsAdviser { get; set; } + public bool IsAdvisor { get; set; } /// /// Admin flag diff --git a/Wonky.Entity/Views/ReportItemLine.cs b/Wonky.Entity/Views/ReportItemLine.cs index d6f82f31..c9bf4cfb 100644 --- a/Wonky.Entity/Views/ReportItemLine.cs +++ b/Wonky.Entity/Views/ReportItemLine.cs @@ -38,7 +38,15 @@ public class ReportItemLine /// public decimal Price { get; set; } /// + /// Line number + /// + public int LineNumber { get; set; } + /// /// Line sum /// public decimal LineSum { get; set; } + /// + /// Flag line as picked + /// + public bool Checked { get; set; } } \ No newline at end of file diff --git a/Wonky.Entity/Views/UserInfoView.cs b/Wonky.Entity/Views/UserInfoView.cs index 46fa0017..f953c3c7 100644 --- a/Wonky.Entity/Views/UserInfoView.cs +++ b/Wonky.Entity/Views/UserInfoView.cs @@ -20,7 +20,7 @@ namespace Wonky.Entity.Views; public class UserInfoView { [JsonPropertyName("id")] public string Id { get; set; } = ""; - [JsonPropertyName("adviser")] public string Adviser { get; set; } = ""; + [JsonPropertyName("Advisor")] public string Advisor { get; set; } = ""; [JsonPropertyName("companyId")] public string CrmCompanyKey { get; set; } = ""; [JsonPropertyName("countryCode")] public string CountryCode { get; set; } = ""; [JsonPropertyName("countryName")] public string CountryName { get; set; } = ""; @@ -28,8 +28,10 @@ public class UserInfoView [JsonPropertyName("fullName")] public string FullName { get; set; } = ""; [JsonPropertyName("phoneNumber")] public string PhoneNumber { get; set; } = ""; [JsonPropertyName("isAdmin")] public bool IsAdmin { get; set; } - [JsonPropertyName("isAdviser")] public bool IsAdviser { get; set; } + [JsonPropertyName("isAdvisor")] public bool IsAdvisor { get; set; } [JsonPropertyName("isEDoc")] public bool IsEDoc { get; set; } [JsonPropertyName("isEShop")] public bool IsEShop { get; set; } + [JsonPropertyName("isOffice")] public bool IsOffice { get; set; } + [JsonPropertyName("isWarehouse")] public bool IsWareHouse { get; set; } [JsonPropertyName("isSupervisor")] public bool IsSupervisor { get; set; } } \ No newline at end of file diff --git a/Wonky.Entity/Views/WarehouseOrderView.cs b/Wonky.Entity/Views/WarehouseOrderView.cs new file mode 100644 index 00000000..0560ade1 --- /dev/null +++ b/Wonky.Entity/Views/WarehouseOrderView.cs @@ -0,0 +1,46 @@ +namespace Wonky.Entity.Views; + +public class WarehouseOrderView +{ + /// + /// Customer company info + /// + public ReportItemCustomer Company { get; set; } = new(); + /// + /// Lines + /// + public List Lines { get; set; } = new(); + + /// + /// Entity id (reference to SalesHeadId) + /// + public string OrderId { get; set; } = ""; + /// + /// Order date + /// + public string OrderDate { get; set; } = ""; + /// + /// Office note + /// + public string OfficeNote { get; set; } = ""; + /// + /// Customer deliver name + /// + public string DlvName { get; set; } = ""; + /// + /// Customer delivery address line 1 + /// + public string DlvAddress1 { get; set; } = ""; + /// + /// Customer delivery address line 2 + /// + public string DlvAddress2 { get; set; } = ""; + /// + /// Customer delivery post code and city name + /// + public string DlvZipCity { get; set; } = ""; + /// + /// Current process status + /// + public string ProcessStatusEnum { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Entity/Views/WarehouseProcess.cs b/Wonky.Entity/Views/WarehouseProcess.cs new file mode 100644 index 00000000..c6f8551b --- /dev/null +++ b/Wonky.Entity/Views/WarehouseProcess.cs @@ -0,0 +1,14 @@ +namespace Wonky.Entity.Views; + +public class WarehouseProcess +{ + /// + /// Entity id + /// + public string OrderId { get; set; } = ""; + + /// + /// Process status enum as string + /// + public string ProcessStatusEnum { get; set; } = ""; +} \ No newline at end of file