b2b order

Wonky.Client/App.razor

@@ -13,8 +13,6 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 *@
 
-@using Wonky.Client.Pages
-
 <CascadingAuthenticationState>
     <DraftStateProvider>
         <Router AppAssembly="@typeof(App).Assembly">

Wonky.Client/Components/OfficeCountryCustomerListComponent.razor

@@ -18,18 +18,13 @@
 @using Wonky.Client.Helpers;
 @using Wonky.Client.OverlayOffice
 
+<div class="office-customer-paged">
     @if (CompanyList.Any())
     {
-    <div class="row mt-2 d-flex g-3">
+        <div class="row mt-2 d-flex g-1">
             @foreach (var company in CompanyList)
             {
-            <div class="mx-3 card px-0 col-sm-12 col-lg-6 col-xxl-4" style="width:500px;">
+                <div class="card me-1 px-0 col-sm-12 col-lg-6 col-xxl-4" style="width:460px;">
-                @*
-            <div class="row g-0">
-            
-            <div class="col-sm-12 col-md-6 col-lg-4 col-xl-3">
-                <div class="card">
-                    *@
                     @if (string.IsNullOrWhiteSpace(company.Blocked))
                     {
                         <div class="card-header fw-bold @(company.HasFolded == 1 ? "alert alert-dark" : "alert alert-success")">
@@ -86,7 +81,7 @@
                                 </td>
                                 <td></td>
                                 <td class="align-middle">
-                                <button class="btn btn-sm btn-secondary w-100" @onclick="() => RequestBusinessCentralData(company.CompanyId, true)"><i class="bi-arrow-repeat"></i> BC</button>
+                                    <button class="btn btn-sm btn-secondary w-100" disabled="@(company.Account.StartsWith("NY") || company.Account.StartsWith("KA"))" @onclick="() => RequestBusinessCentralData(company.CompanyId, true)"><i class="bi-arrow-repeat"></i> BC</button>
                                 </td>
                             </tr>
                             </tbody>
@@ -109,7 +104,6 @@
                         </div>
                     </div>
                 </div>
-            // </div>
             }
         </div>
         <OfficeCustomerInvoiceListOverlay Company="@SelectedCompany" InvoiceList="@InvoiceList" @ref="@InvoiceListOverlay"/>
@@ -120,3 +114,4 @@ else
     {
         <div>Ingen data</div>
     }
+</div>

Wonky.Client/Components/SearchPhraseComponent.razor

@@ -14,8 +14,9 @@
 *@
 
 <div class="input-group">
-    <input id="search-input" type="text" class="form-control" placeholder="Søg ..." aria-described-by="search-addon"
+    <input id="search-input" tabindex="-1" type="text" class="form-control" placeholder="Søg ..." aria-described-by="search-addon"
            @bind-value="SearchTerm" @bind-value:event="oninput" @onkeyup="@OnSearchChanged"/>
-    <span class="input-group-text" id="search-addon"><i class="bi-backspace" @onclick="@ClearSearch"></i></span>
+    <span class="input-group-text" id="search-addon">
+        <i class="bi-backspace" @onclick="@ClearSearch"></i>
+    </span>
 </div>
-

Wonky.Client/Components/SearchPhraseComponent.razor.cs

@@ -15,7 +15,9 @@
 
 using System.Timers;
 using Microsoft.AspNetCore.Components;
+using Toolbelt.Blazor.HotKeys2;
 using Timer = System.Timers.Timer;
+using Wonky.Client.Helpers;
 
 namespace Wonky.Client.Components;
 

Wonky.Client/HttpRepository/CountryCustomerRepository.cs

@@ -78,8 +78,8 @@ public class CountryCustomerRepository : ICountryCustomerRepository
         var content = await response.Content.ReadAsStringAsync();
         var pagingResponse = new PagingResponse<CompanyDto>
         {
-            Items = JsonSerializer.Deserialize<List<CompanyDto>>(content, _options) ?? new List<CompanyDto>(),
+            Items = JsonSerializer.Deserialize<List<CompanyDto>>(content, _options),
-            MetaData = JsonSerializer.Deserialize<MetaData>(response.Headers.GetValues("X-Pagination").First(), _options) ?? new MetaData()
+            MetaData = JsonSerializer.Deserialize<MetaData>(response.Headers.GetValues("X-Pagination").First(), _options)
         };
         return pagingResponse;
     }
@@ -91,8 +91,7 @@ public class CountryCustomerRepository : ICountryCustomerRepository
     /// <param name="salesRepId"></param>
     /// <param name="paging"></param>
     /// <returns></returns>
-    public async Task<PagingResponse<CompanyDto>> GetCompaniesPaged(string countryCode, string salesRepId,
+    public async Task<PagingResponse<CompanyDto>> GetCompaniesPaged(string countryCode, string salesRepId, CustomerPaging paging)
-        CustomerPaging paging)
     {
         var queryDictionary = new Dictionary<string, string>
         {

Wonky.Client/Pages/BusinessOrderViewPage.razor

@@ -42,6 +42,16 @@
             @CountryCode.ToUpper()-@Activity.DlvZipCode @Activity.DlvCity
         </div>
     </div>
+    <div class="card-body">
+        <div class="row">
+            <div class="col">
+                <label for="acceptCondition">Accepter betingelser</label>
+                <InputCheckbox id="acceptCondition" class="form-check-input" bind-Value="@ConditionsAccepted" bind-Value:event="onchange"></InputCheckbox>
+                <button class="btn btn-primary" @onclick="CreateActivity">Send Bestilling</button>
+                <button class="btn btn-secondary" onclick="history.back()">Tilbage</button>
+            </div>
+        </div>
+    </div>
     <div class="card-body">
         <div class="list-group-item">
             <div class="row">
@@ -71,4 +81,15 @@
             }
         </div>
     </div>
+    <div class="card-body">
+        <div class="list-group">
+            <div class="list-group-item-info">Bestillingen følger de til enhver tid gældende listepriser</div>
+            <div class="list-group-item-info">Individuelle aftaler honoreres</div>
+            <div class="list-group-item-info">Priser tillægges moms og afgifter</div>
+            <div class="list-group-item-info">Ved tvivl om gældede priser kontaktes Innotec's konsulent</div>
+            <div class="list-group-item-info">Fragt og Leveringomkostninger tillægges</div>
+            <div class="list-group-item-info">Betaling netto kontant</div>
+            <div class="list-group-item-info">Varer forbliver Innotec's ejendom til betaling er modtaget</div>
+        </div>
+    </div>
 </div>

Wonky.Client/Pages/BusinessOrderViewPage.razor.cs

@@ -40,6 +40,7 @@ public partial class BusinessOrderViewPage
     private ActivityDto Activity { get; set; } = new();
     private DateTime SelectedDate { get; set; }
     private bool Working { get; set; } = true;
+    private bool ConditionsAccepted { get; set; }
     
 
     protected override async Task OnInitializedAsync()

Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs

@@ -21,7 +21,6 @@ using Wonky.Client.HttpRepository;
 using Wonky.Client.Local.Services;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Requests;
-using Wonky.Entity.Views;
 #pragma warning disable CS8618
 
 namespace Wonky.Client.Pages;
@@ -40,7 +39,7 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
     [Parameter] public string CountryCode { get; set; } = "";
 
     // #############################################################
-    private List<CompanyDto> Companies { get; set; } = new();
+    private List<CompanyDto> Companies { get; set; } = [];
     private UserPreference Preference { get; set; } = new();
     private UserManagerEditView XUserInfo { get; set; } = new();
     private string SavedSearch { get; set; } = "";
@@ -50,11 +49,11 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
     private CustomerPaging Paging { get; set; } = new();
     private string ToggleFoldedText { get; set; } = "Vis Lukkede";
 
-    protected override async Task OnParametersSetAsync()
+    protected override Task OnParametersSetAsync()
     {
         Interceptor.RegisterEvent();
         Interceptor.RegisterBeforeSendEvent();
-        await FetchCustomers();
+        return FetchCustomers();
     }
 
     protected override async Task OnInitializedAsync()
@@ -71,8 +70,12 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
         Paging.HasFolded = ShowFolded ? 1 : 0;
         
         // load saved search
-        SavedSearch = string.IsNullOrWhiteSpace(Preference.CompanyFilterPhrase) ? "" : Preference.CompanyFilterPhrase;
+        SavedSearch = string.IsNullOrWhiteSpace(Preference.CompanyFilterPhrase) 
+            ? "" 
+            : Preference.CompanyFilterPhrase;
+        
         await SetSearchPhrase(SavedSearch);
+        
         Working = false;
     }
 
@@ -93,70 +96,70 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
         }
         else
         {
-            Companies = new List<CompanyDto>();
+            Companies = [];
             PageData = new MetaData();
         }
         Working = false;
     }
         
 
