c3lf/c3lf-system-3
9
0
Fork 0
Code Issues 55 Pull requests Projects 2 Releases Wiki Activity Actions

stash

Browse source
This commit is contained in:
j3d1 2024-06-18 14:15:29 +02:00
parent 4affc9e8b9
commit 20a1ba8d9d
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/tickets/tests/v2/test_shipping_codes.py
View file

@ -4,7 +4,7 @@ from django.test import TestCase, Client
from authentication.models import ExtendedUser from authentication.models import ExtendedUser
from mail.models import Email, EmailAttachment from mail.models import Email, EmailAttachment
from tickets.models import IssueThread, StateChange, Comment from tickets.models import IssueThread, StateChange, Comment, ShippingCode
from django.contrib.auth.models import Permission from django.contrib.auth.models import Permission
from knox.models import AuthToken from knox.models import AuthToken
@ -24,8 +24,17 @@ class ShippingCodeApiTest(TestCase):
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertEqual(response.json(), []) self.assertEqual(response.json(), [])
def test_issues_list(self):
ShippingCode.objects.create(code='1234', type='2kg-eu')
response = self.client.get('/api/2/shipping_codes/')
self.assertEqual(response.status_code, 200)
self.assertEqual(response.json()[0]['code'], '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): def test_issues_create(self):
response = self.client.post('/api/2/shipping_codes/', {'code': '1234'}) response = self.client.post('/api/2/shipping_codes/', {'code': '1234', 'type': '2kg-eu'})
self.assertEqual(response.status_code, 201) self.assertEqual(response.status_code, 201)
self.assertEqual(response.json()['code'], '1234') self.assertEqual(response.json()['code'], '1234')
self.assertEqual(response.json()['used_at'], None) self.assertEqual(response.json()['used_at'], None)

19
web/src/store.js
View file

@ -448,12 +448,11 @@ const store = createStore({
commit('setMessageTemplates', data); commit('setMessageTemplates', data);
} }
}, },
async updateMessageTemplate({commit, state}, template) { async updateMessageTemplate({dispatch, state}, template) {
const {data, success} = await http.patch(`/2/message_templates/${template.id}/`, const {data, success} = await http.patch(`/2/message_templates/${template.id}/`,
{'message': template.message}, state.user.token); {'message': template.message}, state.user.token);
const {data: newTemplates, success: newSuccess} = await http.get('/2/message_templates/', state.user.token);
if (data && success) { if (data && success) {
commit('setMessageTemplates', data); dispatch('fetchMessageTemplates');
} }
}, },
async fetchMessageTemplateVariables({commit, state}) { async fetchMessageTemplateVariables({commit, state}) {
@ -462,11 +461,13 @@ const store = createStore({
commit('setMessageTemplateVariables', data); commit('setMessageTemplateVariables', data);
} }
}, },
async createMessageTemplate({commit, state}, template_name) { async createMessageTemplate({dispatch, state}, template_name) {
const {data, success} = await http.post('/2/message_templates/', {name: template_name, message: '-'}, state.user.token); const {data, success} = await http.post('/2/message_templates/', {
const {data: newTemplates, success: newSuccess} = await http.get('/2/message_templates/', state.user.token); name: template_name,
message: '-'
}, state.user.token);
if (data && success) { if (data && success) {
commit('setMessageTemplates', data); dispatch('fetchMessageTemplates');
} }
}, },
async fetchShippingVouchers({commit, state}) { async fetchShippingVouchers({commit, state}) {
@ -496,10 +497,10 @@ const store = createStore({
await Promise.all([dispatch('loadTickets'), dispatch('fetchShippingVouchers')]); await Promise.all([dispatch('loadTickets'), dispatch('fetchShippingVouchers')]);
} }
}, },
async createShippingCode({commit, state}, code) { async createShippingCode({dispatch, state}, code) {
const {data, success} = await http.post('/2/shipping_codes/', code, state.user.token); const {data, success} = await http.post('/2/shipping_codes/', code, state.user.token);
if (data && success) { if (data && success) {
commit('setShippingCodes', data); dispatch('fetchShippingCodes');
} }
} }
}, },