diff --git a/tienda_ilusion/don_confiao/frontend/don-confiao/src/components/Purchase.vue b/tienda_ilusion/don_confiao/frontend/don-confiao/src/components/Purchase.vue index 9340e08..0747b8a 100644 --- a/tienda_ilusion/don_confiao/frontend/don-confiao/src/components/Purchase.vue +++ b/tienda_ilusion/don_confiao/frontend/don-confiao/src/components/Purchase.vue @@ -2,36 +2,34 @@ - - - Agregar Cliente - + + + Agregar Cliente + - - + - - + p.id == selectedProductId); this.purchase.saleline_set[index].unit_price = selectedProduct.price; this.purchase.saleline_set[index].measuring_unit = selectedProduct.measuring_unit; diff --git a/tienda_ilusion/don_confiao/migrations/0034_alter_payment_type_payment_alter_sale_date_and_more.py b/tienda_ilusion/don_confiao/migrations/0034_alter_payment_type_payment_alter_sale_date_and_more.py new file mode 100644 index 0000000..c6dc291 --- /dev/null +++ b/tienda_ilusion/don_confiao/migrations/0034_alter_payment_type_payment_alter_sale_date_and_more.py @@ -0,0 +1,28 @@ +# Generated by Django 5.0.6 on 2024-11-16 20:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('don_confiao', '0033_sale_payment_method'), + ] + + operations = [ + migrations.AlterField( + model_name='payment', + name='type_payment', + field=models.CharField(choices=[('CASH', 'Efectivo'), ('CONFIAR', 'Confiar'), ('BANCOLOMBIA', 'Bancolombia')], default='CASH', max_length=30), + ), + migrations.AlterField( + model_name='sale', + name='date', + field=models.DateTimeField(verbose_name='Date'), + ), + migrations.AlterField( + model_name='sale', + name='payment_method', + field=models.CharField(choices=[('CASH', 'Efectivo'), ('CONFIAR', 'Confiar'), ('BANCOLOMBIA', 'Bancolombia')], default='CASH', max_length=30), + ), + ] diff --git a/tienda_ilusion/don_confiao/models.py b/tienda_ilusion/don_confiao/models.py index ff21a72..5ded6db 100644 --- a/tienda_ilusion/don_confiao/models.py +++ b/tienda_ilusion/don_confiao/models.py @@ -64,7 +64,7 @@ class Product(models.Model): class Sale(models.Model): customer = models.ForeignKey(Customer, on_delete=models.PROTECT) - date = models.DateField("Date") + date = models.DateTimeField("Date") phone = models.CharField(max_length=13, null=True, blank=True) description = models.CharField(max_length=255, null=True, blank=True) payment_method = models.CharField( diff --git a/tienda_ilusion/don_confiao/tests/tests.py b/tienda_ilusion/don_confiao/tests/tests.py index 672d3b4..976518b 100644 --- a/tienda_ilusion/don_confiao/tests/tests.py +++ b/tienda_ilusion/don_confiao/tests/tests.py @@ -19,7 +19,7 @@ class ConfiaoTest(TestCase): def test_create_sale(self): sale = Sale() sale.customer = self.customer - sale.date = "2024-06-22" + sale.date = "2024-06-22 12:05:00" sale.phone = '666666666' sale.description = "Description" sale.save() @@ -29,7 +29,7 @@ class ConfiaoTest(TestCase): def test_can_create_sale_without_payment_method(self): sale = Sale() sale.customer = self.customer - sale.date = "2024-06-22" + sale.date = "2024-06-22 12:05:00" sale.phone = '666666666' sale.description = "Description" sale.payment_method = ''