delete invoice, logout all when confirm email

project/customer/urls.py

@@ -16,6 +16,7 @@ urlpatterns = patterns('',
     url(r'^profile/edit/$', profile.profile_edit, name='customer_profile_edit'),
     url(r'^profile/email/$', profile.profile_email, name='customer_profile_email'),
     url(r'^license/$', license.order_license, name='customer_order_license'),
+    url(r'^delete_license/(?P<pk>\d+)/$', license.delete_license, name='customer_order_license'),
     url(r'^robokassa/result/$', license.payment_result, name='robokassa_result'),
     url(r'^robokassa/success/$', license.payment_success, name='robokassa_success'),
     url(r'^robokassa/fail/$', license.payment_fail, name='robokassa_fail'),

project/customer/views/license.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import json
 import hashlib
 
 from django.shortcuts import render, redirect
@@ -56,7 +57,7 @@ def license_list(request):
     """Список счетов на лицензии
     """
     template_name = 'customer/profile/license_list.html'
-    licenses = License.objects.filter(user=request.user).order_by('-id')
+    licenses = License.objects.filter(user=request.user, deleted=False).order_by('-id')
     dictionary = {
             'licenses': licenses,
     }
@@ -68,7 +69,8 @@ def paid_list(request):
     """Оплаченные лицензии
     """
     template_name = 'customer/profile/paid_list.html'
-    licenses = License.objects.filter(user=request.user, status__in=[-1, 1, 2, 3]).order_by('-id')
+    licenses = License.objects.filter(user=request.user, 
+            status__in=[-1, 1, 2, 3], deleted=False).order_by('-id')
     dictionary = {
             'licenses': licenses,
     }
@@ -77,13 +79,20 @@ def paid_list(request):
 
 @login_required
 def delete_license(request, pk):
-    template_name = 'customer/profile/delete_license.html'
+    if not request.is_ajax():
+        return HttpResponseBadRequest()
+
     try:
-        license = License.objects.get(pk=pk)
+        license = License.objects.get(pk=pk, status=0, user=request.user)
+        if request.method == 'POST':
+            license.deleted = True
+            license.save()
+            dictionary = {'res': 'Ok', 'id': pk}
     except:
-        raise Http404
-    dictionary = {'license': license}
-    return render(request, template_name, dictionary)
+        dictionary = {'res': 'fail'}
+
+    data = json.dumps(dictionary)
+    return HttpResponse(data, mimetype='application/json')
 
  
 @csrf_exempt

project/myauth/views.py

@@ -102,6 +102,7 @@ def confirm_registered_email(request, key):
         user.profile.confirmed = True
         user.profile.active = True
         user.profile.save()
+    auth.logout(request)
 
     return redirect(success_url)
 

project/static/js/license.js

@@ -10,9 +10,30 @@ $(document).ready(function() {
             $($('[name="term"]')[0]).closest('li').show();
         }
     }
+
     show_month();
     $('[name="payform"]').change(function(){ 
         show_month()
     });
+
+    $('.delete_license').click(function(e){
+        e.preventDefault();
+        var lic_pk = $(this).data('id');
+
+        $('#dialogs').html('Удалить?');
+        $('#dialogs').dialog({
+            buttons: {
+                "Да": function(){
+                    $.post('/my/delete_license/' + lic_pk + '/', function(data){
+                        $('.license_' + data['id']).remove()
+                    });
+                    $(this).dialog("close");
+                },
+                "Нет": function(){
+                    $(this).dialog("close");
+                }
+            }
+        })
+    })
 });
 

project/templates/customer/profile/license_list.html

@@ -7,14 +7,19 @@
 <a href="{% url 'customer_paid_list' %}">Оплаченные лицензии</a><br /><br />
 <h1>Выписанные счета</h1>
 {% for license in licenses %}
-<div>
+<div class='license_{{ license.id }}'>
     <div class='w100 left'>{{ license.id }}</div>
     <div class='w100 left'>{{ license.order_date }}</div>
     <div class='w100 left'>{{ license.term }}</div>
     <div class='w100 left'>{{ license.get_payform_display }}</div>
     <div class='w100 left'>{{ license.get_status_display }}</div>
     <div class='w100 left'>{{ license.get_action }}</div>
+    <div class='w100 left'>{% if license.status == 0 %}<a href='#' class='delete_license' data-id='{{ license.pk }}'>Удалить</a>{% endif %}</div>
     <div class='clear'></div>
 </div>
 {% endfor %}
 {% endblock %}
+
+{% block js %}
+    <script src="{{ STATIC_URL }}js/license.js"></script>
+{% endblock %}