diff --git a/Wonky.Client/Components/ProductInventoryTableComponent.razor b/Wonky.Client/Components/ProductInventoryTableComponent.razor index 0e85ff38..5d2ccf09 100644 --- a/Wonky.Client/Components/ProductInventoryTableComponent.razor +++ b/Wonky.Client/Components/ProductInventoryTableComponent.razor @@ -18,6 +18,7 @@ @if (Inventory.Any()) { + @* + *@ @foreach (var product in Inventory) { @@ -48,7 +50,7 @@ @product.Quantity } diff --git a/Wonky.Client/Pages/CrmActivityNewPage.razor b/Wonky.Client/Pages/CrmActivityNewPage.razor index da7f9a35..63042de1 100644 --- a/Wonky.Client/Pages/CrmActivityNewPage.razor +++ b/Wonky.Client/Pages/CrmActivityNewPage.razor @@ -250,6 +250,7 @@ else } + @* end draft line ------------------------------------------------- *@
@* diff --git a/Wonky.Client/Pages/CrmActivityNewPage.razor.cs b/Wonky.Client/Pages/CrmActivityNewPage.razor.cs index 949659b6..784e10aa 100644 --- a/Wonky.Client/Pages/CrmActivityNewPage.razor.cs +++ b/Wonky.Client/Pages/CrmActivityNewPage.razor.cs @@ -298,6 +298,7 @@ public partial class CrmActivityNewPage : IDisposable private async Task DeleteDraft() { await DraftStateProvider.DeleteDraftAsync(); + Activity.ActivityStatusEnum = "noSale"; } /// /// Add item to draft @@ -322,6 +323,8 @@ public partial class CrmActivityNewPage : IDisposable Discount = "0"; // add it to the cart DraftStateProvider.Draft.Items.Add(item); + if(Activity.ActivityStatusEnum != "quote") + Activity.ActivityStatusEnum = "order"; // save the item using the CartStateProvider's save method await DraftStateProvider.SaveChangesAsync(); } @@ -335,6 +338,8 @@ public partial class CrmActivityNewPage : IDisposable DraftStateProvider.Draft.Items.Remove(item); // save the remaining draft await DraftStateProvider.SaveChangesAsync(); + if (!DraftStateProvider.Draft.Items.Any()) + Activity.ActivityStatusEnum = "noSale"; } /// /// Edit Context handle field change diff --git a/Wonky.Client/Pages/CrmCompanyActivityListPage.razor b/Wonky.Client/Pages/CrmCompanyActivityListPage.razor index 48701df3..faeada60 100644 --- a/Wonky.Client/Pages/CrmCompanyActivityListPage.razor +++ b/Wonky.Client/Pages/CrmCompanyActivityListPage.razor @@ -26,30 +26,49 @@ @if (_activities.Any()) {
- - @foreach (var activity in _activities) - {
- @activity.OrderDate +

Dato

- @activity.Demo +

Demo

- @activity.Sales +

Salg

- @activity.VisitTypeEnum +

Note /Kontor

+
+
Note /Selv
+
+
+ @foreach (var activity in _activities) + { +
+
+
+ @activity.OrderDate +
+
+ @activity.Demo +
+
+ @activity.Sales +
+
+ @activity.OfficeNote +
+
+ +
-
- } - + } +
} else { - -} + +} \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmCompanyViewPage.razor b/Wonky.Client/Pages/CrmCompanyViewPage.razor index 457b1fd1..3227ff25 100644 --- a/Wonky.Client/Pages/CrmCompanyViewPage.razor +++ b/Wonky.Client/Pages/CrmCompanyViewPage.razor @@ -203,7 +203,7 @@ Kundeliste
- Aktivitet + Besøg oversigt
Produktkøb diff --git a/Wonky.Client/Shared/InventoryReorderModal.razor b/Wonky.Client/Shared/InventoryReorderModal.razor index d0ec2a10..f3c434e9 100644 --- a/Wonky.Client/Shared/InventoryReorderModal.razor +++ b/Wonky.Client/Shared/InventoryReorderModal.razor @@ -20,70 +20,91 @@
-
@ProductName
+

@SalesItem.Name @SalesItem.Sku

-
-
- @SalesItem.Name -
-
- @SalesItem.Sku -
-
- @SalesItem.ShortName -
-
-
    - @foreach (var rate in SalesItem.Rates) - { -
  • -
    @rate.Quantity
    -
    @rate.Rate
    -
    - - - -
    -
    • - } -
