fix: FR bugs (#1244)

## Describe your changes

Fixes: #

dashboard/api/registration/types/cr.py

@@ -50,7 +50,6 @@ class CRRegistrationSerializer(RegistrationSerializer):
 
     def update(self, instance, validated_data):
         update_field(instance, validated_data, "company", CRCompanySerializer)
-        update_field(instance, validated_data, "exhibitor", ExhibitorSerializer)
 
         orders = validated_data.pop("orders", None)
         if orders != None:

dashboard/api/registration/types/serializer.py

@@ -1,5 +1,6 @@
 from rest_framework import serializers
 from drf_writable_nested import WritableNestedModelSerializer
+from companies.serializers import CompanySerializer
 from people.models import Profile
 from recruitment.models import RecruitmentApplication
 
@@ -238,6 +239,7 @@ class RegistrationSerializer(serializers.Serializer):
     orders = OrderSerializer(many=True)
     contact = CompanyContactSerializer()
     exhibitor = ExhibitorSerializer()
+    company = CompanySerializer()
     interested_in = InterestedInSerializer(many=True)
 
     # Add the 'fair' context to sales_contacts
@@ -257,6 +259,7 @@ def to_representation(self, instance):
 
     def update(self, instance, validated_data):
         update_field(instance, validated_data, "contact", CompanyContactSerializer)
+        update_field(instance, validated_data, "exhibitor", ExhibitorSerializer)
 
         interested_in = validated_data.pop("interested_in", None)
         if interested_in != None:

dashboard/api/registration/types/util.py

@@ -6,8 +6,8 @@
     CRRegistrationSerializer,
     CRSignedRegistrationSerializer,
 )
-from dashboard.api.registration.types.ir import IRRegistrationSerializer
 
+from dashboard.api.registration.types.serializer import RegistrationSerializer
 from fair.models import RegistrationPeriod
 
 from util import status, get_user
@@ -21,23 +21,22 @@ def get_serializer(request, registration, data=empty, context={}):
     if user != None:
         permission = UserPermission(user)
 
-    if registration.period in [
-        RegistrationPeriod.BEFORE_IR,
-        RegistrationPeriod.IR,
-        RegistrationPeriod.BETWEEN_IR_AND_CR,
-    ]:
-        Serializer = IRRegistrationSerializer
+    if (
+        registration.period
+        in [
+            RegistrationPeriod.BEFORE_IR,
+            RegistrationPeriod.IR,
+            RegistrationPeriod.BETWEEN_IR_AND_CR,
+        ]
+        or registration.ir_signature is None
+    ):
+        Serializer = RegistrationSerializer
     elif registration.period in [RegistrationPeriod.CR]:
-        Serializer = CRRegistrationSerializer
-
-        if registration.ir_signature == None:  # If IR has not been signed
-            Serializer = IRRegistrationSerializer
-        elif registration.cr_signature:
-            # If user is sales, they may change anything he likes
-            if permission == UserPermission.SALES:
-                Serializer = CRRegistrationSerializer
-            else:
-                Serializer = CRSignedRegistrationSerializer
+        # If user is sales, they may change anything he likes
+        if permission == UserPermission.SALES or registration.cr_signature is None:
+            Serializer = CRRegistrationSerializer
+        else:
+            Serializer = CRSignedRegistrationSerializer
 
     elif registration.period in [
         RegistrationPeriod.AFTER_CR,

exhibitors/api.py

@@ -159,7 +159,10 @@ def exhibitors(request):
     )
 
     exhibitors = (
-        Exhibitor.objects.filter(fair__in=Fair.objects.filter(**fair_criteria))
+        Exhibitor.objects.filter(
+            fair__in=Fair.objects.filter(**fair_criteria),
+            application_status="accepted",
+        )
         .select_related(
             "company",
             "fair",

templates/register/email/ir_complete.html

@@ -14,10 +14,6 @@
 	What happens now:
 </p>
 <ul>
-	<li style="font-size:16px;line-height:24px;margin:16px 0;color:#525f7f;text-align:left">
-		We are reviewing registrations and will confirm your registration by {{ ir_application_review_date|date:"Y-m-d" }}.
-		This is to make sure we do not take in more exhibitors than we have space for.
-	</li>
 	<li style="font-size:16px;line-height:24px;margin:16px 0;color:#525f7f;text-align:left">
 		Final registration opens {{ fair.complete_registration_start_date|date:"Y-m-d" }} on the same dashboard.
 		There you make your final choice of package, events and other products.