has_valid_pickup_location helper

src/Shipping/PickupLocation.php

@@ -45,6 +45,48 @@ public function init() {
 		add_filter( 'woocommerce_attribute_label', array( $this, 'translate_meta_data' ), 10, 3 );
 	}
 
+	/**
+	 * Checks if a given address is complete.
+	 *
+	 * @param array $address Address.
+	 * @return bool
+	 */
+	protected function has_valid_pickup_location( $address ) {
+		// Normalize address.
+		$address_fields = wp_parse_args(
+			(array) $address,
+			array(
+				'city'     => '',
+				'postcode' => '',
+				'state'    => '',
+				'country'  => '',
+			)
+		);
+
+		// Country is always required.
+		if ( empty( $address_fields['country'] ) ) {
+			return false;
+		}
+
+		// If all fields are provided, we can skip further checks.
+		if ( ! empty( $address_fields['city'] ) && ! empty( $address_fields['postcode'] ) && ! empty( $address_fields['state'] ) ) {
+			return true;
+		}
+
+		// Check validity based on requirements for the country.
+		$country_address_fields = wc()->countries->get_address_fields( $address_fields['country'], 'shipping_' );
+
+		foreach ( $country_address_fields as $field_name => $field ) {
+			$key = str_replace( 'shipping_', '', $field_name );
+
+			if ( true === $field['required'] && empty( $address_fields[ $key ] ) ) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
 	/**
 	 * Calculate shipping.
 	 *
@@ -56,7 +98,6 @@ public function calculate_shipping( $package = array() ) {
 				if ( ! $location['enabled'] ) {
 					continue;
 				}
-				$has_pickup_address = ! empty( $location['address'] ) && ! empty( $location['address']['city'] ) && ! empty( $location['address']['state'] ) && ! empty( $location['address']['country'] );
 				$this->add_rate(
 					array(
 						'id'        => $this->id . ':' . $index,
@@ -66,7 +107,7 @@ public function calculate_shipping( $package = array() ) {
 						'cost'      => $this->cost,
 						'meta_data' => array(
 							'pickup_location' => wp_kses_post( $location['name'] ),
-							'pickup_address'  => $has_pickup_address ? wc()->countries->get_formatted_address( $location['address'], ', ' ) : '',
+							'pickup_address'  => $this->has_valid_pickup_location( $location['address'] ) ? wc()->countries->get_formatted_address( $location['address'], ', ' ) : '',
 							'pickup_details'  => wp_kses_post( $location['details'] ),
 						),
 					)