added user into transaction list

This commit is contained in:
Čarodej
2021-11-24 17:13:12 +01:00
parent 8ff3b408cc
commit be04715f8b
3 changed files with 67 additions and 25 deletions

View File

@@ -10,16 +10,7 @@
>
<template slot-scope="{ row }">
<tr style="border-bottom: 1px dashed #f3f3f3;">
<td class="py-3">
<!--Todo: refactor this component-->
<DatatableCellImage
:member="row.data.relationships.user"
:title="row.data.relationships.user.data.attributes.name"
:description="row.data.relationships.user.data.attributes.email"
/>
</td>
<td class="py-4">
<td class="py-5">
<span class="text-sm font-bold">
{{ row.data.attributes.plan_name }}
</span>
@@ -39,6 +30,23 @@
{{ row.data.attributes.created_at }}
</span>
</td>
<td>
<div class="flex items-center">
<MemberAvatar
:is-border="false"
:size="36"
:member="row.data.relationships.user"
/>
<div class="ml-3">
<b class="text-sm font-bold block max-w-1 overflow-hidden overflow-ellipsis whitespace-nowrap" style="max-width: 155px;">
{{ row.data.relationships.user.data.attributes.name }}
</b>
<span class="block text-xs dark:text-gray-500 text-gray-600">
{{ row.data.relationships.user.data.attributes.email }}
</span>
</div>
</div>
</td>
<td class="text-right">
<span class="text-sm font-bold w-full">
{{ row.data.attributes.driver }}
@@ -78,6 +86,7 @@
</template>
<script>
import MemberAvatar from "../../components/FilesView/MemberAvatar";
import PageTab from "../../components/Others/Layout/PageTab";
import DatatableCellImage from '/resources/js/components/Others/Tables/DatatableCellImage'
import DatatableWrapper from '/resources/js/components/Others/Tables/DatatableWrapper'
@@ -97,6 +106,7 @@
export default {
name: 'Invoices',
components: {
MemberAvatar,
DatatableCellImage,
MobileActionButton,
ExternalLinkIcon,
@@ -121,11 +131,6 @@
isLoading: true,
invoices: [],
columns: [
{
label: this.$t('User'),
field: 'user',
sortable: true
},
{
label: this.$t('Plan'),
field: 'plan_name',
@@ -146,6 +151,11 @@
field: 'created_at',
sortable: true
},
{
label: this.$t('User'),
field: 'user',
sortable: true
},
{
label: this.$t('Service'),
sortable: true

View File

@@ -13,13 +13,23 @@
<template slot-scope="{ row }">
<tr style="border-bottom: 1px dashed #f3f3f3;">
<td class="py-3">
<router-link :to="{name: 'UserDetail', params: {id: row.data.id}}">
<DatatableCellImage
:member="row"
:title="row.data.relationships.settings.data.attributes.name"
:description="row.data.attributes.email"
/>
</router-link>
<router-link :to="{name: 'UserDetail', params: {id: row.data.id}}">
<div class="flex items-center">
<MemberAvatar
:is-border="false"
:size="44"
:member="row.data.relationships.settings"
/>
<div class="ml-3">
<b class="text-sm font-bold block max-w-1 overflow-hidden overflow-ellipsis whitespace-nowrap" style="max-width: 155px;">
{{ row.data.relationships.settings.data.attributes.name }}
</b>
<span class="block text-xs dark:text-gray-500 text-gray-600">
{{ row.data.attributes.email }}
</span>
</div>
</div>
</router-link>
</td>
<td>
<ColorLabel :color="getRoleColor(row.data.attributes.role)">
@@ -76,6 +86,7 @@
</template>
<script>
import MemberAvatar from "../../components/FilesView/MemberAvatar";
import DatatableCellImage from '/resources/js/components/Others/Tables/DatatableCellImage'
import DatatableWrapper from '/resources/js/components/Others/Tables/DatatableWrapper'
import MobileActionButton from '/resources/js/components/FilesView/MobileActionButton'
@@ -95,6 +106,7 @@
DatatableCellImage,
MobileActionButton,
DatatableWrapper,
MemberAvatar,
SectionTitle,
MobileHeader,
Trash2Icon,