-
+
+
+
+
+
+
+
+
+
+ span8
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_contract/website_contract.py b/addons/website_contract/website_contract.py
index feb5b71edb0..10d12f08015 100644
--- a/addons/website_contract/website_contract.py
+++ b/addons/website_contract/website_contract.py
@@ -6,7 +6,8 @@ class res_partner(osv.osv):
_inherit = 'res.partner'
_columns = {
'website_published': fields.boolean('Available in the website'),
- 'website_testimonial': fields.text('Recommandation'),
+ 'website_description': fields.html('Description for the website'),
+ 'website_sort_description': fields.text('Sort description for the website'),
}
def img(self, cr, uid, ids, field='image_small', context=None):
diff --git a/addons/website_sale/controllers/main.py b/addons/website_sale/controllers/main.py
index 79cef4ec07f..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)
@@ -27,16 +29,14 @@ def get_order(order_id=None):
context = {
'pricelist': order.pricelist_id.id,
- 'partner': order.partner_id.id,
}
return order_obj.browse(request.cr, SUPERUSER_ID, order_id, context=context)
def get_current_order():
- order = get_order(request.httprequest.session.get('ecommerce_order_id'))
- if order.state != 'draft':
- order = get_order()
- request.httprequest.session['ecommerce_order_id'] = order.id
- return order
+ if request.httprequest.session.get('ecommerce_order_id'):
+ return get_order(request.httprequest.session.get('ecommerce_order_id'))
+ else:
+ return False
class website(osv.osv):
_inherit = "website"
@@ -60,6 +60,9 @@ class Ecommerce(http.Controller):
@http.route(['/shop/', '/shop/category//', '/shop/category//page//', '/shop/page//'], type='http', auth="public")
def category(self, cat_id=0, page=0, **post):
+ if 'promo' in post:
+ self.change_pricelist(post.get('promo'))
+
website = request.registry['website']
product_obj = request.registry.get('product.template')
@@ -71,7 +74,7 @@ class Ecommerce(http.Controller):
domain += ['|', '|', '|',
('name', 'ilike', "%%%s%%" % post.get("search")),
('description', 'ilike', "%%%s%%" % post.get("search")),
- ('description_website', 'ilike', "%%%s%%" % post.get("search")),
+ ('website_description', 'ilike', "%%%s%%" % post.get("search")),
('product_variant_ids.pos_categ_id.name', 'ilike', "%%%s%%" % post.get("search"))]
if cat_id:
cat_id = int(cat_id)
@@ -81,12 +84,14 @@ class Ecommerce(http.Controller):
product_count = len(product_obj.search(request.cr, request.uid, domain))
pager = website.pager(url="/shop/category/%s/" % cat_id, total=product_count, page=page, step=step, scope=7, url_args=post)
- product_ids = product_obj.search(request.cr, request.uid, domain, limit=step, offset=pager['offset'], order="website_published,name")
+ product_ids = product_obj.search(request.cr, request.uid, domain, limit=step, offset=pager['offset'])
+
+ context = {'pricelist': self.get_pricelist()}
values = website.get_rendering_context({
'categories': self.get_categories(),
'category_id': cat_id,
- 'products': product_obj.browse(request.cr, request.uid, product_ids),
+ 'products': product_obj.browse(request.cr, request.uid, product_ids, context=context),
'search': post.get("search"),
'pager': pager,
})
@@ -94,12 +99,16 @@ class Ecommerce(http.Controller):
@http.route(['/shop/product//'], type='http', auth="public")
def product(self, cat_id=0, product_id=0, **post):
+
+ if 'promo' in post:
+ 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 = get_current_order()._context
+ context = {'pricelist': self.get_pricelist()}
product = product_obj.browse(request.cr, request.uid, product_id, context=context)
values = website.get_rendering_context({
@@ -110,42 +119,45 @@ class Ecommerce(http.Controller):
})
return website.render("website_sale.product", values)
- @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')
+ def get_pricelist(self):
+ if not request.httprequest.session.get('ecommerce_pricelist'):
+ self.change_pricelist(None)
+ return request.httprequest.session.get('ecommerce_pricelist')
- if post.get('code'):
+ 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', '=', post.get('code'))])
+ pricelist_ids = pricelist_obj.search(request.cr, SUPERUSER_ID, [('code', '=', code)])
if pricelist_ids:
- order.write({'pricelist_id': pricelist_ids[0]})
+ pricelist_id = pricelist_ids[0]
- 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))
+ 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
- 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)
+ 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)
def add_product_to_cart(self, product_id=0, number=1, set_number=-1):
- context = {}
-
order_line_obj = request.registry.get('sale.order.line')
user_obj = request.registry.get('res.users')
product_id = product_id and int(product_id) or 0
order = get_current_order()
+ if not order:
+ order = get_order()
+ request.httprequest.session['ecommerce_order_id'] = order.id
+
+ context = {'pricelist': self.get_pricelist()}
quantity = 0
@@ -158,30 +170,61 @@ class Ecommerce(http.Controller):
quantity = set_number
else:
quantity = order_line['product_uom_qty'] + number
- if quantity <= 0:
- order_line_obj.unlink(request.cr, SUPERUSER_ID, order_line_ids, context=context)
+ if quantity < 0:
+ quantity = 0
else:
fields = [k for k, v in order_line_obj._columns.items()]
values = order_line_obj.default_get(request.cr, SUPERUSER_ID, fields, context=context)
quantity = 1
+
values['product_uom_qty'] = quantity
values['product_id'] = product_id
values['order_id'] = order.id
# change and record value
- if quantity > 0:
- pricelist_id = order.pricelist_id and order.pricelist_id.id or False
- values.update(order_line_obj.product_id_change(request.cr, SUPERUSER_ID, [], pricelist_id, product_id,
- partner_id=user_obj.browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id,
- context=context)['value'])
- if order_line_ids:
- order_line_obj.write(request.cr, SUPERUSER_ID, order_line_ids, values, context=context)
- else:
- order_line_id = order_line_obj.create(request.cr, SUPERUSER_ID, values, context=context)
- order.write({'order_line': [(4, order_line_id)]}, context=context)
+ pricelist_id = order.pricelist_id and order.pricelist_id.id or False
+
+ vals = order_line_obj.product_id_change(request.cr, SUPERUSER_ID, [], pricelist_id, product_id,
+ partner_id=user_obj.browse(request.cr, SUPERUSER_ID, request.uid).partner_id.id,
+ context=context)['value']
+
+ values.update(vals)
+ if order_line_ids:
+ order_line_obj.write(request.cr, SUPERUSER_ID, order_line_ids, values, context=context)
+ if not quantity:
+ order_line_obj.unlink(request.cr, SUPERUSER_ID, order_line_ids, context=context)
+ else:
+ order_line_id = order_line_obj.create(request.cr, SUPERUSER_ID, values, context=context)
+ order.write({'order_line': [(4, order_line_id)]}, context=context)
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//add_cart/', '/shop/add_cart/', '/shop/add_cart//', '/shop//add_cart//'], 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))
@@ -319,7 +362,6 @@ class Ecommerce(http.Controller):
shipping_id = partner_obj.create(request.cr, SUPERUSER_ID, shipping_value)
order_value = {
- 'state': 'progress',
'partner_id': partner_id,
'partner_invoice_id': partner_id,
'partner_shipping_id': shipping_id or partner_id
@@ -327,17 +369,14 @@ class Ecommerce(http.Controller):
order_value.update(request.registry.get('sale.order').onchange_partner_id(request.cr, SUPERUSER_ID, [], request.uid, context={})['value'])
order.write(order_value)
- request.httprequest.session['ecommerce_order_id_old'] = order.id
- request.httprequest.session['ecommerce_order_id'] = None
-
return werkzeug.utils.redirect("/shop/payment/")
@http.route(['/shop/payment/'], type='http', auth="public")
def payment(self, **post):
website = request.registry['website']
- order = get_order(request.httprequest.session.get('ecommerce_order_id_old'))
+ order = get_current_order()
- if order.state != 'progress':
+ if not order or not order.order_line:
return self.mycart(**post)
values = website.get_rendering_context({
@@ -354,4 +393,10 @@ class Ecommerce(http.Controller):
return website.render("website_sale.payment", values)
+ @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/static/src/js/website_sale.js b/addons/website_sale/static/src/js/website_sale.js
index 6d72a829b1d..e79b6a4341c 100644
--- a/addons/website_sale/static/src/js/website_sale.js
+++ b/addons/website_sale/static/src/js/website_sale.js
@@ -1,13 +1,19 @@
$(document).ready(function () {
- $(".oe_website_sale input[name='shipping_different']").change(function() {
+ $(".oe_website_sale input[name='shipping_different']").change(function () {
$(".oe_website_sale .js_shipping").toggle();
});
- $(".oe_website_sale .oe_mycart input.js_quantity").change(function() {
+ $(".oe_website_sale .oe_mycart input.js_quantity").change(function () {
var value = parseInt($(this).val());
if (!isNaN(value)) {
window.location.href = window.location.origin + window.location.pathname + 'set_cart/' + $(this).data('id') + '/' + value + '/';
}
});
+ $payment = $(".oe_website_sale .js_payment");
+ $("input[name='payment_type']", $payment).click(function (ev) {
+ var payment_id = $(ev.target).val();
+ $("div[data-id]", $payment).addClass("hidden");
+ $("a.btn:last, div[data-id='"+payment_id+"']", $payment).removeClass("hidden");
+ });
});
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 107a6517c58..5c71e4ce29b 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -22,7 +22,7 @@
My cart
-
+
@@ -62,7 +62,7 @@
Testimonial
-
-
+
+
-
+
-
- ![]()
-
-
-
-
-
+
Trusted by millions worldwide
+Our public references
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ | Address | |
|---|---|
| Website | |
| Tel | |
| Tel | |
| Fax | |
@@ -196,7 +201,7 @@
My Shopping Cart
-| Quantity | -|||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Your cart is empty | |||||||||||||||||||||||||||||||
|
|
-
- + |
- |
@@ -250,15 +253,12 @@
Subtotal | Taxes | Total
| ||||||||||||||||||||||||||
| Proceed To Payment | -|||||||||||||||||||||||||||||||
| Subtotal | |||||||||||||||||||||||||||||||
| Taxes | |||||||||||||||||||||||||||||||
Total |
| ||||||||||||||||||||||||||||||
-
+
| Product | @@ -533,7 +537,7 @@|||
|---|---|---|---|
-
diff --git a/addons/website_sale/website_sale.py b/addons/website_sale/website_sale.py
index f03f70a4c80..c2ebf31bd3e 100644
--- a/addons/website_sale/website_sale.py
+++ b/addons/website_sale/website_sale.py
@@ -32,7 +32,7 @@ class product_template(osv.osv):
_inherit = "product.template"
_columns = {
'website_published': fields.boolean('Available in the website'),
- 'description_website': fields.html('Description for the website'),
+ 'website_description': fields.html('Description for the website'),
'suggested_product_id': fields.many2one('product.product', 'Suggested For Product'),
'suggested_product_ids': fields.one2many('product.product', 'suggested_product_id', 'Suggested Products'),
}
+