frontend & backend update

This commit is contained in:
carodej
2020-06-22 16:46:02 +02:00
parent a2cab6198e
commit a2dfc627a7
35 changed files with 595 additions and 1080 deletions
+8 -5
View File
@@ -9,18 +9,18 @@
<template scope="{ row }">
<tr>
<td>
<a :href="'/invoice/' + row.data.attributes.token" target="_blank" class="cell-item">
<a :href="'/invoice/' + row.data.id" target="_blank" class="cell-item">
{{ row.data.attributes.order }}
</a>
</td>
<td>
<span class="cell-item">
${{ row.data.attributes.total }}
{{ row.data.attributes.total }}
</span>
</td>
<td>
<span class="cell-item">
{{ row.data.attributes.bag[0].description }}
{{ row.data.attributes.bag.description }}
</span>
</td>
<td>
@@ -29,17 +29,20 @@
</span>
</td>
<td>
<router-link :to="{name: 'UserInvoices', params: {id: row.relationships.user.data.id}}">
<router-link v-if="row.relationships" :to="{name: 'UserInvoices', params: {id: row.relationships.user.data.id}}">
<DatatableCellImage
image-size="small"
:image="row.relationships.user.data.attributes.avatar"
:title="row.relationships.user.data.attributes.name"
/>
</router-link>
<span v-else class="cell-item">
-
</span>
</td>
<td>
<div class="action-icons">
<a :href="'/invoice/' + row.data.attributes.token" target="_blank">
<a :href="'/invoice/' + row.data.id" target="_blank">
<external-link-icon size="15" class="icon"></external-link-icon>
</a>
</div>
@@ -72,7 +72,7 @@
this.isSendingRequest = true
axios
.delete(this.$store.getters.api + '/plans/' + this.$route.params.id + '/delete',
.delete(this.$store.getters.api + '/plans/' + this.$route.params.id,
{
data: {
name: this.planName
@@ -82,11 +82,11 @@
.then(() => {
this.isSendingRequest = false
// Show error message
// Show message
events.$emit('success:open', {
emoji: '👍',
title: this.$t('popup_deleted_user.title'),
message: this.$t('popup_deleted_user.message'),
title: 'Plan was deleted',
message: 'Your plan was successfully deleted.',
})
this.$router.push({name: 'Plans'})
@@ -1,22 +1,22 @@
<template>
<PageTab v-if="invoices">
<PageTabGroup v-if="invoices.length > 0">
<PageTab :is-loading="isLoading">
<PageTabGroup v-if="invoices && invoices.length > 0">
<DatatableWrapper :paginator="true" :columns="columns" :data="invoices" class="table">
<template scope="{ row }">
<tr>
<td>
<a :href="'/invoice/' + row.data.attributes.token" target="_blank" class="cell-item">
<a :href="'/invoice/' + row.data.id" target="_blank" class="cell-item">
{{ row.data.attributes.order }}
</a>
</td>
<td>
<span class="cell-item">
${{ row.data.attributes.total }}
{{ row.data.attributes.total }}
</span>
</td>
<td>
<span class="cell-item">
{{ row.data.attributes.bag[0].description }}
{{ row.data.attributes.bag.description }}
</span>
</td>
<td>
@@ -26,7 +26,7 @@
</td>
<td>
<div class="action-icons">
<a :href="'/invoice/' + row.data.attributes.token" target="_blank">
<a :href="'/invoice/' + row.data.id" target="_blank">
<external-link-icon size="15" class="icon"></external-link-icon>
</a>
</div>
@@ -2,7 +2,7 @@
<PageTab v-if="storage">
<PageTabGroup>
<SetupBox
v-if="! config.isSaaS || ! user.relationships.subscription"
v-if="! config.isSaaS || ! user.data.attributes.subscription"
theme="base"
:title="$t('user_box_storage.title')"
:description="$t('user_box_storage.description')"
@@ -1,5 +1,5 @@
<template>
<PageTab>
<PageTab :is-loading="isLoading">
<PageTabGroup v-if="subscription">
<!--Info about active subscription-->
@@ -65,6 +65,7 @@
data() {
return {
subscription: undefined,
isLoading: true,
}
},
created() {