diff --git a/Wonky.Client/Components/InfoAdvisorComponent.razor b/Wonky.Client/Components/InfoAdvisorComponent.razor new file mode 100644 index 00000000..092c4913 --- /dev/null +++ b/Wonky.Client/Components/InfoAdvisorComponent.razor @@ -0,0 +1,47 @@ +

Sælger

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SymbolBetydning
+ + ToDo liste
+ + Pris katalog
+ + Firmaer/Kunder
+ + Aftaler/Tilbud
+ + Aktivitet
+ + Dagsrapporter
\ No newline at end of file diff --git a/Wonky.Client/Components/InfoCommonComponent.razor b/Wonky.Client/Components/InfoCommonComponent.razor new file mode 100644 index 00000000..d178278d --- /dev/null +++ b/Wonky.Client/Components/InfoCommonComponent.razor @@ -0,0 +1,37 @@ +

Fælles

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SymbolBetydning
Gem data
Søg data
Opret ny
Udskrivning
Indstillinger
Log af
Hjælp/Info
diff --git a/Wonky.Client/Components/InfoOfficeComponent.razor b/Wonky.Client/Components/InfoOfficeComponent.razor new file mode 100644 index 00000000..f85cabcb --- /dev/null +++ b/Wonky.Client/Components/InfoOfficeComponent.razor @@ -0,0 +1,23 @@ +

Kontor

+ + + + + + + + + + + + + + + + + +
SymbolBetydning
+ + Brugere
+ + Pakning / Forsendelse
\ No newline at end of file diff --git a/Wonky.Client/Components/InfoWarehouseComponent.razor b/Wonky.Client/Components/InfoWarehouseComponent.razor new file mode 100644 index 00000000..ee8efefd --- /dev/null +++ b/Wonky.Client/Components/InfoWarehouseComponent.razor @@ -0,0 +1,17 @@ +

Lager

+ + + + + + + + + + + + + +
SymbolBetydning
+ + Pakning / Forsendelse
\ No newline at end of file diff --git a/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor b/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor deleted file mode 100644 index 93998911..00000000 --- a/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor +++ /dev/null @@ -1,5 +0,0 @@ -

CustomerInvoiceOverlay

- -@code { - -} \ No newline at end of file diff --git a/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor.cs b/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor.cs deleted file mode 100644 index 74503b56..00000000 --- a/Wonky.Client/Overlays/CustomerInvoiceOverlay.razor.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace Wonky.Client.Overlays; - -public partial class CustomerInvoiceOverlay -{ - -} \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor index 4d92e602..0b98ae7c 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor @@ -34,7 +34,7 @@

Ring til kontoret. Denne konto er spærret med kode '@Company.Blocked'

} -
+

@Activity.Name - @Activity.Account

