-
Notifications
You must be signed in to change notification settings - Fork 21
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove the billing setup page from the Ads setup flow #2577
Remove the billing setup page from the Ads setup flow #2577
Conversation
@joemcgill Based on your comment on issue, I have not modified Jest tests here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kt-12 Thanks for the PR! Works well. I suggested a couple of improvements though. Can you kindly let me know what you think?
Also, let's update the tracking comments here:
google-listings-and-ads/js/src/setup-ads/ads-stepper/index.js
Lines 24 to 25 in 5b14c07
* @fires gla_setup_ads with `{ triggered_by: 'step1-continue-button' | 'step2-continue-button' , action: 'go-to-step2' | 'go-to-step3' }`. | |
* @fires gla_setup_ads with `{ triggered_by: 'stepper-step1-button' | 'stepper-step2-button', action: 'go-to-step1' | 'go-to-step2' }`. |
It should be:
* @fires gla_setup_ads with `{ triggered_by: 'step1-continue-button', action: 'go-to-step2' }`.
* @fires gla_setup_ads with `{ triggered_by: 'stepper-step1-button', action: 'go-to-step1'}`.
submitButtonText={ __( | ||
'Launch paid campaign', | ||
'google-listings-and-ads' | ||
) } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AdsCampaign
component is used in 2 flow. One setting up our first paid campaign flow (here). And another for the setting up other paid campaing.
Next is once the first campaign set up you see a button in the right hand side of dashboard- Add paid campaign
,
once you click that you see a different flow where AdsCampaign
is the first component in the flow.
submitButtonText
was introduced to make change to button text in a way it doesn't effect the other flow.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kt-12 Can you kindly check my comment about the default value for the submitButtonText
parameter please?
Done. I have addressed other open review comments too. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kt-12 I left some more comments. Can you check them out please?
Also why we have this error message for the PR?
Check failure on line 90 in js/src/setup-ads/ads-stepper/index.test.js
change text Co-authored-by: Asvin Balloo <asvin.balloo@gmail.com>
…ommerce/google-listings-and-ads into feature/2536-remove-billing
@kt-12 Can you please fix the linting and unit tests errors please? |
Unit test changes are not handled in this ticket. It is handled in a separate ticket 2579, which merges 2534, 2536 and 2535 |
Co-authored-by: Asvin Balloo <asvin.balloo@gmail.com>
I'm updating this PR to point to the new consolidated feature branch |
@eason9487 besides the changes requested for the continue button, I think this is ready for another look. |
Thank you, you were correct. awating after button is clicked did solve waiting indefinitely issue. I have also removed the newly introduced function. |
@eason9487 we have addressed your review comments and also moved continue button out of AdsCampaign. Moving it back to you for CR. |
@@ -57,6 +57,10 @@ const AdsStepper = ( { formProps } ) => { | |||
continueStep( '2' ); | |||
}; | |||
|
|||
// @todo: Add check for billing status once billing setup is moved to step 2. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Checking billing status cannot be done here, it must instead be done after an Ads account is connected in Step 1. The billing status check will be handled in AdsCampaign
after #2535 is completed, so we can ignore this check for now.
@eason9487 I've added a todo concerning the need to check for billing status, which should be handled after #2623 is updated, since the new consolidated form will be responsible for checking the billing status. |
@eason9487 I have addressed your review changes. Moved it back to you for CR. |
d6ed5cf
into
feature/2459-campaign-creation-flow
Changes proposed in this Pull Request:
Closes #2536 .
Billing setup page should be removed and also
Launch Paid Campaign
should be possible from second step.Screenshots:
Detailed test instructions:
DELETE FROM `wp_options` WHERE `option_name` = 'gla_ads_setup_completed_at';
Add paid campaign
Set up your accounts
pageLaunch Paid Campaign
button which enables on addingDaily Average Cost
Additional details:
Changelog entry