sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2024-12-26 15:23:09 +01:00
parent 275b5f382a
commit dd14f1eef7
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/idoklad.py
View File

@@ -37,9 +37,11 @@ def get_country_id(code):
def idoklad_token(): def idoklad_token():
try: try:
token = iDokladToken.objects.get(id=1) token = iDokladToken.objects.all().order_by('-updated_at')[0]
except iDokladToken.DoesNotExist: except iDokladToken.DoesNotExist:
return None return None
except KeyError:
return None
if token.updated_at + datetime.timedelta(seconds=token.expires_in) < timezone.now(): if token.updated_at + datetime.timedelta(seconds=token.expires_in) < timezone.now():
headers = { headers = {
@@ -189,6 +191,7 @@ def create_invoice(rower, amount, braintreeid, dosend=True, contact_id=None, nam
post_data['ItemsTextSuffix'] = 'This invoice was already paid. Please do not pay it again.' post_data['ItemsTextSuffix'] = 'This invoice was already paid. Please do not pay it again.'
post_data['Items'][0]['VatRate'] = 0.0 post_data['Items'][0]['VatRate'] = 0.0
post_data['Items'][0]['VatRateType'] = 2 post_data['Items'][0]['VatRateType'] = 2
post_data['Items'][0]['PaymentOptionId'] = 2
post_data['Items'][0]['VatCodeId'] = 3 post_data['Items'][0]['VatCodeId'] = 3
post_data['CurrencyId'] = 2 post_data['CurrencyId'] = 2
post_data['ReportLanguage'] = 3 post_data['ReportLanguage'] = 3

2
rowers/models.py
View File

@@ -5597,5 +5597,5 @@ class iDokladToken(models.Model):
expires_in = models.IntegerField() # Store token expiry duration in seconds expires_in = models.IntegerField() # Store token expiry duration in seconds
def __str__(self): def __str__(self):
return f"iDoklad Token updated at {self.updated_at}, expires at {self.updated_at+datetime.timedelta(seconds=self.expires_in)}" return f"iDoklad Token {self.id} updated at {self.updated_at}, expires at {self.updated_at+datetime.timedelta(seconds=self.expires_in)}"

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

4
rowers/views/paymentviews.py
View File

@@ -54,7 +54,7 @@ def process_idokladcallback(request):
if response.status_code == 200: if response.status_code == 200:
result = response.json() result = response.json()
try: try:
t = iDokladToken.objects.get(id=1) t = iDokladToken.objects.all().order_by('-updated_at')[0]
t.acces_token = result['access_token'], t.acces_token = result['access_token'],
t.refresh_token = result['refresh_token'] t.refresh_token = result['refresh_token']
t.expires_in = result['expires_in'] t.expires_in = result['expires_in']
@@ -63,6 +63,7 @@ def process_idokladcallback(request):
except KeyError: except KeyError:
pass pass
t.save() t.save()
dologging("idoklad.log","Saving code to token "+str(t.id)+" with access_token: "+result['access_token'])
except iDokladToken.DoesNotExist: except iDokladToken.DoesNotExist:
t = iDokladToken( t = iDokladToken(
access_token = result['access_token'], access_token = result['access_token'],
@@ -70,6 +71,7 @@ def process_idokladcallback(request):
expires_in = result['expires_in'], expires_in = result['expires_in'],
) )
t.save() t.save()
dologging("idoklad.log", "Creating new token "+str(t.id)+"with access_token: "+result['access_token'])
messages.info(request,"Token refreshed and stored") messages.info(request,"Token refreshed and stored")
else: else:
messages.error(request,"Error") messages.error(request,"Error")