odoo
[FW][FIX] pos_self_order: Allow cancelling self order
Prior to this change, when users cancelled their payment, they remained stuck on their previous order. It was not possible to cancel the order from the basket page.
This change allows the user to cancel the order from the shopping cart page.
taskId: 4830007
Forward-Port-Of: odoo/odoo#214437 Forward-Port-Of: odoo/odoo#212140
@davidmonnom @adgu-odoo cherrypicking of pull request odoo/odoo#212140 failed.
stdout:
Auto-merging addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
CONFLICT (content): Merge conflict in addons/pos_self_order/static/src/app/pages/cart_page/cart_page.js
Auto-merging addons/pos_self_order/static/src/app/pages/cart_page/cart_page.xml
CONFLICT (content): Merge conflict in addons/pos_self_order/static/src/app/pages/cart_page/cart_page.xml
Auto-merging addons/pos_self_order/static/tests/tours/self_order_mobile_tour.js
Auto-merging addons/pos_self_order/static/tests/tours/utils/cart_page_util.js
Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).
In the former case, you may want to edit this PR message as well.
:warning: after resolving this conflict, you will need to merge it via @robodoo.
More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port
