[MIG] pos_receipt_hide_price: Migration to 16.0

OCA · Nov 28, 2022 · fb6caeb · fb6caeb
1 parent fb8130e
commit fb6caeb
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 43 deletions.
diff --git a/pos_receipt_hide_price/README.rst b/pos_receipt_hide_price/README.rst
@@ -73,6 +73,10 @@ Contributors
 
   * Florian Mounier
 
+* `FactorLibre <https://factorlibre.com/>`_:
+
+  * Daniel Duque
+
 Maintainers
 ~~~~~~~~~~~
 

diff --git a/pos_receipt_hide_price/__manifest__.py b/pos_receipt_hide_price/__manifest__.py
@@ -1,18 +1,20 @@
 # Copyright 2021 Akretion - Florian Mounier
+# Copyright 2022 FactorLibre - Daniel Duque
 {
     "name": "POS Receipt Hide Price",
     "summary": "Add button to remove price from receipt.",
-    "author": "Akretion, Odoo Community Association (OCA)",
+    "author": "Akretion, FactorLibre, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/pos",
     "category": "Point of Sale",
-    "version": "14.0.1.0.1",
+    "version": "16.0.1.0.0",
     "license": "LGPL-3",
     "depends": ["point_of_sale"],
-    "data": ["views/assets.xml"],
-    "qweb": [
-        "static/src/xml/OrderReceipt.xml",
-        "static/src/xml/HidePrice.xml",
-        "static/src/xml/ReceiptScreen.xml",
-        "static/src/xml/ReprintReceiptScreen.xml",
-    ],
+    "assets": {
+        "point_of_sale.assets": [
+            "pos_receipt_hide_price/static/src/js/ReceiptScreen.js",
+            "pos_receipt_hide_price/static/src/js/ReprintReceiptScreen.js",
+            "pos_receipt_hide_price/static/src/js/OrderReceipt.js",
+            "pos_receipt_hide_price/static/src/xml/**/*",
+        ],
+    },
 }
diff --git a/pos_receipt_hide_price/readme/CONTRIBUTORS.rst b/pos_receipt_hide_price/readme/CONTRIBUTORS.rst
@@ -1,3 +1,7 @@
 * `Akretion <https://www.akretion.com>`_:
 
   * Florian Mounier
