Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NTR: add sw 6.6.8.0 compatiblity #891

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_pipe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% block mollie_express_privacy_notice %}

{% if mollie_express_required_data_protection and visible %}
<div class="mollie-privacy-note">
<div class="mollie-privacy-note d-none">
{% sw_include '@Storefront/storefront/component/privacy-notice.html.twig' %}
</div>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

}
}
Loading