Projet

Général

Profil

0001-lingo-set-Regie.can_pay_only_one_basket_item-default.patch

Benjamin Dauvergne, 29 janvier 2021 17:14

Télécharger (4,71 ko)

Voir les différences:

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(-)
combo/apps/lingo/migrations/0041_regie_can_pay_only_one_basket_item.py
15 15
        migrations.AddField(
16 16
            model_name='regie',
17 17
            name='can_pay_only_one_basket_item',
18
            field=models.BooleanField(default=False, verbose_name='Basket items must be paid individually'),
18
            field=models.BooleanField(default=True, verbose_name='Basket items must be paid individually'),
19 19
        ),
20 20
    ]
combo/apps/lingo/models.py
190 190
        PaymentBackend, on_delete=models.CASCADE, verbose_name=_('Payment backend'))
191 191
    transaction_options = JSONField(blank=True, verbose_name=_('Transaction Options'))
192 192
    can_pay_only_one_basket_item = models.BooleanField(
193
        default=False, verbose_name=_('Basket items must be paid individually')
193
        default=True, verbose_name=_('Basket items must be paid individually')
194 194
    )
195 195

  
196 196
    def is_remote(self):
tests/test_lingo_payment.py
65 65
        regie.label = 'Test'
66 66
        regie.slug = 'test'
67 67
        regie.description = 'test'
68
        regie.can_pay_only_one_basket_item = False
68 69
        regie.payment_min_amount = Decimal(4.5)
69 70
        regie.payment_backend = payment_backend
70 71
        regie.save()
......
81 82
    try:
82 83
        regie = Regie.objects.get(slug='remote')
83 84
    except Regie.DoesNotExist:
84
        regie = Regie()
85
        regie = Regie(can_pay_only_one_basket_item=False)
85 86
        regie.label = 'Remote'
86 87
        regie.slug = 'remote'
87 88
        regie.description = 'remote'
......
152 153
    payment_backend = PaymentBackend.objects.create(label='foo', slug='foo')
153 154
    Regie.objects.all().delete()
154 155
    regie1 = Regie(label='foo', slug='foo', payment_backend=payment_backend)
156
    regie.can_pay_only_one_basket_item = False
155 157
    regie1.save()
156 158
    assert bool(regie1.is_default) is True
157 159
    regie2 = Regie(label='bar', slug='bar', payment_backend=payment_backend)
......
195 197
    )
196 198
    regie = Regie.objects.create(
197 199
        label='Test', slug='test', description='test', payment_backend=pb,
198
        transaction_options={'manual_validation': True})
200
        transaction_options={'manual_validation': True}, can_pay_only_one_basket_item=False)
199 201
    BasketItem.objects.create(
200 202
        user=user, regie=regie, subject='item1', amount='1.5', source_url='/item/1')
201 203

  
......
257 259
def test_add_amount_to_basket(app, key, regie, user_name_id):
258 260
    payment_backend = PaymentBackend.objects.create(
259 261
            label='test2', slug='test2', service='dummy', service_options={'siret': '1234'})
260
    other_regie = Regie(label='test2', slug='test2', payment_backend=payment_backend)
262
    other_regie = Regie(label='test2', slug='test2', payment_backend=payment_backend, can_pay_only_one_basket_item=False)
261 263
    other_regie.save()
262 264

  
263 265
    data = {'display_name': 'test amount',
tests/test_lingo_remote_regie.py
86 86
        regie.label = 'Remote'
87 87
        regie.slug = 'remote'
88 88
        regie.description = 'remote'
89
        regie.can_pay_only_one_basket_item = False
89 90
        regie.payment_min_amount = Decimal(2.0)
90 91
        regie.payment_backend = payment_backend
91 92
        regie.webservice_url = 'http://example.org/regie' # is_remote
92
-