Opt
2 changed files with 3 additions and 3 deletions
+ 2
- 2
account/models.py
@@ -398,8 +398,8 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin): |
||
| 398 | 398 |
sr = SalesResponsibilityInfo.objects.get(user_id=self.user_id) |
| 399 | 399 |
except SalesResponsibilityInfo.DoesNotExist: |
| 400 | 400 |
sr = None |
| 401 |
- sr_id = sr.sr_id if sr else '' |
|
| 402 |
- is_sr = True if sr else False |
|
| 401 |
+ sr_id = sr.sr_id if sr and sr.user_status == SalesResponsibilityInfo.ACTIVATED else '' |
|
| 402 |
+ is_sr = True if sr and sr.user_status == SalesResponsibilityInfo.ACTIVATED else False |
|
| 403 | 403 |
is_super_sr = True if sr and sr.is_super else False |
| 404 | 404 |
return {
|
| 405 | 405 |
'sr_id': sr_id, |
+ 1
- 1
sales/views.py
@@ -58,7 +58,7 @@ def sr_distributor_tj(request): |
||
| 58 | 58 |
brand_id = request.POST.get('brand_id', settings.KODO_DEFAULT_BRAND_ID)
|
| 59 | 59 |
distributor_id = request.POST.get('distributor_id', '')
|
| 60 | 60 |
|
| 61 |
- sales = SalesResponsibilityInfoModelsSaleStatisticInfo.objects.filter(brand_id=brand_id, distributor_id=distributor_id, ymd=tc.local_string(format='%Y%m%d'), status=True).order_by('-is_important')
|
|
| 61 |
+ sales = SalesResponsibilityInfoModelsSaleStatisticInfo.objects.filter(brand_id=brand_id, distributor_id=distributor_id, ymd=tc.local_string(format='%Y%m%d'), status=True).order_by('-is_important', '-yesterday_num')
|
|
| 62 | 62 |
sales = [sale.data for sale in sales] |
| 63 | 63 |
|
| 64 | 64 |
return response(data={
|