Skip to content

Commit

Permalink
Merge PR #845 into 15.0
Browse files Browse the repository at this point in the history 
Signed-off-by pedrobaeza
  • Loading branch information
@OCA-git-bot
OCA-git-bot committed Sep 14, 2023
2 parents 22ab0f0 + 8df2ce6 commit 4fdbf02
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 57 deletions.
12 changes: 5 additions & 7 deletions website_sale_secondary_unit/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@
Website Sale Secondary Unit
===========================

..
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:5d62d1f0dc3e76f84ddc216fe3f7021a1cfa375533c88a7a02576aa74c0231c2
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
:target: https://odoo-community.org/page/development-status
Expand All @@ -23,10 +20,10 @@ Website Sale Secondary Unit
:target: https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_secondary_unit
: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/webui/builds.html?repo=OCA/e-commerce&target_branch=15.0
:alt: Try me on Runboat

|badge1| |badge2| |badge3| |badge4| |badge5|
|badge1| |badge2| |badge3| |badge4| |badge5|

This module extends the functionality of sale_order_secondary_unit module to
allow sell products in online store in secondary units defined.
Expand Down Expand Up @@ -61,7 +58,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
If you spotted it first, help us smashing it by providing a detailed and welcomed
`feedback <https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_secondary_unit%0Aversion:%2015.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 All @@ -81,6 +78,7 @@ Contributors

* Sergio Teruel
* Carlos Roca
* Pilar Vargas

Maintainers
~~~~~~~~~~~
Expand Down
1 change: 1 addition & 0 deletions website_sale_secondary_unit/readme/CONTRIBUTORS.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

* Sergio Teruel
* Carlos Roca
* Pilar Vargas
43 changes: 21 additions & 22 deletions website_sale_secondary_unit/static/description/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<?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>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
<meta name="generator" content="Docutils: http://docutils.sourceforge.net/" />
<title>Website Sale Secondary Unit</title>
<style type="text/css">

/*
:Author: David Goodger ([email protected])
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
:Copyright: This stylesheet has been placed in the public domain.

Default cascading style sheet for the HTML output of Docutils.

See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/

Expand Down Expand Up @@ -366,33 +366,31 @@ <h1 class="title">Website Sale Secondary Unit</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! source digest: sha256:5d62d1f0dc3e76f84ddc216fe3f7021a1cfa375533c88a7a02576aa74c0231c2
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
<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_secondary_unit"><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_secondary_unit"><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" 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" 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" href="https://github.com/OCA/e-commerce/tree/15.0/website_sale_secondary_unit"><img alt="OCA/e-commerce" src="https://img.shields.io/badge/github-OCA%2Fe--commerce-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/e-commerce-15-0/e-commerce-15-0-website_sale_secondary_unit"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runboat.odoo-community.org/webui/builds.html?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>This module extends the functionality of sale_order_secondary_unit module to
allow sell products in online store in secondary units defined.</p>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
<li><a class="reference internal" href="#configuration" id="toc-entry-1">Configuration</a></li>
<li><a class="reference internal" href="#usage" id="toc-entry-2">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="toc-entry-3">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="toc-entry-4">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="toc-entry-5">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="toc-entry-6">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="toc-entry-7">Maintainers</a></li>
<li><a class="reference internal" href="#configuration" id="id1">Configuration</a></li>
<li><a class="reference internal" href="#usage" id="id2">Usage</a></li>
<li><a class="reference internal" href="#bug-tracker" id="id3">Bug Tracker</a></li>
<li><a class="reference internal" href="#credits" id="id4">Credits</a><ul>
<li><a class="reference internal" href="#authors" id="id5">Authors</a></li>
<li><a class="reference internal" href="#contributors" id="id6">Contributors</a></li>
<li><a class="reference internal" href="#maintainers" id="id7">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="configuration">
<h1><a class="toc-backref" href="#toc-entry-1">Configuration</a></h1>
<h1><a class="toc-backref" href="#id1">Configuration</a></h1>
<p>For define the secondary units, you should active <em>Manage multiples units of measure</em> on
the user that will be responsable of this function.</p>
</div>
<div class="section" id="usage">
<h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
<h1><a class="toc-backref" href="#id2">Usage</a></h1>
<p>To use this module you need to:</p>
<ul class="simple">
<li>Go to <em>‘Website &gt; Products &gt; Products’</em>.</li>
Expand All @@ -406,33 +404,34 @@ <h1><a class="toc-backref" href="#toc-entry-2">Usage</a></h1>
</ul>
</div>
<div class="section" id="bug-tracker">
<h1><a class="toc-backref" href="#toc-entry-3">Bug Tracker</a></h1>
<h1><a class="toc-backref" href="#id3">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
If you spotted it first, help us smashing it by providing a detailed and welcomed
<a class="reference external" href="https://github.com/OCA/e-commerce/issues/new?body=module:%20website_sale_secondary_unit%0Aversion:%2015.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">
<h1><a class="toc-backref" href="#toc-entry-4">Credits</a></h1>
<h1><a class="toc-backref" href="#id4">Credits</a></h1>
<div class="section" id="authors">
<h2><a class="toc-backref" href="#toc-entry-5">Authors</a></h2>
<h2><a class="toc-backref" href="#id5">Authors</a></h2>
<ul class="simple">
<li>Tecnativa</li>
</ul>
</div>
<div class="section" id="contributors">
<h2><a class="toc-backref" href="#toc-entry-6">Contributors</a></h2>
<h2><a class="toc-backref" href="#id6">Contributors</a></h2>
<ul class="simple">
<li><a class="reference external" href="https://www.tecnativa.com">Tecnativa</a>:<ul>
<li>Sergio Teruel</li>
<li>Carlos Roca</li>
<li>Pilar Vargas</li>
</ul>
</li>
</ul>
</div>
<div class="section" id="maintainers">
<h2><a class="toc-backref" href="#toc-entry-7">Maintainers</a></h2>
<h2><a class="toc-backref" href="#id7">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>
<p>OCA, or the Odoo Community Association, is a nonprofit organization whose
Expand Down
6 changes: 2 additions & 4 deletions website_sale_secondary_unit/static/src/js/website_sale_secondary_unit_tour.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,11 @@ odoo.define("website_sale_secondary_unit.tour", function (require) {
},
{
trigger: "button[name='o_payment_submit_button']",
extra_trigger:
"table:has(span:contains(Box 5 Units)):has(span:contains(Units))",
extra_trigger: "table:has(span:contains(Box 5)):has(span:contains(Units))",
},
{
trigger: "a[href='/shop']",
extra_trigger:
"table:has(span:contains(Box 5 Units)):has(span:contains(Units))",
extra_trigger: "table:has(span:contains(Box 5)):has(span:contains(Units))",
},
];

Expand Down
53 changes: 29 additions & 24 deletions website_sale_secondary_unit/views/templates.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,12 @@
t-set="factor"
t-value="int(secondary_uom.factor) == secondary_uom.factor and int(secondary_uom.factor) or secondary_uom.factor"
/>
<!-- Show/hide unit of measure: In case the secondary unit of measure matches the unit of measure of the product it can be omitted so that it is not redundant depending on where this template is called from. -->
<span
t-esc="'{} {} {}'.format(secondary_uom.name, factor, secondary_uom.product_tmpl_id.sudo().uom_id.name)"
t-if="not hide_uom_name"
t-out="'{} {} {}'.format(secondary_uom.name, factor, secondary_uom.product_tmpl_id.sudo().uom_id.name)"
/>
<span t-else="" t-out="'{} {}'.format(secondary_uom.name, factor)" />
</template>
<template
id="product"
Expand All @@ -69,7 +72,7 @@
t-att-data-secondary-uom-factor="1.0"
t-att-data-product-uom-factor="1.0"
>
<span t-esc="product.uom_id.sudo().name" />
<span t-out="product.uom_id.sudo().name" />
</option>
<t t-foreach="secondary_uom_ids" t-as="secondary_uom">
<option
Expand Down Expand Up @@ -162,7 +165,7 @@
position="after"
>
<t t-if="not line.secondary_uom_id">
<span t-esc="line.product_uom.sudo().name" />
<span t-out="line.product_uom.sudo().name" />
</t>
</xpath>
<xpath expr="//th[hasclass('td-qty')]" position="after">
Expand All @@ -171,9 +174,9 @@
<xpath expr="//td[hasclass('td-qty')]" position="after">
<td class="text-center td-qty d-none d-md-table-cell">
<span
t-esc="int(line.product_uom_qty) == line.product_uom_qty and int(line.product_uom_qty) or line.product_uom_qty"
t-out="int(line.product_uom_qty) == line.product_uom_qty and int(line.product_uom_qty) or line.product_uom_qty"
/>
<span t-esc="line.product_uom.sudo().name" />
<span t-out="line.product_uom.sudo().name" />
</td>
</xpath>
<!-- Display product uom to price column to clarify that price is per product unit -->
Expand All @@ -189,12 +192,25 @@
<template id="cart_summary" inherit_id="website_sale.cart_summary">
<xpath expr="//td[hasclass('td-qty')]" position="inside">
<t t-if="line.secondary_uom_id">
<div
t-esc="int(line.secondary_uom_qty) == line.secondary_uom_qty and int(line.secondary_uom_qty) or line.secondary_uom_qty"
/>
<t t-call="website_sale_secondary_unit.second_qty_description">
<t t-set="secondary_uom" t-value="line.secondary_uom_id" />
</t>
<div>
<span
t-out="int(line.product_uom_qty) == line.product_uom_qty and int(line.product_uom_qty) or line.product_uom_qty"
/>
<span t-out="line.product_uom.sudo().name" />
</div>
<div class="font-weight-light">
<t
t-out="int(line.secondary_uom_qty) == line.secondary_uom_qty and int(line.secondary_uom_qty) or line.secondary_uom_qty"
/>
<t t-call="website_sale_secondary_unit.second_qty_description">
<t
t-if="line.product_uom.sudo().name == line.secondary_uom_id.product_tmpl_id.sudo().uom_id.name"
t-set="hide_uom_name"
t-value="True"
/>
<t t-set="secondary_uom" t-value="line.secondary_uom_id" />
</t>
</div>
</t>
</xpath>
<xpath expr="//td[hasclass('td-qty')]/div" position="attributes">
Expand All @@ -204,20 +220,9 @@
</xpath>
<xpath expr="//td[hasclass('td-qty')]/div" position="after">
<t t-if="not line.secondary_uom_id">
<span t-esc="line.product_uom.sudo().name" />
<span t-out="line.product_uom.sudo().name" />
</t>
</xpath>
<xpath expr="//th[hasclass('td-qty')]" position="after">
<th class="text-center td-qty">Quantity</th>
</xpath>
<xpath expr="//td[hasclass('td-qty')]" position="after">
<td class="text-center td-qty">
<span
t-esc="int(line.product_uom_qty) == line.product_uom_qty and int(line.product_uom_qty) or line.product_uom_qty"
/>
<span t-esc="line.product_uom.sudo().name" />
</td>
</xpath>
<!-- Display product uom to price column to clarify that price is per product unit -->
<xpath expr="//td[hasclass('td-price')]" position="inside">
<t t-if="line.product_id.secondary_uom_ids">
Expand All @@ -232,7 +237,7 @@
<xpath expr="//div[hasclass('col-9')]" position="inside">
<div t-if="line.secondary_uom_id">
Qty: <t
t-esc="int(line.secondary_uom_qty) == line.secondary_uom_qty and int(line.secondary_uom_qty) or line.secondary_uom_qty"
t-out="int(line.secondary_uom_qty) == line.secondary_uom_qty and int(line.secondary_uom_qty) or line.secondary_uom_qty"
/>
<t t-call="website_sale_secondary_unit.second_qty_description">
<t t-set="secondary_uom" t-value="line.secondary_uom_id" />
Expand Down

0 comments on commit 4fdbf02

Please sign in to comment.