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

WIP: listing quotes - display on click

Browse source
This commit is contained in:
Frede Hundewadt 2022-12-13 17:34:43 +01:00
parent 743c96972d
commit 9fd56f6b9e
8 changed files with 124 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Wonky.Client/HttpInterfaces/ICrmActivityHttpRepository.cs
View file

@ -24,14 +24,14 @@ public interface ICrmActivityHttpRepository
/// Get a list of open quotes
/// </summary>
/// <returns>List of Activities with ActivityStatus == Quote</returns>
Task<List<ActivityDto>> GetQuotes();
Task<List<ReportItemView>> GetQuotes();
/// <summary>
/// Convert quote to sale
/// </summary>
/// <param name="activity"></param>
/// <returns></returns>
Task<ApiResponseView> AcceptQuote(ActivityDto activity);
Task<ApiResponseView> AcceptQuote(ReportItemView activity);
/// <summary>
/// Get activities by date

9
Wonky.Client/HttpRepository/CrmActivityHttpRepository.cs
View file

@ -50,10 +50,9 @@ public class CrmActivityHttpRepository : ICrmActivityHttpRepository
/// Get a list of quotes
/// </summary>
/// <returns>List of activities with Quote status </returns>
public async Task<List<ActivityDto>> GetQuotes()
public async Task<List<ReportItemView>> GetQuotes()
{
var result = await _client.GetFromJsonAsync<List<ActivityDto>>($"{_api.CrmActivities}/quotes", _options);
return result ?? new List<ActivityDto>();
return await _client.GetFromJsonAsync<List<ReportItemView>>($"{_api.CrmActivities}/quotes", _options);
}
/// <summary>
@ -61,10 +60,10 @@ public class CrmActivityHttpRepository : ICrmActivityHttpRepository
/// </summary>
/// <param name="activity"></param>
/// <returns></returns>
public async Task<ApiResponseView> AcceptQuote(ActivityDto activity)
public async Task<ApiResponseView> AcceptQuote(ReportItemView activity)
{
var response = await _client.PutAsJsonAsync(
$"{_api.CrmActivities}/{activity.SalesHeadId}/accept", activity, _options);
$"{_api.CrmActivities}/{activity.ActivityId}/accept", activity, _options);
var content = await response.Content.ReadAsStringAsync();
var result = JsonSerializer.Deserialize<ApiResponseView>(content);

3
Wonky.Client/Pages/CrmActivityViewPage.razor
View file

