pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MIG] website_sale_delivery: new api migration

Browse Source
This commit is contained in:
Ravi Gadhia
2016-03-23 12:05:08 +01:00
committed by Martin Trigaux
parent 67d95df511
commit 4e49df4eb0
2 changed files with 88 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website_sale_delivery/controllers/main.py
+11 -13
View File
@@ -1,39 +1,37 @@
# -*- coding: utf-8 -*-
import openerp
from openerp import http
from openerp.http import request
from openerp.addons.website_sale.controllers.main import WebsiteSale
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import http
from odoo.http import request
from odoo.addons.website_sale.controllers.main import WebsiteSale
class website_sale(WebsiteSale):
class WebsiteSaleDelivery(WebsiteSale):
@http.route(['/shop/payment'], type='http', auth="public", website=True)
def payment(self, **post):
cr, uid, context = request.cr, request.uid, request.context
order = request.website.sale_get_order()
carrier_id = post.get('carrier_id')
if carrier_id:
carrier_id = int(carrier_id)
if order:
request.registry['sale.order']._check_carrier_quotation(cr, uid, order, force_carrier_id=carrier_id, context=context)
order._check_carrier_quotation(force_carrier_id=carrier_id)
if carrier_id:
return request.redirect("/shop/payment")
res = super(website_sale, self).payment(**post)
return res
return super(WebsiteSaleDelivery, self).payment(**post)
def order_lines_2_google_api(self, order_lines):
""" Transforms a list of order lines into a dict for google analytics """
order_lines_not_delivery = [line for line in order_lines if not line.is_delivery]
return super(website_sale, self).order_lines_2_google_api(order_lines_not_delivery)
order_lines_not_delivery = order_lines.filtered(lambda line: not line.is_delivery)
return super(WebsiteSaleDelivery, self).order_lines_2_google_api(order_lines_not_delivery)
def checkout_values(self, data=None):
values = super(website_sale, self).checkout_values(data)
values = super(WebsiteSaleDelivery, self).checkout_values(data)
return request.env['sale.order']._get_shipping_country(values)
def order_2_return_dict(self, order):
""" Returns the tracking_cart dict of the order for Google analytics """
ret = super(website_sale, self).order_2_return_dict(order)
ret = super(WebsiteSaleDelivery, self).order_2_return_dict(order)
for line in order.order_line:
if line.is_delivery:
ret['transaction']['shipping'] = line.price_unit
addons/website_sale_delivery/models/sale_order.py
+77 -120
View File
@@ -1,192 +1,149 @@
# -*- coding: utf-8 -*-
import logging
from openerp.osv import orm, fields
from openerp import SUPERUSER_ID
from openerp.addons import decimal_precision
from openerp.exceptions import ValidationError
from openerp.tools.translate import _
from odoo import api, fields, models, _
from odoo.exceptions import ValidationError
_logger = logging.getLogger(__name__)
class delivery_carrier(orm.Model):
class DeliveryCarrier(models.Model):
_name = 'delivery.carrier'
_inherit = ['delivery.carrier', 'website.published.mixin']
_columns = {
'website_description': fields.related('product_id', 'description_sale', type="text", string='Description for Online Quotations'),
}
_defaults = {
'website_published': False
}
website_description = fields.Text(related='product_id.description_sale', string='Description for Online Quotations')
website_published = fields.Boolean(default=False)
class SaleOrder(orm.Model):
class SaleOrder(models.Model):
_inherit = 'sale.order'
def _amount_delivery(self, cr, uid, ids, field_name, arg, context=None):
res = {}
for order in self.browse(cr, uid, ids, context=context):
res[order.id] = {}
res[order.id]['amount_delivery'] = sum([line.price_subtotal for line in order.order_line if line.is_delivery])
return res
amount_delivery = fields.Monetary(
compute='_compute_amount_delivery', digits=0,
string='Delivery Amount',
help="The amount without tax.", store=True, track_visibility='always')
has_delivery = fields.Boolean(
compute='_compute_has_delivery', string='Has delivery',
help="Has an order line set for delivery", store=True)
website_order_line = fields.One2many(
'sale.order.line', 'order_id',
string='Order Lines displayed on Website', readonly=True,
domain=[('is_delivery', '=', False)],
help='Order Lines to be displayed on the website. They should not be used for computation purpose.')
def _has_delivery(self, cr, uid, ids, field_name, arg, context=None):
result = dict.fromkeys(ids, False)
for so in self.browse(cr, uid, ids, context=context):
for line in so.order_line:
if line.is_delivery:
result[so.id] = True
break
return result
@api.depends('order_line.price_unit', 'order_line.tax_id', 'order_line.discount', 'order_line.product_uom_qty')
def _compute_amount_delivery(self):
for order in self:
order.amount_delivery = sum(order.order_line.filtered('is_delivery').mapped('price_subtotal'))
def _get_order(self, cr, uid, ids, context=None):
result = {}
for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context):
result[line.order_id.id] = True
return result.keys()
_columns = {
'amount_delivery': fields.function(
_amount_delivery, type='float', digits=0,
string='Delivery Amount',
store={
'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
'sale.order.line': (_get_order, ['price_unit', 'tax_id', 'discount', 'product_uom_qty'], 10),
},
multi='sums', help="The amount without tax.", track_visibility='always'
),
'has_delivery': fields.function(
_has_delivery, type='boolean', string='Has delivery',
store={
'sale.order': (lambda self, cr, uid, ids, c={}: ids, ['order_line'], 10),
'sale.order.line': (_get_order, ['is_delivery'], 10),
},
help="Has an order line set for delivery"
),
'website_order_line': fields.one2many(
'sale.order.line', 'order_id',
string='Order Lines displayed on Website', readonly=True,
domain=[('is_delivery', '=', False)],
help='Order Lines to be displayed on the website. They should not be used for computation purpose.',
),
}
def _check_carrier_quotation(self, cr, uid, order, force_carrier_id=None, context=None):
carrier_obj = self.pool.get('delivery.carrier')
@api.depends('order_line.is_delivery')
def _compute_has_delivery(self):
for order in self:
order.has_delivery = any(order.order_line.filtered('is_delivery'))
def _check_carrier_quotation(self, force_carrier_id=None):
# check to add or remove carrier_id
if not order:
if not self:
return False
if all(line.product_id.type in ("service", "digital") for line in order.website_order_line):
order.write({'carrier_id': None})
self.pool['sale.order']._delivery_unset(cr, SUPERUSER_ID, [order.id], context=context)
self.ensure_one()
if self.only_services:
self.write({'carrier_id': None})
self._delivery_unset()
return True
else:
carrier_id = force_carrier_id or order.carrier_id.id
carrier_ids = self._get_delivery_methods(cr, uid, order, context=context)
else:
carrier_id = force_carrier_id or self.carrier_id.id
carrier_ids = self._get_delivery_methods()
if carrier_id:
if carrier_id not in carrier_ids:
carrier_id = False
else:
carrier_ids.remove(carrier_id)
carrier_ids.insert(0, carrier_id)
if force_carrier_id or not carrier_id or not carrier_id in carrier_ids:
for delivery_id in carrier_ids:
carrier = carrier_obj.verify_carrier(cr, SUPERUSER_ID, [delivery_id], order.partner_shipping_id)
if force_carrier_id or not carrier_id or carrier_id not in carrier_ids:
for delivery in self.env['delivery.carrier'].sudo().browse(carrier_ids):
carrier = delivery.verify_carrier(self.partner_shipping_id)
if carrier:
carrier_id = delivery_id
carrier_id = delivery.id
break
order.write({'carrier_id': carrier_id})
self.write({'carrier_id': carrier_id})
if carrier_id:
order.delivery_set()
self.delivery_set()
else:
order._delivery_unset()
self._delivery_unset()
return bool(carrier_id)
def _get_delivery_methods(self, cr, uid, order, context=None):
carrier_obj = self.pool.get('delivery.carrier')
carrier_ids = carrier_obj.search(cr, SUPERUSER_ID, [('website_published', '=', True)], context=context)
def _get_delivery_methods(self):
self.ensure_one()
available_carrier_ids = []
# Following loop is done to avoid displaying delivery methods who are not available for this order
# This can surely be done in a more efficient way, but at the moment, it mimics the way it's
# done in delivery_set method of sale.py, from delivery module
new_context = dict(context, order_id=order.id)
for carrier in carrier_ids:
carriers = self.env['delivery.carrier'].with_context(order_id=self.id).sudo().search(
[('website_published', '=', True)])
for carrier in carriers:
try:
_logger.debug("Checking availability of carrier #%s" % carrier)
available = carrier_obj.read(cr, SUPERUSER_ID, [carrier], fields=['available'], context=new_context)[0]['available']
_logger.debug("Checking availability of carrier #%s" % carrier.id)
available = carrier.read(fields=['available'])[0]['available']
if available:
available_carrier_ids = available_carrier_ids + [carrier]
available_carrier_ids.append(carrier.id)
except ValidationError as e:
# RIM: hack to remove in master, because available field should not depend on a SOAP call to external shipping provider
# RIM TODO: hack to remove, make available field not depend on a SOAP call to external shipping provider
# The validation error is used in backend to display errors in fedex config, but should fail silently in frontend
_logger.debug("Carrier #%s removed from e-commerce carrier list. %s" % (carrier, e))
_logger.debug("Carrier #%s removed from e-commerce carrier list. %s" % (carrier.id, e))
return available_carrier_ids
def _get_errors(self, cr, uid, order, context=None):
errors = super(SaleOrder, self)._get_errors(cr, uid, order, context=context)
if not self._get_delivery_methods(cr, uid, order, context=context):
@api.model
def _get_errors(self, order):
errors = super(SaleOrder, self)._get_errors(order)
if not order._get_delivery_methods():
errors.append(
(_('Sorry, we are unable to ship your order'),
_('No shipping method is available for your current order and shipping address. '
'Please contact us for more information.')))
return errors
def _get_website_data(self, cr, uid, order, context=None):
@api.model
def _get_website_data(self, order):
""" Override to add delivery-related website data. """
values = super(SaleOrder, self)._get_website_data(cr, uid, order, context=context)
values = super(SaleOrder, self)._get_website_data(order)
# We need a delivery only if we have stockable products
has_stockable_products = False
for line in order.order_line:
if line.product_id.type in ('consu', 'product'):
has_stockable_products = True
has_stockable_products = any(order.order_line.filtered(lambda line: line.product_id.type in ['consu', 'product']))
if not has_stockable_products:
return values
delivery_ctx = dict(context, order_id=order.id)
DeliveryCarrier = self.pool.get('delivery.carrier')
delivery_ids = self._get_delivery_methods(cr, uid, order, context=context)
delivery_ids = order._get_delivery_methods()
values['deliveries'] = DeliveryCarrier.browse(cr, SUPERUSER_ID, delivery_ids, context=delivery_ctx)
values['deliveries'] = self.env['delivery.carrier'].sudo().with_context(order_id=order.id).browse(delivery_ids)
return values
def _cart_update(self, cr, uid, ids, product_id=None, line_id=None, add_qty=0, set_qty=0, context=None, **kwargs):
@api.multi
def _cart_update(self, product_id=None, line_id=None, add_qty=0, set_qty=0, **kwargs):
""" Override to update carrier quotation if quantity changed """
values = super(SaleOrder, self)._cart_update(
cr, uid, ids, product_id, line_id, add_qty, set_qty, context, **kwargs)
values = super(SaleOrder, self)._cart_update(product_id, line_id, add_qty, set_qty, **kwargs)
if add_qty or set_qty is not None:
for sale_order in self.browse(cr, uid, ids, context=context):
self._check_carrier_quotation(cr, uid, sale_order, context=context)
for sale_order in self:
self._check_carrier_quotation()
return values
def _get_shipping_country(self, cr, uid, values, context=None):
country_ids = set()
state_ids = set()
def _get_shipping_country(self, values):
countries = self.env['res.country']
states = self.env['res.country.state']
values['shipping_countries'] = values['countries']
values['shipping_states'] = values['states']
DeliveryCarrier = self.pool['delivery.carrier']
delivery_carrier_ids = DeliveryCarrier.search(cr, SUPERUSER_ID, [('website_published', '=', True)], context=context)
for carrier in DeliveryCarrier.browse(cr, SUPERUSER_ID, delivery_carrier_ids, context):
delivery_carriers = self.env['delivery.carrier'].sudo().search([('website_published', '=', True)])
for carrier in delivery_carriers:
if not carrier.country_ids and not carrier.state_ids:
return values
# Authorized shipping countries
country_ids = country_ids|set(carrier.country_ids.ids)
countries |= carrier.country_ids
# Authorized shipping countries without any state restriction
state_country_ids = [country.id for country in carrier.country_ids if country.id not in carrier.state_ids.mapped('country_id.id')]
state_countries = carrier.country_ids - carrier.state_ids.mapped('country_id')
# Authorized shipping states + all states from shipping countries without any state restriction
state_ids = state_ids|set(carrier.state_ids.ids)|set(values['states'].filtered(lambda r: r.country_id.id in state_country_ids).ids)
states |= carrier.state_ids | values['states'].filtered(lambda state: state.country_id in state_countries)
values['shipping_countries'] = values['countries'].filtered(lambda r: r.id in list(country_ids))
values['shipping_states'] = values['states'].filtered(lambda r: r.id in list(state_ids))
values['shipping_countries'] = values['countries'] & countries
values['shipping_states'] = values['states'] & states
return values