From 1888dea9b4c2bfa9a3b025c466146a9d4e734bb6 Mon Sep 17 00:00:00 2001
From: ddm <ddm@openerp.com>
Date: Tue, 22 Oct 2013 16:01:19 +0200
Subject: [PATCH] [IMP] eCommerce: Checkout summary moved to left (cf. apr's
 review)

bzr revid: ddm@openerp.com-20131022140119-82ex7kvrzeqc7jri
---
 addons/website_sale/views/website_sale.xml | 212 ++++++++++-----------
 1 file changed, 104 insertions(+), 108 deletions(-)

diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index d5a33bfa6fc..dd1bf8b7b24 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -355,120 +355,116 @@
                     <li class="text-muted">Payment<span class="chevron"></span></li>
                     <li class="text-muted">Confirmation<span class="chevron"></span></li>
                 </ul>
-                <h1 class="mb32">Your Cart</h1>
-
+                <h1 class="mb32">Shopping Cart</h1>
                 <div class="row">
-                <div class="col-md-8 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 class="col-md-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; Transation 256bit encrypted</li>
+                            <li>&#9745; Processed by Ogone</li>
+                        </ul>
                     </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/#{ line.product_id.product_tmpl_id.id }/">
-                                            <strong t-field="line.product_id.name"/>
-                                        </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='{
+                    <div class="col-md-8 col-md-offset-1 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/#{ line.product_id.product_tmpl_id.id }/">
+                                                <strong t-field="line.product_id.name"/>
+                                            </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"
                                        }'/>
-                                   </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="./remove_cart/?order_line_id=#{ line.id }" t-att-data-id="line.id" class="mb8 js_add_cart_json">
-                                                <span class="icon-minus"/>
-                                            </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="./add_cart/?order_line_id=#{ line.id }" t-att-data-id="line.id" class="mb8 float_left js_add_cart_json">
-                                                <span class="icon-plus"/>
-                                            </a>
-                                        </span>
-                                    </div>
+                                    </td>
+                                    <td>
+                                        <div class="input-group">
+                                            <span class="input-group-addon">
+                                                <a t-href="./remove_cart/?order_line_id=#{ line.id }" t-att-data-id="line.id" class="mb8 js_add_cart_json">
+                                                    <span class="icon-minus"/>
+                                                </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="./add_cart/?order_line_id=#{ line.id }" t-att-data-id="line.id" class="mb8 float_left js_add_cart_json">
+                                                    <span class="icon-plus"/>
+                                                </a>
+                                            </span>
+                                        </div>
 
-                                </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><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 t-href="/shop" class="btn btn-default"><span class="icon-long-arrow-left"/> Continue Shopping</a>
-                    <a t-if="website_sale_order and website_sale_order.order_line" t-href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="icon-long-arrow-right"/></a>
-                    <div class="oe_structure"/>
-                  </div>
-                  <div class="col-md-3 col-md-offset-1 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; Transation 256bit encrypted</li>
-                        <li>&#9745; Processed by Ogone</li>
-                      </ul>
-
-                  </div>
+                                    </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><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 t-href="/shop" class="btn btn-default"><span class="icon-long-arrow-left"/> Continue Shopping</a>
+                        <a t-if="website_sale_order and website_sale_order.order_line" t-href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="icon-long-arrow-right"/></a>
+                        <div class="oe_structure"/>
+                    </div>
                 </div>
 
               </div>