X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fwebsite_sale%2Fviews%2Fwebsite_sale.xml;h=1e69db2c68436771666302e3b3aa86550a686df2;hb=c62e8fc793b9e65219d89759d384eb99ad3bffdc;hp=22f8dae0663b50b3420a74b2a4957d08e4261a71;hpb=dbcdddd3d4d1581d391819c09e5b2352f72afc22;p=odoo%2Fodoo.git

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 22f8dae..1e69db2 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -2,54 +2,64 @@
 <openerp>
 <data>
 
-    <!-- Layout add nav and footer -->
-
-    <template id="header" inherit_id="website.layout" name="Header Shop My Cart Link">
-        <xpath expr="//header//ul[@id='top_menu']/li" position="before">
-            <li t-att-class="(not website_sale_order or not website_sale_order.get_total_quantity()) and 'hidden' or ''">
-                <a href="/shop/mycart/">
-                    <i class="fa fa-shopping-cart"></i>
-                    My cart <sup t-attf-class="my_cart_quantity label label-primary"
-                                  t-esc="website_sale_order and website_sale_order.get_total_quantity() or ''"/>
-                </a>
-            </li>
-        </xpath>
-        <xpath expr="//t[@id='editable_scripts_hook']" position="inside">
-              <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js" t-ignore="true"></script>
-              <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js" t-ignore="true"></script>
-        </xpath>
-    </template>
-
-    <!-- List of categories -->
-
-    <template id="categories_recursive" name="Category list">
-        <li t-att-class="str(category.id) == search.get('category') and 'active' or ''">
-            <a t-href="/shop/category/#{ category.id }/" t-field="category.name"></a>
-            <ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
-                <t t-foreach="category.child_id" t-as="category">
-                    <t t-call="website_sale.categories_recursive"/>
-                </t>
-            </ul>
-        </li>
-    </template>
-
-    <!-- Product list -->
-
-    <template id="search" name="Search hidden fields">
-        <input type="hidden" name="category" t-att-value="search.get('category') or ''"/>
-        <input type="hidden" name="filter_domain" t-att-value="search.get('filter_domain') or ''"/>
-        <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
-    </template>
-
-    <template id="products_cart" name="Shopping cart">
-      <div class="ribbon-wrapper">
-        <div class="ribbon">Promo</div>
-      </div>
-      <div class="oe_product_description">
-          <a t-href="/shop/product/#{ slug(product) }/" t-keep-query="category,search,filter_domain">
-              <b t-field="product.name"/>
+<!-- Layout add nav and footer -->
+
+<template id="editor_head" inherit_id="website.editor_head" name="Shop Editor" groups="base.group_website_designer">
+  <xpath expr="//script[last()]" position="after">
+      <script type="text/javascript" src="/website_sale/static/src/js/website_sale.editor.js"></script>
+      <script type="text/javascript" src="/website_sale/static/src/js/website.tour.shop.js"></script>
+  </xpath>
+</template>
+
+<template id="header" inherit_id="website.layout" name="Header Shop My Cart Link">
+  <xpath expr="//header//ul[@id='top_menu']/li" position="before">
+      <li t-att-class="(not website_sale_order or not website_sale_order.get_total_quantity()) and 'hidden' or ''">
+          <a href="/shop/mycart/">
+              <i class="fa fa-shopping-cart"></i>
+              My cart <sup t-attf-class="my_cart_quantity label label-primary"
+                            t-esc="website_sale_order and website_sale_order.get_total_quantity() or ''"/>
           </a>
-      </div>
+      </li>
+  </xpath>
+</template>
+
+<!-- List of categories -->
+
+<template id="categories_recursive" name="Category list">
+  <li t-att-class="str(category.id) == search.get('category') and 'active' or ''">
+      <a t-href="/shop/category/#{ slug(category) }/" t-field="category.name"></a>
+      <ul t-if="category.child_id" class="nav nav-pills nav-stacked nav-hierarchy">
+          <t t-foreach="category.child_id" t-as="category">
+              <t t-call="website_sale.categories_recursive"/>
+          </t>
+      </ul>
+  </li>
+</template>
+
+<!-- Product list -->
+
+<template id="search" name="Search hidden fields">
+  <input type="hidden" name="category" t-att-value="search.get('category') or ''"/>
+  <input type="hidden" name="filters" t-att-value="search.get('filters') or ''"/>
+  <div class="input-group">
+    <input type="text" name="search" class="search-query form-control" placeholder="Search..." t-att-value="search.get('search') or ''"/>
+    <span class="input-group-btn">
+      <button class="btn btn-default" type="submit"><i class="fa fa-search"/></button>
+    </span>
+  </div>
+</template>
+
+<template id="products_cart" name="Shopping cart">
+  <div class="ribbon-wrapper">
+    <div class="ribbon btn btn-danger">Promo</div>
+  </div>
+  <div class="oe_product_image">
+      <a t-href="/shop/product/#{ slug(product) }/" t-keep-query="category,search,filters">
+          <span t-field="product.image" t-field-options='{"widget": "image"}'/>
+      </a>
+  </div>
+  <section>
+      <h5><strong><a t-href="/shop/product/#{ slug(product) }/" t-keep-query="category,search,filters" t-field="product.name"/></strong></h5>
       <div class="product_price" t-if="product.product_variant_ids">
           <b>
               <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
@@ -65,899 +75,917 @@
                }'/>
           </b>
       </div>
-      <div class="oe_product_image text-center">
-          <a t-href="/shop/product/#{ product.id }/" t-keep-query="category,search,filter_domain">
-              <span t-field="product.image" t-field-options='{"widget": "image"}'/>
-          </a>
-      </div>
-    </template>
-
-    <template id="products" name="Products">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
-                <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="additional_title">Shop</t>
-            <div id="wrap">
-              <div class="oe_structure"/>
-              <div class="container oe_website_sale">
-                <div class="row">
-                    <div class="col-sm-8 products_pager">
-                        <t t-call="website.pager">
-                            <t t-set="classname">pull-right</t>
-                            <t t-set="style">padding-left: 5px;</t>
-                        </t>
-                        <form action="/shop/" method="get" class="pull-right pagination form-inline" style="padding-right: 5px;">
-                            <t t-call="website_sale.search" />
-                        </form>
-                    </div>
-                </div>
-
-                <div class='style_default row'>
-                  <div class="hidden" id="products_grid_before"></div>
-                  <div class="col-md-12" id="products_grid">
-                    <table width="100%">
-                      <tbody>
-                        <tr t-foreach="bins" t-as="tr_product">
-                          <t t-foreach="tr_product" t-as="td_product">
-                            <t t-if="td_product">
-                            <t t-set="product" t-value="td_product['product']"/>
-                            <td t-att-colspan="td_product['x']"
-                                t-attf-width="#{td_product['x']*25}%"
-                                t-att-rowspan="td_product['y']"
-                                t-attf-class="oe_product oe-height-#{td_product['y']*2} #{ td_product['class'] }">
-
-                                <div class="oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
-
-                                  <div class="css_options" t-ignore="true" t-if="editable">
-                                    <div t-attf-class="dropdown js_options" t-att-data-id="product.id">
-                                      <a class="btn btn-default" t-att-id="'dopprod-%s' % product.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></a>
-                                      <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % product.id">
-                                        <li class='dropdown-submenu'>
-                                          <a tabindex="-1" href="#">Size</a>
-                                          <ul class="dropdown-menu" name="size">
-                                            <li><a href="#">
-                                              <table>
-                                                <tr>
-                                                  <td class="selected"></td>
-                                                  <td t-att-class="product.website_size_x > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_x > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_x > 3 and 'selected'"></td>
-                                                </tr>
-                                                <tr>
-                                                  <td t-att-class="product.website_size_y > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 1 and product.website_size_x > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 1 and product.website_size_x > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 1 and product.website_size_x > 3 and 'selected'"></td>
-                                                </tr>
-                                                <tr>
-                                                  <td t-att-class="product.website_size_y > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 2 and product.website_size_x > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 2 and product.website_size_x > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 2 and product.website_size_x > 3 and 'selected'"></td>
-                                                </tr>
-                                                <tr>
-                                                  <td t-att-class="product.website_size_y > 3 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 3 and product.website_size_x > 1 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 3 and product.website_size_x > 2 and 'selected'"></td>
-                                                  <td t-att-class="product.website_size_y > 3 and product.website_size_x > 3 and 'selected'"></td>
-                                                </tr>
-                                              </table>
-                                            </a></li>
-                                          </ul>
-                                        </li>
-                                        <li class='dropdown-submenu'>
-                                          <a tabindex="-1" href="#">Styles</a>
-                                          <ul class="dropdown-menu" name="style">
-                                            <t t-foreach="styles" t-as="style">
-                                              <li t-att-class="style_in_product(style, product) and 'active' or ''"><a href="#" t-att-data-id="style.id" t-att-data-class="style.html_class"><t t-esc="style.name"/></a></li>
-                                            </t>
-                                          </ul>
-                                        </li>
+  </section>
+</template>
+
+<template id="products" name="Products">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js"></script>
+          <link rel='stylesheet' href="/web/static/lib/jquery.ui/css/smoothness/jquery-ui-1.9.1.custom.css"/>
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <t t-raw="head or ''"/>
+      </t>
+      <t t-set="additional_title">Shop</t>
+      <div id="wrap">
+        <div class="oe_structure"/>
+        <div class="container oe_website_sale">
+          <div class="products_pager">
+            <div>
+              <form action="/shop/" method="get" class="pagination form-inline col-md-3">
+                  <t t-call="website_sale.search" />
+              </form>
+              <t t-call="website.pager"/>
+            </div>
+          </div>
+          <div class='row'>
+            <div class="hidden" id="products_grid_before"></div>
+            <div class="col-md-12" id="products_grid">
+              <table width="100%">
+                <tbody>
+                  <tr t-ignore="true">
+                    <td t-foreach="range(0,rows)" t-as="row" t-attf-width="#{100/rows}%"></td>
+                  </tr>
+                  <tr t-foreach="bins" t-as="tr_product">
+                    <t t-foreach="tr_product" t-as="td_product">
+                      <t t-if="td_product">
+                      <t t-set="product" t-value="td_product['product']"/>
+                      <td t-att-colspan="td_product['x'] != 1 and td_product['x']"
+                          t-att-rowspan="td_product['y'] != 1 and td_product['y']"
+                          t-attf-class="oe_product oe_grid oe-height-#{td_product['y']*2} #{ td_product['class'] }">
+
+                          <div class="oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
+
+                            <div class="css_options" t-ignore="true" groups="base.group_website_publisher">
+                              <div t-attf-class="dropdown js_options" t-att-data-id="product.id">
+                                <a class="btn btn-default" t-att-id="'dopprod-%s' % product.id" role="button" data-toggle="dropdown">Options <span class="caret"></span></a>
+                                <ul class="dropdown-menu" role="menu" t-att-aria-labelledby="'dopprod-%s' % product.id">
+                                  <li class='dropdown-submenu'>
+                                    <a tabindex="-1" href="#">Size</a>
+                                    <ul class="dropdown-menu" name="size">
+                                      <li><a href="#">
+                                        <table>
+                                          <tr>
+                                            <td class="selected"></td>
+                                            <td t-att-class="product.website_size_x > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_x > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_x > 3 and 'selected'"></td>
+                                          </tr>
+                                          <tr>
+                                            <td t-att-class="product.website_size_y > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 1 and product.website_size_x > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 1 and product.website_size_x > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 1 and product.website_size_x > 3 and 'selected'"></td>
+                                          </tr>
+                                          <tr>
+                                            <td t-att-class="product.website_size_y > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 2 and product.website_size_x > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 2 and product.website_size_x > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 2 and product.website_size_x > 3 and 'selected'"></td>
+                                          </tr>
+                                          <tr>
+                                            <td t-att-class="product.website_size_y > 3 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 3 and product.website_size_x > 1 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 3 and product.website_size_x > 2 and 'selected'"></td>
+                                            <td t-att-class="product.website_size_y > 3 and product.website_size_x > 3 and 'selected'"></td>
+                                          </tr>
+                                        </table>
+                                      </a></li>
+                                    </ul>
+                                  </li>
+                                  <li class='dropdown-submenu'>
+                                    <a tabindex="-1" href="#">Styles</a>
+                                    <ul class="dropdown-menu" name="style">
+                                      <t t-foreach="styles" t-as="style">
+                                        <li t-att-class="style_in_product(style, product) and 'active' or ''"><a href="#" t-att-data-id="style.id" t-att-data-class="style.html_class"><t t-esc="style.name"/></a></li>
+                                      </t>
+                                    </ul>
+                                  </li>
+                                  <li class='dropdown-submenu'>
+                                      <a tabindex="-1" href="#">Promote</a>
+                                      <ul class="dropdown-menu" name="sequence">
+                                          <li><a href="#" class="js_go_to_top">Push to top</a></li>
+                                          <li><a href="#" class="js_go_to_bottom">Push to bottom</a></li>
                                       </ul>
