diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 624a2c3d..c872e53e 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -258,18 +258,17 @@ public partial class AdvisorActivityCreatePage : IDisposable Working = true; // pop a message Toaster.ShowError( - "Produkt gennemgang mangler. Vent mens produkt oversigt indlæses. Gå ikke væk fra siden!", - "Produkt check ..."); + "Produkt gennemgang mangler. Vent mens produkt oversigt indlæses. Gå ikke væk fra siden!"); // product inventory has not been updated // send rpc call to sync ERP to CRM - Toaster.ShowInfo("Vent mens data synkroniseres ...", "ERP til CRM ..."); + Toaster.ShowInfo("Vent mens data synkroniseres ..."); var ts = await HistoryRepo.InvoiceErpToCrmRpc(CompanyId, Company.HistorySync); while (string.IsNullOrWhiteSpace(ts)) await Task.Delay(500); // save pDate await Storage.SetItemAsync($"{CompanyId}-pDate", ts); // request products from backend - Toaster.ShowInfo("Vent mens produkt oversigt hentes", "CRM produkt liste"); + Toaster.ShowInfo("Vent mens produkt oversigt hentes"); CheckList = await HistoryRepo.FetchInventory(CompanyId); if (CheckList.Any()) @@ -489,8 +488,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // show result message if (result.IsSuccess) { - Toaster.ShowSuccess($"{result.Message}", - DraftProvider.Draft.Items.Count == 0 ? "Besøg er oprettet" : "Bestilling/Tilbud er oprettet"); + Toaster.ShowSuccess($"{result.Message}"); await DeleteDraft(); Navigator.NavigateTo($"/advisor/customers"); return; @@ -499,7 +497,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // lower working flag Working = false; // show error message - Toaster.ShowError(result.Message, "ORDRE FEJL"); + Toaster.ShowError(result.Message); } @@ -511,7 +509,7 @@ public partial class AdvisorActivityCreatePage : IDisposable if (Company.CountryCode.ToLower() == "se" && Utils.StringToDigits(Activity.VatNumber).Length < 10 && Activity.ActivityStatusEnum == "order") { - Toaster.ShowWarning("Org nummer er ufuldstændig. Skal opdateres før bestilling kan sendes. ", "ADVARSEL"); + Toaster.ShowWarning("Org nummer er ufuldstændig. Skal opdateres før bestilling kan sendes. "); } } diff --git a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs index 031c81f9..401c5f83 100644 --- a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs @@ -58,7 +58,7 @@ public partial class AdvisorActivityTodayListPage : IDisposable private async Task GetActivities(string workDate) { Working = true; - Toaster.ShowInfo("Vent nogle sekunder for data", "HENTER DATA"); + Toaster.ShowInfo("Vent nogle sekunder for data"); SelectedDate = DateTime.Parse(workDate); ReportStatusView = new ReportStatusView(); ReportExist = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs index 3c9fb10e..686ecc44 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs @@ -305,7 +305,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable if (Working) return; Working = true; - Toaster.ShowInfo("Vent venligst ...", "OPDATERER CRM DATA"); + Toaster.ShowInfo("Vent venligst ..."); Company.LastVisit = $"{LastVisit:yyyy-MM-dd}"; Company.NextVisit = $"{NextVisit:yyyy-MM-dd}"; Company.IsHidden = 0; @@ -330,7 +330,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable return; ErpEditDisabled = true; Working = true; - Toaster.ShowInfo("Vent venligst ...", "OPDATERER STAM DATA"); + Toaster.ShowInfo("Vent venligst ..."); var result = await CustomerRepo.UpdateErpData(CompanyId, Company); if (!string.IsNullOrWhiteSpace(result.CompanyId)) { @@ -359,7 +359,7 @@ public partial class AdvisorCustomerViewEditPage : IDisposable return; VatEditDisabled = true; Working = true; - Toaster.ShowInfo("Vent venligst ...", "OPDATERER MOMS NUMMER"); + Toaster.ShowInfo("Vent venligst ..."); var result = await CustomerRepo.UpdateCompanyVat(CompanyId, Company.VatNumber); if (!string.IsNullOrWhiteSpace(result.CompanyId)) { diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs index 79ae66f4..ee9f8bc3 100644 --- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs @@ -76,7 +76,7 @@ public partial class AdvisorQuoteListPage : IDisposable quote.QuoteStatusEnum = Utils.EnumToString(args.Status); // send update request to backend var response = await AdvisorActivityRepo.UpdateQuoteStatus(quote); - Toaster.ShowInfo($"{response.Message}", $"HTTP STATUS {response.Code}"); + Toaster.ShowInfo($"{response.Message}"); // clear and reload quotes QuoteList = new List(); await Storage.RemoveItemAsync("quotes"); diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index d7455de9..04c7e915 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -168,7 +168,7 @@ public partial class AdvisorReportCreatePage : IDisposable Report.Figures.DistancePrivateMonth = Report.Figures.DistancePrivate + CurrKmPrivate; if (Report.Figures.Distance is > 1000 or < 0) { - Toaster.ShowError($"Kørte km for rapporten er '{Report.Figures.Distance}'. Er du sikker på at det er rigtigt?", "KM tal"); + Toaster.ShowError($"Kørte km for rapporten er '{Report.Figures.Distance}'. Er du sikker på at det er rigtigt?"); } StateHasChanged(); } @@ -219,13 +219,13 @@ public partial class AdvisorReportCreatePage : IDisposable // check day type if (string.IsNullOrWhiteSpace(Report.DayTypeEnum)) { - Toaster.ShowError("Dagtype skal vælges", "Dag type mangler"); + Toaster.ShowError("Dagtype skal vælges"); return; } // distance day check - only if not leave if (Report.Figures.KmMorning > Report.Figures.KmEvening && !Report.DayTypeEnum.ToLower().Contains("leave")) { - Toaster.ShowError("Km udregning er negativ - kontroller venligst km tal", "Kontroller km tal"); + Toaster.ShowError("Km udregning er negativ - kontroller venligst km tal"); return; } // local working variables diff --git a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs index 4b3207c7..16fbd244 100644 --- a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs @@ -316,7 +316,7 @@ public partial class OfficeOrderCreatePage : IDisposable // show result message if (result.IsSuccess) { - Toaster.ShowSuccess($"{result.Message}", "Telefon Ordre oprettet"); + Toaster.ShowSuccess($"{result.Message}"); await DeleteDraft(); Navigator.NavigateTo($"/office/customers/{CompanyId}/orders/{result.Id}"); Working = false; @@ -326,7 +326,7 @@ public partial class OfficeOrderCreatePage : IDisposable // lower working flag Working = false; // show error message - Toaster.ShowError(result.Message, "ORDRE FEJL"); + Toaster.ShowError(result.Message); } diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs index d2c4716f..2f6a3505 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs @@ -119,13 +119,11 @@ public partial class OfficeOrderViewPage : IDisposable { Toast .ShowSuccess( - $"Status er opdateret og notifikation sendt til {salesRep.FirstName}.", "OK"); + $"Status er opdateret og notifikation sendt til {salesRep.FirstName}."); } else { - Toast - .ShowWarning( - $"Notifikation til {salesRep.FirstName} kunne ikke sendes. {sendMail.Message}", "ADVARSEL"); + Toast.ShowWarning($"Notifikation til {salesRep.FirstName} kunne ikke sendes. {sendMail.Message}"); } Logger.LogDebug("SendMail Result => \n {}", JsonSerializer.Serialize(sendMail)); // disable further notifications diff --git a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs index 6bba6f44..7ef03e4e 100644 --- a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs +++ b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor.cs @@ -62,7 +62,7 @@ public partial class SystemSupervisorViewEditPage : IDisposable private async Task SaveChanges() { await UserRepo.UpdateUserInfo(UserId, UserData); - Toaster.ShowSuccess("Tilknyttede sælgere er opdateret", "Det var det."); + Toaster.ShowSuccess("Tilknyttede sælgere er opdateret"); } public void Dispose() diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index 1644ae21..83413bf7 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -9,7 +9,7 @@ - + diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index b4cdc992..f6ae3783 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "0.132.1", + "version": "0.133.0", "rc": true, "sandBox": false, "image": "grumpy-coder.png" @@ -19,7 +19,7 @@ } }, "apiConfig": { - "baseUrl": "https://zeta.innotec.dk", + "baseUrl": "https://dev.innotec.dk", "catalog": "api/v2/catalog/country", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory",