account/models.py

@@ -395,16 +395,13 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin):

                     @property
              

                     def srinfo(self):
              

                         try:
              

                -            sr = SalesResponsibilityInfo.objects.get(user_id=self.user_id)
              

                +            sr = SalesResponsibilityInfo.objects.get(user_id=self.user_id, user_status=SalesResponsibilityInfo.ACTIVATED)
              

                         except SalesResponsibilityInfo.DoesNotExist:
              

                             sr = None
              

                -        sr_id = sr.sr_id if sr and sr.user_status == SalesResponsibilityInfo.ACTIVATED else ''
              

                -        is_sr = True if sr and sr.user_status == SalesResponsibilityInfo.ACTIVATED else False
              

                -        is_super_sr = True if sr and sr.is_super else False
              

                -        return {
              

                -            'sr_id': sr_id,
              

                -            'is_sr': is_sr,
              

                -            'is_super_sr': is_super_sr,
              

                +        return sr.base_data if sr else {
              

                +            'sr_id': '',
              

                +            'is_sr': False,
              

                +            'is_super_sr': False,
              

                         }
              

                 
              

                     def brandata(self, brand_id=None):
              

sales/models.py

@@ -54,6 +54,14 @@ class SalesResponsibilityInfo(BaseModelMixin):

                         return u'{}-{}'.format(self.name, self.phone)
              

                 
              

                     @property
              

                +    def base_data(self):
              

                +        return {
              

                +            'sr_id': self.sr_id,
              

                +            'is_sr': True,
              

                +            'is_super': self.is_super,
              

                +        }
              

                +
              

                +    @property
              

                     def admindata(self):
              

                         return {
              

                             'brand_id': self.brand_id,