root/Wonky.Client
root/Wonky.Client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

working new models for product detail view and refactor to fit

Browse source
This commit is contained in:
Frede Hundewadt 2023-08-04 13:34:46 +02:00
parent 14d6175c24
commit ec971c0b00
22 changed files with 174 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Wonky.Client/Components/CustomerInventoryListComponent.razor
View file

@ -84,7 +84,10 @@
</div> </div>
</div> </div>
<div class="col-sm-2"> <div class="col-sm-2">
@product.Description <div class="d-grid mx-auto">
<a class="btn btn-outline-secondary" href="/catalog/item/@product.SalesItemId" >Produkt Info @product.Description</a>
</div>
</div> </div>
<div class="col-sm-2 text-sm-start"> <div class="col-sm-2 text-sm-start">
<a class="btn btn-outline-secondary" href="@(_config.AssetUrl)/Home/DownloadLabelNumber?filename=@(product.VendorItemNo).lbx"> <a class="btn btn-outline-secondary" href="@(_config.AssetUrl)/Home/DownloadLabelNumber?filename=@(product.VendorItemNo).lbx">

12
Wonky.Client/Components/ProductPriceListComponent.razor
View file

@ -36,16 +36,10 @@
onerror="this.onerror=null;this.src='@(_config.AssetUrl)/images/no-image.png?height=100'" onerror="this.onerror=null;this.src='@(_config.AssetUrl)/images/no-image.png?height=100'"
alt="@salesItem.Name"/> alt="@salesItem.Name"/>
</td> </td>
<td class="align-middle"> <td class="align-middle">@salesItem.Name</td>
@salesItem.Name
</td>
<td class="align-middle">@salesItem.ShortName</td> <td class="align-middle">@salesItem.ShortName</td>
<td class="align-middle"> <td class="align-middle">@salesItem.Sku</td>
@salesItem.Sku <td class="align-middle">@salesItem.BoxSize</td>
</td>
<td class="align-middle">
@salesItem.BoxSize
</td>
<td class="align-middle"> <td class="align-middle">
<ul class="list-group"> <ul class="list-group">
@foreach (var rate in salesItem.Rates) @foreach (var rate in salesItem.Rates)

10
Wonky.Client/Components/ProductPriceListComponent.razor.cs
View file

