From b114eaa96941ad1b638f87e92e3a738192de5d19 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Fri, 24 Jun 2022 17:15:11 +0200 Subject: [PATCH] build v0.8.30 --- .../Pages/ActivityCompanyCreate.razor | 524 +++++++++--------- .../Pages/ActivityCompanyCreate.razor.cs | 23 +- Wonky.Client/wwwroot/appsettings.json | 2 +- 3 files changed, 266 insertions(+), 283 deletions(-) diff --git a/Wonky.Client/Pages/ActivityCompanyCreate.razor b/Wonky.Client/Pages/ActivityCompanyCreate.razor index 478ba33e..eea04f81 100644 --- a/Wonky.Client/Pages/ActivityCompanyCreate.razor +++ b/Wonky.Client/Pages/ActivityCompanyCreate.razor @@ -34,289 +34,278 @@
-
-
-

- -

-
-
-
- -
- - - - - - -
- -
- - - - - - -
-
+
+ @_draft.Name - @_draft.Account +
+
+
+ +
+ + + + + + +
+ +
+ + + + + + +
+
-
- -
- - -
- -
- - -
-
-
- -
- - -
- -
- - -
-
-
- -
- - -
- -
- - -
-
-
- -
- - -
-
+
+ +
+ + +
+ +
+ + +
+
+
+ +
+ + +
+ +
+ + +
+
+
+ +
+ + +
+ +
+ + +
+
+
+ +
+ +
+
@* Order lines *@

-
+
-
-
- + @* Order draft lines *@ +
+
+ Kladdelinjer Global kladde (udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet)
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- -
-
- @if (_caltalog.Any()) - { - - - - - - - - - - - @foreach (var item in _caltalog) - { - - - - - - - } - -
NavnVarenrForkStk / Pris
@item.Name@item.Sku@item.ShortName -
    - @foreach (var rate in item.Rates) - { -
  • -
    @rate.Quantity
    -
    @rate.Rate
    - -
    • - } -
-
- } - else - { - - } - @if (_selectedItem != null && ShowItem) - { -
-
Kladdelinje
-
-
- Varenavn -
-
- Varenr -
-
- Antal -
-
- Pris -
-
- Rabat -
-
- SAS -
-
- -
-
-
-
- @_selectedItem.Name -
-
- @_selectedItem.Sku -
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
- } - @* Order draft lines *@ -
-
- Kladdelinjer Global kladde (udløber efter @(DraftStateProvider.Draft.TimeToLiveInSeconds / 60)m inaktivitet) -
-
- - - - - - - - - - - - - @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) - { - @foreach (var cItem in DraftStateProvider.Draft.Items) +
NavnVarenrAntalEnhedsprisLinjesum 
+ + + + + + + + + + + + @if (DraftStateProvider != null && DraftStateProvider.Draft.Items.Count > 0) { + @foreach (var cItem in DraftStateProvider.Draft.Items) + { + + + + + + + + + + } - - - - - - - + + + + + + } - - - - - - - - - } - -
NavnVarenrAntalEnhedsprisLinjesum 
@cItem.Item.Name@cItem.Item.Sku@cItem.Quantity@cItem.Price@cItem.LineTotal + + + +
@cItem.Item.Name@cItem.Item.Sku@cItem.Quantity@cItem.Price@cItem.LineTotal - - - - Total@DraftStateProvider.Draft.Total
Total@DraftStateProvider.Draft.Total
-
-
-
-
- + + +
+
+ +
+ @* draft line *@ + @if (_selectedItem != null && ShowItem) + { +
+
Kladdelinje
+
+
+
+ Varenavn +
+
+ Varenr +
+
+ Antal +
+
+ Pris +
+
+ Rabat +
+
+ SAS +
+
+ +
+
+
+
+ @_selectedItem.Name +
+
+ @_selectedItem.Sku +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ } + @* catalog *@ +
+
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+
+ +
+
+ @if (_caltalog.Any()) + { + + + + + + + + + + + @foreach (var item in _caltalog) + { + + + + + + + } + +
NavnVarenrForkStk / Pris
@item.Name@item.Sku@item.ShortName +
    + @foreach (var rate in item.Rates) + { +
  • +
    @rate.Quantity
    +
    @rate.Rate
    + +
    • + } +
+
+ } + else + { + + } +
+
@* Delivery address *@

-

@@ -357,18 +346,19 @@
-
-
- Til Oversigt -
-
- Tilbage -
-
- @* *@ - -
-
+
+
+
+ Til Oversigt +
+
+ Tilbage +
+
+ +
+
+
\ No newline at end of file diff --git a/Wonky.Client/Pages/ActivityCompanyCreate.razor.cs b/Wonky.Client/Pages/ActivityCompanyCreate.razor.cs index 8057377a..5aff48c8 100644 --- a/Wonky.Client/Pages/ActivityCompanyCreate.razor.cs +++ b/Wonky.Client/Pages/ActivityCompanyCreate.razor.cs @@ -150,18 +150,14 @@ public partial class ActivityCompanyCreate : IDisposable var activityType = _draft.ActivityTypeEnum switch { - "phone" => "T", - "onSite" => "B", + "phone" => "T:", + "onSite" => "B:", _ => "" }; - _draft.OurRef = $"{activityType}:{Ux.FullName.Split(" ")[0]}"; + _draft.OurRef = $"{activityType}{Ux.FullName.Split(" ")[0]}"; var ln = 0; - - // post to create activity endpoint - var lines = new List(); - foreach (var item in DraftStateProvider.Draft.Items) - { - var line = new ActivityLineDto{ + var lines = DraftStateProvider.Draft.Items.Select(item => new ActivityLineDto + { Price = item.Price, Discount = item.Discount, Qty = item.Quantity, @@ -171,15 +167,12 @@ public partial class ActivityCompanyCreate : IDisposable LineAmount = item.LineTotal, LineNumber = ++ln, Sas = item.Sas - }; - lines.Add(line); - } + }) + .ToList(); _draft.Lines = lines; - - await _storage.SetItemAsync(CompanyId, _draft); - Console.WriteLine(JsonSerializer.Serialize(_draft)); var result = await _activityRepo.CreateActivity(_draft); _toast.ShowSuccess($"{result.Message}."); + await DraftStateProvider.DeleteDraftAsync(); _navigator.NavigateTo($"/companies"); } diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 93f499ef..f65255c4 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -18,7 +18,7 @@ }, "appInfo": { "name": "Wonky Client", - "version": "0.8.24", + "version": "0.8.30", "isBeta": true, "image": "grumpy-coder.png" },