fixed billing app fixes

This commit is contained in:
Čarodej
2022-02-11 17:25:39 +01:00
parent eb948f9000
commit 948c7453a6
4 changed files with 13 additions and 8 deletions
@@ -274,10 +274,6 @@ export default {
field: 'role', field: 'role',
sortable: true, sortable: true,
}, },
{
label: this.$t('admin_page_user.table.plan'),
sortable: false,
},
{ {
label: this.$t('admin_page_user.table.storage_used'), label: this.$t('admin_page_user.table.storage_used'),
sortable: false, sortable: false,
@@ -67,6 +67,11 @@
<!--Select Payment Plans--> <!--Select Payment Plans-->
<div v-if="!isPaymentOptionPage"> <div v-if="!isPaymentOptionPage">
<PopupContent v-if="plans"> <PopupContent v-if="plans">
<InfoBox v-if="plans.data.length === 0" class="!mb-0">
<p>There isn't any plan yet.</p>
</InfoBox>
<!--Toggle yearly billing--> <!--Toggle yearly billing-->
<div v-if="hasYearlyPlans.length > 0" class="mb-2 px-5 text-right"> <div v-if="hasYearlyPlans.length > 0" class="mb-2 px-5 text-right">
<label :class="{ 'text-gray-400': !isSelectedYearlyPlans }" class="cursor-pointer text-xs font-bold"> <label :class="{ 'text-gray-400': !isSelectedYearlyPlans }" class="cursor-pointer text-xs font-bold">
@@ -93,7 +98,7 @@
<!--Actions--> <!--Actions-->
<PopupActions> <PopupActions>
<ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary">{{ $t('popup_move_item.cancel') }} </ButtonBase> <ButtonBase class="w-full" @click.native="$closePopup()" button-style="secondary">{{ $t('popup_move_item.cancel') }} </ButtonBase>
<ButtonBase class="w-full" :button-style="buttonStyle" @click.native="isPaymentOptionPage = true">{{ $t('Upgrade Account') }} </ButtonBase> <ButtonBase class="w-full" v-if="plans.data.length !== 0" :button-style="buttonStyle" @click.native="isPaymentOptionPage = true">{{ $t('Upgrade Account') }} </ButtonBase>
</PopupActions> </PopupActions>
</div> </div>
</PopupWrapper> </PopupWrapper>
@@ -114,10 +119,12 @@ import { mapGetters } from 'vuex'
import { events } from '../../bus' import { events } from '../../bus'
import axios from 'axios' import axios from 'axios'
import Spinner from '../FilesView/Spinner' import Spinner from '../FilesView/Spinner'
import InfoBox from "../Others/Forms/InfoBox";
export default { export default {
name: 'SelectPlanSubscriptionPopup', name: 'SelectPlanSubscriptionPopup',
components: { components: {
InfoBox,
Spinner, Spinner,
PaymentMethod, PaymentMethod,
paystack, paystack,
@@ -8,11 +8,11 @@
{{ $t('Free Plan') }} {{ $t('Free Plan') }}
</b> </b>
<b class="mb-3 mb-8 block text-sm text-gray-400"> <b v-if="$store.getters.config.allowed_payments" class="mb-3 mb-8 block text-sm text-gray-400">
{{ $t('1GB Free storage space with 5 Team members') }} {{ $t('Upgrade your account to get more.') }}
</b> </b>
<ButtonBase @click.native="$openUpgradeOptions" type="submit" button-style="theme" class="mt-4 w-full"> <ButtonBase v-if="$store.getters.config.allowed_payments" @click.native="$openUpgradeOptions" type="submit" button-style="theme" class="mt-4 w-full">
{{ $t('Upgrade Your Account') }} {{ $t('Upgrade Your Account') }}
</ButtonBase> </ButtonBase>
</div> </div>
@@ -62,6 +62,8 @@ class StorePaymentServiceCredentialsController
// Store credentials into the .env file // Store credentials into the .env file
setEnvironmentValue($credentials[$request->input('service')]); setEnvironmentValue($credentials[$request->input('service')]);
// TODO: call plan creation
// Clear cache // Clear cache
if (! is_dev()) { if (! is_dev()) {
Artisan::call('cache:clear'); Artisan::call('cache:clear');