diff --git a/dynamic_preferences/dynamic_preferences_registry.py b/dynamic_preferences/dynamic_preferences_registry.py index f39ab06..edc1dad 100644 --- a/dynamic_preferences/dynamic_preferences_registry.py +++ b/dynamic_preferences/dynamic_preferences_registry.py @@ -157,9 +157,10 @@ card_fields = { "format": "table", "title": "", "required_by_default": 1, - "required": ['card_number', "whatsapp_number"], + "required": ['card_number', 'card_name',"whatsapp_number"], "properties": { "card_number": {"type": "string", "title": "Card Number"}, + "card_name": {"type": "string", "title": "Card Name"}, "whatsapp_number": {"type": "string", "title": "Whatsapp Number"}, } } diff --git a/dynamic_preferences/serializers.py b/dynamic_preferences/serializers.py index 83912a5..bf57339 100644 --- a/dynamic_preferences/serializers.py +++ b/dynamic_preferences/serializers.py @@ -14,8 +14,10 @@ from django.utils.dateparse import ( ) from django.utils.duration import duration_string from django.utils.encoding import force_str +from datetime import timezone + from django.utils.timezone import ( - utc, + # utc, is_aware, make_aware, make_naive, @@ -39,6 +41,7 @@ class SupportSerializer(serializers.Serializer): class CardSerializer(serializers.Serializer): card_number = serializers.CharField() + card_name = serializers.CharField() whatsapp_number = serializers.CharField() @@ -428,7 +431,7 @@ class DateTimeSerializer(BaseSerializer): if (field_timezone is not None) and not is_aware(value): return make_aware(value, field_timezone) elif (field_timezone is None) and is_aware(value): - return make_naive(value, utc) + return make_naive(value, timezone.utc) return value @classmethod