From 6601a3c934a562c8918f1b807c918052f88f6ad3 Mon Sep 17 00:00:00 2001
From: Reena  Aheer <ranireena68@gmail.com>
Date: Mon, 1 May 2023 23:44:08 +0200
Subject: [PATCH] from Developer invitation to user invitation

---
 apimanager/base/context_processors.py         |  2 +-
 apimanager/base/templates/base.html           |  2 +-
 apimanager/users/forms.py                     | 13 ++++++++---
 .../users/templates/users/invitation.html     | 23 +++++++++++++------
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/apimanager/base/context_processors.py b/apimanager/base/context_processors.py
index 1ad1068..81b1498 100644
--- a/apimanager/base/context_processors.py
+++ b/apimanager/base/context_processors.py
@@ -13,7 +13,7 @@ USER_CURRENT = "/users/current"
 
 def api_root(request):
     """Returns the configured API_ROOT"""
-    return {'API_ROOT': settings.API_ROOT}
+    return {'API_ROOT': settings.API_ROOT['v500']}
 
 
 def portal_page(request):
diff --git a/apimanager/base/templates/base.html b/apimanager/base/templates/base.html
index 1926850..68a3053 100644
--- a/apimanager/base/templates/base.html
+++ b/apimanager/base/templates/base.html
@@ -44,7 +44,7 @@
                                 <hr class="dropdown-hr">
                                 <li {% ifequal request.path url_users_detail %} class="active" {% endifequal %}><a href="{{ url_users_detail }}">{% trans "My User" %}</a></li>
                                 <hr class="dropdown-hr">
-                                <li {% ifequal request.path my_user_invitation %} class="active" {% endifequal %}><a href="{{ my_user_invitation }}">{% trans "Invite Developer" %}</a></li>
+                                <li {% ifequal request.path my_user_invitation %} class="active" {% endifequal %}><a href="{{ my_user_invitation }}">{% trans "Invite User" %}</a></li>
                             </ul>
                         </li>
                         {% url "api-metrics" as api_metrics_url %} {% url "connector-metrics" as connector_metrics_url %} {% url "metrics-summary" as metrics_summary_url %}
diff --git a/apimanager/users/forms.py b/apimanager/users/forms.py
index 6f0993b..4804fed 100644
--- a/apimanager/users/forms.py
+++ b/apimanager/users/forms.py
@@ -36,6 +36,12 @@ class AddEntitlementForm(forms.Form):
         super(AddEntitlementForm, self).__init__(*args, **kwargs)
 
 class CreateInvitationForm(forms.Form):
+
+    USER_CHOICE = (
+        ('', _('Any')),
+        ('DEVELOPER', 'DEVELOPER'),
+        ('CUSTOMER', 'CUSTOMER'),
+    )
     bank_id = forms.ChoiceField(
         label=_('Bank'),
         widget=forms.Select(
@@ -93,14 +99,15 @@ class CreateInvitationForm(forms.Form):
         ),
         required=True,
     )
-    purpose = forms.CharField(
+    purpose = forms.ChoiceField(
         label=_('Purpose'),
-        widget=forms.TextInput(
+        choices=USER_CHOICE,
+        widget=forms.Select(
             attrs={
-                'placeholder': _('For the Bank App'),
                 'class': 'form-control',
             }
         ),
+        initial='',
         required=False,
     )
 
diff --git a/apimanager/users/templates/users/invitation.html b/apimanager/users/templates/users/invitation.html
index efd4552..c6c3972 100644
--- a/apimanager/users/templates/users/invitation.html
+++ b/apimanager/users/templates/users/invitation.html
@@ -5,7 +5,7 @@
 
 {% block content %}
     <div id="user-invitation">
-        <h1>{% trans "Invite Developer" %}</h1>
+        <h1>{% trans "Invite User" %}</h1>
 
         <form action="{% url 'my-user-invitation' %}" method="post">
             {% csrf_token %}
@@ -42,25 +42,34 @@
                 <div class="col-xs-12 col-sm-4">
                     {% if form.email.errors %}<div class="alert alert-danger">{{ form.email.errors }}</div>{% endif %}
                     <div class="form-group">
-                        <strong>{% trans "email" %} </strong>
+                        <strong>{% trans "Email" %} </strong>
                         {{ form.email }}
                     </div>
                 </div>
                 <div class="col-xs-12 col-sm-4">
                     {% if form.company.errors %}<div class="alert alert-danger">{{ form.company.errors }}</div>{% endif %}
                     <div class="form-group">
-                        <strong>{% trans "company" %} </strong>
+                        <strong>{% trans "Company" %} </strong>
                         {{ form.company }}
                     </div>
                 </div>
                 <div class="col-xs-12 col-sm-4">
                     {% if form.country.errors %}<div class="alert alert-danger">{{ form.country.errors }}</div>{% endif %}
                     <div class="form-group">
-                        <strong>{% trans "country" %} </strong>
+                        <strong>{% trans "Country" %} </strong>
                         {{ form.country }}
                     </div>
                 </div>
             </div>
+            <div class="row">
+                <div class="col-xs-12 col-sm-4">
+                    {% if form.purpose.errors %}<div class="alert alert-danger">{{ form.purpose.errors }}</div>{% endif %}
+                    <div class="form-group">
+                        <strong>{% trans "Purpose" %} </strong>
+                        {{ form.purpose }}
+                    </div>
+                </div>
+            </div>
 
             <input type="submit" value='{% trans "Create" %}' class="btn btn-primary btn-green" />
             <div class="table-responsive">
@@ -69,9 +78,9 @@
                     <th scope="col">{% trans "First Name" %}</th>
                     <th scope="col">{% trans "Last Name" %}</th>
                     <th scope="col">{% trans "Email" %}</th>
-                    <th scope="col">{% trans "company" %}</th>
-                    <th scope="col">{% trans "country" %}</th>
-                    <th scope="col">{% trans "status" %}</th>
+                    <th scope="col">{% trans "Company" %}</th>
+                    <th scope="col">{% trans "Country" %}</th>
+                    <th scope="col">{% trans "Status" %}</th>
                     </thead>
                     <tbody>
                     {% for invitation in invitations %}