@ -24,10 +24,16 @@ namespace Wonky.Client.Components;
public partial class ProductPriceListComponent public partial class ProductPriceListComponent
{ {
[Parameter] public List<SalesItemView> ItemList { get; set; } = new(); // ##############################################################
[Inject] public IToastService ToastService { get; set; }
[Inject] private IOptions<ApiConfig> Config { get; set; } [Inject] private IOptions<ApiConfig> Config { get; set; }
// ##############################################################
[Parameter] public List<SalesItemView> ItemList { get; set; } = new();
// ##############################################################
private ApiConfig _config = new(); private ApiConfig _config = new();
protected override void OnInitialized() protected override void OnInitialized()
{ {
_config = Config.Value; _config = Config.Value;

62
Wonky.Client/HttpRepository/CountryCatalogRepository.cs
View file

@ -48,6 +48,20 @@ public class CountryCatalogRepository : ICountryCatalogRepository
_api = configuration.Value; _api = configuration.Value;
} }
/// <summary>
/// Complete catalog for print country
/// </summary>
/// <param name="countryCode"></param>
/// <returns></returns>
public async Task<List<SalesItemView>> GetPriceList(string countryCode)
{
var result = await _client.GetFromJsonAsync<List<SalesItemView>>(
$"{_api.Catalog}/{countryCode}", _options);
return result ?? new List<SalesItemView>();
}
/// <summary> /// <summary>
/// Get a paged sales item list /// Get a paged sales item list
/// </summary> /// </summary>
@ -89,19 +103,6 @@ public class CountryCatalogRepository : ICountryCatalogRepository
} }
/// <summary>
/// Get sales item by id
/// </summary>
/// <param name="countryCode"></param>
/// <param name="salesItemId"></param>
/// <returns></returns>
public async Task<SalesItemView> GetSalesItemId(string countryCode, string salesItemId)
{
var salesItem = await _client
.GetFromJsonAsync<SalesItemView>($"{_api.Catalog}/{countryCode}/{salesItemId}");
return salesItem ?? new SalesItemView();
}
/// <summary> /// <summary>
/// Overload Get sales item by sku and country code /// Overload Get sales item by sku and country code
/// </summary> /// </summary>
@ -114,28 +115,29 @@ public class CountryCatalogRepository : ICountryCatalogRepository
return salesItem ?? new SalesItemView(); return salesItem ?? new SalesItemView();
} }
/// <summary>
/// Get sales item by id
/// </summary>
/// <param name="salesItemId"></param>
/// <returns></returns>
public async Task<ProductDetailView> GetProductDetailView(string salesItemId)
{
var detailView = await _client
.GetFromJsonAsync<ProductDetailView>($"{_api.Catalog}/{salesItemId}");
return detailView ?? new ProductDetailView();
}
/// <summary> /// <summary>
/// Get sales item by variant id /// Get sales item by variant id
/// </summary> /// </summary>
/// <param name="countryCode"></param>
/// <param name="variantId"></param> /// <param name="variantId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<SalesItemView> GetSalesVariantId(string countryCode, string variantId) public async Task<ProductDetailView> GetVariantDetailView(string variantId)
{ {
var salesItem = await _client var detailView = await _client
.GetFromJsonAsync<SalesItemView>($"{_api.Catalog}/{countryCode}/variant/{variantId}"); .GetFromJsonAsync<ProductDetailView>($"{_api.Catalog}/variant/{variantId}");
return salesItem ?? new SalesItemView(); return detailView ?? new ProductDetailView();
}
/// <summary>
/// Complete catalog for print country
/// </summary>
/// <param name="countryCode"></param>
/// <returns></returns>
public async Task<List<SalesItemView>> GetPriceList(string countryCode)
{
var result = await _client.GetFromJsonAsync<List<SalesItemView>>(
$"{_api.Catalog}/{countryCode}", _options);
return result ?? new List<SalesItemView>();
} }
} }

36
Wonky.Client/HttpRepository/ICountryCatalogRepository.cs
View file

@ -24,6 +24,14 @@ namespace Wonky.Client.HttpRepository;
/// </summary> /// </summary>
public interface ICountryCatalogRepository public interface ICountryCatalogRepository
{ {
/// <summary>
/// Complete catalog for print country
/// </summary>
/// <param name="countryCode"></param>
/// <returns></returns>
Task<List<SalesItemView>> GetPriceList(string countryCode);
/// <summary> /// <summary>
/// Get a paged sales item list /// Get a paged sales item list
/// </summary> /// </summary>
@ -32,14 +40,7 @@ public interface ICountryCatalogRepository
/// <returns></returns> /// <returns></returns>
Task<PagingResponse<SalesItemView>> GetSalesItemsPaged(string countryCode, CatalogPager pager); Task<PagingResponse<SalesItemView>> GetSalesItemsPaged(string countryCode, CatalogPager pager);
/// <summary>
/// Get sales item by id
/// </summary>
/// <param name="countryCode"></param>
/// <param name="salesItemId"></param>
/// <returns></returns>
Task<SalesItemView> GetSalesItemId(string countryCode, string salesItemId);
/// <summary> /// <summary>
/// Overload Get sales item by sku and country code /// Overload Get sales item by sku and country code
/// </summary> /// </summary>
@ -48,18 +49,19 @@ public interface ICountryCatalogRepository
/// <returns></returns> /// <returns></returns>
Task<SalesItemView> GetSalesItemSku(string countryCode, string sku); Task<SalesItemView> GetSalesItemSku(string countryCode, string sku);
/// <summary>
/// Get sales item by id
/// </summary>
/// <param name="salesItemId"></param>
/// <returns></returns>
Task<ProductDetailView> GetProductDetailView(string salesItemId);
/// <summary> /// <summary>
/// Get sales item by variant id /// Get sales item by variant id
/// </summary> /// </summary>
/// <param name="countryCode"></param>
/// <param name="variantId"></param> /// <param name="variantId"></param>
/// <returns></returns> /// <returns></returns>
Task<SalesItemView> GetSalesVariantId(string countryCode, string variantId); Task<ProductDetailView> GetVariantDetailView(string variantId);
/// <summary>
/// Complete catalog for print country
/// </summary>
/// <param name="countryCode"></param>
/// <returns></returns>
Task<List<SalesItemView>> GetPriceList(string countryCode);
} }

