From ccdeb25bafda0c413241dbc8369bd99290035fba Mon Sep 17 00:00:00 2001
From: Denis Mudarisov <denis.mudarisov@gmail.com>
Date: Tue, 9 Feb 2021 13:14:49 +0500
Subject: [PATCH] :arrow_up::one::two: update view

---
 pos_order_merge/views/pos_config_view.xml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pos_order_merge/views/pos_config_view.xml b/pos_order_merge/views/pos_config_view.xml
index cc46425b61..50829f75e8 100644
--- a/pos_order_merge/views/pos_config_view.xml
+++ b/pos_order_merge/views/pos_config_view.xml
@@ -3,10 +3,21 @@
     <record id="view_pos_config_form" model="ir.ui.view">
         <field name="name">pos.config.form.view.inherit</field>
         <field name="model">pos.config</field>
-        <field name="inherit_id" ref="point_of_sale.pos_config_view_form" />
+        <field name="inherit_id" ref="pos_restaurant.pos_config_view_form_inherit_restaurant" />
         <field name="arch" type="xml">
-            <xpath expr="//field[@name='iface_orderline_notes']" position="after">
-                <field name="iface_order_merge" />
+            <xpath expr="//div[@id='iface_orderline_notes']" position="after">
+                <div class="col-12 col-lg-6 o_setting_box" id="iface_order_merge">
+                    <div class="o_setting_left_pane">
+                        <field name="iface_order_merge" />
+                    </div>
+                    <div class="o_setting_right_pane">
+                        <label for="iface_order_merge"/>
+                        <span class="fa fa-lg fa-cutlery" title="For bars and restaurants" role="img" aria-label="For bars and restaurants"/>
+                        <div class="text-muted">
+                            Merge POS orders into a single order
+                        </div>
+                    </div>
+                </div>
             </xpath>
         </field>
     </record>