diff --git a/FruitBank.Common/FruitBankConstClient.cs b/FruitBank.Common/FruitBankConstClient.cs index a41a2e9..ecd408a 100644 --- a/FruitBank.Common/FruitBankConstClient.cs +++ b/FruitBank.Common/FruitBankConstClient.cs @@ -8,9 +8,10 @@ public static class FruitBankConstClient public static string DefaultLocale = "en-US"; public static string BaseUrl = "https://localhost:59579"; //FrutiBank nop + //public static string BaseUrl = "https://localhost:44372"; //FrutiBank nop //public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop #if RELEASE - // public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop + // public static string BaseUrl = "https://shop.fruitbank.hu"; //FrutiBank nop #endif //public static string BaseUrl = "http://localhost:59579"; //FrutiBank nop diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor index acf03a1..32fcf9d 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor @@ -36,7 +36,7 @@ - @if (IsMasterGrid && LoggedInModel.IsDeveloper) + @if (IsMasterGrid && LoggedInModel.IsAdministrator) { var orderDto = ((OrderDto)context.DataItem); diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor index 02faa2f..0c3795d 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor @@ -53,7 +53,7 @@ - @if (IsMasterGrid && LoggedInModel.IsDeveloper) + @if (IsMasterGrid && LoggedInModel.IsAdministrator) { var orderItemDto = ((OrderItemDto)context.DataItem); diff --git a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor index 895d878..3b8bcc2 100644 --- a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor +++ b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor @@ -37,23 +37,14 @@ - - @{ - //GetOrderItemDtosFromDbAsync(productId).Forget(); - //var orderItemDtos = _orderItemDtos?.Where(oi => oi.ProductId == productId).ToList() ?? []; - - var contextIds = new[] { (object)productDto.Id }; - - } - - + @{ //GetOrderDtosFromDbAsync(productId).Forget(); //var orderDtos = _orderDtos?.Where(o => o.OrderItemDtos.Any(oi => oi.ProductId == productId)).ToList() ?? []; } - + @{ //GetOrderItemDtosFromDbAsync(productId).Forget(); //var orderItemDtos = _orderItemDtos?.Where(oi => oi.ProductId == productId).ToList() ?? []; @@ -166,7 +157,7 @@ protected async Task OnFocusedRowChanged(GridFocusedRowChangedEventArgs e) { - if (!LoggedInModel.IsDeveloper) return; + if (!LoggedInModel.IsAdministrator) return; var productDto = (ProductDto)e.DataItem; diff --git a/FruitBankHybrid.Shared/Components/Grids/FruitBankGridBase.cs b/FruitBankHybrid.Shared/Components/Grids/FruitBankGridBase.cs index 6cc8554..8edae39 100644 --- a/FruitBankHybrid.Shared/Components/Grids/FruitBankGridBase.cs +++ b/FruitBankHybrid.Shared/Components/Grids/FruitBankGridBase.cs @@ -40,7 +40,7 @@ public class FruitBankGridBase : MgGridBase - - + + - + diff --git a/FruitBankHybrid.Shared/Pages/OrdersAdmin.razor b/FruitBankHybrid.Shared/Pages/OrdersAdmin.razor index cf0edd4..e03eed3 100644 --- a/FruitBankHybrid.Shared/Pages/OrdersAdmin.razor +++ b/FruitBankHybrid.Shared/Pages/OrdersAdmin.razor @@ -20,7 +20,7 @@ - + diff --git a/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor b/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor index 3fb759e..df376a7 100644 --- a/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor +++ b/FruitBankHybrid.Shared/Pages/ShippingsAdmin.razor @@ -22,7 +22,7 @@ - +