53
Wonky.Client/Local.Services/CabinetDrawerService.cs
View file

@ -7,10 +7,11 @@ namespace Wonky.Client.Local.Services;
public class CabinetDrawerService : ICabinetDrawerService public class CabinetDrawerService : ICabinetDrawerService
{ {
private readonly JsonSerializerOptions _options = new () private readonly JsonSerializerOptions _options = new()
{ {
PropertyNameCaseInsensitive = true PropertyNameCaseInsensitive = true
}; };
private readonly ILogger<CabinetDrawerService> _logger; private readonly ILogger<CabinetDrawerService> _logger;
private readonly ILocalStorageService _asyncStorageService; private readonly ILocalStorageService _asyncStorageService;
private readonly IAdvisorActivityRepository _activityRepo; private readonly IAdvisorActivityRepository _activityRepo;
@ -30,9 +31,9 @@ public class CabinetDrawerService : ICabinetDrawerService
public CabinetDrawerService( public CabinetDrawerService(
ILogger<CabinetDrawerService> logger, ILogger<CabinetDrawerService> logger,
ILocalStorageService asyncStorageService, ILocalStorageService asyncStorageService,
ICountryCatalogRepository catalogRepo, ICountryCatalogRepository catalogRepo,
IAdvisorCustomerHistoryRepository historyRepo, IAdvisorCustomerHistoryRepository historyRepo,
IAdvisorCustomerRepository customerRepo, IAdvisorCustomerRepository customerRepo,
IAdvisorActivityRepository activityRepo) IAdvisorActivityRepository activityRepo)
{ {
_logger = logger; _logger = logger;
@ -65,7 +66,7 @@ public class CabinetDrawerService : ICabinetDrawerService
return drawer ?? new ActivityDrawer(); return drawer ?? new ActivityDrawer();
} }
/// <summary> /// <summary>
/// Sales Catalog /// Sales Catalog
/// </summary> /// </summary>
@ -76,7 +77,7 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
var drawer = await _asyncStorageService var drawer = await _asyncStorageService
.GetItemAsync<CatalogDrawer>($"{countryCode}.{CatalogDrawer.Label}"); .GetItemAsync<CatalogDrawer>($"{countryCode}.{CatalogDrawer.Label}");
if (drawer == null) force = true; if (drawer == null) force = true;
if (!force) return drawer ?? new CatalogDrawer(); if (!force) return drawer ?? new CatalogDrawer();
var result = await _catalogRepo.GetPriceList(countryCode); var result = await _catalogRepo.GetPriceList(countryCode);
@ -89,7 +90,7 @@ public class CabinetDrawerService : ICabinetDrawerService
return drawer ?? new CatalogDrawer(); return drawer ?? new CatalogDrawer();
} }
/// <summary> /// <summary>
/// Company Info /// Company Info
/// </summary> /// </summary>
@ -100,7 +101,7 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
var drawer = await _asyncStorageService var drawer = await _asyncStorageService
.GetItemAsync<InfoDrawer>($"{companyId}.{InfoDrawer.Label}"); .GetItemAsync<InfoDrawer>($"{companyId}.{InfoDrawer.Label}");
if (drawer == null) force = true; if (drawer == null) force = true;
if (!force) return drawer ?? new InfoDrawer(); if (!force) return drawer ?? new InfoDrawer();
var result = await _customerRepo.GetCompanyById(companyId); var result = await _customerRepo.GetCompanyById(companyId);
@ -112,7 +113,7 @@ public class CabinetDrawerService : ICabinetDrawerService
await StoreInfoDrawerAsync(companyId, drawer); await StoreInfoDrawerAsync(companyId, drawer);
return drawer ?? new InfoDrawer(); return drawer ?? new InfoDrawer();
} }
/// <summary> /// <summary>
/// Inventory /// Inventory
@ -124,7 +125,7 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
var drawer = await _asyncStorageService var drawer = await _asyncStorageService
.GetItemAsync<InventoryDrawer>($"{companyId}.{InventoryDrawer.Label}"); .GetItemAsync<InventoryDrawer>($"{companyId}.{InventoryDrawer.Label}");
if (drawer == null) force = true; if (drawer == null) force = true;
if (!force) return drawer ?? new InventoryDrawer(); if (!force) return drawer ?? new InventoryDrawer();
var result = await _historyRepo.GetInventory(companyId); var result = await _historyRepo.GetInventory(companyId);
@ -136,7 +137,7 @@ public class CabinetDrawerService : ICabinetDrawerService
await StoreInventoryDrawerAsync(companyId, drawer); await StoreInventoryDrawerAsync(companyId, drawer);
return drawer ?? new InventoryDrawer(); return drawer ?? new InventoryDrawer();
} }
/// <summary> /// <summary>
/// Invoices /// Invoices
@ -159,8 +160,8 @@ public class CabinetDrawerService : ICabinetDrawerService
await StoreInvoiceDrawerAsync(companyId, drawer); await StoreInvoiceDrawerAsync(companyId, drawer);
return drawer ?? new InvoiceDrawer(); return drawer ?? new InvoiceDrawer();
} }
/// <summary> /// <summary>
/// Statistic (invoice lines) /// Statistic (invoice lines)
/// </summary> /// </summary>
@ -171,7 +172,7 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
var drawer = await _asyncStorageService var drawer = await _asyncStorageService
.GetItemAsync<StatisticDrawer>($"{companyId}.{StatisticDrawer.Label}"); .GetItemAsync<StatisticDrawer>($"{companyId}.{StatisticDrawer.Label}");
if (drawer == null) force = true; if (drawer == null) force = true;
if (!force) return drawer ?? new StatisticDrawer(); if (!force) return drawer ?? new StatisticDrawer();
var result = await _historyRepo.GetProductInvoiceLines(companyId); var result = await _historyRepo.GetProductInvoiceLines(companyId);
@ -205,10 +206,11 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
drawer.Content = drawer.Content.OrderByDescending(x => x.OrderDate).ToList(); drawer.Content = drawer.Content.OrderByDescending(x => x.OrderDate).ToList();
} }
await _asyncStorageService.SetItemAsync($"{companyId}.{ActivityDrawer.Label}", drawer); await _asyncStorageService.SetItemAsync($"{companyId}.{ActivityDrawer.Label}", drawer);
} }
/// <summary> /// <summary>
/// Store Sales Catalog /// Store Sales Catalog
/// </summary> /// </summary>
@ -218,8 +220,8 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
await _asyncStorageService.SetItemAsync($"{countryCode}.{CatalogDrawer.Label}", drawer); await _asyncStorageService.SetItemAsync($"{countryCode}.{CatalogDrawer.Label}", drawer);
} }
/// <summary> /// <summary>
/// Store Company Info /// Store Company Info
/// </summary> /// </summary>
@ -229,8 +231,8 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
await _asyncStorageService.SetItemAsync($"{companyId}.{InfoDrawer.Label}", drawer); await _asyncStorageService.SetItemAsync($"{companyId}.{InfoDrawer.Label}", drawer);
} }
/// <summary> /// <summary>
/// Store Inventory /// Store Inventory
/// </summary> /// </summary>
@ -242,10 +244,11 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
drawer.Content = drawer.Content.OrderByDescending(x => x.LastInvoiceDate).ToList(); drawer.Content = drawer.Content.OrderByDescending(x => x.LastInvoiceDate).ToList();
} }
await _asyncStorageService.SetItemAsync($"{companyId}.{InventoryDrawer.Label}", drawer); await _asyncStorageService.SetItemAsync($"{companyId}.{InventoryDrawer.Label}", drawer);
} }
/// <summary> /// <summary>
/// Store Invoices /// Store Invoices
/// </summary> /// </summary>
@ -257,10 +260,11 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
drawer.Content = drawer.Content.OrderByDescending(x => x.DocumentDate).ToList(); drawer.Content = drawer.Content.OrderByDescending(x => x.DocumentDate).ToList();
} }
await _asyncStorageService.SetItemAsync($"{companyId}.{InvoiceDrawer.Label}", drawer); await _asyncStorageService.SetItemAsync($"{companyId}.{InvoiceDrawer.Label}", drawer);
} }
/// <summary> /// <summary>
/// Store statistic (invoice lines) /// Store statistic (invoice lines)
/// </summary> /// </summary>
@ -272,6 +276,7 @@ public class CabinetDrawerService : ICabinetDrawerService
{ {
drawer.Content = drawer.Content.OrderByDescending(x => x.DeliveryDate).ToList(); drawer.Content = drawer.Content.OrderByDescending(x => x.DeliveryDate).ToList();
} }
await _asyncStorageService.SetItemAsync($"{companyId}.{StatisticDrawer.Label}", drawer); await _asyncStorageService.SetItemAsync($"{companyId}.{StatisticDrawer.Label}", drawer);
} }
} }