+
+* `FactorLibre <https://factorlibre.com/>`_:
+
+  * Daniel Duque
diff --git a/pos_receipt_hide_price/static/src/js/OrderReceipt.js b/pos_receipt_hide_price/static/src/js/OrderReceipt.js
@@ -4,9 +4,9 @@ odoo.define("pos_receipt_hide_price.OrderReceipt", function (require) {
     const OrderReceipt = require("point_of_sale.OrderReceipt");
     const Registries = require("point_of_sale.Registries");
 
-    const HidePriceOrderReceipt = (OrderReceipt) =>
-        class extends OrderReceipt {
-            constructor(_, {hidePriceState}) {
+    const HidePriceOrderReceipt = (OriginalOrderReceipt) =>
+        class extends OriginalOrderReceipt {
+            constructor({hidePriceState}) {
                 super(...arguments);
                 this.hidePriceState = hidePriceState;
             }

diff --git a/pos_receipt_hide_price/static/src/js/ReceiptScreen.js b/pos_receipt_hide_price/static/src/js/ReceiptScreen.js
@@ -1,12 +1,12 @@
 odoo.define("pos_receipt_hide_price.ReceiptScreen", function (require) {
     "use strict";
 
-    const {useState} = owl.hooks;
+    const {useState} = owl;
     const ReceiptScreen = require("point_of_sale.ReceiptScreen");
     const Registries = require("point_of_sale.Registries");
 
-    const HidePriceReceiptScreen = (ReceiptScreen) =>
-        class extends ReceiptScreen {
+    const HidePriceReceiptScreen = (OriginalReceiptScreen) =>
+        class extends OriginalReceiptScreen {
             constructor() {
                 super(...arguments);
                 this.hidePriceState = useState({priceHidden: false});

diff --git a/pos_receipt_hide_price/static/src/js/ReprintReceiptScreen.js b/pos_receipt_hide_price/static/src/js/ReprintReceiptScreen.js
@@ -1,12 +1,12 @@
 odoo.define("pos_receipt_hide_price.ReprintReceiptScreen", function (require) {
     "use strict";
 
-    const {useState} = owl.hooks;
+    const {useState} = owl;
     const ReprintReceiptScreen = require("point_of_sale.ReprintReceiptScreen");
     const Registries = require("point_of_sale.Registries");
 
-    const HidePriceReprintReceiptScreen = (ReprintReceiptScreen) =>
-        class extends ReprintReceiptScreen {
+    const HidePriceReprintReceiptScreen = (OriginalReprintReceiptScreen) =>
+        class extends OriginalReprintReceiptScreen {
             constructor() {
                 super(...arguments);
                 this.hidePriceState = useState({priceHidden: false});

diff --git a/pos_receipt_hide_price/static/src/xml/OrderReceipt.xml b/pos_receipt_hide_price/static/src/xml/OrderReceipt.xml
@@ -1,7 +1,5 @@
 <templates id="template" xml:space="preserve">
-  <t t-inherit="point_of_sale.OrderReceipt" t-inherit-mode="extension">
-    <!-- Attributes position xpath only apply to first match for some reason: -->
-    <!-- https://github.com/odoo/odoo/issues/23862 -->
+  <t t-inherit="point_of_sale.OrderLinesReceipt" t-inherit-mode="extension" owl="1">
     <!-- Simple price -->
     <xpath expr="//t[@t-if='isSimple(line)']/div/span" position="attributes">
       <attribute name="t-att-class">{'oe_hidden': priceHidden}</attribute>
@@ -31,7 +29,10 @@
         </div>
       </t>
     </xpath>
-
+  </t>
+  <t t-inherit="point_of_sale.OrderReceipt" t-inherit-mode="extension" owl="1">
+    <!-- Attributes position xpath only apply to first match for some reason: -->
+    <!-- https://github.com/odoo/odoo/issues/23862 -->
     <!-- Tax included -->
     <xpath expr="//t[@t-if='!isTaxIncluded']/div[1]" position="attributes">
       <attribute name="t-att-class">{'oe_hidden': priceHidden}</attribute>
@@ -85,6 +86,11 @@
     <xpath expr="//t[@t-foreach='receipt.tax_details']/div" position="attributes">
       <attribute name="t-att-class">{'oe_hidden': priceHidden}</attribute>
     </xpath>
+
+    <xpath expr="//t[@t-if='isTaxIncluded']/t[@t-foreach]/div" position="attributes">
+      <attribute name="t-att-class">{'oe_hidden': priceHidden}</attribute>
+    </xpath>
+
     <xpath expr="//t[@t-if='isTaxIncluded']/div" position="attributes">
       <attribute name="t-att-class">{'oe_hidden': priceHidden}</attribute>
     </xpath>

diff --git a/pos_receipt_hide_price/static/src/xml/ReceiptScreen.xml b/pos_receipt_hide_price/static/src/xml/ReceiptScreen.xml
@@ -1,5 +1,5 @@
 <templates id="template" xml:space="preserve">
-  <t t-inherit="point_of_sale.ReceiptScreen" t-inherit-mode="extension">
+  <t t-inherit="point_of_sale.ReceiptScreen" t-inherit-mode="extension" owl="1">
     <xpath expr="//div[hasclass('button', 'print')]" position="before">
       <t t-call="pos_receipt_hide_price.hide_price" />
     </xpath>

diff --git a/pos_receipt_hide_price/static/src/xml/ReprintReceiptScreen.xml b/pos_receipt_hide_price/static/src/xml/ReprintReceiptScreen.xml
@@ -1,5 +1,5 @@
 <templates id="template" xml:space="preserve">
-  <t t-inherit="point_of_sale.ReprintReceiptScreen" t-inherit-mode="extension">
+  <t t-inherit="point_of_sale.ReprintReceiptScreen" t-inherit-mode="extension" owl="1">
     <xpath expr="//div[hasclass('button', 'print')]" position="after">
       <t t-call="pos_receipt_hide_price.hide_price" />
     </xpath>

diff --git a/pos_receipt_hide_price/views/assets.xml b/pos_receipt_hide_price/views/assets.xml
diff --git a/setup/pos_receipt_hide_price/odoo/addons/pos_receipt_hide_price b/setup/pos_receipt_hide_price/odoo/addons/pos_receipt_hide_price
@@ -0,0 +1 @@
+../../../../pos_receipt_hide_price
diff --git a/setup/pos_receipt_hide_price/setup.py b/setup/pos_receipt_hide_price/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)