-    private async Task ToggleFolded()
+    private Task ToggleFolded()
     {
         Working = true;
         ShowFolded = !ShowFolded;
         ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede";
-        Companies = new List<CompanyDto>();
+        Companies = [];
         Paging.PageNumber = 1;
         Paging.HasFolded = ShowFolded ? 1 : 0;
-        await FetchCustomers();
+        return FetchCustomers();
     }
     
     
-    private async Task SetSelectedPage(int page)
+    private Task SetSelectedPage(int page)
     {
         Working = true;
         Companies = new List<CompanyDto>();
         Paging.PageNumber = page;
-        await FetchCustomers();
+        return FetchCustomers();
     }
     
     
-    private async Task SetSearchCol(string searchColumn)
+    private Task SetSearchCol(string searchColumn)
     {
         Working = true;
-        Companies = new List<CompanyDto>();
+        Companies = [];
         Paging.SearchColumn = searchColumn;
         Paging.PageNumber = 1;
-        await FetchCustomers();
+        return FetchCustomers();
     }
     
     
-    private async Task SetPageSize(string pageSize)
+    private Task SetPageSize(string pageSize)
     {
         Working = true;
-        Companies = new List<CompanyDto>();
+        Companies = [];
         Paging.PageSize = Convert.ToInt32(pageSize);
         Paging.PageNumber = 1;
-        await FetchCustomers();
+        return FetchCustomers();
     }
 
     
