From b347ad0eb6534c896b373286d2a18a1f7fddc763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= <tde@odoo.com>
Date: Thu, 2 Jan 2020 10:35:45 +0000
Subject: [PATCH] [REF] website_sale_slides: reorder templates and improve buy
 templates

Purpose of this commit is to

  * extract buy now button in its own template to ease its improvements
    and re-use;
  * rename some templates to improve "Customize" menu entries;

Task ID : 2125086
PR : odoo/odoo#40679
---
 .../views/website_slides_templates.xml        | 159 +++++++++---------
 1 file changed, 84 insertions(+), 75 deletions(-)

diff --git a/addons/website_sale_slides/views/website_slides_templates.xml b/addons/website_sale_slides/views/website_slides_templates.xml
index abeb0ec227d..7f83671dec1 100644
--- a/addons/website_sale_slides/views/website_slides_templates.xml
+++ b/addons/website_sale_slides/views/website_slides_templates.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" ?>
 <odoo><data>
 
+<!-- LESSON -->
 <template id="lesson_content_quiz" inherit_id="website_slides.lesson_content_quiz">
     <xpath expr="//div[hasclass('o_wslides_js_lesson_quiz')]" position="attributes">
         <attribute name="t-att-data-price">product_info['price'] if product_info else None</attribute>
@@ -12,6 +13,26 @@
     </xpath>
 </template>
 
+<template name="Buy Course To Download Resource" id="slide_aside_training_category_buy_course" inherit_id="website_slides.slide_aside_training_category">
+    <xpath expr="//div[hasclass('o_wslides_js_course_join')]" position="inside">
+        <li t-elif="aside_slide.channel_id.enroll == 'payment'" class="text-decoration-none small">
+            <i class="fa fa-download mr-1"/>
+            <t t-call="website_sale_slides.course_buy_course_link">
+                <t t-set="slide" t-value="aside_slide"/>
+            </t>
+        </li>
+    </xpath>
+</template>
+
+<template name="Buy Course To Download Resource Slide Detail" id="slide_content_detailed_buy_course" inherit_id="website_slides.slide_content_detailed">
+    <xpath expr="//div[hasclass('o_wslides_js_course_join')]" position="inside">
+        <span t-elif="slide.channel_id.enroll == 'payment'" class="text-muted mr-auto border-left pl-3">
+            <t t-call="website_sale_slides.course_buy_course_link"/>
+        </span>
+    </xpath>
+</template>
+
+<!-- FULLSCREEN -->
 <template id="slide_fullscreen" inherit_id="website_slides.slide_fullscreen">
     <xpath expr="//div[hasclass('o_wslides_fs_main')]" position="attributes">
         <attribute name="t-att-data-price">product_info['price'] if product_info else None</attribute>
@@ -23,54 +44,76 @@
     </xpath>
 </template>
 
-<template name="Join Channel: Product Button" id='course_sidebar' inherit_id="website_slides.course_sidebar">
+<template name="Buy Course To Download Resource Fullscreen" id="slide_fullscreen_sidebar_category_buy_course" inherit_id="website_slides.slide_fullscreen_sidebar_category">
+    <xpath expr="//div[hasclass('o_wslides_js_course_join')]" position="inside">
+        <li t-elif="slide.channel_id.enroll == 'payment'" class="o_wslides_fs_slide_link mb-1">
+            <i class="fa fa-download mr-1"/>
+            <t t-call="website_sale_slides.course_buy_course_link"/>
+        </li>
+    </xpath>
+</template>
+
+<!-- COURSE -->
+<template name="Course Sidebar (infos, CTA)" id='course_sidebar' inherit_id="website_slides.course_sidebar">
     <!-- Channel main template: override button to join channel -->
     <xpath expr="//div[hasclass('o_wslides_js_course_join')]" position="inside">
         <t t-if="(not channel.is_member or channel.can_publish) and channel.enroll == 'payment'">
