Merge pull request 'Se adiciona el método de pago en la descripción de la venta de tryton #21' (#25) from add_payment_method_to_tryton_sale_on_notes_field_#21 into main

Reviewed-on: #25

tienda_ilusion/don_confiao/api_views.py

@@ -194,12 +194,18 @@ class SalesToTrytonView(APIView):
 
         sales = Sale.objects.filter(external_id=None)
         for sale in sales:
-            lines = SaleLine.objects.filter(sale=sale.id)
+            try:
-            tryton_params = self.__to_tryton_params(sale, lines, tryton_context)
+                lines = SaleLine.objects.filter(sale=sale.id)
-            external_ids = tryton_client.call(method, tryton_params)
+                tryton_params = self.__to_tryton_params(sale, lines, tryton_context)
-            sale.external_id = external_ids[0]
+                external_ids = tryton_client.call(method, tryton_params)
-            sale.save()
+                sale.external_id = external_ids[0]
-            successful.append(sale.id)
+                sale.save()
+                successful.append(sale.id)
+            except Exception as e:
+                print(f"Error al enviar la venta: {e}"
+                      f"venta_id: {sale.id}")
+                failed.append(sale.id)
+                continue
 
         return Response(
             {'successful': successful, 'failed': failed},
@@ -227,14 +233,18 @@ class TrytonSale:
             "shipment_address": self.sale.customer.address_external_id,
             "invoice_address": self.sale.customer.address_external_id,
             "currency": TRYTON_COP_CURRENCY,
-            "description": self.sale.description or '',
+            "comment": self.sale.description or '',
+            "description": "Metodo pago: " + str(
+                self.sale.payment_method or ''
+            ),
             "party": self.sale.customer.external_id,
             "reference": "don_confiao " + str(self.sale.id),
             "sale_date": self._format_date(self.sale.date),
             "lines": [[
                 "create",
                 [TrytonLineSale(line).to_tryton() for line in self.lines]
-            ]]
+            ]],
+            "self_pick_up": True,
         }
 
 

tienda_ilusion/don_confiao/serializers.py

@@ -15,7 +15,7 @@ class SaleSerializer(serializers.ModelSerializer):
     class Meta:
         model = Sale
         fields = ['id', 'customer', 'date', 'saleline_set',
-                  'total', 'payment_method']
+                  'total', 'payment_method', 'external_id']
 
 
 class ProductSerializer(serializers.ModelSerializer):
@@ -27,7 +27,7 @@ class ProductSerializer(serializers.ModelSerializer):
 class CustomerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Customer
-        fields = ['id', 'name', 'address', 'email', 'phone']
+        fields = ['id', 'name', 'address', 'email', 'phone', 'external_id']
 
 
 class ReconciliationJarSerializer(serializers.ModelSerializer):

tienda_ilusion/don_confiao/tests/test_api.py

@@ -16,7 +16,8 @@ class TestAPI(APITestCase):
             measuring_unit='UNIT'
         )
         self.customer = Customer.objects.create(
-            name='Camilo'
+            name='Camilo',
+            external_id='18'
         )
 
     def test_create_sale(self):
@@ -67,6 +68,23 @@ class TestAPI(APITestCase):
         json_response = json.loads(response.content.decode('utf-8'))
         self.assertEqual(response.status_code, 200)
         self.assertEqual(self.customer.name, json_response[0]['name'])
+        self.assertEqual(
+            self.customer.external_id,
+            json_response[0]['external_id']
+        )
+
+    def test_get_sales(self):
+        url = '/don_confiao/api/sales/'
+        self._create_sale()
+
+        response = self.client.get(url)
+        json_response = json.loads(response.content.decode('utf-8'))
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(self.customer.id, json_response[0]['customer'])
+        self.assertEqual(
+            None,
+            json_response[0]['external_id']
+        )
 
     def test_get_sales_for_tryton(self):
         url = '/don_confiao/api/sales/for_tryton'

tienda_ilusion/don_confiao/tests/test_exportar_ventas_para_tryton.py

@@ -100,4 +100,4 @@ class TestExportarVentasParaTryton(TestCase):
         self.assertEqual(updated_sale.external_id, external_id)
         mock_connect.assert_called_once()
         mock_call.assert_called_once()
-        mock_call.assert_called_with('model.sale.sale.create', [[{'company': 1, 'shipment_address': '307', 'invoice_address': '307', 'currency': 31, 'description': '', 'party': '1', 'reference': 'don_confiao 1', 'sale_date': {'__class__': 'date', 'year': 2024, 'month': 9, 'day': 2}, 'lines': [['create', [{'product': '1', 'quantity': {'__class__': 'Decimal', 'decimal': '2.00'}, 'type': 'line', 'unit': '1', 'unit_price': {'__class__': 'Decimal', 'decimal': '3000.00'}}, {'product': '1', 'quantity': {'__class__': 'Decimal', 'decimal': '3.00'}, 'type': 'line', 'unit': '1', 'unit_price': {'__class__': 'Decimal', 'decimal': '5000.00'}}]]]}], {'company': 1, 'shops': [1]}])
+        mock_call.assert_called_with('model.sale.sale.create', [[{'company': 1, 'shipment_address': '307', 'invoice_address': '307', 'currency': 31, 'comment': '', 'description': 'Metodo pago: CASH', 'party': '1', 'reference': 'don_confiao 1', 'sale_date': {'__class__': 'date', 'year': 2024, 'month': 9, 'day': 2}, 'lines': [['create', [{'product': '1', 'quantity': {'__class__': 'Decimal', 'decimal': '2.00'}, 'type': 'line', 'unit': '1', 'unit_price': {'__class__': 'Decimal', 'decimal': '3000.00'}}, {'product': '1', 'quantity': {'__class__': 'Decimal', 'decimal': '3.00'}, 'type': 'line', 'unit': '1', 'unit_price': {'__class__': 'Decimal', 'decimal': '5000.00'}}]]], 'self_pick_up': True}], {'company': 1, 'shops': [1]}])