Skip to content

Commit

Permalink
[MIG] website_sale_tax_toggle: Migration to 16.0
Browse files Browse the repository at this point in the history
  • Loading branch information
carlos-lopez-tecnativa committed Aug 20, 2024
1 parent b981566 commit 25e4a15
Show file tree
Hide file tree
Showing 9 changed files with 125 additions and 110 deletions.
10 changes: 5 additions & 5 deletions website_sale_tax_toggle/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ Website Sale Tax Toggle
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github
:target: https://github.com/OCA/e-commerce/tree/15.0/website_sale_tax_toggle
:target: https://github.com/OCA/e-commerce/tree/16.0/website_sale_tax_toggle
: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-15-0/e-commerce-15-0-website_sale_tax_toggle
:target: https://translation.odoo-community.org/projects/e-commerce-16-0/e-commerce-16-0-website_sale_tax_toggle
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
:target: https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&target_branch=15.0
:target: https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&target_branch=16.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
Expand All @@ -49,7 +49,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues <https://github.com/OCA/e-commerce/issues>`_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
`feedback <https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_tax_toggle%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
`feedback <https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_tax_toggle%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.

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

Expand Down Expand Up @@ -82,6 +82,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 <https://github.com/OCA/e-commerce/tree/15.0/website_sale_tax_toggle>`_ project on GitHub.
This module is part of the `OCA/e-commerce <https://github.com/OCA/e-commerce/tree/16.0/website_sale_tax_toggle>`_ project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
6 changes: 3 additions & 3 deletions website_sale_tax_toggle/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Website Sale Tax Toggle",
"summary": "Allow display price in Shop with or without taxes",
"version": "15.0.1.0.1",
"version": "16.0.1.0.0",
"development_status": "Beta",
"category": "Website",
"website": "https://github.com/OCA/e-commerce",
Expand All @@ -15,11 +15,11 @@
"data": ["views/templates.xml"],
"assets": {
"web.assets_frontend": [
"/website_sale_tax_toggle/static/src/js/website_sale_tax_toggle.js",
"/website_sale_tax_toggle/static/src/js/website_sale_tax_toggle.esm.js",
"/website_sale_tax_toggle/static/src/scss/website_sale_tax_toggle.scss",
],
"web.assets_tests": [
"/website_sale_tax_toggle/static/src/js/website_sale_tax_toggle_tour.js"
"/website_sale_tax_toggle/static/src/js/website_sale_tax_toggle_tour.esm.js"
],
},
}
18 changes: 10 additions & 8 deletions website_sale_tax_toggle/static/description/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Expand All @@ -9,10 +8,11 @@

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.
Despite the name, some widely supported CSS2 features are used.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
Expand Down Expand Up @@ -275,7 +275,7 @@
margin-left: 2em ;
margin-right: 2em }