-            <t t-if="channel.product_id.website_published">
-                <div t-attf-class="text-center d-flex align-items-center text-center pb-1 #{'justify-content-between' if product_info['has_discounted_price'] else 'justify-content-around'}">
-                    <div class="css_editable_mode_hidden">
-                        <!-- real price -->
-                        <div class="oe_price font-weight-bold text-nowrap h2 my-2"
-                             t-esc="product_info['price']"
-                             t-options="{'widget': 'monetary', 'display_currency': product_info['currency_id']}"/>
-                        <span itemprop="price" style="display:none;" t-esc="product_info['price']"/>
-                        <span itemprop="priceCurrency" style="display:none;" t-esc="product_info['currency_id'].name"/>
-                        <!-- original discounted price, if any -->
-                        <del t-att-class="'text-600 text-nowrap oe_default_price %s' % ('' if product_info['has_discounted_price'] else 'd-none')"
-                             t-esc="product_info['list_price']"
-                             t-options="{'widget': 'monetary', 'display_currency': product_info['currency_id']}"/>
-                    </div>
-                    <div class="css_non_editable_mode_hidden decimal_precision oe_price font-weight-bold text-nowrap h2 my-2"
-                         t-att-data-precision="str(product_info['currency_id'].decimal_places)">
-                        <span t-field="channel.product_id.list_price" t-options="{'widget': 'monetary', 'display_currency': product_info['currency_id']}"/>
-                    </div>
-                </div>
-                <div class="oe_website_sale">
-                    <div class="add_to_cart_button">
-                        <form action="/shop/cart/update" method="POST">
-                            <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()" />
-                            <input type="hidden" class="product_id" name="product_id" t-att-value="channel.product_id.id"/>
-                            <input type="hidden" class="product_template_id" name="product_template_id" t-att-value="channel.product_id.id"/>
-                            <a id="add_to_cart" role="button" class="btn btn-primary btn-block js_check_product o_js_add_to_cart a-submit" href="#">
-                                <i class="fa fa-shopping-cart"></i> Add to Cart
-                            </a>
-                            <div id="product_option_block"/>
-                        </form>
-                    </div>
-                    <div class="buy_now_button"/>
-                </div>
-            </t>
-            <t t-else="">
-                <div class="alert my-0 bg-200 text-center">
-                    Course Not Buyable
-                </div>
-            </t>
+            <t t-call="website_sale_slides.course_buy_course_button" />
         </t>
     </xpath>
 </template>
 
