Product management and specific prices new rules in Order #20145

jolelievre · 2020-07-10T17:32:11Z

Questions	Answers
Branch?	1.7.7.x
Description?	This PR has the purpose of bringin more rules to the product management in order, to sum it up: - duplicate products are not allowed any more in an Order unless they are assigned to different invoices - each product has one single price even if it has duplicates among invoices (all invoices are updated) - some additional popup are displayed to prevent the user when he is about to change several products prices at once - when adding a product the preset values for prices must match the specific price if present (#19490)
Type?	bug fix
Category?	BO
BC breaks?	no
Deprecations?	no
Fixed ticket?	Fixes #20010 and fixes #19490 and fixes #18237 (EPIC #20161) and #20533 and #20542
How to test?	You can follow the instructions and use cases from the issue

This change is

Progi1984 · 2020-07-13T13:51:55Z

Travis is 🔴 for integration tests :

    Features/Scenario/Order/order_cart_rules.feature:161
    Features/Scenario/Order/order_from_bo.feature:80
    Features/Scenario/Order/order_from_bo.feature:97
    Features/Scenario/Order/order_from_bo.feature:149

atomiix

LGTM, Maybe add a test for adding the same product but a different combination?

matthieu-rolland · 2020-07-20T07:18:11Z

@atomiix sorry this PR is a work in progress, I should have added the label 😅
There is still work to do:

Edit invoices having the same product (with same combination if any)
Edit (or refresh?) all same products line in the frontend after adding the product (today it adds a line for the new product, but former products are not edited, now it's needed)
Update behat tests, add behat tests regarding the effects of creating a new specific price rules

jolelievre

I believe it's still in WIP but I commented a few things
Also you managed the js for add product, but don't forget to do the same (confirm modal + udpate prices) for product edition 😉

classes/order/OrderInvoice.php

src/Adapter/Order/AbstractOrderHandler.php

src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php

admin-dev/themes/new-theme/js/pages/order/view/order-product-add.js

src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php

admin-dev/themes/new-theme/js/pages/order/view/order-product-edit.js

src/Adapter/Order/OrderAmountUpdater.php

src/Adapter/Order/AbstractOrderHandler.php

src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php

src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php

src/PrestaShopBundle/Controller/Admin/Sell/Order/OrderController.php

src/PrestaShopBundle/Resources/config/routing/admin/sell/orders/orders.yml

src/Adapter/Order/AbstractOrderHandler.php

jolelievre

Some new comments for things to be finished ^^

admin-dev/themes/new-theme/js/pages/order/view/order-product-edit.js

src/Adapter/Order/AbstractOrderHandler.php

src/Adapter/Order/CommandHandler/UpdateProductInOrderHandler.php

jolelievre · 2020-08-25T15:28:31Z

Hi @khouloudbelguith
Thank you I'll look into it

jolelievre · 2020-08-26T11:05:48Z

Hi @khouloudbelguith,

I just fixed the bug it's ok now, actually the price was only checked when adding a product to a new invoice not to an existing one..

khouloudbelguith · 2020-08-27T12:59:17Z

Hi @jolelievre,

I found this issue following these steps:

Create an order with a Product1
Change the status of the Order to payment accepted
Try to add the same product to the order with editing the price
Click Add
See error => the pop up "Edit the price" is displayed instead of this alert "Error! This product is already in your order, please edit the quantity instead."

At this time, if you click Update => the right alert is displayed.

A related issue following these steps:

Create an order with a Product1
Try to add the same product to the order with editing the price
see error => an empty pop up is displayed

Thanks!

…l labels are managed in the edit invoice select

prestashop-issue-bot · 2020-08-28T14:46:18Z

QA OK without required approvals !?

jolelievre requested a review from a team as a code owner July 10, 2020 17:32

prestonBot added 1.7.7.x Branch Bug Type: Bug Waiting for wording Status: action required, waiting for wording labels Jul 10, 2020

jolelievre changed the title ~~Specific prices new rules~~ Order product and specific prices new rules in Order Jul 10, 2020

jolelievre changed the title ~~Order product and specific prices new rules in Order~~ Product management and specific prices new rules in Order Jul 10, 2020

This was linked to issues Jul 13, 2020

Wrong price displayed before adding a product on a order #19490

Closed

When I add an existing product in the order's BO #20010

Closed

Junebyun added Wording ✔️ Status: check done, wording approved and removed Waiting for wording Status: action required, waiting for wording labels Jul 13, 2020

prestonBot added the Waiting for wording Status: action required, waiting for wording label Jul 13, 2020

MatShir linked an issue Jul 13, 2020 that may be closed by this pull request

[EPIC] Wrong product prices on adding/editing on the order's BO #20161

Closed

5 tasks

Progi1984 added this to the 1.7.7.0 milestone Jul 13, 2020

matthieu-rolland force-pushed the specific-prices-new-rules branch from a3351d9 to b3b25a4 Compare July 15, 2020 16:18

LouiseBonnard removed the Waiting for wording Status: action required, waiting for wording label Jul 16, 2020

atomiix reviewed Jul 16, 2020

View reviewed changes

matthieu-rolland added the WIP Status: Work In Progress label Jul 20, 2020

matthieu-rolland changed the title ~~Product management and specific prices new rules in Order~~ [WIP] Product management and specific prices new rules in Order Jul 20, 2020

prestonBot added the Waiting for wording Status: action required, waiting for wording label Jul 20, 2020

matthieu-rolland force-pushed the specific-prices-new-rules branch 2 times, most recently from 40aa632 to 0a161b4 Compare July 23, 2020 13:30

jolelievre commented Jul 23, 2020

View reviewed changes

src/Adapter/Order/CommandHandler/AddProductToOrderHandler.php Outdated Show resolved Hide resolved

jolelievre commented Jul 28, 2020

View reviewed changes

jolelievre commented Jul 29, 2020

View reviewed changes

src/Adapter/Order/AbstractOrderHandler.php Outdated Show resolved Hide resolved

MatShir mentioned this pull request Jul 29, 2020

[EPIC] Wrong product prices on adding/editing on the order's BO #20161

Closed

5 tasks

jolelievre commented Jul 31, 2020

View reviewed changes

jolelievre force-pushed the specific-prices-new-rules branch from ea173cc to c5bf46b Compare July 31, 2020 13:52

Check new price when adding product to existing invoice

e04c558

jolelievre dismissed stale reviews from PierreRambaud and NeOMakinG via 8ac2a45 August 26, 2020 11:03

jolelievre force-pushed the specific-prices-new-rules branch from cf16a65 to 8ac2a45 Compare August 26, 2020 11:03

PierreRambaud previously approved these changes Aug 26, 2020

View reviewed changes

NeOMakinG previously approved these changes Aug 26, 2020

View reviewed changes

NeOMakinG added Waiting for QA Status: action required, waiting for test feedback and removed Waiting for author Status: action required, waiting for author feedback Waiting for dev Status: action required, waiting for tech feedback labels Aug 26, 2020

khouloudbelguith added Waiting for author Status: action required, waiting for author feedback Waiting for dev Status: action required, waiting for tech feedback and removed Waiting for QA Status: action required, waiting for test feedback labels Aug 27, 2020

jolelievre added 2 commits August 27, 2020 17:16

Only check prices when add product on multi invoices order, edit moda…

e65a516

…l labels are managed in the edit invoice select

Build assets

6c2d698

jolelievre dismissed stale reviews from NeOMakinG and PierreRambaud via 6c2d698 August 27, 2020 15:18

jolelievre force-pushed the specific-prices-new-rules branch from 8ac2a45 to 6c2d698 Compare August 27, 2020 15:18

jolelievre added Waiting for QA Status: action required, waiting for test feedback and removed Waiting for author Status: action required, waiting for author feedback Waiting for dev Status: action required, waiting for tech feedback labels Aug 28, 2020

matks approved these changes Aug 28, 2020

View reviewed changes

PierreRambaud approved these changes Aug 28, 2020

View reviewed changes

Robin-Fischer-PS added QA ✔️ Status: check done, code approved and removed Waiting for QA Status: action required, waiting for test feedback labels Aug 28, 2020

jolelievre merged commit 947dd79 into PrestaShop:1.7.7.x Aug 28, 2020

jolelievre deleted the specific-prices-new-rules branch August 28, 2020 14:48

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Product management and specific prices new rules in Order #20145

Product management and specific prices new rules in Order #20145

jolelievre commented Jul 10, 2020 •

edited

Progi1984 commented Jul 13, 2020

atomiix left a comment

matthieu-rolland commented Jul 20, 2020 •

edited

jolelievre left a comment

jolelievre left a comment

jolelievre commented Aug 25, 2020

jolelievre commented Aug 26, 2020

khouloudbelguith commented Aug 27, 2020

prestashop-issue-bot bot commented Aug 28, 2020

Product management and specific prices new rules in Order #20145

Product management and specific prices new rules in Order #20145

Conversation

jolelievre commented Jul 10, 2020 • edited

Progi1984 commented Jul 13, 2020

atomiix left a comment

Choose a reason for hiding this comment

matthieu-rolland commented Jul 20, 2020 • edited

jolelievre left a comment

Choose a reason for hiding this comment

jolelievre left a comment

Choose a reason for hiding this comment

jolelievre commented Aug 25, 2020

jolelievre commented Aug 26, 2020

khouloudbelguith commented Aug 27, 2020

prestashop-issue-bot bot commented Aug 28, 2020

jolelievre commented Jul 10, 2020 •

edited

matthieu-rolland commented Jul 20, 2020 •

edited