adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-16 20:22:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

respect billing permission in frontend, fix hiding of billing banners

Browse Source
This commit is contained in:
Gregor Vostrak
2024-09-05 13:52:35 +02:00
committed by Constantin Graf
parent 4969fcba7e
commit 83301d03ca
7 changed files with 39 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
resources/js/Components/Billing/BillingBanner.vue
View File

@@ -7,9 +7,15 @@ import {
} from '@heroicons/vue/16/solid';
import { Link } from '@inertiajs/vue3';
import { computed } from 'vue';
import { isBlocked, isFreePlan, isInTrial } from '@/utils/billing';
import {
isBillingActivated,
isBlocked,
isFreePlan,
isInTrial,
} from '@/utils/billing';
import { useSessionStorage } from '@vueuse/core';
import { getCurrentOrganizationId } from '@/utils/useUser';
import { canManageBilling } from '@/utils/permissions';
const hideTrialBanner = useSessionStorage(
'showTrialBanner-' + getCurrentOrganizationId(),
@@ -46,13 +52,13 @@ const showFreeUpgradeBanner = computed(
</span>
</div>
<div class="flex items-center space-x-2">
<Link href="/billing">
<Link v-if="canManageBilling()" href="/billing">
<div
class="text-white font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
<span>Upgrade now</span>
</div>
</Link>
<button @click="showTrialBanner = false" class="p-1">
<button @click="hideTrialBanner = true" class="p-1">
<XMarkIcon
class="w-4 opacity-50 hover:opacity-100"></XMarkIcon>
</button>
@@ -74,13 +80,15 @@ const showFreeUpgradeBanner = computed(
</span>
</div>
<div class="flex items-center space-x-2">
<Link href="/billing">
<Link
v-if="isBillingActivated() && canManageBilling()"
href="/billing">
<div
class="text-white font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
<span>Upgrade now</span>
</div>
</Link>
<button @click="showBlockedBanner = false" class="p-1">
<button @click="hideBlockedBanner = true" class="p-1">
<XMarkIcon
class="w-4 opacity-50 hover:opacity-100"></XMarkIcon>
</button>
@@ -102,13 +110,15 @@ const showFreeUpgradeBanner = computed(
>
</div>
<div class="flex items-center space-x-2">
<Link href="/billing">
<Link
v-if="isBillingActivated() && canManageBilling()"
href="/billing">
<div
class="text-white font-semibold uppercase text-xs flex space-x-1 items-center hover:bg-white/10 rounded-lg px-2 py-1.5">
<span>Upgrade now</span>
</div>
</Link>
<button @click="showFreeUpgradeBanner = false" class="p-1">
<button @click="hideTrialBanner = true" class="p-1">
<XMarkIcon
class="w-4 opacity-50 hover:opacity-100"></XMarkIcon>
</button>