Commit 65fed745 authored by klafyvel's avatar klafyvel

Merge branch 'compay_fix' into 'dev'

Fix comnpay url

See merge request federez/re2o!251
parents 008fd836 9b58fc18
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-08-11 23:03
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('cotisations', '0030_custom_payment'),
]
operations = [
migrations.AddField(
model_name='comnpaypayment',
name='production',
field=models.BooleanField(default=True, verbose_name='Production mode enabled (production url, instead of homologation)'),
),
]
......@@ -65,6 +65,16 @@ class ComnpayPayment(PaymentMethodMixin, models.Model):
decimal_places=2,
default=1,
)
production = models.BooleanField(
default=True,
verbose_name=_l("Production mode enabled (production url, instead of homologation)"),
)
def return_url_comnpay(self):
if self.production:
return 'https://secure.comnpay.com'
else:
return 'https://secure.homologation.comnpay.com'
def end_payment(self, invoice, request):
"""
......@@ -87,8 +97,9 @@ class ComnpayPayment(PaymentMethodMixin, models.Model):
"",
"D"
)
r = {
'action': 'https://secure.homologation.comnpay.com',
'action': self.return_url_comnpay(),
'method': 'POST',
'content': p.buildSecretHTML(
_("Pay invoice no : ")+str(invoice.id),
......
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2018-08-15 20:02
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('users', '0074_auto_20180814_1059'),
('users', '0074_auto_20180810_2104'),
]
operations = [
]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment