Release 6.1.7

README.md

@@ -71,7 +71,7 @@ tail -f var/log/postfinancecheckout_payment*.log
 
 ## Documentation
 
-[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/6.1.6/docs/en/documentation.html)
+[Documentation](https://plugin-documentation.postfinance-checkout.ch/pfpayments/shopware-6/6.1.7/docs/en/documentation.html)
 
 ## License
 

bin/release.php

@@ -35,7 +35,7 @@
 		break;
 }
 
-$composerJsonData['version'] = '6.1.6';
+$composerJsonData['version'] = '6.1.7';
 
 $logger->info('Adding shopware/core and shopware/storefront to the composer.json.');
 file_put_contents(

docs/en/documentation.html

@@ -23,7 +23,7 @@ <h2>Documentation</h2>				</div>
 		</a>
 	</li>
 	<li>
-		<a href="https://github.com/pfpayments/shopware-6/releases/tag/6.1.6/">
+		<a href="https://github.com/pfpayments/shopware-6/releases/tag/6.1.7/">
 			Source
 		</a>
 	</li>

src/Resources/views/storefront/page/checkout/order/postfinancecheckout.html.twig

@@ -69,7 +69,9 @@
 
 								{% block page_checkout_confirm_address_billing_data %}
 									<div class="confirm-address-billing">
-										{% if billingAddress.id is same as(shippingAddress.id) %}
+										{% set shippingAddress = context.customer.activeShippingAddress %}
+										{% set billingAddress = context.customer.activeBillingAddress %}
+										{% if shippingAddress.id is defined and shippingAddress.id is same as(billingAddress.id) %}
 											{% block page_checkout_confirm_address_billing_data_equal %}
 												<p>
 													{{ "checkout.addressEqualText"|trans|sw_sanitize }}