Merge branch 'release/07-August-2017'

Author: SehoNoh

.gitignore

@@ -95,4 +95,10 @@ ENV/
 .idea/
 
 # Bower
-pyconkr/static/components/*
+pyconkr/static/components/*
+
+# TEST db
+db.sqlite3
+
+# macOS
+.DS_Store

README.md

@@ -1,5 +1,5 @@
 # A git repository for PyCon Korea 2017
-## Version 02-August-2017
+## Version 07-August-2017
 
 [![Build Status](https://travis-ci.org/pythonkr/pyconkr-2017.svg?branch=master)](https://travis-ci.org/pythonkr/pyconkr-2017)
 

bower.json

@@ -13,6 +13,12 @@
     "bootstrap-social": "~5.1.1",
     "typed.js": "~1.1.1",
     "bootstrap-side-navbar": "^1.0.1",
-    "montserrat-webfont": "^1.0.3"
+    "montserrat-webfont": "^1.0.3",
+    "datatables.net": "^1.10.15",
+    "datatables.net-bs": "^2.1.1",
+    "datatables.net-rowreorder": "^1.2.0",
+    "datatables.net-rowreorder-bs": "^1.2.0",
+    "handlebars": "^4.0.10",
+    "js-cookie": "^2.1.4"
   }
 }

pyconkr/templates/base.html

@@ -43,6 +43,14 @@
   <script src="{% static "components/jquery/dist/jquery.min.js" %}"></script>
   <script src="{% static "components/bootstrap/dist/js/bootstrap.min.js" %}"></script>
   <script src="{% static "js/rgb-hsv.js" %}"></script>
+  <script src="{% static "components/js-cookie/src/js.cookie.js" %}" charset="utf-8"></script>
+  <script src="{% static "components/handlebars/handlebars.min.js" %}" charset="utf-8"></script>
+  <script>
+  function csrfSafeMethod(method) {
+    // these HTTP methods do not require CSRF protection
+    return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
+  }
+  </script>
   {% block head-include %}{% endblock %}
 </head>
 

registration/admin.py

@@ -6,7 +6,7 @@
 from django.utils import timezone
 from .iamporter import get_access_token, Iamporter, IamporterError
 
-from .models import Registration, Option, ManualPayment
+from .models import Registration, Option, ManualPayment, IssueTicket
 
 
 def send_bankpayment_alert_email(modeladmin, request, queryset):
@@ -114,13 +114,18 @@ class RegistrationAdmin(admin.ModelAdmin):
     list_editable = ('payment_status',)
     list_filter = ('option', 'payment_method', 'payment_status')
     csv_fields = ['name', 'email', 'company', 'option', ]
-    search_fields = ('name', 'email')
-    readonly_fields = ('created', )
+    search_fields = ('name', 'email', 'merchant_uid', 'transaction_code', )
+    readonly_fields = ('created', 'merchant_uid', 'transaction_code', )
     ordering = ('id',)
     actions = (send_bankpayment_alert_email, cancel_registration)
 admin.site.register(Registration, RegistrationAdmin)
 
 
+class IssueTicketAdmin(admin.ModelAdmin):
+    list_display = ('registration', 'issuer', 'issue_date')
+    ordering = ('issue_date',)
+admin.site.register(IssueTicket, IssueTicketAdmin)
+
 class ManualPaymentAdmin(admin.ModelAdmin):
     list_display = ('title', 'payment_status', 'user', )
     list_filter = ('payment_status', )

registration/forms.py

@@ -75,3 +75,7 @@ class Meta:
             'email': _('Email'),
             'payment_method': _('Payment Method'),
         }
+
+
+class IssueSubmitForm(forms.Form):
+    user_id = forms.IntegerField()

registration/migrations/0023_issue_manager.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-08-01 11:33
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('registration', '0022_manualpayment'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='IssueTicket',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('issue_date', models.DateTimeField(default=django.utils.timezone.now)),
+                ('issuer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('registration', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='registration.Registration')),
+            ],
+        ),
+    ]

registration/models.py

@@ -3,7 +3,7 @@
 
 from django.db import models
 from django.contrib.auth.models import User
-
+from django.utils import timezone
 
 class Option(models.Model):
     name = models.CharField(max_length=50)
@@ -17,7 +17,7 @@ class Option(models.Model):
 
     class Meta:
         ordering = ['price']
-    
+
     @property
     def is_soldout(self):
         return self.total <= Registration.objects.filter(option=self, payment_status__in=['paid', 'ready']).count()
@@ -80,6 +80,8 @@ class Registration(models.Model):
     confirmed = models.DateTimeField(null=True, blank=True)
     canceled = models.DateTimeField(null=True, blank=True)
 
+    def __str__(self):
+        return "{} {} {}".format(self.name, self.email, self.option.name)
 
 class ManualPayment(models.Model):
     user = models.ForeignKey(User)
@@ -113,3 +115,9 @@ class ManualPayment(models.Model):
 
     def __str__(self):
         return '({}) {} ({})원'.format(self.payment_status.upper(), self.title, self.price)
+
+
+class IssueTicket(models.Model):
+    registration = models.ForeignKey(Registration)
+    issuer = models.ForeignKey(User)
+    issue_date = models.DateTimeField(default=timezone.now)

registration/templates/registration/issue_ticket.html

@@ -0,0 +1,130 @@
+{% extends "base.html" %}
+{% load i18n humanize %}
+{% load staticfiles %}
+{% load crispy_forms_tags %}
+
+{% block content %}
+<table id="issue-ticket" class="table table-hover">
+<thead>
+    <tr>
+    <th>이름</th>
+    <th>이메일</th>
+    <th>관리</th>
+    </tr>
+</thead>
+<tbody>
+    {% for user in registration %}
+    <tr>
+        <td>{{ user.name }}</td>
+        <td>{{ user.email }}</td>
+    <td>
+        <div class="btn-group">
+          <button type="button" class="btn btn-success btn-filter" onclick="printLabelPopup('{{ user.name }}', {{ user.id }},'{{ user.top_size }}')">발권</button>
+            <a class="btn btn-default btn-filter"
+              href='/admin/registration/registration/{{user.id}}'
+              target='_blank' role="button">관리</a>
+        </div>
+    </td>
+    </tr>
+    {% endfor %}
+</tbody>
+</table>
+
+
+{% endblock %}
+
+{% block head-include %}
+<link href="{% static "components/datatables.net-bs/css/dataTables.bootstrap.min.css" %}" rel="stylesheet">
+{% endblock %}
+
+{% block script %}
+<script src="{% static "components/datatables.net/js/jquery.dataTables.min.js" %}" charset="utf-8"></script>
+<script src="{% static "components/datatables.net-bs/js/dataTables.bootstrap.min.js" %}" charset="utf-8"></script>
+
+{% verbatim %}
+<script id="print_template" type="text/x-handlebars-template">
+<div class="ui brother-label">
+    <p class="ui name">{{name}}</p>
+</div>
+<div class="ui brother-label">
+    <p class="ui name">{{topSize}}</p>
+</div>
+<style>
+.brother-label {
+  margin: 0 auto;
+  padding: 0 auto;
+  width: 88mm;
+  height: 27mm;
+}
+.name{
+  font-size: {{fontSize}};
+  font-weight: bold;
+  text-align: center;
+  letter-spacing: 1rem;
+}
+@media print {
+  body, html, p{
+    margin: 0mm !important;
+    padding: 0mm !important;
+  }
+  @page{
+    margin: 0mm !important;
+    padding: 0mm !important;
+  }
+}
+</script>
+{% endverbatim %}
+
+<script type="text/javascript">
+$(document).ready( function () {
+  $('#issue-ticket').DataTable({
+    bInfo: true,
+    bLengthChange: true,
+    lengthMenu: [[50, 100, 200], [50, 100, 200]],
+    order: [[ 0, 'asc' ]],
+    paging: true,
+    searching: true,
+  });
+});
+
+function issueTicketConfirm(userId) {
+  var csrftoken = Cookies.get('csrftoken');
+  $.ajaxSetup({
+    beforeSend: function(xhr, settings) {
+      if (!csrfSafeMethod(settings.type) && !this.crossDomain) {
+        xhr.setRequestHeader("X-CSRFToken", csrftoken);
+      }
+    }
+  });
+  $.ajax("{% url 'registration_issue_submit' %}", {
+    data: {'user_id': userId},
+    method: 'POST',
+    success: function(data) {
+      alert('발권처리 기록 되었습니다.');
+    },
+    error: function(data) {
+      alert('발권처리 기록에 실패 하였습니다.');
+    }
+  });
+}
+
+function printLabelPopup(name, userId, topSize) {
+  var printWindow = window.open('', '', 'width=600, height=400');
+  var fontSize = '1em';
+  var printTemplateScript = $('#print_template').html();
+  var printTemplate = Handlebars.compile(printTemplateScript);
+  var context = {
+    'name': name,
+    'topSize': topSize,
+    'fontSize': fontSize
+  };
+  printWindow.document.write(printTemplate(context));
+  printWindow.document.close();
+  printWindow.focus();
+  printWindow.print();
+  printWindow.close();
+  issueTicketConfirm(userId);
+}
+</script>
+
+{% endblock %}

registration/tests.py

@@ -4,11 +4,12 @@
 from unittest import mock
 from django.test import TestCase
 from django.contrib.auth import get_user_model
+from django.contrib.auth.models import Group
 from django.core.urlresolvers import reverse
 from constance.test import override_config
 from django_dynamic_fixture import G
 
-from .models import Option, Registration
+from .models import Option, Registration, IssueTicket
 
 User = get_user_model()
 
@@ -48,4 +49,33 @@ def test_vbank_status_update_via_iamport_callback(self, Iamporter, get_access_to
         response = self.client.post(reverse('registration_callback'), callback_param)
         self.assertEqual(response.status_code, 200)
         registration = Registration.objects.get(id=registration.id)
-        self.assertEqual(registration.payment_status, 'paid') 
+        self.assertEqual(registration.payment_status, 'paid')
+
+
+class IssueTicketTest(TestCase):
+    def test_inner_group_only(self):
+        response = self.client.get(reverse('registration_issue'))
+        self.assertNotEqual(response.status_code, 200)
+        login_user = User.objects.create_user('test@user.com', 'test@user.com',
+                                              'testpass')
+        self.client.login(username='test@user.com', password='testpass')
+        response = self.client.get(reverse('registration_issue'))
+        self.assertNotEqual(response.status_code, 200)
+        group = G(Group, name='volunteer')
+        login_user.groups.add(group)
+        response = self.client.get(reverse('registration_issue'))
+        self.assertEqual(response.status_code, 200)
+
+    def test_incr_issue_count(self):
+        login_user = User.objects.create_user('test@user.com', 'test@user.com',
+                                              'testpass')
+        G(Registration, payment_status='paid', user=login_user)
+        group = G(Group, name='volunteer')
+        login_user.groups.add(group)
+        self.client.login(username='test@user.com', password='testpass')
+        response = self.client.get(reverse('registration_issue_submit'))
+        self.assertEqual(response.status_code, 405) # Because POST only
+        response = self.client.post(reverse('registration_issue_submit'),
+                                    {'user_id': login_user.id})
+        issue_count = IssueTicket.objects.filter(registration__user=login_user).count()
+        self.assertEqual(issue_count, 1)