From 72761d50e5c3aa0fe1bc6e7d3b3ca1284839837f Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sun, 17 Jan 2021 12:09:49 +0100 Subject: [PATCH] lingo: set Regie.can_pay_only_one_basket_item default to True (#48281) --- .../migrations/0041_regie_can_pay_only_one_basket_item.py | 2 +- combo/apps/lingo/models.py | 2 +- tests/test_lingo_payment.py | 8 +++++--- tests/test_lingo_remote_regie.py | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/combo/apps/lingo/migrations/0041_regie_can_pay_only_one_basket_item.py b/combo/apps/lingo/migrations/0041_regie_can_pay_only_one_basket_item.py index be751266..1c681941 100644 --- a/combo/apps/lingo/migrations/0041_regie_can_pay_only_one_basket_item.py +++ b/combo/apps/lingo/migrations/0041_regie_can_pay_only_one_basket_item.py @@ -15,6 +15,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='regie', name='can_pay_only_one_basket_item', - field=models.BooleanField(default=False, verbose_name='Basket items must be paid individually'), + field=models.BooleanField(default=True, verbose_name='Basket items must be paid individually'), ), ] diff --git a/combo/apps/lingo/models.py b/combo/apps/lingo/models.py index 52cd9bf5..a1eabc07 100644 --- a/combo/apps/lingo/models.py +++ b/combo/apps/lingo/models.py @@ -190,7 +190,7 @@ class Regie(models.Model): PaymentBackend, on_delete=models.CASCADE, verbose_name=_('Payment backend')) transaction_options = JSONField(blank=True, verbose_name=_('Transaction Options')) can_pay_only_one_basket_item = models.BooleanField( - default=False, verbose_name=_('Basket items must be paid individually') + default=True, verbose_name=_('Basket items must be paid individually') ) def is_remote(self): diff --git a/tests/test_lingo_payment.py b/tests/test_lingo_payment.py index ef42492f..74ca4eb2 100644 --- a/tests/test_lingo_payment.py +++ b/tests/test_lingo_payment.py @@ -65,6 +65,7 @@ def regie(): regie.label = 'Test' regie.slug = 'test' regie.description = 'test' + regie.can_pay_only_one_basket_item = False regie.payment_min_amount = Decimal(4.5) regie.payment_backend = payment_backend regie.save() @@ -81,7 +82,7 @@ def remote_regie(): try: regie = Regie.objects.get(slug='remote') except Regie.DoesNotExist: - regie = Regie() + regie = Regie(can_pay_only_one_basket_item=False) regie.label = 'Remote' regie.slug = 'remote' regie.description = 'remote' @@ -152,6 +153,7 @@ def test_default_regie(): payment_backend = PaymentBackend.objects.create(label='foo', slug='foo') Regie.objects.all().delete() regie1 = Regie(label='foo', slug='foo', payment_backend=payment_backend) + regie.can_pay_only_one_basket_item = False regie1.save() assert bool(regie1.is_default) is True regie2 = Regie(label='bar', slug='bar', payment_backend=payment_backend) @@ -195,7 +197,7 @@ def test_transaction_manual_validation(app, basket_page, user, monkeypatch): ) regie = Regie.objects.create( label='Test', slug='test', description='test', payment_backend=pb, - transaction_options={'manual_validation': True}) + transaction_options={'manual_validation': True}, can_pay_only_one_basket_item=False) BasketItem.objects.create( user=user, regie=regie, subject='item1', amount='1.5', source_url='/item/1') @@ -257,7 +259,7 @@ def test_successfull_items_payment(app, basket_page, regie, user, with_payment_b def test_add_amount_to_basket(app, key, regie, user_name_id): payment_backend = PaymentBackend.objects.create( label='test2', slug='test2', service='dummy', service_options={'siret': '1234'}) - other_regie = Regie(label='test2', slug='test2', payment_backend=payment_backend) + other_regie = Regie(label='test2', slug='test2', payment_backend=payment_backend, can_pay_only_one_basket_item=False) other_regie.save() data = {'display_name': 'test amount', diff --git a/tests/test_lingo_remote_regie.py b/tests/test_lingo_remote_regie.py index 95410d04..cf7b5c10 100644 --- a/tests/test_lingo_remote_regie.py +++ b/tests/test_lingo_remote_regie.py @@ -86,6 +86,7 @@ def remote_regie(): regie.label = 'Remote' regie.slug = 'remote' regie.description = 'remote' + regie.can_pay_only_one_basket_item = False regie.payment_min_amount = Decimal(2.0) regie.payment_backend = payment_backend regie.webservice_url = 'http://example.org/regie' # is_remote -- 2.29.2