Compare commits
128 commits
dc57a90cf1
...
f19af7db4f
Author | SHA1 | Date | |
---|---|---|---|
f19af7db4f | |||
e8d1d19d5f | |||
26bfba37cc | |||
cda0bb5fb8 | |||
aa03295ddb | |||
e5cb25ae04 | |||
9a466e6a63 | |||
97822407be | |||
5b8fb72d74 | |||
9129d16b33 | |||
046c942fed | |||
5eae5c22c8 | |||
511f47102c | |||
41af6b8715 | |||
99e6b9c06d | |||
9cbdc09da6 | |||
da310bfa9b | |||
ed9e1d8633 | |||
8f378768f3 | |||
78aa316c57 | |||
6835e93373 | |||
c375eb1316 | |||
49b1c78583 | |||
3b09d1d27b | |||
1f4a81e09c | |||
7af284fb46 | |||
e99a3e1c00 | |||
47f1417f82 | |||
30c2d685dc | |||
8f40867c02 | |||
2e281f4bc3 | |||
a851ca5efb | |||
dbf1cc12a5 | |||
8cb717363a | |||
42b6a3080d | |||
f0d9f9e237 | |||
c99f0b8736 | |||
6586062616 | |||
f70ac4116d | |||
94da3ff699 | |||
42883bfae2 | |||
02d139b7a7 | |||
9ade4f1a08 | |||
c95d668168 | |||
67894458f9 | |||
57f68fa273 | |||
44cd6f7963 | |||
40cc9c2f14 | |||
3d0bb07b0e | |||
ecc4066b5c | |||
a95bdaa5a4 | |||
2397ac3033 | |||
f0a855b68c | |||
db3be4f5bc | |||
2fdec2c3ad | |||
f7f22d5c1b | |||
0dc290bdf9 | |||
7ba487e053 | |||
964880b199 | |||
c09aca525c | |||
c29728db01 | |||
387d72592a | |||
24c171b528 | |||
2cac691ed3 | |||
84b8fd6136 | |||
57c67a6109 | |||
29e35fc18a | |||
6ae1e4f099 | |||
e92ccfad7a | |||
c6a71549f4 | |||
8d8535ddd6 | |||
c243ceb2ac | |||
1d6a6c765e | |||
dca87590af | |||
49b2eeb213 | |||
caf1880305 | |||
19523ad715 | |||
a83bbab802 | |||
073dd6a249 | |||
30b05dd129 | |||
66a86513e2 | |||
91e728bcd0 | |||
cb1d931424 | |||
41555204d7 | |||
8610a19732 | |||
2e69dcd1ee | |||
f53b1c8122 | |||
f9845b94d1 | |||
ff331532e4 | |||
f733e18d50 | |||
91ec4a6348 | |||
b38ad09ca5 | |||
4e8dcbc2e8 | |||
39975fb089 | |||
f51591a976 | |||
ef04c43a92 | |||
30a7c61e26 | |||
1ea4e136ed | |||
2c60bd4243 | |||
727d92360a | |||
e16d34c44d | |||
77655f534c | |||
4767a81ba0 | |||
a9606af605 | |||
0e9afdd52c | |||
4ade62d603 | |||
3b1ecc79ad | |||
8d4a79b5f8 | |||
151ae43be4 | |||
95c860ff15 | |||
69a34aedd6 | |||
65f24ecb33 | |||
ae2364bb70 | |||
93d502735f | |||
9d6779508a | |||
1a9f37ae68 | |||
ec270b36e4 | |||
632833bb1a | |||
61dd80fb43 | |||
a92768c0c2 | |||
5ee2334273 | |||
2c2917637b | |||
76ffaf7aa9 | |||
b69ffde73e | |||
c5ceff2d51 | |||
dadeeb0d53 | |||
d8be7f09e4 | |||
f11758607e |
53 changed files with 12787 additions and 81 deletions
3
.gitmodules
vendored
Normal file
3
.gitmodules
vendored
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
[submodule "web/vendor/vuex-router-sync"]
|
||||||
|
path = web/vendor/vuex-router-sync
|
||||||
|
url = https://github.com/vuejs/vuex-router-sync.git
|
3
README.md
Normal file
3
README.md
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
ansible-playbook deploy/ansible/playbooks/deploy-c3lf-sys3.yml --inventory=deploy/ansible/inventory.yml
|
||||||
|
|
||||||
|
ssh root@andromeda.lab.or.it -A -L8080:localhost:11334
|
14
core/.coveragerc
Normal file
14
core/.coveragerc
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
[run]
|
||||||
|
source = .
|
||||||
|
|
||||||
|
[report]
|
||||||
|
fail_under = 100
|
||||||
|
show_missing = True
|
||||||
|
skip_covered = True
|
||||||
|
omit =
|
||||||
|
*/tests/*
|
||||||
|
*/migrations/*
|
||||||
|
core/asgi.py
|
||||||
|
core/wsgi.py
|
||||||
|
core/settings.py
|
||||||
|
manage.py
|
|
@ -10,5 +10,8 @@ class ExtendedUserAdmin(UserAdmin):
|
||||||
ordering = ('username',)
|
ordering = ('username',)
|
||||||
filter_horizontal = ('groups', 'user_permissions', 'permissions')
|
filter_horizontal = ('groups', 'user_permissions', 'permissions')
|
||||||
|
|
||||||
|
# def permissions(self, obj):
|
||||||
|
# return ', '.join(obj.get_all_permissions())
|
||||||
|
|
||||||
|
|
||||||
admin.site.register(ExtendedUser, ExtendedUserAdmin)
|
admin.site.register(ExtendedUser, ExtendedUserAdmin)
|
||||||
|
|
|
@ -29,7 +29,9 @@ SECRET_KEY = 'django-insecure-tm*$w_14iqbiy-!7(8#ba7j+_@(7@rf2&a^!=shs&$03b%2*rv
|
||||||
# SECURITY WARNING: don't run with debug turned on in production!
|
# SECURITY WARNING: don't run with debug turned on in production!
|
||||||
DEBUG = True
|
DEBUG = True
|
||||||
|
|
||||||
ALLOWED_HOSTS = [os.getenv('HTTP_HOST', 'localhost')]
|
PRIMARY_HOST = os.getenv('HTTP_HOST', 'localhost')
|
||||||
|
|
||||||
|
ALLOWED_HOSTS = [PRIMARY_HOST]
|
||||||
|
|
||||||
MAIL_DOMAIN = os.getenv('MAIL_DOMAIN', 'localhost')
|
MAIL_DOMAIN = os.getenv('MAIL_DOMAIN', 'localhost')
|
||||||
|
|
||||||
|
@ -40,6 +42,10 @@ LEGACY_USER_PASSWORD = os.getenv('LEGACY_API_PASSWORD', 'legacy_password')
|
||||||
|
|
||||||
SYSTEM3_VERSION = "0.0.0-dev.0"
|
SYSTEM3_VERSION = "0.0.0-dev.0"
|
||||||
|
|
||||||
|
TELEGRAM_BOT_TOKEN = os.getenv('TELEGRAM_BOT_TOKEN', '1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghi')
|
||||||
|
|
||||||
|
TELEGRAM_GROUP_CHAT_ID = os.getenv('TELEGRAM_GROUP_CHAT_ID', '-1234567890')
|
||||||
|
|
||||||
# Application definition
|
# Application definition
|
||||||
|
|
||||||
INSTALLED_APPS = [
|
INSTALLED_APPS = [
|
||||||
|
@ -55,6 +61,7 @@ INSTALLED_APPS = [
|
||||||
'drf_yasg',
|
'drf_yasg',
|
||||||
'channels',
|
'channels',
|
||||||
'authentication',
|
'authentication',
|
||||||
|
'notifications',
|
||||||
'files',
|
'files',
|
||||||
'tickets',
|
'tickets',
|
||||||
'inventory',
|
'inventory',
|
||||||
|
|
|
@ -31,5 +31,6 @@ urlpatterns = [
|
||||||
path('api/2/', include('mail.api_v2')),
|
path('api/2/', include('mail.api_v2')),
|
||||||
path('api/2/', include('notify_sessions.api_v2')),
|
path('api/2/', include('notify_sessions.api_v2')),
|
||||||
path('api/2/', include('authentication.api_v2')),
|
path('api/2/', include('authentication.api_v2')),
|
||||||
|
path('api/2/', include('notifications.api_v2')),
|
||||||
path('api/', get_info),
|
path('api/', get_info),
|
||||||
]
|
]
|
||||||
|
|
|
@ -3,6 +3,7 @@ import random
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django_softdelete.models import SoftDeleteModel
|
from django_softdelete.models import SoftDeleteModel
|
||||||
|
|
||||||
|
from authentication.models import ExtendedUser
|
||||||
from core.settings import MAIL_DOMAIN
|
from core.settings import MAIL_DOMAIN
|
||||||
from files.models import AbstractFile
|
from files.models import AbstractFile
|
||||||
from inventory.models import Event
|
from inventory.models import Event
|
||||||
|
@ -38,3 +39,6 @@ class EventAddress(models.Model):
|
||||||
class EmailAttachment(AbstractFile):
|
class EmailAttachment(AbstractFile):
|
||||||
email = models.ForeignKey(Email, models.CASCADE, related_name='attachments', null=True)
|
email = models.ForeignKey(Email, models.CASCADE, related_name='attachments', null=True)
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
import logging
|
import logging
|
||||||
|
from re import match
|
||||||
|
|
||||||
import aiosmtplib
|
import aiosmtplib
|
||||||
from channels.layers import get_channel_layer
|
from channels.layers import get_channel_layer
|
||||||
|
@ -6,10 +7,15 @@ from channels.db import database_sync_to_async
|
||||||
from django.core.files.base import ContentFile
|
from django.core.files.base import ContentFile
|
||||||
|
|
||||||
from mail.models import Email, EventAddress, EmailAttachment
|
from mail.models import Email, EventAddress, EmailAttachment
|
||||||
|
from notifications.templates import render_auto_reply
|
||||||
from notify_sessions.models import SystemEvent
|
from notify_sessions.models import SystemEvent
|
||||||
from tickets.models import IssueThread
|
from tickets.models import IssueThread
|
||||||
|
|
||||||
|
|
||||||
|
class SpecialMailException(Exception):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def find_quoted_printable(s, marker):
|
def find_quoted_printable(s, marker):
|
||||||
positions = [i for i in range(len(s)) if s.lower().startswith('=?utf-8?' + marker + '?', i)]
|
positions = [i for i in range(len(s)) if s.lower().startswith('=?utf-8?' + marker + '?', i)]
|
||||||
for pos in positions:
|
for pos in positions:
|
||||||
|
@ -82,6 +88,22 @@ def make_reply(reply_email, references=None, event=None):
|
||||||
return reply
|
return reply
|
||||||
|
|
||||||
|
|
||||||
|
def make_notification(message, to, title): # TODO where should replies to this go
|
||||||
|
from email.message import EmailMessage
|
||||||
|
from core.settings import MAIL_DOMAIN
|
||||||
|
notification = EmailMessage()
|
||||||
|
notification["From"] = "notifications@%s" % MAIL_DOMAIN
|
||||||
|
notification["To"] = to
|
||||||
|
notification["Subject"] = f"[C3LF Notification]%s" % title
|
||||||
|
# notification["Reply-To"] = f"{event}@{MAIL_DOMAIN}"
|
||||||
|
# notification["In-Reply-To"] = email.reference
|
||||||
|
# notification["Message-ID"] = email.id + "@" + MAIL_DOMAIN
|
||||||
|
|
||||||
|
notification.set_content(message)
|
||||||
|
|
||||||
|
return notification
|
||||||
|
|
||||||
|
|
||||||
async def send_smtp(message):
|
async def send_smtp(message):
|
||||||
await aiosmtplib.send(message, hostname="127.0.0.1", port=25, use_tls=False, start_tls=False)
|
await aiosmtplib.send(message, hostname="127.0.0.1", port=25, use_tls=False, start_tls=False)
|
||||||
|
|
||||||
|
@ -180,13 +202,23 @@ def receive_email(envelope, log=None):
|
||||||
header_in_reply_to = parsed.get('In-Reply-To')
|
header_in_reply_to = parsed.get('In-Reply-To')
|
||||||
header_message_id = parsed.get('Message-ID')
|
header_message_id = parsed.get('Message-ID')
|
||||||
|
|
||||||
if header_from != envelope.mail_from:
|
# if header_from != envelope.mail_from:
|
||||||
log.warning("Header from does not match envelope from")
|
# log.warning("Header from does not match envelope from")
|
||||||
log.info(f"Header from: {header_from}, envelope from: {envelope.mail_from}")
|
# log.info(f"Header from: {header_from}, envelope from: {envelope.mail_from}")
|
||||||
|
#
|
||||||
|
# if header_to != envelope.rcpt_tos[0]:
|
||||||
|
# log.warning("Header to does not match envelope to")
|
||||||
|
# log.info(f"Header to: {header_to}, envelope to: {envelope.rcpt_tos[0]}")
|
||||||
|
|
||||||
if header_to != envelope.rcpt_tos[0]:
|
# handle undelivered mail header_from : 'Mail Delivery System <MAILER-DAEMON@...'
|
||||||
log.warning("Header to does not match envelope to")
|
|
||||||
log.info(f"Header to: {header_to}, envelope to: {envelope.rcpt_tos[0]}")
|
if match(r'^([a-zA-Z ]*<)?MAILER-DAEMON@', header_from) and envelope.mail_from.strip("<>") == "":
|
||||||
|
log.warning("Ignoring mailer daemon")
|
||||||
|
raise SpecialMailException("Ignoring mailer daemon")
|
||||||
|
|
||||||
|
if Email.objects.filter(reference=header_message_id).exists(): # break before issue thread is created
|
||||||
|
log.warning("Email already exists")
|
||||||
|
raise Exception("Email already exists")
|
||||||
|
|
||||||
recipient = envelope.rcpt_tos[0].lower() if envelope.rcpt_tos else header_to.lower()
|
recipient = envelope.rcpt_tos[0].lower() if envelope.rcpt_tos else header_to.lower()
|
||||||
sender = envelope.mail_from if envelope.mail_from else header_from
|
sender = envelope.mail_from if envelope.mail_from else header_from
|
||||||
|
@ -213,16 +245,7 @@ def receive_email(envelope, log=None):
|
||||||
references = collect_references(active_issue_thread)
|
references = collect_references(active_issue_thread)
|
||||||
if not sender.startswith('noreply'):
|
if not sender.startswith('noreply'):
|
||||||
subject = f"Re: {subject} [#{active_issue_thread.short_uuid()}]"
|
subject = f"Re: {subject} [#{active_issue_thread.short_uuid()}]"
|
||||||
body = '''Your request (#{}) has been received and will be reviewed by our lost&found angels.
|
body = render_auto_reply(active_issue_thread)
|
||||||
|
|
||||||
We are reviewing incoming requests during the event and teardown. Immediately after the event, expect a delay as the \
|
|
||||||
workload is high. We will not forget about your request and get back in touch once we have updated information on your \
|
|
||||||
request. Requests for devices, wallets, credit cards or similar items will be handled with priority.
|
|
||||||
|
|
||||||
If you happen to find your lost item or just want to add additional information, please reply to this email. Please \
|
|
||||||
do not create a new request.
|
|
||||||
|
|
||||||
Your c3lf (Cloakroom + Lost&Found) Team'''.format(active_issue_thread.short_uuid())
|
|
||||||
reply_email = Email.objects.create(
|
reply_email = Email.objects.create(
|
||||||
sender=recipient, recipient=sender, body=body, subject=subject,
|
sender=recipient, recipient=sender, body=body, subject=subject,
|
||||||
in_reply_to=header_message_id, event=target_event, issue_thread=active_issue_thread)
|
in_reply_to=header_message_id, event=target_event, issue_thread=active_issue_thread)
|
||||||
|
@ -233,7 +256,7 @@ Your c3lf (Cloakroom + Lost&Found) Team'''.format(active_issue_thread.short_uuid
|
||||||
active_issue_thread.state = 'pending_open'
|
active_issue_thread.state = 'pending_open'
|
||||||
active_issue_thread.save()
|
active_issue_thread.save()
|
||||||
|
|
||||||
return email, new, reply
|
return email, new, reply, active_issue_thread
|
||||||
|
|
||||||
|
|
||||||
class LMTPHandler:
|
class LMTPHandler:
|
||||||
|
@ -255,7 +278,7 @@ class LMTPHandler:
|
||||||
content = None
|
content = None
|
||||||
try:
|
try:
|
||||||
content = envelope.content
|
content = envelope.content
|
||||||
email, new, reply = await receive_email(envelope, log)
|
email, new, reply, thread = await receive_email(envelope, log)
|
||||||
log.info(f"Created email {email.id}")
|
log.info(f"Created email {email.id}")
|
||||||
systemevent = await database_sync_to_async(SystemEvent.objects.create)(type='email received',
|
systemevent = await database_sync_to_async(SystemEvent.objects.create)(type='email received',
|
||||||
reference=email.id)
|
reference=email.id)
|
||||||
|
@ -263,14 +286,28 @@ class LMTPHandler:
|
||||||
channel_layer = get_channel_layer()
|
channel_layer = get_channel_layer()
|
||||||
await channel_layer.group_send(
|
await channel_layer.group_send(
|
||||||
'general', {"type": "generic.event", "name": "send_message_to_frontend", "event_id": systemevent.id,
|
'general', {"type": "generic.event", "name": "send_message_to_frontend", "event_id": systemevent.id,
|
||||||
"message": "email received"}
|
"message": "email received"})
|
||||||
)
|
|
||||||
log.info(f"Sent message to frontend")
|
log.info(f"Sent message to frontend")
|
||||||
|
|
||||||
if new and reply:
|
if new and reply:
|
||||||
log.info('Sending message to %s' % reply['To'])
|
log.info('Sending message to %s' % reply['To'])
|
||||||
await send_smtp(reply)
|
await send_smtp(reply)
|
||||||
log.info("Sent auto reply")
|
log.info("Sent auto reply")
|
||||||
|
|
||||||
|
if thread:
|
||||||
|
await channel_layer.group_send(
|
||||||
|
'general', {"type": "generic.event", "name": "user_notification", "event_id": systemevent.id,
|
||||||
|
"ticket_id": thread.id, "new": new})
|
||||||
|
else:
|
||||||
|
print("No thread found")
|
||||||
|
|
||||||
|
return '250 Message accepted for delivery'
|
||||||
|
except SpecialMailException as e:
|
||||||
|
import uuid
|
||||||
|
random_filename = 'special-' + str(uuid.uuid4())
|
||||||
|
with open(random_filename, 'wb') as f:
|
||||||
|
f.write(content)
|
||||||
|
log.warning(f"Special mail exception: {e} saved to {random_filename}")
|
||||||
return '250 Message accepted for delivery'
|
return '250 Message accepted for delivery'
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
from hashlib import sha256
|
from hashlib import sha256
|
||||||
|
|
20
core/mail/tests/v2/test_user_notifications.py
Normal file
20
core/mail/tests/v2/test_user_notifications.py
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
from django.contrib.auth.models import Permission
|
||||||
|
from django.test import TestCase
|
||||||
|
|
||||||
|
from authentication.models import ExtendedUser
|
||||||
|
from notifications.models import UserNotificationChannel
|
||||||
|
|
||||||
|
|
||||||
|
class UserNotificationTestCase(TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
super().setUp()
|
||||||
|
self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test')
|
||||||
|
self.user.user_permissions.add(*Permission.objects.all())
|
||||||
|
self.user.save()
|
||||||
|
self.channel = UserNotificationChannel.objects.create(user=self.user, channel_type='telegram',
|
||||||
|
channel_target='123456789',
|
||||||
|
event_filter='*', active=True)
|
||||||
|
|
||||||
|
async def test_telegram_notify(self):
|
||||||
|
pass
|
0
core/notifications/__init__.py
Normal file
0
core/notifications/__init__.py
Normal file
15
core/notifications/admin.py
Normal file
15
core/notifications/admin.py
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
from django.contrib import admin
|
||||||
|
|
||||||
|
from notifications.models import MessageTemplate, UserNotificationChannel
|
||||||
|
|
||||||
|
|
||||||
|
class MessageTemplateAdmin(admin.ModelAdmin):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class UserNotificationChannelAdmin(admin.ModelAdmin):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
admin.site.register(MessageTemplate, MessageTemplateAdmin)
|
||||||
|
admin.site.register(UserNotificationChannel, UserNotificationChannelAdmin)
|
37
core/notifications/api_v2.py
Normal file
37
core/notifications/api_v2.py
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
from django.contrib.auth.decorators import permission_required
|
||||||
|
from rest_framework import routers, viewsets
|
||||||
|
from django.urls import re_path
|
||||||
|
from rest_framework.decorators import api_view, permission_classes
|
||||||
|
from rest_framework.permissions import IsAuthenticated
|
||||||
|
from rest_framework.response import Response
|
||||||
|
|
||||||
|
from notifications.models import MessageTemplate
|
||||||
|
from rest_framework import serializers
|
||||||
|
|
||||||
|
from notifications.templates import TEMPLATE_VARS
|
||||||
|
|
||||||
|
|
||||||
|
class MessageTemplateSerializer(serializers.ModelSerializer):
|
||||||
|
class Meta:
|
||||||
|
model = MessageTemplate
|
||||||
|
fields = '__all__'
|
||||||
|
|
||||||
|
|
||||||
|
class MessageTemplateViewSet(viewsets.ModelViewSet):
|
||||||
|
serializer_class = MessageTemplateSerializer
|
||||||
|
queryset = MessageTemplate.objects.all()
|
||||||
|
|
||||||
|
|
||||||
|
@api_view(['GET'])
|
||||||
|
@permission_classes([IsAuthenticated])
|
||||||
|
@permission_required('tickets.add_issuethread_manual', raise_exception=True) # TDOO: change this permission
|
||||||
|
def get_template_vars(self):
|
||||||
|
return Response(TEMPLATE_VARS, status=200)
|
||||||
|
|
||||||
|
|
||||||
|
router = routers.SimpleRouter()
|
||||||
|
router.register(r'message_templates', MessageTemplateViewSet)
|
||||||
|
|
||||||
|
urlpatterns = ([
|
||||||
|
re_path('message_template_variables', get_template_vars),
|
||||||
|
] + router.urls)
|
16
core/notifications/defaults.py
Normal file
16
core/notifications/defaults.py
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
auto_reply_body = '''Your request (#{{ ticket_uuid }}) has been received and will be reviewed by our lost&found angels.
|
||||||
|
|
||||||
|
We are reviewing incoming requests during the event and teardown. Immediately after the event, expect a delay as the \
|
||||||
|
workload is high. We will not forget about your request and get back in touch once we have updated information on your \
|
||||||
|
request. Requests for devices, wallets, credit cards or similar items will be handled with priority.
|
||||||
|
|
||||||
|
If you happen to find your lost item or just want to add additional information, please reply to this email. Please \
|
||||||
|
do not create a new request.
|
||||||
|
|
||||||
|
Your c3lf (Cloakroom + Lost&Found) Team'''
|
||||||
|
|
||||||
|
new_issue_notification = '''New issue "{{ ticket_name | limit_length }}" [{{ ticket_uuid }}] created
|
||||||
|
{{ ticket_url }}'''
|
||||||
|
|
||||||
|
reply_issue_notification = '''Reply to issue "{{ ticket_name }}" [{{ ticket_uuid }}] (was {{ previous_state_pretty }})
|
||||||
|
{{ ticket_url }}'''
|
85
core/notifications/dispatch.py
Normal file
85
core/notifications/dispatch.py
Normal file
|
@ -0,0 +1,85 @@
|
||||||
|
import asyncio
|
||||||
|
|
||||||
|
from aiohttp.client import ClientSession
|
||||||
|
from channels.layers import get_channel_layer
|
||||||
|
from channels.db import database_sync_to_async
|
||||||
|
from urllib.parse import quote as urlencode
|
||||||
|
|
||||||
|
from core.settings import TELEGRAM_BOT_TOKEN, TELEGRAM_GROUP_CHAT_ID
|
||||||
|
from mail.protocol import send_smtp, make_notification
|
||||||
|
from notifications.models import UserNotificationChannel
|
||||||
|
from notifications.templates import render_notification_new_ticket_async, render_notification_reply_ticket_async
|
||||||
|
from tickets.models import IssueThread
|
||||||
|
|
||||||
|
|
||||||
|
async def http_get(url):
|
||||||
|
async with ClientSession() as session:
|
||||||
|
async with session.get(url) as response:
|
||||||
|
return await response.text()
|
||||||
|
|
||||||
|
|
||||||
|
async def telegram_notify(message, chat_id):
|
||||||
|
encoded_message = urlencode(message)
|
||||||
|
url = f"https://api.telegram.org/bot{TELEGRAM_BOT_TOKEN}/sendMessage?chat_id={chat_id}&text={encoded_message}"
|
||||||
|
return await http_get(url)
|
||||||
|
|
||||||
|
|
||||||
|
async def email_notify(message, title, email):
|
||||||
|
mail = make_notification(message, email, title)
|
||||||
|
await send_smtp(mail)
|
||||||
|
|
||||||
|
|
||||||
|
class NotificationDispatcher:
|
||||||
|
channel_layer = None
|
||||||
|
room_group_name = "general"
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self.channel_layer = get_channel_layer('default')
|
||||||
|
if not self.channel_layer:
|
||||||
|
raise Exception("Could not get channel layer")
|
||||||
|
|
||||||
|
@database_sync_to_async
|
||||||
|
def get_notification_targets(self):
|
||||||
|
channels = UserNotificationChannel.objects.filter(active=True)
|
||||||
|
return list(channels)
|
||||||
|
|
||||||
|
@database_sync_to_async
|
||||||
|
def get_ticket(self, ticket_id):
|
||||||
|
return IssueThread.objects.filter(id=ticket_id).select_related('event').first()
|
||||||
|
|
||||||
|
async def run_forever(self):
|
||||||
|
# Infinite loop to continuously listen for messages
|
||||||
|
print("Listening for messages...")
|
||||||
|
channel_name = await self.channel_layer.new_channel()
|
||||||
|
await self.channel_layer.group_add(self.room_group_name, channel_name)
|
||||||
|
print("Channel name:", channel_name)
|
||||||
|
while True:
|
||||||
|
# Blocking receive to get the message from the channel layer
|
||||||
|
message = await self.channel_layer.receive(channel_name)
|
||||||
|
|
||||||
|
if (message and 'type' in message and message['type'] == 'generic.event' and 'name' in message and
|
||||||
|
message['name'] == 'user_notification'):
|
||||||
|
if 'ticket_id' in message and 'event_id' in message and 'new' in message:
|
||||||
|
ticket = await self.get_ticket(message['ticket_id'])
|
||||||
|
await self.dispatch(ticket, message['event_id'], message['new'])
|
||||||
|
else:
|
||||||
|
print("Error: Invalid message format")
|
||||||
|
|
||||||
|
async def dispatch(self, ticket, event_id, new):
|
||||||
|
message = await render_notification_new_ticket_async(
|
||||||
|
ticket) if new else await render_notification_reply_ticket_async(ticket)
|
||||||
|
title = f"[#{ticket.short_uuid()}] {ticket.name}"
|
||||||
|
print("Dispatching message:", message, "with event_id:", event_id)
|
||||||
|
targets = await self.get_notification_targets()
|
||||||
|
jobs = []
|
||||||
|
jobs.append(telegram_notify(message, TELEGRAM_GROUP_CHAT_ID))
|
||||||
|
for target in targets:
|
||||||
|
if target.channel_type == 'telegram':
|
||||||
|
print("Sending telegram notification to:", target.channel_target)
|
||||||
|
jobs.append(telegram_notify(message, target.channel_target))
|
||||||
|
elif target.channel_type == 'email':
|
||||||
|
print("Sending email notification to:", target.channel_target)
|
||||||
|
jobs.append(email_notify(message, title, target.channel_target))
|
||||||
|
else:
|
||||||
|
print("Unknown channel type:", target.channel_type)
|
||||||
|
await asyncio.gather(*jobs)
|
51
core/notifications/migrations/0001_initial.py
Normal file
51
core/notifications/migrations/0001_initial.py
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
# Generated by Django 4.2.7 on 2024-05-03 21:02
|
||||||
|
|
||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
from notifications.defaults import auto_reply_body, new_issue_notification, reply_issue_notification
|
||||||
|
from notifications.models import MessageTemplate
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
initial = True
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
]
|
||||||
|
|
||||||
|
def create_required_templates(apps, schema_editor):
|
||||||
|
MessageTemplate.objects.create(name='auto_reply', message=auto_reply_body, marked_required=True)
|
||||||
|
MessageTemplate.objects.create(name='new_issue_notification', message=new_issue_notification,
|
||||||
|
marked_required=True)
|
||||||
|
MessageTemplate.objects.create(name='reply_issue_notification', message=reply_issue_notification,
|
||||||
|
marked_required=True)
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='MessageTemplate',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('name', models.CharField(max_length=255)),
|
||||||
|
('message', models.TextField()),
|
||||||
|
('created', models.DateTimeField(auto_now_add=True)),
|
||||||
|
('marked_confidential', models.BooleanField(default=False)),
|
||||||
|
('marked_required', models.BooleanField(default=False)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='UserNotificationChannel',
|
||||||
|
fields=[
|
||||||
|
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('channel_type',
|
||||||
|
models.CharField(choices=[('telegram', 'telegram'), ('email', 'email')], max_length=255)),
|
||||||
|
('channel_target', models.CharField(max_length=255)),
|
||||||
|
('event_filter', models.CharField(max_length=255)),
|
||||||
|
('active', models.BooleanField(default=True)),
|
||||||
|
('created', models.DateTimeField(auto_now_add=True)),
|
||||||
|
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
migrations.RunPython(create_required_templates),
|
||||||
|
]
|
0
core/notifications/migrations/__init__.py
Normal file
0
core/notifications/migrations/__init__.py
Normal file
29
core/notifications/models.py
Normal file
29
core/notifications/models.py
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
from authentication.models import ExtendedUser
|
||||||
|
|
||||||
|
|
||||||
|
class MessageTemplate(models.Model):
|
||||||
|
name = models.CharField(max_length=255)
|
||||||
|
message = models.TextField()
|
||||||
|
created = models.DateTimeField(auto_now_add=True)
|
||||||
|
marked_confidential = models.BooleanField(default=False)
|
||||||
|
marked_required = models.BooleanField(default=False) # may not be deleted
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
|
|
||||||
|
|
||||||
|
class UserNotificationChannel(models.Model):
|
||||||
|
user = models.ForeignKey(ExtendedUser, models.CASCADE)
|
||||||
|
channel_type = models.CharField(choices=[('telegram', 'telegram'), ('email', 'email')], max_length=255)
|
||||||
|
channel_target = models.CharField(max_length=255)
|
||||||
|
event_filter = models.CharField(max_length=255)
|
||||||
|
active = models.BooleanField(default=True)
|
||||||
|
created = models.DateTimeField(auto_now_add=True)
|
||||||
|
|
||||||
|
def validate_constraints(self, exclude=None): # TODO: email -> emailaddress, telegram -> chatid
|
||||||
|
return True
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.user.username + '(' + self.channel_type + ')'
|
69
core/notifications/templates.py
Normal file
69
core/notifications/templates.py
Normal file
|
@ -0,0 +1,69 @@
|
||||||
|
import jinja2
|
||||||
|
from channels.db import database_sync_to_async
|
||||||
|
from core.settings import PRIMARY_HOST
|
||||||
|
|
||||||
|
from notifications.models import MessageTemplate
|
||||||
|
|
||||||
|
TEMPLATE_VARS = ['ticket_name', 'ticket_uuid', 'ticket_id', 'ticket_url',
|
||||||
|
'current_state', 'previous_state', 'current_state_pretty', 'previous_state_pretty',
|
||||||
|
'event_slug', 'event_name',
|
||||||
|
'username', 'user_nick',
|
||||||
|
'web_host'] # TODO customer_name, tracking_code
|
||||||
|
|
||||||
|
|
||||||
|
def limit_length(s, length=50):
|
||||||
|
if len(s) > length:
|
||||||
|
return s[:(length - 3)] + "..."
|
||||||
|
return s
|
||||||
|
|
||||||
|
|
||||||
|
def ticket_url(ticket):
|
||||||
|
eventslug = ticket.event.slug if ticket.event else "37C3" # TODO 37C3 should not be hardcoded
|
||||||
|
return f"https://{PRIMARY_HOST}/{eventslug}/ticket/{ticket.id}/"
|
||||||
|
|
||||||
|
|
||||||
|
def render_template(template, **kwargs):
|
||||||
|
try:
|
||||||
|
environment = jinja2.Environment()
|
||||||
|
environment.filters['limit_length'] = limit_length
|
||||||
|
tmpl = MessageTemplate.objects.get(name=template)
|
||||||
|
template = environment.from_string(tmpl.message)
|
||||||
|
return template.render(**kwargs, web_host=PRIMARY_HOST)
|
||||||
|
except MessageTemplate.DoesNotExist:
|
||||||
|
return None
|
||||||
|
|
||||||
|
|
||||||
|
def get_ticket_vars(ticket):
|
||||||
|
states = list(ticket.state_changes.order_by('-timestamp'))
|
||||||
|
return {
|
||||||
|
'ticket_name': ticket.name,
|
||||||
|
'ticket_uuid': ticket.short_uuid(),
|
||||||
|
'ticket_id': ticket.id,
|
||||||
|
'ticket_url': ticket_url(ticket),
|
||||||
|
'current_state': states[0].state if states else 'none',
|
||||||
|
'previous_state': states[1].state if len(states) > 1 else 'none',
|
||||||
|
'current_state_pretty': states[0].get_state_display() if states else 'none',
|
||||||
|
'previous_state_pretty': states[1].get_state_display() if len(states) > 1 else 'none',
|
||||||
|
'event_slug': ticket.event.slug if ticket.event else "37C3", # TODO 37C3 should not be hardcoded
|
||||||
|
'event_name': ticket.event.name if ticket.event else "37C3",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def render_auto_reply(ticket):
|
||||||
|
return render_template('auto_reply', **get_ticket_vars(ticket))
|
||||||
|
|
||||||
|
|
||||||
|
def render_notification_new_ticket(ticket):
|
||||||
|
return render_template('new_issue_notification', **get_ticket_vars(ticket))
|
||||||
|
|
||||||
|
|
||||||
|
def render_notification_reply_ticket(ticket):
|
||||||
|
return render_template('reply_issue_notification', **get_ticket_vars(ticket))
|
||||||
|
|
||||||
|
|
||||||
|
async def render_notification_new_ticket_async(ticket):
|
||||||
|
return await database_sync_to_async(render_notification_new_ticket)(ticket)
|
||||||
|
|
||||||
|
|
||||||
|
async def render_notification_reply_ticket_async(ticket):
|
||||||
|
return await database_sync_to_async(render_notification_reply_ticket)(ticket)
|
0
core/notifications/tests/__init__.py
Normal file
0
core/notifications/tests/__init__.py
Normal file
|
@ -1,3 +1,6 @@
|
||||||
|
aiodns==3.2.0
|
||||||
|
aiohttp==3.9.5
|
||||||
|
aiosignal==1.3.1
|
||||||
aiosmtpd==1.4.4.post2
|
aiosmtpd==1.4.4.post2
|
||||||
aiosmtplib==3.0.1
|
aiosmtplib==3.0.1
|
||||||
anyio==4.1.0
|
anyio==4.1.0
|
||||||
|
@ -28,6 +31,7 @@ django-rest-knox==4.2.0
|
||||||
django-soft-delete==0.9.21
|
django-soft-delete==0.9.21
|
||||||
djangorestframework==3.14.0
|
djangorestframework==3.14.0
|
||||||
drf-yasg==1.21.7
|
drf-yasg==1.21.7
|
||||||
|
frozenlist==1.4.1
|
||||||
h11==0.14.0
|
h11==0.14.0
|
||||||
hyperlink==21.0.0
|
hyperlink==21.0.0
|
||||||
idna==3.4
|
idna==3.4
|
||||||
|
@ -38,11 +42,13 @@ Jinja2==3.1.2
|
||||||
MarkupSafe==2.1.3
|
MarkupSafe==2.1.3
|
||||||
msgpack==1.0.7
|
msgpack==1.0.7
|
||||||
msgpack-python==0.5.6
|
msgpack-python==0.5.6
|
||||||
|
multidict==6.0.5
|
||||||
openapi-codec==1.3.2
|
openapi-codec==1.3.2
|
||||||
packaging==23.2
|
packaging==23.2
|
||||||
Pillow==10.1.0
|
Pillow==10.1.0
|
||||||
pyasn1==0.5.1
|
pyasn1==0.5.1
|
||||||
pyasn1-modules==0.3.0
|
pyasn1-modules==0.3.0
|
||||||
|
pycares==4.4.0
|
||||||
pycparser==2.21
|
pycparser==2.21
|
||||||
pyOpenSSL==23.3.0
|
pyOpenSSL==23.3.0
|
||||||
python-dotenv==1.0.0
|
python-dotenv==1.0.0
|
||||||
|
@ -65,4 +71,5 @@ urllib3==2.1.0
|
||||||
uvicorn==0.24.0.post1
|
uvicorn==0.24.0.post1
|
||||||
watchfiles==0.21.0
|
watchfiles==0.21.0
|
||||||
websockets==12.0
|
websockets==12.0
|
||||||
|
yarl==1.9.4
|
||||||
zope.interface==6.1
|
zope.interface==6.1
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
aiodns==3.2.0
|
||||||
|
aiohttp==3.9.5
|
||||||
|
aiosignal==1.3.1
|
||||||
aiosmtpd==1.4.4.post2
|
aiosmtpd==1.4.4.post2
|
||||||
aiosmtplib==3.0.1
|
aiosmtplib==3.0.1
|
||||||
asgiref==3.7.2
|
asgiref==3.7.2
|
||||||
|
|
7
core/server.py
Normal file → Executable file
7
core/server.py
Normal file → Executable file
|
@ -12,6 +12,7 @@ django.setup()
|
||||||
from helper import init_loop
|
from helper import init_loop
|
||||||
from mail.protocol import LMTPHandler
|
from mail.protocol import LMTPHandler
|
||||||
from mail.socket import UnixSocketLMTPController
|
from mail.socket import UnixSocketLMTPController
|
||||||
|
from notifications.dispatch import NotificationDispatcher
|
||||||
|
|
||||||
|
|
||||||
class UvicornServer(uvicorn.Server):
|
class UvicornServer(uvicorn.Server):
|
||||||
|
@ -54,6 +55,11 @@ async def lmtp(loop):
|
||||||
log.info("LMTP done")
|
log.info("LMTP done")
|
||||||
|
|
||||||
|
|
||||||
|
async def notifications(loop):
|
||||||
|
dispatcher = NotificationDispatcher()
|
||||||
|
await dispatcher.run_forever()
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
import sdnotify
|
import sdnotify
|
||||||
import setproctitle
|
import setproctitle
|
||||||
|
@ -67,6 +73,7 @@ def main():
|
||||||
loop.create_task(web(loop))
|
loop.create_task(web(loop))
|
||||||
# loop.create_task(tcp(loop))
|
# loop.create_task(tcp(loop))
|
||||||
loop.create_task(lmtp(loop))
|
loop.create_task(lmtp(loop))
|
||||||
|
loop.create_task(notifications(loop))
|
||||||
n = sdnotify.SystemdNotifier()
|
n = sdnotify.SystemdNotifier()
|
||||||
n.notify("READY=1")
|
n.notify("READY=1")
|
||||||
log.info("Server ready")
|
log.info("Server ready")
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
from tickets.models import IssueThread, Comment, StateChange
|
from tickets.models import IssueThread, Comment, StateChange, Assignment, ItemRelation, ShippingVoucher
|
||||||
|
|
||||||
|
|
||||||
class IssueThreadAdmin(admin.ModelAdmin):
|
class IssueThreadAdmin(admin.ModelAdmin):
|
||||||
|
@ -15,6 +15,21 @@ class StateChangeAdmin(admin.ModelAdmin):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class AssignmentAdmin(admin.ModelAdmin):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class ItemRelationAdmin(admin.ModelAdmin):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
class ShippingVouchersAdmin(admin.ModelAdmin):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
admin.site.register(IssueThread, IssueThreadAdmin)
|
admin.site.register(IssueThread, IssueThreadAdmin)
|
||||||
admin.site.register(Comment, CommentAdmin)
|
admin.site.register(Comment, CommentAdmin)
|
||||||
admin.site.register(StateChange, StateChangeAdmin)
|
admin.site.register(StateChange, StateChangeAdmin)
|
||||||
|
admin.site.register(Assignment, AssignmentAdmin)
|
||||||
|
admin.site.register(ItemRelation, ItemRelationAdmin)
|
||||||
|
admin.site.register(ShippingVoucher, ShippingVouchersAdmin)
|
||||||
|
|
|
@ -13,8 +13,8 @@ from core.settings import MAIL_DOMAIN
|
||||||
from mail.models import Email
|
from mail.models import Email
|
||||||
from mail.protocol import send_smtp, make_reply, collect_references
|
from mail.protocol import send_smtp, make_reply, collect_references
|
||||||
from notify_sessions.models import SystemEvent
|
from notify_sessions.models import SystemEvent
|
||||||
from tickets.models import IssueThread, Comment, STATE_CHOICES
|
from tickets.models import IssueThread, Comment, STATE_CHOICES, ShippingVoucher
|
||||||
from tickets.serializers import IssueSerializer, CommentSerializer
|
from tickets.serializers import IssueSerializer, CommentSerializer, ShippingVoucherSerializer
|
||||||
|
|
||||||
|
|
||||||
class IssueViewSet(viewsets.ModelViewSet):
|
class IssueViewSet(viewsets.ModelViewSet):
|
||||||
|
@ -22,6 +22,16 @@ class IssueViewSet(viewsets.ModelViewSet):
|
||||||
queryset = IssueThread.objects.all()
|
queryset = IssueThread.objects.all()
|
||||||
|
|
||||||
|
|
||||||
|
class CommentViewSet(viewsets.ModelViewSet):
|
||||||
|
serializer_class = CommentSerializer
|
||||||
|
queryset = Comment.objects.all()
|
||||||
|
|
||||||
|
|
||||||
|
class ShippingVoucherViewSet(viewsets.ModelViewSet):
|
||||||
|
serializer_class = ShippingVoucherSerializer
|
||||||
|
queryset = ShippingVoucher.objects.all()
|
||||||
|
|
||||||
|
|
||||||
@api_view(['POST'])
|
@api_view(['POST'])
|
||||||
@permission_classes([IsAuthenticated])
|
@permission_classes([IsAuthenticated])
|
||||||
@permission_required('tickets.add_issuethread', raise_exception=True)
|
@permission_required('tickets.add_issuethread', raise_exception=True)
|
||||||
|
@ -113,6 +123,8 @@ def add_comment(request, pk):
|
||||||
|
|
||||||
router = routers.SimpleRouter()
|
router = routers.SimpleRouter()
|
||||||
router.register(r'tickets', IssueViewSet, basename='issues')
|
router.register(r'tickets', IssueViewSet, basename='issues')
|
||||||
|
#router.register(r'comments', CommentViewSet, basename='comments')
|
||||||
|
router.register(r'shipping_vouchers', ShippingVoucherViewSet, basename='shipping_vouchers')
|
||||||
|
|
||||||
urlpatterns = ([
|
urlpatterns = ([
|
||||||
re_path(r'^tickets/(?P<pk>\d+)/reply/$', reply, name='reply'),
|
re_path(r'^tickets/(?P<pk>\d+)/reply/$', reply, name='reply'),
|
||||||
|
|
20
core/tickets/migrations/0009_issuethread_event.py
Normal file
20
core/tickets/migrations/0009_issuethread_event.py
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
# Generated by Django 4.2.7 on 2024-05-03 21:21
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('inventory', '0004_alter_event_created_at_alter_item_created_at'),
|
||||||
|
('tickets', '0008_alter_issuethread_options_and_more'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='issuethread',
|
||||||
|
name='event',
|
||||||
|
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='issue_threads', to='inventory.event'),
|
||||||
|
),
|
||||||
|
]
|
25
core/tickets/migrations/0009_shippingvoucher.py
Normal file
25
core/tickets/migrations/0009_shippingvoucher.py
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
# Generated by Django 4.2.7 on 2024-06-23 00:47
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('tickets', '0008_alter_issuethread_options_and_more'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='ShippingVoucher',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(primary_key=True, serialize=False)),
|
||||||
|
('voucher', 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_vouchers', to='tickets.issuethread')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
25
core/tickets/migrations/0010_itemrelation.py
Normal file
25
core/tickets/migrations/0010_itemrelation.py
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
# Generated by Django 4.2.7 on 2024-05-22 18:19
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('inventory', '0004_alter_event_created_at_alter_item_created_at'),
|
||||||
|
('tickets', '0009_issuethread_event'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='ItemRelation',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(primary_key=True, serialize=False)),
|
||||||
|
('timestamp', models.DateTimeField(auto_now_add=True)),
|
||||||
|
('status', models.CharField(choices=[('possible', 'Possible'), ('confirmed', 'Confirmed'), ('discarded', 'Discarded'), ('provided', 'Provided')], default='possible', max_length=255)),
|
||||||
|
('issue_thread', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='item_relations', to='tickets.issuethread')),
|
||||||
|
('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='issues', to='inventory.item')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
19
core/tickets/migrations/0011_issuethread_related_items.py
Normal file
19
core/tickets/migrations/0011_issuethread_related_items.py
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
# Generated by Django 4.2.7 on 2024-06-14 17:48
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('inventory', '0004_alter_event_created_at_alter_item_created_at'),
|
||||||
|
('tickets', '0010_itemrelation'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='issuethread',
|
||||||
|
name='related_items',
|
||||||
|
field=models.ManyToManyField(through='tickets.ItemRelation', to='inventory.item'),
|
||||||
|
),
|
||||||
|
]
|
25
core/tickets/migrations/0012_shippingvoucher.py
Normal file
25
core/tickets/migrations/0012_shippingvoucher.py
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
# Generated by Django 4.2.7 on 2024-06-18 14:54
|
||||||
|
|
||||||
|
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='ShippingVoucher',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(primary_key=True, serialize=False)),
|
||||||
|
('voucher', 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_vouchers', to='tickets.issuethread')),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
]
|
|
@ -1,8 +1,9 @@
|
||||||
|
from django.utils import timezone
|
||||||
from django.db import models
|
from django.db import models
|
||||||
from django_softdelete.models import SoftDeleteModel
|
from django_softdelete.models import SoftDeleteModel
|
||||||
|
|
||||||
from authentication.models import ExtendedUser
|
from authentication.models import ExtendedUser
|
||||||
from inventory.models import Event
|
from inventory.models import Event, Item
|
||||||
from django.db.models.signals import post_save, pre_save
|
from django.db.models.signals import post_save, pre_save
|
||||||
from django.dispatch import receiver
|
from django.dispatch import receiver
|
||||||
|
|
||||||
|
@ -28,12 +29,21 @@ STATE_CHOICES = (
|
||||||
('found_closed', 'Item Found and stored externally and closed'),
|
('found_closed', 'Item Found and stored externally and closed'),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
RELATION_STATUS_CHOICES = (
|
||||||
|
('possible', 'Possible'),
|
||||||
|
('confirmed', 'Confirmed'),
|
||||||
|
('discarded', 'Discarded'),
|
||||||
|
('provided', 'Provided'),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class IssueThread(SoftDeleteModel):
|
class IssueThread(SoftDeleteModel):
|
||||||
id = models.AutoField(primary_key=True)
|
id = models.AutoField(primary_key=True)
|
||||||
uuid = models.CharField(max_length=255, unique=True, null=False, blank=False)
|
uuid = models.CharField(max_length=255, unique=True, null=False, blank=False)
|
||||||
name = models.CharField(max_length=255)
|
name = models.CharField(max_length=255)
|
||||||
|
event = models.ForeignKey(Event, null=True, on_delete=models.SET_NULL, related_name='issue_threads')
|
||||||
manually_created = models.BooleanField(default=False)
|
manually_created = models.BooleanField(default=False)
|
||||||
|
related_items = models.ManyToManyField(Item, through='ItemRelation')
|
||||||
|
|
||||||
def short_uuid(self):
|
def short_uuid(self):
|
||||||
return self.uuid[:8]
|
return self.uuid[:8]
|
||||||
|
@ -116,3 +126,31 @@ class Assignment(models.Model):
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return str(self.issue_thread) + ' assigned to ' + self.assigned_to.username
|
return str(self.issue_thread) + ' assigned to ' + self.assigned_to.username
|
||||||
|
|
||||||
|
|
||||||
|
class ItemRelation(models.Model):
|
||||||
|
id = models.AutoField(primary_key=True)
|
||||||
|
issue_thread = models.ForeignKey(IssueThread, on_delete=models.CASCADE, related_name='item_relations')
|
||||||
|
item = models.ForeignKey(Item, on_delete=models.CASCADE, related_name='issues')
|
||||||
|
timestamp = models.DateTimeField(auto_now_add=True)
|
||||||
|
status = models.CharField(max_length=255, choices=RELATION_STATUS_CHOICES, default='possible')
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return str(self.issue_thread) + ' related to ' + str(self.item)
|
||||||
|
|
||||||
|
|
||||||
|
class ShippingVoucher(models.Model):
|
||||||
|
id = models.AutoField(primary_key=True)
|
||||||
|
issue_thread = models.ForeignKey(IssueThread, on_delete=models.CASCADE, related_name='shipping_vouchers', null=True)
|
||||||
|
voucher = models.CharField(max_length=255)
|
||||||
|
type = models.CharField(max_length=255)
|
||||||
|
timestamp = models.DateTimeField(auto_now_add=True)
|
||||||
|
used_at = models.DateTimeField(null=True)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.voucher + ' (' + self.type + ')'
|
||||||
|
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
if self.used_at is None and self.issue_thread is not None:
|
||||||
|
self.used_at = timezone.now()
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
|
|
@ -2,7 +2,8 @@ from rest_framework import serializers
|
||||||
|
|
||||||
from authentication.models import ExtendedUser
|
from authentication.models import ExtendedUser
|
||||||
from mail.api_v2 import AttachmentSerializer
|
from mail.api_v2 import AttachmentSerializer
|
||||||
from tickets.models import IssueThread, Comment, STATE_CHOICES
|
from tickets.models import IssueThread, Comment, STATE_CHOICES, ShippingVoucher
|
||||||
|
from inventory.serializers import ItemSerializer
|
||||||
|
|
||||||
|
|
||||||
class CommentSerializer(serializers.ModelSerializer):
|
class CommentSerializer(serializers.ModelSerializer):
|
||||||
|
@ -28,23 +29,31 @@ class StateSerializer(serializers.Serializer):
|
||||||
return obj['value']
|
return obj['value']
|
||||||
|
|
||||||
|
|
||||||
|
class ShippingVoucherSerializer(serializers.ModelSerializer):
|
||||||
|
class Meta:
|
||||||
|
model = ShippingVoucher
|
||||||
|
fields = ('id', 'voucher', 'type', 'timestamp', 'issue_thread', 'used_at')
|
||||||
|
read_only_fields = ('id', 'timestamp', 'used_at')
|
||||||
|
|
||||||
|
|
||||||
class IssueSerializer(serializers.ModelSerializer):
|
class IssueSerializer(serializers.ModelSerializer):
|
||||||
timeline = serializers.SerializerMethodField()
|
timeline = serializers.SerializerMethodField()
|
||||||
last_activity = serializers.SerializerMethodField()
|
last_activity = serializers.SerializerMethodField()
|
||||||
assigned_to = serializers.SlugRelatedField(slug_field='username', queryset=ExtendedUser.objects.all(),
|
assigned_to = serializers.SlugRelatedField(slug_field='username', queryset=ExtendedUser.objects.all(),
|
||||||
allow_null=True, required=False)
|
allow_null=True, required=False)
|
||||||
|
related_items = ItemSerializer(many=True, read_only=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = IssueThread
|
model = IssueThread
|
||||||
fields = ('id', 'timeline', 'name', 'state', 'assigned_to', 'last_activity', 'uuid')
|
fields = ('id', 'timeline', 'name', 'state', 'assigned_to', 'last_activity', 'uuid', 'related_items')
|
||||||
read_only_fields = ('id', 'timeline', 'last_activity', 'uuid')
|
read_only_fields = ('id', 'timeline', 'last_activity', 'uuid', 'related_items')
|
||||||
|
|
||||||
def to_internal_value(self, data):
|
def to_internal_value(self, data):
|
||||||
ret = super().to_internal_value(data)
|
ret = super().to_internal_value(data)
|
||||||
if 'state' in data:
|
if 'state' in data:
|
||||||
ret['state'] = data['state']
|
ret['state'] = data['state']
|
||||||
# if 'assigned_to' in data:
|
# if 'assigned_to' in data:
|
||||||
# ret['assigned_to'] = data['assigned_to']
|
# ret['assigned_to'] = data['assigned_to']
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
def validate(self, attrs):
|
def validate(self, attrs):
|
||||||
|
@ -60,7 +69,12 @@ class IssueSerializer(serializers.ModelSerializer):
|
||||||
if self.state_changes.count() > 0 else None
|
if self.state_changes.count() > 0 else None
|
||||||
last_comment = self.comments.order_by('-timestamp').first().timestamp if self.comments.count() > 0 else None
|
last_comment = self.comments.order_by('-timestamp').first().timestamp if self.comments.count() > 0 else None
|
||||||
last_mail = self.emails.order_by('-timestamp').first().timestamp if self.emails.count() > 0 else None
|
last_mail = self.emails.order_by('-timestamp').first().timestamp if self.emails.count() > 0 else None
|
||||||
args = [x for x in [last_state_change, last_comment, last_mail] if x is not None]
|
last_assignment = self.assignments.order_by('-timestamp').first().timestamp if \
|
||||||
|
self.assignments.count() > 0 else None
|
||||||
|
last_relation = self.item_relations.order_by('-timestamp').first().timestamp if \
|
||||||
|
self.item_relations.count() > 0 else None
|
||||||
|
args = [x for x in [last_state_change, last_comment, last_mail, last_assignment, last_relation] if
|
||||||
|
x is not None]
|
||||||
return max(args)
|
return max(args)
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
return None
|
return None
|
||||||
|
@ -100,6 +114,22 @@ class IssueSerializer(serializers.ModelSerializer):
|
||||||
'timestamp': assignment.timestamp,
|
'timestamp': assignment.timestamp,
|
||||||
'assigned_to': assignment.assigned_to.username,
|
'assigned_to': assignment.assigned_to.username,
|
||||||
})
|
})
|
||||||
|
for relation in obj.item_relations.all():
|
||||||
|
timeline.append({
|
||||||
|
'type': 'item_relation',
|
||||||
|
'id': relation.id,
|
||||||
|
'status': relation.status,
|
||||||
|
'timestamp': relation.timestamp,
|
||||||
|
'item': ItemSerializer(relation.item).data,
|
||||||
|
})
|
||||||
|
for shipping_voucher in obj.shipping_vouchers.all():
|
||||||
|
timeline.append({
|
||||||
|
'type': 'shipping_voucher',
|
||||||
|
'id': shipping_voucher.id,
|
||||||
|
'timestamp': shipping_voucher.used_at,
|
||||||
|
'voucher': shipping_voucher.voucher,
|
||||||
|
'voucher_type': shipping_voucher.type,
|
||||||
|
})
|
||||||
return sorted(timeline, key=lambda x: x['timestamp'])
|
return sorted(timeline, key=lambda x: x['timestamp'])
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
|
|
41
core/tickets/tests/v2/test_shipping_vouchers.py
Normal file
41
core/tickets/tests/v2/test_shipping_vouchers.py
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
from datetime import datetime, timedelta
|
||||||
|
|
||||||
|
from django.test import TestCase, Client
|
||||||
|
|
||||||
|
from authentication.models import ExtendedUser
|
||||||
|
from mail.models import Email, EmailAttachment
|
||||||
|
from tickets.models import IssueThread, StateChange, Comment, ShippingVoucher
|
||||||
|
from django.contrib.auth.models import Permission
|
||||||
|
from knox.models import AuthToken
|
||||||
|
|
||||||
|
|
||||||
|
class ShippingVoucherApiTest(TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
super().setUp()
|
||||||
|
self.user = ExtendedUser.objects.create_user('testuser', 'test', 'test')
|
||||||
|
self.user.user_permissions.add(*Permission.objects.all())
|
||||||
|
self.user.save()
|
||||||
|
self.token = AuthToken.objects.create(user=self.user)
|
||||||
|
self.client = Client(headers={'Authorization': 'Token ' + self.token[1]})
|
||||||
|
|
||||||
|
def test_issues_empty(self):
|
||||||
|
response = self.client.get('/api/2/shipping_vouchers/')
|
||||||
|
self.assertEqual(response.status_code, 200)
|
||||||
|
self.assertEqual(response.json(), [])
|
||||||
|
|
||||||
|
def test_issues_list(self):
|
||||||
|
ShippingVoucher.objects.create(voucher='1234', type='2kg-eu')
|
||||||
|
response = self.client.get('/api/2/shipping_vouchers/')
|
||||||
|
self.assertEqual(response.status_code, 200)
|
||||||
|
self.assertEqual(response.json()[0]['voucher'], '1234')
|
||||||
|
self.assertEqual(response.json()[0]['used_at'], None)
|
||||||
|
self.assertEqual(response.json()[0]['issue_thread'], None)
|
||||||
|
self.assertEqual(response.json()[0]['type'], '2kg-eu')
|
||||||
|
|
||||||
|
def test_issues_create(self):
|
||||||
|
response = self.client.post('/api/2/shipping_vouchers/', {'voucher': '1234', 'type': '2kg-eu'})
|
||||||
|
self.assertEqual(response.status_code, 201)
|
||||||
|
self.assertEqual(response.json()['voucher'], '1234')
|
||||||
|
self.assertEqual(response.json()['used_at'], None)
|
||||||
|
self.assertEqual(response.json()['issue_thread'], None)
|
|
@ -247,6 +247,16 @@ class IssueApiTest(TestCase):
|
||||||
self.assertEqual(timeline[1]['subject'], 'test issue')
|
self.assertEqual(timeline[1]['subject'], 'test issue')
|
||||||
self.assertEqual(timeline[1]['body'], 'test')
|
self.assertEqual(timeline[1]['body'], 'test')
|
||||||
|
|
||||||
|
#def test_post_comment(self):
|
||||||
|
# issue = IssueThread.objects.create(
|
||||||
|
# name="test issue",
|
||||||
|
# )
|
||||||
|
# response = self.client.post('/api/2/comments/', {'comment': 'test', 'issue_thread': issue.id})
|
||||||
|
# self.assertEqual(response.status_code, 201)
|
||||||
|
# self.assertEqual(response.json()['comment'], 'test')
|
||||||
|
# self.assertEqual(response.json()['issue_thread'], issue.id)
|
||||||
|
# self.assertEqual(response.json()['timestamp'], response.json()['timestamp'])
|
||||||
|
|
||||||
def test_post_comment_altenative(self):
|
def test_post_comment_altenative(self):
|
||||||
issue = IssueThread.objects.create(
|
issue = IssueThread.objects.create(
|
||||||
name="test issue",
|
name="test issue",
|
||||||
|
|
|
@ -9,3 +9,5 @@ LEGACY_API_USER={{ legacy_api_user }}
|
||||||
LEGACY_API_PASSWORD={{ legacy_api_password }}
|
LEGACY_API_PASSWORD={{ legacy_api_password }}
|
||||||
MEDIA_ROOT=/var/www/c3lf-sys3/userfiles
|
MEDIA_ROOT=/var/www/c3lf-sys3/userfiles
|
||||||
STATIC_ROOT=/var/www/c3lf-sys3/staticfiles
|
STATIC_ROOT=/var/www/c3lf-sys3/staticfiles
|
||||||
|
TELEGRAM_GROUP_CHAT_ID={{ telegram_group_chat_id }}
|
||||||
|
TELEGRAM_BOT_TOKEN={{ telegram_bot_token }}
|
27
deploy/nginx-ws-proxy.conf
Normal file
27
deploy/nginx-ws-proxy.conf
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
http {
|
||||||
|
map $http_upgrade $connection_upgrade {
|
||||||
|
default upgrade;
|
||||||
|
'' close;
|
||||||
|
}
|
||||||
|
|
||||||
|
upstream websocket {
|
||||||
|
server staging.c3lf.de:443;
|
||||||
|
}
|
||||||
|
|
||||||
|
server {
|
||||||
|
listen 8082;
|
||||||
|
access_log /home/jedi/Projects/c3lf-system-3/deploy/foo.log;
|
||||||
|
location / {
|
||||||
|
proxy_pass https://websocket;
|
||||||
|
proxy_http_version 1.1;
|
||||||
|
proxy_set_header Upgrade $http_upgrade;
|
||||||
|
proxy_set_header Connection $connection_upgrade;
|
||||||
|
proxy_set_header Origin "https://staging.c3lf.de/";
|
||||||
|
proxy_set_header Host $host;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
events {}
|
||||||
|
|
||||||
|
pid /home/jedi/Projects/c3lf-system-3/deploy/nginx.pid;
|
11286
web/package-lock.json
generated
Normal file
11286
web/package-lock.json
generated
Normal file
File diff suppressed because it is too large
Load diff
|
@ -8,6 +8,7 @@
|
||||||
"lint": "vue-cli-service lint"
|
"lint": "vue-cli-service lint"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@chenfengyuan/vue-qrcode": "^2.0.0",
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
"@fortawesome/fontawesome-svg-core": "^6.5.1",
|
||||||
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
"@fortawesome/free-solid-svg-icons": "^6.5.1",
|
||||||
"@fortawesome/vue-fontawesome": "^3.0.6",
|
"@fortawesome/vue-fontawesome": "^3.0.6",
|
||||||
|
|
|
@ -1,6 +1,31 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-3 col-xl-2">
|
<div class="col-lg-3 col-xl-2">
|
||||||
|
<!--div class="card bg-dark text-light mb-2" id="filters">
|
||||||
|
<div class="card-body">
|
||||||
|
<h5 class="card-title text-info">Sort & Filter</h5>
|
||||||
|
<div class="form-group" v-for="(column, index) in columns" :key="index">
|
||||||
|
<label>{{ column }}</label>
|
||||||
|
<div class="input-group">
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<button
|
||||||
|
:class="[ 'btn', column === sortBy ? 'btn-outline-info' : 'btn-outline-secondary' ]"
|
||||||
|
type="button"
|
||||||
|
@click="toggleSort(column)">
|
||||||
|
<font-awesome-icon :icon="getSortIcon(column)"/>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
placeholder="filter"
|
||||||
|
:value="filters[column]"
|
||||||
|
@input="changeFilter(column, $event.target.value)"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div-->
|
||||||
</div>
|
</div>
|
||||||
<div class="col-lg-9 col-xl-8">
|
<div class="col-lg-9 col-xl-8">
|
||||||
<div class="w-100"
|
<div class="w-100"
|
||||||
|
@ -58,6 +83,13 @@ export default {
|
||||||
} else {
|
} else {
|
||||||
this.collapsed = this.sections.map(() => true);
|
this.collapsed = this.sections.map(() => true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//this.$router.push({...this.$router.currentRoute, query: {...this.$router.currentRoute.query, layout}});
|
||||||
|
//this.collapsed = this.sections.map(() => true);
|
||||||
|
/*this.columns.map(e => ({
|
||||||
|
k: e,
|
||||||
|
v: this.$store.getters.getFilters[e]
|
||||||
|
})).filter(e => e.v).forEach(e => this.setFilter(e.k, e.v));*/
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
grouped_items() {
|
grouped_items() {
|
||||||
|
|
105
web/src/components/SlotTable.vue
Normal file
105
web/src/components/SlotTable.vue
Normal file
|
@ -0,0 +1,105 @@
|
||||||
|
<template>
|
||||||
|
<table class="table table-striped table-dark">
|
||||||
|
<thead>
|
||||||
|
<tr>
|
||||||
|
<th scope="col" v-for="(column, index) in columns" :key="index"
|
||||||
|
v-if="columnHasData[index]||columnHasSlot[index]">
|
||||||
|
<div class="input-group" v-if="columnHasData[index]">
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<button
|
||||||
|
:class="[ 'btn', column === sortBy ? 'btn-outline-info' : 'btn-outline-secondary' ]"
|
||||||
|
@click="toggleSort(column)"
|
||||||
|
>
|
||||||
|
{{ column }}
|
||||||
|
<span :class="{ 'text-info': column === sortBy }">
|
||||||
|
<font-awesome-icon :icon="getSortIcon(column)"/>
|
||||||
|
</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
class="form-control"
|
||||||
|
placeholder="filter"
|
||||||
|
:value="filters[column]"
|
||||||
|
@input="changeFilter(column, $event.target.value)"
|
||||||
|
>
|
||||||
|
</div>
|
||||||
|
<span v-else-if="columnHasSlot[index]">
|
||||||
|
{{ column }}
|
||||||
|
</span>
|
||||||
|
</th>
|
||||||
|
<th>
|
||||||
|
<slot name="header_actions"/>
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody>
|
||||||
|
<tr v-for="item in internalItems" :key="item[keyName]" @click="$emit('itemActivated', item)">
|
||||||
|
<td v-for="(column, index) in columns" :key="index" v-if="columnHasSlot[index]||columnHasData[index]">
|
||||||
|
<slot v-if="columnHasSlot[index]" :name="column" :item="item"/>
|
||||||
|
<span v-else-if="columnHasData[index]">
|
||||||
|
{{ item[column] }}
|
||||||
|
</span>
|
||||||
|
<span v-else>
|
||||||
|
{{ column }}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
<slot v-bind:item="item" name="actions"/>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import DataContainer from '@/mixins/data-container';
|
||||||
|
import router from '../router';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'SlotTable',
|
||||||
|
mixins: [DataContainer],
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
columnHasSlot: [],
|
||||||
|
columnHasData: []
|
||||||
|
}
|
||||||
|
},
|
||||||
|
created() {
|
||||||
|
this.columns.map(e => ({
|
||||||
|
k: e,
|
||||||
|
v: this.$store.getters.getFilters[e]
|
||||||
|
})).filter(e => e.v).forEach(e => this.setFilter(e.k, e.v));
|
||||||
|
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.columnHasSlot = this.columns.map(e => Object.keys(this.$slots).includes(e));
|
||||||
|
this.columnHasData = this.columns.map(e => this.items.reduce((a, b) => a || b[e] !== undefined, false));
|
||||||
|
//console.log(this.columnHasData, this.columnHasSlot, this.columns, Object.keys(this.$slots), this.$slots);
|
||||||
|
for (let slot in this.$slots) {
|
||||||
|
console.log(`Slot: ${slot}`);
|
||||||
|
console.log(`Data: ${this.$slots[slot]}`);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
beforeUpdate() {
|
||||||
|
this.columnHasSlot = this.columns.map(e => Object.keys(this.$slots).includes(e));
|
||||||
|
this.columnHasData = this.columns.map(e => this.items.reduce((a, b) => a || b[e] !== undefined, false));
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
changeFilter(col, val) {
|
||||||
|
this.setFilter(col, val);
|
||||||
|
let newquery = Object.entries({
|
||||||
|
...this.$store.getters.getFilters,
|
||||||
|
[col]: val
|
||||||
|
}).reduce((a, [k, v]) => (v ? {...a, [k]: v} : a), {});
|
||||||
|
router.push({query: newquery});
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style>
|
||||||
|
.table-body-move {
|
||||||
|
transition: transform 1s;
|
||||||
|
}
|
||||||
|
</style>
|
48
web/src/components/Toast.vue
Normal file
48
web/src/components/Toast.vue
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
<template>
|
||||||
|
<div class="toast" :class="color && ('border-' + color)" role="alert" ref="toast" data-autohide="false">
|
||||||
|
<div class="toast-header" :class="[color && ('bg-' + color), color && 'text-light']">
|
||||||
|
<strong class="mr-auto pr-3">{{ title }}</strong>
|
||||||
|
<small>{{ displayTime }}</small>
|
||||||
|
<button type="button" class="ml-2 mb-1 close" @click="close()">
|
||||||
|
<span aria-hidden="true">×</span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<!--div class="toast-body" v-html="message">{{ message }}</div-->
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import $ from 'jquery';
|
||||||
|
import 'bootstrap/js/dist/toast';
|
||||||
|
import {DateTime} from 'luxon';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'Toast',
|
||||||
|
props: ['title', 'message', 'color'],
|
||||||
|
data: () => ({
|
||||||
|
creationTime: DateTime.local(),
|
||||||
|
displayTime: 'just now',
|
||||||
|
timer: undefined
|
||||||
|
}),
|
||||||
|
mounted() {
|
||||||
|
const {toast} = this.$refs;
|
||||||
|
$(toast).toast('show');
|
||||||
|
this.timer = setInterval(this.updateDisplayTime, 1000);
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
close() {
|
||||||
|
const {toast} = this.$refs;
|
||||||
|
$(toast).toast('hide');
|
||||||
|
window.setTimeout(() => {
|
||||||
|
this.$emit('close');
|
||||||
|
}, 500);
|
||||||
|
},
|
||||||
|
updateDisplayTime() {
|
||||||
|
this.displayTime = this.creationTime.toRelative();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
beforeDestroy() {
|
||||||
|
clearInterval(this.timer);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
112
web/src/components/inputs/FormatedText.vue
Normal file
112
web/src/components/inputs/FormatedText.vue
Normal file
|
@ -0,0 +1,112 @@
|
||||||
|
<template>
|
||||||
|
<div contenteditable @input="onchange" ref="text">
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: 'FormatedText',
|
||||||
|
props: {
|
||||||
|
value: {
|
||||||
|
type: String,
|
||||||
|
required: true
|
||||||
|
},
|
||||||
|
format: {
|
||||||
|
type: Function,
|
||||||
|
default: null
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
selection: {start: 0, end: 0, direction: 'forward', type: 'Caret'}
|
||||||
|
};
|
||||||
|
},
|
||||||
|
emits: ['input'],
|
||||||
|
methods: {
|
||||||
|
rawhtml(value) {
|
||||||
|
if (typeof this.format === 'function') {
|
||||||
|
return this.format(value.replace(/ /g, ' '));
|
||||||
|
} else {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onchange(event) {
|
||||||
|
const div = this.$refs.text;
|
||||||
|
const sel = window.getSelection();
|
||||||
|
if (sel.rangeCount > 0) {
|
||||||
|
this.selection.start = this.calculateOffset(div, sel.anchorNode, sel.anchorOffset);
|
||||||
|
this.selection.end = this.calculateOffset(div, sel.focusNode, sel.focusOffset);
|
||||||
|
this.selection.direction = sel.direction;
|
||||||
|
this.selection.type = sel.type;
|
||||||
|
}
|
||||||
|
this.$emit('input', event.target.innerText.replace(/ /g, ' ').replace(/\xA0/g, ' '));
|
||||||
|
},
|
||||||
|
calculateOffset(container, node, offset) {
|
||||||
|
let position = 0;
|
||||||
|
let found = false;
|
||||||
|
const walk = (elem) => {
|
||||||
|
if (elem === node) {
|
||||||
|
found = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (elem.nodeType === 3) {
|
||||||
|
position += elem.length;
|
||||||
|
} else {
|
||||||
|
for (let i = 0; i < elem.childNodes.length; i++) {
|
||||||
|
walk(elem.childNodes[i]);
|
||||||
|
if (found) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
walk(container);
|
||||||
|
return position + offset;
|
||||||
|
},
|
||||||
|
findNode(container, offset) {
|
||||||
|
let position = 0;
|
||||||
|
let found = false;
|
||||||
|
let node = null;
|
||||||
|
const walk = (elem) => {
|
||||||
|
if (position + elem.length >= offset) {
|
||||||
|
found = true;
|
||||||
|
node = elem;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (elem.nodeType === 3) {
|
||||||
|
position += elem.length;
|
||||||
|
} else {
|
||||||
|
for (let i = 0; i < elem.childNodes.length; i++) {
|
||||||
|
walk(elem.childNodes[i]);
|
||||||
|
if (found) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
walk(container);
|
||||||
|
return [node, offset - position]
|
||||||
|
},
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
value() {
|
||||||
|
if (this.selection) {
|
||||||
|
const div = this.$refs.text;
|
||||||
|
div.innerHTML = this.rawhtml(this.value);
|
||||||
|
|
||||||
|
const range = document.createRange();
|
||||||
|
const sel = window.getSelection();
|
||||||
|
range.setStart(...this.findNode(div, this.selection.start));
|
||||||
|
range.setEnd(...this.findNode(div, this.selection.end));
|
||||||
|
|
||||||
|
sel.removeAllRanges();
|
||||||
|
sel.addRange(range);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
const div = this.$refs.text;
|
||||||
|
div.innerHTML = this.rawhtml(this.value);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
|
@ -1,5 +1,6 @@
|
||||||
import {createApp} from 'vue'
|
import {createApp} from 'vue'
|
||||||
import App from './App.vue';
|
import App from './App.vue';
|
||||||
|
import VueQrcode from '@chenfengyuan/vue-qrcode';
|
||||||
import store from './store';
|
import store from './store';
|
||||||
import router from './router';
|
import router from './router';
|
||||||
|
|
||||||
|
@ -52,5 +53,6 @@ library.add(faPlus, faCheckCircle, faEdit, faTrash, faCat, faSyncAlt, faSort, fa
|
||||||
|
|
||||||
const app = createApp(App).use(store).use(router);
|
const app = createApp(App).use(store).use(router);
|
||||||
|
|
||||||
|
app.component(VueQrcode.name, VueQrcode);
|
||||||
app.component('font-awesome-icon', FontAwesomeIcon);
|
app.component('font-awesome-icon', FontAwesomeIcon);
|
||||||
app.mount('#app')
|
app.mount('#app')
|
|
@ -4,6 +4,7 @@ import store from '@/store';
|
||||||
import Items from './views/Items';
|
import Items from './views/Items';
|
||||||
import Boxes from './views/Boxes';
|
import Boxes from './views/Boxes';
|
||||||
import Files from './views/Files';
|
import Files from './views/Files';
|
||||||
|
import Error from './views/Error';
|
||||||
import HowTo from './views/HowTo';
|
import HowTo from './views/HowTo';
|
||||||
import Login from '@/views/Login.vue';
|
import Login from '@/views/Login.vue';
|
||||||
import Register from '@/views/Register.vue';
|
import Register from '@/views/Register.vue';
|
||||||
|
@ -13,8 +14,11 @@ import Ticket from "@/views/Ticket.vue";
|
||||||
import Admin from "@/views/admin/Admin.vue";
|
import Admin from "@/views/admin/Admin.vue";
|
||||||
import Empty from "@/views/Empty.vue";
|
import Empty from "@/views/Empty.vue";
|
||||||
import Events from "@/views/admin/Events.vue";
|
import Events from "@/views/admin/Events.vue";
|
||||||
|
import Settings from "@/views/admin/Settings.vue";
|
||||||
import AccessControl from "@/views/admin/AccessControl.vue";
|
import AccessControl from "@/views/admin/AccessControl.vue";
|
||||||
import {default as BoxesAdmin} from "@/views/admin/Boxes.vue"
|
import {default as BoxesAdmin} from "@/views/admin/Boxes.vue"
|
||||||
|
import Shipping from "@/views/admin/Shipping.vue";
|
||||||
|
import Notifications from "@/views/admin/Notifications.vue";
|
||||||
|
|
||||||
const routes = [
|
const routes = [
|
||||||
{path: '/', redirect: '/37C3/items', meta: {requiresAuth: false}},
|
{path: '/', redirect: '/37C3/items', meta: {requiresAuth: false}},
|
||||||
|
@ -57,6 +61,10 @@ const routes = [
|
||||||
path: 'events/', name: 'events', component: Events, meta:
|
path: 'events/', name: 'events', component: Events, meta:
|
||||||
{requiresAuth: true, requiresPermission: 'delete_event'}
|
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'settings/', name: 'settings', component: Settings, meta:
|
||||||
|
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: '', name: 'admin', component: Debug, meta:
|
path: '', name: 'admin', component: Debug, meta:
|
||||||
{requiresAuth: true, requiresPermission: 'delete_event'}
|
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||||
|
@ -69,9 +77,18 @@ const routes = [
|
||||||
path: 'boxes/', name: 'admin_boxes', component: BoxesAdmin, meta:
|
path: 'boxes/', name: 'admin_boxes', component: BoxesAdmin, meta:
|
||||||
{requiresAuth: true, requiresPermission: 'delete_event'}
|
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: 'shipping/', name: 'shipping', component: Shipping, meta:
|
||||||
|
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: 'notifications/', name: 'notifications', component: Notifications, meta:
|
||||||
|
{requiresAuth: true, requiresPermission: 'delete_event'}
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{path: '/user', name: 'user', component: Empty, meta: {requiresAuth: true}},
|
{path: '/user', name: 'user', component: Empty, meta: {requiresAuth: true}},
|
||||||
|
//{path: '*', component: Error},
|
||||||
];
|
];
|
||||||
|
|
||||||
const router = createRouter({
|
const router = createRouter({
|
||||||
|
@ -105,3 +122,4 @@ router.afterEach((to, from) => {
|
||||||
});
|
});
|
||||||
|
|
||||||
export default router;
|
export default router;
|
||||||
|
|
||||||
|
|
106
web/src/store.js
106
web/src/store.js
|
@ -6,7 +6,6 @@ import * as utf8 from 'utf8';
|
||||||
import {ticketStateColorLookup, ticketStateIconLookup, http} from "@/utils";
|
import {ticketStateColorLookup, ticketStateIconLookup, http} from "@/utils";
|
||||||
import sharedStatePlugin from "@/shared-state-plugin";
|
import sharedStatePlugin from "@/shared-state-plugin";
|
||||||
import persistentStatePlugin from "@/persistent-state-plugin";
|
import persistentStatePlugin from "@/persistent-state-plugin";
|
||||||
import {triggerRef} from "vue";
|
|
||||||
|
|
||||||
const store = createStore({
|
const store = createStore({
|
||||||
state: {
|
state: {
|
||||||
|
@ -20,6 +19,10 @@ const store = createStore({
|
||||||
users: [],
|
users: [],
|
||||||
groups: [],
|
groups: [],
|
||||||
state_options: [],
|
state_options: [],
|
||||||
|
messageTemplates: [],
|
||||||
|
messageTemplateVariables: [],
|
||||||
|
shippingVouchers: [],
|
||||||
|
|
||||||
lastEvent: '37C3',
|
lastEvent: '37C3',
|
||||||
lastUsed: {},
|
lastUsed: {},
|
||||||
remember: false,
|
remember: false,
|
||||||
|
@ -40,12 +43,24 @@ const store = createStore({
|
||||||
users: 0,
|
users: 0,
|
||||||
groups: 0,
|
groups: 0,
|
||||||
states: 0,
|
states: 0,
|
||||||
|
messageTemplates: 0,
|
||||||
|
shippingVouchers: 0,
|
||||||
},
|
},
|
||||||
persistent_loaded: false,
|
persistent_loaded: false,
|
||||||
shared_loaded: false,
|
shared_loaded: false,
|
||||||
afterInitHandlers: [],
|
afterInitHandlers: [],
|
||||||
|
|
||||||
showAddBoxModal: false,
|
showAddBoxModal: false,
|
||||||
|
test: ['foo', 'bar', 'baz'],
|
||||||
|
|
||||||
|
shippingVoucherTypes: {
|
||||||
|
'2kg-de': '2kg Paket (DE)',
|
||||||
|
'5kg-de': '5kg Paket (DE)',
|
||||||
|
'10kg-de': '10kg Paket (DE)',
|
||||||
|
'2kg-eu': '2kg Paket (EU)',
|
||||||
|
'5kg-eu': '5kg Paket (EU)',
|
||||||
|
'10kg-eu': '10kg Paket (EU)',
|
||||||
|
}
|
||||||
},
|
},
|
||||||
getters: {
|
getters: {
|
||||||
route: state => router.currentRoute.value,
|
route: state => router.currentRoute.value,
|
||||||
|
@ -75,6 +90,12 @@ const store = createStore({
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
availableShippingVoucherTypes: state => {
|
||||||
|
return Object.keys(state.shippingVoucherTypes).map(key => {
|
||||||
|
var count = state.shippingVouchers.filter(voucher => voucher.type === key && voucher.issue_thread === null).length;
|
||||||
|
return {id: key, count: count, name: state.shippingVoucherTypes[key]};
|
||||||
|
});
|
||||||
|
},
|
||||||
layout: (state, getters) => {
|
layout: (state, getters) => {
|
||||||
if (router.currentRoute.value.query.layout)
|
if (router.currentRoute.value.query.layout)
|
||||||
return router.currentRoute.value.query.layout;
|
return router.currentRoute.value.query.layout;
|
||||||
|
@ -139,7 +160,6 @@ const store = createStore({
|
||||||
updateTicket(state, updatedTicket) {
|
updateTicket(state, updatedTicket) {
|
||||||
const ticket = state.tickets.filter(({id}) => id === updatedTicket.id)[0];
|
const ticket = state.tickets.filter(({id}) => id === updatedTicket.id)[0];
|
||||||
Object.assign(ticket, updatedTicket);
|
Object.assign(ticket, updatedTicket);
|
||||||
//triggerRef(state.tickets);
|
|
||||||
state.tickets = [...state.tickets];
|
state.tickets = [...state.tickets];
|
||||||
},
|
},
|
||||||
replaceUsers(state, users) {
|
replaceUsers(state, users) {
|
||||||
|
@ -195,9 +215,23 @@ const store = createStore({
|
||||||
user.permissions = null;
|
user.permissions = null;
|
||||||
state.user = user;
|
state.user = user;
|
||||||
},
|
},
|
||||||
|
setTest(state, test) {
|
||||||
|
state.test = test;
|
||||||
|
},
|
||||||
setThumbnail(state, {url, data}) {
|
setThumbnail(state, {url, data}) {
|
||||||
state.thumbnailCache[url] = data;
|
state.thumbnailCache[url] = data;
|
||||||
},
|
},
|
||||||
|
setMessageTemplates(state, templates) {
|
||||||
|
state.messageTemplates = templates;
|
||||||
|
state.fetchedData = {...state.fetchedData, messageTemplates: Date.now()};
|
||||||
|
},
|
||||||
|
setMessageTemplateVariables(state, variables) {
|
||||||
|
state.messageTemplateVariables = variables;
|
||||||
|
},
|
||||||
|
setShippingVouchers(state, codes) {
|
||||||
|
state.shippingVouchers = codes;
|
||||||
|
state.fetchedData = {...state.fetchedData, shippingVouchers: Date.now()};
|
||||||
|
},
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
async login({commit}, {username, password, remember}) {
|
async login({commit}, {username, password, remember}) {
|
||||||
|
@ -412,6 +446,66 @@ const store = createStore({
|
||||||
async updateTicketPartial({commit, state}, {id, ...ticket}) {
|
async updateTicketPartial({commit, state}, {id, ...ticket}) {
|
||||||
const {data, success} = await http.patch(`/2/tickets/${id}/`, ticket, state.user.token);
|
const {data, success} = await http.patch(`/2/tickets/${id}/`, ticket, state.user.token);
|
||||||
commit('updateTicket', data);
|
commit('updateTicket', data);
|
||||||
|
},
|
||||||
|
async fetchMessageTemplates({commit, state}) {
|
||||||
|
if (!state.user.token) return;
|
||||||
|
if (state.messageTemplates.length > 0) return;
|
||||||
|
const {data, success} = await http.get('/2/message_templates/', state.user.token);
|
||||||
|
if (data && success) {
|
||||||
|
commit('setMessageTemplates', data);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async updateMessageTemplate({dispatch, state}, template) {
|
||||||
|
const {data, success} = await http.patch(`/2/message_templates/${template.id}/`,
|
||||||
|
{'message': template.message}, state.user.token);
|
||||||
|
if (data && success) {
|
||||||
|
state.fetchedData.messageTemplates = 0;
|
||||||
|
dispatch('fetchMessageTemplates');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async fetchMessageTemplateVariables({commit, state}) {
|
||||||
|
if (!state.user.token) return;
|
||||||
|
if (state.messageTemplateVariables.length > 0) return;
|
||||||
|
const {data, success} = await http.get('/2/message_template_variables/', state.user.token);
|
||||||
|
if (data && success) {
|
||||||
|
commit('setMessageTemplateVariables', data);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async createMessageTemplate({dispatch, state}, template_name) {
|
||||||
|
const {data, success} = await http.post('/2/message_templates/', {
|
||||||
|
name: template_name,
|
||||||
|
message: '-'
|
||||||
|
}, state.user.token);
|
||||||
|
if (data && success) {
|
||||||
|
dispatch('fetchMessageTemplates');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async fetchShippingVouchers({commit, state}) {
|
||||||
|
if (!state.user.token) return;
|
||||||
|
if (state.fetchedData.shippingVouchers > Date.now() - 1000 * 60 * 60 * 24) return;
|
||||||
|
const {data, success} = await http.get('/2/shipping_vouchers/', state.user.token);
|
||||||
|
if (data && success) {
|
||||||
|
commit('setShippingVouchers', data);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async createShippingVoucher({dispatch, state}, code) {
|
||||||
|
const {data, success} = await http.post('/2/shipping_vouchers/', code, state.user.token);
|
||||||
|
if (data && success) {
|
||||||
|
state.fetchedData.shippingVouchers = 0;
|
||||||
|
dispatch('fetchShippingVouchers');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
async claimShippingVoucher({dispatch, state}, {ticket, shipping_voucher_type}) {
|
||||||
|
const id = state.shippingVouchers.filter(voucher => voucher.type === shipping_voucher_type && voucher.issue_thread === null)[0].id;
|
||||||
|
const {
|
||||||
|
data,
|
||||||
|
success
|
||||||
|
} = await http.patch(`/2/shipping_vouchers/${id}/`, {issue_thread: ticket}, state.user.token);
|
||||||
|
if (data && success) {
|
||||||
|
state.fetchedData.shippingVouchers = 0;
|
||||||
|
state.fetchedData.tickets = 0;
|
||||||
|
await Promise.all([dispatch('loadTickets'), dispatch('fetchShippingVouchers')]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
|
@ -427,7 +521,7 @@ const store = createStore({
|
||||||
]
|
]
|
||||||
}),
|
}),
|
||||||
sharedStatePlugin({
|
sharedStatePlugin({
|
||||||
debug: true,
|
debug: false,
|
||||||
isLoadedKey: "shared_loaded",
|
isLoadedKey: "shared_loaded",
|
||||||
clearingMutation: "logout",
|
clearingMutation: "logout",
|
||||||
afterInit: "afterSharedInit",
|
afterInit: "afterSharedInit",
|
||||||
|
@ -440,6 +534,9 @@ const store = createStore({
|
||||||
"groups",
|
"groups",
|
||||||
"loadedBoxes",
|
"loadedBoxes",
|
||||||
"loadedItems",
|
"loadedItems",
|
||||||
|
"messageTemplates",
|
||||||
|
"messageTemplatesVariables",
|
||||||
|
"shippingVouchers",
|
||||||
],
|
],
|
||||||
watch: [
|
watch: [
|
||||||
"test",
|
"test",
|
||||||
|
@ -450,6 +547,9 @@ const store = createStore({
|
||||||
"groups",
|
"groups",
|
||||||
"loadedBoxes",
|
"loadedBoxes",
|
||||||
"loadedItems",
|
"loadedItems",
|
||||||
|
"messageTemplates",
|
||||||
|
"messageTemplatesVariables",
|
||||||
|
"shippingVouchers",
|
||||||
],
|
],
|
||||||
mutations: [
|
mutations: [
|
||||||
//"replaceTickets",
|
//"replaceTickets",
|
||||||
|
|
|
@ -23,13 +23,15 @@
|
||||||
>
|
>
|
||||||
<template #actions="{ item }">
|
<template #actions="{ item }">
|
||||||
<div class="btn-group">
|
<div class="btn-group">
|
||||||
<button class="btn btn-success" @click.stop="confirm('return Item?') && markItemReturned(item)" title="returned">
|
<button class="btn btn-success"
|
||||||
|
@click.stop="confirm('return Item?') && markItemReturned(item)" title="returned">
|
||||||
<font-awesome-icon icon="check"/>
|
<font-awesome-icon icon="check"/>
|
||||||
</button>
|
</button>
|
||||||
<button class="btn btn-secondary" @click.stop="openEditingModalWith(item)" title="edit">
|
<button class="btn btn-secondary" @click.stop="openEditingModalWith(item)" title="edit">
|
||||||
<font-awesome-icon icon="edit"/>
|
<font-awesome-icon icon="edit"/>
|
||||||
</button>
|
</button>
|
||||||
<button class="btn btn-danger" @click.stop="confirm('delete Item?') && deleteItem(item)" title="delete">
|
<button class="btn btn-danger" @click.stop="confirm('delete Item?') && deleteItem(item)"
|
||||||
|
title="delete">
|
||||||
<font-awesome-icon icon="trash"/>
|
<font-awesome-icon icon="trash"/>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -13,10 +13,6 @@
|
||||||
<font-awesome-icon icon="trash"/>
|
<font-awesome-icon icon="trash"/>
|
||||||
Delete
|
Delete
|
||||||
</button-->
|
</button-->
|
||||||
<ClipboardButton :payload="shippingEmail" class="btn btn-primary">
|
|
||||||
<font-awesome-icon icon="clipboard"/>
|
|
||||||
Copy DHL contact to clipboard
|
|
||||||
</ClipboardButton>
|
|
||||||
<div class="btn-group">
|
<div class="btn-group">
|
||||||
<select class="form-control" v-model="ticket.assigned_to">
|
<select class="form-control" v-model="ticket.assigned_to">
|
||||||
<option v-for="user in users" :value="user.username">{{ user.username }}</option>
|
<option v-for="user in users" :value="user.username">{{ user.username }}</option>
|
||||||
|
@ -34,6 +30,24 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="card-footer d-flex justify-content-between">
|
||||||
|
<ClipboardButton :payload="shippingEmail" class="btn btn-primary">
|
||||||
|
<font-awesome-icon icon="clipboard"/>
|
||||||
|
Copy DHL contact to clipboard
|
||||||
|
</ClipboardButton>
|
||||||
|
<div class="btn-group">
|
||||||
|
<select class="form-control" v-model="shipping_voucher_type">
|
||||||
|
<option v-for="type in availableShippingVoucherTypes.filter(t=>t.count>0)"
|
||||||
|
:value="type.id">{{ type.name }}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<button class="form-control btn btn-success"
|
||||||
|
@click="claimShippingVoucher({ticket: ticket.id, shipping_voucher_type}).then(()=>shipping_voucher_type=null)"
|
||||||
|
:disabled="!shipping_voucher_type">
|
||||||
|
Claim Shipping Voucher
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -41,15 +55,21 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {mapActions, mapState} from 'vuex';
|
import {mapActions, mapGetters, mapState} from 'vuex';
|
||||||
import Timeline from "@/components/Timeline.vue";
|
import Timeline from "@/components/Timeline.vue";
|
||||||
import ClipboardButton from "@/components/inputs/ClipboardButton.vue";
|
import ClipboardButton from "@/components/inputs/ClipboardButton.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Ticket',
|
name: 'Ticket',
|
||||||
components: {ClipboardButton, Timeline},
|
components: {ClipboardButton, Timeline},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
shipping_voucher_type: null
|
||||||
|
}
|
||||||
|
},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState(['tickets', 'state_options', 'users']),
|
...mapState(['tickets', 'state_options', 'users']),
|
||||||
|
...mapGetters(['availableShippingVoucherTypes']),
|
||||||
ticket() {
|
ticket() {
|
||||||
const id = parseInt(this.$route.params.id)
|
const id = parseInt(this.$route.params.id)
|
||||||
const ret = this.tickets.find(ticket => ticket.id === id);
|
const ret = this.tickets.find(ticket => ticket.id === id);
|
||||||
|
@ -63,6 +83,7 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['deleteItem', 'markItemReturned', 'sendMail', 'updateTicketPartial', 'postComment']),
|
...mapActions(['deleteItem', 'markItemReturned', 'sendMail', 'updateTicketPartial', 'postComment']),
|
||||||
...mapActions(['loadTickets', 'fetchTicketStates', 'loadUsers', 'scheduleAfterInit']),
|
...mapActions(['loadTickets', 'fetchTicketStates', 'loadUsers', 'scheduleAfterInit']),
|
||||||
|
...mapActions(['claimShippingVoucher']),
|
||||||
handleMail(mail) {
|
handleMail(mail) {
|
||||||
this.sendMail({
|
this.sendMail({
|
||||||
id: this.ticket.id,
|
id: this.ticket.id,
|
||||||
|
|
|
@ -2,13 +2,13 @@
|
||||||
<div class="container-fluid px-xl-5 mt-3">
|
<div class="container-fluid px-xl-5 mt-3">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-xl-8 offset-xl-2">
|
<div class="col-xl-8 offset-xl-2">
|
||||||
<Table
|
<SlotTable
|
||||||
:columns="['id', 'name', 'state', 'last_activity', 'assigned_to']"
|
:columns="['id', 'name', 'state', 'last_activity', 'assigned_to', 'actions', 'actions2']"
|
||||||
:items="tickets"
|
:items="tickets.map(formatTicket)"
|
||||||
:keyName="'id'"
|
:keyName="'id'"
|
||||||
v-if="layout === 'table'"
|
v-if="layout === 'table'"
|
||||||
>
|
>
|
||||||
<template #actions="{ item }">
|
<template v-slot:actions="{item}">
|
||||||
<div class="btn-group">
|
<div class="btn-group">
|
||||||
<a class="btn btn-primary" :href="'/'+ getEventSlug + '/ticket/' + item.id" title="view"
|
<a class="btn btn-primary" :href="'/'+ getEventSlug + '/ticket/' + item.id" title="view"
|
||||||
@click.prevent="gotoDetail(item)">
|
@click.prevent="gotoDetail(item)">
|
||||||
|
@ -17,7 +17,7 @@
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</Table>
|
</SlotTable>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<CollapsableCards v-if="layout === 'tasks'" :items="tickets"
|
<CollapsableCards v-if="layout === 'tasks'" :items="tickets"
|
||||||
|
@ -54,12 +54,12 @@ import Modal from '@/components/Modal';
|
||||||
import EditItem from '@/components/EditItem';
|
import EditItem from '@/components/EditItem';
|
||||||
import {mapActions, mapGetters, mapState} from 'vuex';
|
import {mapActions, mapGetters, mapState} from 'vuex';
|
||||||
import Lightbox from '../components/Lightbox';
|
import Lightbox from '../components/Lightbox';
|
||||||
import Table from '@/components/Table';
|
import SlotTable from "@/components/SlotTable.vue";
|
||||||
import CollapsableCards from "@/components/CollapsableCards.vue";
|
import CollapsableCards from "@/components/CollapsableCards.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Tickets',
|
name: 'Tickets',
|
||||||
components: {Lightbox, Table, Cards, Modal, EditItem, CollapsableCards},
|
components: {Lightbox, SlotTable, Cards, Modal, EditItem, CollapsableCards},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState(['tickets']),
|
...mapState(['tickets']),
|
||||||
...mapGetters(['stateInfo', 'getEventSlug', 'layout']),
|
...mapGetters(['stateInfo', 'getEventSlug', 'layout']),
|
||||||
|
|
|
@ -8,9 +8,18 @@
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<router-link class="nav-link" :to="{name: 'admin'}" active-class="dummy" exact-active-class="active">Dashboard</router-link>
|
<router-link class="nav-link" :to="{name: 'admin'}" active-class="dummy" exact-active-class="active">Dashboard</router-link>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<router-link class="nav-link" :to="{name: 'settings'}" active-class="active">Settings</router-link>
|
||||||
|
</li>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<router-link class="nav-link" :to="{name: 'events'}" active-class="active">Events</router-link>
|
<router-link class="nav-link" :to="{name: 'events'}" active-class="active">Events</router-link>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<router-link class="nav-link" :to="{name: 'notifications'}" active-class="active">Notifications</router-link>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<router-link class="nav-link" :to="{name: 'shipping'}" active-class="active">Shipping</router-link>
|
||||||
|
</li>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<router-link class="nav-link" :to="{name: 'admin_boxes'}" active-class="active">Boxes</router-link>
|
<router-link class="nav-link" :to="{name: 'admin_boxes'}" active-class="active">Boxes</router-link>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -1,39 +1,54 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<!--qr-code :text="qr_url" color="#000" bg-color="#fff" error-level="H" class="qr-code"></qr-code-->
|
<div>
|
||||||
<h3 class="text-center">Events</h3>
|
<ul>
|
||||||
<!--p>{{ events }}</p-->
|
<li>
|
||||||
<ul>
|
<button class="btn btn-primary" @click="addTest('test')">+</button>
|
||||||
<li v-for="event in events" :key="event.id">
|
</li>
|
||||||
{{ event.slug }}
|
<li v-for="(t, index) in test" :key="index">
|
||||||
</li>
|
{{ t }}
|
||||||
</ul>
|
<button class="btn btn-link" @click="removeTest(index)">-</button>
|
||||||
<h3 class="text-center">Items</h3>
|
</li>
|
||||||
<!--p>{{ loadedItems }}</p-->
|
</ul>
|
||||||
<ul>
|
</div>
|
||||||
<li v-for="item in loadedItems" :key="item.id">
|
<vue-qrcode :value="qr_url" tag="svg" :size="200" :options="{errorCorrectionLevel: 'H'}"></vue-qrcode>
|
||||||
{{ item.description }}
|
<!--qr-code :text="" color="#000" bg-color="#fff" error-level="H" ></qr-code-->
|
||||||
</li>
|
<h3 class="text-center">Events</h3>
|
||||||
</ul>
|
<!--p>{{ events }}</p-->
|
||||||
<h3 class="text-center">Boxes</h3>
|
<span>{{ events.length }} loaded events</span>
|
||||||
<!--p>{{ loadedBoxes }}</p-->
|
<ul class="hidden">
|
||||||
<ul>
|
<li v-for="event in events" :key="event.id">
|
||||||
<li v-for="box in loadedBoxes" :key="box.id">
|
{{ event.slug }}
|
||||||
{{ box.name }}
|
</li>
|
||||||
</li>
|
</ul>
|
||||||
</ul>
|
<h3 class="text-center">Items</h3>
|
||||||
<h3 class="text-center">Issues</h3>
|
<!--p>{{ loadedItems }}</p-->
|
||||||
<!--p>{{ issues }}</p-->
|
<span>{{ loadedItems.length }} loaded items</span>
|
||||||
<ul>
|
<ul class="hidden">
|
||||||
<li v-for="issue in tickets" :key="issue.id">
|
<li v-for="item in loadedItems" :key="item.id">
|
||||||
{{ issue.id }}
|
{{ item.description }}
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
<h3 class="text-center">Boxes</h3>
|
||||||
|
<!--p>{{ loadedBoxes }}</p-->
|
||||||
|
<span>{{ loadedBoxes.length }} loaded boxes</span>
|
||||||
|
<ul class="hidden">
|
||||||
|
<li v-for="box in loadedBoxes" :key="box.id">
|
||||||
|
{{ box.name }}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<h3 class="text-center">Issues</h3>
|
||||||
|
<!--p>{{ issues }}</p-->
|
||||||
|
<ul>
|
||||||
|
<li v-for="issue in tickets" :key="issue.id">
|
||||||
|
{{ issue.id }}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {mapActions, mapState} from 'vuex';
|
import {mapActions, mapMutations, mapState} from 'vuex';
|
||||||
import Table from '@/components/Table';
|
import Table from '@/components/Table';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
@ -41,6 +56,8 @@ export default {
|
||||||
components: {Table},
|
components: {Table},
|
||||||
computed: {
|
computed: {
|
||||||
...mapState(['events', 'loadedItems', 'loadedBoxes', 'tickets']),
|
...mapState(['events', 'loadedItems', 'loadedBoxes', 'tickets']),
|
||||||
|
...mapState(['events', 'loadedItems', 'loadedBoxes']),//, 'mails', 'issues', 'systemEvents']),
|
||||||
|
...mapState(['test']),
|
||||||
qr_url() {
|
qr_url() {
|
||||||
return window.location.href;
|
return window.location.href;
|
||||||
}
|
}
|
||||||
|
@ -48,6 +65,17 @@ export default {
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['changeEvent', 'loadTickets']),
|
...mapActions(['changeEvent', 'loadTickets']),
|
||||||
|
|
||||||
|
...mapActions(['changeEvent']),//, 'loadMails', 'loadIssues', 'loadSystemEvents']),
|
||||||
|
...mapMutations(['setTest']),
|
||||||
|
addTest(test) {
|
||||||
|
const tests = [...this.test, test];
|
||||||
|
this.setTest(tests);
|
||||||
|
},
|
||||||
|
removeTest(index) {
|
||||||
|
const tests = [...this.test];
|
||||||
|
tests.splice(index, 1);
|
||||||
|
this.setTest(tests);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
this.loadTickets();
|
this.loadTickets();
|
||||||
|
@ -56,7 +84,4 @@ export default {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.qr-code img {
|
|
||||||
border: #fff solid 7px
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
36
web/src/views/admin/Notifications.vue
Normal file
36
web/src/views/admin/Notifications.vue
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
<template>
|
||||||
|
<Table
|
||||||
|
:columns="['slug', 'name']"
|
||||||
|
:items="events"
|
||||||
|
:keyName="'slug'"
|
||||||
|
>
|
||||||
|
<template #actions="{ item }">
|
||||||
|
<div class="btn-group">
|
||||||
|
<button class="btn btn-secondary" @click.stop="changeEvent(item)">
|
||||||
|
<font-awesome-icon icon="archive"/>
|
||||||
|
use
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-danger" @click.stop="">
|
||||||
|
<font-awesome-icon icon="trash"/>
|
||||||
|
delete
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
</Table>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {mapActions, mapState} from 'vuex';
|
||||||
|
import Table from '@/components/Table';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'Notifications',
|
||||||
|
components: {Table},
|
||||||
|
computed: mapState(['events']),
|
||||||
|
methods: mapActions(['changeEvent']),
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
|
||||||
|
</style>
|
109
web/src/views/admin/Settings.vue
Normal file
109
web/src/views/admin/Settings.vue
Normal file
|
@ -0,0 +1,109 @@
|
||||||
|
<template>
|
||||||
|
<h3 class="text-center">Available Message Template Variables</h3>
|
||||||
|
<p>
|
||||||
|
<span v-for="(variable, key) in messageTemplateVariables" :key="key" class="badge badge-primary"
|
||||||
|
style="margin: 5px;">
|
||||||
|
{{ variable }}
|
||||||
|
</span>
|
||||||
|
</p>
|
||||||
|
<h3 class="text-center">Message Templates</h3>
|
||||||
|
<div v-for="template in messageTemplatesIntermediate" :key="template.id" class="card bg-dark"
|
||||||
|
style="margin-bottom: 10px;">
|
||||||
|
<div class="card-header">{{ template.name }}</div>
|
||||||
|
<FormatedText :value="template.message" :format="formatText" class="card-body"
|
||||||
|
@input="changeMessageTemplate(template.id, $event)"/>
|
||||||
|
<div class="card-body">
|
||||||
|
<button class="btn btn-primary" @click="resetMessageTemplate(template.id)"
|
||||||
|
:disabled="messageTemplates.find(t => t.id === template.id).message === template.message">Reset
|
||||||
|
</button>
|
||||||
|
<button class="btn btn-success" @click="saveMessageTemplate(template.id)"
|
||||||
|
:disabled="messageTemplates.find(t => t.id === template.id).message === template.message">Save
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="card bg-dark">
|
||||||
|
<div class="card-body">
|
||||||
|
<div class="input-group">
|
||||||
|
<input type="text" class="form-control" v-model="newTemplateName" placeholder="New Template Name">
|
||||||
|
<button class="btn btn-success input-group-btn" @click="createMessageTemplateAndReset()"
|
||||||
|
ref="createButton">Create
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {mapActions, mapState} from 'vuex';
|
||||||
|
import Table from '@/components/Table';
|
||||||
|
import FormatedText from "@/components/inputs/FormatedText.vue";
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'Settings',
|
||||||
|
components: {FormatedText, Table},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
messageTemplatesIntermediate: [],
|
||||||
|
newTemplateName: '',
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: mapState(['messageTemplates', 'messageTemplateVariables']),
|
||||||
|
methods: {
|
||||||
|
...mapActions(['fetchMessageTemplates', 'fetchMessageTemplateVariables', 'updateMessageTemplate', 'createMessageTemplate']),
|
||||||
|
formatText(value) {
|
||||||
|
return value.replace(/{{(.+?)}}/g, (match, key) => {
|
||||||
|
return `<span class="text-primary">{{${key}}}</span>`;
|
||||||
|
}).replace(/\n/g, '<br>').replace(/\t/g, ' ');
|
||||||
|
},
|
||||||
|
changeMessageTemplate(id, message) {
|
||||||
|
console.log(id, message);
|
||||||
|
this.messageTemplatesIntermediate.forEach(template => {
|
||||||
|
if (template.id === id) {
|
||||||
|
template.message = message;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
saveMessageTemplate(id) {
|
||||||
|
this.updateMessageTemplate(this.messageTemplatesIntermediate.find(template => template.id === id));
|
||||||
|
},
|
||||||
|
resetMessageTemplate(id) {
|
||||||
|
this.messageTemplatesIntermediate.find(template => template.id === id).message =
|
||||||
|
this.messageTemplates.find(template => template.id === id).message;
|
||||||
|
},
|
||||||
|
async createMessageTemplateAndReset() {
|
||||||
|
this.$refs.createButton.disabled = true;
|
||||||
|
await this.createMessageTemplate(this.newTemplateName);
|
||||||
|
this.newTemplateName = '';
|
||||||
|
this.$refs.createButton.disabled = false;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.fetchMessageTemplates().then(() => {
|
||||||
|
this.messageTemplatesIntermediate = JSON.parse(JSON.stringify(this.messageTemplates));
|
||||||
|
});
|
||||||
|
this.fetchMessageTemplateVariables();
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
messageTemplates() {
|
||||||
|
for (const template of this.messageTemplates) {
|
||||||
|
if (!this.messageTemplatesIntermediate.find(t => t.id === template.id)) {
|
||||||
|
this.messageTemplatesIntermediate.push(JSON.parse(JSON.stringify(template)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (const template of this.messageTemplatesIntermediate) {
|
||||||
|
if (!this.messageTemplates.find(t => t.id === template.id)) {
|
||||||
|
this.messageTemplatesIntermediate = this.messageTemplatesIntermediate.filter(t => t.id !== template.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
pre {
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-wrap: break-word;
|
||||||
|
color: inherit;
|
||||||
|
}
|
||||||
|
</style>
|
99
web/src/views/admin/Shipping.vue
Normal file
99
web/src/views/admin/Shipping.vue
Normal file
|
@ -0,0 +1,99 @@
|
||||||
|
<template>
|
||||||
|
<div>
|
||||||
|
<h3>Shipping Vouchers</h3>
|
||||||
|
<div class="mt-3">
|
||||||
|
<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 }}
|
||||||
|
</span>
|
||||||
|
<span v-else class="badge badge-danger">{{ type.name }}</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="mt-3">
|
||||||
|
<h5>Available Shipping Vouchers</h5>
|
||||||
|
<ul>
|
||||||
|
<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
|
||||||
|
<router-link :to="'/'+ getEventSlug + '/ticket/' + voucher.issue_thread">#{{
|
||||||
|
voucher.issue_thread
|
||||||
|
}}</router-link></span>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
<div class="mt-3">
|
||||||
|
<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 Voucher" v-model="voucher" v-if="!bulk">
|
||||||
|
<select class="form-control" v-model="type">
|
||||||
|
<option v-for="it in Object.keys(shippingVoucherTypes)" :value="it">{{
|
||||||
|
shippingVoucherTypes[it]
|
||||||
|
}}
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<div class="input-group-prepend">
|
||||||
|
<div class="input-group-text">
|
||||||
|
<input type="checkbox" v-model="bulk" class="mr-2" id="bulk" style="margin: 0;">
|
||||||
|
<label for="bulk" style="margin: 0;">Bulk</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<button class="btn btn-primary form-control" @click="createSingleOrBulkShippingVoucher">
|
||||||
|
<font-awesome-icon icon="plus"/>
|
||||||
|
{{ (bulk ? "Add Shipping Vouchers" : "Add Shipping Voucher") }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
import {mapActions, mapGetters, mapState} from 'vuex';
|
||||||
|
import Table from '@/components/Table';
|
||||||
|
|
||||||
|
export default {
|
||||||
|
name: 'Shipping',
|
||||||
|
components: {Table},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
voucher: '',
|
||||||
|
bulk_vouchers: '',
|
||||||
|
type: '2kg-eu',
|
||||||
|
bulk: false,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
computed: {
|
||||||
|
...mapState(['shippingVouchers', 'shippingVoucherTypes']),
|
||||||
|
...mapGetters(['getEventSlug', 'availableShippingVoucherTypes']),
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
...mapActions(['fetchShippingVouchers', 'createShippingVoucher']),
|
||||||
|
createSingleOrBulkShippingVoucher() {
|
||||||
|
if (this.bulk) {
|
||||||
|
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_vouchers = '';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
this.createShippingVoucher({voucher: this.voucher, type: this.type}).then(() => {
|
||||||
|
this.voucher = '';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
this.fetchShippingVouchers();
|
||||||
|
},
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
|
||||||
|
</style>
|
1
web/vendor/vuex-router-sync
vendored
Submodule
1
web/vendor/vuex-router-sync
vendored
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 7b8bdeec5e3127c7877842193253ac234487d097
|
Loading…
Reference in a new issue