hide subscription, payment cards and invoices in profile menu when is 'Allow subscription payment' option disabled

frontend build
This commit is contained in:
Peter Papp
2020-08-30 11:05:08 +02:00
parent 8895b5062a
commit ab65ca7a13
10 changed files with 17 additions and 47 deletions

View File

@@ -8,6 +8,7 @@
AddType video/ogg .ogv
AddType video/mp4 .mp4
AddType video/webm .webm
<ifModule mod_headers.c>
Header set Connection keep-alive
</ifModule>

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

2
public/js/main.js vendored

File diff suppressed because one or more lines are too long

View File

@@ -1,35 +1,25 @@
{
"/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js",
"/js/main.js": "/js/main.js",
"/css/app.css": "/css/app.css",
"/chunks/admin.js": "/chunks/admin.js",
"/chunks/admin-account.js": "/chunks/admin-account.js",
"/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~2d9ff916.js",
"/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js": "/chunks/admin-account~chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/datab~01aef58e.js",
"/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js": "/chunks/admin~chunks/files~chunks/settings~chunks/shared-files~chunks/trash.js",
"/chunks/app-appearance.js": "/chunks/app-appearance.js",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~605f4c49.js",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js",
"/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~b9e5655a.js",
"/chunks/app-billings.js": "/chunks/app-billings.js",
"/chunks/app-email.js": "/chunks/app-email.js",
"/chunks/app-index.js": "/chunks/app-index.js",
"/chunks/app-others.js": "/chunks/app-others.js",
"/chunks/app-payments.js": "/chunks/app-payments.js",
"/chunks/app-settings.js": "/chunks/app-settings.js",
"/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js": "/chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~8a0e1d25.js",
"/chunks/app-setup.js": "/chunks/app-setup.js",
"/chunks/billings-detail.js": "/chunks/billings-detail.js",
"/chunks/contact-us.js": "/chunks/contact-us.js",
"/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js": "/chunks/contact-us~chunks/dynamic-page~chunks/landing-page.js",
"/chunks/create-new-password.js": "/chunks/create-new-password.js",
"/chunks/dashboard.js": "/chunks/dashboard.js",
"/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~0e2a0654.js",
"/chunks/database.js": "/chunks/database.js",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js",
"/chunks/environment-setup.js": "/chunks/environment-setup.js",
"/chunks/files.js": "/chunks/files.js",
"/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js": "/chunks/files~chunks/settings-subscription~chunks/shared-files~chunks/shared-page~chunks/trash~chunks~3ea7670b.js",
"/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.js",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js",
"/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js",
"/chunks/invoices.js": "/chunks/invoices.js",
@@ -44,7 +34,6 @@
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js",
"/chunks/plans.js": "/chunks/plans.js",
"/chunks/profile.js": "/chunks/profile.js",
"/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js",
"/chunks/purchase-code.js": "/chunks/purchase-code.js",
"/chunks/settings.js": "/chunks/settings.js",
"/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js",
@@ -64,7 +53,6 @@
"/chunks/trash.js": "/chunks/trash.js",
"/chunks/upgrade.js": "/chunks/upgrade.js",
"/chunks/upgrade-billing.js": "/chunks/upgrade-billing.js",
"/chunks/upgrade-billing~chunks/upgrade-plan.js": "/chunks/upgrade-billing~chunks/upgrade-plan.js",
"/chunks/upgrade-plan.js": "/chunks/upgrade-plan.js",
"/chunks/user.js": "/chunks/user.js",
"/chunks/user-create.js": "/chunks/user-create.js",
@@ -74,23 +62,5 @@
"/chunks/user-password.js": "/chunks/user-password.js",
"/chunks/user-storage.js": "/chunks/user-storage.js",
"/chunks/user-subscription.js": "/chunks/user-subscription.js",
"/chunks/users.js": "/chunks/users.js",
"/js/main.1116b58ef850b0d7e6c1.hot-update.js": "/js/main.1116b58ef850b0d7e6c1.hot-update.js",
"/js/main.6946958f555d97fdde24.hot-update.js": "/js/main.6946958f555d97fdde24.hot-update.js",
"/js/main.11519e3f1f4b381460e1.hot-update.js": "/js/main.11519e3f1f4b381460e1.hot-update.js",
"/js/main.375c154fd9f9240050d6.hot-update.js": "/js/main.375c154fd9f9240050d6.hot-update.js",
"/js/main.e80c042abed521780289.hot-update.js": "/js/main.e80c042abed521780289.hot-update.js",
"/js/main.4039781b64165019af1e.hot-update.js": "/js/main.4039781b64165019af1e.hot-update.js",
"/js/main.2be99a0eec70df1695df.hot-update.js": "/js/main.2be99a0eec70df1695df.hot-update.js",
"/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.1c3d9a46902779640cb7.hot-update.js": "/chunks/files~chunks/shared-files~chunks/shared-page~chunks/trash.1c3d9a46902779640cb7.hot-update.js",
"/js/main.2b9ecac46338083d7de9.hot-update.js": "/js/main.2b9ecac46338083d7de9.hot-update.js",
"/chunks/shared-page.2b9ecac46338083d7de9.hot-update.js": "/chunks/shared-page.2b9ecac46338083d7de9.hot-update.js",
"/js/main.6dd00119b130336463df.hot-update.js": "/js/main.6dd00119b130336463df.hot-update.js",
"/js/main.5908348e9980052c4cfa.hot-update.js": "/js/main.5908348e9980052c4cfa.hot-update.js",
"/js/main.4185db090221550d85ee.hot-update.js": "/js/main.4185db090221550d85ee.hot-update.js",
"/js/main.4cbd8999f1f90f08165b.hot-update.js": "/js/main.4cbd8999f1f90f08165b.hot-update.js",
"/js/main.000fae35402f1a759d1f.hot-update.js": "/js/main.000fae35402f1a759d1f.hot-update.js",
"/js/main.288465b6020b308e9695.hot-update.js": "/js/main.288465b6020b308e9695.hot-update.js",
"/js/main.6153ba03604d8736903f.hot-update.js": "/js/main.6153ba03604d8736903f.hot-update.js",
"/js/main.9f2f4c380dd317be8da0.hot-update.js": "/js/main.9f2f4c380dd317be8da0.hot-update.js"
"/chunks/users.js": "/chunks/users.js"
}

View File

@@ -2,7 +2,7 @@
<PageTab :is-loading="isLoading" class="form-fixed-width">
<!--Stripe Information-->
<PageTabGroup v-if="config.stripe_public_key">
<PageTabGroup v-if="config.stripe_public_key && payments">
<div class="form block-form">
<FormLabel>{{ $t('admin_settings.payments.section_payments') }}</FormLabel>
<InfoBox>
@@ -143,10 +143,7 @@
isLoading: true,
isError: false,
errorMessage: '',
payments: {
status: 1,
configured: undefined,
},
payments: undefined,
stripeCredentials: {
key: '',
secret: '',
@@ -746,8 +743,10 @@
.then(response => {
this.isLoading = false
this.payments.configured = parseInt(response.data.payments_configured)
this.payments.status = parseInt(response.data.payments_active)
this.payments = {
configured: parseInt(response.data.payments_configured),
status: parseInt(response.data.payments_active),
}
})
}
}

View File

@@ -172,7 +172,7 @@
return this.user.data.attributes.subscription ? 'green' : 'purple'
},
canShowSubscriptionSettings() {
return this.config.isSaaS
return this.config.isSaaS && this.config.app_payments_active
},
canShowUpgradeWarning() {
return this.config.storageLimit && this.user.relationships.storage.data.attributes.used > 95