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.

Sign up for GitHub

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

Jump to bottom

Update OrderFollowController.php #9372

Merged
merged 3 commits into from Jul 30, 2018
Merged

Update OrderFollowController.php #9372

merged 3 commits into from Jul 30, 2018

Conversation

PedroRendeiro
Copy link
Contributor

@PedroRendeiro PedroRendeiro commented Jul 23, 2018 •
edited by PierreRambaud

Questions Answers
Branch? develop
Description? When in order follow page and there is nothing to show an error is displayed instead of a warning like in other account pages.
Type? bug fix
Category? FO
BC breaks? no
Deprecations? no
Fixed ticket? -
How to test? Just go to the Order Follow page on My Account.

Important guidelines

This change is Reviewable

@prestonBot
Copy link
Collaborator

Hello @PedroRendeiro!

This is your first pull request on the PrestaShop project. Thank you, and welcome to this Open Source community!

@prestonBot prestonBot added 1.7.4.x Branch Bug Type: Bug Waiting for wording Status: action required, waiting for wording labels Jul 23, 2018
@Quetzacoalt91
Copy link
Member

That's a legit change.
Would you mind making your PR for the develop branch instead?

@LouiseBonnard LouiseBonnard removed the Waiting for wording Status: action required, waiting for wording label Jul 24, 2018
@PedroRendeiro PedroRendeiro changed the base branch from 1.7.4.x to develop July 24, 2018 10:35
@prestonBot prestonBot added 1.7.4.x Branch Bug Type: Bug Waiting for wording Status: action required, waiting for wording labels Jul 24, 2018
@PedroRendeiro
Update order-return.tpl
c5bdae4 
Fixes missing quantity on order return page.
@PedroRendeiro
Update order-return.tpl
fe08f95
@prestonBot prestonBot added develop Branch Bug Type: Bug Waiting for wording Status: action required, waiting for wording labels Jul 25, 2018
@PierreRambaud PierreRambaud added develop Branch and removed 1.7.4.x Branch develop Branch labels Jul 25, 2018
@LouiseBonnard LouiseBonnard removed the Waiting for wording Status: action required, waiting for wording label Jul 25, 2018
@Quetzacoalt91 Quetzacoalt91 added the Waiting for QA Status: action required, waiting for test feedback label Jul 25, 2018
@ntiepresta ntiepresta added QA ✔️ Status: check done, code approved and removed Waiting for QA Status: action required, waiting for test feedback labels Jul 27, 2018
@PierreRambaud PierreRambaud added this to the 1.7.5.0 milestone Jul 30, 2018
@PierreRambaud PierreRambaud merged commit e29a6e4 into PrestaShop:develop Jul 30, 2018
@PierreRambaud
Copy link
Contributor

Thanks @PedroRendeiro

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PierreRambaud PierreRambaud PierreRambaud approved these changes

@Quetzacoalt91 Quetzacoalt91 Quetzacoalt91 approved these changes

Assignees
No one assigned
Labels
Bug Type: Bug develop Branch QA ✔️ Status: check done, code approved
Projects
None yet
Milestone
1.7.5.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@PedroRendeiro @prestonBot @Quetzacoalt91 @PierreRambaud @LouiseBonnard @ntiepresta