@ -20,6 +20,7 @@
@attribute [Authorize(Roles = "Admin,Office,Warehouse,Advisor")]
@page "/companies/{CompanyId}/orders/{OrderId}"
@page "/companies/{CompanyId}/quotes/{OrderId}"
@* <ReportItemComponent ReportItem="@_item" /> *@
@ -31,7 +32,7 @@
<h2 class="fw-bold text-center">@ReportItem.Company.Name</h2>
@if (ReportItem.StatusTypeEnum.ToLower() is "quote")
{
<h3 class="text-center">TILBUD</h3>
<h3 class="text-center">TILBUD @ReportItem.ESalesNumber</h3>
}
@if (ReportItem.VisitTypeEnum.ToLower() == "phone" || ReportItem.OurRef.Contains("T:"))
{

4
Wonky.Client/Pages/CrmCompanyViewPage.razor
View file

@ -129,11 +129,13 @@
<div class="col">
<a class="btn btn-dark opacity-50 d-block" href="/companies/@Company.CompanyId/invoices">Faktura</a>
</div>
@*
<div class="col">
<a class="btn btn-dark opacity-50 d-block" href="/companies/@Company.CompanyId/quotes">Tilbud</a>
</div>
*@
<div class="col">
<a class="btn btn-dark opacity-50 d-block" href="/companies/@Company.CompanyId/activities">Besøg</a>
<a class="btn btn-dark opacity-50 d-block" href="/companies/@Company.CompanyId/activities">Tidl. Besøg</a>
</div>
<div class="col">
<a class="btn btn-dark opacity-50 d-block" href="/companies/@Company.CompanyId/h/i">Produkter</a>

73
Wonky.Client/Pages/CrmQuotes.razor
View file

@ -1,15 +1,68 @@
@page "/open-quotes"
@using Wonky.Client.HttpInterfaces
<div class="row">
<h3>Åbne tilbud</h3>
@using Wonky.Client.Components
<div class="row g-3">
<div class="col-sm-12">
<h3 class="text-center">Åbne tilbud</h3>
</div>
</div>
<div class="list-group">
<div class="list-group-item bg-dark text-white">
<div class="row g-3">
<div class="col-sm-2">
Reference
</div>
<div class="col-sm-4">
Kunde
</div>
<div class="col-sm-1">
Dato
</div>
<div class="col-sm-2 text-end">
Tilbudssum
</div>
<div class="col-sm-3"></div>
</div>
</div>
@if (Quotes.Any())
{
foreach (var quote in Quotes)
{
<a class="list-group-item list-group-item-action" href="/companies/@quote.Company.CompanyId/quotes/@quote.ActivityId">
<div class="row g-3">
<div class="col-sm-2" style="font-family: monospace;">
@quote.ESalesNumber
</div>
<div class="col-sm-4">
@quote.Company.Name
</div>
<di class="col-sm-1">
@quote.OrderDate
</di>
<div class="col-sm-2 text-end">
@($"{quote.OrderAmount:N2}")
</div>
<div class="col-sm-3">
</div>
@if (!string.IsNullOrWhiteSpace(quote.OfficeNote))
{
<div class="col-sm-2"><i class="bi-pencil"></i> Note</div>
<div class="col-sm-10">
@quote.OfficeNote
</div>
}
</div>
</a>
}
}
else
{
<div class="list-group-item">Ingen data</div>
}
</div>
@code {
[Inject] ICrmHistoryHttpRepository HistoryRepo { get; set; }
protected override Task OnParametersSetAsync()
{
return base.OnParametersSetAsync();
}
@if (Working)
{
<WorkingThreeDots/>
}

30
Wonky.Client/Pages/CrmQuotes.razor.cs Normal file
View file

@ -0,0 +1,30 @@
using Microsoft.AspNetCore.Components;
using Wonky.Client.HttpInterceptors;
using Wonky.Client.HttpInterfaces;
using Wonky.Entity.DTO;
using Wonky.Entity.Views;
namespace Wonky.Client.Pages;
public partial class CrmQuotes : IDisposable
{
[Inject] public ICrmActivityHttpRepository ActivityRepo { get; set; }
[Inject] public HttpInterceptorService Interceptor { get; set; }
private List<ReportItemView> Quotes { get; set; } = new();
private bool Working = true;
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
Quotes = await ActivityRepo.GetQuotes();
if (Quotes.Any())
Quotes = Quotes.OrderBy(x => x.CreateTimestamp).ToList();
Working = false;
}
public void Dispose()
{
Interceptor.DisposeEvent();
}
}

36
Wonky.Client/Shared/NavMenu.razor
View file

@ -33,12 +33,12 @@
<NotAuthorized>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/" Match="NavLinkMatch.All">
<span class="oi oi-dashboard"></span> Start
<i class="bi-person-workspace pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Start
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/login">
<span class="oi oi-account-login"></span> Log ind
<i class="bi-lock pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Log ind
</NavLink>
</div>
</NotAuthorized>
@ -47,12 +47,12 @@
<AuthorizeView Roles="Admin">
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/office/users/advisors">
<span class="oi oi-people" aria-hidden="true"></span> Sælgere
<i class="bi-people pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Sælgere
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/price-catalog">
<span class="oi oi-spreadsheet" aria-hidden="true"></span> Priskatalog
<i class="bi-file-spreadsheet pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Priskatalog
</NavLink>
</div>
</AuthorizeView>
@ -60,17 +60,12 @@
<AuthorizeView Roles="Office">
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/office/users/advisors">
<span class="oi oi-people" aria-hidden="true"></span> Sælgere
<i class="bi-people pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Sælgere
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/price-catalog">
<span class="oi oi-spreadsheet" aria-hidden="true"></span> Priskatalog
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/warehouse/orders">
<span class="oi oi-box" aria-hidden="true"></span> Forsendelse
<i class="bi-file-spreadsheet pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Priskatalog
</NavLink>
</div>
</AuthorizeView>
@ -78,7 +73,7 @@
<AuthorizeView Roles="Warehouse,Admin,Office">
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/warehouse/orders/none">
<span class="oi oi-box" aria-hidden="true"></span> Forsendelse
<i class="bi-box pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Forsendelse
</NavLink>
</div>
</AuthorizeView>
@ -87,33 +82,38 @@
<Authorized>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/home">
<span class="oi oi-calendar" aria-hidden="true"></span> ToDo
<i class="bi-calendar pe-2" style="font-size:1.3em;" aria-hidden="true"></i> ToDo
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/companies">
<span class="oi oi-file" aria-hidden="true"></span> Firmaer
<i class="bi-building pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Firmaer
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/price-catalog">
<span class="oi oi-spreadsheet" aria-hidden="true"></span> Priskatalog
<i class="bi-file-spreadsheet pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Priskatalog
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/open-quotes">
<i class="bi-calculator pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Åbne Tilbud
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/activity-today">
<span class="oi oi-dashboard" aria-hidden="true"></span> Aktivitet
<i class="bi-activity pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Aktivitet
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/sales-reports">
<span class="oi oi-document" aria-hidden="true"></span> Dagsrapporter
<i class="bi-file-earmark-spreadsheet pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Dagsrapporter
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link ps-2" href="/info">
<span class="oi oi-question-mark" aria-hidden="true"></span> Hjælp
<i class="bi-question pe-2" style="font-size:1.3em;" aria-hidden="true"></i> Hjælp
</NavLink>
</div>
</Authorized>

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

@ -1,13 +1,12 @@
{
"appInfo": {
"name": "Wonky Client",
"version": "0.84.3",
"version": "0.85.2",
"rc": true,
"sandBox": false,
"image": "grumpy-coder.png"
},
"apiConfig": {
"baseUrl": "https://zeta.innotec.dk",
"catalog": "api/v2/catalog",
"crmCustomers": "api/v2/crm/companies",
"crmInventoryExt": "history/inventory",
@ -44,4 +43,4 @@
}
}
}
}
}