Removed xml fields escaping

Edited billing info table so that fields has the right length
This commit is contained in:
Théo DURR 2023-01-07 15:15:38 +01:00
parent ef52dd792c
commit feac603db9
No known key found for this signature in database
GPG Key ID: 708858E9F7281E30
3 changed files with 51 additions and 4 deletions

View File

@ -0,0 +1,47 @@
# Generated by Django 3.2.16 on 2023-01-07 14:13
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('counter', '0019_billinginfo'),
]
operations = [
migrations.AlterModelOptions(
name='producttype',
options={'ordering': ['-priority', 'name'], 'verbose_name': 'product type'},
),
migrations.AlterField(
model_name='billinginfo',
name='address_1',
field=models.CharField(max_length=50, verbose_name='Address 1'),
),
migrations.AlterField(
model_name='billinginfo',
name='address_2',
field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Address 2'),
),
migrations.AlterField(
model_name='billinginfo',
name='city',
field=models.CharField(max_length=50, verbose_name='City'),
),
migrations.AlterField(
model_name='billinginfo',
name='first_name',
field=models.CharField(max_length=22, verbose_name='First name'),
),
migrations.AlterField(
model_name='billinginfo',
name='last_name',
field=models.CharField(max_length=22, verbose_name='Last name'),
),
migrations.AlterField(
model_name='billinginfo',
name='zip_code',
field=models.CharField(max_length=16, verbose_name='Zip code'),
),
]

View File

@ -154,8 +154,8 @@ class BillingInfo(models.Model):
# declaring surname and name even though they are already defined
# in User add some redundancy, but ensures that the billing infos
# shall stay correct, whatever shenanigans the user commits on its profile
first_name = models.CharField(_("First name"), max_length=30)
last_name = models.CharField(_("Last name"), max_length=30)
first_name = models.CharField(_("First name"), max_length=22)
last_name = models.CharField(_("Last name"), max_length=22)
address_1 = models.CharField(_("Address 1"), max_length=50)
address_2 = models.CharField(_("Address 2"), max_length=50, blank=True, null=True)
zip_code = models.CharField(_("Zip code"), max_length=16) # code postal

View File

@ -206,8 +206,8 @@ class Basket(models.Model):
cart, newlines=False
)
data += [
("PBX_SHOPPINGCART", html.escape(cart)),
("PBX_BILLING", html.escape(customer.billing_infos.to_3dsv2_xml())),
("PBX_SHOPPINGCART", cart),
("PBX_BILLING", customer.billing_infos.to_3dsv2_xml()),
]
pbx_hmac = hmac.new(
settings.SITH_EBOUTIC_HMAC_KEY,