mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-30 00:22:25 +00:00
Merge branch 'fix_online_payment' into crans
This commit is contained in:
commit
baacc0ce22
5 changed files with 47 additions and 8 deletions
|
@ -31,17 +31,18 @@ def add_comnpay(apps, schema_editor):
|
||||||
comnpay.payment = payment
|
comnpay.payment = payment
|
||||||
comnpay.save()
|
comnpay.save()
|
||||||
payment.moyen = "ComnPay"
|
payment.moyen = "ComnPay"
|
||||||
|
|
||||||
payment.save()
|
payment.save()
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
('preferences', '0044_remove_payment_pass'),
|
||||||
('cotisations', '0031_article_allow_self_subscription'),
|
('cotisations', '0031_article_allow_self_subscription'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.RunSQL('update preferences_assooption set payment_pass="" where id=1;'),
|
|
||||||
migrations.CreateModel(
|
migrations.CreateModel(
|
||||||
name='ChequePayment',
|
name='ChequePayment',
|
||||||
fields=[
|
fields=[
|
||||||
|
@ -60,6 +61,6 @@ class Migration(migrations.Migration):
|
||||||
],
|
],
|
||||||
bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
|
bases=(cotisations.payment_methods.mixins.PaymentMethodMixin, models.Model),
|
||||||
),
|
),
|
||||||
migrations.RunPython(add_comnpay),
|
# migrations.RunPython(add_comnpay),
|
||||||
migrations.RunPython(add_cheque),
|
# migrations.RunPython(add_cheque),
|
||||||
]
|
]
|
||||||
|
|
|
@ -1,3 +1,23 @@
|
||||||
|
# -*- mode: python; coding: utf-8 -*-
|
||||||
|
# Re2o est un logiciel d'administration développé initiallement au rezometz. Il
|
||||||
|
# se veut agnostique au réseau considéré, de manière à être installable en
|
||||||
|
# quelques clics.
|
||||||
|
#
|
||||||
|
# Copyright © 2018 Hugo Levy-Falk
|
||||||
|
#
|
||||||
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# This program is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License along
|
||||||
|
# with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
from . import views
|
from . import views
|
||||||
|
|
||||||
|
|
20
preferences/migrations/0044_remove_payment_pass.py
Normal file
20
preferences/migrations/0044_remove_payment_pass.py
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# Generated by Django 1.10.7 on 2018-07-05 13:40
|
||||||
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('preferences', '0035_optionaluser_allow_self_subscription'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='assooption',
|
||||||
|
name='payment_pass',
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
|
@ -8,7 +8,8 @@ from django.db import migrations
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('preferences', '0035_optionaluser_allow_self_subscription'),
|
('preferences', '0044_remove_payment_pass'),
|
||||||
|
('cotisations', '0032_chequepayment_comnpaypayment'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
@ -20,10 +21,6 @@ class Migration(migrations.Migration):
|
||||||
model_name='assooption',
|
model_name='assooption',
|
||||||
name='payment_id',
|
name='payment_id',
|
||||||
),
|
),
|
||||||
migrations.RemoveField(
|
|
||||||
model_name='assooption',
|
|
||||||
name='payment_pass',
|
|
||||||
),
|
|
||||||
migrations.RemoveField(
|
migrations.RemoveField(
|
||||||
model_name='optionaluser',
|
model_name='optionaluser',
|
||||||
name='allow_self_subscription',
|
name='allow_self_subscription',
|
|
@ -10,6 +10,7 @@ class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('topologie', '0029_auto_20171002_0334'),
|
('topologie', '0029_auto_20171002_0334'),
|
||||||
|
('machines', '0049_vlan'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
|
|
Loading…
Reference in a new issue