[MIG] pos_order_reorder: Migration to 18.0

OCA · Feb 10, 2025 · 3fe1cdf · 3fe1cdf
1 parent 6b717ee
commit 3fe1cdf
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 29 deletions.
diff --git a/pos_order_reorder/README.rst b/pos_order_reorder/README.rst
@@ -66,6 +66,9 @@ Contributors
 
 - Cetmix <https://cetmix.com/>
 - Dinar Gabbasov
+- `Heliconia Solutions Pvt. Ltd. <https://www.heliconia.io>`__
+
+  - Bhavesh Heliconia
 
 Maintainers
 -----------

diff --git a/pos_order_reorder/__manifest__.py b/pos_order_reorder/__manifest__.py
@@ -1,6 +1,6 @@
 {
     "name": "Point of Sale Re-order",
-    "version": "16.0.0.1.2",
+    "version": "18.0.1.0.0",
     "category": "Sales/Point of Sale",
     "summary": "Simple Re-order in the Point of Sale ",
     "depends": ["point_of_sale"],
@@ -12,7 +12,7 @@
     ],
     "installable": True,
     "assets": {
-        "point_of_sale.assets": [
+        "point_of_sale._assets_pos": [
             "pos_order_reorder/static/src/js/**/*.js",
             "pos_order_reorder/static/src/xml/**/*.xml",
         ],

diff --git a/pos_order_reorder/readme/CONTRIBUTORS.md b/pos_order_reorder/readme/CONTRIBUTORS.md
@@ -1,2 +1,4 @@
 - Cetmix \<<https://cetmix.com/>\>
 - Dinar Gabbasov
+- [Heliconia Solutions Pvt. Ltd.](https://www.heliconia.io)
+  - Bhavesh Heliconia
diff --git a/pos_order_reorder/static/description/index.html b/pos_order_reorder/static/description/index.html
@@ -412,6 +412,10 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Cetmix &lt;<a class="reference external" href="https://cetmix.com/">https://cetmix.com/</a>&gt;</li>
 <li>Dinar Gabbasov</li>
+<li><a class="reference external" href="https://www.heliconia.io">Heliconia Solutions Pvt. Ltd.</a><ul>
+<li>Bhavesh Heliconia</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">

diff --git a/pos_order_reorder/static/src/js/Screens/TicketScreen/ControlButtons/ReorderButton.esm.js b/pos_order_reorder/static/src/js/Screens/TicketScreen/ControlButtons/ReorderButton.esm.js
@@ -1,10 +1,14 @@
 /** @odoo-module **/
 
-import {Orderline} from "point_of_sale.models";
-import PosComponent from "point_of_sale.PosComponent";
-import Registries from "point_of_sale.Registries";
+import {Component} from "@odoo/owl";
+import {usePos} from "@point_of_sale/app/store/pos_hook";
 
-class ReorderButton extends PosComponent {
+export class ReorderButton extends Component {
+    static template = "ReorderButton";
+
+    setup() {
+        this.pos = usePos();
+    }
     get isEmptyOrder() {
         if (!this.props.order) return true;
         return this.props.order.is_empty();
@@ -14,7 +18,7 @@ class ReorderButton extends PosComponent {
             return;
         }
         const order = this.props.order;
-        const pos = this.env.pos;
+        const pos = this.pos;
         const partner = order.get_partner();
         const newOrder = pos.add_new_order();
         if (partner) {
@@ -29,8 +33,7 @@ class ReorderButton extends PosComponent {
         const lines = order.get_orderlines();
         for (var i = 0; i < lines.length; i++) {
             const line = lines[i];
-            const new_line = Orderline.create(
-                {},
+            const new_line = this.props.order.models["pos.order.line"].create(
                 this._prepareReorderLineVals(newOrder, line)
             );
             if (line.pack_lot_lines) {
@@ -44,18 +47,16 @@ class ReorderButton extends PosComponent {
             new_line.set_unit_price(line.get_unit_price());
             new_line.set_quantity(line.get_quantity());
             new_line.set_discount(line.get_discount());
-            newOrder.add_orderline(new_line);
         }
-        this.trigger("click-order", newOrder);
+        this.pos.closeScreen();
     }
     _prepareReorderLineVals(order, line) {
         return {
-            pos: this.env.pos,
-            order: order,
-            product: this.env.pos.db.get_product_by_id(line.get_product().id),
+            order_id: order,
+            product_id: line.product_id,
             description: line.name,
-            price: line.price_unit,
-            tax_ids: order.fiscal_position ? undefined : line.tax_id,
+            price_unit: line.price_unit,
+            tax_ids: line.tax_ids.map((tax) => ["link", tax]),
             price_manually_set: true,
             customer_note: line.customer_note,
         };
@@ -64,7 +65,3 @@ class ReorderButton extends PosComponent {
         this._reOrder();
     }
 }
-ReorderButton.template = "ReorderButton";
-Registries.Component.add(ReorderButton);
-
-export default ReorderButton;
diff --git a/pos_order_reorder/static/src/js/Screens/TicketScreen/TicketScreen.esm.js b/pos_order_reorder/static/src/js/Screens/TicketScreen/TicketScreen.esm.js
@@ -0,0 +1,7 @@
+import {TicketScreen} from "@point_of_sale/app/screens/ticket_screen/ticket_screen";
+import {patch} from "@web/core/utils/patch";
+import {ReorderButton} from "@pos_order_reorder/js/Screens/TicketScreen/ControlButtons/ReorderButton.esm";
+
+patch(TicketScreen, {
+    components: {...TicketScreen.components, ReorderButton},
+});
diff --git a/pos_order_reorder/static/src/xml/Screens/TicketScreen/ControlButtons/ReorderButton.xml b/pos_order_reorder/static/src/xml/Screens/TicketScreen/ControlButtons/ReorderButton.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates id="template" xml:space="preserve">
 
-    <t t-name="ReorderButton" owl="1">
-        <span class="control-button" t-on-click="_onClick">
+    <t t-name="ReorderButton">
+        <span
+            class="control-button btn btn-light btn-lg lh-lg flex-grow-1 flex-shrink-1"
+            t-on-click="_onClick"
+        >
             <i class="fa fa-copy" />
             <span />
             <span>Re-order</span>

diff --git a/pos_order_reorder/static/src/xml/Screens/TicketScreen/TicketScreen.xml b/pos_order_reorder/static/src/xml/Screens/TicketScreen/TicketScreen.xml
@@ -5,12 +5,8 @@
         t-name="TicketScreen"
         t-inherit="point_of_sale.TicketScreen"
         t-inherit-mode="extension"
-        owl="1"
     >
-        <xpath
-            expr="//div[hasclass('leftpane')]//div[hasclass('control-buttons')]"
-            position="inside"
-        >
+        <xpath expr="//InvoiceButton" position="after">
             <ReorderButton order="_selectedSyncedOrder" />
         </xpath>
     </t>

diff --git a/pos_order_reorder/views/res_config_settings_view.xml b/pos_order_reorder/views/res_config_settings_view.xml
@@ -5,7 +5,7 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="point_of_sale.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <div id="pos_interface_section" position="inside">
+            <xpath expr="//block[@id='pos_interface_section']" position="inside">
                 <div class="col-12 col-lg-6 o_setting_box">
                     <div class="o_setting_left_pane">
                         <field name="pos_allow_reorder" />
@@ -17,7 +17,7 @@
                         </div>
                     </div>
                 </div>
-            </div>
+            </xpath>
         </field>
     </record>
 </odoo>