odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] payment, website_sale: back port of f89e8f9

This commit is contained in:
Denis Ledoux 2016-03-23 14:05:23 +01:00
parent d39d191cec
commit e1b1f24516
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/payment/models/payment_acquirer.py
View File

@ -454,6 +454,14 @@ class PaymentTransaction(osv.Model):
'partner_phone': partner and partner.phone or False,
}}
def get_next_reference(self, cr, uid, reference, context=None):
ref_suffix = 1
init_ref = reference
while self.pool['payment.transaction'].search_count(cr, uid, [('reference', '=', reference)], context=context):
reference = init_ref + '-' + str(ref_suffix)
ref_suffix += 1
return reference
# --------------------------------------------------
# FORM RELATED METHODS
# --------------------------------------------------

10
addons/website_sale/controllers/main.py
View File

@ -687,18 +687,16 @@ class website_sale(http.Controller):
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:
if not values['errors']:
# find an already existing transaction
tx = request.website.sale_get_transaction()
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,
tx and tx.reference or request.env['payment.transaction'].get_next_reference(order.name),
order.amount_total,
order.pricelist_id.currency_id.id,
partner_id=shipping_partner_id,
@ -748,7 +746,7 @@ class website_sale(http.Controller):
'currency_id': order.pricelist_id.currency_id.id,
'partner_id': order.partner_id.id,
'partner_country_id': order.partner_id.country_id.id,
'reference': order.name,
'reference': request.env['payment.transaction'].get_next_reference(order.name),
'sale_order_id': order.id,
}, context=context)
request.session['sale_transaction_id'] = tx_id