Search existing members in Inside.

- Also removes some files belonging to another project
This commit is contained in:
nikolark committed 2015-07-07 17:39:12 +02:00
1 parent 8eaaa19665
commit 7bc0c8f65c
25 files changed
+170 -6035

No files matched your search

+5 -5
View File
@@ -1,10 +1,10 @@
from django import forms
from phonenumber_field.formfields import PhoneNumberField
from django.utils.translation import ugettext_lazy as _
class SearchUserForm(forms.Form):
query = forms.CharField(required=False) # ,label=_('Search existing members'))
class AddCardForm(forms.Form):
phone_number = PhoneNumberField(widget=forms.TextInput(attrs={
'type': 'tel',
'class': 'form-control'
}))
card_number = forms.IntegerField(widget=forms.NumberInput(attrs={'class': 'form-control'}))
phone_number = PhoneNumberField(widget=forms.TextInput(attrs={'type': 'tel'}))
card_number = forms.IntegerField(widget=forms.NumberInput())
+9 -6
View File
@@ -3,22 +3,25 @@
{% block content %}
<div class="row">
<div class="col-xs-12">
<h2>Registrer kjøpt medlemskap</h2>
<h2>{% trans "Register membership card" %}</h2>
</div>
</div>
<div class="row">
<div class="col-sm-6">
<p>Telefonnummer som allerede er tilknyttet en bruker i Inside vil få kortnummer registrert på sin bruker.</p>
<form>
{{ form|bootstrap }}
<h3 style="margin-top: 0;">{% trans "Lookup existing user" %}</h3>
{{ search_user_form|bootstrap }}
<h3>{% trans "Register card" %}</h3>
{{ add_card_form|bootstrap }}
<p><em>Registering a card number with a phone number already tied to an existing user, will add the card to that user.</em></p>
<button type="submit" class="btn btn-primary btn-lg">{% trans "Register" %}</button>
</form>
</div>
<div class="col-sm-6">
<div class="panel panel-default">
<div class="panel-heading">Søkeresultater</div>
<div class="panel-body results">
TODO: ...
<div class="panel-heading">Results</div>
<div class="panel-body results-wrap">
&nbsp;
</div>
</div>
</div>
+4 -3
View File
@@ -1,6 +1,7 @@
from django.conf.urls import url
from apps.kassa.views import register
from apps.kassa.views import register, inside_user_api
urlpatterns = [
url(r'^$', register, name='register')
]
url(r'^$', register, name='register'),
url(r'^inside/user/$', inside_user_api, name='inside-user-api')
]
+17 -2
View File
@@ -1,14 +1,29 @@
# coding: utf-8
from __future__ import unicode_literals
from django.conf import settings
from django.contrib.auth.decorators import login_required
from django.http import JsonResponse
from django.shortcuts import render
from apps.kassa.forms import AddCardForm
from apps.kassa.forms import AddCardForm, SearchUserForm
import requests
@login_required
def register(request):
context = {
'form': AddCardForm()
'add_card_form': AddCardForm(),
'search_user_form': SearchUserForm()
}
return render(request, 'kassa/register.html', context)
@login_required
def inside_user_api(request):
payload = {
'apikey': settings.INSIDE_API_KEY,
'q': request.GET.get('q', '')
}
url = settings.INSIDE_API_URL
data = requests.get(url, params=payload).json()
return JsonResponse(data)