[FIX] website_sale*: handle no delivery methods in website
Display a user friendly message instead of crashing when there is not delivery method available for a specific order
This commit is contained in:
parent
cad29b0fdf
commit
38668fd404
|
@ -595,6 +595,7 @@ class website_sale(http.Controller):
|
|||
"""
|
||||
cr, uid, context = request.cr, request.uid, request.context
|
||||
payment_obj = request.registry.get('payment.acquirer')
|
||||
sale_order_obj = request.registry.get('sale.order')
|
||||
|
||||
order = request.website.sale_get_order(context=context)
|
||||
|
||||
|
@ -612,26 +613,28 @@ class website_sale(http.Controller):
|
|||
values = {
|
||||
'order': request.registry['sale.order'].browse(cr, SUPERUSER_ID, order.id, context=context)
|
||||
}
|
||||
values.update(request.registry.get('sale.order')._get_website_data(cr, uid, order, context))
|
||||
values['errors'] = sale_order_obj._get_errors(cr, uid, order, context=context)
|
||||
values.update(sale_order_obj._get_website_data(cr, uid, order, context))
|
||||
|
||||
# fetch all registered payment means
|
||||
# if tx:
|
||||
# acquirer_ids = [tx.acquirer_id.id]
|
||||
# else:
|
||||
acquirer_ids = payment_obj.search(cr, SUPERUSER_ID, [('website_published', '=', True), ('company_id', '=', order.company_id.id)], context=context)
|
||||
values['acquirers'] = list(payment_obj.browse(cr, uid, acquirer_ids, context=context))
|
||||
render_ctx = dict(context, submit_class='btn btn-primary', submit_txt=_('Pay Now'))
|
||||
for acquirer in values['acquirers']:
|
||||
acquirer.button = payment_obj.render(
|
||||
cr, SUPERUSER_ID, acquirer.id,
|
||||
order.name,
|
||||
order.amount_total,
|
||||
order.pricelist_id.currency_id.id,
|
||||
partner_id=shipping_partner_id,
|
||||
tx_values={
|
||||
'return_url': '/shop/payment/validate',
|
||||
},
|
||||
context=render_ctx)
|
||||
if not values['errors']:
|
||||
acquirer_ids = payment_obj.search(cr, SUPERUSER_ID, [('website_published', '=', True), ('company_id', '=', order.company_id.id)], context=context)
|
||||
values['acquirers'] = list(payment_obj.browse(cr, uid, acquirer_ids, context=context))
|
||||
render_ctx = dict(context, submit_class='btn btn-primary', submit_txt=_('Pay Now'))
|
||||
for acquirer in values['acquirers']:
|
||||
acquirer.button = payment_obj.render(
|
||||
cr, SUPERUSER_ID, acquirer.id,
|
||||
order.name,
|
||||
order.amount_total,
|
||||
order.pricelist_id.currency_id.id,
|
||||
partner_id=shipping_partner_id,
|
||||
tx_values={
|
||||
'return_url': '/shop/payment/validate',
|
||||
},
|
||||
context=render_ctx)
|
||||
|
||||
return request.website.render("website_sale.payment", values)
|
||||
|
||||
|
|
|
@ -1017,6 +1017,14 @@
|
|||
</ul>
|
||||
<h1 class="mb32">Validate Order</h1>
|
||||
<div class="row">
|
||||
<div class="col-lg-8 col-sm-9">
|
||||
<t t-foreach="errors" t-as="error">
|
||||
<div class="alert alert-danger" t-if="error">
|
||||
<h4><t t-esc="error[0]"/></h4>
|
||||
<t t-esc="error[1]"/>
|
||||
</div>
|
||||
</t>
|
||||
</div>
|
||||
<div class="col-lg-8 col-sm-9 oe_cart">
|
||||
<t t-set="website_sale_order" t-value="website.sale_get_order()"/>
|
||||
<table class='table table-striped table-condensed' id="cart_products" t-if="website_sale_order and website_sale_order.website_order_line">
|
||||
|
|
|
@ -95,10 +95,9 @@ class SaleOrder(orm.Model):
|
|||
# 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
|
||||
for delivery_id in list(delivery_ids):
|
||||
grid_id = carrier_obj.grid_get(cr, SUPERUSER_ID, [delivery_id], order.partner_shipping_id.id)
|
||||
if not grid_id:
|
||||
delivery_ids.remove(delivery_id)
|
||||
for delivery_id in carrier_obj.browse(cr, SUPERUSER_ID, delivery_ids, context=dict(context, order_id=order.id)):
|
||||
if not delivery_id.available:
|
||||
delivery_ids.remove(delivery_id.id)
|
||||
return delivery_ids
|
||||
|
||||
def _get_errors(self, cr, uid, order, context=None):
|
||||
|
|
Loading…
Reference in New Issue