Minor fixes and TODOs

apps/kassa/forms.py

@@ -11,6 +11,6 @@ class SearchUserForm(forms.Form):
 
 
 class AddCardForm(forms.Form):
-    phone_number = PhoneNumberField(widget=forms.TextInput(attrs={'type': 'tel'}))
     card_number = forms.IntegerField(widget=forms.NumberInput())
+    phone_number = PhoneNumberField(widget=forms.TextInput(attrs={'type': 'tel'}))
     user_id = forms.IntegerField(widget=forms.HiddenInput(), required=False)

apps/kassa/templates/kassa/register.html

@@ -5,8 +5,9 @@
     <div class="col-sm-5 section-card-form">
         <form class="register-card-form" autocomplete="off">
             {% csrf_token %}
-            <h3>{% trans "Register card" %}</h3>
-            <p><!--
+            <h3>{% trans "Card and membership" %}</h3>
+            <p>Enter card and phone number to register a new membership or add card to an existing user.
+                <!--
                 Add no-user membership [DONE].
                 Add membership for new user and existing user.
                 Renew membership for existing user.
@@ -14,14 +15,13 @@
                 Replace card for existing user [DONE]
                 -->
                 </p>
+            {{ add_card_form|bootstrap }}
             <div class="register-card-form--selected-user-section">
                 <label>{% trans "Member" %}</label>
                 <div class="register-card-form--selected-user-wrap"></div>
             </div>
-            {{ add_card_form|bootstrap }}
             <ul>
-                <li>If <em>no</em> existing user with membership can be found, <strong>a new membership is registered</strong> and tied to a card number.</li>
-                <li>If an existing user is found <em>without</em> a membership, it is <strong>renewed</strong></li>
+                <li>If an existing user is found <em>without</em> a valid membership, the membership is <strong>renewed</strong></li>
                 <li>Registering a card number with a phone number already tied to an existing user, will add the card to that user.</li>
             </ul>
             <button id="register-submit-btn" type="submit" class="btn btn-primary btn-lg" disabled>{% trans "Register card" %}</button>

apps/kassa/utils.py

@@ -13,7 +13,7 @@ def tekstmelding_new_card_no_user(card_number, phone_number):
         'action': 'new_card_no_user',
     }
 
-    url = '{}kassa/notify-new-card'.format(settings.TEKSTMELDING_API_URL)
+    url = '{}kassa/new-membership-card'.format(settings.TEKSTMELDING_API_URL)
     response = requests.post(
         url,
         data=json.dumps(payload),

apps/kassa/views.py

@@ -81,6 +81,7 @@ def inside_card_api(request):
     }
 
     if request.method == 'POST':
+        # TODO: Move this to own method in utils.py, called by register_card_and_membership
         post_data = json.loads(request.body)
         payload = {
             'card_number': post_data.get('card_number'),
@@ -111,6 +112,7 @@ def inside_card_api(request):
 
 @login_required
 def inside_register_api(request):
+    # TODO: move this to own method in utils.py
     post_data = json.loads(request.body)
     payload = {
         'apikey': settings.INSIDE_API_KEY,
@@ -124,3 +126,9 @@ def inside_register_api(request):
     response = requests.post(url, data=json.dumps(payload), headers=dict(content_type='application/json'))
 
     return JsonResponse(response.json(), status=response.status_code)
+
+
+@login_required()
+def register_card_and_membership(request):
+    # TODO: Call membership and card apis above, depending of what need to be done
+    pass

static/app/scripts/app.js

@@ -397,14 +397,14 @@ $(document).ready(function(){
 
         /* Register type */
         // FIXME: get from form
-        // action: 'new_card_no_user', 'update_card', 'renewal'
+        // action: 'new_card_no_user', 'update_card', 'add_or_renew'
         if(selectedUser === null) {
             payload.action = 'new_card_no_user';
         } else {
             if(selectedUser.is_member === '1') {
                 payload.action = 'update_card';
             } else {
-                payload.action = 'renewal'; // Not: could also update card number
+                payload.action = 'add_or_renew'; // Note: could also update card number
             }
         }
 

static/app/templates/search_result.html

@@ -29,8 +29,8 @@
     {% if not no_user_actions %}
         <div class="user-actions">
             <div class="btn-group">
-                <a href="#" class="btn btn-default{% if res.is_member == "1" %} disabled{% endif %}">Membership</a>
-                <a href="#" class="btn btn-default">Reg. card</a>
+                <!--<a href="#" class="btn btn-default{% if res.is_member == "1" %} disabled{% endif %}">Membership</a>
+                <a href="#" class="btn btn-default">Reg. card</a>-->
                 <div class="btn-group" role="group">
                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <span class="glyphicon glyphicon-option-vertical"></span>

static/dist/scripts/app.js

@@ -397,14 +397,14 @@ $(document).ready(function(){
 
         /* Register type */
         // FIXME: get from form
-        // action: 'new_card_no_user', 'update_card', 'renewal'
+        // action: 'new_card_no_user', 'update_card', 'add_or_renew'
         if(selectedUser === null) {
             payload.action = 'new_card_no_user';
         } else {
             if(selectedUser.is_member === '1') {
                 payload.action = 'update_card';
             } else {
-                payload.action = 'renewal'; // Not: could also update card number
+                payload.action = 'add_or_renew'; // Note: could also update card number
             }
         }
 

static/dist/scripts/templates.js

@@ -70,12 +70,12 @@ output += "\n            <span class=\"label label-is-active\">Active</span>\n
 }
 output += "\n    </div>\n    ";
 if(!runtime.contextOrFrameLookup(context, frame, "no_user_actions")) {
-output += "\n        <div class=\"user-actions\">\n            <div class=\"btn-group\">\n                <a href=\"#\" class=\"btn btn-default";
+output += "\n        <div class=\"user-actions\">\n            <div class=\"btn-group\">\n                <!--<a href=\"#\" class=\"btn btn-default";
 if(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"is_member", env.opts.autoescape) == "1") {
 output += " disabled";
 ;
 }
-output += "\">Membership</a>\n                <a href=\"#\" class=\"btn btn-default\">Reg. card</a>\n                <div class=\"btn-group\" role=\"group\">\n                    <button type=\"button\" class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">\n                        <span class=\"glyphicon glyphicon-option-vertical\"></span>\n                    </button>\n                    <ul class=\"dropdown-menu\">\n                        <li><a href=\"https://inside.studentersamfundet.no/index.php?page=display-user&userid=";
+output += "\">Membership</a>\n                <a href=\"#\" class=\"btn btn-default\">Reg. card</a>-->\n                <div class=\"btn-group\" role=\"group\">\n                    <button type=\"button\" class=\"btn btn-default dropdown-toggle\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">\n                        <span class=\"glyphicon glyphicon-option-vertical\"></span>\n                    </button>\n                    <ul class=\"dropdown-menu\">\n                        <li><a href=\"https://inside.studentersamfundet.no/index.php?page=display-user&userid=";
 output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "res")),"id", env.opts.autoescape), env.opts.autoescape);
 output += "\" target=\"_blank\">Edit in Inside</a></li>\n                    </ul>\n              </div>\n            </div>\n        </div>\n    ";
 ;