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

Implement discounts management in Order View page #15901

Merged
merged 28 commits into from Oct 17, 2019

Conversation

@sarjon
Copy link
Contributor

sarjon commented Oct 10, 2019

Questions Answers
Branch? develop
Description? This PR implements discounts management in new Order view page.
Type? refacto
Category? BO
BC breaks? no
Deprecations? no
Fixed ticket? #15826
How to test? Please indicate how to best verify that this PR is correct.

This change is Reviewable

@sarjon sarjon requested a review from PrestaShop/prestashop-core-developers as a code owner Oct 10, 2019
@matks

This comment has been minimized.

Copy link
Contributor

matks commented Oct 11, 2019

Only #15901 (comment) missing, then code is valid 👍

@sarjon sarjon force-pushed the sarjon:m/orders/view-products branch from 22cd7b9 to 0025241 Oct 14, 2019
@matks

This comment has been minimized.

Copy link
Contributor

matks commented Oct 14, 2019

Code is 👍
Once we get validation for wording, we can move on QA 😄

@sarjon

This comment has been minimized.

Copy link
Contributor Author

sarjon commented Oct 16, 2019

Wording updated! :)

sarjon and others added 16 commits Oct 10, 2019
…ocks/View/Modal/add_product_modal.html.twig

Co-Authored-By: LouiseBonnard <32565890+LouiseBonnard@users.noreply.github.com>
…ocks/View/Modal/add_product_modal.html.twig

Co-Authored-By: LouiseBonnard <32565890+LouiseBonnard@users.noreply.github.com>
…ocks/View/Modal/add_product_modal.html.twig

Co-Authored-By: LouiseBonnard <32565890+LouiseBonnard@users.noreply.github.com>
…ocks/View/Modal/update_product_modal.html.twig

Co-Authored-By: LouiseBonnard <32565890+LouiseBonnard@users.noreply.github.com>
…ocks/View/Modal/update_product_modal.html.twig

Co-Authored-By: LouiseBonnard <32565890+LouiseBonnard@users.noreply.github.com>
…ocks/View/products.html.twig

Co-Authored-By: LouiseBonnard <32565890+LouiseBonnard@users.noreply.github.com>
@sarjon sarjon force-pushed the sarjon:m/orders/view-products branch from 27af5ab to cadea7e Oct 17, 2019
@matks
matks approved these changes Oct 17, 2019
@matks matks added this to the 1.7.7.0 milestone Oct 17, 2019
@matks

This comment has been minimized.

Copy link
Contributor

matks commented Oct 17, 2019

Merged, QA and product review will happen on next PR to be built on top of this one

@matks matks merged commit a79bbea into PrestaShop:develop Oct 17, 2019
2 checks passed
2 checks passed
PrettyCI Code formatting
Details
Travis CI - Pull Request Build Passed
Details
@sarjon sarjon deleted the sarjon:m/orders/view-products branch Oct 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.