Adds renew membership only button

This commit is contained in:
nikolark committed 2015-08-16 23:39:10 +02:00
1 parent 47303857ea
commit afb2d6705e
8 files changed
+3463 -148

No files matched your search

+1 -1
View File
@@ -11,6 +11,6 @@ class SearchUserForm(forms.Form):
class AddCardForm(forms.Form):
card_number = forms.IntegerField(widget=forms.NumberInput())
card_number = forms.IntegerField(widget=forms.NumberInput(attrs={'autofocus': True}))
phone_number = PhoneNumberField(widget=forms.TextInput(attrs={'type': 'tel'}))
user_id = forms.IntegerField(widget=forms.HiddenInput(), required=False)
+6 -10
View File
@@ -6,15 +6,7 @@
<form class="register-card-form" autocomplete="off">
{% csrf_token %}
<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 [DONE].
Renew membership for existing user [DONE].
Register card to existing user [DONE].
Replace card for existing user [DONE]
-->
</p>
<p>Enter card and phone number to register a new membership or add card to an existing user.</p>
{{ add_card_form|bootstrap }}
<div class="register-card-form--selected-user-section">
<label>{% trans "Member" %}</label>
@@ -25,7 +17,11 @@
<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>
<button type="reset" class="register-reset-btn btn btn-default">{% trans "Reset" %}</button>
<button type="reset" class="register-reset-btn btn btn-default">{% trans "Reset" %}</button><br><br>
<ul>
<li>If an existing user is found, you can renew the membership only (up to 30 days before expiry).</li>
</ul>
<button id="membership-submit-btn" type="submit" class="btn btn-default" disabled>{% trans "Renew membership only" %}</button>
</form>
</div>
<div class="col-sm-7 section-search">
+2 -1
View File
@@ -1,6 +1,6 @@
from django.conf.urls import url
from apps.kassa.views import register, inside_user_api, inside_card_api, check_phone_number, \
register_card_and_membership, stats_card_sales
register_card_and_membership, stats_card_sales, renew_membership
urlpatterns = [
url(r'^$', register, name='register'),
@@ -8,5 +8,6 @@ urlpatterns = [
url(r'^check-phonenumber/$', check_phone_number, name='check-phone-number'),
url(r'^inside/card/$', inside_card_api, name='inside-card-number-api'),
url(r'^register-card-membership/$', register_card_and_membership, name='register-card-and-membership'),
url(r'^renew-membership/$', renew_membership, name='renew-membership'),
url(r'^stats/card-sales/$', stats_card_sales, name='stats-card-sales')
]
+12
View File
@@ -149,6 +149,18 @@ def register_card_and_membership(request):
return JsonResponse(response.json(), status=response.status_code)
@login_required()
def renew_membership(request):
if request.method != 'POST':
return JsonResponse({'error': 'Only method POST supported'})
post_data = json.loads(request.body)
response = inside_update_membership(post_data.get('user_id'), purchased=post_data.get('purchased'))
return JsonResponse(response.json(), status=response.status_code)
def stats_card_sales(request):
sale_events = [KassaEvent.ADD_OR_RENEW, KassaEvent.NEW_CARD_MEMBERSHIP]