mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into feature/6561/invoices-webhook

Browse source
This commit is contained in:
PCoder 2019-07-18 08:26:15 +05:30
commit 8300babead
23 changed files with 434 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosting/models.py
View file

@ -187,7 +187,7 @@ class HostingOrder(AssignPermissionsMixin, models.Model):
class UserHostingKey(models.Model):
user = models.ForeignKey(CustomUser)
user = models.ForeignKey(CustomUser, blank=True, null=True)
public_key = models.TextField()
private_key = models.FileField(upload_to='private_keys', blank=True)
created_at = models.DateTimeField(auto_now_add=True)
@ -613,6 +613,8 @@ class UserCardDetail(AssignPermissionsMixin, models.Model):
for card in user_card_details:
cards_list.append({
'last4': card.last4, 'brand': card.brand, 'id': card.id,
'exp_year': card.exp_year,
'exp_month': '{:02d}'.format(card.exp_month),
'preferred': card.preferred
})
return cards_list