diff --git a/TestData/Register/Party/500802.json b/TestData/Register/Party/500802.json index 4731226d..e6eb3136 100644 --- a/TestData/Register/Party/500802.json +++ b/TestData/Register/Party/500802.json @@ -1,7 +1,7 @@ { "partyId": "500802", "partyTypeName": 2, - "orgNumber": "910423185", + "orgNumber": "910423495", "ssn": null, "unitType": "AS", "name": "EAS Health Consulting Svolvær", diff --git a/loadbalancer/502Receipt.html b/loadbalancer/502Receipt.html new file mode 100644 index 00000000..551e34c3 --- /dev/null +++ b/loadbalancer/502Receipt.html @@ -0,0 +1,21 @@ + + +
+ + + +Please ensure that Receipt is running on port 5060
++ Open a terminal in src/Altinn.Platform/Altinn.Platform.Receipt + run yarn --immutable + run yarn run gulp-install-deps + run yarn run gulp (if running for the first time, otherwise this can be skipped) + run yarn run gulp-develop if need for changing fronend code, dotnet run if only needing standard receipt ++ + diff --git a/loadbalancer/nginx.conf b/loadbalancer/nginx.conf index c3ba46cf..4c9e7c87 100644 --- a/loadbalancer/nginx.conf +++ b/loadbalancer/nginx.conf @@ -16,6 +16,10 @@ http { server host.docker.internal:5005; } + upstream receiptcomp { + server host.docker.internal:5060; + } + server { listen 80; server_name altinn3local.no localhost; @@ -43,6 +47,15 @@ http { proxy_pass http://localtest/Home/; } + location /receipt/ { + proxy_pass http://receiptcomp/receipt/; + error_page 502 /502Receipt.html; + } + + location /storage/ { + proxy_pass http://localtest/storage/; + } + location /localtestresources/ { proxy_pass http://localtest/localtestresources/; } @@ -55,6 +68,9 @@ http { location /502App.html { root /www; } + location /502Receipt.html { + root /www; + } } } diff --git a/src/Controllers/Storage/TextsController.cs b/src/Controllers/Storage/TextsController.cs index 2ad8d099..8e9a44bd 100644 --- a/src/Controllers/Storage/TextsController.cs +++ b/src/Controllers/Storage/TextsController.cs @@ -81,7 +81,6 @@ public async Task