temp rebasing PR 262 (16cd937)

ingadhoc · Jan 16, 2024 · 5f03bbb · 5f03bbb
2 parents d95a1be + 16cd937
commit 5f03bbb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 39 deletions.
diff --git a/website_sale_ux/README.rst b/website_sale_ux/README.rst
@@ -18,7 +18,6 @@ Website Sale UX
 #. This module also changes the functionality of the Catalog page`s "Add to cart" buttons (frontend):
     * If the product has not variants, when user clicks Add to cart button then the product is added to the Cart (default behaviour).
     * If the product has variants, when users click the Add to cart button then they are redirected to the Product page (new feature) so they could choice among all variants, instead of opening the pop-up to choice among all variants (default behaviour). This new feature is required because "variant pop-up" shows a malfunction when user tries to add to cart a bigger quantity of a variant product than stock available.
-#. By default, on Settings > Website the option Customer account (which set Free sign up option or By invitation on website) is not able. This module adds this setting option per website.
 #. Rename "All products" to "All categories" in categories left snippet on shop
 #. Add an option to disable returning categories on shop search bar. To do so you need to go to website settings and check option "Disable Categories Search"
 #. Add a button on the filters sidebar on ecommerce to get back to the shop page unapplying all filters previously set

diff --git a/website_sale_ux/__manifest__.py b/website_sale_ux/__manifest__.py
@@ -20,7 +20,7 @@
 {
     'name': 'Website Sale UX',
     'category': 'base.module_category_knowledge_management',
-    'version': "16.0.1.4.0",
+    'version': "17.0.1.0.0",
     'author': 'ADHOC SA',
     'website': 'www.adhoc.com.ar',
     'license': 'AGPL-3',
@@ -35,5 +35,5 @@
         'views/res_config_settings_views.xml',
         'views/products.xml',
     ],
-    'installable': False,
+    'installable': True,
 }
diff --git a/website_sale_ux/views/product_template_views.xml b/website_sale_ux/views/product_template_views.xml
@@ -21,9 +21,10 @@
             </a>
         </xpath>
     </template>
+
     <template id="products_categories_list" inherit_id="website_sale.products_categories_list">
-        <label class="form-check-label fw-normal" t-att-for="all_products" position="replace">
-            <label class="form-check-label fw-normal" t-att-for="all_products">All Categories</label>
-        </label>
+        <xpath expr="//label[@t-att-for='all_products'][text()='All Products']" position="replace">
+            <label class="form-check-label fw-normal" t-att-for="'all_products'">All Categories</label>
+        </xpath>
     </template>
 </odoo>
diff --git a/website_sale_ux/views/res_config_settings_views.xml b/website_sale_ux/views/res_config_settings_views.xml
@@ -5,39 +5,11 @@
         <field name="model">res.config.settings</field>
         <field name="inherit_id" ref="website_sale.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='website_login_documents']/div[hasclass('o_setting_right_pane')]" position="before">
-                <div class="col-12 col-lg-6 o_setting_box" id="website_login_documents" title=" To send invitations in B2B mode, open a contact or select several ones in list view and click on 'Portal Access Management' option in the dropdown menu *Action*.">
-                    <div class="o_setting_left_pane">
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="auth_signup_uninvited"/>
-                        <div class="text-muted">
-                            Let your customers log in to see their documents
-                        </div>
-                        <div class="mt8">
-                            <field name="auth_signup_uninvited" class="o_light_label" widget="radio" options="{'horizontal': true}" required="True"/>
-                        </div>
-                        <div class="content-group" attrs="{'invisible': [('auth_signup_uninvited','=','b2b')]}">
-                            <div class="mt8">
-                                <button type="object" name="action_open_template_user" string="Default Access Rights" icon="fa-arrow-right" class="btn-link"/>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </xpath>
-            <div id="sale_product_catalog_settings">
-                <div class="col-12 col-lg-6 o_setting_box">
-                    <div class="o_setting_left_pane">
-                        <field name="disable_categories_search"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="disable_categories_search"/>
-                        <div class="text-muted">
-                            Disable search by categories on shop searchbar
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <block id="sale_product_catalog_settings" position="inside">
+                <setting id="comparator_option_setting" string="Disable Categories Search" help="Disable search by categories on shop searchbar">
+                    <field name="disable_categories_search"/>
+                </setting>
+            </block>
         </field>
     </record>
 </odoo>