-                                    </div>
-                                  </div>
+                                  </li>
+                                </ul>
+                              </div>
+                            </div>
 
-                                  <t t-call="website_sale.products_cart"/>
-                                </div>
+                            <t t-call="website_sale.products_cart"/>
+                          </div>
 
-                            </td>
-                            </t>
-                            <td t-if="td_product == None"/>
-                          </t>
-                        </tr>
-                      </tbody>
-                    </table>
-                    <t t-if="not bins">
-                      <h3 class="text-center text-muted">No product found for this search</h3>
-                    </t>
-                  </div>
-                </div>
-                <div class="products_pager">
-                    <t t-call="website.pager">
-                        <t t-set="classname">pull-right</t>
+                      </td>
+                      </t>
+                      <td t-if="td_product == None"/>
                     </t>
+                  </tr>
+                </tbody>
+              </table>
+              <t t-if="not bins">
+                <div class="text-center text-muted">
+                  <h3>No product found</h3>
+                  <t groups="base.group_website_publisher">
+                    <p>Click on "Content" to define a new product or "Help" for more informations.</p>
+                    <img src="/website/static/src/img/content_here.png"/>
+                    <p>In the backend's product form contains information to simplify the sale process: price, notes in the quotation, accounting data, procurement methods, etc.</p>
+                  </t>
                 </div>
-              </div>
-              <div class="oe_structure mb32"/>
+              </t>
             </div>
-        </t>
-    </template>
-
-    <!-- Product Description-->
-
-    <template id="product_description" inherit_option_id="website_sale.products_cart" name="Product Description">
-        <xpath expr="//div[@class='oe_product_description']" position="inside">
-            <p class="text-muted oe_subdescription">
-                <span t-field="product.description_sale"/>
-            </p>
-        </xpath>
-    </template>
-
-    <!-- Add to cart button-->
-
-    <template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
-        <xpath expr="//div[@class='product_price']" position="inside">
-            <a t-href="/shop/add_cart/#{ product.product_variant_ids[0].id }/" class="js_add_cart_json">
-                <span class="fa fa-shopping-cart"/>
-            </a>
-        </xpath>
-    </template>
-
-    <!-- List view of products -->
-
-    <template id="list_view" inherit_option_id="website_sale.products" name="List View">
-        <xpath expr="//div[@id='products_grid']//table" position="replace">
-          <div class="row">
-            <t t-foreach="products" t-as="product">
-              <div class="col-md-12 oe_list_products oe-height-1">
-                <t t-call="website_sale.products_cart"/>
+          </div>
+          <div class="products_pager">
+              <t t-call="website.pager"/>
+          </div>
+        </div>
+        <div class="oe_structure mb32"/>
+      </div>
+  </t>
+</template>
+
+<!-- Product Description-->
+
+<template id="product_description" inherit_option_id="website_sale.products_cart" name="Product Description">
+  <xpath expr="//div[@class='product_price']" position="before">
+      <div class="text-info oe_subdescription oe_shadow" t-field="product.description_sale"/>
+      <div class="text-info oe_subdescription" t-field="product.description_sale"/>
+  </xpath>
+</template>
+
+<!-- Add to cart button-->
+
+<template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
+  <xpath expr="//div[@class='product_price']" position="inside">
+      <a t-href="/shop/add_cart/#{ product.product_variant_ids[0].id }/"><!-- class="js_add_cart_json" -->
+          <span class="fa fa-shopping-cart"/>
+      </a>
+  </xpath>
+</template>
+
+<!-- List view of products -->
+
+<template id="list_view" inherit_option_id="website_sale.products" name="List View">
+  <xpath expr="//div[@id='products_grid']//table" position="replace">
+    <t t-foreach="products" t-as="product">
+      <div class="oe_product oe_list oe_product_cart" t-att-data-publish="product.website_published and 'on' or 'off'">
+        <t t-call="website_sale.products_cart"/>
+      </div>
+    </t>
+  </xpath>
+</template>
+
+
+<!-- product -->
+<template id="404">
+  <t t-call="website.layout">
+      <div id="wrap">
+          <div class="oe_structure oe_empty">
+              <div class="container">
+                  <h1 class="mt32">Product not found!</h1>
+                  <p>Sorry, this product is not available anymore.</p>
+                  <p><a t-href="/shop/">Return to the product list.</a></p>
               </div>
-            </t>
           </div>
