Merge pull request #169 from FJNR-inc/develop

New release
FJNR-inc · Sep 8, 2019 · db4e38a · db4e38a
2 parents cb233dd + 2fbabcf
commit db4e38a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/retirement/models.py b/retirement/models.py
@@ -566,7 +566,7 @@ def generate_key(self):
     def front_url(self):
         url = settings.LOCAL_SETTINGS[
             'FRONTEND_INTEGRATION'][
-            'FORGOT_PASSWORD_URL'].replace(
+            'RETREAT_INVITATION_URL'].replace(
             "{{token}}",
             str(self.url_token)
         )

diff --git a/retirement/serializers.py b/retirement/serializers.py
@@ -24,7 +24,7 @@
                                 getMessageTranslate)
 from store.exceptions import PaymentAPIError
 from store.models import Order, OrderLine, PaymentProfile, Refund
-from store.serializers import BaseProductSerializer
+from store.serializers import BaseProductSerializer, CouponSerializer
 from store.services import (charge_payment,
                             create_external_payment_profile,
                             create_external_card,
@@ -960,9 +960,12 @@ class Meta:
 
 
 class RetreatInvitationSerializer(serializers.HyperlinkedModelSerializer):
+    id = serializers.ReadOnlyField()
     url_token = serializers.ReadOnlyField()
     front_url = serializers.ReadOnlyField()
     nb_places_used = serializers.ReadOnlyField()
+    retreat_detail = RetreatSerializer(read_only=True, source='retreat')
+    coupon_detail = CouponSerializer(read_only=True, source='coupon')
 
     class Meta:
         model = RetreatInvitation

diff --git a/retirement/tests/test_viewset_Invitation.py b/retirement/tests/test_viewset_Invitation.py
@@ -113,7 +113,7 @@ def test_create(self):
 
         url = settings.LOCAL_SETTINGS[
             'FRONTEND_INTEGRATION'][
-            'FORGOT_PASSWORD_URL'].replace(
+            'RETREAT_INVITATION_URL'].replace(
             "{{token}}",
             str(response_data.get('url_token'))
         )

diff --git a/retirement/views.py b/retirement/views.py
@@ -59,6 +59,7 @@ class RetreatViewSet(ExportMixin, viewsets.ModelViewSet):
         'start_time': ['exact', 'gte', 'lte'],
         'end_time': ['exact', 'gte', 'lte'],
         'is_active': ['exact'],
+        'hidden': ['exact'],
     }
     ordering = ('name', 'start_time', 'end_time')