Team functionality (#459)
* add api enpoints for adding, removing, updating user to workspace and leaving workspace * feat: updates client site workspace settings * refactor and add domain setting ui in modal * move workspace user functionality to its own component * adds tests * fix linting * updates select input to FlatSelectInput * moves workspace user role edit to seperated component * move user adding to its own component * adds check to usure users exist before checking is admin * fix loading users * feat: invite user to team functionality * fix token coulmn * fix self host mode changes * tests for user invite * Refactor back-end * Rename variables * Improve some styling elements + refactor workspace settings * More styling * More UI polishing * More UI fixes * PHP linting * Implemented most of the logic for team-functionnality * Fix user avatar URL * WIP remove users on cancellation * Finished pricing for team functionality * Fix tests * Fix linting * Added pricing_enabled helper * Fix pricing_enabled shortcut * Debug CI * Disable pricing when testing --------- Co-authored-by: LL-Etiane <lukongleinyuyetiane@gmail.com> Co-authored-by: Lukong Etiane <83535251+LL-Etiane@users.noreply.github.com> Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
63
app/Jobs/Billing/RemoveWorkspaceGuests.php
Normal file
63
app/Jobs/Billing/RemoveWorkspaceGuests.php
Normal file
@@ -0,0 +1,63 @@
|
||||
<?php
|
||||
|
||||
namespace App\Jobs\Billing;
|
||||
|
||||
use App\Models\User;
|
||||
use App\Models\Workspace;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Bus\Dispatchable;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
|
||||
class RemoveWorkspaceGuests implements ShouldQueue
|
||||
{
|
||||
use Dispatchable;
|
||||
use InteractsWithQueue;
|
||||
use Queueable;
|
||||
use SerializesModels;
|
||||
|
||||
/**
|
||||
* Create a new job instance.
|
||||
*/
|
||||
public function __construct(public User $user)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute the job.
|
||||
*/
|
||||
public function handle(): void
|
||||
{
|
||||
// If pricing not enabled
|
||||
if (!pricing_enabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ($this->user->is_subscribed) {
|
||||
return;
|
||||
}
|
||||
|
||||
// User is not subscribed anymore - remove guests
|
||||
$this->user->workspaces->each(function (Workspace $workspace) {
|
||||
// Flush workspace cache to be sure we have the latest data
|
||||
$workspace->flush();
|
||||
if ($workspace->is_pro) {
|
||||
// Another user still has pro subscription
|
||||
return;
|
||||
}
|
||||
|
||||
// Detach all users from the workspace (except the owner)
|
||||
foreach ($workspace->users()->where('users.id', '!=', $this->user->id)->get() as $user) {
|
||||
\Log::info('Detaching user from workspace', [
|
||||
'workspace_id' => $workspace->id,
|
||||
'workspace_name' => $workspace->name,
|
||||
'user_id' => $user->id,
|
||||
'user_email' => $user->email,
|
||||
]);
|
||||
$workspace->users()->detach($user);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
106
app/Jobs/Billing/WorkspaceUsersUpdated.php
Normal file
106
app/Jobs/Billing/WorkspaceUsersUpdated.php
Normal file
@@ -0,0 +1,106 @@
|
||||
<?php
|
||||
|
||||
namespace App\Jobs\Billing;
|
||||
|
||||
use App\Models\Billing\Subscription;
|
||||
use App\Models\Workspace;
|
||||
use App\Service\BillingHelper;
|
||||
use App\Service\UserHelper;
|
||||
use Illuminate\Bus\Queueable;
|
||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||
use Illuminate\Foundation\Bus\Dispatchable;
|
||||
use Illuminate\Queue\InteractsWithQueue;
|
||||
use Illuminate\Queue\SerializesModels;
|
||||
use Illuminate\Support\Collection;
|
||||
use Laravel\Cashier\Cashier;
|
||||
|
||||
/**
|
||||
* Update subscription with extra users when workspace users are updated.
|
||||
*/
|
||||
class WorkspaceUsersUpdated implements ShouldQueue
|
||||
{
|
||||
use Dispatchable;
|
||||
use InteractsWithQueue;
|
||||
use Queueable;
|
||||
use SerializesModels;
|
||||
|
||||
/**
|
||||
* Create a new job instance.
|
||||
*/
|
||||
public function __construct(public Workspace $workspace)
|
||||
{
|
||||
//
|
||||
}
|
||||
|
||||
/**
|
||||
* Execute the job.
|
||||
*/
|
||||
public function handle(): void
|
||||
{
|
||||
// If self-hosted, no need to update billing
|
||||
if (!pricing_enabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* @var User $billingOwner
|
||||
*/
|
||||
$billingOwner = $this->workspace->billingOwners()->first();
|
||||
|
||||
if (!$billingOwner || !$billingOwner->is_subscribed) {
|
||||
// If somehow billing owner is not found or not subscribed, no need to update billing
|
||||
return;
|
||||
}
|
||||
|
||||
if ($billingOwner->activeLicense()) {
|
||||
// No need to update billing if user has a fixed license
|
||||
return;
|
||||
}
|
||||
|
||||
// Now update the subscription accordingly
|
||||
$subscription = $billingOwner->subscription();
|
||||
$totalUsersCount = (new UserHelper($billingOwner))->getActiveMembersCount() - 1;
|
||||
$this->updateSubscriptionWithExtraUsers($subscription, $totalUsersCount);
|
||||
}
|
||||
|
||||
private function updateSubscriptionWithExtraUsers(Subscription $subscription, int $quantity): void
|
||||
{
|
||||
$stripe = Cashier::stripe();
|
||||
$extraUserPricing = BillingHelper::getPricing('extra_user');
|
||||
$stripeSub = $subscription->asStripeSubscription();
|
||||
$lineItems = collect($stripeSub->items);
|
||||
|
||||
// Make sure Stripe sub has the right pro-rating settings
|
||||
$stripe->subscriptions->update($stripeSub->id, [
|
||||
'proration_behavior' => 'always_invoice',
|
||||
]);
|
||||
|
||||
// Main sub info
|
||||
$mainSubscriptionItem = $this->getLineItem($lineItems, 'default');
|
||||
$subscriptionInterval = BillingHelper::getLineItemInterval($mainSubscriptionItem);
|
||||
|
||||
$extraUserLineItem = $this->getLineItem($lineItems, 'extra_user');
|
||||
if ($extraUserLineItem) {
|
||||
$stripe->subscriptionItems->update(
|
||||
$extraUserLineItem->id,
|
||||
['quantity' => $quantity]
|
||||
);
|
||||
} else {
|
||||
$stripeSub->items->create([
|
||||
'price' => $extraUserPricing[$subscriptionInterval],
|
||||
'quantity' => $quantity,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
private function getLineItem(Collection $lineItems, string $productName)
|
||||
{
|
||||
$productId = BillingHelper::getProductId($productName);
|
||||
if (!$productId) {
|
||||
return null;
|
||||
}
|
||||
return $lineItems->first(function ($lineItem) use ($productId) {
|
||||
return $lineItem->price->product === $productId;
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user