nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-06 02:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

- extend setup:dev script

Browse Source 
- Stripe taxes refactoring
- billing subscription fixes
This commit is contained in:
Peter Papp
2021-03-24 08:19:52 +01:00
parent 09d2032a70
commit 0e3c6e286e
9 changed files with 106 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/Console/Commands/SetupDevEnvironment.php
View File

@@ -824,6 +824,38 @@ class SetupDevEnvironment extends Command
[
'name' => 'purchase_code',
'value' => '26b889eb-3602-4bf2-beb3-3sc378fcf484',
],
[
'name' => 'billing_address',
'value' => 'Palo Alto 20',
],
[
'name' => 'billing_city',
'value' => 'Palo Alto',
],
[
'name' => 'billing_country',
'value' => 'US',
],
[
'name' => 'billing_name',
'value' => 'VueFileManager Inc.',
],
[
'name' => 'billing_phone_number',
'value' => '312343141243214',
],
[
'name' => 'billing_postal_code',
'value' => '43213',
],
[
'name' => 'billing_state',
'value' => 'California',
],
[
'name' => 'billing_vat_number',
'value' => '41241241234',
]
])->each(function ($col) {
Setting::forceCreate([

27
app/Http/Controllers/User/SubscriptionController.php
View File

@@ -9,34 +9,33 @@ use App\Services\DemoService;
use App\Models\User;
use App\Services\StripeService;
use Auth;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Cache;
use Stripe\SetupIntent;
class SubscriptionController extends Controller
{
private $stripe;
private $demo;
/**
* SubscriptionController constructor.
* @param $payment
*/
public function __construct(StripeService $stripe)
public function __construct()
{
$this->stripe = $stripe;
$this->stripe = resolve(StripeService::class);
$this->demo = DemoService::class;
}
/**
* Generate setup intent
*
* @return \Stripe\SetupIntent
* @return Application|ResponseFactory|Response|SetupIntent
*/
public function setup_intent()
{
return $this->stripe
->getSetupIntent(
Auth::user()
);
return response(
$this->stripe->getSetupIntent(Auth::user()), 201
);
}
/**
@@ -69,7 +68,7 @@ class SubscriptionController extends Controller
* Upgrade account to subscription
*
* @param StoreUpgradeAccountRequest $request
* @return ResponseFactory|\Illuminate\Http\Response
* @return ResponseFactory|Response
*/
public function upgrade(StoreUpgradeAccountRequest $request)
{
@@ -107,7 +106,7 @@ class SubscriptionController extends Controller
/**
* Cancel Subscription
*
* @return ResponseFactory|\Illuminate\Http\Response
* @return ResponseFactory|Response
*/
public function cancel()
{
@@ -130,7 +129,7 @@ class SubscriptionController extends Controller
/**
* Resume Subscription
*
* @return ResponseFactory|\Illuminate\Http\Response
* @return ResponseFactory|Response
*/
public function resume()
{

2
app/Models/User.php
View File

@@ -67,7 +67,7 @@ class User extends Authenticatable
// Find tax rate
$user_tax_rate = $rates->first(function ($item) {
return $item['jurisdiction'] === $this->settings->billing_country && $item['active'];
return $item['country'] === $this->settings->country && $item['active'];
});
return $user_tax_rate ? [$user_tax_rate['id']] : [];

4
app/Services/StripeService.php
View File

@@ -70,7 +70,7 @@ class StripeService
array_push($rates_public, [
'id' => $rate['id'],
'active' => $rate['active'],
'jurisdiction' => $rate['jurisdiction'],
'country' => $rate['country'],
'percentage' => $rate['percentage'],
'plan_price_formatted' => Cashier::formatAmount(round($amount + $tax)),
]);
@@ -283,7 +283,7 @@ class StripeService
$product = $this->stripe->products()->find($plan['product']);
return [
'plan' => $plan,
'plan' => $plan,
'product' => $product,
];
});

79
resources/js/views/Upgrade/UpgradeBilling.vue
View File

@@ -1,7 +1,7 @@
<template>
<div id="single-page">
<div id="page-content" class="large-width center-page" v-show="! isLoading">
<MobileHeader :title="$router.currentRoute.meta.title"/>
<MobileHeader :title="$router.currentRoute.meta.title" />
<div class="content-page">
<div class="plan-title">
<credit-card-icon size="42" class="title-icon"></credit-card-icon>
@@ -91,7 +91,7 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper"
rules="required"
name="billing_name" v-slot="{ errors }">
<input v-model="billing.billing_name"
<input v-model="billing.name"
:placeholder="$t('user_settings.name_plac')"
type="text"
:class="{'is-error': errors[0]}"
@@ -105,7 +105,7 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper"
rules="required"
name="billing_address" v-slot="{ errors }">
<input v-model="billing.billing_address"
<input v-model="billing.address"
:placeholder="$t('user_settings.address_plac')"
type="text"
:class="{'is-error': errors[0]}"
@@ -120,7 +120,7 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper"
rules="required" name="billing_city"
v-slot="{ errors }">
<input v-model="billing.billing_city"
<input v-model="billing.city"
:placeholder="$t('user_settings.city_plac')"
type="text"
:class="{'is-error': errors[0]}"
@@ -134,7 +134,7 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper"
rules="required" name="billing_postal_code"
v-slot="{ errors }">
<input v-model="billing.billing_postal_code"
<input v-model="billing.postal_code"
:placeholder="$t('user_settings.postal_code_plac')"
type="text"
:class="{'is-error': errors[0]}"
@@ -149,8 +149,8 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper"
rules="required"
name="billing_country" v-slot="{ errors }">
<SelectInput v-model="billing.billing_country"
:default="billing.billing_country"
<SelectInput v-model="billing.country"
:default="billing.country"
:options="countries"
:placeholder="$t('user_settings.country_plac')"
:isError="errors[0]" />
@@ -163,7 +163,7 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper"
rules="required"
name="billing_state" v-slot="{ errors }">
<input v-model="billing.billing_state"
<input v-model="billing.state"
:placeholder="$t('user_settings.state_plac')"
type="text"
:class="{'is-error': errors[0]}"
@@ -180,7 +180,7 @@
<ValidationProvider tag="div" mode="passive" class="input-wrapper"
rules="required"
name="billing_phone_number" v-slot="{ errors }">
<input v-model="billing.billing_phone_number"
<input v-model="billing.phone_number"
:placeholder="$t('user_settings.phone_number_plac')"
type="text"
:class="{'is-error': errors[0]}"
@@ -206,7 +206,7 @@
</div>
<div class="row" v-if="taxRates">
<div class="cell">
<b>{{ $t('page_upgrade_account.summary.vat') }} - ({{ taxRates.jurisdiction }} {{ taxRates.percentage }}%)</b>
<b>{{ $t('page_upgrade_account.summary.vat') }} - ({{ taxRates.country }} {{ taxRates.percentage }}%)</b>
</div>
<div class="cell">
<b>{{ taxRates.plan_price_formatted }}</b>
@@ -291,11 +291,11 @@
computed: {
...mapGetters(['requestedPlan', 'config', 'countries']),
billing() {
return this.$store.getters.user.relationships.settings.data.attributes
return this.$store.getters.user.data.relationships.settings.data.attributes
},
taxRates() {
return this.requestedPlan.data.attributes.tax_rates.find(taxRate => {
return taxRate.jurisdiction === this.billing.billing_country
return taxRate.country === this.billing.country
})
}
},
@@ -405,8 +405,16 @@
} else {
axios
.post('/api/subscription/upgrade', {
billing: this.billing,
.post('/api/user/subscription/upgrade', {
billing: {
billing_address: this.billing.address,
billing_city: this.billing.city,
billing_country: this.billing.country,
billing_name: this.billing.name,
billing_phone_number: this.billing.phone_number,
billing_postal_code: this.billing.postal_code,
billing_state: this.billing.state,
},
plan: this.requestedPlan,
payment: {
type: 'stripe',
@@ -415,8 +423,12 @@
}
}
})
.then(() => this.successOrder())
.catch((error) => this.errorOrder(error))
.then(() => {
this.successOrder()
})
.catch((error) => {
this.errorOrder(error)
})
.finally(() => {
this.isSubmitted = false
})
@@ -427,15 +439,27 @@
if (this.defaultPaymentMethod && !this.payByNewCard) {
axios
.post('/api/subscription/upgrade', {
billing: this.billing,
.post('/api/user/subscription/upgrade', {
billing: {
billing_address: this.billing.address,
billing_city: this.billing.city,
billing_country: this.billing.country,
billing_name: this.billing.name,
billing_phone_number: this.billing.phone_number,
billing_postal_code: this.billing.postal_code,
billing_state: this.billing.state,
},
plan: this.requestedPlan,
payment: {
type: 'stripe',
}
})
.then(() => this.successOrder())
.catch((error) => this.errorOrder(error))
.then(() => {
this.successOrder()
})
.catch((error) => {
this.errorOrder(error)
})
.finally(() => {
this.isSubmitted = false
})
@@ -452,11 +476,13 @@
created() {
// Get setup intent for stripe
axios.get('/api/subscription/setup-intent')
axios.get('/api/user/subscription/setup-intent')
.then(response => {
this.clientSecret = response.data.client_secret
})
.catch(() => this.$isSomethingWrong())
.catch(() => {
this.$isSomethingWrong()
})
axios.get('/api/user/payments')
.then(response => {
@@ -464,11 +490,12 @@
this.defaultPaymentMethod = response.data.default
this.PaymentMethods = response.data.others
})
.catch(() => this.$isSomethingWrong())
.catch(() => {
this.$isSomethingWrong()
})
.finally(() => {
this.isLoading = false
}
)
this.isLoading = false
})
}
}
</script>

2
resources/js/views/User/CreatePaymentMethod.vue
View File

@@ -161,7 +161,7 @@
document.head.appendChild(StripeElementsScript)
// Get setup intent for stripe
axios.get('/api/subscription/setup-intent')
axios.get('/api/user/subscription/setup-intent')
.then(response => {
this.clientSecret = response.data.client_secret

4
resources/views/vuefilemanager/invoice.blade.php
View File

@@ -232,7 +232,7 @@
@foreach ($invoice->taxes() as $tax)
<tr>
<td colspan="2" style="text-align: right;">
{{ $tax->display_name }} {{ $tax->jurisdiction ? ' - '.$tax->jurisdiction : '' }}
{{ $tax->display_name }} {{ $tax->country ? ' - '.$tax->country : '' }}
({{ $tax->percentage }}%{{ $tax->isInclusive() ? ' incl.' : '' }})
</td>
<td>{{ $tax->amount() }}</td>
@@ -335,7 +335,7 @@
@foreach ($invoice->taxes() as $tax)
<tr>
<td colspan="3" style="text-align: right;">
{{ $tax->display_name }} {{ $tax->jurisdiction ? ' - '.$tax->jurisdiction : '' }}
{{ $tax->display_name }} {{ $tax->country ? ' - '.$tax->country : '' }}
({{ $tax->percentage }}%{{ $tax->isInclusive() ? ' ' . __('vuefilemanager.vat_included') : '' }})
</td>
<td>{{ $tax->amount() }}</td>

2
routes/user.php
View File

@@ -17,7 +17,7 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
Route::get('/storage', [AccountController::class, 'storage']);
Route::get('/', [AccountController::class, 'user']);
// Payment cards TODO: tests
// Payment cards
Route::delete('/payment-cards/{id}', [PaymentMethodsController::class, 'delete']);
Route::patch('/payment-cards/{id}', [PaymentMethodsController::class, 'update']);
Route::post('/payment-cards', [PaymentMethodsController::class, 'store']);

2
tests/Feature/External/SubscriptionTest.php vendored
View File

@@ -71,7 +71,7 @@ class SubscriptionTest extends TestCase
Sanctum::actingAs($user);
$this->getJson('/api/user/subscription/setup-intent')
->assertStatus(200)
->assertStatus(201)
->assertJsonFragment([
"object" => "setup_intent"
]);