Compare commits
No commits in common. "main" and "0.1.6" have entirely different histories.
@ -194,18 +194,12 @@ class SalesToTrytonView(APIView):
|
|||||||
|
|
||||||
sales = Sale.objects.filter(external_id=None)
|
sales = Sale.objects.filter(external_id=None)
|
||||||
for sale in sales:
|
for sale in sales:
|
||||||
try:
|
|
||||||
lines = SaleLine.objects.filter(sale=sale.id)
|
lines = SaleLine.objects.filter(sale=sale.id)
|
||||||
tryton_params = self.__to_tryton_params(sale, lines, tryton_context)
|
tryton_params = self.__to_tryton_params(sale, lines, tryton_context)
|
||||||
external_ids = tryton_client.call(method, tryton_params)
|
external_ids = tryton_client.call(method, tryton_params)
|
||||||
sale.external_id = external_ids[0]
|
sale.external_id = external_ids[0]
|
||||||
sale.save()
|
sale.save()
|
||||||
successful.append(sale.id)
|
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(
|
return Response(
|
||||||
{'successful': successful, 'failed': failed},
|
{'successful': successful, 'failed': failed},
|
||||||
@ -233,18 +227,14 @@ class TrytonSale:
|
|||||||
"shipment_address": self.sale.customer.address_external_id,
|
"shipment_address": self.sale.customer.address_external_id,
|
||||||
"invoice_address": self.sale.customer.address_external_id,
|
"invoice_address": self.sale.customer.address_external_id,
|
||||||
"currency": TRYTON_COP_CURRENCY,
|
"currency": TRYTON_COP_CURRENCY,
|
||||||
"comment": self.sale.description or '',
|
"description": self.sale.description or '',
|
||||||
"description": "Metodo pago: " + str(
|
|
||||||
self.sale.payment_method or ''
|
|
||||||
),
|
|
||||||
"party": self.sale.customer.external_id,
|
"party": self.sale.customer.external_id,
|
||||||
"reference": "don_confiao " + str(self.sale.id),
|
"reference": "don_confiao " + str(self.sale.id),
|
||||||
"sale_date": self._format_date(self.sale.date),
|
"sale_date": self._format_date(self.sale.date),
|
||||||
"lines": [[
|
"lines": [[
|
||||||
"create",
|
"create",
|
||||||
[TrytonLineSale(line).to_tryton() for line in self.lines]
|
[TrytonLineSale(line).to_tryton() for line in self.lines]
|
||||||
]],
|
]]
|
||||||
"self_pick_up": True,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ class SaleSerializer(serializers.ModelSerializer):
|
|||||||
class Meta:
|
class Meta:
|
||||||
model = Sale
|
model = Sale
|
||||||
fields = ['id', 'customer', 'date', 'saleline_set',
|
fields = ['id', 'customer', 'date', 'saleline_set',
|
||||||
'total', 'payment_method', 'external_id']
|
'total', 'payment_method']
|
||||||
|
|
||||||
|
|
||||||
class ProductSerializer(serializers.ModelSerializer):
|
class ProductSerializer(serializers.ModelSerializer):
|
||||||
@ -27,7 +27,7 @@ class ProductSerializer(serializers.ModelSerializer):
|
|||||||
class CustomerSerializer(serializers.ModelSerializer):
|
class CustomerSerializer(serializers.ModelSerializer):
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Customer
|
model = Customer
|
||||||
fields = ['id', 'name', 'address', 'email', 'phone', 'external_id']
|
fields = ['id', 'name', 'address', 'email', 'phone']
|
||||||
|
|
||||||
|
|
||||||
class ReconciliationJarSerializer(serializers.ModelSerializer):
|
class ReconciliationJarSerializer(serializers.ModelSerializer):
|
||||||
|
@ -16,8 +16,7 @@ class TestAPI(APITestCase):
|
|||||||
measuring_unit='UNIT'
|
measuring_unit='UNIT'
|
||||||
)
|
)
|
||||||
self.customer = Customer.objects.create(
|
self.customer = Customer.objects.create(
|
||||||
name='Camilo',
|
name='Camilo'
|
||||||
external_id='18'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def test_create_sale(self):
|
def test_create_sale(self):
|
||||||
@ -68,23 +67,6 @@ class TestAPI(APITestCase):
|
|||||||
json_response = json.loads(response.content.decode('utf-8'))
|
json_response = json.loads(response.content.decode('utf-8'))
|
||||||
self.assertEqual(response.status_code, 200)
|
self.assertEqual(response.status_code, 200)
|
||||||
self.assertEqual(self.customer.name, json_response[0]['name'])
|
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):
|
def test_get_sales_for_tryton(self):
|
||||||
url = '/don_confiao/api/sales/for_tryton'
|
url = '/don_confiao/api/sales/for_tryton'
|
||||||
|
@ -100,4 +100,4 @@ class TestExportarVentasParaTryton(TestCase):
|
|||||||
self.assertEqual(updated_sale.external_id, external_id)
|
self.assertEqual(updated_sale.external_id, external_id)
|
||||||
mock_connect.assert_called_once()
|
mock_connect.assert_called_once()
|
||||||
mock_call.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, '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]}])
|
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]}])
|
||||||
|
Loading…
Reference in New Issue
Block a user