Skip to content
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

Fixed #20631 for 2.3 #20637

Closed

Conversation

mahesh-rajawat
Copy link
Member

@mahesh-rajawat mahesh-rajawat commented Jan 26, 2019

Reference PR #20632.
Fixed #20631

Description (*)

Fixed Issues (if relevant)

  1. Console error on checkout after changing the allowed countries from admin. #20631
  2. ...

Manual testing scenarios (*)

  1. Add a product to cart as guest.
  2. Fill the shipping address and reload the page now shipping address must be filled already.
  3. Go to Admin->Stores->configuration->General, Change allowed countries single one that is not filled on checkout. like i have filled United State at checkout and change allowed countries to Libya.
  4. Now reload the checkout shipping page again.

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

@magento-engcom-team
Copy link
Contributor

Hi @maheshWebkul721. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento-engcom-team give me test instance - deploy test instance based on PR changes
  • @magento-engcom-team give me 2.3-develop instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

@mahesh-rajawat mahesh-rajawat changed the title Fixed #20632 Fixed #20631 for 2.3 Jan 27, 2019
@novikor novikor requested a review from swnsma January 28, 2019 08:29
@novikor
Copy link
Contributor

novikor commented Jan 28, 2019

@maheshWebkul721 , it seems you forgot to push your changes 😄

@mahesh-rajawat
Copy link
Member Author

@novikor changes added.

Copy link
Contributor

@swnsma swnsma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @maheshWebkul721
Thank you for your pull request.
Please merge all your commits into one.

You can do it with next instruction:

  • Open project in terminal
  • Run git rebase -i commit_hash, where commit_hash is Revision Number of commit from which your branch was created.
  • You should see a list of commits, each commit starting with the word "pick".
  • Make sure the first commit says "pick" and change the rest from "pick" to "squash". -- This will squash each commit into the previous commit, which will continue until every commit is squashed into the first commit.
  • Save and close the editor.
  • It will give you the opportunity to change the commit message.
  • Save and close the editor again.
  • Then you have to force push the final, squashed commit: git push -f

@mahesh-rajawat
Copy link
Member Author

Hi @swnsma , i have tried to do rebase it like:
i have created this branch from my fork project 2.3-develope. And on 2.3-develop branch latest commit
id is 103282cb113128ac4049cae98abc49001aea1fec, so i did it like:
git rebase -i 103282cb113128ac4049cae98abc49001aea1fec i didn't see the list of commits on editor.
when i close editor, message says rebase successfully, then tried to push, now message is: everything
up to date.

@swnsma
Copy link
Contributor

swnsma commented Jan 31, 2019

Hi @maheshWebkul721,
You can try next:

  • Checkout to your branch;
  • Use git log in terminal to see history of commits;
  • Scroll down to first commit which are not present in current pull request (so, last commit which was done without your changes).
  • Copy commit hash and use it for rebase;

If it will not help, please sent me screenshot of the problem in your terminal.

@mahesh-rajawat
Copy link
Member Author

Hi @swnsma , i think i did it, you are awesome 😊
Thanks for your Help.

@swnsma
Copy link
Contributor

swnsma commented Feb 2, 2019

Hi @maheshWebkul721
Thank you for your contribution and for your time.
This issue already have been fixed and merged in PR #20634.

@ghost
Copy link

ghost commented Feb 2, 2019

Hi @maheshWebkul721, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Console error on checkout after changing the allowed countries from admin.
4 participants