[#3793] PR feedback

Viicos · Viicos · commit dcb2fff2e81a · 2024-02-02T16:55:02.000+01:00
diff --git a/.github/ISSUE_TEMPLATE/prepare-release.md b/.github/ISSUE_TEMPLATE/prepare-release.md
@@ -15,6 +15,7 @@ assignees: sergei-maertens
   - [ ] Haal Centraal BRP Personen bevragen
   - [ ] `src.soap.tests.test_client`
   - [ ] BRK (Kadaster)
+  - [ ] Ogone
 - [ ] Release new SDK version
 - [ ] Correct SDK version pinned in `.sdk-release`
 - [ ] Check translations
diff --git a/src/openforms/payments/contrib/ogone/tests/files/vcr_cassettes/OgoneClientTest/OgoneClientTest.test_payment_request_invalid_order_id.yaml b/src/openforms/payments/contrib/ogone/tests/files/vcr_cassettes/OgoneClientTest/OgoneClientTest.test_payment_request_invalid_order_id.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: PSPID=maykinmedia&ORDERID=xyz2024_OF-123456_987654321THISISPROBABLYTOOLONG&AMOUNT=1000&CURRENCY=EUR&LANGUAGE=nl_NL&PMLISTTYPE=2&ACCEPTURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Daccept&DECLINEURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&EXCEPTIONURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dexception&CANCELURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&BACKURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&SHASIGN=2514CC52C8D1C2D92F0D389FAAC9B677C1B96A24B8295F39E4C700C2D643C89C15ECD8905FC6070E6DB91E8EA7A66A7EDF4CB9D9CF8A8C156BDAE76C334B9F26
+    body: PSPID=maykinmedia&ORDERID=xyz2024%2FOF-123456%2F987654321THISISPROBABLYTOOLONG&AMOUNT=1000&CURRENCY=EUR&LANGUAGE=nl_NL&PMLISTTYPE=2&ACCEPTURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Daccept&DECLINEURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&EXCEPTIONURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dexception&CANCELURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&BACKURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&SHASIGN=BEA42C28E1B4B66C3AB7673171C6F9B0D9EE6F91AD9DBB10D51E7B1B30B0B060BEC26B723F4CB6F2EA6009B0CE294FADE87EA4E045FE7D00CF6D740662B10606
     headers:
       Accept:
       - '*/*'
@@ -9,7 +9,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '629'
+      - '633'
       Content-Type:
       - application/x-www-form-urlencoded
       User-Agent:
@@ -29,7 +29,7 @@ interactions:
         border=\"0\" cellpadding=\"2\" cellspacing=\"0\" width=\"95%\" id=\"ncol_ref\">\r\n\t\t\t\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t<td
         class=ncoltxtl colspan=\"1\" align=\"right\" width=\"50%\"><small>Referentie
         van de bestelling :<!--External reference--></small></td>\r\n\t\t\t\t\t\t\t<td
-        class=ncoltxtr colspan=\"1\" width=\"50%\"><small>xyz2024_OF-123456_987654321THISISPROBABLYTOOLONG</small></td>\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t<td
+        class=ncoltxtr colspan=\"1\" width=\"50%\"><small>xyz2024/OF-123456/987654321THISISPROBABLYTOOLONG</small></td>\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t<td
         class=ncoltxtl colspan=\"1\" align=\"right\"><small>Totale kostprijs :<!--Total
         to pay--></small></td>\r\n\t\t\t\t\t\t\t<td class=ncoltxtr colspan=\"1\">\r\n\t\t\t\t\t\t\t<small>\r\n\t\t\t\t\t\t\t---\r\n\t\t\t\t\t\t\t</small>\r\n\t\t\t\t\t\t\t</td>\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t</tr>\r\n\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t<td
         class=ncoltxtl colspan=\"1\" align=\"right\"><small>Begunstigde  :<!--Beneficiary--></small></td>\r\n\t\t\t\t\t\t\t<td
@@ -51,12 +51,12 @@ interactions:
         hidden;\">Overige gegevens / Annuleren</h2>\r\n<table class=ncoltable3 border=\"0\"
         cellpadding=\"2\" cellspacing=\"0\" width=\"95%\" id=\"ie_cc\" style=\"behavior:url(#default#clientCaps)\">\r\n\t<tr><td
         class=\"ncollogoc\" valign=\"middle\" align=\"center\" width=\"33%\"></td><td
-        class=\"ncollogoc\" valign=\"middle\" align=\"center\" width=\"33%\"><a href=\"https&#58;//ogone.test.v-psp.com/ncol/PSPabout.asp?lang=8&pspid=maykinmedia&branding=OGONE&CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&CSRFKEY=8D5C820EDD4D570CF6BBCF7BB7258F202A86B70C&CSRFTS=20240131140344\"
+        class=\"ncollogoc\" valign=\"middle\" align=\"center\" width=\"33%\"><a href=\"https&#58;//ogone.test.v-psp.com/ncol/PSPabout.asp?lang=8&pspid=maykinmedia&branding=OGONE&CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&CSRFKEY=F77393D36F82089C4B499AE746500D453DF57E4F&CSRFTS=20240202164716\"
         target=\"_blank\"><img border=\"0\" src=\"https&#58;//ogone.test.v-psp.com/images/pp_WorldLine8.png\"
         alt=\"Betaling verwerkt door Worldline\" title=\"Betaling verwerkt door Worldline\"
-        vspace=\"2\" id=\"NCOLPP\"></a><br><small><small><a class=\"bottom\" href=\"https&#58;//worldline.com/&#63;lang=8&amp;pspid=maykinmedia&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=307CB69EE61F9F70DF280DAFBBC14DC6AF930980&amp;CSRFTS=20240131140344\"
-        target=\"_blank\">Over Worldline</a> |<a class=\"bottom\" href=\"https&#58;//ogone.test.v-psp.com/ncol/security.asp&#63;lang=8&amp;mode=STD&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=17A2D3D9980939D10B70EAF1ECD44794762256D8&amp;CSRFTS=20240131140344\"
-        target=\"_blank\">Veiligheid<!--Security--></a>| <a class=\"bottom\" href=\"https&#58;//worldline.com/en/home/main-navigation/git/office-locations.html&#63;lang=8&amp;mode=STD&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=920D9F96982F7C782AF91FEE1EF2F3720DB5CFC1&amp;CSRFTS=20240131140344\"
+        vspace=\"2\" id=\"NCOLPP\"></a><br><small><small><a class=\"bottom\" href=\"https&#58;//worldline.com/&#63;lang=8&amp;pspid=maykinmedia&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=2578130B066787EEC8CA6E4DF270A36580EBD2D1&amp;CSRFTS=20240202164716\"
+        target=\"_blank\">Over Worldline</a> |<a class=\"bottom\" href=\"https&#58;//ogone.test.v-psp.com/ncol/security.asp&#63;lang=8&amp;mode=STD&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=526BC185B60C087400168E352C0D67B0E31049E5&amp;CSRFTS=20240202164716\"
+        target=\"_blank\">Veiligheid<!--Security--></a>| <a class=\"bottom\" href=\"https&#58;//worldline.com/en/home/main-navigation/git/office-locations.html&#63;lang=8&amp;mode=STD&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=A0A001CEAE487440253CF3C558B0F2A855F7A52F&amp;CSRFTS=20240202164716\"
         target=\"_blank\">Wettelijke informatie<!--Legal--></a></small></small></td><td
         class=\"ncollogoc\" valign=\"middle\" align=\"center\" width=\"33%\">&nbsp;</td></tr>\r\n\r\n</table>\r\n</font></html>"
     headers:
@@ -67,11 +67,11 @@ interactions:
       content-type:
       - text/html; Charset=utf-8
       date:
-      - Wed, 31 Jan 2024 13:03:44 GMT
+      - Fri, 02 Feb 2024 15:47:16 GMT
       expires:
-      - Wed, 31 Jan 2024 13:02:43 GMT
+      - Fri, 02 Feb 2024 15:46:16 GMT
       set-cookie:
-      - sessionTest=ae8e45aa-37a3-492f-9852-12f95aba3e88; path=/ncol/test/; Secure;
+      - sessionTest=c2ace207-3f71-491c-8de4-923f2b85a396; path=/ncol/test/; Secure;
         HttpOnly
       strict-transport-security:
       - max-age=16000000; includeSubDomains; preload;
diff --git a/src/openforms/payments/contrib/ogone/tests/files/vcr_cassettes/OgoneClientTest/OgoneClientTest.test_payment_request_valid_order_id.yaml b/src/openforms/payments/contrib/ogone/tests/files/vcr_cassettes/OgoneClientTest/OgoneClientTest.test_payment_request_valid_order_id.yaml
@@ -1,6 +1,6 @@
 interactions:
 - request:
-    body: PSPID=maykinmedia&ORDERID=xyz2024_OF-123456_987654321&AMOUNT=1000&CURRENCY=EUR&LANGUAGE=nl_NL&PMLISTTYPE=2&ACCEPTURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Daccept&DECLINEURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&EXCEPTIONURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dexception&CANCELURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&BACKURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&SHASIGN=85B606C7CC8B7C0D298E7B5EFCEC4849A944C5E6B8C31DA6ACE81DC5D21E951FA0107EEE4030A62923B0A5EDF02CAA0F322D79B312D8E59256CFAB80BCD0426B
+    body: PSPID=maykinmedia&ORDERID=xyz2024%2FOF-123456%2F987654321&AMOUNT=1000&CURRENCY=EUR&LANGUAGE=nl_NL&PMLISTTYPE=2&ACCEPTURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Daccept&DECLINEURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&EXCEPTIONURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dexception&CANCELURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&BACKURL=http%3A%2F%2Ffoo.bar%2Freturn%3Fbazz%3Dbuzz%26action%3Dcancel&SHASIGN=7D59105FA08F72341447A871074D100C886A7CD3E80CDF17019B9FC7007B92885037248F991D034CF728C52321B044E77532084BD20BA1F0DCAF6A82EF7DCE4D
     headers:
       Accept:
       - '*/*'
@@ -9,7 +9,7 @@ interactions:
       Connection:
       - keep-alive
       Content-Length:
-      - '608'
+      - '612'
       Content-Type:
       - application/x-www-form-urlencoded
       User-Agent:
@@ -54,7 +54,7 @@ interactions:
         id=\"ncol_ref\">\r\n\t\t\t\r\n\t\t\t\t\t\t\t<tr>\r\n\t\t\t\t\t\t\t\t<td class=ncoltxtl
         colspan=\"1\" align=\"right\" width=\"50%\"><small>Referentie van de bestelling
         :<!--External reference--></small></td>\r\n\t\t\t\t\t\t\t\t<td class=ncoltxtr
-        colspan=\"1\" width=\"50%\"><small>xyz2024_OF-123456_987654321</small></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\r\n\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t\r\n\t\t\t\t\t\t\t<td
+        colspan=\"1\" width=\"50%\"><small>xyz2024/OF-123456/987654321</small></td>\r\n\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\r\n\r\n\t\t\t\t<tr>\r\n\t\t\t\t\t\r\n\t\t\t\t\t\t\t<td
         class=ncoltxtl colspan=\"1\" align=\"right\" width=\"50%\"><small>\r\n\t\t\t\t\t\t\tTotale
         kostprijs :<!--Total to pay-->\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t</small></td>\r\n\t\t\t\t\t\t\t<td
         class=ncoltxtr colspan=\"1\" width=\"50%\">\r\n\t\t\t\t\t\t\t\t<small>10.00
@@ -113,15 +113,15 @@ interactions:
         AlertERR_96 = \"CVC is niet aanwezig en geen reden waarom.\";\r\n\r\n\r\n//-->\r\n\r\n\r\n</script>\r\n\r\n\t\t\t\t<form
         name=\"IDEALOGFORM\" action=\"https&#58;//ogone.test.v-psp.com/ncol/test/orderstandard_UTF8.asp\"
         method=\"POST\" onSubmit=\"return my_submitAndDisable(this,0);\">\r\n\t\t\t\t\t<input
-        type=\"hidden\" name=\"CSRFKEY\" value=\"9A91CD66866707544555AF4EE6E87F701B47E647\"
-        >\r\n<input type=\"hidden\" name=\"CSRFTS\" value=\"20240131140345\" >\r\n<input
+        type=\"hidden\" name=\"CSRFKEY\" value=\"221FD47284D94DB2B46C13F50811F81B88EB885C\"
+        >\r\n<input type=\"hidden\" name=\"CSRFTS\" value=\"20240202164717\" >\r\n<input
         type=\"hidden\" name=\"CSRFSP\" value=\"/ncol/test/orderstandard_utf8.asp\"
         >\r\n\t\t\t\t\t<input type=\"hidden\" name=\"WIN3DS\" value=\"\">\r\n\t\t\t\t\t<input
         type=\"hidden\" name=\"PMListType\" value=\"2\">\r\n\t\t\t\t\t<input type=\"hidden\"
         name=\"branding\" value=\"OGONE\">\r\n\t\t\t\t\t<input type=\"hidden\" name=\"PM\"
-        value=\"\">\r\n\t\t\t\t\t<input type=\"hidden\" name=\"payid\" value=\"3847836923\">\r\n\t\t\t\t\t<input
-        type=\"hidden\" name=\"hash_param\" value=\"5C1286B60CC80F0D5E3FB0FB0682A6E5602DBF30\">\r\n
-        \                   <input type=\"hidden\" name=\"CorrelationID\" value=\"FA4DEECB-8A2A-4F9D-8728-10D6E3F0D65A\">\r\n\t\t\t\t\t\t\t\t<input
+        value=\"\">\r\n\t\t\t\t\t<input type=\"hidden\" name=\"payid\" value=\"3853726846\">\r\n\t\t\t\t\t<input
+        type=\"hidden\" name=\"hash_param\" value=\"58B32658CD626C38D344BAC72CE084824603BCBC\">\r\n
+        \                   <input type=\"hidden\" name=\"CorrelationID\" value=\"BE0941AB-D853-4663-92ED-D90E2F8875BC\">\r\n\t\t\t\t\t\t\t\t<input
         type=\"hidden\" name=\"hash_post\" value=\"\">\r\n\t\t\t\t\t\t\t\t<input type=\"hidden\"
         name=\"allowcorrection\" value=\"\">\r\n\t\t\t\t\t<input type=\"hidden\" name=\"thisstep\"
         value=\"1\">\r\n\t\t\t\t\t<input type=\"hidden\" name=\"idealstep\" value=\"2\">\r\n\t\t\t\t\t<input
@@ -149,12 +149,12 @@ interactions:
         style=\"behavior:url(#default#clientCaps)\">\r\n\t<tr><td class=\"ncollogoc\"
         valign=\"middle\" align=\"center\" width=\"33%\"><img border=\"0\" src=\"https&#58;//ogone.test.v-psp.com/images/ING.gif\"
         hspace=\"5\" alt=\"ING\" title=\"ING\" id=\"NCOLACQ\"></td><td class=\"ncollogoc\"
-        valign=\"middle\" align=\"center\" width=\"33%\"><a href=\"https&#58;//ogone.test.v-psp.com/ncol/PSPabout.asp?lang=3&pspid=maykinmedia&branding=OGONE&CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&CSRFKEY=39F20D7BCFF407273EA21CA42856EE7D3EA5BE37&CSRFTS=20240131140346\"
+        valign=\"middle\" align=\"center\" width=\"33%\"><a href=\"https&#58;//ogone.test.v-psp.com/ncol/PSPabout.asp?lang=3&pspid=maykinmedia&branding=OGONE&CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&CSRFKEY=E37A30BFC74D4303370BEDA47F01210C7672F6F9&CSRFTS=20240202164718\"
         target=\"_blank\"><img border=\"0\" src=\"https&#58;//ogone.test.v-psp.com/images/pp_WorldLine3.png\"
         alt=\"Betaling verwerkt door Worldline\" title=\"Betaling verwerkt door Worldline\"
-        vspace=\"2\" id=\"NCOLPP\"></a><br><small><small><a class=\"bottom\" href=\"https&#58;//worldline.com/&#63;lang=3&amp;pspid=maykinmedia&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=FB07930BFF3F682F51B42191F4138610072E60F0&amp;CSRFTS=20240131140346\"
-        target=\"_blank\">Over Worldline</a> |<a class=\"bottom\" href=\"https&#58;//ogone.test.v-psp.com/ncol/security.asp&#63;lang=3&amp;mode=STD&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=BFFF567096453F3441BA23C38C52FF31CF6A6A97&amp;CSRFTS=20240131140346\"
-        target=\"_blank\">Veiligheid<!--Security--></a>| <a class=\"bottom\" href=\"https&#58;//worldline.com/en/home/main-navigation/git/office-locations.html&#63;lang=3&amp;mode=STD&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=809D5ACEB5CF38199926654595B054842E28E430&amp;CSRFTS=20240131140346\"
+        vspace=\"2\" id=\"NCOLPP\"></a><br><small><small><a class=\"bottom\" href=\"https&#58;//worldline.com/&#63;lang=3&amp;pspid=maykinmedia&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=AAF69C7845042CBB34C5F009899F7C4C4390CDC1&amp;CSRFTS=20240202164718\"
+        target=\"_blank\">Over Worldline</a> |<a class=\"bottom\" href=\"https&#58;//ogone.test.v-psp.com/ncol/security.asp&#63;lang=3&amp;mode=STD&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=5D73905D75B45DA8F08D4055D77D06E713420CE9&amp;CSRFTS=20240202164718\"
+        target=\"_blank\">Veiligheid<!--Security--></a>| <a class=\"bottom\" href=\"https&#58;//worldline.com/en/home/main-navigation/git/office-locations.html&#63;lang=3&amp;mode=STD&amp;branding=OGONE&amp;CSRFSP=%2Fncol%2Ftest%2Forderstandard%5Futf8%2Easp&amp;CSRFKEY=12E53DC3B8DFF13E3FFC42BDA585704CBF1DEE4A&amp;CSRFTS=20240202164718\"
         target=\"_blank\">Wettelijke informatie<!--Legal--></a></small></small></td><td
         class=\"ncollogoc\" valign=\"middle\" align=\"center\" width=\"33%\">&nbsp;</td></tr>\r\n\t\t<tr>\r\n\t\t\t\t<td
         class=ncollogoc align=\"center\" colspan=\"3\">\r\n\t\t\t\t\t\t<center>\r\n\t\t\t\t\t\t\t<table
@@ -163,15 +163,15 @@ interactions:
         method=\"POST\" action=\"https&#58;//ogone.test.v-psp.com/ncol/test/Order_Cancel_UTF8.asp\"
         id=form3 name=form3 onsubmit=\"return(window.confirm('Weet u zeker dat u deze
         transactie wilt annuleren&#63;'))\"  style=\"margin-bottom:0px;\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t<input
-        type=\"hidden\" name=\"CSRFKEY\" value=\"E5F0C1A7B48E2F4B91C4A374149669C81188A1E3\"
-        >\r\n<input type=\"hidden\" name=\"CSRFTS\" value=\"20240131140346\" >\r\n<input
+        type=\"hidden\" name=\"CSRFKEY\" value=\"0CA1BAC2BE712949393C587DED972B9C6F32FC3F\"
+        >\r\n<input type=\"hidden\" name=\"CSRFTS\" value=\"20240202164718\" >\r\n<input
         type=\"hidden\" name=\"CSRFSP\" value=\"/ncol/test/orderstandard_utf8.asp\"
-        >\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input type=\"hidden\" name=\"payid\" value=\"3847836923\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input
+        >\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input type=\"hidden\" name=\"payid\" value=\"3853726846\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input
         type=\"hidden\" name=\"ownerZIP\" value=\"\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input
         type=\"hidden\" name=\"owneraddress\" value=\"\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input
         type=\"hidden\" name=\"alias\" value=\"\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input
         type=\"hidden\" name=\"aliasoperation\" value=\"\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input
-        type=\"hidden\" name=\"hash_param\" value=\"5C1286B60CC80F0D5E3FB0FB0682A6E5602DBF30\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input
+        type=\"hidden\" name=\"hash_param\" value=\"58B32658CD626C38D344BAC72CE084824603BCBC\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<input
         type=\"hidden\" name=\"branding\" value=\"OGONE\">\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t\t<small><input
         class=ncol ID=\"ncol_cancel\" type=\"submit\" name=\"cancel\" value=\"Annuleren\"></small><!--Cancel-->\r\n\t\t\t\t\t\t\t\t\t\t\t\t\t</form>\r\n\t\t\t\t\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t\t\t\t</td>\r\n\t\t\t\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\t\t\t</tr>\r\n\t\t\t\t\t\t\t</table>\r\n\t\t\t\t\t\t</center>\r\n\t\t\t\t</td>\r\n\r\n\t\t</tr>\r\n\t\t\r\n\r\n</table>\r\n</div>\r\n</div>\r\n</body>\r\n</html>"
     headers:
@@ -182,11 +182,11 @@ interactions:
       content-type:
       - text/html; Charset=utf-8
       date:
-      - Wed, 31 Jan 2024 13:03:46 GMT
+      - Fri, 02 Feb 2024 15:47:18 GMT
       expires:
-      - Wed, 31 Jan 2024 13:02:44 GMT
+      - Fri, 02 Feb 2024 15:46:16 GMT
       set-cookie:
-      - sessionTest=04fd6ef2-e381-4b1e-ade0-f2e98e9901f3; path=/ncol/test/; Secure;
+      - sessionTest=962e2093-e859-49f6-beaf-83cb5c3e18b0; path=/ncol/test/; Secure;
         HttpOnly
       strict-transport-security:
       - max-age=16000000; includeSubDomains; preload;
diff --git a/src/openforms/payments/contrib/ogone/tests/test_client.py b/src/openforms/payments/contrib/ogone/tests/test_client.py
@@ -15,9 +15,10 @@
 class OgoneClientTest(OFVCRMixin, TestCase):
     VCR_TEST_FILES = Path(__file__).parent / "files"
 
-    def setUp(self):
-        super().setUp()
-        self.merchant = OgoneMerchantFactory(
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        cls.merchant = OgoneMerchantFactory.build(
             pspid=os.getenv("OGONE_PSPID", "maykinmedia"),
             sha_in_passphrase=os.getenv("OGONE_SHA_IN", "placeholder_sha_in"),
             sha_out_passphrase=os.getenv("OGONE_SHA_OUT", "placeholder_sha_out"),
@@ -27,21 +28,22 @@ def test_payment_request_valid_order_id(self):
         client = OgoneClient(self.merchant)
 
         info = client.get_payment_info(
-            "xyz2024_OF-123456_987654321",
+            "xyz2024/OF-123456/987654321",
             1000,
             "http://foo.bar/return?bazz=buzz",
             RETURN_ACTION_PARAM,
         )
 
         payment_request = requests.post(info.url, data=info.data)
 
+        # Response is always a 200, so we assert on the content instead
         self.assertNotIn("Er is een fout opgetreden", payment_request.text)
 
     def test_payment_request_invalid_order_id(self):
         client = OgoneClient(self.merchant)
 
         info = client.get_payment_info(
-            "xyz2024_OF-123456_987654321THISISPROBABLYTOOLONG",
+            "xyz2024/OF-123456/987654321THISISPROBABLYTOOLONG",
             1000,
             "http://foo.bar/return?bazz=buzz",
             RETURN_ACTION_PARAM,
diff --git a/src/openforms/payments/models.py b/src/openforms/payments/models.py
@@ -52,9 +52,11 @@ def create_public_order_id_for(payment: SubmissionPayment) -> str:
         config = GlobalConfiguration.get_solo()
         prefix = config.payment_order_id_prefix.format(year=payment.created.year)
         if prefix:
-            prefix = f"{prefix}_"
+            prefix = f"{prefix}/"
+
+        assert payment.submission.public_registration_reference
         return (
-            f"{prefix}{payment.submission.public_registration_reference}_{payment.pk}"
+            f"{prefix}{payment.submission.public_registration_reference}/{payment.pk}"
         )
 
 
diff --git a/src/openforms/payments/tests/test_models.py b/src/openforms/payments/tests/test_models.py
