diff --git a/tienda_ilusion/don_confiao/forms.py b/tienda_ilusion/don_confiao/forms.py index 8fc05c9..758b119 100644 --- a/tienda_ilusion/don_confiao/forms.py +++ b/tienda_ilusion/don_confiao/forms.py @@ -48,6 +48,6 @@ class ReconciliationJarForm(forms.ModelForm): 'cash_taken', 'cash_discrepancy', ] - # widgets = { - # 'date_time': DateTimeInput(attrs={'type': 'datetime-local'}) - # } + widgets = { + 'date_time': DateTimeInput(attrs={'type': 'datetime-local'}) + } diff --git a/tienda_ilusion/don_confiao/migrations/0022_alter_payment_reconciliation_jar.py b/tienda_ilusion/don_confiao/migrations/0022_alter_payment_reconciliation_jar.py new file mode 100644 index 0000000..5956a97 --- /dev/null +++ b/tienda_ilusion/don_confiao/migrations/0022_alter_payment_reconciliation_jar.py @@ -0,0 +1,19 @@ +# Generated by Django 5.0.6 on 2024-07-13 22:39 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('don_confiao', '0021_rename_reconciler_reconciliationjar_reconcilier'), + ] + + operations = [ + migrations.AlterField( + model_name='payment', + name='reconciliation_jar', + field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.RESTRICT, to='don_confiao.reconciliationjar'), + ), + ] diff --git a/tienda_ilusion/don_confiao/models.py b/tienda_ilusion/don_confiao/models.py index 78c4746..2874dac 100644 --- a/tienda_ilusion/don_confiao/models.py +++ b/tienda_ilusion/don_confiao/models.py @@ -106,6 +106,7 @@ class Payment(models.Model): ReconciliationJar, null=True, default=None, + blank=True, on_delete=models.RESTRICT ) description = models.CharField(max_length=255, null=True, blank=True) diff --git a/tienda_ilusion/don_confiao/templates/don_confiao/reconciliate_jar.html b/tienda_ilusion/don_confiao/templates/don_confiao/reconciliate_jar.html index ff0d778..16fa5dc 100644 --- a/tienda_ilusion/don_confiao/templates/don_confiao/reconciliate_jar.html +++ b/tienda_ilusion/don_confiao/templates/don_confiao/reconciliate_jar.html @@ -1,22 +1,27 @@ {% if summary.total %} -
+

Pagos No reconciliados

- +
- Monto - {% for payment in summary.payments %} - - {% endfor %} + - {{ summary.total }} + + {% for payment in summary.payments %} + + {% endfor %} + + + + +
Fecha
payment.date_timepayment.amount
FechaMonto
{{ payment.date_time }}{{ payment.amount }}
Total{{ summary.total }}
{% csrf_token %} {{ form.as_table }}
-
+
{% else %}