license: always call check_one_profile on license save

remotes/origin/license
Andrey 9 years ago
parent cea1634d93
commit 613b8d1b88
  1. 11
      project/customer/models.py
  2. 1
      project/customer/utils.py
  3. 1
      project/myauth/views.py

@ -445,25 +445,24 @@ class License(models.Model):
)
def save(self, *args, **kwargs):
now_ = datetime.now()
if not self.__prev_paid_date and self.paid_date:
max_date_license = License.objects.filter(company=self.company).aggregate(Max('date_to'))['date_to__max']
now_ = datetime.now()
if max_date_license < now_.date():
max_date_license = now_.date() - timedelta(days=1)
self.date_from = max_date_license + relativedelta(days=1)
self.date_to = self.date_from + relativedelta(months=self.term, days=-1)
self.company.active = True
self.company.save()
self.status = consts.LICENSE_PAID
utils.check_one_profile(self.company, License, now_, manual=True)
super(License, self).save(*args, **kwargs)
# дополнительные действия, связанные с сохранением лицензии
utils.check_one_profile(self.company, License, now_, manual=True)
def set_paid(self, paid_date=None):
self.paid_date = paid_date or date.today()
self.status = consts.LICENSE_PAID

@ -27,6 +27,7 @@ def check_one_profile(profile, License, now_, manual=False):
user_email = profile.users.get().email
# если профиль только что активирован
if profile.active and not profile_was_active:
template_name = 'myauth/license_activated.txt'
subject = u'Документор: Профиль активирован'

@ -99,7 +99,6 @@ def confirm_registered_email(request, key):
license = License.objects.create_test_period_license(company=user.profile)
emails.send_welcome_email.delay(new_user.email, confirm_url)
user.profile.confirmed = True
user.profile.active = True
user.profile.save()
auth.logout(request)

Loading…
Cancel
Save