6
Wonky.Client/Models/SelectedSku.cs → Wonky.Client/Models/ItemSelect.cs
View file

@ -16,12 +16,12 @@
namespace Wonky.Client.Models; namespace Wonky.Client.Models;
public class SelectedSku public class ItemSelect
{ {
/// <summary> /// <summary>
/// ItemId /// ItemNo
/// </summary> /// </summary>
public string ItemId { get; set; } = ""; public string ItemNo { get; set; } = "";
/// <summary> /// <summary>
/// Quantity /// Quantity

4
Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor
View file

@ -20,7 +20,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h3 class="modal-title">@CompanyName - Produktoversigt</h3> <h3 class="modal-title">@CompanyName - Produktoversigt</h3>
<button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button> <button type="button" class="btn btn-outline-secondary" @onclick="OnReload"><i class="bi-repeat"></i></button> <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<CustomerInventoryListComponent OnReorderSelected="OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/> <CustomerInventoryListComponent OnReorderSelected="OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/>
@ -33,4 +33,4 @@
<div class="modal-backdrop fade show"></div> <div class="modal-backdrop fade show"></div>
} }
<CustomerInventoryReorderOverlay CompanyId="@CompanyId" SalesItem="SalesItem" OnSelected="OnSelected" @ref="@ReorderOverlay" /> <CustomerInventoryReorderOverlay CompanyId="@CompanyId" SalesItemView="SalesItem" OnSelected="OnSelected" @ref="@ReorderOverlay" />

