inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-08-05 19:41:41 +00:00
Code Activity

fix reused builtins

Browse Source
This commit is contained in:
Matthias
2022-01-21 00:17:52 +01:00
parent cbd84a23f9
commit c44565f9e3
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
InvenTree/barcodes/api.py
View File

@@ -109,14 +109,14 @@ class BarcodeScan(APIView):
# No plugin is found!
# However, the hash of the barcode may still be associated with a StockItem!
else:
hash = hash_barcode(barcode_data)
result_hash = hash_barcode(barcode_data)
response['hash'] = hash
response['hash'] = result_hash
response['plugin'] = None
# Try to look for a matching StockItem
try:
item = StockItem.objects.get(uid=hash)
item = StockItem.objects.get(uid=result_hash)
serializer = StockItemSerializer(item, part_detail=True, location_detail=True, supplier_part_detail=True)
response['stockitem'] = serializer.data
response['url'] = reverse('stock-item-detail', kwargs={'pk': item.id})
@@ -182,8 +182,8 @@ class BarcodeAssign(APIView):
# Matching plugin was found
if plugin is not None:
hash = plugin.hash()
response['hash'] = hash
result_hash = plugin.hash()
response['hash'] = result_hash
response['plugin'] = plugin.name
# Ensure that the barcode does not already match a database entry
@@ -208,14 +208,14 @@ class BarcodeAssign(APIView):
match_found = True
else:
hash = hash_barcode(barcode_data)
result_hash = hash_barcode(barcode_data)
response['hash'] = hash
response['hash'] = result_hash
response['plugin'] = None
# Lookup stock item by hash
try:
item = StockItem.objects.get(uid=hash)
item = StockItem.objects.get(uid=result_hash)
response['error'] = _('Barcode hash already matches Stock Item')
match_found = True
except StockItem.DoesNotExist:

4
InvenTree/barcodes/tests.py
View File

@@ -124,12 +124,12 @@ class BarcodeAPITest(APITestCase):
self.assertIn('success', data)
hash = data['hash']
result_hash = data['hash']
# Read the item out from the database again
item = StockItem.objects.get(pk=522)
self.assertEqual(hash, item.uid)
self.assertEqual(result_hash, item.uid)
# Ensure that the same UID cannot be assigned to a different stock item!
response = self.client.post(