diff --git a/TransactionProcessing.MerchantPos/Program.cs b/TransactionProcessing.MerchantPos/Program.cs index 5a4a4f0..1d98c07 100644 --- a/TransactionProcessing.MerchantPos/Program.cs +++ b/TransactionProcessing.MerchantPos/Program.cs @@ -31,6 +31,9 @@ EnvironmentName = envName }); + // Load hosting.json so values such as "urls" or Kestrel endpoints are applied + builder.Configuration.AddJsonFile("hosting.json", optional: true, reloadOnChange: true); + // Explicit configuration ordering: appsettings.json, appsettings.{Environment}.json, environment vars, command line builder.Configuration .SetBasePath(builder.Environment.ContentRootPath) diff --git a/TransactionProcessing.MerchantPos/Runtime/ApiClient.cs b/TransactionProcessing.MerchantPos/Runtime/ApiClient.cs index 5942fc0..b113f95 100644 --- a/TransactionProcessing.MerchantPos/Runtime/ApiClient.cs +++ b/TransactionProcessing.MerchantPos/Runtime/ApiClient.cs @@ -96,8 +96,6 @@ public async Task> GetProductList(MerchantConfig cfg, List? responseData = JsonConvert.DeserializeObject>(content.Data); - responseData = responseData.Where(r => r.ContractId == Guid.Parse("881f5e96-deac-45a5-a9cf-69977a5af559")).ToList(); - Logger.LogInformation($"{responseData.Count} for merchant requested successfully"); Logger.LogDebug($"Merchant Contract Response: [{JsonConvert.SerializeObject(responseData)}]"); diff --git a/TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj b/TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj index e4fdd90..1037b94 100644 --- a/TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj +++ b/TransactionProcessing.MerchantPos/TransactionProcessing.MerchantPos.csproj @@ -16,6 +16,9 @@ + + Always + Always diff --git a/TransactionProcessing.MerchantPos/appsettings.staging.json b/TransactionProcessing.MerchantPos/appsettings.staging.json index abe7516..e0c3dfb 100644 --- a/TransactionProcessing.MerchantPos/appsettings.staging.json +++ b/TransactionProcessing.MerchantPos/appsettings.staging.json @@ -9,7 +9,7 @@ "EstateId": "435613ac-a468-47a3-ac4f-649d89764c22", "MerchantId": "ab1c99fb-1c6c-4694-9a32-b71be5d1da33", "MerchantName": "Staging Merchant 1", - "Enabled": true, + "Enabled": false, "ApplicationVersion": "1.0.5", "DeviceIdentifier": "stagingmerchant1device", "Username": "merchantuser@stagingmerchant1.co.uk", diff --git a/TransactionProcessing.MerchantPos/hosting.json b/TransactionProcessing.MerchantPos/hosting.json new file mode 100644 index 0000000..c87ad1f --- /dev/null +++ b/TransactionProcessing.MerchantPos/hosting.json @@ -0,0 +1,3 @@ +{ + "urls": "http://*:9600" +} \ No newline at end of file