From cf1780d251ade7d9ed1925d616b6303f461e7acd Mon Sep 17 00:00:00 2001
From: Christophe Matthieu <chm@openerp.com>
Date: Fri, 23 Aug 2013 16:37:57 +0200
Subject: [PATCH] [FIX] website_sale: set pricelist

bzr revid: chm@openerp.com-20130823143757-81cc0pzajetu55m8
---
 addons/website_sale/controllers/main.py    | 91 ++++++++++++----------
 addons/website_sale/views/website_sale.xml | 18 ++---
 2 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index ee6114c9bde..45c83d4c231 100644
--- a/addons/website_sale/controllers/main.py
+++ b/addons/website_sale/controllers/main.py
@@ -20,6 +20,8 @@ def get_order(order_id=None):
     if not order_id:
         fields = [k for k, v in order_obj._columns.items()]
         order_value = order_obj.default_get(request.cr, SUPERUSER_ID, fields)
+        if request.httprequest.session.get('ecommerce_pricelist'):
+            order_value['pricelist_id'] = request.httprequest.session['ecommerce_pricelist']
         order_value['partner_id'] = request.registry.get('res.users').browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id
         order_value.update(order_obj.onchange_partner_id(request.cr, SUPERUSER_ID, [], request.uid, context={})['value'])
         order_id = order_obj.create(request.cr, SUPERUSER_ID, order_value)
@@ -59,8 +61,8 @@ class Ecommerce(http.Controller):
     def category(self, cat_id=0, page=0, **post):
 
         if 'promo' in post:
-            self.change_pricelist(post.get('code'))
-        
+            self.change_pricelist(post.get('promo'))
+            
         website = request.registry['website']
         product_obj = request.registry.get('product.template')
 
@@ -84,7 +86,7 @@ class Ecommerce(http.Controller):
 
         product_ids = product_obj.search(request.cr, request.uid, domain, limit=step, offset=pager['offset'])
 
