diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3eecdf9..1974c2d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,6 +39,8 @@ jobs:
with:
repository: open-formulieren/open-forms
path: open-forms
+ # TODO remove after this is merged
+ ref: feature/4380-ogone-payment-id
- name: Checkout StUF-ZDS payments extension
uses: actions/checkout@v4
diff --git a/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_register_submission_with_payment.yaml b/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_register_submission_with_payment.yaml
index f73cd6d..67f0b89 100644
--- a/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_register_submission_with_payment.yaml
+++ b/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_register_submission_with_payment.yaml
@@ -7,7 +7,7 @@ interactions:
\ xmlns:BG=\"http://www.egem.nl/StUF/sector/bg/0310\"\n xmlns:GML=\"http://www.opengis.net/gml\"\n>\n
\ \n Lk01\n
\ \n zender_organisatie-0\nzender_applicatie-0\nzender_administratie-0\nzender_gebruiker-0\n\n\n\n
- \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\n58f3d63c-37ab-4b65-844d-fdb9da043b17\n20240805124256\n\n
+ \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\n71257f65-be1b-4d9a-bc67-16dfd5a3e1a8\n20240805140054\n\n
\ ZAK\n \n
\ \n T\n V\n
\ \n \n
@@ -19,11 +19,13 @@ interactions:
\ \n 20240805\n 20240805\n
\ N.v.t.\n \n\n
\ 1\n N\n
- \ 20240805124256\n
+ \ 20240805140054\n
\ \n\nen\n\nBuzzBazz\n\ntrue\n\n40.0\n\nfoo\n\nbar\n\n\n\n\n
+ naam=\"payment_public_order_ids.1\">bar\n\n123456\n\n654321\n\n\n\n\n
\ \n
\ \n
\ \n bar\n
@@ -39,7 +41,7 @@ interactions:
\ \n 20001231\n\n \n
\ \n \n \n
- \ 20240805124256\n
+ \ 20240805140054\n
\ \n \n \n \n \n \n \n
@@ -56,7 +58,7 @@ interactions:
Connection:
- keep-alive
Content-Length:
- - '5155'
+ - '5309'
Content-Type:
- application/soap+xml
SOAPAction:
@@ -89,7 +91,7 @@ interactions:
Content-Type:
- text/xml
Date:
- - Mon, 05 Aug 2024 12:42:56 GMT
+ - Mon, 05 Aug 2024 14:00:54 GMT
Server:
- Werkzeug/3.0.3 Python/3.12.4
status:
@@ -102,7 +104,7 @@ interactions:
\ \n\n\n
\ \n Di02\n
\ \n zender_organisatie-0\nzender_applicatie-0\nzender_administratie-0\nzender_gebruiker-0\n\n\n\n
- \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\ne4bcac4d-5fab-4a01-a28a-76d168bd7180\n20240805124256\n\n
+ \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\n1f00fc6e-a068-4e91-9d66-840e23d0af57\n20240805140054\n\n
\ genereerDocumentidentificatie\n \n\n
\ \n\n"
headers:
@@ -136,7 +138,7 @@ interactions:
\ genereerDocumentidentificatie\n
\ \n melding\n
\ \n
- \ b3c8b5a4d32fb168\n
+ \ 8eec122ce1010d29\n
\ \n \n
\ \n"
headers:
@@ -147,7 +149,7 @@ interactions:
Content-Type:
- text/xml
Date:
- - Mon, 05 Aug 2024 12:42:56 GMT
+ - Mon, 05 Aug 2024 14:00:54 GMT
Server:
- Werkzeug/3.0.3 Python/3.12.4
status:
@@ -160,11 +162,11 @@ interactions:
\ \n\n\n \n
\ Lk01\n \n zender_organisatie-0\nzender_applicatie-0\nzender_administratie-0\nzender_gebruiker-0\n\n\n\n
- \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\n3cac727d-3782-4905-b516-8ecc109a2c6c\n20240805124256\n\n
+ \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\n66ff8468-958d-4909-b57f-9b114d60429e\n20240805140054\n\n
\ EDC\n \n
\ \n T\n I\n
\ \n \n
- \ b3c8b5a4d32fb168\n foo\n
+ \ 8eec122ce1010d29\n foo\n
\ 20240805\n 20240805\n
\ inzending\n Ingezonden
formulier\n application/pdf\n
@@ -174,11 +176,11 @@ interactions:
StUF:bestandsnaam=\"open-forms-inzending.pdf\">\n \n
\ 20240805\n \n \n
- \ 20240805124256\n
+ \ 20240805140054\n
\ \n
\ \n
\ abc123\n my-form\n
- \ \n 20240805124256\n
+ \ \n 20240805140054\n
\ \n \n\n \n\n"
headers:
Accept:
@@ -221,7 +223,7 @@ interactions:
Content-Type:
- text/xml
Date:
- - Mon, 05 Aug 2024 12:42:56 GMT
+ - Mon, 05 Aug 2024 14:00:54 GMT
Server:
- Werkzeug/3.0.3 Python/3.12.4
status:
diff --git a/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_set_zaak_payment.yaml b/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_set_zaak_payment.yaml
index 78276b2..16cb5f3 100644
--- a/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_set_zaak_payment.yaml
+++ b/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_set_zaak_payment.yaml
@@ -6,7 +6,7 @@ interactions:
\ \n\n\n
\ \n Lk01\n
\ \n zender_organisatie-0\nzender_applicatie-0\nzender_administratie-0\nzender_gebruiker-0\n\n\n\n
- \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\na62fad4a-01c0-46ad-98a7-49592c88b21e\n20240805124256\n\n
+ \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\n5be0d3ae-c1f5-484e-842d-b978f79eed2c\n20240805140054\n\n
\ ZAK\n \n
\ \n W\n V\n
\ \n \n
@@ -15,7 +15,9 @@ interactions:
naam=\"language_code\">en\n\nBuzzBazz\n\ntrue\n\n40.0\n\nfoo\n\nbar\n\n\n\n\n
+ naam=\"payment_public_order_ids.1\">bar\n\n123456\n\n654321\n\n\n\n\n
\ \n\n \n\n"
headers:
Accept:
@@ -25,7 +27,7 @@ interactions:
Connection:
- keep-alive
Content-Length:
- - '2171'
+ - '2325'
Content-Type:
- application/soap+xml
SOAPAction:
@@ -58,7 +60,7 @@ interactions:
Content-Type:
- text/xml
Date:
- - Mon, 05 Aug 2024 12:42:56 GMT
+ - Mon, 05 Aug 2024 14:00:54 GMT
Server:
- Werkzeug/3.0.3 Python/3.12.4
status:
diff --git a/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_set_zaak_payment_incorrect_payment_status_update_mapping.yaml b/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_set_zaak_payment_incorrect_payment_status_update_mapping.yaml
index 9b9aa08..fd0c550 100644
--- a/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_set_zaak_payment_incorrect_payment_status_update_mapping.yaml
+++ b/stuf_zds_payments/tests/data/vcr_cassettes/StufZDSPaymentsRegistrationTestCase/StufZDSPaymentsRegistrationTestCase.test_set_zaak_payment_incorrect_payment_status_update_mapping.yaml
@@ -6,7 +6,7 @@ interactions:
\ \n\n\n
\ \n Lk01\n
\ \n zender_organisatie-0\nzender_applicatie-0\nzender_administratie-0\nzender_gebruiker-0\n\n\n\n
- \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\n59dedae3-715d-429f-ada3-e66c3b3fe3a9\n20240805124256\n\n
+ \ ontvanger_organisatie-0\nontvanger_applicatie-0\nontvanger_administratie-0\nontvanger_gebruiker-0\n\n\n40a76860-3e96-4fe3-b35f-ca5f134e9d4b\n20240805140054\n\n
\ ZAK\n \n
\ \n W\n V\n
\ \n \n
@@ -56,7 +56,7 @@ interactions:
Content-Type:
- text/xml
Date:
- - Mon, 05 Aug 2024 12:42:56 GMT
+ - Mon, 05 Aug 2024 14:00:54 GMT
Server:
- Werkzeug/3.0.3 Python/3.12.4
status:
diff --git a/stuf_zds_payments/tests/test_plugin.py b/stuf_zds_payments/tests/test_plugin.py
index 104d146..2a2845f 100644
--- a/stuf_zds_payments/tests/test_plugin.py
+++ b/stuf_zds_payments/tests/test_plugin.py
@@ -113,12 +113,14 @@ def setUpTestData(cls):
amount=Decimal("25.00"),
public_order_id="foo",
status=PaymentStatus.completed,
+ provider_payment_id="123456",
)
SubmissionPaymentFactory.create(
submission=cls.submission,
amount=Decimal("15.00"),
public_order_id="bar",
status=PaymentStatus.completed,
+ provider_payment_id="654321",
)
def test_set_zaak_payment(self):
@@ -142,6 +144,10 @@ def test_set_zaak_payment(self):
bar
+ 123456
+
+ 654321
+
"""
)
@@ -207,6 +213,10 @@ def test_register_submission_with_payment(self):
bar
+ 123456
+
+ 654321
+
"""
)