-
-
- - @if (!string.IsNullOrWhiteSpace(ProductName)) - { -
@@ -34,6 +35,7 @@
- + Historik
- - - - - - - - - - - @foreach (var entry in History) - { + @* draft line ----------------------------------------------------- *@ +
+
+
DatoAntalRabatPris
+ + + + - - - - - + + + + + + + + + + + + + - } - -
BESTILLING
@entry.DeliveryDate@entry.Quantity@entry.Discount@entry.Price - + AntalPrisRabatSAS
+ + +
+ +
+ 		+ + + + +
- } - else - { -

Ingen data

- } + + + + + @* end draft line ------------------------------------------------- *@ + @* price list item ------------------------------------------------ *@ +
+ @foreach (var rate in SalesItem.Rates) + { +
+ + @rate.Quantity @rate.Rate/stk + +
+ } +
+ @* end price list item -------------------------------------------- *@ + + @* product history ------------------------------------------------ *@ + + + + + + + + + + + + @foreach (var entry in History) + { + + + + + + + + } + +
DatoAntalRabatPris
@entry.DeliveryDate@entry.Quantity@entry.Discount@entry.Price + +
+ @* end product history -------------------------------------------- *@ diff --git a/Wonky.Client/Shared/InventoryReorderModal.razor.cs b/Wonky.Client/Shared/InventoryReorderModal.razor.cs index 99dabee3..1a96cfb2 100644 --- a/Wonky.Client/Shared/InventoryReorderModal.razor.cs +++ b/Wonky.Client/Shared/InventoryReorderModal.razor.cs @@ -30,13 +30,13 @@ public partial class InventoryReorderModal [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public SalesItemView SalesItem { get; set; } = new(); [Inject] public ICrmHistoryHttpRepository CrmHistoryRepo { get; set; } - [Parameter] public EventCallback OnSelected { get; set; } - - private List History { get; set; } + private List History { get; set; } = new(); + private DraftItem SelectedItem { get; set; } = new(); private string ProductName { get; set; } = ""; private string _modalDisplay = ""; private bool _showBackdrop; + private bool ShowDraft { get; set; } protected override async Task OnParametersSetAsync() { @@ -44,36 +44,33 @@ public partial class InventoryReorderModal return; History = await CrmHistoryRepo.FetchHistory(CompanyId, SalesItem.Sku); - if (History.Any()) - { - ProductName = History[0].Description; - } + SelectedItem.Item = SalesItem; + SelectedItem.Discount = 0; + SelectedItem.Quantity = 1; + SelectedItem.Price = decimal.Parse(SalesItem.Rates[0].Rate, CultureInfo.InvariantCulture); } - private void SelectItem(string quantity, string rate) + private async Task SendToOrder(DraftItem item) { - var result = new DraftItem - { - Discount = 0, - Item = SalesItem, - Price = decimal.Parse(rate, CultureInfo.InvariantCulture), - Quantity = int.Parse(quantity) - }; - OnSelected.InvokeAsync(result); + SelectedItem = new DraftItem(); + await OnSelected.InvokeAsync(item); Hide(); } - - private void SelectLine(ProductHistoryView item) + + private void SelectPrice(string quantity, string rate) { - var result = new DraftItem - { - Discount = item.Discount, - Item = SalesItem, - Price = item.Price, - Quantity = item.Quantity, - }; - OnSelected.InvokeAsync(result); - Hide(); + SelectedItem.Discount = 0; + SelectedItem.Price = decimal.Parse(rate, CultureInfo.InvariantCulture); + SelectedItem.Quantity = int.Parse(quantity); + StateHasChanged(); + } + + private void SelectHistory(ProductHistoryView item) + { + SelectedItem.Discount = item.Discount; + SelectedItem.Price = item.Price; + SelectedItem.Quantity = item.Quantity; + StateHasChanged(); } public void Show() @@ -85,6 +82,7 @@ public partial class InventoryReorderModal private void Hide() { + SelectedItem = new DraftItem(); _modalDisplay = "none;"; _showBackdrop = false; StateHasChanged(); diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 987be5b6..70c95ff4 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.27.2", - "rc": true, + "version": "0.28.0", + "rc": false, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "innoBaseUrl": "https://dev.innotec.dk", + "innoBaseUrl": "https://app.innotec.dk", "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=", "glsId": "", "serviceVirk": "api/v2/services/virk",