From 0f78e602d62bd177227485cdaeb647723bd1197c Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@odoo.com>
Date: Fri, 13 Jun 2014 17:08:19 +0200
Subject: [PATCH] [FIX] website_sale: tour; product split kanban view of
 product and product template

---
 addons/product/product_view.xml               | 33 ++++++++++++++-----
 addons/website_sale/models/product.py         |  2 +-
 .../static/src/js/website.tour.sale.js        | 11 ++++++-
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 6f29d3a188d..e6f0a4cf23d 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -283,15 +283,30 @@
         <record id="product_kanban_view" model="ir.ui.view">
             <field name="name">Product Kanban</field>
             <field name="model">product.product</field>
-            <field name="mode">primary</field>
-            <field name="inherit_id" ref="product.product_template_kanban_view"/>
             <field name="arch" type="xml">
-                <field name="name" position="after">
-                    <field name="attribute_value_ids"/>
-                </field>
-                <xpath expr="//img[@class='oe_kanban_image']" position="replace">
-                    <img t-att-src="kanban_image('product.product', 'image_small', record.id.value)" class="oe_kanban_image"/>
-                </xpath>
+                <kanban>
+                    <field name="image_small"/>
+                    <field name="lst_price"/>
+                    <templates>
+                        <t t-name="kanban-box">
+                            <div class="oe_kanban_vignette oe_semantic_html_override">
+                                <a type="open"><img t-att-src="kanban_image('product.product', 'image_small', record.id.value)" class="oe_kanban_image"/></a>
+                                <div class="oe_kanban_details">
+                                    <h4>
+                                        <a type="open">
+                                            <field name="name"/>
+                                            <field name="attribute_value_ids"/>
+                                        </a>
+                                    </h4>
+                                    <div name="tags"/>
+                                    <ul>
+                                        <li>Price: <field name="lst_price"></field></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
             </field>
         </record>
 
@@ -361,7 +376,7 @@
                     <field name="product_variant_ids"/>
                 </field>
                 <h4 position="after">
-                    <a name="%(product.product_variant_action)d" type="action" t-if="!record.is_product_variant.raw_value &amp; record.product_variant_count.raw_value&gt;1">
+                    <a name="%(product.product_variant_action)d" type="action">
                         <t t-esc="record.product_variant_count.value"/> Variants
                     </a>
                 </h4>
diff --git a/addons/website_sale/models/product.py b/addons/website_sale/models/product.py
index 51359c4851a..f01a90c604f 100644
--- a/addons/website_sale/models/product.py
+++ b/addons/website_sale/models/product.py
@@ -211,5 +211,5 @@ class product_attribute(osv.Model):
 class product_attribute_value(osv.Model):
     _inherit = "product.attribute.value"
     _columns = {
-        'color': fields.char("Color for Color Attributes"),
+        'color': fields.char("HTML Color Index", help="Here you can set a specific HTML color index (e.g. #ff0000) to display the color on the website if the attibute type is 'Color'."),
     }
diff --git a/addons/website_sale/static/src/js/website.tour.sale.js b/addons/website_sale/static/src/js/website.tour.sale.js
index c8b4213b870..d91ca072e28 100644
--- a/addons/website_sale/static/src/js/website.tour.sale.js
+++ b/addons/website_sale/static/src/js/website.tour.sale.js
@@ -64,8 +64,17 @@
                 element:   "#customize-menu a:contains(Confirm: Add To Cart)",
             },
             {
-                title:     "finish",
+                title:     "click on 'My Cart'",
                 waitFor:   "a.a-submit:contains(Add to Cart)",
+                element:   "a[href='/shop/cart']",
+            },
+            {
+                title:     "remove ipad from cart",
+                element:   '#cart_products a.js_add_cart_json:first',
+            },
+            {
+                title:     "finish",
+                waitFor:   '.my_cart_quantity:contains(1)',
             },
         ]
     });