From 8a5a1e12f0617652f17dc13ee9fdaf30d563211d Mon Sep 17 00:00:00 2001
From: Jose Luis Zanotti <joseluiszanotti@gmail.com>
Date: Sun, 21 Nov 2021 00:02:14 -0300
Subject: [PATCH 01/10] [MOD] Fix bootstrap class

---
 .../templates/events_base_paginated_list.html | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/website/events/templates/events_base_paginated_list.html b/website/events/templates/events_base_paginated_list.html
index 6192027..b789756 100644
--- a/website/events/templates/events_base_paginated_list.html
+++ b/website/events/templates/events_base_paginated_list.html
@@ -28,40 +28,43 @@
     {% block pagination %}
         {% if is_paginated %}
             <nav aria-label="Page navigation">
-                <ul class="pagination">
+            <br/>
+                <ul class="pagination justify-content-center">
                 {% if page_obj.has_previous %}
                 <li>
-                    <a href="{{ request.path }}?page={{ page_obj.previous_page_number }}" aria-label="Previous">
-                    <span aria-hidden="true">&laquo;</span>
+                    <a class="page-link" tabindex="-1" href="{{ request.path }}?page={{ page_obj.previous_page_number }}">
+                        <span aria-hidden="true">&laquo;</span>
+                        <span class="sr-only">Previous</span> 
                     </a>
                 </li>
                 {% else %}
-                <li class="disabled"> 
-                    <a href="#" aria-label="Previous">
-                    <span aria-hidden="true">&laquo;</span>
-                    </a>
+                <li class="disabled page-item"> 
+                    <span class="page-link" aria-hidden="true">&laquo;</span>
+                    <span class="page-link sr-only">Previous</span>
                 </li>
                 {% endif %}
                 
                 {% for i in paginator.page_range %}
                     {% if page_obj.number == i %}
-                        <li class="active"><span>{{ i }} <span class="sr-only">(current)</span></span></li>
+                        <li class="page-item active">
+                        <a class="page-link" href="#">{{ i }} <span class="sr-only">(current)</span></a>
                     {% else %}
-                        <li><a href="?page={{ i }}">{{ i }}</a></li>
+                        <li class="page-item"><a class="page-link" href="?page={{ i }}">{{ i }}</a></li>
                     {% endif %}
                 {% endfor %}
 
+
                 {% if page_obj.has_next %}
                 <li>
-                    <a href="{{ request.path }}?page={{ page_obj.next_page_number }}" aria-label="Next">
-                    <span aria-hidden="true">&raquo;</span>
+                    <a class="page-link" href="{{ request.path }}?page={{ page_obj.next_page_number }}" aria-label="Next">
+                        <span aria-hidden="true">&raquo;</span>
+                        <span class="sr-only">Next</span>
                     </a>
                 </li>
                 {% else %}
-                <li class="disabled">
-                    <a href="#" aria-label="Next">
-                    <span aria-hidden="true">&raquo;</span>
-                    </a>
+                <li class="page-item disabled">
+                    <span class="page-link" aria-hidden="true">&raquo;</span>
+                    <span class="page-link sr-only">Previous</span>
                 </li>
                 {% endif %}
                 </ul>

From 1f6b3fffb9a8f1f6d9234cc5e449a9479ff588b8 Mon Sep 17 00:00:00 2001
From: Facundo Batista <facundo@taniquetil.com.ar>
Date: Sun, 21 Nov 2021 18:14:33 -0300
Subject: [PATCH 02/10] Remove cardholder as it's no longer provided.

---
 website/members/management/commands/get_mercadopago_payments.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/members/management/commands/get_mercadopago_payments.py b/website/members/management/commands/get_mercadopago_payments.py
index d134e73..c89696c 100644
--- a/website/members/management/commands/get_mercadopago_payments.py
+++ b/website/members/management/commands/get_mercadopago_payments.py
@@ -59,7 +59,6 @@ def process_mercadopago(self, results, filter_payment_id, filter_payer_id):
 
             # some info to identify the payer in case it's not in our DB
             id_helper = {
-                'cardholder': info['card']['cardholder'],
                 'reason': info['description'],
                 'payment_id': info['id'],
             }

From d0da2445b73cd6f9afbdb7465a6510a6656b8b25 Mon Sep 17 00:00:00 2001
From: Jose Luis Zanotti <joseluiszanotti@gmail.com>
Date: Sun, 21 Nov 2021 00:17:26 -0300
Subject: [PATCH 03/10] [MOD] Fix lint

---
 website/events/factories.py                               | 3 ++-
 website/events/management/commands/load_providers_data.py | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/website/events/factories.py b/website/events/factories.py
