diff --git a/PizzaBot/Components/ArchiveListComponent.razor b/PizzaBot/Components/ArchiveListComponent.razor index 579a8b4..bf61b5b 100644 --- a/PizzaBot/Components/ArchiveListComponent.razor +++ b/PizzaBot/Components/ArchiveListComponent.razor @@ -18,7 +18,7 @@ @if (ShowDate) { - + } @if (ShowPizzaTotal) { diff --git a/PizzaBot/Components/GlobalMessages.razor b/PizzaBot/Components/GlobalMessages.razor index 0e79a2e..eea9d0c 100644 --- a/PizzaBot/Components/GlobalMessages.razor +++ b/PizzaBot/Components/GlobalMessages.razor @@ -7,19 +7,10 @@ } @if (GlobalStuffService.Message.Length >= 2) { -
@((MarkupString)Markdig.Markdown.ToHtml(GlobalStuffService.Message))
+

@GlobalStuffService.Message

+ } - - @code{ protected override void OnInitialized() { diff --git a/PizzaBot/Components/Pages/Admin.razor b/PizzaBot/Components/Pages/Admin.razor index 702e1ac..88368f3 100644 --- a/PizzaBot/Components/Pages/Admin.razor +++ b/PizzaBot/Components/Pages/Admin.razor @@ -12,28 +12,20 @@

Order Locking

-@if (GlobalStuffService.OrdersLocked) -{ - -} -else -{ - -} - -@if (ShowUnlockConfirmation) -{ -

Order(s) have already been marked as payed. If you unlock payment information WILL be lost!

- -} + } +

Global Message

- + @@ -144,33 +136,15 @@ else bool WrongDeletionPasscode = false; string DeletionPasscode = ""; - bool ShowUnlockConfirmation = false; - void SaveNewPizzaConfig(EditContext editContext) { GlobalStuffService.SetConfig(PConfig); GlobalStuffService.ShouldBalance = true; } - void LockOrders() + void ToggleOrdersLocked() { - GlobalStuffService.SetOrdersLocked(true); - } - - void UnlockOrders() - { - if(PizzaDBService.GetAllResults().Where(o => o.hasPaid).Count() > 0) - { - ShowUnlockConfirmation = true; - return; - } - GlobalStuffService.SetOrdersLocked(false); - } - - void ConfirmedUnlockOrders() - { - ShowUnlockConfirmation = false; - GlobalStuffService.SetOrdersLocked(false); + GlobalStuffService.SetOrdersLocked(!GlobalStuffService.OrdersLocked); } void SetGlobalMessage() @@ -190,4 +164,4 @@ else { PConfig = GlobalStuffService.GetConfig() ?? new PizzaConfig(); } - } +} \ No newline at end of file diff --git a/PizzaBot/Components/Pages/PizzaOrder.razor b/PizzaBot/Components/Pages/PizzaOrder.razor index 7f1c5cd..60692af 100644 --- a/PizzaBot/Components/Pages/PizzaOrder.razor +++ b/PizzaBot/Components/Pages/PizzaOrder.razor @@ -27,8 +27,7 @@ - One slice = ca. @GlobalStuffService.GetSizeOfSliceInCM2().ToString("F0") cm2 - + One slice = ca. @GlobalStuffService.GetSizeOfSliceInCM2().ToString("F0") cm2
@@ -50,16 +49,15 @@

The balancing algorithm tries to avoid changes of the corresponding Variable
- E.g. If you want to only get pieces from your chosen category put the slider all the way to the left -

- + E.g. If you want to only get pieces from your chosen category put the slider all the way to the left

+
Category
Total Count
- + diff --git a/PizzaBot/PizzaBot.csproj b/PizzaBot/PizzaBot.csproj index 9e7bfbe..56f8723 100644 --- a/PizzaBot/PizzaBot.csproj +++ b/PizzaBot/PizzaBot.csproj @@ -15,7 +15,6 @@ -