diff --git a/tienda_ilusion/don_confiao/frontend/don-confiao/src/components/SummaryPurchase.vue b/tienda_ilusion/don_confiao/frontend/don-confiao/src/components/SummaryPurchase.vue index dbdbfa5..5111c64 100644 --- a/tienda_ilusion/don_confiao/frontend/don-confiao/src/components/SummaryPurchase.vue +++ b/tienda_ilusion/don_confiao/frontend/don-confiao/src/components/SummaryPurchase.vue @@ -13,17 +13,39 @@ Cliente: - {{ purchase.customer }} - - - - - Productos: - {{ purchase.saleline_set }} + {{ purchase.customer.name }} + + + + Producto: + + + Nombre: + {{ line.product.name }} + Precio: + {{ currencyFormat(line.unit_price) }} + Cantidad: + {{ line.quantity }} + Cantidad: + {{ line.quantity }} + Subtotal: + {{ currencyFormat(calculateSubtotal(line.price, line.quantity)) }} + + + + + + + + + Total: + {{ currencyFormat(calculateTotal(purchase.set_lines)) }} + + + - diff --git a/tienda_ilusion/don_confiao/tests/test_summary_view_purchase.py b/tienda_ilusion/don_confiao/tests/test_summary_view_purchase.py index d89b590..a68a438 100644 --- a/tienda_ilusion/don_confiao/tests/test_summary_view_purchase.py +++ b/tienda_ilusion/don_confiao/tests/test_summary_view_purchase.py @@ -1,6 +1,7 @@ from django.test import TestCase, Client from ..models import Sale, Product, SaleLine, Customer + class TestSummaryViewPurchase(TestCase): def setUp(self): customer = Customer() @@ -22,20 +23,29 @@ class TestSummaryViewPurchase(TestCase): line = SaleLine() line.sale = purchase line.product = product - line.quantity = "2" + line.quantity = "11" line.unit_price = "72500" line.save() self.purchase = purchase def test_summary_has_customer(self): - response = self.client.get("/don_confiao/resumen_compra/" + str(self.purchase.id)) + url = "/don_confiao/resumen_compra/" + str(self.purchase.id) + response = self.client.get(url) self.assertEqual(response.status_code, 200) - self.assertEqual(response.context["purchase"].customer, self.purchase.customer) + self.assertEqual( + response.context["purchase"].customer, + self.purchase.customer + ) self.assertIn('Alejo Mono', response.content.decode('utf-8')) def test_json_summary(self): - response = self.client.get(f"/don_confiao/resumen_compra_json/{self.purchase.id}") + url = f"/don_confiao/resumen_compra_json/{self.purchase.id}" + response = self.client.get(url) self.assertEqual(response.status_code, 200) self.assertIn('Alejo Mono', response.content.decode('utf-8')) self.assertIn('cafe', response.content.decode('utf-8')) self.assertIn('72500', response.content.decode('utf-8')) + self.assertIn('quantity', response.content.decode('utf-8')) + self.assertIn('11', response.content.decode('utf-8')) + self.assertIn('date', response.content.decode('utf-8')) + self.assertIn(self.purchase.date, response.content.decode('utf-8')) diff --git a/tienda_ilusion/don_confiao/views.py b/tienda_ilusion/don_confiao/views.py index 132f978..fda488e 100644 --- a/tienda_ilusion/don_confiao/views.py +++ b/tienda_ilusion/don_confiao/views.py @@ -137,13 +137,14 @@ def purchase_json_summary(request, id): 'product': { 'id': line.product.id, 'name': line.product.name, - 'quantity': line.quantity, - 'unit_price': line.unit_price, - 'description': line.description, - } + }, + 'quantity': line.quantity, + 'unit_price': line.unit_price, + 'description': line.description, }) to_response = { 'id': purchase.id, + 'date': purchase.date, 'customer': { 'id': purchase.customer.id, 'name': purchase.customer.name,