Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

updates

Browse Source
This commit is contained in:
Andras Bacsai 2023-08-24 17:41:11 +02:00
parent 6f14e127a3
commit 9ef3218bb5
5 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Livewire/Subscription/PricingPlans.php
View File

@ -44,9 +44,6 @@ public function subscribeStripe($type)
'price' => $priceId,
'quantity' => 1,
]],
'customer_update' =>[
'name' => 'auto'
],
'tax_id_collection' => [
'enabled' => true,
],
@ -57,6 +54,9 @@ public function subscribeStripe($type)
$customer = currentTeam()->subscription?->stripe_customer_id ?? null;
if ($customer) {
$payload['customer'] = $customer;
$payload['customer_update'] = [
'name' => 'auto'
];
} else {
$payload['customer_email'] = auth()->user()->email;
}

4
app/Http/Middleware/IsBoardingFlow.php
View File

@ -15,8 +15,8 @@ class IsBoardingFlow
*/
public function handle(Request $request, Closure $next): Response
{
ray('IsBoardingFlow Middleware');
if (showBoarding() && !in_array($request->path(), allowedPaths())) {
// ray('IsBoardingFlow Middleware');
if (showBoarding() && !in_array($request->path(), allowedPathsForBoardingAccounts())) {
return redirect('boarding');
}
return $next($request);

2
app/Http/Middleware/SubscriptionValid.php
View File

@ -27,7 +27,7 @@ public function handle(Request $request, Closure $next): Response
}
if (!isSubscriptionActive() && !isSubscriptionOnGracePeriod()) {
// ray('SubscriptionValid Middleware');
if (!in_array($request->path(), allowedPaths())) {
if (!in_array($request->path(), allowedPathsForUnsubscribedAccounts())) {
return redirect('subscription');
} else {
return $next($request);

12
bootstrap/helpers/subscriptions.php
View File

@ -104,7 +104,7 @@ function getStripeCustomerPortalSession(Team $team)
]);
return $session;
}
function allowedPaths()
function allowedPathsForUnsubscribedAccounts()
{
return [
'subscription',
@ -113,11 +113,17 @@ function allowedPaths()
'waitlist',
'force-password-reset',
'logout',
'boarding',
'livewire/message/boarding',
'livewire/message/force-password-reset',
'livewire/message/check-license',
'livewire/message/switch-team',
'livewire/message/subscription.pricing-plans'
];
}
function allowedPathsForBoardingAccounts()
{
return [
...allowedPathsForUnsubscribedAccounts(),
'boarding',
'livewire/message/boarding',
];
}

10
resources/views/components/pricing-plans.blade.php
View File

@ -5,15 +5,15 @@
<div class="px-6 mx-auto lg:px-8">
<div class="flex justify-center mt-5">
<fieldset
class="grid grid-cols-2 p-1 text-xs font-semibold leading-5 text-center rounded-full gap-x-1 ring-1 ring-inset ring-coolgray-500">
class="grid grid-cols-2 p-1 text-xs font-semibold leading-5 text-center rounded-full gap-x-1 ">
<legend class="sr-only">Payment frequency</legend>
<label class="cursor-pointer rounded-full px-2.5 py-1"
<label class="cursor-pointer rounded px-2.5 py-1"
:class="selected === 'monthly' ? 'bg-coollabs-100 text-white' : ''">
<input type="radio" x-on:click="selected = 'monthly'" name="frequency" value="monthly"
class="sr-only">
<span>Monthly</span>
</label>
<label class="cursor-pointer rounded-full px-2.5 py-1"
<label class="cursor-pointer rounded px-2.5 py-1"
:class="selected === 'yearly' ? 'bg-coollabs-100 text-white' : ''">
<input type="radio" x-on:click="selected = 'yearly'" name="frequency" value="annually"
class="sr-only">
@ -22,11 +22,11 @@ class="sr-only">
</fieldset>
</div>
<div x-show="selected === 'monthly'" class="flex justify-center h-10 mt-3 text-sm leading-6 ">
<div>Save <span class="font-bold text-warning">10% </span> annually with the yearly plan.
<div>Save <span class="font-bold text-warning">1 month</span> annually with the yearly plans.
</div>
</div>
<div x-show="selected === 'yearly'" class="flex justify-center h-10 mt-3 text-sm leading-6 ">
<div>Congratulations! 🎉 You are saving money with this choice!
<div>
</div>
</div>
<div class="flow-root mt-12">