diff --git a/website_sale_checkout_skip_payment/README.rst b/website_sale_checkout_skip_payment/README.rst index 04ef08f0a7..e98c60d548 100644 --- a/website_sale_checkout_skip_payment/README.rst +++ b/website_sale_checkout_skip_payment/README.rst @@ -14,13 +14,13 @@ Website Sale Checkout Skip Payment :target: http://www.gnu.org/licenses/lgpl-3.0-standalone.html :alt: License: LGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github - :target: https://github.com/OCA/e-commerce/tree/14.0/website_sale_checkout_skip_payment + :target: https://github.com/OCA/e-commerce/tree/15.0/website_sale_checkout_skip_payment :alt: OCA/e-commerce .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/e-commerce-14-0/e-commerce-14-0-website_sale_checkout_skip_payment + :target: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_checkout_skip_payment :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/113/14.0 + :target: https://runbot.odoo-community.org/runbot/113/15.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -56,7 +56,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -71,10 +71,13 @@ Authors Contributors ~~~~~~~~~~~~ -* Sergio Teruel -* David Vidal +* `Tecnativa `_ + + * Sergio Teruel + * David Vidal + * Alexandre Díaz + * Carlos Roca * Martin Wilderoth -* Alexandre Díaz Maintainers ~~~~~~~~~~~ @@ -89,6 +92,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/e-commerce `_ project on GitHub. +This module is part of the `OCA/e-commerce `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/website_sale_checkout_skip_payment/i18n/website_sale_checkout_skip_payment.pot b/website_sale_checkout_skip_payment/i18n/website_sale_checkout_skip_payment.pot index 979c7e4ad0..865ba223d3 100644 --- a/website_sale_checkout_skip_payment/i18n/website_sale_checkout_skip_payment.pot +++ b/website_sale_checkout_skip_payment/i18n/website_sale_checkout_skip_payment.pot @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 15.0\n" "Report-Msgid-Bugs-To: \n" "Last-Translator: \n" "Language-Team: \n" @@ -64,27 +64,6 @@ msgstr "" msgid "Contact" msgstr "" -#. module: website_sale_checkout_skip_payment -#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_config_settings__display_name -#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_partner__display_name -#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_website__display_name -msgid "Display Name" -msgstr "" - -#. module: website_sale_checkout_skip_payment -#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_config_settings__id -#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_partner__id -#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_website__id -msgid "ID" -msgstr "" - -#. module: website_sale_checkout_skip_payment -#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_config_settings____last_update -#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_res_partner____last_update -#: model:ir.model.fields,field_description:website_sale_checkout_skip_payment.field_website____last_update -msgid "Last Modified on" -msgstr "" - #. module: website_sale_checkout_skip_payment #: model_terms:ir.ui.view,arch_db:website_sale_checkout_skip_payment.res_config_settings_view_form msgid "Message shown to the user when the purchase is finished" diff --git a/website_sale_checkout_skip_payment/readme/CONTRIBUTORS.rst b/website_sale_checkout_skip_payment/readme/CONTRIBUTORS.rst index 4f2b621910..4c650f2628 100644 --- a/website_sale_checkout_skip_payment/readme/CONTRIBUTORS.rst +++ b/website_sale_checkout_skip_payment/readme/CONTRIBUTORS.rst @@ -1,4 +1,7 @@ -* Sergio Teruel -* David Vidal +* `Tecnativa `_ + + * Sergio Teruel + * David Vidal + * Alexandre Díaz + * Carlos Roca * Martin Wilderoth -* Alexandre Díaz diff --git a/website_sale_checkout_skip_payment/static/description/index.html b/website_sale_checkout_skip_payment/static/description/index.html index 99b3f5e47b..221a83fc7b 100644 --- a/website_sale_checkout_skip_payment/static/description/index.html +++ b/website_sale_checkout_skip_payment/static/description/index.html @@ -367,7 +367,7 @@

Website Sale Checkout Skip Payment

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: LGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

+

Beta License: LGPL-3 OCA/e-commerce Translate me on Weblate Try me on Runbot

This module allows to logged users to checkout with no payment step. At the end of the checkout proccess the quotation is sent to the user email address and set to Qoutation Sent state.

@@ -406,7 +406,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -420,10 +420,14 @@

Authors

Contributors

@@ -433,7 +437,7 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/e-commerce project on GitHub.

+

This module is part of the OCA/e-commerce project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/website_sale_checkout_skip_payment/static/src/js/website_sale_checkout_skip_payment_tour.js b/website_sale_checkout_skip_payment/static/src/js/website_sale_checkout_skip_payment_tour.js index a5c967a887..e7171cde49 100644 --- a/website_sale_checkout_skip_payment/static/src/js/website_sale_checkout_skip_payment_tour.js +++ b/website_sale_checkout_skip_payment/static/src/js/website_sale_checkout_skip_payment_tour.js @@ -12,7 +12,11 @@ odoo.define("website_sale_checkout_skip_payment.tour", function (require) { trigger: "a:contains('Customizable Desk')", }, { - trigger: "a:contains('Add to Cart')", + trigger: "a#add_to_cart", + }, + { + trigger: "a[href='/shop/cart']", + extra_trigger: "sup.my_cart_quantity:contains('1')", }, { trigger: ".btn-primary:contains('Confirm')", @@ -23,7 +27,7 @@ odoo.define("website_sale_checkout_skip_payment.tour", function (require) { }, { trigger: "a[href='/shop']", - extra_trigger: "h2:contains('Thank you for your order')", + extra_trigger: "strong:contains('Payment Information:')", }, ]; tour.register( diff --git a/website_sale_checkout_skip_payment/tests/test_checkout_skip_payment.py b/website_sale_checkout_skip_payment/tests/test_checkout_skip_payment.py index 6e6d055a22..5a263cbfe3 100644 --- a/website_sale_checkout_skip_payment/tests/test_checkout_skip_payment.py +++ b/website_sale_checkout_skip_payment/tests/test_checkout_skip_payment.py @@ -1,6 +1,6 @@ # Copyright 2018 Tecnativa - Sergio Teruel # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -import mock +from unittest.mock import Mock, patch from odoo.tests.common import HttpCase @@ -16,8 +16,9 @@ def setUp(self): def test_checkout_skip_payment(self): website = self.env.ref("website.website2") - with mock.patch( - "odoo.addons.website_sale_checkout_skip_payment.models.website.request" + with patch( + "odoo.addons.website_sale_checkout_skip_payment.models.website.request", + new=Mock(), ) as request: request.session.uid = False self.assertFalse(website.checkout_skip_payment)