Skip to content

Commit

Permalink
style corrections
Browse files Browse the repository at this point in the history
  • Loading branch information
@SergeoLacruz
SergeoLacruz committed Apr 21, 2024
1 parent b7d04f2 commit 9bfae87
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions inventree_supplier_panel/meta_access.py
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
class MetaAccess():

def get_value(inventree_object, app, key):
def get_value(self, inventree_object, app, key):
try:
value = inventree_object.metadata[app][key]
except Exception:
value = None
print('<----', app, key, value)
return (value)

def set_value(inventree_object, app, key, value):
def set_value(self, inventree_object, app, key, value):
print('---->', app, key, value)
data = inventree_object.metadata
if data is None:
Expand Down
76 changes: 38 additions & 38 deletions inventree_supplier_panel/supplier_panel.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ def get_custom_panels(self, view, request):
pass
if isinstance(view, PurchaseOrderDetail):
order = view.get_object()
HasPermission = (check_user_role(view.request.user, 'purchase_order', 'change')
or check_user_role(view.request.user, 'purchase_order', 'delete')
or check_user_role(view.request.user, 'purchase_order', 'add'))
has_permission = (check_user_role(view.request.user, 'purchase_order', 'change')
or check_user_role(view.request.user, 'purchase_order', 'delete')
or check_user_role(view.request.user, 'purchase_order', 'add'))

for s in self.registered_suppliers:
if order.supplier.pk == self.registered_suppliers[s]['pk'] and HasPermission:
if order.supplier.pk == self.registered_suppliers[s]['pk'] and has_permission:
if (order.pk != self.PurchaseOrderPK):
self.cart_content = []
panels.append({
Expand All @@ -130,13 +130,13 @@ def get_custom_panels(self, view, request):
'content_template': self.registered_suppliers[s]['po_template'],
})
if isinstance(view, PartDetail):
HasPermission = (check_user_role(view.request.user, 'part', 'change')
or check_user_role(view.request.user, 'part', 'delete')
or check_user_role(view.request.user, 'part', 'add'))
has_permission = (check_user_role(view.request.user, 'part', 'change')
or check_user_role(view.request.user, 'part', 'delete')
or check_user_role(view.request.user, 'part', 'add'))
show_panel = False
for s in self.registered_suppliers:
show_panel = show_panel or self.registered_suppliers[s]['is_registered']
if HasPermission and show_panel:
if has_permission and show_panel:
panels.append({
'title': 'Automatic Supplier parts',
'icon': 'fa-user',
Expand All @@ -150,7 +150,7 @@ def setup_urls(self):
re_path(r'^digikeytoken/', self.receive_authcode, name='digikeytoken'),

# Now for the plugin
re_path(r'transfercart/(?P<pk>\d+)/', self.TransferCart, name='transfer-cart'),
re_path(r'transfercart/(?P<pk>\d+)/', self.transfer_cart, name='transfer-cart'),
re_path(r'addsupplierpart(?:\.(?P<format>json))?$', self.add_supplierpart, name='add-supplierpart'),
]

Expand All @@ -159,15 +159,15 @@ def post_request(self, post_data, path, headers):
proxy_con = os.getenv('PROXY_CON')
proxy_url = os.getenv('PROXY_URL')
if proxy_con and proxy_url:
Proxies = {proxy_con: proxy_url}
proxies = {proxy_con: proxy_url}
elif self.get_setting('PROXY_CON') != '' and self.get_setting('PROXY_URL') != '':
Proxies = {self.get_setting('PROXY_CON'): self.get_setting('PROXY_URL')}
proxies = {self.get_setting('PROXY_CON'): self.get_setting('PROXY_URL')}
else:
Proxies = {}
proxies = {}
try:
response = requests.post(path,
verify=False,
proxies=Proxies,
proxies=proxies,
data=post_data,
timeout=5,
headers=headers
Expand All @@ -185,15 +185,15 @@ def get_request(self, path, headers):
proxy_con = os.getenv('PROXY_CON')
proxy_url = os.getenv('PROXY_URL')
if proxy_con and proxy_url:
Proxies = {proxy_con: proxy_url}
proxies = {proxy_con: proxy_url}
elif self.get_setting('PROXY_CON') != '' and self.get_setting('PROXY_URL') != '':
Proxies = {self.get_setting('PROXY_CON'): self.get_setting('PROXY_URL')}
proxies = {self.get_setting('PROXY_CON'): self.get_setting('PROXY_URL')}
else:
Proxies = {}
proxies = {}
try:
response = requests.get(path,
verify=False,
proxies=Proxies,
proxies=proxies,
timeout=5,
headers=headers
)
Expand Down Expand Up @@ -260,7 +260,7 @@ def update_mouser_cart(self, order, cart_key):
}
self.status_code = 200
self.message = 'OK'
MetaAccess.set_value(order, self.NAME, 'MouserCartKey', response['CartKey'])
MetaAccess.set_value(self, order, self.NAME, 'MouserCartKey', response['CartKey'])
return (shopping_cart)

# --------------------------- get_partdata ------------------------------------
Expand All @@ -287,11 +287,11 @@ def get_mouser_partdata(self, sku):
if response['Errors'] != []:
self.status_code = response['Errors']
return (part_data)
NumberOfResults = int(response['SearchResults']['NumberOfResult'])
if NumberOfResults == 0:
number_of_results = int(response['SearchResults']['NumberOfResult'])
if number_of_results == 0:
self.status_code = 'Part not found: ' + sku
return (part_data)
for i in range(0, NumberOfResults):
for i in range(0, number_of_results):
part_data['SKU'] = response['SearchResults']['Parts'][i]['MouserPartNumber']
part_data['MPN'] = response['SearchResults']['Parts'][i]['ManufacturerPartNumber']
part_data['URL'] = response['SearchResults']['Parts'][i]['ProductDetailUrl']
Expand All @@ -306,16 +306,16 @@ def get_mouser_partdata(self, sku):

# ------------------------------- get_mouser_package --------------------------
# Extracts the available packages from the Mouser part data json
def get_mouser_package(self, PartData):
Package = ''
def get_mouser_package(self, part_data):
package = ''
try:
Attributes = PartData['ProductAttributes']
attributes = part_data['ProductAttributes']
except Exception:
return None
for Att in Attributes:
if Att['AttributeName'] == 'Verpackung':
Package = Package + Att['AttributeValue'] + ', '
return (Package)
for att in attributes:
if att['AttributeName'] == 'Verpackung':
package = package + att['AttributeValue'] + ', '
return (package)

# The Digikey part
# digikey has no shopping cart API. So we create a list using the MyLists API.
Expand Down Expand Up @@ -362,7 +362,7 @@ def update_digikey_cart(self, order, list_id):
})
shopping_cart = {'MerchandiseTotal': merchandise_total,
'CartItems': cart_items,
'cart_key': MetaAccess.get_value(order, self.NAME, 'DigiKeyListName'),
'cart_key': MetaAccess.get_value(self, order, self.NAME, 'DigiKeyListName'),
'currency_code': InvenTreeSetting.get_setting('INVENTREE_DEFAULT_CURRENCY'),
}
self.status_code = 200
Expand Down Expand Up @@ -436,7 +436,7 @@ def create_mouser_cart(self, order):