-<template name="Buy Now Button" id="course_sidebar_buy_now_course" inherit_id="website_sale_slides.course_sidebar" active="False" customize_show="True">
+<!-- TOOLS -->
+<template name="Buy Course Link" id="course_buy_course_link">
+    <a t-att-href="'/shop/cart/update?product_id=%s' % slide.channel_id.product_id.id">
+        Buy Course
+    </a>
+     to download resources
+</template>
+
+<template name="Buy Course Button" id="course_buy_course_button">
+    <t t-if="channel.product_id.website_published">
+        <div t-attf-class="text-center d-flex align-items-center text-center pb-1 #{'justify-content-between' if product_info['has_discounted_price'] else 'justify-content-around'}">
+            <div class="css_editable_mode_hidden">
+                <!-- real price -->
+                <div class="oe_price font-weight-bold text-nowrap h2 my-2"
+                     t-esc="product_info['price']"
+                     t-options="{'widget': 'monetary', 'display_currency': product_info['currency_id']}"/>
+                <span itemprop="price" style="display:none;" t-esc="product_info['price']"/>
+                <span itemprop="priceCurrency" style="display:none;" t-esc="product_info['currency_id'].name"/>
+                <!-- original discounted price, if any -->
+                <del t-att-class="'text-600 text-nowrap oe_default_price %s' % ('' if product_info['has_discounted_price'] else 'd-none')"
+                     t-esc="product_info['list_price']"
+                     t-options="{'widget': 'monetary', 'display_currency': product_info['currency_id']}"/>
+            </div>
+            <div class="css_non_editable_mode_hidden decimal_precision oe_price font-weight-bold text-nowrap h2 my-2"
+                 t-att-data-precision="str(product_info['currency_id'].decimal_places)">
+                <span t-field="channel.product_id.list_price" t-options="{'widget': 'monetary', 'display_currency': product_info['currency_id']}"/>
+            </div>
+        </div>
+        <div class="oe_website_sale">
+            <div class="add_to_cart_button">
+                <form action="/shop/cart/update" method="POST">
+                    <input type="hidden" name="csrf_token" t-att-value="request.csrf_token()" />
+                    <input type="hidden" class="product_id" name="product_id" t-att-value="channel.product_id.id"/>
+                    <input type="hidden" class="product_template_id" name="product_template_id" t-att-value="channel.product_id.id"/>
+                    <a id="add_to_cart" role="button" class="btn btn-primary btn-block js_check_product o_js_add_to_cart a-submit" href="#">
+                        <i class="fa fa-shopping-cart"></i> Add to Cart
+                    </a>
+                    <div id="product_option_block"/>
+                </form>
+            </div>
+            <div class="buy_now_button"/>
+        </div>
+    </t>
+    <t t-else="">
+        <div class="alert my-0 bg-200 text-center">
+            Course Not Buyable
+        </div>
+    </t>
+</template>
+
+<template name="Allow Buy Now" id="course_option_buy_course_now" inherit_id="website_sale_slides.course_buy_course_button" active="False" customize_show="True">
     <xpath expr="//div[hasclass('buy_now_button')]" position="inside">
         <div style="margin-top:5px;">
             <a role="button" class="btn btn-outline-primary btn-block" t-att-href="'/shop/cart/update?product_id=%s&amp;express=1' % channel.product_id.id">
@@ -80,38 +123,4 @@
     </xpath>
 </template>
 
-<template name="Buy Course To Download Resource" id="slide_aside_training_category_buy_course" inherit_id="website_slides.slide_aside_training_category">
-    <xpath expr="//div[hasclass('o_wslides_js_course_join')]" position="inside">
-        <li t-elif="aside_slide.channel_id.enroll == 'payment'" class="text-decoration-none small">
-            <i class="fa fa-download mr-1"/>
-            <t t-call="website_sale_slides.buy_course_link">
-                <t t-set="slide" t-value="aside_slide"/>
-            </t>
-        </li>
-    </xpath>
-</template>
-
-<template name="Buy Course To Download Resource Fullscreen" id="slide_fullscreen_sidebar_category_buy_course" inherit_id="website_slides.slide_fullscreen_sidebar_category">
-    <xpath expr="//div[hasclass('o_wslides_js_course_join')]" position="inside">
-        <li t-elif="slide.channel_id.enroll == 'payment'" class="o_wslides_fs_slide_link mb-1">
-            <i class="fa fa-download mr-1"/>
-            <t t-call="website_sale_slides.buy_course_link"/>
-        </li>
-    </xpath>
-</template>
-
-<template name="Buy Course To Download Resource Slide Detail" id="slide_content_detailed_buy_course" inherit_id="website_slides.slide_content_detailed">
-    <xpath expr="//div[hasclass('o_wslides_js_course_join')]" position="inside">
-        <span t-elif="slide.channel_id.enroll == 'payment'" class="text-muted mr-auto border-left pl-3">
-            <t t-call="website_sale_slides.buy_course_link"/>
-        </span>
-    </xpath>
-</template>
-
-<template name="Buy Course Link" id="buy_course_link">
-    <a t-att-href="'/shop/cart/update?product_id=%s' % slide.channel_id.product_id.id">
-        Buy Course
-    </a>
-     to download resources
-</template>
 </data></odoo>