Don't check payment and delivery postal/country for same include/exclude

aimeos · May 7, 2018 · 8f188ff · 8f188ff
1 parent 6563b40
commit 8f188ff
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/lib/mshoplib/src/MShop/Service/Provider/Decorator/Country.php b/lib/mshoplib/src/MShop/Service/Provider/Decorator/Country.php
@@ -128,11 +128,6 @@ public function isAvailable( \Aimeos\MShop\Order\Item\Base\Iface $basket )
 			) {
 				return false;
 			}
-		}
-
-		if( isset( $addresses[$paymentType] ) )
-		{
-			$code = strtoupper( $addresses[$paymentType]->getCountryId() );
 
 			if( $this->checkCountryCode( $code, 'country.billing-include' ) === false
 				|| $this->checkCountryCode( $code, 'country.billing-exclude' ) === true

diff --git a/lib/mshoplib/src/MShop/Service/Provider/Decorator/Postal.php b/lib/mshoplib/src/MShop/Service/Provider/Decorator/Postal.php
@@ -128,11 +128,6 @@ public function isAvailable( \Aimeos\MShop\Order\Item\Base\Iface $basket )
 			) {
 				return false;
 			}
-		}
-
-		if( isset( $addresses[$paymentType] ) )
-		{
-			$code = $addresses[$paymentType]->getPostal();
 
 			if( $this->checkPostalCode( $code, 'postal.billing-include' ) === false
 				|| $this->checkPostalCode( $code, 'postal.billing-exclude' ) === true