index 13372ba..01f5a66 100644
--- a/website/events/factories.py
+++ b/website/events/factories.py
@@ -11,6 +11,7 @@
 
 fake = Faker("es_MX")
 
+
 class ProviderFactory(DjangoModelFactory):
     document_number = factory.fuzzy.FuzzyInteger(1, 99999999)
     bank_entity = fake.company
@@ -20,7 +21,7 @@ class ProviderFactory(DjangoModelFactory):
     cbu = fake.bban
 
     class Meta:
-        model = Provider 
+        model = Provider
         django_get_or_create = (
             "document_number",
         )
diff --git a/website/events/management/commands/load_providers_data.py b/website/events/management/commands/load_providers_data.py
index 06d6df8..2dad72a 100644
--- a/website/events/management/commands/load_providers_data.py
+++ b/website/events/management/commands/load_providers_data.py
@@ -15,8 +15,9 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         providers_count = Provider.objects.count()
         q = options["count"]
-        provider = ProviderFactory.create_batch(q)
+        ProviderFactory.create_batch(q)
         providers_count = Provider.objects.count() - providers_count
         self.stdout.write(
-            self.style.SUCCESS("Successfully created Providers instances (count %d)" % providers_count)
+            self.style.SUCCESS("Successfully created Providers instances (count %d)" 
+            % providers_count)
         )

From 4690a8f2ea71d1999f3407e7c0bac1a9e8b2c105 Mon Sep 17 00:00:00 2001
From: Jose Luis Zanotti <joseluiszanotti@gmail.com>
Date: Sun, 21 Nov 2021 00:27:53 -0300
Subject: [PATCH 04/10] [MOD] improve makefile and fix lint

---
 Makefile                                                  | 2 ++
 website/events/management/commands/load_providers_data.py | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 6383a17..5bd3fda 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@ help:
 	@echo "ps    -- show status"
 	@echo "dockershell -- run bash inside docker"
 	@echo "shell_plus -- run django shell_plus inside docker"
+	@echo "load_members_testdata -- populate the DB with members"
+	@echo "load_providers_test_data -- populate the DB with providers"
 
 RUN=docker-compose exec web
 MANAGE=${RUN} ./manage.py
