diff --git a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Index.cshtml b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Index.cshtml index 4fd37e2f85..69a40d0df2 100644 --- a/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Index.cshtml +++ b/src/SFA.DAS.EmployerAccounts.Web/Views/EmployerTeam/Index.cshtml @@ -119,15 +119,25 @@ else } - @if (Model.Data.ApprenticeshipEmployerType == ApprenticeshipEmployerType.Levy - && Html.IsAuthorized("EmployerFeature.TransfersMatching")) + @if (Html.IsAuthorized("EmployerFeature.TransfersMatching")) { -
-

Your transfers

-

View your 25% transfers balance and manage your transfers, including finding a business to transfer your levy to.

-
+ if (Model.Data.ApprenticeshipEmployerType == ApprenticeshipEmployerType.Levy) + { +
+

Your transfers

+

View your 25% transfers balance and manage your transfers, including finding a business to transfer your levy to.

+
+ } + else if (Model.Data.ApprenticeshipEmployerType == ApprenticeshipEmployerType.NonLevy) + { +
+

Your transfers

+

View your apprentices funded by a transfer. Find a large business to fund your apprenticeship training with a transfer.

+
+ } } + diff --git a/src/SFA.DAS.EmployerFinance.UnitTests/Infrastructure/WhenHandlingAGetRequest.cs b/src/SFA.DAS.EmployerFinance.UnitTests/Infrastructure/WhenHandlingAGetRequest.cs index 8e3865961d..d47dd59550 100644 --- a/src/SFA.DAS.EmployerFinance.UnitTests/Infrastructure/WhenHandlingAGetRequest.cs +++ b/src/SFA.DAS.EmployerFinance.UnitTests/Infrastructure/WhenHandlingAGetRequest.cs @@ -80,9 +80,9 @@ public static Mock SetupMessageHandlerMock(HttpResponseMessa ItExpr.Is(c => c.Method.Equals(HttpMethod.Get) && c.Headers.Contains("Ocp-Apim-Subscription-Key") - && c.Headers.GetValues("Ocp-Apim-Subscription-Key").First().Equals(key) + && c.Headers.GetValues("Ocp-Apim-Subscription-Key").Single().Equals(key) && c.Headers.Contains("X-Version") - && c.Headers.GetValues("X-Version").First().Equals("1") + && c.Headers.GetValues("X-Version").Single().Equals("1") && c.RequestUri.AbsoluteUri.Equals(url)), ItExpr.IsAny() ) diff --git a/src/SFA.DAS.EmployerFinance.Web/Views/Transfers/Index.cshtml b/src/SFA.DAS.EmployerFinance.Web/Views/Transfers/Index.cshtml index d199593fbc..c23119e289 100644 --- a/src/SFA.DAS.EmployerFinance.Web/Views/Transfers/Index.cshtml +++ b/src/SFA.DAS.EmployerFinance.Web/Views/Transfers/Index.cshtml @@ -3,12 +3,12 @@ @{ ViewBag.PageID = "transfers"; ViewBag.Section = "finance"; - ViewBag.Title = "Transfers"; + ViewBag.Title = "Manage transfers"; ViewBag.AnalyticsData.Vpv = $"/finance/transfers"; ViewBag.ZenDeskLabel = "eas-finance"; } -

Transfers

+

Manage transfers

@if (Model.Data.CanViewPledgesSection) diff --git a/src/SFA.DAS.EmployerFinance/Infrastructure/ApiClient.cs b/src/SFA.DAS.EmployerFinance/Infrastructure/ApiClient.cs index e7ac464c98..2495063de4 100644 --- a/src/SFA.DAS.EmployerFinance/Infrastructure/ApiClient.cs +++ b/src/SFA.DAS.EmployerFinance/Infrastructure/ApiClient.cs @@ -23,19 +23,21 @@ public ApiClient( public async Task Get(IGetApiRequest request) { - AddHeaders(); + var httpRequestMessage = new HttpRequestMessage(HttpMethod.Get, request.GetUrl); + + AddHeaders(httpRequestMessage); - var response = await _httpClient.GetAsync(request.GetUrl).ConfigureAwait(false); + var response = await _httpClient.SendAsync(httpRequestMessage).ConfigureAwait(false); response.EnsureSuccessStatusCode(); var json = await response.Content.ReadAsStringAsync().ConfigureAwait(false); return JsonConvert.DeserializeObject(json); } - private void AddHeaders() + private void AddHeaders(HttpRequestMessage httpRequestMessage) { - _httpClient.DefaultRequestHeaders.Add("Ocp-Apim-Subscription-Key", _config.Key); - _httpClient.DefaultRequestHeaders.Add("X-Version", "1"); + httpRequestMessage.Headers.Add("Ocp-Apim-Subscription-Key", _config.Key); + httpRequestMessage.Headers.Add("X-Version", "1"); } } } \ No newline at end of file