-        </xpath>
-    </template>
-
-
-    <!-- product -->
-
-    <template id="product" name="Product">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-            </t>
-            <t t-set="additional_title" t-value="product.name"/>
-            <div id="wrap">
-
-              <section class="container mt8">
-                <div class="row">
-                  <div class="col-sm-5">
-                      <ol class="breadcrumb">
-                          <li><a href="/shop">Products</a></li>
-                          <li t-if="search.get('category')"><a t-href="/shop/" t-keep-query="category,search,filter_domain"><span t-field="category.name"/></a></li>
-                          <li class="active"><span t-field="product.name"/></li>
-                      </ol>
-                  </div><div class="col-sm-3">
-                      <t t-call="website.publish_management">
-                        <t t-set="object" t-value="product"/>
-                        <t t-set="publish_edit" t-value="True"/>
-                        <li class='dropdown-submenu'>
-                            <a tabindex="-1" href="#">Promote</a>
-                            <ul class="dropdown-menu" name="sequence">
-                                <li><a href="#" class="js_go_to_top">Push to top</a></li>
-                                <li><a href="#" class="js_go_to_bottom">Push to bottom</a></li>
-                            </ul>
-                        </li>
-                      </t>
-                  </div><div class="col-sm-3 col-sm-offset-1">
-                        <form action="/shop/" method="get" class="pull-right">
-                            <t t-call="website_sale.search" />
-                        </form>
-                  </div>
-                </div>
-              </section>
-
-              <section class="container oe_website_sale mb16" id="product_detail">
-                <div class="row">
-                  <div class="col-sm-7 col-md-7 col-lg-7">
-                      <span t-field="product.image" style="max-height: 500px" t-field-options='{"widget": "image", "class": "img img-responsive"}'/>
-                  </div><div class="col-sm-5 col-md-5 col-lg-4 col-lg-offset-1">
-                      <h1 t-field="product.name">Product Name</h1>
-
-                      <form action="/shop/add_cart/" class="js_add_cart_json" method="POST">
-                          <input type="hidden" t-if="len(product.product_variant_ids) == 1" name="product_id" t-att-value="product.product_variant_ids[0].id"/>
-                          <t t-if="len(product.product_variant_ids) &gt; 1">
-                              <label label-default="label-default" class="radio" t-foreach="product.product_variant_ids" t-as="variant_id">
-                                  <input type="radio" name="product_id" t-att-value="variant_id.id" t-att-checked="variant_id == product.product_variant_ids[0] or None"/>
-                                  <t t-esc="variant_id.variants or ''">Standard</t>
-                                  <span class="badge" t-if="variant_id.price_extra">
-                                      <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" t-field-options='{
-                                                   "widget": "monetary",
-                                                   "display_currency": "website.pricelist_id.currency_id"
-                                               }'/>
-                                  </span>
-                              </label>
-                              <br/>
-                          </t>
-
-                          <div class="product_price mt16" t-if="product.product_variant_ids">
-                              <h4>
-                                  <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
-                                  <span class="text-danger" style="text-decoration: line-through;"
-                                    t-field="product.product_variant_ids[0].lst_price"
-                                    t-field-options='{
-                                       "widget": "monetary",
-                                       "display_currency": "website.pricelist_id.currency_id"
-                                   }'/><br/>
-                                  </t>
-                                  <b class="oe_price"
-                                    t-field="product.product_variant_ids[0].price"
-                                    t-field-options='{
-                                       "widget": "monetary",
-                                       "display_currency": "website.pricelist_id.currency_id"
-                                   }'/>
-                              </h4>
-                          </div>
-                          <button class="btn btn-primary btn-lg mt8">Add to Cart</button>
-                          <hr t-if="product.description_sale"/>
-                          <p t-field="product.description_sale" class="text-muted"/>
-                          <hr/>
-                          <p class="text-muted">
-                              30-day money-back guarantee<br/>
-                              Free Shipping in U.S.<br/>
-                              Buy now, get in 2 days
-                          </p>
-                      </form>
-                  </div>
-                </div>
-              </section>
-              <div t-field="product.website_description" class="oe_structure" id="product_full_description"/>
+      </div>
+  </t>
+</template>
+
+<template id="product" name="Product">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+      </t>
+      <t t-set="additional_title" t-value="product.name"/>
+      <div id="wrap">
+
+        <section class="container mt8">
+          <div class="row">
+            <div class="col-sm-4">
+                <ol class="breadcrumb">
+                    <li><a href="/shop">Products</a></li>
+                    <li t-if="search.get('category')"><a t-href="/shop/" t-keep-query="category,search,filters"><span t-field="category.name"/></a></li>
+                    <li class="active"><span t-field="product.name"/></li>
+                </ol>
             </div>
-        </t>
-    </template>
-
-    <template id="recommended_products" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Recommended Products">
-        <xpath expr="//div[@id='product_full_description']" position="after">
-            <div class="container mt32" t-if="product.recommended_products()">
-                <h3>Customers who have bought this product also bought:</h3>
-                <div class='row mt16' style="margin-left: 15px !important;">
-                <t t-foreach="product.recommended_products()" t-as="product">
-                    <div class='col-md-2 thumbnail' style='width: 170px; margin-right: 16px;'>
-                        <div class='mt16 text-center'>
-                            <span t-field="product.image_small"/>
-                            <h5>
-                                <a t-href="/shop/product/#{ slug(product) }/"
-                                   style="display: block">
-                                    <span t-field='product.name'
-                                          style="display: block"/>
-                                </a>
-                            </h5>
-                        </div>
-                    </div>
-                </t>
-                </div>
+            <div class="col-sm-3">
+              <form action="/shop/" method="get" class="pull-right">
+                  <t t-call="website_sale.search" />
+              </form>
             </div>
-        </xpath>
-    </template>
-
-    <template id="product_attributes" inherit_option_id="website_sale.product" name="Product Attributes">
-      <xpath expr="//p[@t-field='product.description_sale']" position="after">
-        <hr t-if="product.website_attribute_ids"/>
-        <p class="text-muted">
-          <t t-set="attr" t-value="None"/>
-          <t t-foreach="product.website_attribute_ids" t-as="attribute"><br t-if="attr and attribute.attribute_id.id != attr"/><t t-if="attribute.attribute_id.id != attr"><span t-field="attribute.attribute_id"/>: </t><t t-if="attribute.attribute_id.id == attr">, </t><t t-if="attribute.attribute_id.type == 'distinct'"><span t-field="attribute.value_id"/></t><t t-if="attribute.attribute_id.type == 'float'"><span t-field="attribute.value"/></t><t t-set="attr" t-value="attribute.attribute_id.id"/></t>
-        </p>
-      </xpath>
-    </template>
-
-    <!-- Page Shop my cart -->
-
-    <template id="mycart" name="Your Cart">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-                <t t-raw="head or ''"/>
-            </t>
-            <div id="wrap">
-              <div class="container oe_website_sale">
-
-                <ul class="wizard pull-right">
-                    <li class="text-primary">Review Order<span class="chevron"></span></li>
-                    <li class="text-muted">Shipping &amp; Billing<span class="chevron"></span></li>
-                    <li class="text-muted">Payment<span class="chevron"></span></li>
-                    <li class="text-muted">Confirmation<span class="chevron"></span></li>
-                </ul>
-                <h1 class="mb32">Shopping Cart</h1>
-                <div class="row">
-                    <div class="col-md-8 col-sm-9 oe_mycart">
-                        <div t-if="not website_sale_order or not website_sale_order.order_line" class="well well-lg">
-                            Your cart is empty!
-                        </div>
-                        <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.order_line">
-                            <colgroup>
-                                <col width="80"/>
-                                <col/>
-                                <col width="100"/>
-                                <col width="120"/>
-                            </colgroup>
-                            <thead>
-                                <tr>
-                                    <th colspan="2">Product</th>
-                                    <th>Price</th>
-                                    <th>Quantity</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <tr t-foreach="website_sale_order.order_line" t-as="line">
-                                    <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
-                                    <td t-if="line.product_id.product_tmpl_id">
-                                        <span t-field="line.product_id.image_small"
-                                              t-field-options='{"widget": "image", "class": "img-rounded"}'/>
-                                    </td>
-                                    <td t-if="line.product_id.product_tmpl_id">
-                                        <div>
-                                            <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
-                                                <strong t-field="line.product_id.name"/>
-                                                <t t-if="line.product_id.variants">(<t t-esc="line.product_id.variants"/>)</t>
-                                            </a>
-                                        </div>
-                                        <div class="text-muted" t-field="line.product_id.description_sale"/>
-                                    </td>
-                                    <td class="text-center">
-                                       <del class="text-danger" t-if="line.product_id.lst_price &gt; line.price_unit">
-                                           <span t-field="line.product_id.lst_price" t-field-options='{
-                                               "widget": "monetary",
-                                               "display_currency": "website.pricelist_id.currency_id"
-                                           }'/>
-                                       </del>
-                                       <span t-field="line.price_unit" t-field-options='{
-                                           "widget": "monetary",
-                                           "display_currency": "website.pricelist_id.currency_id"
-                                       }'/>
-                                    </td>
-                                    <td>
-                                        <div class="input-group">
-                                            <span class="input-group-addon">
-                                                <a t-href="./change_cart/#{ line.id }/?remove=True" class="mb8 js_add_cart_json">
-                                                    <i class="fa fa-minus-square"></i>
-                                                </a>
-                                            </span>
-                                            <input type="text" class="js_quantity form-control"
-                                                t-att-data-id="line.id" t-att-value="int(line.product_uom_qty)"/>
-                                            <span class="input-group-addon">
-                                                <a t-href="./change_cart/#{ line.id }/" class="mb8 float_left js_add_cart_json">
-                                                    <i class="fa fa-plus-square"></i>
-                                                </a>
-                                            </span>
-                                        </div>
-
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <table class='pull-right mb16' id="mycart_total" t-if="website_sale_order">
-                            <colgroup>
-                                <col width="100"/>
-                                <col width="120"/>
-                            </colgroup>
-                            <thead>
-                                <tr style="border-top: 1px solid #000">
-                                    <th><h3>Total:</h3></th>
-                                    <th class="text-right">
-                                      <h3><t t-call="website_sale.total"/></h3>
-                                    </th>
-                                </tr>
-                                <tr class="text-muted">
-                                    <td><abbr title="Taxes may be updated after providing shipping address">Incl. Taxes:</abbr></td>
-                                    <td class="text-right">
-                                        <span t-field="website_sale_order.amount_tax" t-field-options='{
-                                            "widget": "monetary",
-                                            "display_currency": "website.pricelist_id.currency_id"
-                                        }'/>
-                                    </td>
-                                </tr>
-                            </thead>
-                        </table>
-                        <div class="clearfix"/>
-                        <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
-                        <a t-if="website_sale_order and website_sale_order.order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
-                        <div class="oe_structure"/>
-                    </div>
-                    <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
-                        <h4>Policies</h4>
-                        <ul class="list-unstyled mb32">
-                            <li>&#9745; 30-days money-back guarantee</li>
-                            <li>&#9745; Invoice sent by e-Mail</li>
-                        </ul>
-                        <h4>Secure Payment</h4>
-                        <ul class="list-unstyled mb32">
-                            <li>&#9745; 256 bit encryption</li>
-                            <li>&#9745; Processed by Ogone</li>
-                        </ul>
-                    </div>
-                </div>
-
-              </div>
-              <div class="oe_structure"/>
+            <div class="col-sm-4">
+                <t t-call="website.publish_management">
+                  <t t-set="object" t-value="product"/>
+                  <t t-set="publish_edit" t-value="True"/>
+                </t>
             </div>