diff --git a/website/events/management/commands/load_providers_data.py b/website/events/management/commands/load_providers_data.py
index 2dad72a..8181214 100644
--- a/website/events/management/commands/load_providers_data.py
+++ b/website/events/management/commands/load_providers_data.py
@@ -3,7 +3,7 @@
 """
 from django.core.management.base import BaseCommand
 from events.factories import ProviderFactory
-from events.models import Provider 
+from events.models import Provider
 
 
 class Command(BaseCommand):
@@ -18,6 +18,6 @@ def handle(self, *args, **options):
         ProviderFactory.create_batch(q)
         providers_count = Provider.objects.count() - providers_count
         self.stdout.write(
-            self.style.SUCCESS("Successfully created Providers instances (count %d)" 
-            % providers_count)
+            self.style.SUCCESS("Successfully created Providers instances (count %d)"
+                               % providers_count)
         )

From 6237d0cb5e76f700884c72c165f23447ef9e3e0d Mon Sep 17 00:00:00 2001
From: Jose Luis Zanotti <joseluiszanotti@gmail.com>
Date: Sun, 21 Nov 2021 12:24:09 -0300
Subject: [PATCH 05/10] [MOD] Fix Bootstrap and typo

---
 website/events/templates/organizers/organizer_detail.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/website/events/templates/organizers/organizer_detail.html b/website/events/templates/organizers/organizer_detail.html
index f7d1b73..129da90 100644
--- a/website/events/templates/organizers/organizer_detail.html
+++ b/website/events/templates/organizers/organizer_detail.html
@@ -35,8 +35,8 @@ <h3>Datos del organizador </h3>
             <a class="btn btn-primary btn-block text-uppercase" href="{% url 'organizer_change' organizer.pk %}"><i class="fas fa-pencil-alt"></i> Editar</a>
             {% endif %}
             {% if organizer.has_unpayment_refunds and perms.events.add_payment %}
-                <p>El organizasor contiene reintegros sin pagar. Para agregar un comprobante de pago para los reintegros del organizador ingrese aquí</p> <br/>
-                <a class="btn btn-primary" href="{% url 'organizer_refund_payment_create' pk=organizer.pk %}"><i class="fa fa-plus"> Comprobante de pago</i></a>
+                <p>El organizador contiene reintegros sin pagar. Para agregar un comprobante de pago para los reintegros del organizador ingrese aquí</p> <br/>
+                <a class="btn btn-primary" role="button" aria-pressed="true" href="{% url 'organizer_refund_payment_create' pk=organizer.pk %}"><i class="fa fa-plus"></i> Comprobante de pago</a>
             {% endif %}
         </div>
         <div class="col-md-6">

From 18f9de75e5836d11fd35ff48af2519c004b91c74 Mon Sep 17 00:00:00 2001
From: Jose Luis Zanotti <joseluiszanotti@gmail.com>
Date: Sun, 21 Nov 2021 15:42:34 -0300
Subject: [PATCH 06/10] [MOD] Remove unwanted text

---
 .../events/expenses/organizer_refunds_payment_form.html          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/website/events/templates/events/expenses/organizer_refunds_payment_form.html b/website/events/templates/events/expenses/organizer_refunds_payment_form.html
index 33769b6..7c8c4d2 100644
--- a/website/events/templates/events/expenses/organizer_refunds_payment_form.html
+++ b/website/events/templates/events/expenses/organizer_refunds_payment_form.html
@@ -64,7 +64,6 @@ <h4>Reintegros impagos: {{organizer}}</h4>
         <a class="btn btn-danger col-3 float-right mx-1" href="{{ go_to }}"><i class="fas fa-undo"></i> Volver</a>
         {% else %}
         <a class="btn btn-danger col-3 float-right mx-1" href="{{request.META.HTTP_REFERER}}"><i class="fas fa-undo"></i> Volver</a>
-        ">Volver</a>
         {% endif %}
     </form>
 </div>

From 6e6bfc8145d89801c395c6da989a70c658d6b417 Mon Sep 17 00:00:00 2001
From: Jose Luis Zanotti <joseluiszanotti@gmail.com>
Date: Sun, 21 Nov 2021 15:47:31 -0300
Subject: [PATCH 07/10] [MOD] Change text

---
 website/events/templates/events/event_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/events/templates/events/event_detail.html b/website/events/templates/events/event_detail.html
index 8d7aabe..eedcdc4 100644
--- a/website/events/templates/events/event_detail.html
+++ b/website/events/templates/events/event_detail.html
@@ -41,7 +41,7 @@ <h3>Organizadores <small><span class="badge badge-dark">{{organizers.count}}</sp
                      
                 {% endif %}
                 {% if perms.events.add_eventorganizer %}
-                    <a class="btn btn-primary btn-block text-uppercase" href="{% url 'admin:events_event_change' event.pk %}" target="_blank"><i class="fas fa-user-plus"></i> Agregar Organizadores</a>
+                    <a class="btn btn-primary btn-block text-uppercase" href="{% url 'admin:events_event_change' event.pk %}" target="_blank"><i class="fas fa-user-plus"></i>Vincular Organizadores</a>
                 {% endif %}
             {% endif %}
         </div>

From 63040563b441414cde05130734209faacfe9bee1 Mon Sep 17 00:00:00 2001
From: Jose Luis Zanotti <joseluiszanotti@gmail.com>
Date: Tue, 23 Nov 2021 11:03:07 -0300
Subject: [PATCH 08/10] [ADD] New feature to assign discounts to events

---
 website/events/admin.py                       | 17 +++--
 website/events/forms.py                       | 20 +++++-
 website/events/helpers/notifications.py       |  1 +
 .../migrations/0013_auto_20211122_1838.py     | 32 ++++++++++
 website/events/models.py                      | 35 ++++++++++-
 .../event_create_sponsor_discount_form.html   | 26 ++++++++
 .../events/templates/events/event_detail.html | 22 ++++++-
 .../events/sponsorings/sponsoring_detail.html | 18 +++++-
 website/events/tests.py                       | 13 +++-
 website/events/urls.py                        |  5 ++
 website/events/views.py                       | 63 ++++++++++++++++++-
 11 files changed, 240 insertions(+), 12 deletions(-)
 create mode 100644 website/events/migrations/0013_auto_20211122_1838.py
 create mode 100644 website/events/templates/events/event_create_sponsor_discount_form.html

diff --git a/website/events/admin.py b/website/events/admin.py
index 62f0a02..97f3091 100644
--- a/website/events/admin.py
+++ b/website/events/admin.py
@@ -4,6 +4,7 @@
 from events.helpers.notifications import email_notifier
 from events.models import (
     Event,
+    SponsorshipDiscounts,
     EventOrganizer,
     Invoice,
     InvoiceAffect,
@@ -20,6 +21,11 @@
 from reversion_compare.admin import CompareVersionAdmin
 
 
+class SponsorshipDiscountsInline(admin.TabularInline):
+    model = SponsorshipDiscounts
+    exclude = ('created_by', 'changed_by',)
+
+
 class EventOrganizerInline(admin.TabularInline):
     model = EventOrganizer
     exclude = ('created_by', 'changed_by',)
@@ -28,7 +34,7 @@ class EventOrganizerInline(admin.TabularInline):
 
 class EventAdmin(CompareVersionAdmin):
     fields = ('name', 'commission', 'category', 'start_date', 'place', 'close')
-    inlines = (EventOrganizerInline,)
+    inlines = (SponsorshipDiscountsInline, EventOrganizerInline)
     list_display = ('name', 'start_date', 'place', 'category', 'close')
     search_fields = ('start_date', 'place', )
     list_filter = ('category', 'close')
@@ -43,9 +49,7 @@ def save_formset(self, request, form, formset, change):
                     event=instance.event, organizer=instance.organizer).exists()
                 if not exists_organizer:
                     notify_organizers.append(instance.organizer)
-
         super(EventAdmin, self).save_formset(request, form, formset, change)
-
         if len(notify_organizers):
             current_site = get_current_site(request)
             context = {
@@ -104,7 +108,7 @@ def sponsor(self, obj):
 
 
 class SponsorCategoryAdmin(CompareVersionAdmin):
-    fields = ('name', 'amount', 'event')
+    fields = ('name', 'amount', 'event', 'sponsorship_discount')
     list_display = ('name', 'amount', 'event', 'sponsoring_number')
     search_fields = ('name', 'event__name')
     list_select_related = (
@@ -292,6 +296,11 @@ class ProviderAdmin(CompareVersionAdmin):
     list_display = ('organization_name', 'document_number')
 
 
+class SponsorshipDiscountsAdmin(CompareVersionAdmin):
+    exclude = []
+
+
+admin.site.register(SponsorshipDiscounts, SponsorshipDiscountsAdmin)
 admin.site.register(Provider, ProviderAdmin)
 admin.site.register(Payment, PaymentAdmin)
 admin.site.register(ProviderExpense, ProviderExpenseAdmin)
diff --git a/website/events/forms.py b/website/events/forms.py
index c634cf1..687cae5 100644
--- a/website/events/forms.py
+++ b/website/events/forms.py
@@ -19,7 +19,8 @@
     ProviderExpense,
     Sponsor,
     SponsorCategory,
-    Sponsoring
+    Sponsoring,
+    SponsorshipDiscounts,
 )
 
 
@@ -117,6 +118,20 @@ class Meta:
         fields = ['name', 'amount']
 
 
+class SponsorshipDiscountForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super(SponsorshipDiscountForm, self).__init__(*args, **kwargs)
+        self.helper = FormHelper()
+        self.helper.form_class = 'form-horizontal'
+        self.helper.form_tag = False
+        self.helper.label_class = "col-sm-2"
+        self.helper.field_class = "col-sm-10"
+
+    class Meta:
+        model = SponsorshipDiscounts
+        fields = ['name', 'description', 'discount', 'event']
+
+
 class BankAccountDataForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(BankAccountDataForm, self).__init__(*args, **kwargs)
@@ -176,12 +191,15 @@ def __init__(self, event, *args, **kwargs):
         # Pre-filter sponsorcategory by event
         self.fields['sponsorcategory'].queryset = SponsorCategory.objects.filter(event=event)
         self.fields['sponsor'].queryset = Sponsor.objects.filter(enabled=True)
+        self.fields['sponsorship_discount'].queryset = \
+            SponsorshipDiscounts.objects.filter(event=event)
 
     class Meta:
         model = Sponsoring
         fields = [
             'sponsorcategory',
             'sponsor',
+            'sponsorship_discount',
             'comments',
         ]
         widgets = {
diff --git a/website/events/helpers/notifications.py b/website/events/helpers/notifications.py
index 73d43c2..0d12de2 100644
--- a/website/events/helpers/notifications.py
+++ b/website/events/helpers/notifications.py
@@ -9,6 +9,7 @@
 class EmailNotification():
     ORGANIZER_ASSOCIATED_TO_EVENT = 'organizer_associated_to_event'
     SPONSOR_JUST_CREATED = 'sponsor_just_created'
+
     INVOICE_JUST_CREATED = 'invoice_just_created'
     INVOICE_AFFECT_JUST_CREATED = 'invoice_affect_just_created'
     SPONSOR_JUST_ENABLED = 'sponsor_just_enabled'
diff --git a/website/events/migrations/0013_auto_20211122_1838.py b/website/events/migrations/0013_auto_20211122_1838.py
new file mode 100644
index 0000000..940ba66
--- /dev/null
+++ b/website/events/migrations/0013_auto_20211122_1838.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.1.13 on 2021-11-22 18:38
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0012_auto_20211122_1550'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='SponsorshipDiscounts',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=32, verbose_name='nombre')),
+                ('description', models.TextField(blank=True, null=True, verbose_name='descripción')),
+                ('discount', models.DecimalField(decimal_places=2, max_digits=18, verbose_name='descuento (%)')),
+                ('event', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='discount', to='events.event')),
+            ],
+            options={
+                'verbose_name_plural': 'Sponsorship Discounts',
+            },
+        ),
+        migrations.AddField(
+            model_name='sponsoring',
+            name='sponsorship_discount',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='events.sponsorshipdiscounts', verbose_name='Descuento'),
+        ),
+    ]
diff --git a/website/events/models.py b/website/events/models.py
index 3f76300..af3cf85 100644
--- a/website/events/models.py
+++ b/website/events/models.py
@@ -190,7 +190,6 @@ class Event(SaveReversionMixin, AuditUserTime):
         verbose_name=_('organizadores'),
         related_name='events'
     )
-
     close = models.BooleanField(_('cerrado'), default=False)
 
     def get_absolute_url(self):
@@ -213,6 +212,25 @@ class Meta:
         ordering = ['-start_date']
 
 
+class SponsorshipDiscounts(models.Model):
+    """SponsorShip Discount."""
+
+    class Meta:
+        verbose_name_plural = "Sponsorship Discounts"
+
+    name = models.CharField(_('nombre'), max_length=32)
+    description = models.TextField(_('descripción'), null=True, blank=True)
+    discount = models.DecimalField(_('descuento (%)'), max_digits=18, decimal_places=2)
+    event = models.ForeignKey(
+        Event,
+        related_name='discount',
+        on_delete=models.SET_NULL,
+        null=True)
+
+    def __str__(self):
+        return self.name
+
+
 @reversion.register
 class EventOrganizer(SaveReversionMixin, AuditUserTime):
     """Represents the many to many relationship between events and organizers. With TimeStamped
