This repository has been archived by the owner on Feb 23, 2024. It is now read-only.
Hide "collection from" text when a location has an incomplete address. #9808
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The release ZIP for this PR is accessible via: Script Dependencies ReportThere is no changed script dependency between this branch and trunk. This comment was automatically generated by the TypeScript Errors Report
🎉 🎉 This PR does not introduce new TS errors. |
|
Size Change: +1.33 kB (0%) Total Size: 1.17 MB
ℹ️ View Unchanged
|
|
@tarunvijwani thats the trunk behaviour. I just retested and its fine in this branch. Suggest rebuilding and clearing caches, or someone else from @woocommerce/rubik can try it. |
@mikejolley I'm getting the same result as @tarunvijwani. To ensure that I'm starting with a fresh environment, I ran the following commands: rm composer.lock
rm package-lock.json
rm -rf node_modules
rm -rf vendor
nvm use
composer i
npm i
npm run build
|
tarunvijwani
suggested changes
Jun 21, 2023
src/Shipping/PickupLocation.php
Outdated
| @@ -42,6 +56,7 @@ 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'] ); | |||
There was a problem hiding this comment.
Some countries like UAE don't have a state. This condition will hide the Collection from for them as well.
I feel we should have helper function that will check the address completeness based on the country.
We have one similar function: isAddressComplete in utils. Do you think we should utilize it here?
You can test that with the below address:
opr
suggested changes
Jun 26, 2023
There was a problem hiding this comment.
Code wise it looks great, Tarun's suggestion is valid though! We should avoid checking for fields that may are not required for that locale.
What do you think of this?
$required_address_fields_for_country = [];
if ( ! empty( $location['address']['country'] ) ) {
$shipping_address_fields = wc()->countries->get_address_fields( $location['address']['country'], 'shipping_' );
foreach ( $shipping_address_fields as $field_name => $field ) {
if ( true === $field['required'] ) {
$required_address_fields_for_country[] = str_replace( 'shipping_', '', $field_name );
}
}
}
$has_pickup_address = ! empty( $location['address'] ) &&
( ! empty( $location['address']['city'] ) || ! in_array( 'city', $required_address_fields_for_country, true ) ) &&
( ! empty( $location['address']['state'] ) || ! in_array( 'state', $required_address_fields_for_country, true ) ) &&
( ! empty( $location['address']['country'] ) );|
I added a helper in b4bfc94 |
opr
approved these changes
Jun 28, 2023
tarunvijwani
suggested changes
Jun 28, 2023
|
@tarunvijwani missed a check to see if the field was included in address_fields. Try now. |
tarunvijwani
approved these changes
Jun 28, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hides the "collection from
" section when a local pickup location has no defined address. This prevents repetition of the local pickup rate name, or nonsensical text.Fixes #9789
User Facing Testing
WooCommerce Visibility
Changelog