diff --git a/api/serializers.py b/api/serializers.py index b8e617ba..4df2f4e9 100644 --- a/api/serializers.py +++ b/api/serializers.py @@ -78,13 +78,19 @@ class FactureSerializer(NamespacedHMSerializer): 'control', 'prix_total', 'name', 'api_url') +class BaseInvoiceSerializer(NamespacedHMSerializer): + class Meta: + model = cotisations.BaseInvoice + fields = ('__all__') + class VenteSerializer(NamespacedHMSerializer): """Serialize `cotisations.models.Vente` objects. """ class Meta: model = cotisations.Vente - fields = ('facture', 'number', 'name', 'prix', 'duration', + fields = ('facture', + 'number', 'name', 'prix', 'duration', 'type_cotisation', 'prix_total', 'api_url') @@ -356,11 +362,15 @@ class OptionalUserSerializer(NamespacedHMSerializer): """Serialize `preferences.models.OptionalUser` objects. """ tel_mandatory = serializers.BooleanField(source='is_tel_mandatory') + shell_default = serializers.StringRelatedField() class Meta: model = preferences.OptionalUser fields = ('tel_mandatory', 'gpg_fingerprint', - 'all_can_create_club', 'self_adhesion', 'shell_default') + 'all_can_create_club', 'self_adhesion', 'shell_default', + 'self_change_shell', 'local_email_accounts_enabled', 'local_email_domain', + 'max_email_address', + ) class OptionalMachineSerializer(NamespacedHMSerializer): diff --git a/api/views.py b/api/views.py index e1ebf2c3..3d7f4bc2 100644 --- a/api/views.py +++ b/api/views.py @@ -55,6 +55,12 @@ class FactureViewSet(viewsets.ReadOnlyModelViewSet): queryset = cotisations.Facture.objects.all() serializer_class = serializers.FactureSerializer +class FactureViewSet(viewsets.ReadOnlyModelViewSet): + """Exposes list and details of `cotisations.models.Facture` objects. + """ + queryset = cotisations.BaseInvoice.objects.all() + serializer_class = serializers.BaseInvoiceSerializer + class VenteViewSet(viewsets.ReadOnlyModelViewSet): """Exposes list and details of `cotisations.models.Vente` objects.