-        context = request.httprequest.session.get('ecommerce_context', {})
+        context = {'pricelist': self.get_pricelist()}
 
         values = website.get_rendering_context({
             'categories': self.get_categories(),
@@ -99,14 +101,14 @@ class Ecommerce(http.Controller):
     def product(self, cat_id=0, product_id=0, **post):
 
         if 'promo' in post:
-            self.change_pricelist(post.get('code'))
+            self.change_pricelist(post.get('promo'))
 
         website = request.registry['website']
 
         product_id = product_id and int(product_id) or 0
         product_obj = request.registry.get('product.template')
 
-        context = request.httprequest.session.get('ecommerce_context', {})
+        context = {'pricelist': self.get_pricelist()}
 
         product = product_obj.browse(request.cr, request.uid, product_id, context=context)
         values = website.get_rendering_context({
@@ -117,53 +119,35 @@ class Ecommerce(http.Controller):
         })
         return website.render("website_sale.product", values)
 
-    def change_pricelist(self, code):
-        request.httprequest.session.setdefault('ecommerce_context', {})
+    def get_pricelist(self):
+        if not request.httprequest.session.get('ecommerce_pricelist'):
+            self.change_pricelist(None)
+        return request.httprequest.session.get('ecommerce_pricelist')
 
-        order = get_current_order()
-        if order:
+    def change_pricelist(self, code):
+        request.httprequest.session.setdefault('ecommerce_pricelist', False)
+
+        pricelist_id = False
+        if code:
             pricelist_obj = request.registry.get('product.pricelist')
             pricelist_ids = pricelist_obj.search(request.cr, SUPERUSER_ID, [('code', '=', code)])
             if pricelist_ids:
                 pricelist_id = pricelist_ids[0]
-            else:
-                pricelist_id = order.onchange_partner_id(request.uid, context={})['value']['pricelist_id']
 
-            request.httprequest.session['ecommerce_context']['pricelist'] = pricelist_id
+        if not pricelist_id:
+            pricelist_id = request.registry['sale.order'].onchange_partner_id(request.cr, SUPERUSER_ID, [], request.uid, context={})['value']['pricelist_id']
+        
+        request.httprequest.session['ecommerce_pricelist'] = pricelist_id
+
+        order = get_current_order()
+        if order:
             values = {'pricelist_id': pricelist_id}
             values.update(order.onchange_pricelist_id(pricelist_id, None)['value'])
             order.write(values)
             for line in order.order_line:
                 self.add_product_to_cart(line.product_id.id, 0)
 
-    @http.route(['/shop/mycart/'], type='http', auth="public")
-    def mycart(self, **post):
-        order = get_current_order()
-        website = request.registry['website']
-        prod_obj = request.registry.get('product.product')
-
-        if 'promo' in post:
-            self.change_pricelist(post.get('promo'))
-
-        suggested_ids = []
-        for line in order.order_line:
-            suggested_ids += [p.id for p in line.product_id.suggested_product_ids for line in order.order_line]
-        suggested_ids = prod_obj.search(request.cr, request.uid, [('id', 'in', suggested_ids)])
-        # select 3 random products
-        suggested_products = []
-        while len(suggested_products) < 3 and suggested_ids:
-            index = random.randrange(0, len(suggested_ids))
-            suggested_products.append(suggested_ids.pop(index))
-
-        values = website.get_rendering_context({
-            'categories': self.get_categories(),
-            'suggested_products': prod_obj.browse(request.cr, request.uid, suggested_products),
-        })
-        return website.render("website_sale.mycart", values)
-
     def add_product_to_cart(self, product_id=0, number=1, set_number=-1):
-        context = request.httprequest.session.get('ecommerce_context', {})
-
         order_line_obj = request.registry.get('sale.order.line')
         user_obj = request.registry.get('res.users')
 
@@ -173,6 +157,8 @@ class Ecommerce(http.Controller):
             order = get_order()
             request.httprequest.session['ecommerce_order_id'] = order.id
 
+        context = {'pricelist': self.get_pricelist()}
+
         quantity = 0
 
         # values initialisation
@@ -213,6 +199,32 @@ class Ecommerce(http.Controller):
 
         return quantity
 
+    @http.route(['/shop/mycart/'], type='http', auth="public")
+    def mycart(self, **post):
+        order = get_current_order()
+        website = request.registry['website']
+        prod_obj = request.registry.get('product.product')
+
+        if 'promo' in post:
+            self.change_pricelist(post.get('promo'))
+
+        suggested_ids = []
+        if order:
+            for line in order.order_line:
+                suggested_ids += [p.id for p in line.product_id.suggested_product_ids for line in order.order_line]
+        suggested_ids = prod_obj.search(request.cr, request.uid, [('id', 'in', suggested_ids)])
+        # select 3 random products
+        suggested_products = []
+        while len(suggested_products) < 3 and suggested_ids:
+            index = random.randrange(0, len(suggested_ids))
+            suggested_products.append(suggested_ids.pop(index))
+
+        values = website.get_rendering_context({
+            'categories': self.get_categories(),
+            'suggested_products': prod_obj.browse(request.cr, request.uid, suggested_products),
+        })
+        return website.render("website_sale.mycart", values)
+
     @http.route(['/shop/<path:path>/add_cart/', '/shop/add_cart/', '/shop/add_cart/<product_id>/', '/shop/<path:path>/add_cart/<product_id>/'], type='http', auth="public")
     def add_cart(self, path=None, product_id=0, remove=None):
         self.add_product_to_cart(product_id, number=(remove and -1 or 1))
@@ -384,6 +396,7 @@ class Ecommerce(http.Controller):
     @http.route(['/shop/payment_validate/'], type='http', auth="public")
     def payment_validate(self, **post):
         request.httprequest.session['ecommerce_order_id'] = False
+        request.httprequest.session['ecommerce_pricelist'] = False
         return werkzeug.utils.redirect("/shop/")
 
 # vim:expandtab:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 61711110b73..4591fa0dfc8 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -161,7 +161,7 @@
                         </label><br/>
                         <button class="btn btn-small btn-success">Add to cart</button>
                     </form>
-                    <img class="media-object" t-att-src="product.img('image')"/>
+                    <img class="media-object" t-att-src="product.img('image_medium')"/>
                     <div t-field="product.website_description"></div>
                     <div>
                         <t t-if="product.product_variant_ids[0].lst_price != product.product_variant_ids[0].price">
@@ -215,10 +215,10 @@
                                 <th>Quantity</th>
                             </tr>
                         </thead>
-                        <tbody t-if="not order.order_line">
+                        <tbody t-if="not order or not order.order_line">
                             <tr><td colspan="4"><h3>Your cart is empty</h3></td></tr>
                         </tbody>
-                        <tbody t-if="order.order_line">
+                        <tbody t-if="order and order.order_line">
                             <t t-foreach="order.order_line" t-as="line">
                                 <tr>
                                     <td>
@@ -253,12 +253,12 @@
                             <col width="160"/>
                         </colgroup>
                         <thead>
-                            <tr> <th colspan="3">Subtotal </th>      <th><t t-esc="order.amount_untaxed"/> €</th></tr>
-                            <tr> <th colspan="3">Taxes </th>         <th><t t-esc="order.amount_tax"/> €</th></tr>
-                            <tr> <th colspan="3"><h4>Total</h4></th> <th><h4><t t-esc="order.amount_total"/> €</h4></th></tr>
+                            <tr> <th colspan="3">Subtotal </th>      <th><t t-esc="order and order.amount_untaxed or 0"/> €</th></tr>
+                            <tr> <th colspan="3">Taxes </th>         <th><t t-esc="order and order.amount_tax or 0"/> €</th></tr>
+                            <tr> <th colspan="3"><h4>Total</h4></th> <th><h4><t t-esc="order and order.amount_total or 0"/> €</h4></th></tr>
                         </thead>
                     </table>
-                    <a t-if="order.order_line" href="/shop/checkout/" class="btn btn-success">Proceed To Payment</a>
+                    <a t-if="order and order.order_line" href="/shop/checkout/" class="btn btn-success">Proceed To Payment</a>
                 </div>
             </t>
         </t>
@@ -318,7 +318,7 @@
     </template>
     <template id="reduction_code" inherit_option_id="website_sale.mycart" name="Reduction Code">
         <xpath expr="//table[@id='mycart_total']" position="after">
-            <form t-if="order.order_line" class="well form-search" action="/shop/mycart/" method="post">
+            <form t-if="order and order.order_line" class="well form-search" action="/shop/mycart/" method="post">
                 <input name="promo" class='input' type="text" placeholder="Reduction Code..." t-att-value="order.pricelist_id.code or ''"/>
                 <button class="btn">Apply Code</button>
             </form>
@@ -524,7 +524,7 @@
             <div class="container mt48 oe_website_sale">
                 <div class="row">
                     <div class="span4">
-                        <table class="table table-condensed">
+                        <table class="table table-condensed" t-if="order">
                             <thead>
                                 <tr>
                                     <th>Product</th>