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

Issue 2868: Products at multiple Stock Locations appear as unique variants #3063

Merged
merged 1 commit into from
Jan 31, 2019

Conversation

mayanktap
Copy link
Contributor

Description

This PR deals with the fix for the following issue:
#2868

Ref # (issue)

Checklist:

  • Pull Request guidelines are respected
  • Documentation/Readme have been updated accordingly
  • Changes are covered by tests (if possible)
  • Each commit has a meaningful message attached that described WHAT changed, and WHY

@mayanktap
Copy link
Contributor Author

Hi @spaghetticode ,

This is the new PR(replacement for #2898) that consist the resolution for issue: #2868
Please have a look and let me know in case of any discrepancy.

@spaghetticode
Copy link
Member

@mayanktap I see there are three commits, two of them seems to me to be merge commits. Can you remove them?

This gist may help if you have problems updating the code on your local fork.

@mayanktap
Copy link
Contributor Author

mayanktap commented Jan 30, 2019

@spaghetticode ,
Can we also proceed with making it a single commit by marking the two other commit as fixup?
Otherwise I will proceed with the above.

@spaghetticode
Copy link
Member

@mayanktap I'm not sure I understand your last comment. the ideal situation for this PR is to have only one commit, this one which includes both the code and the spec. I think both code and spec can live in a single commit as they're minimal.

The other 2 commits should be removed, as they are merge commits that don't belong to this PR.

I hope this helps :)

@mayanktap mayanktap force-pushed the remove_duplicate_variants branch from f240b8e to 4b5f2d6 Compare January 30, 2019 18:09
@mayanktap
Copy link
Contributor Author

@spaghetticode ,

Done. Please check.

Copy link
Member

@spaghetticode spaghetticode left a comment

Choose a reason for hiding this comment

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

@mayanktap looks good to me, thank you!

@mayanktap
Copy link
Contributor Author

mayanktap commented Jan 30, 2019

@jacobherrington , @ericsaupe
Can you please review the changes?

Copy link
Contributor

@jacobherrington jacobherrington left a comment

Choose a reason for hiding this comment

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

Thanks for this PR @mayanktap! Great work between you and @spaghetticode 🖖

Copy link
Contributor

@aitbw aitbw left a comment

Choose a reason for hiding this comment

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

Looks good to me, great work @mayanktap ! 👏

@kennyadsl kennyadsl merged commit b5d6ae7 into solidusio:master Jan 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants