From ec6b072a1c284c814724c85d695c4b2d71a8d7ea Mon Sep 17 00:00:00 2001
From: Sergio Teruel
Date: Fri, 3 May 2019 20:47:43 +0200
Subject: [PATCH 1/2] [11.0][NEW] website_sale_product_minimal_price: New
module
---
website_sale_product_minimal_price/README.rst | 87 ++++
.../__init__.py | 2 +
.../__manifest__.py | 24 +
.../data/demo.xml | 49 ++
website_sale_product_minimal_price/i18n/es.po | 51 ++
.../website_sale_product_minimal_price.pot | 50 ++
.../models/__init__.py | 1 +
.../models/product_template.py | 35 ++
.../readme/CONTRIBUTORS.rst | 3 +
.../readme/DESCRIPTION.rst | 3 +
.../readme/USAGE.rst | 6 +
.../static/description/icon.png | Bin 0 -> 9455 bytes
.../static/description/index.html | 439 ++++++++++++++++++
...website_sale_product_minimal_price_tour.js | 31 ++
.../tests/__init__.py | 1 +
...test_website_sale_product_minimal_price.py | 18 +
.../views/assets.xml | 9 +
.../views/templates.xml | 28 ++
18 files changed, 837 insertions(+)
create mode 100644 website_sale_product_minimal_price/README.rst
create mode 100644 website_sale_product_minimal_price/__init__.py
create mode 100644 website_sale_product_minimal_price/__manifest__.py
create mode 100644 website_sale_product_minimal_price/data/demo.xml
create mode 100644 website_sale_product_minimal_price/i18n/es.po
create mode 100644 website_sale_product_minimal_price/i18n/website_sale_product_minimal_price.pot
create mode 100644 website_sale_product_minimal_price/models/__init__.py
create mode 100644 website_sale_product_minimal_price/models/product_template.py
create mode 100644 website_sale_product_minimal_price/readme/CONTRIBUTORS.rst
create mode 100644 website_sale_product_minimal_price/readme/DESCRIPTION.rst
create mode 100644 website_sale_product_minimal_price/readme/USAGE.rst
create mode 100644 website_sale_product_minimal_price/static/description/icon.png
create mode 100644 website_sale_product_minimal_price/static/description/index.html
create mode 100644 website_sale_product_minimal_price/static/src/js/website_sale_product_minimal_price_tour.js
create mode 100644 website_sale_product_minimal_price/tests/__init__.py
create mode 100644 website_sale_product_minimal_price/tests/test_website_sale_product_minimal_price.py
create mode 100644 website_sale_product_minimal_price/views/assets.xml
create mode 100755 website_sale_product_minimal_price/views/templates.xml
diff --git a/website_sale_product_minimal_price/README.rst b/website_sale_product_minimal_price/README.rst
new file mode 100644
index 0000000000..ba6b06b96c
--- /dev/null
+++ b/website_sale_product_minimal_price/README.rst
@@ -0,0 +1,87 @@
+==================================
+Website Sale Product Minimal Price
+==================================
+
+.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ !! This file is generated by oca-gen-addon-readme !!
+ !! changes will be overwritten. !!
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+ :target: https://odoo-community.org/page/development-status
+ :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+ :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/11.0/website_sale_product_minimal_price
+ :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-11-0/e-commerce-11-0-website_sale_product_minimal_price
+ :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/11.0
+ :alt: Try me on Runbot
+
+|badge1| |badge2| |badge3| |badge4| |badge5|
+
+This module extends the functionality of website sale module to allow to
+display the minimal price in '/shop' view when product has extra variants
+price and set order by extra price in product's view.
+
+**Table of contents**
+
+.. contents::
+ :local:
+
+Usage
+=====
+
+#. Go to backend and set a product with variants and extra price by attribute
+ value.
+#. Go to Website Shop.
+#. You will see that in main products view appears the text "From " with
+ minimal price if the product has a diferent extra prices by attribute.
+#. Click on product, the price displayed is the minimal variant price.
+
+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 `_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Tecnativa
+
+Contributors
+~~~~~~~~~~~~
+
+* `Tecnativa `_:
+
+ * Sergio Teruel
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+ :alt: Odoo Community Association
+ :target: https://odoo-community.org
+
+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.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/website_sale_product_minimal_price/__init__.py b/website_sale_product_minimal_price/__init__.py
new file mode 100644
index 0000000000..3275ac2adf
--- /dev/null
+++ b/website_sale_product_minimal_price/__init__.py
@@ -0,0 +1,2 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from . import models
diff --git a/website_sale_product_minimal_price/__manifest__.py b/website_sale_product_minimal_price/__manifest__.py
new file mode 100644
index 0000000000..fbfba46aa5
--- /dev/null
+++ b/website_sale_product_minimal_price/__manifest__.py
@@ -0,0 +1,24 @@
+# Copyright 2019 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+{
+ 'name': 'Website Sale Product Minimal Price',
+ 'summary': 'Display minimal price for products that has variants',
+ 'version': '11.0.1.0.0',
+ 'development_status': 'Beta',
+ 'category': 'Website',
+ 'website': 'https://github.com/OCA/e-commerce',
+ 'author': 'Tecnativa, Odoo Community Association (OCA)',
+ 'license': 'AGPL-3',
+ 'application': False,
+ 'installable': True,
+ 'depends': [
+ 'website_sale',
+ ],
+ 'data': [
+ 'views/assets.xml',
+ 'views/templates.xml',
+ ],
+ 'demo': [
+ 'data/demo.xml',
+ ],
+}
diff --git a/website_sale_product_minimal_price/data/demo.xml b/website_sale_product_minimal_price/data/demo.xml
new file mode 100644
index 0000000000..a21fe954fd
--- /dev/null
+++ b/website_sale_product_minimal_price/data/demo.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+ Test attribute
+
+
+
+ Test v1
+
+
+
+ Test v2
+
+
+
+ My product test with various prices
+ 20.0
+ consu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5.0
+
+
+
+
+ 10.0
+
+
+
diff --git a/website_sale_product_minimal_price/i18n/es.po b/website_sale_product_minimal_price/i18n/es.po
new file mode 100644
index 0000000000..160ce1e3e3
--- /dev/null
+++ b/website_sale_product_minimal_price/i18n/es.po
@@ -0,0 +1,51 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_sale_product_minimal_price
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-07 14:11+0000\n"
+"PO-Revision-Date: 2019-05-07 16:13+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 2.0.6\n"
+
+#. module: website_sale_product_minimal_price
+#: model:ir.ui.view,arch_db:website_sale_product_minimal_price.products_item
+msgid "From "
+msgstr "Desde "
+
+#. module: website_sale_product_minimal_price
+#: model:product.product,name:website_sale_product_minimal_price.product_product_test_1
+#: model:product.product,name:website_sale_product_minimal_price.product_product_test_2
+#: model:product.template,name:website_sale_product_minimal_price.product_product_test_1_product_template
+#: model:product.template,name:website_sale_product_minimal_price.product_product_test_2_product_template
+msgid "My product test with various prices"
+msgstr "Mi producto de test con varios precios"
+
+#. module: website_sale_product_minimal_price
+#: model:ir.model,name:website_sale_product_minimal_price.model_product_template
+msgid "Product Template"
+msgstr "Plantilla de producto"
+
+#. module: website_sale_product_minimal_price
+#: model:product.attribute,name:website_sale_product_minimal_price.product_attribute_test
+msgid "Test attribute"
+msgstr "Atributo de prueba"
+
+#. module: website_sale_product_minimal_price
+#: model:product.attribute.value,name:website_sale_product_minimal_price.product_attribute_value_test_1
+msgid "Test v1"
+msgstr "Valor 1 de test"
+
+#. module: website_sale_product_minimal_price
+#: model:product.attribute.value,name:website_sale_product_minimal_price.product_attribute_value_test_2
+msgid "Test v2"
+msgstr "Valor 2 de test"
diff --git a/website_sale_product_minimal_price/i18n/website_sale_product_minimal_price.pot b/website_sale_product_minimal_price/i18n/website_sale_product_minimal_price.pot
new file mode 100644
index 0000000000..6b3b06bed9
--- /dev/null
+++ b/website_sale_product_minimal_price/i18n/website_sale_product_minimal_price.pot
@@ -0,0 +1,50 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * website_sale_product_minimal_price
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-05-07 14:11+0000\n"
+"PO-Revision-Date: 2019-05-07 14:11+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: website_sale_product_minimal_price
+#: model:ir.ui.view,arch_db:website_sale_product_minimal_price.products_item
+msgid "From "
+msgstr ""
+
+#. module: website_sale_product_minimal_price
+#: model:product.product,name:website_sale_product_minimal_price.product_product_test_1
+#: model:product.product,name:website_sale_product_minimal_price.product_product_test_2
+#: model:product.template,name:website_sale_product_minimal_price.product_product_test_1_product_template
+#: model:product.template,name:website_sale_product_minimal_price.product_product_test_2_product_template
+msgid "My product test with various prices"
+msgstr ""
+
+#. module: website_sale_product_minimal_price
+#: model:ir.model,name:website_sale_product_minimal_price.model_product_template
+msgid "Product Template"
+msgstr ""
+
+#. module: website_sale_product_minimal_price
+#: model:product.attribute,name:website_sale_product_minimal_price.product_attribute_test
+msgid "Test attribute"
+msgstr ""
+
+#. module: website_sale_product_minimal_price
+#: model:product.attribute.value,name:website_sale_product_minimal_price.product_attribute_value_test_1
+msgid "Test v1"
+msgstr ""
+
+#. module: website_sale_product_minimal_price
+#: model:product.attribute.value,name:website_sale_product_minimal_price.product_attribute_value_test_2
+msgid "Test v2"
+msgstr ""
+
diff --git a/website_sale_product_minimal_price/models/__init__.py b/website_sale_product_minimal_price/models/__init__.py
new file mode 100644
index 0000000000..e8fa8f6bf1
--- /dev/null
+++ b/website_sale_product_minimal_price/models/__init__.py
@@ -0,0 +1 @@
+from . import product_template
diff --git a/website_sale_product_minimal_price/models/product_template.py b/website_sale_product_minimal_price/models/product_template.py
new file mode 100644
index 0000000000..a1d0c4c141
--- /dev/null
+++ b/website_sale_product_minimal_price/models/product_template.py
@@ -0,0 +1,35 @@
+# Copyright 2019 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import api, fields, models
+
+
+class ProductTemplate(models.Model):
+ _inherit = 'product.template'
+
+ has_variant_price_extra = fields.Boolean(
+ compute='_compute_has_variant_price_extra',
+ store=True,
+ string='Has variants with price extra',
+ )
+
+ @api.depends(
+ 'product_variant_ids.attribute_value_ids.price_ids.price_extra')
+ def _compute_has_variant_price_extra(self):
+ for template in self:
+ if (template.product_variant_count and len(set(
+ template.product_variant_ids.mapped('price_extra'))) != 1):
+ template.has_variant_price_extra = True
+
+ def _website_price(self):
+ templates = self.filtered(
+ lambda x: (
+ x.product_variant_count > 1 and any(
+ [v.price_extra != 0.0 for v in x.product_variant_ids]))
+ )
+ super(ProductTemplate, self - templates)._website_price()
+ for product in templates:
+ variant = product.product_variant_ids.sorted(
+ key=lambda v: v.price_extra)[:1]
+ product.website_price = variant.website_price
+ product.website_public_price = variant.website_public_price
+ product.website_price_difference = variant.website_price_difference
diff --git a/website_sale_product_minimal_price/readme/CONTRIBUTORS.rst b/website_sale_product_minimal_price/readme/CONTRIBUTORS.rst
new file mode 100644
index 0000000000..3bfad993cb
--- /dev/null
+++ b/website_sale_product_minimal_price/readme/CONTRIBUTORS.rst
@@ -0,0 +1,3 @@
+* `Tecnativa `_:
+
+ * Sergio Teruel
diff --git a/website_sale_product_minimal_price/readme/DESCRIPTION.rst b/website_sale_product_minimal_price/readme/DESCRIPTION.rst
new file mode 100644
index 0000000000..f4f13e65e4
--- /dev/null
+++ b/website_sale_product_minimal_price/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+This module extends the functionality of website sale module to allow to
+display the minimal price in '/shop' view when product has extra variants
+price and set order by extra price in product's view.
diff --git a/website_sale_product_minimal_price/readme/USAGE.rst b/website_sale_product_minimal_price/readme/USAGE.rst
new file mode 100644
index 0000000000..e074c0c211
--- /dev/null
+++ b/website_sale_product_minimal_price/readme/USAGE.rst
@@ -0,0 +1,6 @@
+#. Go to backend and set a product with variants and extra price by attribute
+ value.
+#. Go to Website Shop.
+#. You will see that in main products view appears the text "From " with
+ minimal price if the product has a diferent extra prices by attribute.
+#. Click on product, the price displayed is the minimal variant price.
diff --git a/website_sale_product_minimal_price/static/description/icon.png b/website_sale_product_minimal_price/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d
GIT binary patch
literal 9455
zcmW++2RxMjAAjx~&dlBk9S+%}OXg)AGE&Cb*&}d0jUxM@u(PQx^-s)697TX`ehR4?GS^qbkof1cslKgkU)h65qZ9Oc=ml_0temigYLJfnz{IDzUf>bGs4N!v3=Z3jMq&A#7%rM5eQ#dc?k~!
zVpnB`o+K7|Al`Q_U;eD$B
zfJtP*jH`siUq~{KE)`jP2|#TUEFGRryE2`i0**z#*^6~AI|YzIWy$Cu#CSLW3q=GA
z6`?GZymC;dCPk~rBS%eCb`5OLr;RUZ;D`}um=H)BfVIq%7VhiMr)_#G0N#zrNH|__
zc+blN2UAB0=617@>_u;MPHN;P;N#YoE=)R#i$k_`UAA>WWCcEVMh~L_
zj--gtp&|K1#58Yz*AHCTMziU1Jzt_jG0I@qAOHsk$2}yTmVkBp_eHuY$A9)>P6o~I
z%aQ?!(GqeQ-Y+b0I(m9pwgi(IIZZzsbMv+9w{PFtd_<_(LA~0H(xz{=FhLB@(1&qHA5EJw1>>=%q2f&^X>IQ{!GJ4e9U
z&KlB)z(84HmNgm2hg2C0>WM{E(DdPr+EeU_N@57;PC2&DmGFW_9kP&%?X4}+xWi)(
z;)z%wI5>D4a*5XwD)P--sPkoY(a~WBw;E~AW`Yue4kFa^LM3X`8x|}ZUeMnqr}>kH
zG%WWW>3ml$Yez?i%)2pbKPI7?5o?hydokgQyZsNEr{a|mLdt;X2TX(#B1j35xPnPW
z*bMSSOauW>o;*=kO8ojw91VX!qoOQb)zHJ!odWB}d+*K?#sY_jqPdg{Sm2HdYzdEx
zOGVPhVRTGPtv0o}RfVP;Nd(|CB)I;*t&QO8h
zFfekr30S!-LHmV_Su-W+rEwYXJ^;6&3|L$mMC8*bQptyOo9;>Qb9Q9`ySe3%V$A*9
zeKEe+b0{#KWGp$F+tga)0RtI)nhMa-K@JS}2krK~n8vJ=Ngm?R!9G<~RyuU0d?nz#
z-5EK$o(!F?hmX*2Yt6+coY`6jGbb7tF#6nHA
zuKk=GGJ;ZwON1iAfG$E#Y7MnZVmrY|j0eVI(DN_MNFJmyZ|;w4tf@=CCDZ#5N_0K=
z$;R~bbk?}TpfDjfB&aiQ$VA}s?P}xPERJG{kxk5~R`iRS(SK5d+Xs9swCozZISbnS
zk!)I0>t=A<-^z(cmSFz3=jZ23u13X><0b)P)^1T_))Kr`e!-pb#q&J*Q`p+B6la%C
zuVl&0duN<;uOsB3%T9Fp8t{ED108)`y_~Hnd9AUX7h-H?jVuU|}My+C=TjH(jKz
zqMVr0re3S$H@t{zI95qa)+Crz*5Zj}Ao%4Z><+W(nOZd?gDnfNBC3>M8WE61$So|P
zVvqH0SNtDTcsUdzaMDpT=Ty0pDHHNL@Z0w$Y`XO
z2M-_r1S+GaH%pz#Uy0*w$Vdl=X=rQXEzO}d6J^R6zjM1u&c9vYLvLp?W7w(?np9x1
zE_0JSAJCPB%i7p*Wvg)pn5T`8k3-uR?*NT|J`eS#_#54p>!p(mLDvmc-3o0mX*mp_
zN*AeS<>#^-{S%W<*mz^!X$w_2dHWpcJ6^j64qFBft-o}o_Vx80o0>}Du;>kLts;$8
zC`7q$QI(dKYG`Wa8#wl@V4jVWBRGQ@1dr-hstpQL)Tl+aqVpGpbSfN>5i&QMXfiZ>
zaA?T1VGe?rpQ@;+pkrVdd{klI&jVS@I5_iz!=UMpTsa~mBga?1r}aRBm1WS;TT*s0f0lY=JBl66Upy)-k4J}lh=P^8(SXk~0xW=T9v*B|gzIhN
z>qsO7dFd~mgxAy4V?&)=5ieYq?zi?ZEoj)&2o)RLy=@hbCRcfT5jigwtQGE{L*8<@Yd{zg;CsL5mvzfDY}P-wos_6PfprFVaeqNE%h
zKZhLtcQld;ZD+>=nqN~>GvROfueSzJD&BE*}XfU|H&(FssBqY=hPCt`d
zH?@s2>I(|;fcW&YM6#V#!kUIP8$Nkdh0A(bEVj``-AAyYgwY~jB
zT|I7Bf@%;7aL7Wf4dZ%VqF$eiaC38OV6oy3Z#TER2G+fOCd9Iaoy6aLYbPTN{XRPz
z;U!V|vBf%H!}52L2gH_+j;`bTcQRXB+y9onc^wLm5wi3-Be}U>k_u>2Eg$=k!(l@I
zcCg+flakT2Nej3i0yn+g+}%NYb?ta;R?(g5SnwsQ49U8Wng8d|{B+lyRcEDvR3+`O{zfmrmvFrL6acVP%yG98X
zo&+VBg@px@i)%o?dG(`T;n*$S5*rnyiR#=wW}}GsAcfyQpE|>a{=$Hjg=-*_K;UtD
z#z-)AXwSRY?OPefw^iI+
z)AXz#PfEjlwTes|_{sB?4(O@fg0AJ^g8gP}ex9Ucf*@_^J(s_5jJV}c)s$`Myn|Kd
z$6>}#q^n{4vN@+Os$m7KV+`}c%4)4pv@06af4-x5#wj!KKb%caK{A&Y#Rfs
z-po?Dcb1({W=6FKIUirH&(yg=*6aLCekcKwyfK^JN5{wcA3nhO(o}SK#!CINhI`-I
z1)6&n7O&ZmyFMuNwvEic#IiOAwNkR=u5it{B9n2sAJV5pNhar=j5`*N!Na;c7g!l$
z3aYBqUkqqTJ=Re-;)s!EOeij=7SQZ3Hq}ZRds%IM*PtM$wV
z@;rlc*NRK7i3y5BETSKuumEN`Xu_8GP1Ri=OKQ$@I^ko8>H6)4rjiG5{VBM>B|%`&&s^)jS|-_95&yc=GqjNo{zFkw%%HHhS~e=s
zD#sfS+-?*t|J!+ozP6KvtOl!R)@@-z24}`9{QaVLD^9VCSR2b`b!KC#o;Ki<+wXB6
zx3&O0LOWcg4&rv4QG0)4yb}7BFSEg~=IR5#ZRj8kg}dS7_V&^%#Do==#`u
zpy6{ox?jWuR(;pg+f@mT>#HGWHAJRRDDDv~@(IDw&R>9643kK#HN`!1vBJHnC+RM&yIh8{gG2q
zA%e*U3|N0XSRa~oX-3EAneep)@{h2vvd3Xvy$7og(sayr@95+e6~Xvi1tUqnIxoIH
zVWo*OwYElb#uyW{Imam6f2rGbjR!Y3`#gPqkv57dB6K^wRGxc9B(t|aYDGS=m$&S!NmCtrMMaUg(c
zc2qC=2Z`EEFMW-me5B)24AqF*bV5Dr-M5ig(l-WPS%CgaPzs6p_gnCIvTJ=Y<6!gT
zVt@AfYCzjjsMEGi=rDQHo0yc;HqoRNnNFeWZgcm?f;cp(6CNylj36DoL(?TS7eU#+
z7&mfr#y))+CJOXQKUMZ7QIdS9@#-}7y2K1{8)cCt0~-X0O!O?Qx#E4Og+;A2SjalQ
zs7r?qn0H044=sDN$SRG$arw~n=+T_DNdSrarmu)V6@|?1-ZB#hRn`uilTGPJ@fqEy
zGt(f0B+^JDP&f=r{#Y_wi#AVDf-y!RIXU^0jXsFpf>=Ji*TeqSY!H~AMbJdCGLhC)
zn7Rx+sXw6uYj;WRYrLd^5IZq@6JI1C^YkgnedZEYy<&4(z%Q$5yv#Boo{AH8n$a
zhb4Y3PWdr269&?V%uI$xMcUrMzl=;w<_nm*qr=c3Rl@i5wWB;e-`t7D&c-mcQl7x!
zZWB`UGcw=Y2=}~wzrfLx=uet<;m3~=8I~ZRuzvMQUQdr+yTV|ATf1Uuomr__nDf=X
zZ3WYJtHp_ri(}SQAPjv+Y+0=fH4krOP@S&=zZ-t1jW1o@}z;xk8
z(Nz1co&El^HK^NrhVHa-_;&88vTU>_J33=%{if;BEY*J#1n59=07jrGQ#IP>@u#3A
z;!q+E1Rj3ZJ+!4bq9F8PXJ@yMgZL;>&gYA0%_Kbi8?S=XGM~dnQZQ!yBSgcZhY96H
zrWnU;k)qy`rX&&xlDyA%(a1Hhi5CWkmg(`Gb%m(HKi-7Z!LKGRP_B8@`7&hdDy5n=
z`OIxqxiVfX@OX1p(mQu>0Ai*v_cTMiw4qRt3~NBvr9oBy0)r>w3p~V0SCm=An6@3n)>@z!|o-$HvDK
z|3D2ZMJkLE5loMKl6R^ez@Zz%S$&mbeoqH5`Bb){Ei21q&VP)hWS2tjShfFtGE+$z
zzCR$P#uktu+#!w)cX!lWN1XU%K-r=s{|j?)Akf@q#3b#{6cZCuJ~gCxuMXRmI$nGtnH+-h
z+GEi!*X=AP<|fG`1>MBdTb?28JYc=fGvAi2I<$B(rs$;eoJCyR6_bc~p!XR@O-+sD
z=eH`-ye})I5ic1eL~TDmtfJ|8`0VJ*Yr=hNCd)G1p2MMz4C3^Mj?7;!w|Ly%JqmuW
zlIEW^Ft%z?*|fpXda>Jr^1noFZEwFgVV%|*XhH@acv8rdGxeEX{M$(vG{Zw+x(ei@
zmfXb22}8-?Fi`vo-YVrTH*C?a8%M=Hv9MqVH7H^J$KsD?>!SFZ;ZsvnHr_gn=7acz
z#W?0eCdVhVMWN12VV^$>WlQ?f;P^{(&pYTops|btm6aj>_Uz+hqpGwB)vWp0Cf5y<
zft8-je~nn?W11plq}N)4A{l8I7$!ks_x$PXW-2XaRFswX_BnF{R#6YIwMhAgd5F9X
zGmwdadS6(a^fjHtXg8=l?Rc0Sm%hk6E9!5cLVloEy4eh(=FwgP`)~I^5~pBEWo+F6
zSf2ncyMurJN91#cJTy_u8Y}@%!bq1RkGC~-bV@SXRd4F{R-*V`bS+6;W5vZ(&+I<9$;-V|eNfLa5n-6%
z2(}&uGRF;p92eS*sE*oR$@pexaqr*meB)VhmIg@h{uzkk$9~qh#cHhw#>O%)b@+(|
z^IQgqzuj~Sk(J;swEM-3TrJAPCq9k^^^`q{IItKBRXYe}e0Tdr=Huf7da3$l4PdpwWDop%^}n;dD#K4s#DYA8SHZ
z&1!riV4W4R7R#C))JH1~axJ)RYnM$$lIR%6fIVA@zV{XVyx}C+a-Dt8Y9M)^KU0+H
zR4IUb2CJ{Hg>CuaXtD50jB(_Tcx=Z$^WYu2u5kubqmwp%drJ6
z?Fo40g!Qd<-l=TQxqHEOuPX0;^z7iX?Ke^a%XT<13TA^5`4Xcw6D@Ur&VT&CUe0d}
z1GjOVF1^L@>O)l@?bD~$wzgf(nxX1OGD8fEV?TdJcZc2KoUe|oP1#=$$7ee|xbY)A
zDZq+cuTpc(fFdj^=!;{k03C69lMQ(|>uhRfRu%+!k&YOi-3|1QKB
z
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
Xviia!U7SGha1wx#SCgwmn*{w2TRX*I
literal 0
HcmV?d00001
diff --git a/website_sale_product_minimal_price/static/description/index.html b/website_sale_product_minimal_price/static/description/index.html
new file mode 100644
index 0000000000..2432706364
--- /dev/null
+++ b/website_sale_product_minimal_price/static/description/index.html
@@ -0,0 +1,439 @@
+
+
+
+
+
+
+Website Sale Product Minimal Price
+
+
+
+
+
Website Sale Product Minimal Price
+
+
+
+
This module extends the functionality of website sale module to allow to
+display the minimal price in ‘/shop’ view when product has extra variants
+price and set order by extra price in product’s view.
+
Table of contents
+
+
+
+
+- Go to backend and set a product with variants and extra price by attribute
+value.
+- Go to Website Shop.
+- You will see that in main products view appears the text “From ” with
+minimal price if the product has a diferent extra prices by attribute.
+- Click on product, the price displayed is the minimal variant price.
+
+
+
+
+
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.
+
Do not contact contributors directly about support or help with technical issues.
+
+
+
+
+
+
+
+
This module is maintained by the OCA.
+
+
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.
+
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
+
+
+
+
+
diff --git a/website_sale_product_minimal_price/static/src/js/website_sale_product_minimal_price_tour.js b/website_sale_product_minimal_price/static/src/js/website_sale_product_minimal_price_tour.js
new file mode 100644
index 0000000000..72a56fe11d
--- /dev/null
+++ b/website_sale_product_minimal_price/static/src/js/website_sale_product_minimal_price_tour.js
@@ -0,0 +1,31 @@
+/* Copyright 2019 Sergio Teruel
+ * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
+
+odoo.define("website_sale_product_minimal_price.tour", function (require) {
+ "use strict";
+
+ var tour = require("web_tour.tour");
+ var base = require("web_editor.base");
+
+ var steps = [
+ {
+ trigger: "a:contains('My product test')",
+ extra_trigger: ".product_price:has(span:contains('From '))",
+ },
+ {
+ trigger: "a[href='/shop']",
+ extra_trigger: ".js_attribute_value:eq(0):has(span:contains('Test v1'))",
+ },
+ ];
+ tour.register("website_sale_product_minimal_price",
+ {
+ url: "/shop",
+ test: true,
+ wait_for: base.ready(),
+ },
+ steps
+ );
+ return {
+ steps: steps,
+ };
+});
diff --git a/website_sale_product_minimal_price/tests/__init__.py b/website_sale_product_minimal_price/tests/__init__.py
new file mode 100644
index 0000000000..3feff797da
--- /dev/null
+++ b/website_sale_product_minimal_price/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_website_sale_product_minimal_price
diff --git a/website_sale_product_minimal_price/tests/test_website_sale_product_minimal_price.py b/website_sale_product_minimal_price/tests/test_website_sale_product_minimal_price.py
new file mode 100644
index 0000000000..bcaf4d6b07
--- /dev/null
+++ b/website_sale_product_minimal_price/tests/test_website_sale_product_minimal_price.py
@@ -0,0 +1,18 @@
+# Copyright 2019 Tecnativa - Sergio Teruel
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo.tests.common import HttpCase
+
+
+class WebsiteSaleProductMinimalPriceHttpCase(HttpCase):
+
+ def test_ui_website(self):
+ """Test frontend tour."""
+ tour = (
+ "odoo.__DEBUG__.services['web_tour.tour']",
+ "website_sale_product_minimal_price",
+ )
+ self.phantom_js(
+ url_path="/",
+ code="%s.run('%s')" % tour,
+ ready="%s.tours['%s'].ready" % tour,
+ )
diff --git a/website_sale_product_minimal_price/views/assets.xml b/website_sale_product_minimal_price/views/assets.xml
new file mode 100644
index 0000000000..e3da2ba84f
--- /dev/null
+++ b/website_sale_product_minimal_price/views/assets.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
diff --git a/website_sale_product_minimal_price/views/templates.xml b/website_sale_product_minimal_price/views/templates.xml
new file mode 100755
index 0000000000..2d8ab1eab0
--- /dev/null
+++ b/website_sale_product_minimal_price/views/templates.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+ variant_id.value_ids.sorted(key=lambda x: x.price_extra)
+
+
+ variant_id.value_ids.sorted(key=lambda x: x.price_extra)
+
+
+ variant_id.value_ids.sorted(key=lambda x: x.price_extra)
+
+
+
+
+
+
+
+ From
+
+
+
+
+
From 2f1d1bab372ea9a7ff15e81bc53c7e2de3819ff1 Mon Sep 17 00:00:00 2001
From: Sergio Teruel
Date: Fri, 17 May 2019 18:29:28 +0200
Subject: [PATCH 2/2] [11.0][IMP] website_sale_product_minimal_price: Order by
minimal variant price (from pricelists or extra variant price)
---
website_sale_product_minimal_price/README.rst | 8 +++---
.../models/product_template.py | 28 ++++++++-----------
.../readme/DESCRIPTION.rst | 4 +--
.../readme/USAGE.rst | 4 +--
.../static/description/index.html | 8 +++---
.../views/templates.xml | 13 ++++++---
6 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/website_sale_product_minimal_price/README.rst b/website_sale_product_minimal_price/README.rst
index ba6b06b96c..a3785b9696 100644
--- a/website_sale_product_minimal_price/README.rst
+++ b/website_sale_product_minimal_price/README.rst
@@ -26,8 +26,8 @@ Website Sale Product Minimal Price
|badge1| |badge2| |badge3| |badge4| |badge5|
This module extends the functionality of website sale module to allow to
-display the minimal price in '/shop' view when product has extra variants
-price and set order by extra price in product's view.
+display the minimal price in '/shop' view when product has distinct variants
+price and set order by minimal price in product's view.
**Table of contents**
@@ -38,10 +38,10 @@ Usage
=====
#. Go to backend and set a product with variants and extra price by attribute
- value.
+ value or define a distinct prices in public price list for this variant.
#. Go to Website Shop.
#. You will see that in main products view appears the text "From " with
- minimal price if the product has a diferent extra prices by attribute.
+ minimal price if the product has a distinct prices by attribute.
#. Click on product, the price displayed is the minimal variant price.
Bug Tracker
diff --git a/website_sale_product_minimal_price/models/product_template.py b/website_sale_product_minimal_price/models/product_template.py
index a1d0c4c141..5e19bf9d20 100644
--- a/website_sale_product_minimal_price/models/product_template.py
+++ b/website_sale_product_minimal_price/models/product_template.py
@@ -1,35 +1,29 @@
# Copyright 2019 Tecnativa - Sergio Teruel
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
-from odoo import api, fields, models
+from odoo import fields, models
class ProductTemplate(models.Model):
_inherit = 'product.template'
- has_variant_price_extra = fields.Boolean(
- compute='_compute_has_variant_price_extra',
- store=True,
- string='Has variants with price extra',
+ has_distinct_variant_price = fields.Boolean(
+ compute='_compute_has_distinct_variant_price',
+ string='Has variants with distinct extra',
)
- @api.depends(
- 'product_variant_ids.attribute_value_ids.price_ids.price_extra')
- def _compute_has_variant_price_extra(self):
+ def _compute_has_distinct_variant_price(self):
for template in self:
- if (template.product_variant_count and len(set(
- template.product_variant_ids.mapped('price_extra'))) != 1):
- template.has_variant_price_extra = True
+ if template.product_variant_count > 1:
+ prices = template.product_variant_ids.mapped('website_price')
+ if len(prices) > 1:
+ template.has_distinct_variant_price = True
def _website_price(self):
- templates = self.filtered(
- lambda x: (
- x.product_variant_count > 1 and any(
- [v.price_extra != 0.0 for v in x.product_variant_ids]))
- )
+ templates = self.filtered(lambda x: x.product_variant_count > 1)
super(ProductTemplate, self - templates)._website_price()
for product in templates:
variant = product.product_variant_ids.sorted(
- key=lambda v: v.price_extra)[:1]
+ key=lambda p: p.website_price)[:1]
product.website_price = variant.website_price
product.website_public_price = variant.website_public_price
product.website_price_difference = variant.website_price_difference
diff --git a/website_sale_product_minimal_price/readme/DESCRIPTION.rst b/website_sale_product_minimal_price/readme/DESCRIPTION.rst
index f4f13e65e4..09c47abbba 100644
--- a/website_sale_product_minimal_price/readme/DESCRIPTION.rst
+++ b/website_sale_product_minimal_price/readme/DESCRIPTION.rst
@@ -1,3 +1,3 @@
This module extends the functionality of website sale module to allow to
-display the minimal price in '/shop' view when product has extra variants
-price and set order by extra price in product's view.
+display the minimal price in '/shop' view when product has distinct variants
+price and set order by minimal price in product's view.
diff --git a/website_sale_product_minimal_price/readme/USAGE.rst b/website_sale_product_minimal_price/readme/USAGE.rst
index e074c0c211..5e5e861d43 100644
--- a/website_sale_product_minimal_price/readme/USAGE.rst
+++ b/website_sale_product_minimal_price/readme/USAGE.rst
@@ -1,6 +1,6 @@
#. Go to backend and set a product with variants and extra price by attribute
- value.
+ value or define a distinct prices in public price list for this variant.
#. Go to Website Shop.
#. You will see that in main products view appears the text "From " with
- minimal price if the product has a diferent extra prices by attribute.
+ minimal price if the product has a distinct prices by attribute.
#. Click on product, the price displayed is the minimal variant price.
diff --git a/website_sale_product_minimal_price/static/description/index.html b/website_sale_product_minimal_price/static/description/index.html
index 2432706364..8c0a9db721 100644
--- a/website_sale_product_minimal_price/static/description/index.html
+++ b/website_sale_product_minimal_price/static/description/index.html
@@ -369,8 +369,8 @@ Website Sale Product Minimal Price
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
This module extends the functionality of website sale module to allow to
-display the minimal price in ‘/shop’ view when product has extra variants
-price and set order by extra price in product’s view.
+display the minimal price in ‘/shop’ view when product has distinct variants
+price and set order by minimal price in product’s view.
Table of contents
@@ -388,10 +388,10 @@ Website Sale Product Minimal Price
- Go to backend and set a product with variants and extra price by attribute
-value.
+value or define a distinct prices in public price list for this variant.
- Go to Website Shop.
- You will see that in main products view appears the text “From ” with
-minimal price if the product has a diferent extra prices by attribute.
+minimal price if the product has a distinct prices by attribute.
- Click on product, the price displayed is the minimal variant price.
diff --git a/website_sale_product_minimal_price/views/templates.xml b/website_sale_product_minimal_price/views/templates.xml
index 2d8ab1eab0..be6aabbe0d 100755
--- a/website_sale_product_minimal_price/views/templates.xml
+++ b/website_sale_product_minimal_price/views/templates.xml
@@ -5,21 +5,26 @@
+
+
+
+
- variant_id.value_ids.sorted(key=lambda x: x.price_extra)
+ sorted_values
- variant_id.value_ids.sorted(key=lambda x: x.price_extra)
+ sorted_values
- variant_id.value_ids.sorted(key=lambda x: x.price_extra)
+ sorted_values
-
+
From