♻️ Consolidate country-based validation issues

Author: stracker-phil

modules/ppcp-store-sync/src/CartValidation/ShippingValidator.php

@@ -35,8 +35,6 @@ class ShippingValidator implements ValidatorInterface {
 	/**
 	 * List of shipping countries that are supported by the agentic integration.
 	 * Managed on plugin-side for extra code and test stability.
-	 *
-	 * If this list is expanded, also update the message in {@see validate_country()}
 	 */
 	private const PAYPAL_SUPPORTED_COUNTRIES = array( 'US' );
 
@@ -348,17 +346,6 @@ private function validate_country( ?string $country_code ): ?ValidationIssue {
 				);
 		}
 
-		if ( $this->get_wc_countries() && ! $this->is_paypal_supported_country( $country_code ) ) {
-			return ValidationIssue::create_shipping_unavailable( sprintf( 'Shipping to %s is not supported by PayPal', $country_code ) )
-				->user_message( 'PayPal currently only supports shipping to the United States.' )
-				->for_field( 'shipping_address.country_code' )
-				->add_resolution(
-					ResolutionOption::create_update_address()
-						->label( 'Use a supported shipping country' )
-						->priority( Priority::HIGH )
-				);
-		}
-
 		return null;
 	}
 
@@ -374,6 +361,10 @@ private function is_country_allowed( string $country_code ): bool {
 			return true;
 		}
 
+		if ( ! $this->is_paypal_supported_country( $country_code ) ) {
+			return false;
+		}
+
 		$allowed_countries = $wc_countries->get_shipping_countries();
 
 		if ( empty( $allowed_countries ) ) {