diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor index 66f0d67f..e2b40758 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor @@ -19,8 +19,8 @@ User permissions
-

User permissions

-

Manage transfers here!

+

Partner prices

+

Set partner prices here!

@@ -30,13 +30,7 @@
-
- -
- +
@@ -58,19 +52,9 @@ bool PopupVisible { get; set; } - IGrid Grid { get; set; } - //object? MasterGridData { get; set; } + bool AutoCollapseDetailRow { get; set; } - public List IgnoreList = - [ - "ReceiverEmailAddress", - "ReceiverId", - "SenderEmailAddress", - "SenderId", - "ContextId" - ]; - void Grid_CustomizeElement(GridCustomizeElementEventArgs e) @@ -159,10 +143,6 @@ base.OnInitialized(); } - - void ColumnChooserButton_Click() - { - Grid.ShowColumnChooser(); - } + } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor index cf7cda0c..d2c73c4e 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor @@ -30,7 +30,6 @@
-
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor index 903887c1..cf8919b4 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinationToProductDetailGridComponent.razor @@ -47,7 +47,7 @@ - + diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index c185b406..9604543a 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -21,6 +21,7 @@ using TIAMWebApp.Shared.Application.Models.ClientSide; using AyCode.Core.Extensions; using TIAM.Entities.Users; using TIAMSharedUI.Shared.Components.Grids; +using AyCode.Core.Helpers; namespace TIAMWebApp.Server.Controllers { @@ -136,6 +137,7 @@ namespace TIAMWebApp.Server.Controllers return result ? transferDestination : null; } + //[AllowAnonymous] //[HttpPost] @@ -258,27 +260,29 @@ namespace TIAMWebApp.Server.Controllers //} - //[AllowAnonymous] - //[HttpGet] - //[Route(APIUrls.GetTransferDestinationsRouteName)] + //TransferDestinationToProduct + + [AllowAnonymous] + [HttpGet] + [Route(APIUrls.GetAllTransferDestinationToProductsRouteName)] [SignalR(SignalRTags.GetAllTransferDestinationToProducts)] public async Task> GetAllTransferDestinationToProducts() { return await _adminDal.GetTransferDestinationToProducts(); } - //[AllowAnonymous] - //[HttpGet] - //[Route(APIUrls.GetTransferDestinationsRouteName)] + [AllowAnonymous] + [HttpGet] + [Route(APIUrls.GetTransferDestinationToProductsByProductIdRouteName)] [SignalR(SignalRTags.GetTransferDestinationToProductsByProductId)] public async Task> GetTransferDestinationToProductsByProductId(Guid productId) { return await _adminDal.GetTransferDestinationToProductsByProductId(productId); } - //[AllowAnonymous] - //[HttpGet] - //[Route(APIUrls.GetTransferDestinationsRouteName)] + [AllowAnonymous] + [HttpGet] + [Route(APIUrls.GetTransferDestinationToProductsByTransferDestinationIdRouteName)] [SignalR(SignalRTags.GetTransferDestinationToProductsByTransferDestinationId)] public async Task> GetTransferDestinationToProductsByTransferDestinationId(Guid transferDestinationId) { @@ -287,7 +291,8 @@ namespace TIAMWebApp.Server.Controllers //[Authorize] //[HttpGet] - //[Route(APIUrls.GetTransferDriversByTransferIdRouteName)] + //[Route(APIUrls.GetTransferDestinationToProductById)] + [NonAction] [SignalR(SignalRTags.GetTransferDestinationToProductById)] public async Task GetTransferDestinationToProductById(Guid transferDestinationToProductId) { @@ -297,7 +302,7 @@ namespace TIAMWebApp.Server.Controllers [AllowAnonymous] [HttpPost] - [Route(APIUrls.CreateTransferDestinationRouteName)] + [Route(APIUrls.CreateTransferDestinationToProductRouteName)] [SignalR(SignalRTags.CreateTransferDestinationToProduct)] public async Task CreateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct) { @@ -320,9 +325,9 @@ namespace TIAMWebApp.Server.Controllers return isSuccess ? transferDestinationToProduct : null; } - //[AllowAnonymous] - //[HttpPost] - //[Route(APIUrls.UpdateTransferDestinationRouteName)] + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.UpdateTransferDestinationToProductRouteName)] [SignalR(SignalRTags.UpdateTransferDestinationToProduct)] public async Task UpdateTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct) { @@ -341,9 +346,9 @@ namespace TIAMWebApp.Server.Controllers } - //[Authorize] - //[HttpGet] - //[Route(APIUrls.GetTransferDriversByTransferIdRouteName)] + [Authorize] + [HttpGet] + [Route(APIUrls.RemoveTransferDestinationToProductRouteName)] [SignalR(SignalRTags.RemoveTransferDestinationToProduct)] public async Task RemoveTransferDestinationToProduct([FromBody] TransferDestinationToProduct transferDestinationToProduct) { @@ -351,6 +356,8 @@ namespace TIAMWebApp.Server.Controllers return result ? transferDestinationToProduct : null; } + //transfer + [AllowAnonymous] [HttpPost] [Route(APIUrls.CreateTransferRouteName)] diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index 2c0fec58..bf8d9a31 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -81,6 +81,24 @@ namespace TIAMWebApp.Shared.Application.Models public const string CreateTransferDestinationRouteName = "CreateTransferDestination"; public const string CreateTransferDestination = TransferDataAPI + CreateTransferDestinationRouteName; + public const string GetAllTransferDestinationToProductsRouteName = "GetAllTransferDestinationToProducts"; + public const string GetAllTransferDestinationToProducts = TransferDataAPI + GetAllTransferDestinationToProductsRouteName; + + public const string GetTransferDestinationToProductsByProductIdRouteName = "GetTransferDestinationToProductsByProductId"; + public const string GetTransferDestinationToProductsByProductId = TransferDataAPI + GetTransferDestinationToProductsByProductIdRouteName; + + public const string GetTransferDestinationToProductsByTransferDestinationIdRouteName = "GetTransferDestinationToProductsByTransferDestinationId"; + public const string GetTransferDestinationToProductsByTransferDestinationId = TransferDataAPI + GetTransferDestinationToProductsByTransferDestinationIdRouteName; + + public const string CreateTransferDestinationToProductRouteName = "CreateTransferDestinationToProduct"; + public const string CreateTransferDestinationToProduct = TransferDataAPI + CreateTransferDestinationToProductRouteName; + + public const string UpdateTransferDestinationToProductRouteName = "UpdateTransferDestinationToProduct"; + public const string UpdateTransferDestinationToProduct = TransferDataAPI + UpdateTransferDestinationToProductRouteName; + + public const string RemoveTransferDestinationToProductRouteName = "RemoveTransferDestinationToProduct"; + public const string RemoveTransferDestinationToProduct = TransferDataAPI + RemoveTransferDestinationToProductRouteName; + public const string GetTransfersRouteName = "GetTransfers"; public const string GetTransfers = TransferDataAPI + GetTransfersRouteName;