refactor namespace
This commit is contained in:
parent
fc0682c747
commit
41c80c223c
14 changed files with 25 additions and 25 deletions
|
@ -350,9 +350,9 @@ else
|
||||||
<ConfirmProductCheckModalOverlay BodyMessage="" CompanyId="@CompanyId" Products="CheckList"
|
<ConfirmProductCheckModalOverlay BodyMessage="" CompanyId="@CompanyId" Products="CheckList"
|
||||||
OnOkClicked="ConfirmProductCheckCallback" @ref="ProductCheckOverlay" />
|
OnOkClicked="ConfirmProductCheckCallback" @ref="ProductCheckOverlay" />
|
||||||
|
|
||||||
<CustomerInvoiceModalOverlay CustomerInvoices="CompanyInvoices" @ref="InvoiceOverlay" />
|
<CustomerInvoiceListModalOverlay CustomerInvoices="CompanyInvoices" @ref="InvoiceListOverlay" />
|
||||||
|
|
||||||
<CustomerInventoryModalOverlay CompanyName="@Company.Name" CompanyId="@CompanyId" CountryCode="@Company.CountryCode"
|
<CustomerInventoryListModalOverlay CompanyName="@Company.Name" CompanyId="@CompanyId" CountryCode="@Company.CountryCode"
|
||||||
OnInventorySelected="OnInventoryCallback" Inventory="Inventory" @ref="InventoryOverlay" />
|
OnInventorySelected="OnInventoryCallback" Inventory="Inventory" @ref="InventoryListOverlay" />
|
||||||
|
|
||||||
<CustomerActivityListModalOverlay Activities="Activities" CompanyName="@Company.Name" @ref="ActivityListOverlay" />
|
<CustomerActivityListModalOverlay Activities="Activities" CompanyName="@Company.Name" @ref="ActivityListOverlay" />
|
|
@ -76,8 +76,8 @@ public partial class AdvisorActivityCreatePage : IDisposable
|
||||||
private ProductPriceHistoryModal PriceOverlay { get; set; } = new();
|
private ProductPriceHistoryModal PriceOverlay { get; set; } = new();
|
||||||
private ConfirmWorkDateModalOverlay WorkDateOverlay { get; set; } = new();
|
private ConfirmWorkDateModalOverlay WorkDateOverlay { get; set; } = new();
|
||||||
private ConfirmProductCheckModalOverlay ProductCheckOverlay { get; set; } = new();
|
private ConfirmProductCheckModalOverlay ProductCheckOverlay { get; set; } = new();
|
||||||
private CustomerInvoiceModalOverlay InvoiceOverlay { get; set; } = new();
|
private CustomerInvoiceListModalOverlay InvoiceListOverlay { get; set; } = new();
|
||||||
private CustomerInventoryModalOverlay InventoryOverlay { get; set; } = new();
|
private CustomerInventoryListModalOverlay InventoryListOverlay { get; set; } = new();
|
||||||
private CustomerActivityListModalOverlay ActivityListOverlay { get; set; } = new();
|
private CustomerActivityListModalOverlay ActivityListOverlay { get; set; } = new();
|
||||||
private List<ProductInventoryView> Inventory { get; set; } = new();
|
private List<ProductInventoryView> Inventory { get; set; } = new();
|
||||||
private List<ProductInventoryView> CheckList { get; set; } = new();
|
private List<ProductInventoryView> CheckList { get; set; } = new();
|
||||||
|
@ -179,7 +179,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
|
||||||
{
|
{
|
||||||
Logger.LogDebug("ShowInventoryOverlay - wait for inventory");
|
Logger.LogDebug("ShowInventoryOverlay - wait for inventory");
|
||||||
|
|
||||||
InventoryOverlay.Show();
|
InventoryListOverlay.Show();
|
||||||
|
|
||||||
Inventory = await HistoryRepo.FetchInventory(CompanyId);
|
Inventory = await HistoryRepo.FetchInventory(CompanyId);
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
|
||||||
{
|
{
|
||||||
Logger.LogDebug("ShowInvoiceOverlay - wait for invoices");
|
Logger.LogDebug("ShowInvoiceOverlay - wait for invoices");
|
||||||
|
|
||||||
InvoiceOverlay.Show();
|
InvoiceListOverlay.Show();
|
||||||
CompanyInvoices = await FetchCompanyInvoices();
|
CompanyInvoices = await FetchCompanyInvoices();
|
||||||
await Task.Delay(500);
|
await Task.Delay(500);
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
<CustomerInventoryListComponent OnReorderSelected="OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/>
|
<CustomerInventoryListComponent OnReorderSelected="OnReorderCallback" CompanyId="@CompanyId" Inventory="@Inventory"/>
|
||||||
|
|
||||||
<InventoryReorderModalOverlay OnSelected="@OnSelectedItem" CompanyId="@CompanyId" SalesItem="@SalesItem" @ref="InventoryOverlay"/>
|
<CustomerInventoryReorderModalOverlay OnSelected="@OnSelectedItem" CompanyId="@CompanyId" SalesItem="@SalesItem" @ref="CustomerInventoryReorderOverlay"/>
|
||||||
|
|
||||||
@if (Working)
|
@if (Working)
|
||||||
{
|
{
|
||||||
|
|
|
@ -44,7 +44,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
|
||||||
private CompanyDto Company { get; set; } = new();
|
private CompanyDto Company { get; set; } = new();
|
||||||
private bool Working { get; set; } = true;
|
private bool Working { get; set; } = true;
|
||||||
private SalesItemView SalesItem { get; set; } = new();
|
private SalesItemView SalesItem { get; set; } = new();
|
||||||
private InventoryReorderModalOverlay InventoryOverlay { get; set; } = new();
|
private CustomerInventoryReorderModalOverlay CustomerInventoryReorderOverlay { get; set; } = new();
|
||||||
private List<ProductInventoryView> Inventory { get; set; } = new();
|
private List<ProductInventoryView> Inventory { get; set; } = new();
|
||||||
|
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
|
||||||
{
|
{
|
||||||
// fetch item from http repo
|
// fetch item from http repo
|
||||||
SalesItem = await Catalog.GetSalesItemSku(Company.CountryCode.ToLower(), sku);
|
SalesItem = await Catalog.GetSalesItemSku(Company.CountryCode.ToLower(), sku);
|
||||||
InventoryOverlay.Show();
|
CustomerInventoryReorderOverlay.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task OnSelectedItem(DraftItem draftItem)
|
private async Task OnSelectedItem(DraftItem draftItem)
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<CustomerInvoiceListComponent OnShowInvoice="CallInvoiceModal" CompanyId="@_companyId" InvoiceList="@CompanyInvoices.Invoices"/>
|
<CustomerInvoiceListComponent OnShowInvoice="CallInvoiceModal" CompanyId="@_companyId" InvoiceList="@CompanyInvoices.Invoices"/>
|
||||||
<InvoiceViewModalOverlay CompanyId="@_companyId" InvoiceId="@InvoiceId" @ref="InvoiceView" />
|
<CustomerInvoiceViewModalOverlay CompanyId="@_companyId" InvoiceId="@InvoiceId" @ref="CustomerInvoiceView" />
|
||||||
}
|
}
|
||||||
|
|
||||||
@if (Working)
|
@if (Working)
|
||||||
|
|
|
@ -23,7 +23,7 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable
|
||||||
[Inject] private ILogger<AdvisorCustomerInvoiceListPage> Logger { get; set; }
|
[Inject] private ILogger<AdvisorCustomerInvoiceListPage> Logger { get; set; }
|
||||||
private InvoiceListView CompanyInvoices { get; set; } = new();
|
private InvoiceListView CompanyInvoices { get; set; } = new();
|
||||||
private CompanyDto Company { get; set; } = new();
|
private CompanyDto Company { get; set; } = new();
|
||||||
private InvoiceViewModalOverlay InvoiceView { get; set; } = new();
|
private CustomerInvoiceViewModalOverlay CustomerInvoiceView { get; set; } = new();
|
||||||
private string InvoiceId { get; set; } = "";
|
private string InvoiceId { get; set; } = "";
|
||||||
private bool Working { get; set; }
|
private bool Working { get; set; }
|
||||||
private bool AllSet { get; set; }
|
private bool AllSet { get; set; }
|
||||||
|
@ -63,7 +63,7 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable
|
||||||
private void CallInvoiceModal(string invoiceId)
|
private void CallInvoiceModal(string invoiceId)
|
||||||
{
|
{
|
||||||
InvoiceId = invoiceId;
|
InvoiceId = invoiceId;
|
||||||
InvoiceView.Show();
|
CustomerInvoiceView.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<InvoiceListView> FetchCompanyInvoices()
|
private async Task<InvoiceListView> FetchCompanyInvoices()
|
||||||
|
|
|
@ -17,4 +17,4 @@
|
||||||
{
|
{
|
||||||
<div class="modal-backdrop fade show"></div>
|
<div class="modal-backdrop fade show"></div>
|
||||||
}
|
}
|
||||||
<InventoryReorderModalOverlay CompanyId="@CompanyId" SalesItem="SalesItem" OnSelected="OnInventorySelected" @ref="InventoryOverlay" />
|
<CustomerInventoryReorderModalOverlay CompanyId="@CompanyId" SalesItem="SalesItem" OnSelected="OnInventorySelected" @ref="CustomerInventoryReorderOverlay" />
|
|
@ -9,11 +9,11 @@ using Wonky.Entity.Views;
|
||||||
|
|
||||||
namespace Wonky.Client.Shared;
|
namespace Wonky.Client.Shared;
|
||||||
|
|
||||||
public partial class CustomerInventoryModalOverlay : IDisposable
|
public partial class CustomerInventoryListModalOverlay : IDisposable
|
||||||
{
|
{
|
||||||
[Inject] private HttpInterceptorService Interceptor { get; set; }
|
[Inject] private HttpInterceptorService Interceptor { get; set; }
|
||||||
[Inject] private ICountryCatalogRepository Catalog { get; set; }
|
[Inject] private ICountryCatalogRepository Catalog { get; set; }
|
||||||
[Inject] private ILogger<CustomerInventoryModalOverlay> Logger { get; set; }
|
[Inject] private ILogger<CustomerInventoryListModalOverlay> Logger { get; set; }
|
||||||
|
|
||||||
[Parameter] public string CompanyName { get; set; } = "";
|
[Parameter] public string CompanyName { get; set; } = "";
|
||||||
[Parameter] public string CompanyId { get; set; } = "";
|
[Parameter] public string CompanyId { get; set; } = "";
|
||||||
|
@ -28,7 +28,7 @@ public partial class CustomerInventoryModalOverlay : IDisposable
|
||||||
private List<ProductInventoryView> _inventory { get; set; } = new();
|
private List<ProductInventoryView> _inventory { get; set; } = new();
|
||||||
private DraftItem DraftItem { get; set; } = new();
|
private DraftItem DraftItem { get; set; } = new();
|
||||||
private SalesItemView SalesItem { get; set; } = new();
|
private SalesItemView SalesItem { get; set; } = new();
|
||||||
private InventoryReorderModalOverlay InventoryOverlay { get; set; } = new();
|
private CustomerInventoryReorderModalOverlay CustomerInventoryReorderOverlay { get; set; } = new();
|
||||||
|
|
||||||
protected override void OnInitialized()
|
protected override void OnInitialized()
|
||||||
{
|
{
|
||||||
|
@ -40,7 +40,7 @@ public partial class CustomerInventoryModalOverlay : IDisposable
|
||||||
private async Task OnReorderCallback(string sku)
|
private async Task OnReorderCallback(string sku)
|
||||||
{
|
{
|
||||||
SalesItem = await Catalog.GetSalesItemSku(CountryCode.ToLower(), sku);
|
SalesItem = await Catalog.GetSalesItemSku(CountryCode.ToLower(), sku);
|
||||||
InventoryOverlay.Show();
|
CustomerInventoryReorderOverlay.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task OnSelectedItem(DraftItem draftItem)
|
private async Task OnSelectedItem(DraftItem draftItem)
|
|
@ -25,7 +25,7 @@ using Wonky.Entity.Views;
|
||||||
|
|
||||||
namespace Wonky.Client.Shared;
|
namespace Wonky.Client.Shared;
|
||||||
|
|
||||||
public partial class InventoryReorderModalOverlay
|
public partial class CustomerInventoryReorderModalOverlay
|
||||||
{
|
{
|
||||||
[Parameter] public string CompanyId { get; set; } = "";
|
[Parameter] public string CompanyId { get; set; } = "";
|
||||||
[Parameter] public SalesItemView SalesItem { get; set; } = new();
|
[Parameter] public SalesItemView SalesItem { get; set; } = new();
|
|
@ -16,7 +16,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<CustomerInvoiceListComponent OnShowInvoice="@CallInvoiceModal" CompanyId="@Company.CompanyId" InvoiceList="@Invoices"/>
|
<CustomerInvoiceListComponent OnShowInvoice="@CallInvoiceModal" CompanyId="@Company.CompanyId" InvoiceList="@Invoices"/>
|
||||||
<InvoiceViewModalOverlay CompanyId="@Company.CompanyId" InvoiceId="@InvoiceId" @ref="InvoiceView" />
|
<CustomerInvoiceViewModalOverlay CompanyId="@Company.CompanyId" InvoiceId="@InvoiceId" @ref="CustomerInvoiceView" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
|
@ -6,12 +6,12 @@ using Wonky.Entity.Views;
|
||||||
|
|
||||||
namespace Wonky.Client.Shared;
|
namespace Wonky.Client.Shared;
|
||||||
|
|
||||||
public partial class CustomerInvoiceModalOverlay
|
public partial class CustomerInvoiceListModalOverlay
|
||||||
{
|
{
|
||||||
[Parameter] public InvoiceListView CustomerInvoices { get; set; } = new();
|
[Parameter] public InvoiceListView CustomerInvoices { get; set; } = new();
|
||||||
|
|
||||||
[Inject] private ILogger<CustomerInvoiceModalOverlay> Logger { get; set; }
|
[Inject] private ILogger<CustomerInvoiceListModalOverlay> Logger { get; set; }
|
||||||
private InvoiceViewModalOverlay InvoiceView { get; set; } = new();
|
private CustomerInvoiceViewModalOverlay CustomerInvoiceView { get; set; } = new();
|
||||||
private string InvoiceId { get; set; } = "";
|
private string InvoiceId { get; set; } = "";
|
||||||
private string _modalDisplay = "";
|
private string _modalDisplay = "";
|
||||||
private bool _showBackdrop;
|
private bool _showBackdrop;
|
||||||
|
@ -35,7 +35,7 @@ public partial class CustomerInvoiceModalOverlay
|
||||||
private void CallInvoiceModal(string invoiceId)
|
private void CallInvoiceModal(string invoiceId)
|
||||||
{
|
{
|
||||||
InvoiceId = invoiceId;
|
InvoiceId = invoiceId;
|
||||||
InvoiceView.Show();
|
CustomerInvoiceView.Show();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Show()
|
public void Show()
|
|
@ -25,7 +25,7 @@ using Wonky.Entity.Views;
|
||||||
|
|
||||||
namespace Wonky.Client.Shared;
|
namespace Wonky.Client.Shared;
|
||||||
|
|
||||||
public partial class InvoiceViewModalOverlay : IDisposable
|
public partial class CustomerInvoiceViewModalOverlay : IDisposable
|
||||||
{
|
{
|
||||||
[Parameter] public string CompanyId { get; set; } = "";
|
[Parameter] public string CompanyId { get; set; } = "";
|
||||||
[Parameter] public string InvoiceId { get; set; } = "";
|
[Parameter] public string InvoiceId { get; set; } = "";
|
Loading…
Reference in a new issue