-    private async Task SetSearchPhrase(string searchTerm)
+    private Task SetSearchPhrase(string searchTerm)
     {
         Working = true;
-        Companies = new List<CompanyDto>();
+        Companies = [];
         Paging.PageNumber = 1;
         Paging.SearchTerm = searchTerm;
-        await FetchCustomers();
+        return FetchCustomers();
     }
 
     
-    private async Task SetSortCol(string orderBy)
+    private Task SetSortCol(string orderBy)
     {
         Working = true;
-        Companies = new List<CompanyDto>();
+        Companies = [];
         Paging.OrderBy = orderBy;
-        await FetchCustomers();
+        return FetchCustomers();
     }
 
     

Wonky.Client/Program.cs

@@ -50,6 +50,8 @@ builder.Services.AddHttpClient("inno-api", (sp, cl) =>
 
 builder.Services.AddBlazoredToast();
 builder.Services.AddHttpClientInterceptor();
+builder.Services.AddHotKeys2();
+
 // api config object
 builder.Services.Configure<ApiConfig>(builder.Configuration.GetSection("ApiConfig"));
 // app info object

Wonky.Client/Wonky.Client.csproj

@@ -19,6 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="8.0.0" />
+    <PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="3.2.1" />
     <PackageReference Include="Toolbelt.Blazor.HttpClientInterceptor" Version="10.2.0" />
   </ItemGroup>
 

Wonky.Client/wwwroot/appsettings.json

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

Wonky.Client/wwwroot/css/app.css

@@ -3,6 +3,10 @@
     /*background-color: #eeeeee;*/
 }
 
+.office-customer-paged {
+    left: 0;
+    width: 100%;
+}
 .draft-expires-msg {
     font-size: 0.8em;
 }