-        </t>
-    </template>
-
-    <!-- Page Shop -->
+          </div>
+        </section>
 
-    <template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
-        <xpath expr="//div[@id='products_grid_before']" position="inside">
-            <ul class="nav nav-pills nav-stacked mt16">
-                <li t-att-class=" '' if search.get('category') else 'active' "><a href="/shop/">All Products</a></li>
-                <t t-foreach="categories" t-as="category">
-                    <t t-call="website_sale.categories_recursive"/>
-                </t>
-            </ul>
-        </xpath>
-        <xpath expr="//div[@id='products_grid_before']" position="attributes">
-            <attribute name="class">col-md-3</attribute>
-        </xpath>
-        <xpath expr="//div[@id='products_grid']" position="attributes">
-            <attribute name="class">col-md-9</attribute>
-        </xpath>
-    </template>
-
-    <template id="products_attributes" inherit_option_id="website_sale.products" name="Product Filters and Attributes">
-        <xpath expr="//div[@id='products_grid_before']" position="inside">
-            <form t-action="/shop/filter/" method="post" t-keep-query="category,search">
-                <ul class="nav nav-pills nav-stacked mt16">
-                    <t t-set="attribute_ids" t-value="Ecommerce.get_attribute_ids()"/>
-                    <t t-foreach="attribute_ids" t-as="attribute_id">
-                      <t t-if="attribute_id.visible">
-                        <li t-if="attribute_id.value_ids and attribute_id.type == 'distinct'">
-                            <div t-field="attribute_id.name"/>
-                            <ul class="nav nav-pills nav-stacked">
-                                <t t-foreach="attribute_id.value_ids" t-as="value_id">
-                                    <li t-att-class="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'active' or ''">
-                                        <label style="margin: 0 20px;">
-                                            <input type="checkbox" t-att-name="'att-%s-%s' % (attribute_id.id, value_id.id)"
-                                                t-att-checked="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'checked' or ''"/>
-                                            <span style="font-weight: normal" t-field="value_id.name"/>
-                                        </label>
-                                    </li>
-                                </t>
-                            </ul>
-                        </li>
-                        <li t-if="attribute_id.type == 'float' and attribute_id.float_min != attribute_id.float_max">
-                            <div t-field="attribute_id.name"/>
-                            <t t-set="attribute" t-value="Ecommerce.has_search_filter(attribute_id.id)"/>
-                            <div style="margin: 0 20px;" class="js_slider"
-                              t-att-data-id="attribute_id.id"
-                              t-att-data-value-min="attribute and attribute[1][0] or attribute_id.float_min"
-                              t-att-data-value-max="attribute and attribute[1][1] or attribute_id.float_max"
-                              t-att-data-min="attribute_id.float_min"
-                              t-att-data-max="attribute_id.float_max"></div>
-                        </li>
-                      </t>
+        <section class="container oe_website_sale" id="product_detail">
+          <div class="row">
+            <div class="col-sm-7 col-md-7 col-lg-7">
+                <span t-field="product.image" t-field-options='{"widget": "image", "class": "product_detail_img"}'/>
+            </div><div class="col-sm-5 col-md-5 col-lg-4 col-lg-offset-1">
+                <h1 t-field="product.name">Product Name</h1>
+
+                <form action="/shop/add_cart/" class="js_add_cart_json" method="POST">
+                    <input type="hidden" t-if="len(product.product_variant_ids) == 1" name="product_id" t-att-value="product.product_variant_ids[0].id"/>
+                    <t t-if="len(product.product_variant_ids) &gt; 1">
+                        <label label-default="label-default" class="radio" t-foreach="product.product_variant_ids" t-as="variant_id">
+                            <input type="radio" name="product_id" t-att-value="variant_id.id" t-att-checked="variant_id == product.product_variant_ids[0] or None"/>
+                            <t t-esc="variant_id.variants or ''">Standard</t>
+                            <span class="badge" t-if="variant_id.price_extra">
+                                <t t-esc="variant_id.price_extra > 0 and '+' or ''"/><span t-field="variant_id.price_extra" t-field-options='{
+                                             "widget": "monetary",
+                                             "display_currency": "website.pricelist_id.currency_id"
+                                         }'/>
+                            </span>
+                        </label>
                     </t>
-                </ul>
-                <button class="btn btn-xs btn-primary mt16">Apply filter</button>
-                <a t-href="/shop/" t-keep-query="category,search,add_filter" class="btn btn-xs btn-default mt16">Cancel filter</a>
-            </form>
-        </xpath>
-        <xpath expr="//div[@id='products_grid_before']" position="attributes">
-            <attribute name="class">col-md-3</attribute>
-        </xpath>
-        <xpath expr="//div[@id='products_grid']" position="attributes">
-            <attribute name="class">col-md-9</attribute>
-        </xpath>
-    </template>
-
-    <template id="suggested_products_list" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Suggested Products in my cart">
-        <xpath expr="//table[@id='mycart_products']" position="after">
-            <table t-if="suggested_products" class='table table-striped table-condensed'>
-                <colgroup>
-                    <col width="80"/>
-                    <col/>
-                    <col width="100"/>
-                    <col width="120"/>
-                </colgroup>
-                <thead>
-                    <tr>
-                        <th colspan="2">Suggested products</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr t-foreach="suggested_products" t-as="product">
-
-                        <td>
-                            <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
-                                <span t-field="product.image_small"
-                                      t-field-options='{"widget": "image", "class": "img-rounded"}'/>
-                            </a>
-                        </td>
-                        <td>
-                            <div>
-                                <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
-                                    <strong t-field="product.name"/>
-                                </a>
-                            </div>
-                            <div class="text-muted" t-field="product.description_sale"/>
-                        </td>
-                        <td>
-                            <span t-field="product.lst_price" t-field-options='{
-                                "widget": "monetary",
-                                "display_currency": "website.pricelist_id.currency_id"
-                            }'/>
-                        </td>
-                        <td class="text-center">
-                            <a t-href="./add_cart/#{ product.id }/"><strong>Add to Cart</strong></a>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </xpath>
-    </template>
-
-    <template id="reduction_code" inherit_option_id="website_sale.mycart" name="Reduction Code">
-        <xpath expr="//div[@id='right_column']" position="inside">
-            <h4>Coupon Code</h4>
-            <p>
-                Have a coupon code? Fill in this field and apply.
-            </p>
-            <form t-if="website_sale_order and website_sale_order.order_line" action="/shop/mycart/" method="post" class="mb32">
-                <div class="input-group">
-                    <input name="promo" class='form-control' type="text" placeholder="code..." t-att-value="website_sale_order.pricelist_id.code or ''"/>
-                    <div class="input-group-btn">
-                        <button class="btn btn-default">Apply</button>
-                    </div>
-                </div>
-            </form>
-        </xpath>
-    </template>
 
-
-    <!-- Page confirm my cart -->
-
-    <template id="checkout">
-        <t t-call="website.layout">
-          <t t-set="head">
-              <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-              <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-              <t t-raw="head or ''"/>
+                    <div class="product_price mt16" t-if="product.product_variant_ids">
+                        <h4>
+                            <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
+                            <span class="text-danger" style="text-decoration: line-through;"
+                              t-field="product.product_variant_ids[0].lst_price"
+                              t-field-options='{
+                                 "widget": "monetary",
+                                 "display_currency": "website.pricelist_id.currency_id"
+                             }'/><br/>
+                            </t>
+                            <b class="oe_price"
+                              t-field="product.product_variant_ids[0].price"
+                              t-field-options='{
+                                 "widget": "monetary",
+                                 "display_currency": "website.pricelist_id.currency_id"
+                             }'/>
+                        </h4>
+                    </div>
+                    <button class="btn btn-primary btn-lg mt8">Add to Cart</button>
+                    <hr t-if="product.description_sale"/>
+                    <p t-field="product.description_sale" class="text-muted"/>
+                    <hr/>
+                    <p class="text-muted">
+                        30-day money-back guarantee<br/>
+                        Free Shipping in U.S.<br/>
+                        Buy now, get in 2 days
+                    </p>
+                </form>
+            </div>
+          </div>
+        </section>
+        <div t-field="product.website_description" class="oe_structure" id="product_full_description"/>
+      </div>
+  </t>
+</template>
+
+<template id="recommended_products" inherit_id="website_sale.product" inherit_option_id="website_sale.product" name="Recommended Products">
+  <xpath expr="//div[@id='product_full_description']" position="after">
+      <div class="container mt32" t-if="product.recommended_products()">
+          <h3>Customers who have bought this product also bought:</h3>
+          <div class='row mt16' style="margin-left: 15px !important;">
+          <t t-foreach="product.recommended_products()" t-as="product">
+              <div class='col-md-2 thumbnail' style='width: 170px; margin-right: 16px;'>
+                  <div class='mt16 text-center'>
+                      <span t-field="product.image_small"/>
+                      <h5>
+                          <a t-href="/shop/product/#{ slug(product) }/"
+                             style="display: block">
+                              <span t-field='product.name'
+                                    style="display: block"/>
+                          </a>
+                      </h5>
+                  </div>
+              </div>
           </t>
