diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml
index 51303d84a..4e471fe74 100644
--- a/.github/workflows/ci_pipe.yml
+++ b/.github/workflows/ci_pipe.yml
@@ -340,7 +340,7 @@ jobs:
fail-fast: false
matrix:
include:
- - shopware: '6.6.7.1'
+ - shopware: '6.6.8.2'
php: '8.2'
- shopware: '6.5.8.12'
php: '8.2'
diff --git a/.github/workflows/nightly_pipe.yml b/.github/workflows/nightly_pipe.yml
index 535c0deff..d1e9283f6 100644
--- a/.github/workflows/nightly_pipe.yml
+++ b/.github/workflows/nightly_pipe.yml
@@ -334,7 +334,7 @@ jobs:
fail-fast: false
matrix:
include:
- - shopware: '6.6.7.1'
+ - shopware: '6.6.8.2'
php: '8.2'
- shopware: '6.6.6.0'
php: '8.2'
diff --git a/.github/workflows/pr_pipe.yml b/.github/workflows/pr_pipe.yml
index eddbe7127..615af3144 100644
--- a/.github/workflows/pr_pipe.yml
+++ b/.github/workflows/pr_pipe.yml
@@ -333,7 +333,7 @@ jobs:
fail-fast: false
matrix:
include:
- - shopware: '6.6.7.1'
+ - shopware: '6.6.8.2'
php: '8.2'
- shopware: '6.5.8.12'
php: '8.2'
diff --git a/src/Resources/views/mollie/component/express-privacy-notice.html.twig b/src/Resources/views/mollie/component/express-privacy-notice.html.twig
index 55bb8f122..3ee537796 100644
--- a/src/Resources/views/mollie/component/express-privacy-notice.html.twig
+++ b/src/Resources/views/mollie/component/express-privacy-notice.html.twig
@@ -1,7 +1,7 @@
{% block mollie_express_privacy_notice %}
{% if mollie_express_required_data_protection and visible %}
-
+
{% sw_include '@Storefront/storefront/component/privacy-notice.html.twig' %}
{% endif %}
diff --git a/tests/Cypress/cypress/e2e/storefront/checkout/checkout-failed.cy.js b/tests/Cypress/cypress/e2e/storefront/checkout/checkout-failed.cy.js
index 23b3beb4c..516385dfd 100644
--- a/tests/Cypress/cypress/e2e/storefront/checkout/checkout-failed.cy.js
+++ b/tests/Cypress/cypress/e2e/storefront/checkout/checkout-failed.cy.js
@@ -198,9 +198,16 @@ context("Checkout Failure Tests", () => {
// we are now back in our shop
// the payment failed, so shopware says the order is complete
// but we still need to complete the payment and edit the order
- cy.url().should('include', '/account/order/edit/');
-
- if (shopware.isVersionGreaterEqual('6.4.10.0')) {
+ if (shopware.isVersionGreaterEqual('6.6.8.0')) {
+ cy.url().should('include', '/account/order');
+ }else {
+ cy.url().should('include', '/account/order/edit/');
+ }
+ //since shopware 6.6.8.0 a cancelled order cannot be edited or paid
+ if(shopware.isVersionGreaterEqual('6.6.8.0')){
+ cy.contains('was canceled and cannot be edited afterwards.');
+ return;
+ } else if(shopware.isVersionGreaterEqual('6.4.10.0')){
cy.contains('We have received your order, but the payment was aborted');
} else {
cy.contains('We received your order, but the payment was aborted');
diff --git a/tests/Cypress/cypress/support/actions/storefront/checkout/CheckoutAction.js b/tests/Cypress/cypress/support/actions/storefront/checkout/CheckoutAction.js
index 8b4d66b42..4e7f2a5da 100644
--- a/tests/Cypress/cypress/support/actions/storefront/checkout/CheckoutAction.js
+++ b/tests/Cypress/cypress/support/actions/storefront/checkout/CheckoutAction.js
@@ -118,5 +118,12 @@ export default class CheckoutAction {
cy.wait(1000);
cy.get('select.country-select:eq(0)').select(billingCountry);
cy.get('.address-form-actions:eq(0) button').click();
+
+ //since 6.6.8.0 the edit address modal does not close automatically
+ if(shopware.isVersionGreaterEqual('6.6.8.0')){
+ cy.wait(1000);
+ cy.get('.js-pseudo-modal .modal-dialog .btn-close').click();
+ }
+
}
}