Merge branch 'sales_features' into 'dev'

finance email

See merge request !303

access/models/other.py

@@ -53,6 +53,10 @@ class Account(models.Model):
     def __str__(self):
         return self.owner.email
 
+    def get_phone(self):
+        return '' if self.phone.national_number else \
+            (self.phone.national_number if self.phone.country_code is None else str(self.phone))
+
     class Meta:
         verbose_name = 'Дополнительная информация о пользователе'
         verbose_name_plural = 'Дополнительная информация о пользователе'

access/serializers.py

@@ -8,6 +8,7 @@ from progress.serializers import SecureProgressSerializer, SupportProgressSerial
 
 class AccountSerializer(serializers.ModelSerializer):
     gender = serializers.SerializerMethodField()
+    phone = serializers.SerializerMethodField()
 
     class Meta:
         model = Account
@@ -17,6 +18,10 @@ class AccountSerializer(serializers.ModelSerializer):
     def get_gender(self):
         return self.get_gender_display()
 
+    @staticmethod
+    def get_phone(self):
+        return self.get_phone()
+
 
 class UserSelfSerializer(serializers.ModelSerializer):
     account = serializers.SerializerMethodField()
@@ -84,7 +89,7 @@ class UserSearchSerializer(serializers.ModelSerializer):
 
     @staticmethod
     def get_phone(self):
-        return None if self.account.phone is None else self.account.phone.raw_input
+        return self.account.get_phone()
 
     @staticmethod
     def get_pay(self):
@@ -114,7 +119,7 @@ class UserProgressSearchSerializer(serializers.ModelSerializer):
 
     @staticmethod
     def get_phone(self):
-        return None if self.account.phone is None else self.account.phone.raw_input
+        return self.account.get_phone()
 
     @staticmethod
     def get_progresses(self):