@@ -54,7 +54,7 @@ else -
+
@@ -124,18 +124,6 @@ else
- -
- - -
- - -
- - -
-
@@ -148,22 +136,35 @@ else
- +
-
+ + +
+ + +
+ +
+ +
+
-
-
- +
+
+
-
- +
+
-
- +
+
@@ -330,7 +331,7 @@ else Kundekort
- +
} diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 04df9dc7..a81d1736 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -67,7 +67,6 @@ public partial class AdvisorActivityCreatePage : IDisposable private UserInfoView SalesRep { get; set; } = new(); private DateTime SelectedDate { get; set; } private string OldPhone { get; set; } = ""; - private string PromptDateConfirm { get; set; } = ""; // MODAL DIALOGS private PriceCatalogModal PriceCatalogModal { get; set; } = new(); @@ -77,6 +76,7 @@ public partial class AdvisorActivityCreatePage : IDisposable private ConfirmProductCheckModal ConfirmProductCheckModal { get; set; } = new(); private List CheckList { get; set; } = new(); private string ButtonText { get; set; } = "Gem besøg"; + private bool OrgWarning { get; set; } /// @@ -152,13 +152,19 @@ public partial class AdvisorActivityCreatePage : IDisposable PoFormInvalid = false; } Working = false; - //StateHasChanged(); - if (Company.CountryCode.ToLower() == "se" && VatUtils.SanitizeVatNumber(Activity.VatNumber).Length < 10) - { - Toaster.ShowWarning("Organisationsnummer skal opdateres."); - } } + private void ShowOrgWarning() + { + if (OrgWarning) + return; + OrgWarning = true; + if (Company.CountryCode.ToLower() == "se" && VatUtils.SanitizeVatNumber(Activity.VatNumber).Length < 10 && Activity.ActivityStatusEnum == "order") + { + Toaster.ShowWarning("Org nummer er ufuldstændig. Skal opdateres før bestilling kan sendes. ", "ADVARSEL"); + } + } + private async Task CallConfirmProductCheckModel() { // check if new account @@ -464,12 +470,11 @@ public partial class AdvisorActivityCreatePage : IDisposable DraftProvider.Draft.Items = new List(); } - ButtonText = Activity.ActivityStatusEnum switch + ButtonText = Activity.ActivityStatusEnum.ToLower() switch { - "noSale" => "Gem Besøg", - "order" => "Gem Bestilling", - "quote" => "Gem Tilbud", - _ => ButtonText + "nosale" => "Gem Besøg", + "order" => "Send Bestilling", + "quote" => "Send Tilbud" }; // InvalidCanvas = InvalidActivityType; @@ -499,12 +504,16 @@ public partial class AdvisorActivityCreatePage : IDisposable PoFormInvalid = true; return; } - - if (Company.CountryCode.ToLower() == "se" && VatUtils.SanitizeVatNumber(Activity.VatNumber).Length < 10) + + if (Activity.ActivityStatusEnum.ToLower() is "order" or "quote" + && Company.CountryCode.ToLower() == "se" + && VatUtils.SanitizeVatNumber(Activity.VatNumber).Length < 10) { + ShowOrgWarning(); PoFormInvalid = true; return; } + PoFormInvalid = false; ActivityContext.OnFieldChanged -= HandleFieldChanged; ActivityContext.OnValidationStateChanged -= ValidationChanged; diff --git a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor index 6bf0de0b..baf37c9f 100644 --- a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor @@ -31,7 +31,20 @@
@* vat lookup *@
- +
+ @switch (Company.CountryCode) + { + case "dk": + + break; + case "no": + Firma søgning + break; + case "se": + Firma søgning + break; + } +
@* entity name *@ @@ -70,7 +83,7 @@
@* entity vat number *@ - +
@@ -100,7 +113,7 @@
-
+
@@ -125,7 +138,7 @@
-
+
diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs index d55ad114..97ffce46 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs @@ -23,9 +23,9 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable [Inject] private ILogger Logger { get; set; } private InvoiceListView CompanyInvoices { get; set; } = new(); private CompanyDto Company { get; set; } = new(); - private bool Working { get; set; } private InvoiceViewModal InvoiceView { get; set; } = new(); private string InvoiceId { get; set; } = ""; + private bool Working { get; set; } private bool AllSet { get; set; } private string _companyId = ""; diff --git a/Wonky.Client/Pages/AdvisorCustomerViewPage.razor b/Wonky.Client/Pages/AdvisorCustomerViewPage.razor index 06834695..1e9c1f9f 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerViewPage.razor @@ -95,7 +95,7 @@
- +
@* account *@ @@ -104,7 +104,7 @@
@* vat number*@ - +
@@ -131,7 +131,7 @@
@* save vat number *@
- +
@@ -173,7 +173,7 @@
@* Save CRM data button *@
- +
@* crm context - contacts *@ diff --git a/Wonky.Client/Pages/InfoPage.razor b/Wonky.Client/Pages/InfoPage.razor index a25c6f31..a6e68da8 100644 --- a/Wonky.Client/Pages/InfoPage.razor +++ b/Wonky.Client/Pages/InfoPage.razor @@ -39,11 +39,23 @@
- +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/Wonky.Client/Overlays/CustomerInventoryOverlay.razor b/Wonky.Client/Shared/CustomerInventoryOverlay.razor similarity index 100% rename from Wonky.Client/Overlays/CustomerInventoryOverlay.razor rename to Wonky.Client/Shared/CustomerInventoryOverlay.razor diff --git a/Wonky.Client/Overlays/CustomerInventoryOverlay.razor.cs b/Wonky.Client/Shared/CustomerInventoryOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlays/CustomerInventoryOverlay.razor.cs rename to Wonky.Client/Shared/CustomerInventoryOverlay.razor.cs diff --git a/Wonky.Client/Shared/CustomerInvoiceOverlay.razor b/Wonky.Client/Shared/CustomerInvoiceOverlay.razor new file mode 100644 index 00000000..c854495c --- /dev/null +++ b/Wonky.Client/Shared/CustomerInvoiceOverlay.razor @@ -0,0 +1,20 @@ + + + diff --git a/Wonky.Client/Shared/CustomerInvoiceOverlay.razor.cs b/Wonky.Client/Shared/CustomerInvoiceOverlay.razor.cs new file mode 100644 index 00000000..a32a8580 --- /dev/null +++ b/Wonky.Client/Shared/CustomerInvoiceOverlay.razor.cs @@ -0,0 +1,31 @@ +using Microsoft.AspNetCore.Components; +using Wonky.Entity.DTO; +using Wonky.Entity.Views; + + +namespace Wonky.Client.Shared; + +public partial class CustomerInvoiceOverlay +{ + [Parameter] public InvoiceListView CompanyInvoices { get; set; } = new(); + [Parameter] public CompanyDto Company { get; set; } = new(); + [Parameter] public InvoiceViewModal InvoiceView { get; set; } = new(); + private string InvoiceId { get; set; } = ""; + private string _modalDisplay = ""; + private bool _showBackdrop; + + public void Show() + { + _modalDisplay = "block;"; + _showBackdrop = true; + StateHasChanged(); + } + + private void Hide() + { + _modalDisplay = "none;"; + _showBackdrop = false; + StateHasChanged(); + } + +} \ No newline at end of file diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index 201a97bf..5841b7d1 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -92,14 +92,16 @@ Dagsrapporter
- -
- - Hjælp - -
+ + +
+ + Hjælp + +
+
diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index ae7de65b..9489d99f 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -3795,4 +3795,8 @@ + + + + diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index e92f3a3a..f2d2f7a6 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "0.103.1", + "version": "0.103.9", "rc": true, "sandBox": false, "image": "grumpy-coder.png"