- balance implementation

- invoice refactoring
This commit is contained in:
Čarodej
2021-12-15 11:24:41 +01:00
parent 6cb3503870
commit b368d56bbc
14 changed files with 197 additions and 150 deletions
+33 -8
View File
@@ -11,8 +11,8 @@
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~673d1ac3.js?id=7b94fd0c332ed326530d",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/settin~97130d1f.js?id=e2d818009a4e2c1fffdf",
"/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js": "/chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunks/shared~1bec6fe4.js?id=510e6c1b1017a73a40a6",
"/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=86fe6adc24fde93f5c4a",
"/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=2c77195288f4631c9003",
"/chunks/admin~chunks/platform.js": "/chunks/admin~chunks/platform.js?id=917aab9de16d3eb7039a",
"/chunks/admin~chunks/platform~chunks/settings.js": "/chunks/admin~chunks/platform~chunks/settings.js?id=aa33127e176333acfb68",
"/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.js?id=8e89d2271b17b2d78177",
"/chunks/admin~chunks/platform~chunks/shared.js": "/chunks/admin~chunks/platform~chunks/shared.js?id=0d6c4be667e46ea1303e",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=6035ca411b2c4239d964",
@@ -67,14 +67,14 @@
"/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=11a027aca50aa90afb77",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=f8b2619e393a5823bf29",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=2716127ee2f945a90c0e",
"/chunks/settings.js": "/chunks/settings.js?id=0d1ba874378d01eff0e2",
"/chunks/settings.js": "/chunks/settings.js?id=783e0ddb413217a022e5",
"/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=d3443e79b667f5b4b1d2",
"/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=c29a32cbe845039e376f",
"/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=56f3c814aefb783ceb2a",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=fc95bc9d31d3e9ee0442",
"/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=093cc2fd918ee6a340d3",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=df343d15bec5a0fbd1bb",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=75172fe522988795ec59",
"/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.js": "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.js?id=147afaac8c8bacfe6433",
"/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=210b6b5d8febb39f76b0",
"/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=1c39345122bbf945f055",
"/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=c33cd2341b9b04a732e5",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5",
"/chunks/shared.js": "/chunks/shared.js?id=6230d050545cd1bd9b87",
@@ -101,7 +101,7 @@
"/chunks/user-detail.js": "/chunks/user-detail.js?id=a55ae1a545a65b92511d",
"/chunks/user-invoices.js": "/chunks/user-invoices.js?id=8813b138d1296673a27d",
"/chunks/user-password.js": "/chunks/user-password.js?id=ce6c12a5b038f5481bd1",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=a915de897147d9efde5b",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=a535f6f5cce3d5a4e569",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=82038ce92ca5e1c9ae05",
"/chunks/users.js": "/chunks/users.js?id=2ed4763745592f464cc2",
"/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~35bc7519.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~35bc7519.js?id=ae06aafc3749254fe4aa",
@@ -1227,5 +1227,30 @@
"/chunks/settings-subscription.992b3eedd8e52eb0e481.hot-update.js": "/chunks/settings-subscription.992b3eedd8e52eb0e481.hot-update.js",
"/chunks/settings-subscription.06e847acfdba66cbfee3.hot-update.js": "/chunks/settings-subscription.06e847acfdba66cbfee3.hot-update.js",
"/chunks/settings-subscription.d367012eef304bbc662b.hot-update.js": "/chunks/settings-subscription.d367012eef304bbc662b.hot-update.js",
"/chunks/settings-subscription.03fd85b26f7dd566a0ca.hot-update.js": "/chunks/settings-subscription.03fd85b26f7dd566a0ca.hot-update.js"
"/chunks/settings-subscription.03fd85b26f7dd566a0ca.hot-update.js": "/chunks/settings-subscription.03fd85b26f7dd566a0ca.hot-update.js",
"/chunks/settings-subscription.4b339e907763b2fc845a.hot-update.js": "/chunks/settings-subscription.4b339e907763b2fc845a.hot-update.js",
"/chunks/settings-subscription.90772e322684ba44b295.hot-update.js": "/chunks/settings-subscription.90772e322684ba44b295.hot-update.js",
"/chunks/settings-subscription.d870cb21a45d7400b6ab.hot-update.js": "/chunks/settings-subscription.d870cb21a45d7400b6ab.hot-update.js",
"/chunks/settings.53a4f5bf5dcbaf014e6c.hot-update.js": "/chunks/settings.53a4f5bf5dcbaf014e6c.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings.58141c69e3f5a94dbc60.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.58141c69e3f5a94dbc60.hot-update.js",
"/chunks/admin~chunks/platform.1e4dd1f0bb52e405e023.hot-update.js": "/chunks/admin~chunks/platform.1e4dd1f0bb52e405e023.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings.3c7dbab16f127f2fa92a.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.3c7dbab16f127f2fa92a.hot-update.js",
"/chunks/settings-subscription.a13dccbbadfefcddc4f9.hot-update.js": "/chunks/settings-subscription.a13dccbbadfefcddc4f9.hot-update.js",
"/chunks/settings-subscription.8ed89ec3a3586b380a29.hot-update.js": "/chunks/settings-subscription.8ed89ec3a3586b380a29.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings.8803126548c5d628eb32.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.8803126548c5d628eb32.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings.1c4cab03055fb947bd74.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.1c4cab03055fb947bd74.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings.a9a6d94470edf96919a7.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.a9a6d94470edf96919a7.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings.7fdfde91c552786fa005.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings.7fdfde91c552786fa005.hot-update.js",
"/chunks/settings.e919814c174594da3f8f.hot-update.js": "/chunks/settings.e919814c174594da3f8f.hot-update.js",
"/chunks/settings.71c74aebc056976b2425.hot-update.js": "/chunks/settings.71c74aebc056976b2425.hot-update.js",
"/chunks/settings-subscription.07f021d2bab11ac75636.hot-update.js": "/chunks/settings-subscription.07f021d2bab11ac75636.hot-update.js",
"/chunks/settings-subscription.37cf8bad0ac05d70e167.hot-update.js": "/chunks/settings-subscription.37cf8bad0ac05d70e167.hot-update.js",
"/js/main.23e9d0684b6560fc4b9f.hot-update.js": "/js/main.23e9d0684b6560fc4b9f.hot-update.js",
"/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-p~9a2a5248.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-p~9a2a5248.js?id=13d2345d9620e97b18d1",
"/chunks/settings-invoices.23e9d0684b6560fc4b9f.hot-update.js": "/chunks/settings-invoices.23e9d0684b6560fc4b9f.hot-update.js",
"/js/main.8f53fa9a690e57d40219.hot-update.js": "/js/main.8f53fa9a690e57d40219.hot-update.js",
"/chunks/settings-storage.025677c7d6044c82014b.hot-update.js": "/chunks/settings-storage.025677c7d6044c82014b.hot-update.js",
"/chunks/user-storage.025677c7d6044c82014b.hot-update.js": "/chunks/user-storage.025677c7d6044c82014b.hot-update.js",
"/chunks/settings-storage.0c4a306e871a6a932496.hot-update.js": "/chunks/settings-storage.0c4a306e871a6a932496.hot-update.js",
"/chunks/user-storage.0c4a306e871a6a932496.hot-update.js": "/chunks/user-storage.0c4a306e871a6a932496.hot-update.js"
}
@@ -4,7 +4,7 @@
<!--User avatar-->
<UserHeadline v-if="!clickedSubmenu" class="user-info" />
<div class="block px-5 pt-2">
<div v-if="config.subscriptionType === 'metered'" class="block px-5 pt-2">
<div class="bg-light-background px-3 py-1.5 rounded-lg">
<span class="text-sm font-semibold">
{{ $t('Your current estimated usage:') }}
@@ -5,14 +5,14 @@
<div v-if="user" class="mb-auto text-center">
<MemberAvatar
class="mb-1 mx-auto inline-block"
class="mx-auto inline-block"
:size="44"
:is-border="false"
:member="user"
/>
<!--Usage-->
<div class="text-center leading-3 mb-7">
<div v-if="config.subscriptionType === 'metered'" class="text-center leading-3 mt-1">
<b class="text-xs font-bold leading-3 block text-theme">
$22,93
</b>
@@ -22,19 +22,21 @@
</div>
<!--Navigation-->
<router-link
v-for="item in navigation"
:to="{name: item.route}"
:title="item.title"
:class="[{'router-link-active': isSection(item.section)}, item.icon]"
class="block mb-1.5"
>
<div class="button-icon p-3 cursor-pointer inline-block dark:hover:bg-4x-dark-foreground hover:bg-light-300 text-theme rounded-xl">
<hard-drive-icon v-if="item.icon === 'home'" size="20" />
<settings-icon v-if="item.icon === 'settings'" size="20" />
<user-icon v-if="item.icon === 'user'" size="20" />
</div>
</router-link>
<div class="mt-7">
<router-link
v-for="item in navigation"
:to="{name: item.route}"
:title="item.title"
:class="[{'router-link-active': isSection(item.section)}, item.icon]"
class="block mb-1.5"
>
<div class="button-icon p-3 cursor-pointer inline-block dark:hover:bg-4x-dark-foreground hover:bg-light-300 text-theme rounded-xl">
<hard-drive-icon v-if="item.icon === 'home'" size="20" />
<settings-icon v-if="item.icon === 'settings'" size="20" />
<user-icon v-if="item.icon === 'user'" size="20" />
</div>
</router-link>
</div>
<!--Toggle Dark/Light mode-->
<div @click="toggleDarkMode" :title="$t('dark_mode_toggle')" class="block mt-6">
@@ -84,6 +86,7 @@
computed: {
...mapGetters([
'isDarkMode',
'config',
'user',
]),
navigation() {
-10
View File
@@ -38,16 +38,6 @@ const routesUser = [
title: 'routes_title.settings_storage'
},
},
{
name: 'Invoice',
path: '/user/settings/invoices',
component: () =>
import(/* webpackChunkName: "chunks/settings-invoices" */ '../views/User/Invoices'),
meta: {
requiresAuth: true,
title: 'routes_title.invoices'
},
},
{
name: 'Subscription',
path: '/user/settings/subscription',
@@ -88,7 +88,7 @@
import ButtonBase from '/resources/js/components/FilesView/ButtonBase'
import SetupBox from '/resources/js/components/Others/Forms/SetupBox'
import {required} from 'vee-validate/dist/rules'
import BarChart from "../../../User/BarChart"
import BarChart from "../../../../components/UI/BarChart"
import {events} from '/resources/js/bus'
import {mapGetters} from "vuex"
import axios from 'axios'
+5 -9
View File
@@ -149,17 +149,9 @@
title: this.$t('menu.subscription'),
route: 'Subscription',
},
{
title: this.$t('Transactions'),
route: 'Invoice',
},
]
let meteredSubscription = [
{
title: this.$t('Billing'),
route: 'MeteredSubscription',
},
{
title: this.$t('menu.profile'),
route: 'Profile',
@@ -172,12 +164,16 @@
title: this.$t('menu.storage'),
route: 'Storage',
},
{
title: this.$t('Billing'),
route: 'MeteredSubscription',
},
]
return {
fixed: fixedSubscription,
metered: meteredSubscription,
}['metered']
}[this.config.subscriptionType]
}
},
data() {
-97
View File
@@ -1,97 +0,0 @@
<template>
<PageTab :is-loading="isLoading">
<div class="card shadow-card">
<DatatableWrapper
@init="isLoading = false"
api="/api/subscriptions/transactions"
:paginator="true"
:columns="columns"
>
<template slot-scope="{ row }">
<tr class="border-b dark:border-opacity-5 border-light border-dashed">
<td class="py-4">
<span class="text-sm font-bold">
{{ row.data.attributes.note }}
</span>
</td>
<td>
<ColorLabel :color="$getTransactionStatusColor(row.data.attributes.status)">
{{ row.data.attributes.status }}
</ColorLabel>
</td>
<td>
<span class="text-sm font-bold" :class="$getTransactionTypeTextColor(row.data.attributes.type)">
{{ $getTransactionMark(row.data.attributes.type) + row.data.attributes.price }}
</span>
</td>
<td>
<span class="text-sm font-bold">
{{ row.data.attributes.created_at }}
</span>
</td>
<td class="text-right">
<img class="inline-block max-h-5" :src="$getPaymentLogo(row.data.attributes.driver)" :alt="row.data.attributes.driver">
</td>
</tr>
</template>
<!--Empty page-->
<template v-slot:empty-page>
<InfoBox>
<p>{{ $t('admin_page_user.invoices.empty') }}</p>
</InfoBox>
</template>
</DatatableWrapper>
</div>
</PageTab>
</template>
<script>
import DatatableWrapper from '/resources/js/components/Others/Tables/DatatableWrapper'
import PageTab from '/resources/js/components/Others/Layout/PageTab'
import InfoBox from '/resources/js/components/Others/Forms/InfoBox'
import ColorLabel from "/resources/js/components/Others/ColorLabel"
export default {
name: 'UserInvoices',
components: {
DatatableWrapper,
ColorLabel,
InfoBox,
PageTab,
},
data() {
return {
isLoading: true,
invoices: undefined,
columns: [
{
label: this.$t('Note'),
field: 'note',
sortable: true
},
{
label: this.$t('Status'),
field: 'status',
sortable: true
},
{
label: this.$t('admin_page_invoices.table.total'),
field: 'amount',
sortable: true
},
{
label: this.$t('Payed At'),
field: 'created_at',
sortable: true
},
{
label: this.$t('Service'),
field: 'driver',
sortable: true
},
],
}
},
}
</script>
@@ -8,7 +8,7 @@
</FormLabel>
<b class="text-3xl font-extrabold -mt-3 block mb-0.5">
$52.90
{{ user.data.relationships.balance.data.attributes.formatted }}
</b>
<ValidationObserver ref="changeStorageCapacity" @submit.prevent="makePayment" v-slot="{ invalid }" tag="form" class="mt-6">
@@ -47,7 +47,7 @@
</b>
<div>
<div class="flex items-center justify-between py-2 border-b dark:border-opacity-5 border-light border-dashed" v-for="usage in usages">
<div class="flex items-center justify-between py-2 border-b dark:border-opacity-5 border-light border-dashed" v-for="(usage, i) in usages" :ke="i">
<div class="w-2/4 leading-none">
<b class="text-sm font-bold leading-none">
{{ usage.title }}
@@ -205,7 +205,39 @@
usage: '12',
amount: '$1.20',
},
]
{
title: 'Platform Fee',
usage: '1',
amount: '$2.00',
},
],
columns: [
{
label: this.$t('Note'),
field: 'note',
sortable: true
},
{
label: this.$t('Status'),
field: 'status',
sortable: true
},
{
label: this.$t('admin_page_invoices.table.total'),
field: 'amount',
sortable: true
},
{
label: this.$t('Payed At'),
field: 'created_at',
sortable: true
},
{
label: this.$t('Service'),
field: 'driver',
sortable: true
},
],
}
},
methods: {
+1 -1
View File
@@ -53,7 +53,7 @@
import FormLabel from '/resources/js/components/Others/Forms/FormLabel'
import PageTab from '/resources/js/components/Others/Layout/PageTab'
import axios from 'axios'
import BarChart from "./BarChart";
import BarChart from "../../components/UI/BarChart";
export default {
name: 'Storage',
+80
View File
@@ -62,6 +62,55 @@
</AppInputSwitch>
</div>
<!--Transactions-->
<div class="card shadow-card">
<FormLabel icon="file-text">
{{ $t('Transactions') }}
</FormLabel>
<DatatableWrapper
@init="isLoading = false"
api="/api/subscriptions/transactions"
:paginator="true"
:columns="columns"
>
<template slot-scope="{ row }">
<tr class="border-b dark:border-opacity-5 border-light border-dashed">
<td class="py-4">
<span class="text-sm font-bold">
{{ row.data.attributes.note }}
</span>
</td>
<td>
<ColorLabel :color="$getTransactionStatusColor(row.data.attributes.status)">
{{ row.data.attributes.status }}
</ColorLabel>
</td>
<td>
<span class="text-sm font-bold" :class="$getTransactionTypeTextColor(row.data.attributes.type)">
{{ $getTransactionMark(row.data.attributes.type) + row.data.attributes.price }}
</span>
</td>
<td>
<span class="text-sm font-bold">
{{ row.data.attributes.created_at }}
</span>
</td>
<td class="text-right">
<img class="inline-block max-h-5" :src="$getPaymentLogo(row.data.attributes.driver)" :alt="row.data.attributes.driver">
</td>
</tr>
</template>
<!--Empty page-->
<template v-slot:empty-page>
<InfoBox>
<p>{{ $t('admin_page_user.invoices.empty') }}</p>
</InfoBox>
</template>
</DatatableWrapper>
</div>
<div v-if="! subscription && !isLoading" class="card shadow-card">
<InfoBox style="margin-bottom: 0">
<p>{{ $t("You don't have any subscription") }}</p>
@@ -71,6 +120,8 @@
</template>
<script>
import DatatableWrapper from "../../components/Others/Tables/DatatableWrapper";
import ColorLabel from "../../components/Others/ColorLabel";
import ButtonBase from '/resources/js/components/FilesView/ButtonBase'
import PageTab from '/resources/js/components/Others/Layout/PageTab'
import InfoBox from '/resources/js/components/Others/Forms/InfoBox'
@@ -84,6 +135,8 @@
export default {
name: 'UserSubscription',
components: {
DatatableWrapper,
ColorLabel,
AppInputSwitch,
ProgressLine,
ButtonBase,
@@ -115,6 +168,33 @@
isCancelling: false,
limitations: [],
isLoading: true,
columns: [
{
label: this.$t('Note'),
field: 'note',
sortable: true
},
{
label: this.$t('Status'),
field: 'status',
sortable: true
},
{
label: this.$t('admin_page_invoices.table.total'),
field: 'amount',
sortable: true
},
{
label: this.$t('Payed At'),
field: 'created_at',
sortable: true
},
{
label: this.$t('Service'),
field: 'driver',
sortable: true
},
],
}
},
methods: {
+3 -1
View File
@@ -56,7 +56,9 @@
stripe_public_key: '{{ config('cashier.key') ?? null }}',
app_payments_active: {{ $settings->payments_active ?? 0 }},
allowHomepage: {{ $settings->allow_homepage ?? 1 }},
subscriptionType: '{{ $settings->subscription_type ?? null }}',
allowHomepage: {{ $settings->allow_homepage ?? 1 }},
userRegistration: {{ $settings->registration ?? 1 }},
userVerification: {{ $settings->user_verification ?? 0 }},
storageLimit: {{ $settings->storage_limitation ?? 1 }},
@@ -956,6 +956,10 @@ class SetupDevEnvironment extends Command
{
// Get options
collect([
[
'name' => 'subscription_type', // TODO: add to setup wizard
'value' => 'metered',
],
[
'name' => 'setup_wizard_database',
'value' => 1,
+16 -4
View File
@@ -1,4 +1,5 @@
<?php
namespace App\Users\Resources;
use Domain\Folders\Resources\FolderCollection;
@@ -30,20 +31,31 @@ class UserResource extends JsonResource
'updated_at' => format_date($this->updated_at, '%d. %B. %Y'),
],
'relationships' => [
'balance' => [
'data' => [
'id' => $this->balance->id,
'type' => 'balance',
'attributes' => [
'formatted' => format_currency($this->balance->amount, $this->balance->currency),
'balance' => $this->balance->amount,
'currency' => $this->balance->currency,
],
],
],
'settings' => new SettingsResource($this->settings),
'favourites' => new FolderCollection($this->favouriteFolders),
'limitations' => [
'id' => $this->id,
'type' => 'limitations',
'data' => [
'id' => $this->id,
'type' => 'limitations',
'attributes' => $this->limitations,
],
],
$this->mergeWhen($this->hasSubscription(), fn () => [
$this->mergeWhen($this->hasSubscription(), fn() => [
'subscription' => new SubscriptionResource($this->subscription),
]),
],
'meta' => [
'meta' => [
'limitations' => $this->limitations->summary(),
],
],