-          <t t-set="additional_title">Shop - Checkout</t>
-          <div id="wrap">
-            <div class="container oe_website_sale">
-                <ul class="wizard pull-right">
-                    <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
-                    <li class="text-primary">Shipping &amp; Billing<span class="chevron"></span></li>
-                    <li class="text-muted">Payment<span class="chevron"></span></li>
-                    <li class="text-muted">Confirmation<span class="chevron"></span></li>
-                </ul>
-                <h1>Your Address</h1>
-                <form action="/shop/confirm_order/" method="post">
-
-                <div class="row">
-                <div class="col-md-8 oe_mycart">
-                    <h3 class="page-header mt16">Billing Information
-                        <small t-if="user_id.id == website.public_user.id"> or
-                            <a t-if="not partner" t-attf-href="/web#action=redirect&amp;url=#{ request.httprequest.url }">sign in</a>
-                        </small>
-                    </h3>
-                        <div class="row">
-                            <div t-attf-class="form-group #{error.get('name') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Your Name</label>
-                                <input type="text" name="name" class="form-control" t-att-value="checkout.get('name')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('company') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="company" style="font-weight: normal">Your Company</label>
-                                <input type="text" name="company" class="form-control" t-att-value="checkout.get('company')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('email') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Email</label>
-                                <input type="email" name="email" class="form-control" t-att-value="checkout.get('email')"/>
-                            </div>
-                            <div t-attf-class="form-group #{ error.get('phone') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="phone">Phone</label>
-                                <input type="tel" name="phone" class="form-control" t-att-value="checkout.get('phone')"/>
-                            </div>
+          </div>
+      </div>
+  </xpath>
+</template>
+
+<template id="product_attributes" inherit_option_id="website_sale.product" name="Product Attributes">
+<xpath expr="//p[@t-field='product.description_sale']" position="after">
+  <hr t-if="product.website_attribute_ids"/>
+  <p class="text-muted">
+    <t t-set="attr" t-value="None"/>
+    <t t-foreach="product.website_attribute_ids" t-as="attribute"><br t-if="attr and attribute.attribute_id.id != attr"/><t t-if="attribute.attribute_id.id != attr"><span t-field="attribute.attribute_id"/>: </t><t t-if="attribute.attribute_id.id == attr">, </t><t t-if="attribute.attribute_id.type == 'distinct'"><span t-field="attribute.value_id"/></t><t t-if="attribute.attribute_id.type == 'float'"><span t-field="attribute.value"/></t><t t-set="attr" t-value="attribute.attribute_id.id"/></t>
+  </p>
+</xpath>
+</template>
+
+<!-- Page Shop my cart -->
+
+<template id="mycart" name="Your Cart">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <t t-raw="head or ''"/>
+      </t>
+      <div id="wrap">
+        <div class="container oe_website_sale">
+
+          <ul class="wizard pull-right">
+              <li class="text-primary">Review Order<span class="chevron"></span></li>
+              <li class="text-muted">Shipping &amp; Billing<span class="chevron"></span></li>
+              <li class="text-muted">Payment<span class="chevron"></span></li>
+              <li class="text-muted">Confirmation<span class="chevron"></span></li>
+          </ul>
+          <h1 class="mb32">Shopping Cart</h1>
+          <div class="row">
+              <div class="col-md-8 col-sm-9 oe_mycart">
+                  <div t-if="not website_sale_order or not website_sale_order.order_line" class="well well-lg">
+                      Your cart is empty!
+                  </div>
+                  <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.order_line">
+                      <colgroup>
+                          <col width="100"/>
+                          <col/>
+                          <col width="100"/>
+                          <col width="120"/>
+                      </colgroup>
+                      <thead>
+                          <tr>
+                              <th colspan="2">Product</th>
+                              <th>Price</th>
+                              <th>Quantity</th>
+                          </tr>
+                      </thead>
+                      <tbody>
+                          <tr t-foreach="website_sale_order.order_line" t-as="line">
+                              <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
+                              <td align="center" t-if="line.product_id.product_tmpl_id">
+                                  <span t-field="line.product_id.image_small"
+                                        t-field-options='{"widget": "image", "class": "img-rounded"}'/>
+                              </td>
+                              <td t-if="line.product_id.product_tmpl_id">
+                                  <div>
+                                      <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
+                                          <strong t-field="line.product_id.name"/>
+                                          <t t-if="line.product_id.variants">(<t t-esc="line.product_id.variants"/>)</t>
+                                      </a>
+                                  </div>
+                                  <div class="text-muted" t-field="line.product_id.description_sale"/>
+                              </td>
+                              <td class="text-center">
+                                 <del class="text-danger" t-if="line.product_id.lst_price &gt; line.price_unit">
+                                     <span t-field="line.product_id.lst_price" t-field-options='{
+                                         "widget": "monetary",
+                                         "display_currency": "website.pricelist_id.currency_id"
+                                     }'/>
+                                 </del>
+                                 <span t-field="line.price_unit" t-field-options='{
+                                     "widget": "monetary",
+                                     "display_currency": "website.pricelist_id.currency_id"
+                                 }'/>
+                              </td>
+                              <td>
+                                  <div class="input-group">
+                                      <span class="input-group-addon">
+                                          <a t-href="./change_cart/#{ line.id }/?remove=True" class="mb8 js_add_cart_json">
+                                              <i class="fa fa-minus-square"></i>
+                                          </a>
+                                      </span>
+                                      <input type="text" class="js_quantity form-control"
+                                          t-att-data-id="line.id" t-att-value="int(line.product_uom_qty)"/>
+                                      <span class="input-group-addon">
+                                          <a t-href="./change_cart/#{ line.id }/" class="mb8 float_left js_add_cart_json">
+                                              <i class="fa fa-plus-square"></i>
+                                          </a>
+                                      </span>
+                                  </div>
 
-                            <div t-attf-class="form-group #{error.get('street') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="street">Street</label>
-                                <input type="text" name="street" class="form-control" t-att-value="checkout.get('street')"/>
-                            </div>
-                            <div class="clearfix"/>
+                              </td>
+                          </tr>
+                      </tbody>
+                  </table>
+                  <table class='pull-right mb16' id="mycart_total" t-if="website_sale_order">
+                      <colgroup>
+                          <col width="100"/>
+                          <col width="120"/>
+                      </colgroup>
+                      <thead>
+                          <tr style="border-top: 1px solid #000">
+                              <th><h3>Total:</h3></th>
+                              <th class="text-right">
+                                <h3><t t-call="website_sale.total"/></h3>
+                              </th>
+                          </tr>
+                          <tr class="text-muted">
+                              <td><abbr title="Taxes may be updated after providing shipping address">Taxes:</abbr></td>
+                              <td class="text-right">
+                                  <span t-field="website_sale_order.amount_tax" t-field-options='{
+                                      "widget": "monetary",
+                                      "display_currency": "website.pricelist_id.currency_id"
+                                  }'/>
+                              </td>
+                          </tr>
+                      </thead>
+                  </table>
+                  <div class="clearfix"/>
+                  <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
+                  <a t-if="website_sale_order and website_sale_order.order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
+                  <div class="oe_structure"/>
+              </div>
+              <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
+                  <h4>Policies</h4>
+                  <ul class="list-unstyled mb32">
+                      <li>&#9745; 30-days money-back guarantee</li>
+                      <li>&#9745; Invoice sent by e-Mail</li>
+                  </ul>
+                  <h4>Secure Payment</h4>
+                  <ul class="list-unstyled mb32">
+                      <li>&#9745; 256 bit encryption</li>
+                      <li>&#9745; Processed by Ogone</li>
+                  </ul>
+              </div>
+          </div>
 
-                            <div t-attf-class="form-group #{error.get('city') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="city">City</label>
-                                <input type="text" name="city" class="form-control" t-att-value="checkout.get('city')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('zip') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="zip">Zip / Postal Code</label>
-                                <input type="text" name="zip" class="form-control" t-att-value="checkout.get('zip')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('state_id') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="state_id" style="font-weight: normal">State / Province</label>
-                                <select name="state_id" class="form-control">
-                                    <option value="">select...</option>
-                                    <t t-foreach="states or []" t-as="state">
-                                        <option t-att-value="state.id" t-att-selected="state.id == checkout.get('state_id')"><t t-esc="state.name"/></option>
-                                    </t>
-                                </select>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('country_id') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Country</label>
-                                <select name="country_id" class="form-control">
-                                    <option value="">Country...</option>
-                                    <t t-foreach="countries or []" t-as="country">
-                                        <option t-att-value="country.id" t-att-selected="country.id == checkout.get('country_id')"><t t-esc="country.name"/></option>
-                                    </t>
-                                </select>
-                            </div>
+        </div>
+        <div class="oe_structure"/>
+      </div>
+  </t>
+</template>
 
-                            <div class="clearfix"/>
+<!-- Page Shop -->
 