pre.code .ln { color: grey; } /* line numbers */
pre.code .ln { color: gray; } /* line numbers */
pre.code, code { background-color: #eeeeee }
pre.code .comment, code .comment { color: #5C6576 }
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
Expand All @@ -301,7 +301,7 @@
span.pre {
white-space: pre }

span.problematic {
span.problematic, pre.problematic {
color: red }

span.section-subtitle {
Expand Down Expand Up @@ -369,7 +369,7 @@ <h1 class="title">Website Sale Tax Toggle</h1>
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:ab7bba29c5e2694f722c38d64267357a2bc8d5603a8fbc6d6a57a95f9259be17
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_tax_toggle"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_tax_toggle"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/e-commerce/tree/16.0/website_sale_tax_toggle"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/e-commerce-16-0/e-commerce-16-0-website_sale_tax_toggle"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/e-commerce&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
<p>This module extends the functionality of website sale module adding a toggle
button to allow to user selects view prices with taxes included or without taxes.</p>
<p><strong>Table of contents</strong></p>
Expand Down Expand Up @@ -398,7 +398,7 @@ <h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/e-commerce/issues">GitHub Issues</a>.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us to smash it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_tax_toggle%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<a class="reference external" href="https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_tax_toggle%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
Expand All @@ -425,11 +425,13 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<a class="reference external image-reference" href="https://odoo-community.org">
<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
</a>
<p>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.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_tax_toggle">OCA/e-commerce</a> project on GitHub.</p>
<p>This module is part of the <a class="reference external" href="https://github.com/OCA/e-commerce/tree/16.0/website_sale_tax_toggle">OCA/e-commerce</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/** @odoo-module **/

/* Copyright 2020 Sergio Teruel
* License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */

import {browser} from "@web/core/browser/browser";
import publicWidget from "web.public.widget";

publicWidget.registry.tax_toggle_button = publicWidget.Widget.extend({
selector: ".js_tax_toggle_management",
events: {
"click .js_tax_toggle_btn": "_onPublishBtnClick",
},
_onPublishBtnClick: function (ev) {
ev.preventDefault();
const $data = $(ev.currentTarget).parents(".js_tax_toggle_management:first");
this._rpc({
route: $data.data("controller"),
}).then(function (result) {
$data.find("input").prop("checked", result);
browser.location.reload();
});
},
});
27 changes: 0 additions & 27 deletions website_sale_tax_toggle/static/src/js/website_sale_tax_toggle.js

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/** @odoo-module **/
/* Copyright 2020 Sergio Teruel
* License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */

import tour from "web_tour.tour";

// Notice that it's important targeting the price as `span .oe_currency_value`
// or `.oe_price .oe_currency_value` to make sure this test is compatible
// with website_sale_b2x_alt_price module in this same repo.
const steps = [
{
content: "Toggle tax button click from list page",
trigger: ".js_tax_toggle_btn",
extra_trigger:
".oe_product_cart:contains('Product test tax toggle') span .oe_currency_value:containsExact('750.00')",
},
{
content: "Enter the product page",
trigger:
".oe_product_cart:has(span .oe_currency_value:containsExact('862.50')) a:contains('Product test tax toggle')",
extra_trigger: ".o_switch_danger:has(input:checked)",
},
{
content: "Toggle tax button click from product page",
trigger: ".js_tax_toggle_btn",
extra_trigger:
"#product_details .oe_price .oe_currency_value:containsExact('862.50')",
},
{
content: "Check the product price is back to what it should",
trigger:
"#product_details .oe_price .oe_currency_value:containsExact('750.00')",
extra_trigger: ".o_switch_danger:has(input:not(:checked))",
},
];
tour.register(
"website_sale_tax_toggle",
{
url: "/shop",
test: true,
},
steps
);

This file was deleted.

22 changes: 6 additions & 16 deletions website_sale_tax_toggle/tests/test_website_sale_tax_toggle.py
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
# Copyright 2020 Tecnativa - Sergio Teruel
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
from odoo.tests import tagged
from odoo.tests.common import HttpCase

from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT


@tagged("post_install", "-at_install")
class WebsiteSaleTaxesToggleHttpCase(HttpCase):
@classmethod
def setUpClass(cls):
super().setUpClass()
# Remove this variable in v16 and put instead:
# from odoo.addons.base.tests.common import DISABLED_MAIL_CONTEXT
DISABLED_MAIL_CONTEXT = {
"tracking_disable": True,
"mail_create_nolog": True,
"mail_create_nosubscribe": True,
"mail_notrack": True,
"no_reset_password": True,
}
cls.env = cls.env(context=dict(cls.env.context, **DISABLED_MAIL_CONTEXT))
# Get company for Mitchel Admin user
cls.user_admin = cls.env.ref("base.user_admin")
Expand Down Expand Up @@ -47,13 +42,8 @@ def setUpClass(cls):

def test_ui_website(self):
"""Test frontend tour."""
tour = (
"odoo.__DEBUG__.services['web_tour.tour']",
"website_sale_tax_toggle",
)
self.browser_js(
self.start_tour(
url_path="/shop",
code="%s.run('%s')" % tour,
ready="%s.tours['%s'].ready" % tour,
tour_name="website_sale_tax_toggle",
login="admin",
)
34 changes: 34 additions & 0 deletions website_sale_tax_toggle/views/templates.xml
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,38 @@
<t t-call="website_sale_tax_toggle.tax_toggle_template" />
</xpath>
</template>

<!-- Add the tax_toggle_taxed in the t-cache key after all overrides -->
<template
id="products_tax_toggle_taxed"
inherit_id="website_sale.products"
priority="200"
>
<xpath
expr="//div[starts-with(@t-cache, 'pricelist,products')]"
position="attributes"
>
<attribute
name="t-cache"
add="request.session.get('tax_toggle_taxed')"
separator=","
/>
</xpath>
</template>
<template
id="product_tax_toggle_taxed"
inherit_id="website_sale.product"
priority="200"
>
<xpath
expr="//t[starts-with(@t-cache, 'pricelist,product')]"
position="attributes"
>
<attribute
name="t-cache"
add="request.session.get('tax_toggle_taxed')"
separator=","
/>
</xpath>
</template>
</odoo>

0 comments on commit 25e4a15

Please sign in to comment.