[#3793] Change payment reference number

.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

requirements/base.txt

@@ -12,7 +12,7 @@ ape-pie==0.1.0
     # via
     #   -r requirements/base.in
     #   zgw-consumers
-asgiref==3.5.0
+asgiref==3.7.2
     # via django
 asn1crypto==1.5.1
     # via webauthn
@@ -478,7 +478,9 @@ tinycss2==1.1.0
 tornado==6.3.3
     # via flower
 typing-extensions==4.9.0
-    # via -r requirements/base.in
+    # via
+    #   -r requirements/base.in
+    #   asgiref
 tzdata==2023.3
     # via pytz-deprecation-shim
 tzlocal==4.3.1

requirements/ci.txt

@@ -18,7 +18,7 @@ ape-pie==0.1.0
     #   -c requirements/base.txt
     #   -r requirements/base.txt
     #   zgw-consumers
-asgiref==3.5.0
+asgiref==3.7.2
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
@@ -976,6 +976,7 @@ typing-extensions==4.9.0
     # via
     #   -c requirements/base.txt
     #   -r requirements/base.txt
+    #   asgiref
     #   black
     #   pyee
 tzdata==2023.3

requirements/dev.txt

@@ -21,7 +21,7 @@ ape-pie==0.1.0
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
     #   zgw-consumers
-asgiref==3.5.0
+asgiref==3.7.2
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
@@ -1158,6 +1158,7 @@ typing-extensions==4.9.0
     # via
     #   -c requirements/ci.txt
     #   -r requirements/ci.txt
+    #   asgiref
     #   black
     #   pyee
 tzdata==2023.3

requirements/extensions.txt

@@ -15,7 +15,7 @@ ape-pie==0.1.0
     #   -c requirements/base.in
     #   -r requirements/base.txt
     #   zgw-consumers
-asgiref==3.5.0
+asgiref==3.7.2
     # via
     #   -r requirements/base.txt
     #   django
@@ -754,6 +754,7 @@ typing-extensions==4.9.0
     # via
     #   -c requirements/base.in
     #   -r requirements/base.txt
+    #   asgiref
 tzdata==2023.3
     # via
     #   -r requirements/base.txt

src/openforms/appointments/tests/test_views.py

@@ -803,7 +803,7 @@ def test_invalid_auth_value_raises_exception(self):
 
     def test_change_appointment_details_after_payment(self):
         submission = SubmissionFactory.from_components(
-            completed=True,
+            with_public_registration_reference=True,
             components_list=[
                 {
                     "key": "product",

src/openforms/emails/tests/test_confirmation_email.py

@@ -432,7 +432,7 @@ def test_email_payment_incomplete(self):
     def test_email_payment_completed(self):
         email = ConfirmationEmailTemplate(content="test {% payment_information %}")
         submission = SubmissionFactory.create(
-            completed=True,
+            with_public_registration_reference=True,
             form__product__price=Decimal("12.34"),
             form__payment_backend="test",
         )

src/openforms/logging/logevent.py

@@ -286,7 +286,7 @@ def payment_flow_start(payment: SubmissionPayment, plugin):
         "payment_flow_start",
         plugin=plugin,
         extra_data={
-            "payment_order_id": payment.order_id,
+            "payment_order_id": payment.public_order_id,
             "payment_id": payment.id,
         },
     )
@@ -299,7 +299,7 @@ def payment_flow_failure(payment: SubmissionPayment, plugin, error: Exception):
         plugin=plugin,
         error=error,
         extra_data={
-            "payment_order_id": payment.order_id,
+            "payment_order_id": payment.public_order_id,
             "payment_id": payment.id,
         },
     )
@@ -311,7 +311,7 @@ def payment_flow_return(payment: SubmissionPayment, plugin):
         "payment_flow_return",
         plugin=plugin,
         extra_data={
-            "payment_order_id": payment.order_id,
+            "payment_order_id": payment.public_order_id,
             "payment_id": payment.id,
             "payment_status": payment.status,
             "payment_status_label": PaymentStatus.get_label(payment.status),
@@ -325,7 +325,7 @@ def payment_flow_webhook(payment: SubmissionPayment, plugin):
         "payment_flow_webhook",
         plugin=plugin,
         extra_data={
-            "payment_order_id": payment.order_id,
+            "payment_order_id": payment.public_order_id,
             "payment_id": payment.id,
             "payment_status": payment.status,
             "payment_status_label": PaymentStatus.get_label(payment.status),
@@ -342,7 +342,7 @@ def payment_register_success(payment: SubmissionPayment, plugin):
         "payment_register_success",
         plugin=plugin,
         extra_data={
-            "payment_order_id": payment.order_id,
+            "payment_order_id": payment.public_order_id,
             "payment_id": payment.id,
         },
     )
@@ -355,7 +355,7 @@ def payment_register_failure(payment: SubmissionPayment, plugin, error: Exceptio
         plugin=plugin,
         error=error,
         extra_data={
-            "payment_order_id": payment.order_id,
+            "payment_order_id": payment.public_order_id,
             "payment_id": payment.id,
         },
     )

src/openforms/payments/admin.py

@@ -25,7 +25,6 @@ class SubmissionPaymentAdmin(admin.ModelAdmin):
         "submission",
         "plugin_id",
         "plugin_options",
-        "order_id",
         "public_order_id",
         "amount",
         "status",

src/openforms/payments/contrib/demo/tests/test_plugin.py

@@ -23,7 +23,7 @@ class DemoPaymentTests(TestCase):
 
     def test_payment(self):
         submission = SubmissionFactory.create(
-            completed=True,
+            with_public_registration_reference=True,
             form__slug="myform",
             form__payment_backend="demo",
             form__product__price=Decimal("11.35"),

src/openforms/payments/contrib/ogone/tests/files/vcr_cassettes/OgoneClientTest/OgoneClientTest.test_payment_request_invalid_order_id.yaml

@@ -0,0 +1,81 @@
+interactions:
+- request:
+    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:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, br
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '633'
+      Content-Type:
+      - application/x-www-form-urlencoded
+      User-Agent:
+      - python-requests/2.31.0
+    method: POST
+    uri: https://ogone.test.v-psp.com/ncol/test/orderstandard_utf8.asp
+  response:
+    body:
+      string: "<html><head><meta http-equiv=\"Content-Type\" content=\"text/html;
+        charset=iso-8859-1\"><title>Betaalbevestiging</title><meta name=\"viewport\"
+        content=\"width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0,
+        maximum-scale=1.0\"></head><body text=\"#000000\" bgcolor=\"#FFFFFF\" topmargin=\"2\"
+        leftmargin=\"4\"><p  align=\"center\"><b><font face=\"Verdana\" size=\"4\">Betaalbevestiging</font></b></p><font
+        face=\"Verdana\">\r\n\t<!-- Order overview -->\r\n\t<h2 style=\"display: inline;
+        position: absolute; left: -1000px; top: -1000px; width: 0px; height: 0px;
+        overflow: hidden;\">Overzicht van de bestelling</h2>\r\n\t<table class=ncoltable1
+        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=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
+        class=ncoltxtr colspan=\"1\"><small>---</small></td>\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t</tr>\r\n\r\n\t\t\t\t\t\r\n\t</table>\r\n\t\r\n<br>\r\n<table
+        class=\"ncoltable1\" border=\"0\" cellpadding=\"2\" cellspacing=\"0\" width=\"95%\">\r\n\t<tr>\r\n\t\t<td
+        class=\"ncoltxtc\" colspan=\"2\" align=\"center\">\r\n\t\t\tEr is een fout
+        opgetreden. Probeer later opnieuw.\r\nBent u de eigenaar of de designer van
+        deze website&#63; Meld u dan aan in het backoffice van  om de details van
+        de foutmelding te bekijken.\r\n\t\t</td>\r\n\t</tr>\r\n</table>\r\n<input
+        type=\"hidden\" name=\"log\" value=\"\">\r\n<br>\r\n\r\n\t\t<script type=\"text/javascript\"
+        src=\"js/jquery.core/jquery-3.7.0.min.js\"></script>\r\n\t\t<script type=\"text/javascript\"
+        src=\"js/jquery.plugins/jquery-migrate-3.4.1.min.js\"></script>\r\n\t\r\n\t\t<script
+        type=\"text/javascript\">\r\n\t\t\tvar OGONE = {};\r\n\t\t\tOGONE.jQuery =
+        $.noConflict(true);\r\n\t\t</script>\r\n\t\r\n\t<script type=\"text/javascript\"
+        language=\"JavaScript\" src=\"js/fp/Fp_inc.1.2.js\"></script>\r\n\t<script
+        type=\"text/javascript\" language=\"JavaScript\" src=\"base64_inc.js\"></script>\r\n\t\r\n<!--
+        Further information / Cancel -->\r\n<h2 style=\"display: inline; position:
+        absolute; left: -1000px; top: -1000px; width: 0px; height: 0px; overflow:
+        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=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=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:
+      cache-control:
+      - private, max-age=0
+      content-length:
+      - '4328'
+      content-type:
+      - text/html; Charset=utf-8
+      date:
+      - Fri, 02 Feb 2024 15:47:16 GMT
+      expires:
+      - Fri, 02 Feb 2024 15:46:16 GMT
+      set-cookie:
+      - sessionTest=c2ace207-3f71-491c-8de4-923f2b85a396; path=/ncol/test/; Secure;
+        HttpOnly
+      strict-transport-security:
+      - max-age=16000000; includeSubDomains; preload;
+    status:
+      code: 200
+      message: OK
+version: 1