-                            <div class="form-group col-lg-6">
-                                <label>
-                                    <input t-if="not shipping" type="checkbox" name="shipping_different"/>
-                                    <input t-if="shipping" type="checkbox" name="shipping_different" checked="1"/>
-                                    Ship to a different address
-                                </label>
-                            </div>
-                        </div>
+<template id="products_categories" inherit_option_id="website_sale.products" name="Product Categories">
+  <xpath expr="//div[@id='products_grid_before']" position="inside">
+      <ul class="nav nav-pills nav-stacked mt16">
+          <li t-att-class=" '' if search.get('category') else 'active' "><a href="/shop/">All Products</a></li>
+          <t t-foreach="categories" t-as="category">
+              <t t-call="website_sale.categories_recursive"/>
+          </t>
+      </ul>
+  </xpath>
+  <xpath expr="//div[@id='products_grid_before']" position="attributes">
+      <attribute name="class">col-md-3 hidden-xs</attribute>
+  </xpath>
+  <xpath expr="//div[@id='products_grid']" position="attributes">
+      <attribute name="class">col-md-9</attribute>
+  </xpath>
+</template>
+
+<template id="products_attributes" inherit_option_id="website_sale.products" name="Product Filters and Attributes">
+  <xpath expr="//div[@id='products_grid_before']" position="inside">
+      <form t-action="/shop/filters/" method="post" t-keep-query="category,search">
+          <ul class="nav nav-pills nav-stacked mt16">
+              <t t-set="attribute_ids" t-value="Ecommerce.get_attribute_ids()"/>
+              <t t-foreach="attribute_ids" t-as="attribute_id">
+                <t t-if="attribute_id.visible">
+                  <li t-if="attribute_id.value_ids and attribute_id.type == 'distinct'">
+                      <div t-field="attribute_id.name"/>
+                      <ul class="nav nav-pills nav-stacked">
+                          <t t-foreach="attribute_id.value_ids" t-as="value_id">
+                              <li t-att-class="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'active' or ''">
+                                  <label style="margin: 0 20px;">
+                                      <input type="checkbox" t-att-name="'att-%s-%s' % (attribute_id.id, value_id.id)"
+                                          t-att-checked="Ecommerce.has_search_filter(attribute_id.id, value_id.id) and 'checked' or ''"/>
+                                      <span style="font-weight: normal" t-field="value_id.name"/>
+                                  </label>
+                              </li>
+                          </t>
+                      </ul>
+                  </li>
+                  <li t-if="attribute_id.type == 'float' and attribute_id.float_min != attribute_id.float_max">
+                      <div t-field="attribute_id.name"/>
+                      <t t-set="attribute" t-value="Ecommerce.has_search_filter(attribute_id.id)"/>
+                      <div style="margin: 0 20px;" class="js_slider"
+                        t-att-data-id="attribute_id.id"
+                        t-att-data-value-min="attribute and attribute[1][0] or attribute_id.float_min"
+                        t-att-data-value-max="attribute and attribute[1][1] or attribute_id.float_max"
+                        t-att-data-min="attribute_id.float_min"
+                        t-att-data-max="attribute_id.float_max"></div>
+                  </li>
+                </t>
+              </t>
+          </ul>
+          <button class="btn btn-xs btn-primary mt16">Apply filter</button>
+          <a t-href="/shop/" t-keep-query="category,search" class="btn btn-xs btn-default mt16">Cancel filter</a>
+      </form>
+  </xpath>
+  <xpath expr="//div[@id='products_grid_before']" position="attributes">
+      <attribute name="class">col-md-3 hidden-xs</attribute>
+  </xpath>
+  <xpath expr="//div[@id='products_grid']" position="attributes">
+      <attribute name="class">col-md-9</attribute>
+  </xpath>
+</template>
+
+<template id="suggested_products_list" inherit_id="website_sale.mycart" inherit_option_id="website_sale.mycart" name="Suggested Products in my cart">
+  <xpath expr="//table[@id='mycart_products']" position="after">
+      <table t-if="suggested_products" class='table table-striped table-condensed'>
+          <colgroup>
+              <col width="80"/>
+              <col/>
+              <col width="100"/>
+              <col width="120"/>
+          </colgroup>
+          <thead>
+              <tr>
+                  <th colspan="2">Suggested products</th>
+              </tr>
+          </thead>
+          <tbody>
+              <tr t-foreach="suggested_products" t-as="product">
+
+                  <td>
+                      <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
+                          <span t-field="product.image_small"
+                                t-field-options='{"widget": "image", "class": "img-rounded"}'/>
+                      </a>
+                  </td>
+                  <td>
+                      <div>
+                          <a t-href="/shop/product/#{ slug(product.product_tmpl_id) }/">
+                              <strong t-field="product.name"/>
+                          </a>
+                      </div>
+                      <div class="text-muted" t-field="product.description_sale"/>
+                  </td>
+                  <td>
+                      <span t-field="product.lst_price" t-field-options='{
+                          "widget": "monetary",
+                          "display_currency": "website.pricelist_id.currency_id"
+                      }'/>
+                  </td>
+                  <td class="text-center">
+                      <a t-href="./add_cart/#{ product.id }/"><strong>Add to Cart</strong></a>
+                  </td>
+              </tr>
+          </tbody>
+      </table>
+  </xpath>
+</template>
+
+<template id="reduction_code" inherit_option_id="website_sale.mycart" name="Reduction Code">
+  <xpath expr="//div[@id='right_column']" position="inside">
+      <h4>Coupon Code</h4>
+      <p>
+          Have a coupon code? Fill in this field and apply.
+      </p>
+      <form t-if="website_sale_order and website_sale_order.order_line" action="/shop/mycart/" method="post" class="mb32">
+          <div class="input-group">
+              <input name="promo" class='form-control' type="text" placeholder="code..." t-att-value="website_sale_order.pricelist_id.code or ''"/>
+              <div class="input-group-btn">
+                  <button class="btn btn-default">Apply</button>
+              </div>
+          </div>
+      </form>
+  </xpath>
+</template>
+
+
+<!-- Page confirm my cart -->
+
+<template id="checkout">
+  <t t-call="website.layout">
+    <t t-set="head">
+        <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+        <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+        <t t-raw="head or ''"/>
+    </t>
+    <t t-set="additional_title">Shop - Checkout</t>
+    <div id="wrap">
+      <div class="container oe_website_sale">
+          <ul class="wizard pull-right">
+              <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
+              <li class="text-primary">Shipping &amp; Billing<span class="chevron"></span></li>
+              <li class="text-muted">Payment<span class="chevron"></span></li>
+              <li class="text-muted">Confirmation<span class="chevron"></span></li>
+          </ul>
+          <h1>Your Address</h1>
+          <form action="/shop/confirm_order/" method="post">
 
-                        <div class="js_shipping row mb16" t-att-style="not shipping and 'display:none' or ''">
-                            <h3 class="oe_shipping col-lg-12 mt16">Shipping Information</h3>
+          <div class="row">
+          <div class="col-md-8 oe_mycart">
+              <h3 class="page-header mt16">Billing Information
+                  <small t-if="user_id.id == website.public_user.id"> or
+                      <a t-if="not partner" t-attf-href="/web#action=redirect&amp;url=#{ request.httprequest.url }">sign in</a>
+                  </small>
+              </h3>
+                  <div class="row">
+                      <div t-attf-class="form-group #{error.get('name') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Your Name</label>
+                          <input type="text" name="name" class="form-control" t-att-value="checkout.get('name')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('company') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="company" style="font-weight: normal">Your Company</label>
+                          <input type="text" name="company" class="form-control" t-att-value="checkout.get('company')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('email') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Email</label>
+                          <input type="email" name="email" class="form-control" t-att-value="checkout.get('email')"/>
+                      </div>
+                      <div t-attf-class="form-group #{ error.get('phone') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="phone">Phone</label>
+                          <input type="tel" name="phone" class="form-control" t-att-value="checkout.get('phone')"/>
+                      </div>
 