3
Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs
View file

@ -39,6 +39,7 @@ public partial class CustomerInventoryListOverlay : IDisposable
[Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = "";
[Parameter] public List<ProductInventoryItemView> Inventory { get; set; } = new(); [Parameter] public List<ProductInventoryItemView> Inventory { get; set; } = new();
[Parameter] public EventCallback<DraftItem> OnSelected { get; set; } [Parameter] public EventCallback<DraftItem> OnSelected { get; set; }
[Parameter] public EventCallback OnReload { get; set; }
/* /*
* Private Variables * Private Variables
*/ */
@ -72,7 +73,7 @@ public partial class CustomerInventoryListOverlay : IDisposable
Interceptor.RegisterBeforeSendEvent(); Interceptor.RegisterBeforeSendEvent();
StateHasChanged(); StateHasChanged();
} }
/// <summary> /// <summary>
/// Inventory Reorder Overlay Callback /// Inventory Reorder Overlay Callback

8
Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor
View file

@ -20,11 +20,11 @@
<div class="modal-dialog modal-dialog-scrollable modal-fullscreen"> <div class="modal-dialog modal-dialog-scrollable modal-fullscreen">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">@SalesItem.Name @SalesItem.Sku (@SalesItem.BoxSize stk/colli)</h4> <h4 class="modal-title">@SalesItemView.Name @SalesItemView.Sku (@SalesItemView.BoxSize stk/colli)</h4>
<button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button> <button type="button" class="btn btn-danger" @onclick="@Hide" data-bs-dismiss="modal" aria-label="Luk"><i class="bi-x-lg"></i></button>
</div> </div>
<div class="modal-body"> <div class="modal-body">
@if (SalesItem.Discontinued) @if (SalesItemView.Discontinued)
{ {
<h3>Udgået produkt</h3> <h3>Udgået produkt</h3>
} }
@ -73,7 +73,7 @@
@* end draft line ------------------------------------------------- *@ @* end draft line ------------------------------------------------- *@
@* price list item ------------------------------------------------ *@ @* price list item ------------------------------------------------ *@
<div class="row align-middle"> <div class="row align-middle">
@foreach (var rate in SalesItem.Rates) @foreach (var rate in SalesItemView.Rates)
{ {
<div class="col"> <div class="col">
<a type="button" class="btn btn-primary btn-sm" data-bs-dismiss="modal" @onclick="@(() => SelectPrice(rate.Quantity, rate.Rate))"> <a type="button" class="btn btn-primary btn-sm" data-bs-dismiss="modal" @onclick="@(() => SelectPrice(rate.Quantity, rate.Rate))">
@ -105,7 +105,7 @@
<td class="align-middle">@entry.Discount</td> <td class="align-middle">@entry.Discount</td>
<td class="align-middle">@entry.Price</td> <td class="align-middle">@entry.Price</td>
<td class="align-middle"> <td class="align-middle">
@if (!SalesItem.Discontinued) @if (!SalesItemView.Discontinued)
{ {
<button type="button" class="btn btn-primary btn-sm" data-bs-dismiss="modal" @onclick="@(() => SelectHistory(entry))"> <button type="button" class="btn btn-primary btn-sm" data-bs-dismiss="modal" @onclick="@(() => SelectHistory(entry))">
<i class="bi-plus"></i> VÆLG <i class="bi-plus"></i> VÆLG

12
Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs
View file

@ -31,7 +31,7 @@ public partial class CustomerInventoryReorderOverlay
// ############################################################## // ##############################################################
[Parameter] public EventCallback<DraftItem> OnSelected { get; set; } [Parameter] public EventCallback<DraftItem> OnSelected { get; set; }
[Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string CompanyId { get; set; } = "";
[Parameter] public SalesItemView SalesItem { get; set; } = new(); [Parameter] public SalesItemView SalesItemView { get; set; } = new();
// ############################################################## // ##############################################################
private List<ProductHistoryView>? History { get; set; } = new(); private List<ProductHistoryView>? History { get; set; } = new();
@ -47,17 +47,17 @@ public partial class CustomerInventoryReorderOverlay
/// </summary> /// </summary>
protected override async Task OnParametersSetAsync() protected override async Task OnParametersSetAsync()
{ {
if (string.IsNullOrWhiteSpace(SalesItem.Sku)) if (string.IsNullOrWhiteSpace(SalesItemView.Sku))
return; return;
History = await HistoryRepo.GetProductInvoiceLines(CompanyId, SalesItem.Sku); History = await HistoryRepo.GetProductInvoiceLines(CompanyId, SalesItemView.Sku);
if (!History.Any()) if (!History.Any())
await Task.Delay(1000); await Task.Delay(1000);
SelectedItem.Item = SalesItem; SelectedItem.Item = SalesItemView;
SelectedItem.Discount = 0; SelectedItem.Discount = 0;
SelectedItem.Quantity = 1; SelectedItem.Quantity = 1;
if(SalesItem.Rates.Any()) if(SalesItemView.Rates.Any())
SelectedItem.Price = decimal.Parse(SalesItem.Rates[0].Rate, CultureInfo.InvariantCulture); SelectedItem.Price = decimal.Parse(SalesItemView.Rates[0].Rate, CultureInfo.InvariantCulture);
} }

3
Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor
View file

@ -79,7 +79,8 @@
<div class="text-sm-end me-1">@rate.Quantity</div> <div class="text-sm-end me-1">@rate.Quantity</div>
<div class="text-sm-end me-1">@rate.Rate</div> <div class="text-sm-end me-1">@rate.Rate</div>
<div> <div>
<a class="btn btn-primary btn-sm" data-bs-dismiss="modal" @onclick="@(() => SelectItem(item.SalesItemId, rate.Quantity, rate.Rate))"> <a class="btn btn-primary btn-sm" data-bs-dismiss="modal"
@onclick="@(() => SelectItem(item.Sku, rate.Quantity, rate.Rate))">
<i class="bi-plus-lg"></i> <i class="bi-plus-lg"></i>
</a> </a>
</div> </div>

8
Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs
View file

@ -37,7 +37,7 @@ public partial class CatalogPagedOverlay : IDisposable
// ############################################################## // ##############################################################
[Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = "";
[Parameter] public EventCallback<SelectedSku> OnSelected { get; set; } [Parameter] public EventCallback<ItemSelect> OnSelected { get; set; }
// ############################################################## // ##############################################################
private string _modalDisplay = ""; private string _modalDisplay = "";
@ -65,16 +65,14 @@ public partial class CatalogPagedOverlay : IDisposable
private async Task GetSalesItems() private async Task GetSalesItems()
{ {
var pagingResponse = await CatalogRepo.GetSalesItemsPaged(CountryCode, _pager); var pagingResponse = await CatalogRepo.GetSalesItemsPaged(CountryCode, _pager);
if (pagingResponse == null)
Task.Delay(250);
Items = pagingResponse.Items!; Items = pagingResponse.Items!;
PageData = pagingResponse.MetaData; PageData = pagingResponse.MetaData;
Logger.LogDebug("PriceCatalogOverlay => Items <= {}", JsonSerializer.Serialize(Items)); Logger.LogDebug("PriceCatalogOverlay => Items <= {}", JsonSerializer.Serialize(Items));
} }
private void SelectItem(string itemId, string quantity, string rate) private void SelectItem(string itemNo, string quantity, string rate)
{ {
OnSelected.InvokeAsync(new SelectedSku { Quantity = quantity, Rate = rate, ItemId = itemId }); OnSelected.InvokeAsync(new ItemSelect { Quantity = quantity, Rate = rate, ItemNo = itemNo });
Hide(); Hide();
} }

2
Wonky.Client/Pages/AdvisorActivityCreatePage.razor
View file

@ -449,7 +449,7 @@ else
Activities="_activityDrawer.Content" @ref="ActivityListOverlay"/> Activities="_activityDrawer.Content" @ref="ActivityListOverlay"/>
<CustomerInventoryListOverlay CompanyName="@_company.Name" CompanyId="@CompanyId" CountryCode="@_company.CountryCode" <CustomerInventoryListOverlay CompanyName="@_company.Name" CompanyId="@CompanyId" CountryCode="@_company.CountryCode"
Inventory="_inventoryDrawer.Content" OnReload="@(() => ReloadHistory(true))" Inventory="_inventoryDrawer.Content"
OnSelected="InventoryOverlayCallback" @ref="InventoryListOverlay"/> OnSelected="InventoryOverlayCallback" @ref="InventoryListOverlay"/>
<CustomerInvoiceListOverlay Company="_company" <CustomerInvoiceListOverlay Company="_company"

12
Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs
View file

@ -336,18 +336,18 @@ public partial class AdvisorActivityCreatePage : IDisposable
/// <summary> /// <summary>
/// Price Catalog Overlay Callback /// Price Catalog Overlay Callback
/// </summary> /// </summary>
/// <param name="sku"></param> /// <param name="selectedItem"></param>
private async Task PriceCatalogOverlayCallback(SelectedSku sku) private async Task PriceCatalogOverlayCallback(ItemSelect selectedItem)
{ {
// get selected item // get selected item
if (string.IsNullOrWhiteSpace(sku.ItemId)) if (string.IsNullOrWhiteSpace(selectedItem.ItemNo))
{ {
return; return;
} }
_selectedItem = await CatalogRepo.GetSalesItemId(_salesRep.CountryCode.ToLower(), sku.ItemId); _selectedItem = await CatalogRepo.GetSalesItemSku(_company.CountryCode, selectedItem.ItemNo);
ShowItem = true; ShowItem = true;
Price = sku.Rate; Price = selectedItem.Rate;
Quantity = sku.Quantity; Quantity = selectedItem.Quantity;
StateHasChanged(); StateHasChanged();
} }

2
Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor
View file

@ -37,7 +37,7 @@
</div> </div>
<CustomerInventoryListComponent OnReorderSelected="@OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/> <CustomerInventoryListComponent OnReorderSelected="@OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/>
<CustomerInventoryReorderOverlay OnSelected="@OnSelectedItem" CompanyId="@CompanyId" SalesItem="@SalesItem" @ref="@ReorderOverlay"/> <CustomerInventoryReorderOverlay OnSelected="@OnSelectedItem" CompanyId="@CompanyId" SalesItemView="@SalesItem" @ref="@ReorderOverlay"/>
@if (Working) @if (Working)
{ {

2
Wonky.Client/Pages/CatalogCountryProductPage.razor
View file

@ -1,6 +1,6 @@
@using Wonky.Client.Components @using Wonky.Client.Components
@using System.Text.Json @using System.Text.Json
@page "/catalog/{CountryCode}/{sku}" @page "/catalog/item/{SalesItemId}"
<h3>CatalogCountryProductPage</h3> <h3>CatalogCountryProductPage</h3>

7
Wonky.Client/Pages/CatalogCountryProductPage.razor.cs
View file

@ -15,11 +15,10 @@ public partial class CatalogCountryProductPage
[Inject] public ICountryCatalogRepository Catalog { get; set; } [Inject] public ICountryCatalogRepository Catalog { get; set; }
// ############################################################## // ##############################################################
[Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string SalesItemId { get; set; } = "";
[Parameter] public string Sku { get; set; } = "";
// ############################################################## // ##############################################################
private SalesItemView _item = new(); private ProductDetailView _item = new();
private bool _working = true; private bool _working = true;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
@ -27,7 +26,7 @@ public partial class CatalogCountryProductPage
Interceptor.RegisterEvent(); Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent(); Interceptor.RegisterBeforeSendEvent();
_item = await Catalog.GetSalesItemSku(CountryCode, Sku); _item = await Catalog.GetProductDetailView(SalesItemId);
_working = false; _working = false;
} }
} }

10
Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs
View file

@ -205,15 +205,15 @@ public partial class OfficeOrderCreatePage : IDisposable
} }
private async Task PriceListCallback(SelectedSku sku) private async Task PriceListCallback(ItemSelect selectedItem)
{ {
// get selected item // get selected item
if (string.IsNullOrWhiteSpace(sku.ItemId)) if (string.IsNullOrWhiteSpace(selectedItem.ItemNo))
return; return;
SelectedItem = await Catalog.GetSalesItemId(CountryCode, sku.ItemId); SelectedItem = await Catalog.GetSalesItemSku(CountryCode, selectedItem.ItemNo);
ShowItem = true; ShowItem = true;
Price = sku.Rate; Price = selectedItem.Rate;
Quantity = sku.Quantity; Quantity = selectedItem.Quantity;
StateHasChanged(); StateHasChanged();
} }

2
Wonky.Client/wwwroot/appsettings.json
View file

@ -1,7 +1,7 @@
{ {
"appInfo": { "appInfo": {
"name": "Wonky Online", "name": "Wonky Online",
"version": "203.0", "version": "205.0",
"rc": true, "rc": true,
"sandBox": true, "sandBox": true,
"image": "grumpy-coder.png", "image": "grumpy-coder.png",

38
Wonky.Entity/Views/ProductDetailView.cs Normal file
View file

@ -0,0 +1,38 @@
// Copyright (C) 2022 FCS Frede's Computer Services.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
//
using System.Collections.Generic;
namespace Wonky.Entity.Views;
public class ProductDetailView
{
public string Name { get; set; } = "";
public string Sku { get; set; } = "";
public string VendorItemNo { get; set; } = "";
public string ShortName { get; set; } = "";
public string PictureLink { get; set; } = "";
public string ProductGroup { get; set; } = "";
public bool Discontinued { get; set; }
public int BoxSize { get; set; }
public List<DocumentView> Documents { get; set; } = new();
}
public class DocumentView
{
public string Name { get; set; } = "";
public string Description { get; set; } = "";
public string DocumentTypeEnum { get; set; } = "";
}

1
Wonky.Entity/Views/ProductInventoryItemView.cs
View file

@ -29,4 +29,5 @@ public class ProductInventoryItemView
public string LastInvoiceDate { get; set; } = ""; public string LastInvoiceDate { get; set; } = "";
public string Sku { get; set; } = ""; public string Sku { get; set; } = "";
public string VendorItemNo { get; set; } = ""; public string VendorItemNo { get; set; } = "";
public string SalesItemId { get; set; } = "";
} }