def create_digikey_cart(self, order):
cart_data = {}
list_name = MetaAccess.get_value(order, self.NAME, 'DigiKeyListName')
list_name = MetaAccess.get_value(self, order, self.NAME, 'DigiKeyListName')
if list_name is None:
list_name = order.reference + '-00'
version = int(list_name[len(list_name) - 2:]) + 1
Expand All @@ -453,7 +453,7 @@ def create_digikey_cart(self, order):
cart_data['ID'] = ''
self.message = 'No valid list name found within 20 attempts'
return cart_data
MetaAccess.set_value(order, self.NAME, 'DigiKeyListName', list_name)
MetaAccess.set_value(self, order, self.NAME, 'DigiKeyListName', list_name)
url = 'https://api.digikey.com/mylists/v1/lists'
header = {
'Authorization': f"{'Bearer'} {self.get_setting('DIGIKEY_TOKEN')}",
Expand Down Expand Up @@ -534,10 +534,10 @@ def receive_authcode(self, request):
print('\033[31m\033[1mReceive access token FAILED\033[0m')
return HttpResponse(response.content)

# --------------------------- TransferCart ------------------------------------
# --------------------------- transfer_cart ------------------------------------
# This is called when the button is pressed and does most of the work.

def TransferCart(self, request, pk):
def transfer_cart(self, request, pk):

self.PurchaseOrderPK = int(pk)
order = PurchaseOrder.objects.filter(id=pk).all()[0]
Expand All @@ -553,11 +553,11 @@ def TransferCart(self, request, pk):
return HttpResponse('Error')

# Now we transfer the actual prices back into the PO
for POItem in order.lines.all():
for Item in self.cart_content['CartItems']:
if POItem.part.SKU == Item['SKU']:
POItem.purchase_price = Item['UnitPrice']
POItem.save()
for po_item in order.lines.all():
for item in self.cart_content['CartItems']:
if po_item.part.SKU == item['SKU']:
po_item.purchase_price = item['UnitPrice']
po_item.save()
return HttpResponse('OK')

# ---------------------------- add_supplierpart -------------------------------
Expand Down

0 comments on commit 9bfae87

Please sign in to comment.