- set paypal mode in credentials setup

This commit is contained in:
Čarodej
2022-04-04 16:48:29 +02:00
parent c1f775975d
commit b219c00113
25 changed files with 111 additions and 95 deletions

View File

@@ -67,7 +67,7 @@ PAYSTACK_PUBLIC_KEY=
PAYPAL_CLIENT_ID=
PAYPAL_CLIENT_SECRET=
PAYPAL_WEBHOOK_ID=
PAYPAL_IS_LIVE=true
PAYPAL_IS_LIVE=false
FACEBOOK_CLIENT_ID=
FACEBOOK_CLIENT_SECRET=

View File

@@ -1,7 +1,7 @@
<?php
return [
'version' => '2.0.12',
'version' => '2.0.13',
'is_demo' => env('APP_DEMO', false),

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

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

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

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,75 +1,75 @@
{
"/js/main.js": "/js/main.js",
"/chunks/request.js": "/chunks/request.js?id=a2e029ce6f98ec5c",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=2c31458c3fadfe7a",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=3c2fc454c3fce8d2",
"/chunks/status-check.js": "/chunks/status-check.js?id=33441ae2e08993b1",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=c1df85c34d7e9521",
"/chunks/database.js": "/chunks/database.js?id=c686d46622194c7e",
"/chunks/environment.js": "/chunks/environment.js?id=d1bf5ed9d728445a",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=c37d19ccd20b6656",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=666e7ee49b02b57c",
"/chunks/shared.js": "/chunks/shared.js?id=3f4d9d949ae6b64c",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=efc80e0da33c9f0b",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=86175dc679f57f41",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=ca8cc89fe5982782",
"/chunks/not-found.js": "/chunks/not-found.js?id=4cb8d3a7a2212c3c",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=c71981d946a9ca71",
"/chunks/admin.js": "/chunks/admin.js?id=8cac63487cd85d28",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=c9fa77053bf090fc",
"/chunks/invoices.js": "/chunks/invoices.js?id=70fb9a603be2f554",
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=94e96e1bb505ae59",
"/chunks/pages.js": "/chunks/pages.js?id=a78bbcf039e5d9e5",
"/chunks/page-edit.js": "/chunks/page-edit.js?id=ba309ccc95221294",
"/chunks/plans.js": "/chunks/plans.js?id=492aa4439e0fa2ec",
"/chunks/users.js": "/chunks/users.js?id=b5feffcc35d4b023",
"/chunks/user-create.js": "/chunks/user-create.js?id=a29fdec565540fa4",
"/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=b2e842f4f312aff2",
"/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=140d3aa05e7a450e",
"/chunks/user.js": "/chunks/user.js?id=dae4ac26750f99d0",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=c2a3b380d4546d2f",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=0293215520c5e771",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=eff779ab6866265e",
"/chunks/user-password.js": "/chunks/user-password.js?id=3fb4538cd2283ff5",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=5a4fad364a41a35c",
"/chunks/plan.js": "/chunks/plan.js?id=d8ffa85dc9b68966",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=3010ddb4ba7419e9",
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=f41fe30f2273279c",
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=6432308fb4313d44",
"/chunks/payments.js": "/chunks/payments.js?id=051e8246e2b5c9d0",
"/chunks/payments/billings.js": "/chunks/payments/billings.js?id=9068ff2602b50ab4",
"/chunks/payments/settings.js": "/chunks/payments/settings.js?id=7808dbc69369beb1",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=692d3291fb9d2cf7",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=aef973f6a55425e8",
"/chunks/app-index.js": "/chunks/app-index.js?id=6a442cd46f8ae636",
"/chunks/app-environment.js": "/chunks/app-environment.js?id=62561e3e76a5335f",
"/chunks/app-others.js": "/chunks/app-others.js?id=6fb5b2fdc245159f",
"/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=91065b9cee23b7b4",
"/chunks/app-adsense.js": "/chunks/app-adsense.js?id=18842ed46783ea39",
"/chunks/app-server.js": "/chunks/app-server.js?id=f67831fd8b5e599e",
"/chunks/app-language.js": "/chunks/app-language.js?id=da8fb3ae026fdfce",
"/chunks/homepage.js": "/chunks/homepage.js?id=828e3e90bf35b652",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=e110e8923b6ca22f",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=5ca104a75598dd39",
"/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=3153532f0d2273c8",
"/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=d630ed9f6f558509",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=8cec25f9f11b217a",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=c1cadbfd4ac0df7b",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=9c62b8573fbdd567",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=926b35b6745d99ba",
"/chunks/settings.js": "/chunks/settings.js?id=520eedca3c7e7bed",
"/chunks/profile.js": "/chunks/profile.js?id=4f1d8cad4a4cc40c",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=d87e19ad7a50ce47",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=68765cac4e648e90",
"/chunks/billing.js": "/chunks/billing.js?id=e10952f60d374cc2",
"/chunks/platform.js": "/chunks/platform.js?id=07da2415179d88ff",
"/chunks/files.js": "/chunks/files.js?id=6c78a4e3bea8415b",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=350d7bf3925d798a",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=5694fb192136ccf8",
"/chunks/trash.js": "/chunks/trash.js?id=3dfb84acbdd68367",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=ebef99cec746bfcb",
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=0dd0fe81189c5cfc",
"/chunks/invitation.js": "/chunks/invitation.js?id=64a211c90b505767",
"/chunks/request.js": "/chunks/request.js?id=0af05c27cd2a923d",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=4185c583092afa25",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
"/chunks/status-check.js": "/chunks/status-check.js?id=87d72b50e83864bb",
"/chunks/purchase-code.js": "/chunks/purchase-code.js?id=df5bd89528649783",
"/chunks/database.js": "/chunks/database.js?id=15cc488117dccf7b",
"/chunks/environment.js": "/chunks/environment.js?id=ab5382f4452a258a",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=288594cd7f628cf8",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=916450217130f3b8",
"/chunks/shared.js": "/chunks/shared.js?id=036d97c0534d7f51",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=38ef8c97b11c9c2d",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=b561af60bcd5be2b",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=672e931a9fb0b672",
"/chunks/not-found.js": "/chunks/not-found.js?id=9f6ce23ce5d969f1",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=f564565faa09d6d6",
"/chunks/admin.js": "/chunks/admin.js?id=c94163e0c94b811c",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=fd1d266e493a79a8",
"/chunks/invoices.js": "/chunks/invoices.js?id=1416cbf6d1a593ac",
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5bf6704f5b599f36",
"/chunks/pages.js": "/chunks/pages.js?id=c8380d571e91e8be",
"/chunks/page-edit.js": "/chunks/page-edit.js?id=fb3f9eda3dc1d15c",
"/chunks/plans.js": "/chunks/plans.js?id=6e8c847c141e41e8",
"/chunks/users.js": "/chunks/users.js?id=ec687ee365c4248a",
"/chunks/user-create.js": "/chunks/user-create.js?id=8dd9d29f024132f5",
"/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=c994595021a98ce6",
"/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=d9f1bcb1fe44a6ae",
"/chunks/user.js": "/chunks/user.js?id=c191b906a0496fe5",
"/chunks/user-detail.js": "/chunks/user-detail.js?id=f9e17ff98354e984",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=a8e0bce4703232a0",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=27d046c1122783ea",
"/chunks/user-password.js": "/chunks/user-password.js?id=23d3aee39f539a3c",
"/chunks/user-delete.js": "/chunks/user-delete.js?id=6bea6f8cadf4d74f",
"/chunks/plan.js": "/chunks/plan.js?id=4b267375ea9f19b3",
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=a956ceca6865c50c",
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=715ee86991d5e4db",
"/chunks/plan-delete.js": "/chunks/plan-delete.js?id=1ad77372d342326f",
"/chunks/payments.js": "/chunks/payments.js?id=dc4586691c25de6f",
"/chunks/payments/billings.js": "/chunks/payments/billings.js?id=dd6c9d6a29a47808",
"/chunks/payments/settings.js": "/chunks/payments/settings.js?id=ea498b4bac742dae",
"/chunks/app-settings.js": "/chunks/app-settings.js?id=55da23af2b076069",
"/chunks/app-appearance.js": "/chunks/app-appearance.js?id=a694a01f3641712c",
"/chunks/app-index.js": "/chunks/app-index.js?id=efdbfa062749ca00",
"/chunks/app-environment.js": "/chunks/app-environment.js?id=e73ab59f2d81adb0",
"/chunks/app-others.js": "/chunks/app-others.js?id=16dc948aa2205189",
"/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=1cfffc99465b9a7a",
"/chunks/app-adsense.js": "/chunks/app-adsense.js?id=a5dc9e715f8561bd",
"/chunks/app-server.js": "/chunks/app-server.js?id=2554ff5c24994949",
"/chunks/app-language.js": "/chunks/app-language.js?id=7e5f3d5ec447e397",
"/chunks/homepage.js": "/chunks/homepage.js?id=b6597181c9e4353d",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2504793131107b1f",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=9adc7e145be4e160",
"/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=25b805ade5230382",
"/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=f4562229776d9f56",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=0d48d229038a3a1e",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=bb92bad614e60d45",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=50a1bc5e4ed86ec9",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f652de052dba55c1",
"/chunks/settings.js": "/chunks/settings.js?id=7f300286a54df85c",
"/chunks/profile.js": "/chunks/profile.js?id=0eca231475e267ab",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=11d4331650cac280",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=994b669a56fd417b",
"/chunks/billing.js": "/chunks/billing.js?id=40e758c87bcf6e89",
"/chunks/platform.js": "/chunks/platform.js?id=786df99c955c6781",
"/chunks/files.js": "/chunks/files.js?id=954d9679ec19a00e",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=fc682388bfb0e363",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=4cfda69a55d4dd7f",
"/chunks/trash.js": "/chunks/trash.js?id=ed1da867bfff2c4c",
"/chunks/team-folders.js": "/chunks/team-folders.js?id=0b7f74e182d4875b",
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=bed8ea17c597a20a",
"/chunks/invitation.js": "/chunks/invitation.js?id=9ed8456c9d6d5ce1",
"/css/tailwind.css": "/css/tailwind.css",
"/css/app.css": "/css/app.css"
}

View File

@@ -165,6 +165,9 @@ const mutations = {
SET_PAYPAL_CREDENTIALS(state, data) {
state.config.paypal_client_id = data.key
state.config.isPayPal = true
if (data.live)
state.config.isPayPalLive = data.live
},
UPDATE_DARK_MODE_STATUS(state, val) {
state.isDarkMode = val

View File

@@ -19,7 +19,7 @@ const actions = {
commit('LOADING_STATE', { loading: true, data: [] })
axios
.get(`${getters.api}/browse/folders/${id}/${getters.sorting.URI}`)
.get(`${getters.api}/browse/folders/${id}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data
@@ -85,7 +85,7 @@ const actions = {
commit('LOADING_STATE', { loading: true, data: [] })
axios
.get(`${getters.api}/browse/trash/${id}/${getters.sorting.URI}`)
.get(`${getters.api}/browse/trash/${id}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data

View File

@@ -17,7 +17,7 @@ const actions = {
}
axios
.get(`${getters.api}/teams/folders/${id}/${getters.sorting.URI}`)
.get(`${getters.api}/teams/folders/${id}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data
@@ -59,7 +59,7 @@ const actions = {
}
axios
.get(`${getters.api}/teams/shared-with-me/${id}/${getters.sorting.URI}`)
.get(`${getters.api}/teams/shared-with-me/${id}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data

View File

@@ -348,7 +348,7 @@
</AppInputText>
<div v-if="paypal.isConfigured">
<AppInputSwitch :title="$t('Live Mode')" :description="$t('Toggle amid live and sandbox mode')">
<AppInputSwitch :title="$t('Live Mode')" :description="$t('Toggle between live and sandbox mode')">
<SwitchInput
@input="$updateText('/admin/settings', 'paypal_live', config.isPayPalLive)"
v-model="config.isPayPalLive"
@@ -402,6 +402,13 @@
<FormLabel v-if="!paypal.isConfigured" icon="shield">
{{ $t('configure_your_credentials') }}
</FormLabel>
<ValidationProvider>
<AppInputSwitch v-if="! paypal.isConfigured" :title="$t('Live Mode')" :description="$t('Toggle between live and sandbox mode')">
<SwitchInput v-model="paypal.credentials.live" :state="paypal.credentials.live" />
</AppInputSwitch>
</ValidationProvider>
<ValidationProvider
tag="div"
mode="passive"
@@ -545,6 +552,7 @@ export default {
key: undefined,
secret: undefined,
webhook: undefined,
live: false,
},
},
columns: [
@@ -591,6 +599,7 @@ export default {
key: this[service].credentials.key,
secret: this[service].credentials.secret,
webhook: this[service].credentials.webhook || undefined,
live: this[service].credentials.live,
})
.then(() => {
// Update Credentials

View File

@@ -39,6 +39,8 @@ class StorePaymentServiceCredentialsController
'value' => $setting['value'],
]));
$PayPalDefaultMode = config('subscription.credentials.paypal.is_live') ? 'true' : 'false';
// Get and store credentials
if (! app()->runningUnitTests()) {
$credentials = [
@@ -55,14 +57,14 @@ class StorePaymentServiceCredentialsController
'PAYPAL_CLIENT_ID' => $request->input('key'),
'PAYPAL_CLIENT_SECRET' => $request->input('secret'),
'PAYPAL_WEBHOOK_ID' => $request->input('webhook'),
'PAYPAL_IS_LIVE' => 'true',
'PAYPAL_IS_LIVE' => $request->has('live') ? (string) $request->input('live') : $PayPalDefaultMode,
],
];
// Store credentials into the .env file
setEnvironmentValue($credentials[$request->input('service')]);
// TODO: call plan creation
// TODO: call plan synchronization
// Clear cache
if (! is_dev()) {

View File

@@ -1,4 +1,5 @@
<?php
namespace Domain\Settings\Requests;
use Illuminate\Foundation\Http\FormRequest;
@@ -26,6 +27,7 @@ class StorePaymentServiceCredentialsRequest extends FormRequest
'key' => 'required|string',
'secret' => 'required|string',
'webhook' => 'sometimes|string',
'live' => 'sometimes|nullable|boolean',
];
}
}