stash
This commit is contained in:
parent
a8ee12668b
commit
f9e4b10c08
10 changed files with 81 additions and 103 deletions
|
|
@ -1,6 +1,6 @@
|
|||
from django.contrib import admin
|
||||
|
||||
from tickets.models import IssueThread, Comment, StateChange, Assignment, ItemRelation, ShippingCode
|
||||
from tickets.models import IssueThread, Comment, StateChange, Assignment, ItemRelation, ShippingVoucher
|
||||
|
||||
|
||||
class IssueThreadAdmin(admin.ModelAdmin):
|
||||
|
|
@ -23,7 +23,7 @@ class ItemRelationAdmin(admin.ModelAdmin):
|
|||
pass
|
||||
|
||||
|
||||
class ShippingCodesAdmin(admin.ModelAdmin):
|
||||
class ShippingVouchersAdmin(admin.ModelAdmin):
|
||||
pass
|
||||
|
||||
|
||||
|
|
@ -32,4 +32,4 @@ admin.site.register(Comment, CommentAdmin)
|
|||
admin.site.register(StateChange, StateChangeAdmin)
|
||||
admin.site.register(Assignment, AssignmentAdmin)
|
||||
admin.site.register(ItemRelation, ItemRelationAdmin)
|
||||
admin.site.register(ShippingCode, ShippingCodesAdmin)
|
||||
admin.site.register(ShippingVoucher, ShippingVouchersAdmin)
|
||||
|
|
|
|||
|
|
@ -13,8 +13,8 @@ from core.settings import MAIL_DOMAIN
|
|||
from mail.models import Email
|
||||
from mail.protocol import send_smtp, make_reply, collect_references
|
||||
from notify_sessions.models import SystemEvent
|
||||
from tickets.models import IssueThread, Comment, STATE_CHOICES, ShippingCode
|
||||
from tickets.serializers import IssueSerializer, CommentSerializer, ShippingCodeSerializer
|
||||
from tickets.models import IssueThread, Comment, STATE_CHOICES, ShippingVoucher
|
||||
from tickets.serializers import IssueSerializer, CommentSerializer, ShippingVoucherSerializer
|
||||
|
||||
|
||||
class IssueViewSet(viewsets.ModelViewSet):
|
||||
|
|
@ -27,9 +27,9 @@ class CommentViewSet(viewsets.ModelViewSet):
|
|||
queryset = Comment.objects.all()
|
||||
|
||||
|
||||
class ShippingCodeViewSet(viewsets.ModelViewSet):
|
||||
serializer_class = ShippingCodeSerializer
|
||||
queryset = ShippingCode.objects.all()
|
||||
class ShippingVoucherViewSet(viewsets.ModelViewSet):
|
||||
serializer_class = ShippingVoucherSerializer
|
||||
queryset = ShippingVoucher.objects.all()
|
||||
|
||||
|
||||
@api_view(['POST'])
|
||||
|
|
@ -124,7 +124,7 @@ def add_comment(request, pk):
|
|||
router = routers.SimpleRouter()
|
||||
router.register(r'tickets', IssueViewSet, basename='issues')
|
||||
#router.register(r'comments', CommentViewSet, basename='comments')
|
||||
router.register(r'shipping_codes', ShippingCodeViewSet, basename='shipping_codes')
|
||||
router.register(r'shipping_vouchers', ShippingVoucherViewSet, basename='shipping_vouchers')
|
||||
|
||||
urlpatterns = ([
|
||||
re_path(r'^tickets/(?P<pk>\d+)/reply/$', reply, name='reply'),
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
# Generated by Django 4.2.7 on 2024-06-15 17:37
|
||||
|
||||
from django.db import migrations, models
|
||||
import django.db.models.deletion
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('tickets', '0011_issuethread_related_items'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='ShippingCode',
|
||||
fields=[
|
||||
('id', models.AutoField(primary_key=True, serialize=False)),
|
||||
('code', models.CharField(max_length=255)),
|
||||
('type', models.CharField(max_length=255)),
|
||||
('timestamp', models.DateTimeField(auto_now_add=True)),
|
||||
('used_at', models.DateTimeField(null=True)),
|
||||
('issue_thread', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='shipping_codes', to='tickets.issuethread')),
|
||||
],
|
||||
),
|
||||
]
|
||||
|
|
@ -138,9 +138,9 @@ class ItemRelation(models.Model):
|
|||
return str(self.issue_thread) + ' related to ' + str(self.item)
|
||||
|
||||
|
||||
class ShippingCode(models.Model):
|
||||
class ShippingVoucher(models.Model):
|
||||
id = models.AutoField(primary_key=True)
|
||||
issue_thread = models.ForeignKey(IssueThread, on_delete=models.CASCADE, related_name='shipping_codes', null=True)
|
||||
issue_thread = models.ForeignKey(IssueThread, on_delete=models.CASCADE, related_name='shipping_vouchers', null=True)
|
||||
code = models.CharField(max_length=255)
|
||||
type = models.CharField(max_length=255)
|
||||
timestamp = models.DateTimeField(auto_now_add=True)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ from rest_framework import serializers
|
|||
|
||||
from authentication.models import ExtendedUser
|
||||
from mail.api_v2 import AttachmentSerializer
|
||||
from tickets.models import IssueThread, Comment, STATE_CHOICES, ShippingCode
|
||||
from tickets.models import IssueThread, Comment, STATE_CHOICES, ShippingVoucher
|
||||
from inventory.serializers import ItemSerializer
|
||||
|
||||
|
||||
|
|
@ -29,9 +29,9 @@ class StateSerializer(serializers.Serializer):
|
|||
return obj['value']
|
||||
|
||||
|
||||
class ShippingCodeSerializer(serializers.ModelSerializer):
|
||||
class ShippingVoucherSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = ShippingCode
|
||||
model = ShippingVoucher
|
||||
fields = ('id', 'code', 'type', 'timestamp', 'issue_thread', 'used_at')
|
||||
read_only_fields = ('id', 'timestamp', 'used_at')
|
||||
|
||||
|
|
@ -122,13 +122,13 @@ class IssueSerializer(serializers.ModelSerializer):
|
|||
'timestamp': relation.timestamp,
|
||||
'item': ItemSerializer(relation.item).data,
|
||||
})
|
||||
for shipping_code in obj.shipping_codes.all():
|
||||
for shipping_voucher in obj.shipping_vouchers.all():
|
||||
timeline.append({
|
||||
'type': 'shipping_code',
|
||||
'id': shipping_code.id,
|
||||
'timestamp': shipping_code.used_at,
|
||||
'code': shipping_code.code,
|
||||
'code_type': shipping_code.type,
|
||||
'type': 'shipping_voucher',
|
||||
'id': shipping_voucher.id,
|
||||
'timestamp': shipping_voucher.used_at,
|
||||
'code': shipping_voucher.code,
|
||||
'code_type': shipping_voucher.type,
|
||||
})
|
||||
return sorted(timeline, key=lambda x: x['timestamp'])
|
||||
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ from django.test import TestCase, Client
|
|||
|
||||
from authentication.models import ExtendedUser
|
||||
from mail.models import Email, EmailAttachment
|
||||
from tickets.models import IssueThread, StateChange, Comment, ShippingCode
|
||||
from tickets.models import IssueThread, StateChange, Comment, ShippingVoucher
|
||||
from django.contrib.auth.models import Permission
|
||||
from knox.models import AuthToken
|
||||
|
||||
|
||||
class ShippingCodeApiTest(TestCase):
|
||||
class ShippingVoucherApiTest(TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super().setUp()
|
||||
|
|
@ -20,13 +20,13 @@ class ShippingCodeApiTest(TestCase):
|
|||
self.client = Client(headers={'Authorization': 'Token ' + self.token[1]})
|
||||
|
||||
def test_issues_empty(self):
|
||||
response = self.client.get('/api/2/shipping_codes/')
|
||||
response = self.client.get('/api/2/shipping_vouchers/')
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertEqual(response.json(), [])
|
||||
|
||||
def test_issues_list(self):
|
||||
ShippingCode.objects.create(code='1234', type='2kg-eu')
|
||||
response = self.client.get('/api/2/shipping_codes/')
|
||||
ShippingVoucher.objects.create(code='1234', type='2kg-eu')
|
||||
response = self.client.get('/api/2/shipping_vouchers/')
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertEqual(response.json()[0]['code'], '1234')
|
||||
self.assertEqual(response.json()[0]['used_at'], None)
|
||||
|
|
@ -34,7 +34,7 @@ class ShippingCodeApiTest(TestCase):
|
|||
self.assertEqual(response.json()[0]['type'], '2kg-eu')
|
||||
|
||||
def test_issues_create(self):
|
||||
response = self.client.post('/api/2/shipping_codes/', {'code': '1234', 'type': '2kg-eu'})
|
||||
response = self.client.post('/api/2/shipping_vouchers/', {'code': '1234', 'type': '2kg-eu'})
|
||||
self.assertEqual(response.status_code, 201)
|
||||
self.assertEqual(response.json()['code'], '1234')
|
||||
self.assertEqual(response.json()['used_at'], None)
|
||||
|
|
@ -8,7 +8,8 @@
|
|||
<span class="timeline-item-icon faded-icon" v-else-if="item.type === 'comment'">
|
||||
<font-awesome-icon icon="comment"/>
|
||||
</span>
|
||||
<span class="timeline-item-icon faded-icon" v-else-if="item.type === 'state'" :class="'bg-' + stateInfo(item.state).color">
|
||||
<span class="timeline-item-icon faded-icon" v-else-if="item.type === 'state'"
|
||||
:class="'bg-' + stateInfo(item.state).color">
|
||||
<font-awesome-icon :icon="stateInfo(item.state).icon"/>
|
||||
</span>
|
||||
<span class="timeline-item-icon faded-icon" v-else-if="item.type === 'assignment'" :class="'bg-secondary'">
|
||||
|
|
@ -28,7 +29,7 @@
|
|||
<TimelineStateChange v-else-if="item.type === 'state'" :item="item"/>
|
||||
<TimelineAssignment v-else-if="item.type === 'assignment'" :item="item"/>
|
||||
<TimelineRelatedItem v-else-if="item.type === 'item_relation'" :item="item"/>
|
||||
<TimelineShippingCode v-else-if="item.type === 'shipping_code'" :item="item"/>
|
||||
<TimelineShippingVoucher v-else-if="item.type === 'shipping_code'" :item="item"/>
|
||||
<p v-else>{{ item }}</p>
|
||||
</li>
|
||||
<li class="timeline-item">
|
||||
|
|
@ -75,13 +76,14 @@ import TimelineStateChange from "@/components/TimelineStateChange.vue";
|
|||
import {mapGetters} from "vuex";
|
||||
import TimelineAssignment from "@/components/TimelineAssignment.vue";
|
||||
import TimelineRelatedItem from "@/components/TimelineRelatedItem.vue";
|
||||
import TimelineShippingCode from "@/components/TimelineShippingCode.vue";
|
||||
import TimelineShippingVoucher from "@/components/TimelineShippingVoucher.vue";
|
||||
|
||||
export default {
|
||||
name: 'Timeline',
|
||||
components: {
|
||||
TimelineShippingCode,
|
||||
TimelineRelatedItem, TimelineAssignment, TimelineStateChange, TimelineComment, TimelineMail},
|
||||
TimelineShippingVoucher,
|
||||
TimelineRelatedItem, TimelineAssignment, TimelineStateChange, TimelineComment, TimelineMail
|
||||
},
|
||||
props: {
|
||||
timeline: {
|
||||
type: Array,
|
||||
|
|
|
|||
|
|
@ -3,10 +3,11 @@
|
|||
<i class="avatar | small">
|
||||
<font-awesome-icon icon="user"/>
|
||||
</i>
|
||||
<span><a href="#">$USER</a> has claimed sipping code
|
||||
<ClipboardButton class="btn btn-primary badge badge-pill" title="Copy shipping code to clipboard" :payload="item.code">{{ item.code }}
|
||||
<span><a href="#">$USER</a> has claimed shipping voucher
|
||||
<ClipboardButton class="btn btn-primary badge badge-pill" title="Copy shipping voucher to clipboard"
|
||||
:payload="item.voucher">{{ item.voucher }}
|
||||
<font-awesome-icon icon="clipboard"/>
|
||||
</ClipboardButton> of type <span class="badge badge-pill badge-secondary">{{ item.code_type }}</span> for this ticket at <time
|
||||
</ClipboardButton> of type <span class="badge badge-pill badge-secondary">{{ item.voucher_type }}</span> for this ticket at <time
|
||||
:datetime="timestamp">{{ timestamp }}</time>
|
||||
</span>
|
||||
</div>
|
||||
|
|
@ -18,7 +19,7 @@ import {mapState} from "vuex";
|
|||
import ClipboardButton from "@/components/inputs/ClipboardButton.vue";
|
||||
|
||||
export default {
|
||||
name: 'TimelineShippingCode',
|
||||
name: 'TimelineShippingVoucher',
|
||||
components: {ClipboardButton},
|
||||
props: {
|
||||
'item': {
|
||||
|
|
@ -21,7 +21,7 @@ const store = createStore({
|
|||
state_options: [],
|
||||
messageTemplates: [],
|
||||
messageTemplateVariables: [],
|
||||
shippingCodes: [],
|
||||
shippingVouchers: [],
|
||||
test: ['foo', 'bar', 'baz'],
|
||||
|
||||
lastEvent: '37C3',
|
||||
|
|
@ -50,7 +50,7 @@ const store = createStore({
|
|||
|
||||
showAddBoxModal: false,
|
||||
|
||||
shippingCodeTypes: {
|
||||
shippingVoucherTypes: {
|
||||
'2kg-de': '2kg Paket (DE)',
|
||||
'5kg-de': '5kg Paket (DE)',
|
||||
'10kg-de': '10kg Paket (DE)',
|
||||
|
|
@ -213,8 +213,8 @@ const store = createStore({
|
|||
setMessageTemplateVariables(state, variables) {
|
||||
state.messageTemplateVariables = variables;
|
||||
},
|
||||
setShippingCodes(state, codes) {
|
||||
state.shippingCodes = codes;
|
||||
setShippingVouchers(state, codes) {
|
||||
state.shippingVouchers = codes;
|
||||
},
|
||||
},
|
||||
actions: {
|
||||
|
|
@ -453,16 +453,16 @@ const store = createStore({
|
|||
dispatch('fetchMessageTemplates');
|
||||
}
|
||||
},
|
||||
async fetchShippingCodes({commit, state}) {
|
||||
const {data, success} = await http.get('/2/shipping_codes/', state.user.token);
|
||||
async fetchShippingVouchers({commit, state}) {
|
||||
const {data, success} = await http.get('/2/shipping_vouchers/', state.user.token);
|
||||
if (data && success) {
|
||||
commit('setShippingCodes', data);
|
||||
commit('setShippingVouchers', data);
|
||||
}
|
||||
},
|
||||
async createShippingCode({dispatch, state}, code) {
|
||||
const {data, success} = await http.post('/2/shipping_codes/', code, state.user.token);
|
||||
async createShippingVoucher({dispatch, state}, code) {
|
||||
const {data, success} = await http.post('/2/shipping_vouchers/', code, state.user.token);
|
||||
if (data && success) {
|
||||
dispatch('fetchShippingCodes');
|
||||
dispatch('fetchShippingVouchers');
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -493,7 +493,7 @@ const store = createStore({
|
|||
"loadedItems",
|
||||
"messageTemplates",
|
||||
"messageTemplatesVariables",
|
||||
"shippingCodes",
|
||||
"shippingVouchers",
|
||||
],
|
||||
watch: [
|
||||
"test",
|
||||
|
|
@ -506,7 +506,7 @@ const store = createStore({
|
|||
"loadedItems",
|
||||
"messageTemplates",
|
||||
"messageTemplatesVariables",
|
||||
"shippingCodes",
|
||||
"shippingVouchers",
|
||||
],
|
||||
mutations: [
|
||||
//"replaceTickets",
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<template>
|
||||
<div>
|
||||
<h3>Shipping Codes</h3>
|
||||
<h3>Shipping Vouchers</h3>
|
||||
<div class="mt-3">
|
||||
<h5>Shipping Code Types</h5>
|
||||
<span v-for="(type, key) in availableShippingCodeTypes()" :key="key" class="mr-2">
|
||||
<h5>Shipping Voucher Types</h5>
|
||||
<span v-for="(type, key) in availableShippingVoucherTypes()" :key="key" class="mr-2">
|
||||
<span v-if="type.count > 2" class="badge badge-success">{{ type.name }} - {{ type.count }}</span>
|
||||
<span v-else-if="type.count > 0" class="badge badge-warning" v-if="type.count > 0">
|
||||
{{ type.name }} - {{ type.count }}
|
||||
|
|
@ -12,23 +12,23 @@
|
|||
</span>
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<h5>Available Shipping Codes</h5>
|
||||
<h5>Available Shipping Vouchers</h5>
|
||||
<ul>
|
||||
<li v-for="code in shippingCodes" :key="code.code">
|
||||
<span v-if="code.issue_thread == null">{{ code.type }} - {{ code.code }}</span>
|
||||
<span v-else><s style="color:var(--danger)">{{ code.type }} - {{ code.code }}</s> use in <a
|
||||
:href="'/'+ getEventSlug + '/ticket/' + code.issue_thread">#{{ code.issue_thread }}</a></span>
|
||||
<li v-for="voucher in shippingVouchers" :key="voucher.voucher">
|
||||
<span v-if="voucher.issue_thread == null">{{ voucher.type }} - {{ voucher.voucher }}</span>
|
||||
<span v-else><s style="color:var(--danger)">{{ voucher.type }} - {{ voucher.voucher }}</s> used in <a
|
||||
:href="'/'+ getEventSlug + '/ticket/' + voucher.issue_thread">#{{ voucher.issue_thread }}</a></span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="mt-3">
|
||||
<textarea class="form-control mb-3" rows="5" placeholder="Shipping Code List" v-model="bulk_codes"
|
||||
<textarea class="form-control mb-3" rows="5" placeholder="Shipping Voucher List" v-model="bulk_vouchers"
|
||||
v-if="bulk"></textarea>
|
||||
<div class="input-group">
|
||||
<input type="text" class="form-control" placeholder="Shipping Code" v-model="code" v-if="!bulk">
|
||||
<input type="text" class="form-control" placeholder="Shipping Voucher" v-model="voucher" v-if="!bulk">
|
||||
<select class="form-control" v-model="type">
|
||||
<option v-for="it in Object.keys(shippingCodeTypes)" :value="it">{{
|
||||
shippingCodeTypes[it]
|
||||
<option v-for="it in Object.keys(shippingVoucherTypes)" :value="it">{{
|
||||
shippingVoucherTypes[it]
|
||||
}}
|
||||
</option>
|
||||
</select>
|
||||
|
|
@ -38,9 +38,9 @@
|
|||
<label for="bulk" style="margin: 0;">Bulk</label>
|
||||
</div>
|
||||
</div>
|
||||
<button class="btn btn-primary form-control" @click="createSingleOrBulkShippingCode">
|
||||
<button class="btn btn-primary form-control" @click="createSingleOrBulkShippingVoucher">
|
||||
<font-awesome-icon icon="plus"/>
|
||||
{{ (bulk ? "Add Shipping Codes" : "Add Shipping Code") }}
|
||||
{{ (bulk ? "Add Shipping Vouchers" : "Add Shipping Voucher") }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -56,44 +56,44 @@ export default {
|
|||
components: {Table},
|
||||
data() {
|
||||
return {
|
||||
code: '',
|
||||
bulk_codes: '',
|
||||
voucher: '',
|
||||
bulk_vouchers: '',
|
||||
type: '2kg-eu',
|
||||
bulk: false,
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
...mapState(['shippingCodes', 'shippingCodeTypes']),
|
||||
...mapState(['shippingVouchers', 'shippingVoucherTypes']),
|
||||
...mapGetters(['getEventSlug']),
|
||||
},
|
||||
methods: {
|
||||
...mapActions(['fetchShippingCodes', 'createShippingCode']),
|
||||
createSingleOrBulkShippingCode() {
|
||||
...mapActions(['fetchShippingVouchers', 'createShippingVoucher']),
|
||||
createSingleOrBulkShippingVoucher() {
|
||||
if (this.bulk) {
|
||||
const list = this.bulk_codes.split('\n');
|
||||
if (confirm('Are you sure you want to add ' + list.length + ' shipping codes as ' + this.type + '?')) {
|
||||
const jobs = list.map(code => {
|
||||
return this.createShippingCode({code: code.trim(), type: this.type});
|
||||
const list = this.bulk_vouchers.split('\n');
|
||||
if (confirm('Are you sure you want to add ' + list.length + ' shipping vouchers as ' + this.type + '?')) {
|
||||
const jobs = list.map(voucher => {
|
||||
return this.createShippingVoucher({voucher: voucher.trim(), type: this.type});
|
||||
});
|
||||
Promise.all(jobs).then(() => {
|
||||
this.bulk_codes = '';
|
||||
this.bulk_vouchers = '';
|
||||
});
|
||||
}
|
||||
} else {
|
||||
this.createShippingCode({code: this.code, type: this.type}).then(() => {
|
||||
this.code = '';
|
||||
this.createShippingVoucher({voucher: this.voucher, type: this.type}).then(() => {
|
||||
this.voucher = '';
|
||||
});
|
||||
}
|
||||
},
|
||||
availableShippingCodeTypes() {
|
||||
return Object.keys(this.shippingCodeTypes).map(key => {
|
||||
var count = this.shippingCodes.filter(code => code.type === key && code.issue_thread === null).length;
|
||||
return {id: key, count: count, name: this.shippingCodeTypes[key]};
|
||||
availableShippingVoucherTypes() {
|
||||
return Object.keys(this.shippingVoucherTypes).map(key => {
|
||||
var count = this.shippingVouchers.filter(voucher => voucher.type === key && voucher.issue_thread === null).length;
|
||||
return {id: key, count: count, name: this.shippingVoucherTypes[key]};
|
||||
});
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.fetchShippingCodes();
|
||||
this.fetchShippingVouchers();
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
Loading…
Reference in a new issue