{{ $t('Your current estimated usage:') }}
diff --git a/resources/js/components/Others/SelectSingleChargeMethodPopup.vue b/resources/js/components/Others/SelectSingleChargeMethodPopup.vue
index 9f24357b..5cbb93f3 100644
--- a/resources/js/components/Others/SelectSingleChargeMethodPopup.vue
+++ b/resources/js/components/Others/SelectSingleChargeMethodPopup.vue
@@ -5,7 +5,10 @@
-
+
{{ $t('upgrade_banner.title') }}
-
{{ $t('upgrade_banner.description') }}
+
{{ $t('upgrade_banner.button') }}
diff --git a/resources/js/routes/routesAdmin.js b/resources/js/routes/routesAdmin.js
index 0d7a84fd..cb7498db 100644
--- a/resources/js/routes/routesAdmin.js
+++ b/resources/js/routes/routesAdmin.js
@@ -110,7 +110,6 @@ const routesAdmin = [
},
},
{
- name: 'User',
path: '/admin/user/:id',
component: () =>
import(/* webpackChunkName: "chunks/user" */ '../views/Admin/Users/User'),
diff --git a/resources/js/routes/routesIndex.js b/resources/js/routes/routesIndex.js
index 1bd50c14..6b0ce51f 100644
--- a/resources/js/routes/routesIndex.js
+++ b/resources/js/routes/routesIndex.js
@@ -26,24 +26,6 @@ const routesIndex = [
requiresAuth: false
},
},
- {
- name: 'NotFound',
- path: '/not-found',
- component: () =>
- import(/* webpackChunkName: "chunks/not-found" */ '../views/NotFound'),
- meta: {
- requiresAuth: false
- },
- },
- {
- name: 'TemporaryUnavailable',
- path: '/temporary-unavailable',
- component: () =>
- import(/* webpackChunkName: "chunks/temporary-unavailable" */ '../views/TemporaryUnavailable'),
- meta: {
- requiresAuth: false
- },
- },
]
export default routesIndex
\ No newline at end of file
diff --git a/resources/js/routes/routesOthers.js b/resources/js/routes/routesOthers.js
index a4f02012..76f79694 100644
--- a/resources/js/routes/routesOthers.js
+++ b/resources/js/routes/routesOthers.js
@@ -8,6 +8,15 @@ const routesOthers = [
requiresAuth: false
},
},
+ {
+ name: 'TemporaryUnavailable',
+ path: '/temporary-unavailable',
+ component: () =>
+ import(/* webpackChunkName: "chunks/temporary-unavailable" */ '../views/TemporaryUnavailable'),
+ meta: {
+ requiresAuth: false
+ },
+ },
]
export default routesOthers
\ No newline at end of file
diff --git a/resources/js/routes/routesUser.js b/resources/js/routes/routesUser.js
index 0dea746e..51d063b4 100644
--- a/resources/js/routes/routesUser.js
+++ b/resources/js/routes/routesUser.js
@@ -50,26 +50,6 @@ const routesUser = [
},
]
},
- {
- name: 'UpgradePlan',
- path: '/user/upgrade/plan',
- component: () =>
- import(/* webpackChunkName: "chunks/upgrade-plan" */ '../views/Upgrade/UpgradePlan'),
- meta: {
- requiresAuth: true,
- title: 'routes_title.upgrade_plan'
- },
- },
- {
- name: 'UpgradeBilling',
- path: '/user/upgrade/billing',
- component: () =>
- import(/* webpackChunkName: "chunks/upgrade-billing" */ '../views/Upgrade/UpgradeBilling'),
- meta: {
- requiresAuth: true,
- title: 'routes_title.upgrade_billing'
- },
- },
]
export default routesUser
\ No newline at end of file
diff --git a/resources/js/store/modules/app.js b/resources/js/store/modules/app.js
index d39c034c..292238d8 100644
--- a/resources/js/store/modules/app.js
+++ b/resources/js/store/modules/app.js
@@ -82,9 +82,6 @@ const mutations = {
SET_SAAS(state, data) {
state.config.isSaaS = data
},
- SET_STRIPE_PUBLIC_KEY(state, data) {
- state.config.stripe_public_key = data
- },
FILE_INFO_TOGGLE(state, isVisible) {
state.isVisibleSidebar = isVisible
@@ -108,6 +105,18 @@ const mutations = {
STORE_REQUESTED_PLAN(state, plan) {
state.requestedPlan = plan
},
+ SET_STRIPE_CREDENTIALS(state, data) {
+ state.config.stripe_public_key = data.key
+ state.config.isStripe = true
+ },
+ SET_PAYSTACK_CREDENTIALS(state, data) {
+ state.config.paystack_public_key = data.key
+ state.config.isPaystack = true
+ },
+ SET_PAYPAL_CREDENTIALS(state, data) {
+ state.config.paypal_client_id = data.key
+ state.config.isPayPal = true
+ },
}
const getters = {
diff --git a/resources/js/store/modules/payments.js b/resources/js/store/modules/payments.js
index e11697e8..7d734c33 100644
--- a/resources/js/store/modules/payments.js
+++ b/resources/js/store/modules/payments.js
@@ -18,7 +18,7 @@ const actions = {
const mutations = {
SET_SINGLE_CHARGE_AMOUNT(state, amount) {
state.singleChargeAmount = amount
- }
+ },
}
const getters = {
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Payments.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Payments.vue
index 856b1fce..37e3c03c 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Payments.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Payments.vue
@@ -1,12 +1,13 @@
+
{{ $t('Subscription Payments') }}
-
@@ -20,14 +21,14 @@
{{ $t('Stripe') }}
-
-
+
-
+
+
{{ $t('Configure Your Stripe Credentials') }}
@@ -122,13 +130,33 @@
},
data() {
return {
- isLoading: true,
+ allowedPayments: false,
+ isLoading: false,
isError: false,
errorMessage: '',
- allowedPayments: true,
stripe: {
- allowStripe: true,
- isConfigured: true,
+ allowedService: true,
+ isConfigured: false,
+ isVisibleCredentialsForm: false,
+ paymentDescription: undefined,
+ credentials: {
+ key: 'test',
+ secret: 'test',
+ }
+ },
+ paystack: {
+ allowedService: true,
+ isConfigured: false,
+ isVisibleCredentialsForm: false,
+ paymentDescription: undefined,
+ credentials: {
+ key: undefined,
+ secret: undefined,
+ }
+ },
+ paypal: {
+ allowedService: true,
+ isConfigured: false,
isVisibleCredentialsForm: false,
paymentDescription: undefined,
credentials: {
@@ -139,58 +167,88 @@
}
},
methods: {
- async stripeCredentialsSubmit() {
+ async storeCredentials(service) {
// Validate fields
- const isValid = await this.$refs.stripeCredentials.validate();
+ const isValid = await this.$refs.credentialsForm.validate();
if (!isValid) return;
// Start loading
this.isLoading = true
+ let credentials = {
+ stripe: {
+ service: 'stripe',
+ key: this.stripe.credentials.key,
+ secret: this.stripe.credentials.secret,
+ },
+ paystack: {
+ service: 'paystack',
+ key: this.paystack.credentials.key,
+ secret: this.paystack.credentials.secret,
+ },
+ paypal: {
+ service: 'paypal',
+ key: this.paypal.credentials.key,
+ secret: this.paypal.credentials.secret,
+ },
+ }
+
// Send request to get verify account
axios
- .post('/api/admin/settings/stripe', this.stripeCredentials)
+ .post('/api/admin/settings/payment-service', credentials[service])
.then(() => {
- // Store Stripe Public
- this.$store.commit('SET_STRIPE_PUBLIC_KEY', this.stripeCredentials.key)
+ // Update Credentials
+ let commitKey = {
+ stripe: 'SET_STRIPE_CREDENTIALS',
+ paystack: 'SET_PAYSTACK_CREDENTIALS',
+ paypal: 'SET_PAYPAL_CREDENTIALS',
+ }[service]
+
+ // Commit credentials
+ this.$store.commit(commitKey, credentials[service])
+
+ this[service].allowedService = true
+ this[service].isConfigured = true
+ this[service].isVisibleCredentialsForm = false
// Show toaster
events.$emit('toaster', {
type: 'success',
- message: this.$t('toaster.stripe_set'),
+ message: this.$t('toaster.credentials_set', {service: service}),
})
})
.catch(error => {
- if (error.response.status = 401) {
+ if (error.response.status === 500) {
this.isError = true
this.errorMessage = error.response.data.message
}
})
- .finally(() => {
-
- // End loading
- this.isLoading = false
- })
+ .finally(() => this.isLoading = false)
},
},
mounted() {
- axios.get('/api/admin/settings', {
- params: {
- column: 'payments_active|payments_configured'
- }
- })
- .then(response => {
- this.isLoading = false
+ this.stripe.paymentDescription = this.config.stripe_payment_description
+ this.paystack.paymentDescription = this.config.paystack_payment_description
+ this.paypal.paymentDescription = this.config.paypal_payment_description
- this.payments = {
- configured: parseInt(response.data.payments_configured),
- status: parseInt(response.data.payments_active),
- }
- })
+ this.stripe.allowedService = this.config.isStripe
+ this.paystack.allowedService = this.config.isPaystack
+ this.paypal.allowedService = this.config.isPayPal
+
+ if (this.config.stripe_public_key)
+ this.stripe.isConfigured = true
+
+ if (this.config.paystack_public_key)
+ this.paystack.isConfigured = true
+
+ if (this.config.paypal_client_id)
+ this.paypal.isConfigured = true
+
+ this.allowedPayments = this.config.allowed_payments
}
}
diff --git a/resources/js/views/Upgrade/UpgradeBilling.vue b/resources/js/views/Upgrade/UpgradeBilling.vue
deleted file mode 100644
index 7a03cfb9..00000000
--- a/resources/js/views/Upgrade/UpgradeBilling.vue
+++ /dev/null
@@ -1,820 +0,0 @@
-
-
-
+
@@ -42,7 +43,14 @@
-
-
-
-
-
-
-
diff --git a/resources/js/views/Upgrade/UpgradePlan.vue b/resources/js/views/Upgrade/UpgradePlan.vue
deleted file mode 100644
index 1c2982d6..00000000
--- a/resources/js/views/Upgrade/UpgradePlan.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
- {{ $t('page_upgrade_account.title') }}
-{{ $t('page_upgrade_account.desription') }}
-
-
-
-
-
-
- {{ $t('page_upgrade_account.section_card') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- For test your payment please use 4242 4242 4242 4242 or 5555 5555 5555 4444 as a card number, 11/22 - as the expiration date and 123 as CVC number and ZIP 12345.
-
-
-
-
-
-
-
-
- ![]()
- {{ $t('global.default') }}
-
-
- •••• {{ defaultPaymentMethod.data.attributes.last4 }}
-
-
- {{ defaultPaymentMethod.data.attributes.exp_month }} / {{ defaultPaymentMethod.data.attributes.exp_year }}
-
-
-
- {{ $t('page_upgrade_account.change_payment.you_can') }}
-
-
-
- {{ $t('page_upgrade_account.change_payment.change_payment') }}
-
-
-
- {{ $t('global.or') }}
-
-
-
- {{ $t('page_upgrade_account.change_payment.pay_by_new_card') }}
-
-
-
-
-
-
- {{ $t('page_upgrade_account.section_billing') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- State, county, province, or region.
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('page_upgrade_account.section_summary') }}
-
-
-
- {{ $t('page_upgrade_account.summary.submit_button') }}
-
-
-
- {{ $t('page_upgrade_account.summary.submit_disclaimer', {app: config.app_name}) }}
-
-
-
-
-
- {{ requestedPlan.data.attributes.name }}
- {{ $t('page_upgrade_account.summary.period') }}
-
-
- {{ requestedPlan.data.attributes.price }}
-
-
-
-
-
-
- {{ $t('page_upgrade_account.summary.vat') }} - ({{ userTaxRates.country }} {{ userTaxRates.percentage }}%)
-
-
- {{ userTaxRates.plan_price_formatted }}
-
-
-
-
-
-
- {{ $t('global.total') }}
-
-
- {{ requestedPlan.data.attributes.price }}
-
-
-
-
-
- {{ $t('page_upgrade_account.summary.total_with_vat') }}
-
-
- {{ userTaxRates.plan_price_formatted }}
-
-
-
-
-
-
-
-
-
-
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 4b50c8e8..2e305598 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -53,7 +53,6 @@
app_logo_horizontal: '{{ $settings->app_logo_horizontal ?? null }}',
app_description: '{{ $settings->app_description ?? __t('app_description') }}',
- subscriptionType: '{{ $settings->subscription_type ?? 'none' }}',
allowHomepage: {{ $settings->allow_homepage ?? 1 }},
userRegistration: {{ $settings->registration ?? 1 }},
@@ -78,19 +77,23 @@
statusCheck: {!! json_encode($status_check) ?? 'undefined' !!},
// Payments
- app_payments_active: {{ $settings->payments_active ?? 0 }},
+ allowed_payments: {{ $settings->allowed_payments ?? 0 }},
+ subscriptionType: '{{ $settings->subscription_type ?? 'none' }}',
// PayPal
- isPayPal: true,
+ isPayPal: {{ $settings->allowed_paypal ?? 0 }},
paypal_client_id: '{{ env('PAYPAL_CLIENT_ID') }}',
+ paypal_payment_description: '{{ $settings->paypal_payment_description ?? '' }}',
// Paystack
- isPaystack: true,
+ isPaystack: {{ $settings->allowed_paystack ?? 0 }},
paystack_public_key: '{{ env('PAYSTACK_PUBLIC_KEY') }}',
+ paystack_payment_description: '{{ $settings->paystack_payment_description ?? '' }}',
// Stripe
- isStripe: true,
+ isStripe: {{ $settings->allowed_stripe ?? 0 }},
stripe_public_key: '{{ env('STRIPE_PUBLIC_KEY') }}',
+ stripe_payment_description: '{{ $settings->stripe_payment_description ?? '' }}',
}
diff --git a/routes/admin.php b/routes/admin.php
index 42027c63..84c9d47a 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -15,6 +15,7 @@ use Domain\Admin\Controllers\Dashboard\GetWidgetsValuesController;
use Domain\Localization\Controllers\UpdateLanguageStringController;
use Domain\Admin\Controllers\Users\ShowUserStorageCapacityController;
use Domain\Admin\Controllers\Users\ChangeUserStorageCapacityController;
+use Domain\Settings\Controllers\StorePaymentServiceCredentialsController;
// Dashboard
Route::group(['prefix' => 'dashboard'], function () {
@@ -29,10 +30,6 @@ Route::group(['prefix' => 'users'], function () {
Route::get('/{user}/storage', ShowUserStorageCapacityController::class);
Route::patch('/{user}/role', ChangeUserRoleController::class);
Route::delete('/{user}/delete', DeleteUserController::class);
-
- // Subscription
- //Route::get('/{user}/subscription', ShowUserSubscriptionController::class);
- //Route::get('/{user}/invoices', ShowUserInvoicesController::class);
});
Route::apiResource('/users', UserController::class);
@@ -48,8 +45,7 @@ Route::group(['prefix' => 'settings'], function () {
Route::get('/flush-cache', FlushCacheController::class);
Route::post('/email', SetEmailController::class);
- // TODO: stripe setup
- //Route::post('/stripe', SetStripeController::class);
+ Route::post('/payment-service', StorePaymentServiceCredentialsController::class);
});
// Language
diff --git a/src/Domain/Settings/Controllers/SetStripeController.php b/src/Domain/Settings/Controllers/SetStripeController.php
deleted file mode 100644
index 4cfb73a2..00000000
--- a/src/Domain/Settings/Controllers/SetStripeController.php
+++ /dev/null
@@ -1,74 +0,0 @@
-runningUnitTests()) {
- Stripe::make($request->input('secret'), '2020-03-02')
- ->account()
- ->details();
- }
- } catch (UnauthorizedException $e) {
- throw new HttpException(401, $e->getMessage());
- }
-
- // Get options
- collect([
- [
- 'name' => 'stripe_currency',
- 'value' => $request->input('currency'),
- ],
- [
- 'name' => 'payments_configured',
- 'value' => 1,
- ],
- [
- 'name' => 'payments_active',
- 'value' => 1,
- ],
- ])->each(function ($col) {
- Setting::forceCreate([
- 'name' => $col['name'],
- 'value' => $col['value'],
- ]);
- });
-
- if (! app()->runningUnitTests()) {
- // Set stripe credentials to .env
- setEnvironmentValue([
- 'CASHIER_CURRENCY' => $request->input('currency'),
- 'STRIPE_KEY' => $request->input('key'),
- 'STRIPE_SECRET' => $request->input('secret'),
- 'STRIPE_WEBHOOK_SECRET' => $request->input('webhookSecret'),
- ]);
-
- // Clear cache
- Artisan::call('cache:clear');
- Artisan::call('config:clear');
- Artisan::call('config:cache');
- }
-
- return response('Done', 204);
- }
-}
diff --git a/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php b/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php
new file mode 100644
index 00000000..2c56334a
--- /dev/null
+++ b/src/Domain/Settings/Controllers/StorePaymentServiceCredentialsController.php
@@ -0,0 +1,84 @@
+runningUnitTests()) {
+ Stripe::make($request->input('secret'), '2020-03-02')
+ ->account()
+ ->details();
+ }
+ } catch (UnauthorizedException $e) {
+ throw new HttpException(401, $e->getMessage());
+ }*/
+
+ $options = [
+ 'stripe' => [
+ 'name' => 'allowed_stripe',
+ 'value' => 1,
+ ],
+ 'paypal' => [
+ 'name' => 'allowed_paypal',
+ 'value' => 1,
+ ],
+ 'paystack' => [
+ 'name' => 'allowed_paystack',
+ 'value' => 1,
+ ],
+ ];
+
+ // Get options
+ collect([$options[$request->input('service')]])
+ ->each(fn($setting) => Setting::updateOrCreate([
+ 'name' => $setting['name'],
+ ], [
+ 'value' => $setting['value'],
+ ]));
+
+ // Get and store credentials
+ if (!app()->runningUnitTests()) {
+ $credentials = [
+ 'stripe' => [
+ 'STRIPE_PUBLIC_KEY' => $request->input('key'),
+ 'STRIPE_SECRET_KEY' => $request->input('secret'),
+ ],
+ 'paystack' => [
+ 'PAYSTACK_PUBLIC_KEY' => $request->input('key'),
+ 'PAYSTACK_SECRET' => $request->input('secret'),
+ ],
+ 'paypal' => [
+ 'PAYPAL_CLIENT_ID' => $request->input('key'),
+ 'PAYPAL_CLIENT_SECRET' => $request->input('secret'),
+ ],
+ ];
+
+ // Store credentials into the .env file
+ setEnvironmentValue($credentials[$request->input('service')]);
+
+ // Clear cache
+ if (! is_dev()) {
+ Artisan::call('cache:clear');
+ Artisan::call('config:clear');
+ Artisan::call('config:cache');
+ }
+ }
+
+ return response('Done', 204);
+ }
+}
diff --git a/src/Domain/Settings/Requests/StorePaymentServiceCredentialsRequest.php b/src/Domain/Settings/Requests/StorePaymentServiceCredentialsRequest.php
new file mode 100644
index 00000000..a72e8276
--- /dev/null
+++ b/src/Domain/Settings/Requests/StorePaymentServiceCredentialsRequest.php
@@ -0,0 +1,32 @@
+ 'required|string',
+ 'secret' => 'required|string',
+ 'webhook' => 'sometimes|string',
+ ];
+ }
+}
diff --git a/tests/Domain/Settings/SettingsTest.php b/tests/Domain/Settings/SettingsTest.php
index 581c3138..97bb35c4 100644
--- a/tests/Domain/Settings/SettingsTest.php
+++ b/tests/Domain/Settings/SettingsTest.php
@@ -136,35 +136,24 @@ class SettingsTest extends TestCase
}
/**
- * TODO: complete test
+ * @test
*/
- public function it_set_stripe()
+ public function it_store_payment_service_credentials()
{
$admin = User::factory()
->create(['role' => 'admin']);
$this
->actingAs($admin)
- ->postJson('/api/admin/settings/stripe', [
- 'currency' => 'EUR',
+ ->post('/api/admin/settings/payment-service', [
+ 'service' => 'stripe',
'key' => '123456789',
'secret' => '123456789',
- 'webhookSecret' => '123456789',
])->assertStatus(204);
$this->assertDatabaseHas('settings', [
- 'name' => 'stripe_currency',
- 'value' => 'EUR',
- ]);
-
- $this->assertDatabaseHas('settings', [
- 'name' => 'payments_configured',
- 'value' => 1,
- ]);
-
- $this->assertDatabaseHas('settings', [
- 'name' => 'payments_active',
- 'value' => 1,
+ 'name' => 'allowed_stripe',
+ 'value' => '1',
]);
}
-
-
-
-
-
-
-
-
-
- {{ $t('page_pricing_tables.title') }}
-{{ $t('page_pricing_tables.description') }}
-
-
-