This repository has been archived by the owner on Feb 23, 2024. It is now read-only.
Hide the shipping address form from Checkout Block in Editor and rename the Billing Address label when "Force shipping to the customer billing address" is enabled. #7800
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
…hen Force shipping to the customer billing address is enabled
|
The release ZIP for this PR is accessible via: |
TypeScript Errors ReportFiles with errors: 431 🎉 🎉 This PR does not introduce new TS errors. |
|
Size Change: +288 B (0%) Total Size: 972 kB
ℹ️ View Unchanged
|
rubikuserbot
requested review from
a team and
senadir
and removed request for
a team
tarunvijwani
added
status: needs review
type: bug
opr
suggested changes
Dec 1, 2022
There was a problem hiding this comment.
Hey @tarunvijwani thanks for working on this, it looks great! I have added a few comments, but nothing major.
|
|
||
| export default { | ||
| export const attributes: Record< string, Record< string, unknown > > = { |
There was a problem hiding this comment.
Could we use the Gutenberg type BlockAttributes here?
You'd need to import { BlockAttributes } from '@wordpress/blocks';
There was a problem hiding this comment.
Yes, that's a better way to define types. Added the BlockAttributes type. 👍
|
|
||
| if ( forcedBillingAddress ) { | ||
| attributes.title = | ||
| attributes.title === DEFAULT_TITLE |
There was a problem hiding this comment.
This ternary operator is a little hard to reason with, maybe adding comments would be useful here.
There was a problem hiding this comment.
I would also consider if we need the if/else structure here, or if it would be better to move this logic into a separate function, remove the use of ternary operators and make this easier to read, what do you think?
There was a problem hiding this comment.
That's actually a good idea! I have moved the logic to a different function and added the comments for better understanding. Thank you! 🙂
| @@ -43,7 +49,19 @@ const FrontendBlock = ( { | |||
| if ( ! showBillingFields && ! forcedBillingAddress ) { | |||
| return null; | |||
| } | |||
|
|
|||
| if ( forcedBillingAddress ) { | |||
There was a problem hiding this comment.
Please see my comment about if/else and ternary operators in the edit.tsx file and consider if the same applies here.
|
|
||
| export default { |
There was a problem hiding this comment.
How come we removed this and now only export a named const?
Should we add export default attributes at the bottom of this file?
There was a problem hiding this comment.
Ah, I missed that. This is fixed now. Thank you!
…efault export for attributes
Script Dependencies ReportThere is no changed script dependency between this branch and trunk. This comment was automatically generated by the |
opr
reviewed
Dec 1, 2022
| forcedBillingAddress: boolean | ||
| ): string => { | ||
| if ( forcedBillingAddress ) { | ||
| // returns default forced billing title when forced billing address is enabled and there is no title set |
There was a problem hiding this comment.
Slight nit pick on these comments: please ensure we follow the WP Coding guidelines here: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/javascript/#comments
Besides this, these new functions look good!
There was a problem hiding this comment.
Thank you for the guide! I have fixed the comments. 👍
opr
approved these changes
Dec 2, 2022
tarunvijwani
deleted the
fix/7513-billing-address-lable-for-force-billing
branch
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.
In PRs #7268 and #7393, we hide the shipping address form from the front end for the Checkout block when
Force shipping to the customer billing addressis enabled.In this PR, we hide the shipping address form from the Editor and rename the billing address label when
Force shipping to the customer billing addressis enabled.Fixes #7513
Fixes #7394
Changes in the PR
Accessibility
prefers-reduced-motionOther Checks
Screenshots
Testing
Automated Tests
User Facing Testing
wp-admin/admin.php?page=wc-settings&tab=shipping§ion=optionspage.Force shipping to the customer billing addressoption and save the changes.Billing and shipping addressand the description isEnter the billing and shipping address that matches your payment method.Billing and shipping addressand the description isEnter the billing and shipping address that matches your payment method.Force shipping to the customer billing addressoption and save the changes.WooCommerce Visibility
Performance Impact
Changelog