@@ -270,9 +288,24 @@ class Sponsoring(SaveReversionMixin, AuditUserTime):
         related_name='sponsoring',
         on_delete=models.CASCADE,
     )
+    sponsorship_discount = models.ForeignKey(
+        'SponsorshipDiscounts',
+        verbose_name=_('Descuento'),
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+    )
     comments = models.TextField(_('comentarios'), blank=True)
     close = models.BooleanField(_('cerrado'), default=False)
 
+    @property
+    def total_amount(self):
+        if self.sponsorship_discount:
+            amount = self.sponsorcategory.amount * (1 - self.sponsorship_discount.discount / 100)
+        else:
+            amount = self.sponsorcategory.amount
+        return format(amount, '.2f')
+
     def __str__(self):
         return (
             f"{self.sponsor.organization_name} "
diff --git a/website/events/templates/events/event_create_sponsor_discount_form.html b/website/events/templates/events/event_create_sponsor_discount_form.html
new file mode 100644
index 0000000..aaa4727
--- /dev/null
+++ b/website/events/templates/events/event_create_sponsor_discount_form.html
@@ -0,0 +1,26 @@
+{% extends "events_base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+<div class="container">
+    {% block route-navigator %}
+    <nav aria-label="breadcrumb">
+        <ol class="breadcrumb">
+          <li class="breadcrumb-item"><i class="fas fa-home"></i><a href="{% url 'events_home' %}"> Inicio</a></li>
+          <li class="breadcrumb-item"><i class="fas fa-calendar-alt"></i><a href="{% url 'event_list' %}"> Eventos</a></li>
+          <li class="breadcrumb-item"><i class="fas fa-calendar-check"></i><a href="{% url 'event_detail' pk=event.pk %}"> {{event.name}}</a></li>
+          <li class="breadcrumb-item" aria-current="page"><i class="fas fa-wallet"></i> Crear</li>
+        </ol>
+    </nav>
+    {% endblock %}
+    <h3>Descuentos</h3>
+    <form method="POST">
+        {% csrf_token %}
+        {% crispy form %}
+        <button type="submit" class="btn btn-success col-2 float-right mx-1">
+            <i class="fas fa-save"></i> 
+            Crear
+        </button>
+        <a class="btn btn-danger col-2 float-right mx-1" href="{{request.META.HTTP_REFERER}}"><i class="fas fa-undo"></i> Volver</a>
+    </form>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/website/events/templates/events/event_detail.html b/website/events/templates/events/event_detail.html
index eedcdc4..c7bd53f 100644
--- a/website/events/templates/events/event_detail.html
+++ b/website/events/templates/events/event_detail.html
@@ -41,7 +41,27 @@ <h3>Organizadores <small><span class="badge badge-dark">{{organizers.count}}</sp
                      
                 {% endif %}
                 {% if perms.events.add_eventorganizer %}
-                    <a class="btn btn-primary btn-block text-uppercase" href="{% url 'admin:events_event_change' event.pk %}" target="_blank"><i class="fas fa-user-plus"></i>Vincular Organizadores</a>
+                    <a class="btn btn-primary btn-block text-uppercase" href="{% url 'admin:events_event_change' event.pk %}" target="_blank"><i class="fas fa-user-plus"></i> Vincular Organizadores</a>
+                {% endif %}
+            {% endif %}
+
+            {% if perms.events.view_event_organizers %}
+                <br>
+                <h3>Descuentos <small><span class="badge badge-dark">{{sponsorship_discount.count}}</span></small></h3>
+                {% if sponsorship_discount %}
+                    <ul>
+                        {% for discount in sponsorship_discount %}
+                            <li>{{discount.name}} ({{discount.discount}}%)</li>
+                        {% endfor %}
+                    </ul>
+                {% else %}
+                    <div class="alert alert-info" role="alert">
+                        No hay descuentos asociados al evento!
+                    </div>
+                {% endif %}
+
+                {% if perms.events.add_sponsorship_discount %}
+                    <a class="btn btn-primary btn-block text-uppercase" href="{% url 'event_create_sponsor_discount' event.pk %}" target="_blank"><i class="fas fa-ticket-alt"></i> Crear Descuento</a>
                 {% endif %}
             {% endif %}
         </div>
diff --git a/website/events/templates/events/sponsorings/sponsoring_detail.html b/website/events/templates/events/sponsorings/sponsoring_detail.html
index 9132efa..4e97bb9 100644
--- a/website/events/templates/events/sponsorings/sponsoring_detail.html
+++ b/website/events/templates/events/sponsorings/sponsoring_detail.html
@@ -16,7 +16,19 @@
     {% endblock %}
 
     <h2>Sponsor {{sponsoring.sponsor.organization_name}}</h2>
-    <h2><small class="text-muted">Categoría: {{sponsoring.sponsorcategory.name}} (${{sponsoring.sponsorcategory.amount|intcomma}}) [{{sponsoring.state}}]</small></h2>
+    {% if sponsoring.sponsorship_discount.discount %}
+        <h2><small class="text-muted">Categoría: {{sponsoring.sponsorcategory.name}} (${{sponsoring.sponsorcategory.amount|intcomma}}) - Descuento: {{sponsoring.sponsorship_discount.discount}}% - Total: {{total_reminder}} ${{ sponsoring.total_amount|intcomma }}
+    {% else %}
+        <h2><small class="text-muted">Categoría: {{sponsoring.sponsorcategory.name}} (${{sponsoring.sponsorcategory.amount|intcomma}}) - Total: ${{ sponsoring.sponsorcategory.amount|intcomma }}
+    {% endif %}
+        <br>
+    {% if sponsoring.state == "no facturado" %}
+        <span class="text-danger">[{{sponsoring.state}}]</span>
+    {% else %}
+        <span class="text-success">[{{sponsoring.state}}]</span>
+    {% endif %}
+    </small></h2>
+
     <h3><small class="text-muted">Última modificación: {{sponsoring.modified}}</small></h3>
     <h3>Detalles <button class="btn btn-info col-2 float-right" data-toggle="collapse" href="#EventAndSponsorDetails" aria-expanded="false" aria-controls="collapseExample" id="detailButton"><i class="fa" aria-hidden="true"></i> Ver</button></h3>
     {% if sponsoring.state == "no facturado" %}
@@ -263,7 +275,7 @@ <h5 class="modal-title" id="NewSponsoringInvoiceAffectLabel"><i class="fas fa-re
                 <div class="modal-dialog modal-lg">
                     <div class="modal-content">
                         <div class="modal-header">
-                            <h5 class="modal-title" id="NewSponsoringInvoiceLabel"><i class="fas fa-file-invoice-dollar"></i> Factura <span class="text-muted">{{sponsoring.sponsor.organization_name}} ({{sponsoring.sponsorcategory.name}} <small>${{sponsoring.sponsorcategory.amount|intcomma}}</small>) @ {{event.name}} [#{{sponsoring.pk}}]</span></h5>
+                            <h5 class="modal-title" id="NewSponsoringInvoiceLabel"><i class="fas fa-file-invoice-dollar"></i> Factura <span class="text-muted">{{sponsoring.sponsor.organization_name}} ({{sponsoring.sponsorcategory.name}} <small>${{sponsoring.total_amount|intcomma}}</small>) @ {{event.name}} [#{{sponsoring.pk}}]</span></h5>
                             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                                 <span aria-hidden="true">&times;</span>
                             </button>
@@ -274,7 +286,7 @@ <h5 class="modal-title" id="NewSponsoringInvoiceLabel"><i class="fas fa-file-inv
                             <div class="form-group row">
                                 <label for="amount" class="font-weight-bold col-sm-2 col-form-label text-right">Monto</label>
                                 <div class="col-sm-10">
-                                    <input type="text" class="form-control" id="id_amount" name="amount" placeholder="Valor de la factura" required>
+                                    <input type="text" class="form-control" id="id_amount" name="amount" value="{{sponsoring.total_amount}}" placeholder="Valor de la factura" required>
                                 </div>
                             </div>
                             <div class="form-group row">
diff --git a/website/events/tests.py b/website/events/tests.py
index 452ca9c..4e3b984 100644
--- a/website/events/tests.py
+++ b/website/events/tests.py
@@ -103,6 +103,18 @@ def admin_event_associate_organizers_post_data(event, organizers):
         'event_organizers-__prefix__-id': [''],
         'event_organizers-__prefix__-event': ['1'],
         'event_organizers-__prefix__-organizer': [''],
+
+        'discount-TOTAL_FORMS': ['1'],
+        'discount-INITIAL_FORMS': ['0'],
+        'discount-MIN_NUM_FORMS': ['0'],
+        'discount-MAX_NUM_FORMS': ['1000'],
+
+        'discount-__prefix__-id': [''],
+        'discount-__prefix__-event': ['1'],
+        'discount-__prefix__-name': [''],
+        'discount-__prefix__-description': [''],
+        'discount-__prefix__-discount': [''],
+
         '_save': ['Save']
     }
 
@@ -353,7 +365,6 @@ def test_on_organizer_associate_to_event_call_mail_function(self, send_email_fun
 
         url = reverse('admin:events_event_change', kwargs={'object_id': event.pk})
         self.client.login(username='administrator', password='administrator')
-
         organizers = []
         for organizer in Organizer.objects.all():
             organizers.append(organizer)
diff --git a/website/events/urls.py b/website/events/urls.py
index 834692a..262caf8 100644
--- a/website/events/urls.py
+++ b/website/events/urls.py
@@ -14,6 +14,11 @@
         views.event_create_sponsor_category,
         name='event_create_sponsor_category'
     ),
+    path(
+        'eventos/<pk>/descuentos-sponsor/crear/',
+        views.event_create_sponsor_discount,
+        name='event_create_sponsor_discount'
+    ),
 
     # Sponsoring urls.
     path('eventos/<event_pk>/patrocinios/', views.sponsoring_list, name='sponsoring_list'),
diff --git a/website/events/views.py b/website/events/views.py
index dfeceb6..a252067 100644
--- a/website/events/views.py
+++ b/website/events/views.py
@@ -1,5 +1,6 @@
 from django.conf import settings
 from django.contrib import messages
+from django.contrib.messages.views import SuccessMessageMixin
 from django.contrib.auth.decorators import login_required, permission_required
 from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin
 from django.contrib.auth.models import Group
@@ -50,6 +51,7 @@
     ProviderExpenseForm,
     SponsorForm,
     SponsorCategoryForm,
+    SponsorshipDiscountForm,
     SponsoringForm
 )
 from events.helpers.notifications import email_notifier
@@ -69,7 +71,8 @@
     ProviderExpense,
     Sponsor,
     SponsorCategory,
-    Sponsoring
+    Sponsoring,
+    SponsorshipDiscounts,
 )
 from events.helpers.sponsoring_pending import (
     calculate_sponsoring_pending,
@@ -169,7 +172,9 @@ def get_context_data(self, **kwargs):
         user = self.request.user
         if user.has_perm('events.' + CAN_VIEW_EVENT_ORGANIZERS_CODENAME):
             organizers = event.organizers.all()
+            sponsorship_discount = event.discount.all()
             context['organizers'] = organizers
+            context['sponsorship_discount'] = sponsorship_discount
         return context
 
     def has_permission(self):
@@ -347,6 +352,61 @@ def handle_no_permission(self):
             return super(SponsorCategoryCreateView, self).handle_no_permission()
 
 
+class SponsorshipDiscountCreateView(
+        SuccessMessageMixin,
+        PermissionRequiredMixin,
+        generic.edit.CreateView):
+
+    model = SponsorshipDiscounts
+    form_class = SponsorshipDiscountForm
+    template_name = 'events/event_create_sponsor_discount_form.html'
+    permission_required = 'events.add_sponsorcategory'
+    success_message = 'Descuento creado correctamente.'
+
+    def _get_event(self):
+        return get_object_or_404(Event, pk=self.kwargs['pk'])
+
+    def form_valid(self, form):
+        form.instance.event = self._get_event()
+        return super(SponsorshipDiscountCreateView, self).form_valid(form)
+
+    def get_context_data(self, **kwargs):
+        context = super(SponsorshipDiscountCreateView, self).get_context_data(**kwargs)
+        event = self._get_event()
+        context['event'] = event
+        return context
+
+    def get_success_url(self):
+        url = reverse('event_detail', kwargs={'pk': self._get_event().pk})
+        return url
+
+    def has_permission(self):
+        ret = super(SponsorshipDiscountCreateView, self).has_permission()
+        # Must be event organizer.
+        event = self._get_event()
+        if ret and not is_event_organizer(self.request.user, event):
+            self.permission_denied_message = MUST_BE_EVENT_ORGANIZAER_MESSAGE
+            return False
+        return ret
+
+    def handle_no_permission(self):
+        if self.get_permission_denied_message() == MUST_BE_EVENT_ORGANIZAER_MESSAGE:
+            messages.add_message(
+                self.request,
+                messages.WARNING,
+                MUST_BE_EVENT_ORGANIZAER_MESSAGE)
+            return redirect('sponsoring_detail', pk=self._get_sponsoring().pk)
+        else:
+            return super(SponsorshipDiscountCreateView, self).handle_no_permission()
+
+    def get_initial(self, *args, **kwargs):
+        initial = super(SponsorshipDiscountCreateView, self).get_initial(**kwargs)
+        event = self._get_event()
+        if event:
+            initial['event'] = event
+        return initial
+
+
 class OrganizersListView(PermissionRequiredMixin, generic.ListView):
     model = Organizer
     context_object_name = 'organizer_list'
@@ -1294,6 +1354,7 @@ def post(self, request, *args, **kwargs):
 event_detail = EventDetailView.as_view()
 event_change = EventChangeView.as_view()
 event_create_sponsor_category = SponsorCategoryCreateView.as_view()
+event_create_sponsor_discount = SponsorshipDiscountCreateView.as_view()
 
 organizers_list = OrganizersListView.as_view()
 organizer_detail = OrganizerDetailView.as_view()

From cc84832ba15e93c21d31f10e746fa22710a7b662 Mon Sep 17 00:00:00 2001
From: Jose Luis Zanotti <joseluiszanotti@gmail.com>
Date: Tue, 23 Nov 2021 15:07:21 -0300
Subject: [PATCH 09/10] [FIX] Fix Conflicts

---
 website/events/templates/events/event_detail.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/website/events/templates/events/event_detail.html b/website/events/templates/events/event_detail.html
index 950b5ac..88a4e61 100644
--- a/website/events/templates/events/event_detail.html
+++ b/website/events/templates/events/event_detail.html
@@ -41,7 +41,6 @@ <h3>Organizadores <small><span class="badge badge-dark">{{organizers.count}}</sp
                      
                 {% endif %}
                 {% if perms.events.add_eventorganizer %}
-<<<<<<< HEAD
                     <a class="btn btn-primary btn-block text-uppercase" href="{% url 'admin:events_event_change' event.pk %}" target="_blank"><i class="fas fa-user-plus"></i> Vincular Organizadores</a>
                 {% endif %}
             {% endif %}
@@ -63,10 +62,7 @@ <h3>Descuentos <small><span class="badge badge-dark">{{sponsorship_discount.coun
 
                 {% if perms.events.add_sponsorship_discount %}
                     <a class="btn btn-primary btn-block text-uppercase" href="{% url 'event_create_sponsor_discount' event.pk %}" target="_blank"><i class="fas fa-ticket-alt"></i> Crear Descuento</a>
-=======
-                    <a class="btn btn-primary btn-block text-uppercase" href="{% url 'admin:events_event_change' event.pk %}" target="_blank"><i class="fas fa-user-plus"></i>Vincular Organizadores</a>
->>>>>>> upstream/master
-                {% endif %}
+                {% ndif %}
             {% endif %}
         </div>
     </div>

From 70c3a670e78acdd018315691e6a54f0dc2992ce2 Mon Sep 17 00:00:00 2001
From: Jose Luis Zanotti <joseluiszanotti@gmail.com>
Date: Tue, 23 Nov 2021 17:01:54 -0300
Subject: [PATCH 10/10] Fix Typo

---
 website/events/templates/events/event_detail.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/website/events/templates/events/event_detail.html b/website/events/templates/events/event_detail.html
index 88a4e61..c7bd53f 100644
--- a/website/events/templates/events/event_detail.html
+++ b/website/events/templates/events/event_detail.html
@@ -62,7 +62,7 @@ <h3>Descuentos <small><span class="badge badge-dark">{{sponsorship_discount.coun
 
                 {% if perms.events.add_sponsorship_discount %}
                     <a class="btn btn-primary btn-block text-uppercase" href="{% url 'event_create_sponsor_discount' event.pk %}" target="_blank"><i class="fas fa-ticket-alt"></i> Crear Descuento</a>
-                {% ndif %}
+                {% endif %}
             {% endif %}
         </div>
     </div>