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

[FW][FIX] point_of_sale,pos_restaurant: show qrcode when order is paid #156362

Conversation

fw-bot
Copy link
Contributor

@fw-bot fw-bot commented Mar 4, 2024

Current behavior:
When printing the bill before the order has been paid, the QRCode to get the invoice shouldn't be shown.

Steps to reproduce:

  • Activate the option "Show QR Code" in the POS settings
  • Create a new order
  • Add some products
  • Click on "Bill" button
  • The QRCode is shown

opw-3703720

I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr

Forward-Port-Of: #156106
Forward-Port-Of: #155253

@robodoo
Copy link
Contributor

robodoo commented Mar 4, 2024

@fw-bot
Copy link
Contributor Author

fw-bot commented Mar 4, 2024

@robinengels @caburj cherrypicking of pull request #155253 failed.

stdout:

Auto-merging addons/point_of_sale/static/src/js/models.js
CONFLICT (content): Merge conflict in addons/point_of_sale/static/src/js/models.js
Auto-merging addons/pos_restaurant/static/tests/tours/pos_restaurant.js
CONFLICT (content): Merge conflict in addons/pos_restaurant/static/tests/tours/pos_restaurant.js
Auto-merging addons/pos_restaurant/tests/test_frontend.py

stderr:

17:28:00.076706 git.c:463               trace: built-in: git cherry-pick 8b87dd5970f914e219998e774d5d98142d32487a
error: could not apply 8b87dd5970f9... [FIX] point_of_sale,pos_restaurant: show qrcode when order is paid
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

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.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

@robodoo robodoo added forwardport This PR was created by @fw-bot conflict There was an error while creating this forward-port PR labels Mar 4, 2024
@C3POdoo C3POdoo added the OE the report is linked to a support ticket (opw-...) label Mar 4, 2024
@robinengels robinengels force-pushed the saas-16.2-16.0-opw-3703720-invoice_qr_code_no_payments-roen-Jzuo-fw branch from 47b307f to 588d887 Compare March 5, 2024 09:36
@C3POdoo C3POdoo requested review from a team and vlst-odoo and removed request for a team March 5, 2024 09:42
Current behavior:
When printing the bill before the order has been paid, the QRCode to get
the invoice shouldn't be shown.

Steps to reproduce:
- Activate the option "Show QR Code" in the POS settings
- Create a new order
- Add some products
- Click on "Bill" button
- The QRCode is shown

opw-3703720

X-original-commit: cfe93f4
@robinengels robinengels force-pushed the saas-16.2-16.0-opw-3703720-invoice_qr_code_no_payments-roen-Jzuo-fw branch from 588d887 to 4b69f4b Compare March 5, 2024 09:42
@robinengels
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Mar 5, 2024
Current behavior:
When printing the bill before the order has been paid, the QRCode to get
the invoice shouldn't be shown.

Steps to reproduce:
- Activate the option "Show QR Code" in the POS settings
- Create a new order
- Add some products
- Click on "Bill" button
- The QRCode is shown

opw-3703720

closes #156362

X-original-commit: cfe93f4
Signed-off-by: Joseph Caburnay (jcb) <jcb@odoo.com>
Signed-off-by: Robin Engels (roen) <roen@odoo.com>
@robodoo robodoo closed this Mar 5, 2024
@fw-bot fw-bot deleted the saas-16.2-16.0-opw-3703720-invoice_qr_code_no_payments-roen-Jzuo-fw branch March 19, 2024 12:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflict There was an error while creating this forward-port PR forwardport This PR was created by @fw-bot OE the report is linked to a support ticket (opw-...)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants