From 67e0806547960028b054278e3548beadb4ece8a6 Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Mon, 3 Feb 2014 13:33:54 +0100
Subject: [PATCH] [FIX] website_sale: test tour and bootstrap col layout

bzr revid: chm@openerp.com-20140203123354-xt5zco6rz92z3str
---
 addons/website/static/src/js/website.tour.banner.js    | 1 -
 addons/website_sale/static/src/js/website.tour.shop.js | 4 ----
 addons/website_sale/static/src/js/website_sale.js      | 7 ++++---
 addons/website_sale/views/website_sale.xml             | 4 ++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/addons/website/static/src/js/website.tour.banner.js b/addons/website/static/src/js/website.tour.banner.js
index b079c4a670c..c46efcabce8 100644
--- a/addons/website/static/src/js/website.tour.banner.js
+++ b/addons/website/static/src/js/website.tour.banner.js
@@ -48,7 +48,6 @@
                 {
                     waitFor:   '.oe_overlay_options .oe_options:visible',
                     element:   '#wrap [data-snippet-id=carousel]:first .carousel-caption',
-                    sampleText: 'My Title',
                     placement: 'top',
                     title:     "Customize banner's text",
                     content:   "Click in the text and start editing it. Click continue once it's done.",
diff --git a/addons/website_sale/static/src/js/website.tour.shop.js b/addons/website_sale/static/src/js/website.tour.shop.js
index a141e991661..47d2508034f 100644
--- a/addons/website_sale/static/src/js/website.tour.shop.js
+++ b/addons/website_sale/static/src/js/website.tour.shop.js
@@ -215,10 +215,6 @@
                         $("select[name='country_id']").val("21");
                     },
                 },
-                {
-                    title:     "select acquirer",
-                    element:   'input[name="acquirer"]:first',
-                },
                 {
                     title:     "Pay Now",
                     element:   'button:contains("Pay Now")',
diff --git a/addons/website_sale/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 7f6d24373f7..3c9bb6ea05c 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -26,11 +26,12 @@ $(document).ready(function () {
         if (isNaN(value)) value = 0;
         openerp.jsonRpc("/shop/set_cart_json/", 'call', {'order_line_id': $input.data('id'), 'set_number': value})
             .then(function (data) {
+                if (!data) {
+                    location.reload();
+                    return;
+                }
                 set_my_cart_quantity(data[1]);
                 $input.val(data[0]);
-                if (!data[0]) {
-                    location.reload();
-                }
             });
     });
 
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index ed2007e27c7..81dc8adbcb6 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -530,7 +530,7 @@
                   <a t-if="website_sale_order and website_sale_order.website_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">
+              <div class="col-lg-3 col-lg-offset-1 col-sm-3 col-md-3 text-muted" id="right_column">
                   <h4>Policies</h4>
                   <ul class="list-unstyled mb32">
                       <li>&#9745; 30-days money-back guarantee</li>
@@ -828,7 +828,7 @@
               </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">
+          <div class="col-lg-offset-1 col-lg-3 col-md-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>