-                            <div t-attf-class="form-group #{error.get('shipping_name') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Name (Shipping)</label>
-                                <input type="text" name="shipping_name" class="form-control" t-att-value="checkout.get('shipping_name', '')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_phone') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Phone</label>
-                                <input type="tel" name="shipping_phone" class="form-control" t-att-value="checkout.get('shipping_phone', '')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_street') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Street</label>
-                                <input type="text" name="shipping_street" class="form-control" t-att-value="checkout.get('shipping_street', '')"/>
-                            </div>
-                            <div class="clearfix"/>
-                            <div t-attf-class="form-group #{error.get('shipping_city') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">City</label>
-                                <input type="text" name="shipping_city" class="form-control" t-att-value="checkout.get('shipping_city', '')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_zip') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Zip / Postal Code</label>
-                                <input type="text" name="shipping_zip" class="form-control" t-att-value="checkout.get('shipping_zip', '')"/>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_state_id') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name" style="font-weight: normal">State / Province</label>
-                                <select name="shipping_state_id" class="form-control">
-                                    <option value="">State / Province...</option>
-                                    <t t-foreach="states or []" t-as="state">
-                                        <option t-att-value="state.id" t-att-selected="state.id == checkout.get('shipping_state_id')"><t t-esc="state.name"/></option>
-                                    </t>
-                                </select>
-                            </div>
-                            <div t-attf-class="form-group #{error.get('shipping_country_id') and 'has-error' or ''} col-lg-6">
-                                <label class="control-label" for="contact_name">Country</label>
-                                <select name="shipping_country_id" class="form-control">
-                                    <option value="">Country...</option>
-                                    <t t-foreach="countries or []" t-as="country">
-                                        <option t-att-value="country.id" t-att-selected="country.id == checkout.get('shipping_country_id')"><t t-esc="country.name"/></option>
-                                    </t>
-                                </select>
-                            </div>
-                        </div>
-                        <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
-                </div>
-                <div class="col-lg-offset-1 col-lg-3 text-muted">
-                    <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="fa fa-arrow-right"/> change</a></small></h3>
-                    <div class="row">
-                        <div class="col-sm-6 text-right">Subtotal:</div>
-                        <div class="col-sm-6"><span t-esc="website_sale_order.amount_untaxed" t-field-options='{
-                            "widget": "monetary",
-                            "display_currency": "website.pricelist_id.currency_id"
-                        }'/></div>
-                        <div class="col-sm-6 text-right">Taxes:</div>
-                        <div class="col-sm-6"><span t-field="website_sale_order.amount_tax" t-field-options='{
-                            "widget": "monetary",
-                            "display_currency": "website.pricelist_id.currency_id"
-                        }'/></div>
-                        <div class="col-sm-6 text-right"><h4>Total To Pay:</h4></div>
-                        <div class="col-sm-6"><h4><span t-field="website_sale_order.amount_total" t-field-options='{
-                            "widget": "monetary",
-                            "display_currency": "website.pricelist_id.currency_id"
-                        }'/></h4></div>
-                    </div>
-                </div>
-            </div>
-            </form>
-          </div>
-          </div>
-        </t>
-    </template>
-
-    <template id="payment">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
-                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="additional_title">Shop - Select Payment Mode</t>
-            <div id="wrap">
-              <div class="container oe_website_sale">
-
-                <ul class="wizard pull-right">
-                    <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
-                    <li><a href="/shop/checkout" class="text-success">Shipping &amp; Billing<span class="chevron"></span></a></li>
-                    <li class="text-primary">Payment<span class="chevron"></span></li>
-                    <li class="text-muted">Confirmation<span class="chevron"></span></li>
-                </ul>
-                <h1 class="mb32">Validate Order</h1>
-                <div class="row">
-                <div class="col-lg-8 col-sm-9 oe_mycart">
-                    <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.order_line">
-                        <colgroup>
-                            <col width="80"/>
-                            <col/>
-                            <col width="100"/>
-                            <col width="120"/>
-                        </colgroup>
-                        <thead>
-                            <tr>
-                                <th colspan="2">Product</th>
-                                <th>Price</th>
-                                <th>Quantity</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <tr t-foreach="website_sale_order.order_line" t-as="line">
-                                <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
-                                <td t-if="line.product_id.product_tmpl_id">
-                                    <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
-                                        <span t-field="line.product_id.image_small"
-                                              t-field-options='{"widget": "image", "class": "img-rounded"}'/>
-                                    </a>
-                                </td>
-                                <td t-if="line.product_id.product_tmpl_id">
-                                   <strong t-field="line.product_id.name"/>
-                                </td>
-                                <td class="text-center">
-                                   <span t-field="line.price_unit" t-field-options='{
-                                       "widget": "monetary",
-                                       "display_currency": "website.pricelist_id.currency_id"
-                                   }'/>
-                                </td>
-                                <td>
-                                   <div t-esc="line.product_uom_qty"/>
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <table class='pull-right mb16' id="mycart_total">
-                        <colgroup>
-                            <col width="100"/>
-                            <col width="120"/>
-                        </colgroup>
-                        <thead>
-                            <tr style="border-top: 1px solid #000">
-                                <th><h3>Total:</h3></th>
-                                <th class="text-right"><h3><span t-field="website_sale_order.amount_total" t-field-options='{
-                                    "widget": "monetary",
-                                    "display_currency": "website.pricelist_id.currency_id"
-                                }'/></h3></th>
-                            </tr>
-                            <tr class="text-muted">
-                                <td>Incl. Taxes:</td>
-                                <td class="text-right"><span t-field="website_sale_order.amount_tax" t-field-options='{
-                                    "widget": "monetary",
-                                    "display_currency": "website.pricelist_id.currency_id"
-                                }'/></td>
-                            </tr>
-                        </thead>
-                    </table>
-                    <div class="clearfix"/>
-                    <div class="oe_structure"/>
-                  </div>
-                  <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
-                      <h4>Bill To:</h4>
-                      <div t-field="website_sale_order.partner_invoice_id"/>
-                      <div>
-                        <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
+                      <div t-attf-class="form-group #{error.get('street') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="street">Street</label>
+                          <input type="text" name="street" class="form-control" t-att-value="checkout.get('street')"/>
                       </div>
+                      <div class="clearfix"/>
 
-                      <h4 class="mt32">Ship To:</h4>
-                      <div t-field="website_sale_order.partner_shipping_id"/>
-                      <div>
-                        <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
+                      <div t-attf-class="form-group #{error.get('city') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="city">City</label>
+                          <input type="text" name="city" class="form-control" t-att-value="checkout.get('city')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('zip') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="zip">Zip / Postal Code</label>
+                          <input type="text" name="zip" class="form-control" t-att-value="checkout.get('zip')"/>
                       </div>
+                      <div t-attf-class="form-group #{error.get('state_id') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="state_id" style="font-weight: normal">State / Province</label>
+                          <select name="state_id" class="form-control">
+                              <option value="">select...</option>
+                              <t t-foreach="states or []" t-as="state">
+                                  <option t-att-value="state.id" t-att-selected="state.id == checkout.get('state_id')"><t t-esc="state.name"/></option>
+                              </t>
+                          </select>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('country_id') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Country</label>
+                          <select name="country_id" class="form-control">
+                              <option value="">Country...</option>
+                              <t t-foreach="countries or []" t-as="country">
+                                  <option t-att-value="country.id" t-att-selected="country.id == checkout.get('country_id')"><t t-esc="country.name"/></option>
+                              </t>
+                          </select>
+                      </div>
+
+                      <div class="clearfix"/>
 
+                      <div class="form-group col-lg-6">
+                          <label>
+                              <input t-if="not shipping" type="checkbox" name="shipping_different"/>
+                              <input t-if="shipping" type="checkbox" name="shipping_different" checked="1"/>
+                              Ship to a different address
+                          </label>
+                      </div>
                   </div>
-                </div>
 
-                <div class="js_payment mb64" t-if="acquirers" id="payment_method">
-                    <h3>Choose your payment method</h3>
-                    <div class="col-lg-5 col-sm-6">
-                        <t t-foreach="acquirers or []" t-as="acquirer">
-                            <label t-if="acquirer.button" class="oe_sale_acquirer_logo" style="display: block;">
-                                <input t-att-value="acquirer.id" type="radio" name="acquirer"/>
-                                <img class="media-object" style="width: 60px; display: inline-block;"
-                                    t-att-title="acquirer.name"
-                                    t-att-src="'/payment_acquirer_%s/static/src/img/%s_icon.png' % (acquirer.name, acquirer.name)"/>
-                            </label>
-                        </t>
-                    </div>
-                    <div class="col-lg-3 col-sm-3">
-                        <t t-foreach="acquirers or []" t-as="acquirer">
-                            <div t-att-data-id="acquirer.id" t-raw="acquirer.button" class="oe_sale_acquirer_button hidden"/>
-                        </t>
-                    </div>
-                </div>
+                  <div class="js_shipping row mb16" t-att-style="not shipping and 'display:none' or ''">
+                      <h3 class="oe_shipping col-lg-12 mt16">Shipping Information</h3>
 
+                      <div t-attf-class="form-group #{error.get('shipping_name') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Name (Shipping)</label>
+                          <input type="text" name="shipping_name" class="form-control" t-att-value="checkout.get('shipping_name', '')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_phone') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Phone</label>
+                          <input type="tel" name="shipping_phone" class="form-control" t-att-value="checkout.get('shipping_phone', '')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_street') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Street</label>
+                          <input type="text" name="shipping_street" class="form-control" t-att-value="checkout.get('shipping_street', '')"/>
+                      </div>
+                      <div class="clearfix"/>
+                      <div t-attf-class="form-group #{error.get('shipping_city') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">City</label>
+                          <input type="text" name="shipping_city" class="form-control" t-att-value="checkout.get('shipping_city', '')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_zip') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Zip / Postal Code</label>
+                          <input type="text" name="shipping_zip" class="form-control" t-att-value="checkout.get('shipping_zip', '')"/>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_state_id') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name" style="font-weight: normal">State / Province</label>
+                          <select name="shipping_state_id" class="form-control">
+                              <option value="">State / Province...</option>
+                              <t t-foreach="states or []" t-as="state">
+                                  <option t-att-value="state.id" t-att-selected="state.id == checkout.get('shipping_state_id')"><t t-esc="state.name"/></option>
+                              </t>
+                          </select>
+                      </div>
+                      <div t-attf-class="form-group #{error.get('shipping_country_id') and 'has-error' or ''} col-lg-6">
+                          <label class="control-label" for="contact_name">Country</label>
+                          <select name="shipping_country_id" class="form-control">
+                              <option value="">Country...</option>
+                              <t t-foreach="countries or []" t-as="country">
+                                  <option t-att-value="country.id" t-att-selected="country.id == checkout.get('shipping_country_id')"><t t-esc="country.name"/></option>
+                              </t>
+                          </select>
+                      </div>
+                  </div>
+                  <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
+          </div>
+          <div class="col-lg-offset-1 col-lg-3 text-muted">
+              <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="fa fa-arrow-right"/> change</a></small></h3>
+              <div class="row">
+                  <div class="col-sm-6 text-right">Subtotal:</div>
+                  <div class="col-sm-6"><span t-esc="website_sale_order.amount_untaxed" t-field-options='{
+                      "widget": "monetary",
+                      "display_currency": "website.pricelist_id.currency_id"
+                  }'/></div>
+                  <div class="col-sm-6 text-right">Taxes:</div>
+                  <div class="col-sm-6"><span t-field="website_sale_order.amount_tax" t-field-options='{
+                      "widget": "monetary",
+                      "display_currency": "website.pricelist_id.currency_id"
+                  }'/></div>
+                  <div class="col-sm-6 text-right"><h4>Total To Pay:</h4></div>
+                  <div class="col-sm-6"><h4><span t-field="website_sale_order.amount_total" t-field-options='{
+                      "widget": "monetary",
+                      "display_currency": "website.pricelist_id.currency_id"
+                  }'/></h4></div>
               </div>
+          </div>
+      </div>
+      </form>
+    </div>
+    </div>
+  </t>
+</template>
+
+<template id="payment">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale_payment.js"></script>
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <t t-raw="head or ''"/>
+      </t>
+      <t t-set="additional_title">Shop - Select Payment Mode</t>
+      <div id="wrap">
+        <div class="container oe_website_sale">
+
+          <ul class="wizard pull-right">
+              <li><a href="/shop/mycart" class="text-success">Review Order<span class="chevron"></span></a></li>
+              <li><a href="/shop/checkout" class="text-success">Shipping &amp; Billing<span class="chevron"></span></a></li>
+              <li class="text-primary">Payment<span class="chevron"></span></li>
+              <li class="text-muted">Confirmation<span class="chevron"></span></li>
+          </ul>
+          <h1 class="mb32">Validate Order</h1>
+          <div class="row">
+          <div class="col-lg-8 col-sm-9 oe_mycart">
+              <table class='table table-striped table-condensed' id="mycart_products" t-if="website_sale_order and website_sale_order.order_line">
+                  <colgroup>
+                      <col width="80"/>
+                      <col/>
+                      <col width="100"/>
+                      <col width="120"/>
+                  </colgroup>
+                  <thead>
+                      <tr>
+                          <th colspan="2">Product</th>
+                          <th>Price</th>
+                          <th>Quantity</th>
+                      </tr>
+                  </thead>
+                  <tbody>
+                      <tr t-foreach="website_sale_order.order_line" t-as="line">
+                          <td colspan="2" t-if="not line.product_id.product_tmpl_id"></td>
+                          <td t-if="line.product_id.product_tmpl_id">
+                              <a t-href="/shop/product/#{ slug(line.product_id.product_tmpl_id) }/">
+                                  <span t-field="line.product_id.image_small"
+                                        t-field-options='{"widget": "image", "class": "img-rounded"}'/>
+                              </a>
+                          </td>
+                          <td t-if="line.product_id.product_tmpl_id">
+                             <strong t-field="line.product_id.name"/>
+                          </td>
+                          <td class="text-center">
+                             <span t-field="line.price_unit" t-field-options='{
+                                 "widget": "monetary",
+                                 "display_currency": "website.pricelist_id.currency_id"
+                             }'/>
+                          </td>
+                          <td>
+                             <div t-esc="line.product_uom_qty"/>
+                          </td>
+                      </tr>
+                  </tbody>
+              </table>
+              <table class='pull-right mb16' id="mycart_total">
+                  <colgroup>
+                      <col width="100"/>
+                      <col width="120"/>
+                  </colgroup>
+                  <thead>
+                      <tr style="border-top: 1px solid #000">
+                          <th><h3>Total:</h3></th>
+                          <th class="text-right"><h3><span t-field="website_sale_order.amount_total" t-field-options='{
+                              "widget": "monetary",
+                              "display_currency": "website.pricelist_id.currency_id"
+                          }'/></h3></th>
+                      </tr>
+                      <tr class="text-muted">
+                          <td>Taxes:</td>
+                          <td class="text-right"><span t-field="website_sale_order.amount_tax" t-field-options='{
+                              "widget": "monetary",
+                              "display_currency": "website.pricelist_id.currency_id"
+                          }'/></td>
+                      </tr>
+                  </thead>
+              </table>
+              <div class="clearfix"/>
               <div class="oe_structure"/>
             </div>
+            <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
+                <h4>Bill To:</h4>
+                <div t-field="website_sale_order.partner_invoice_id" t-field-options='{
+                    "widget": "contact",
+                    "fields": ["address", "name", "phone", "email"]
+                    }'/>
+                <div>
+                  <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
+                </div>
 
-        </t>
-    </template>
-
-    <template id="confirmation">
-        <t t-call="website.layout">
-            <t t-set="head">
-                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
-                <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
-                <t t-raw="head or ''"/>
-            </t>
-            <t t-set="additional_title">Shop - Confirmed</t>
-            <div id="wrap">
-              <div class="container oe_website_sale">
-
-                <ul class="wizard pull-right">
-                    <li class="text-muted">Review Order<span class="chevron"></span></li>
-                    <li class="text-muted">Shipping &amp; Billing<span class="chevron"></span></li>
-                    <li class="text-muted">Payment<span class="chevron"></span></li>
-                    <li class="text-primary">Confirmation<span class="chevron"></span></li>
-                </ul>
-                <h1 class="mb32">Order Confirmed</h1>
-                <div class="row">
-                    <div class="col-md-8 oe_mycart">
-                        <h2>Thank you for your order.</h2>
-                        <div class="oe_website_sale_tx_status" t-att-data-order-id="order.id">
-                        </div>
-                        <div class="clearfix"/>
-                        <div class="oe_structure"/>
-                    </div>
-                    <div class="col-md-3 col-md-offset-1 text-muted" id="right_column">
-                        <h4>Bill To:</h4>
-                        <div t-field="order.partner_invoice_id"/>
-
-                        <h4 class="mt32">Ship To:</h4>
-                        <div t-field="order.partner_shipping_id"/>
-
-                        <h4 class="mt32">Amount:</h4>
-                        <!--<div t-field="order.amount_total" t-field-options='{
-                            "widget": "monetary",
-                            "display_currency": "website.pricelist_id.currency_id"
-                        }'/> -->
-                    </div>
+                <h4 class="mt32">Ship To:</h4>
+                <div t-if="website_sale_order.partner_shipping_id.id != website_sale_order.partner_invoice_id.id" t-field="website_sale_order.partner_shipping_id" t-field-options='{
+                    "widget": "contact",
+                    "fields": ["address", "name", "phone"]
+                    }'/>
+                <address t-if="website_sale_order.partner_shipping_id.id == website_sale_order.partner_invoice_id.id">Ship to the same address</address>
+                <div class="mb32">
+                  <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
                 </div>
 
-              </div>
-              <div class="oe_structure"/>
             </div>
+          </div>
+
+          <div class="js_payment mb64" t-if="acquirers" id="payment_method">
+              <h3>Choose your payment method</h3>
+              <div class="col-lg-5 col-sm-6">
+                  <t t-foreach="acquirers or []" t-as="acquirer">
+                      <label t-if="acquirer.button" class="oe_sale_acquirer_logo" style="display: block;">
+                          <input t-att-value="acquirer.id" type="radio" name="acquirer"/>
+                          <img class="media-object" style="width: 60px; display: inline-block;"
+                              t-att-title="acquirer.name"
+                              t-att-src="'/payment_acquirer_%s/static/src/img/%s_icon.png' % (acquirer.name, acquirer.name)"/>
+                      </label>
+                  </t>
+              </div>
+              <div class="col-lg-3 col-sm-3">
+                  <t t-foreach="acquirers or []" t-as="acquirer">
+                      <div t-att-data-id="acquirer.id" t-raw="acquirer.button" class="oe_sale_acquirer_button hidden"/>
+                  </t>
+              </div>
+          </div>
+
+        </div>
+        <div class="oe_structure"/>
+      </div>
+
+  </t>
+</template>
+
+<template id="confirmation">
+  <t t-call="website.layout">
+      <t t-set="head">
+          <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
+          <script type="text/javascript" src="/website_sale/static/src/js/website_sale_validate.js"></script>
+          <t t-raw="head or ''"/>
+      </t>
+      <t t-set="additional_title">Shop - Confirmed</t>
+      <div id="wrap">
+        <div class="container oe_website_sale">
+
+          <ul class="wizard pull-right">
+              <li class="text-muted">Review Order<span class="chevron"></span></li>
+              <li class="text-muted">Shipping &amp; Billing<span class="chevron"></span></li>
+              <li class="text-muted">Payment<span class="chevron"></span></li>
+              <li class="text-primary">Confirmation<span class="chevron"></span></li>
+          </ul>
+          <h1 class="mb32">Order Confirmed</h1>
+          <div class="row">
+              <div class="col-md-8 oe_mycart">
+                  <h2>Thank you for your order.</h2>
+                  <div class="oe_website_sale_tx_status" t-att-data-order-id="order.id">
+                  </div>
+                  <div class="clearfix"/>
+                  <div class="oe_structure"/>
+              </div>
+              <div class="col-md-3 col-md-offset-1 text-muted" id="right_column">
+                  <h4>Bill To:</h4>
+                  <div t-field="order.partner_invoice_id"/>
+
+                  <h4 class="mt32">Ship To:</h4>
+                  <div t-field="order.partner_shipping_id"/>
+
+                  <h4 class="mt32">Amount:</h4>
+                  <!--<div t-field="order.amount_total" t-field-options='{
+                      "widget": "monetary",
+                      "display_currency": "website.pricelist_id.currency_id"
+                  }'/> -->
+              </div>
+          </div>
+
+        </div>
+        <div class="oe_structure"/>
+      </div>
 
-        </t>
-    </template>
+  </t>
+</template>
 
-    <template id="total">
-      <span t-field="website_sale_order.amount_total" t-field-options='{
-          "widget": "monetary",
-          "display_currency": "website.pricelist_id.currency_id"
-        }'/>
-    </template>
- </data>
+<template id="total">
+<span t-field="website_sale_order.amount_total" t-field-options='{
+    "widget": "monetary",
+    "display_currency": "website.pricelist_id.currency_id"
+  }'/>
+</template>
+</data>
 </openerp>