remove branding for subscribed users (#424)

* removebrandingfor subscribed users

* backend  changes, test

* fix test  name

* fix disable branding

* Fix linting

---------

Co-authored-by: Julien Nahum <julien@nahum.net>
This commit is contained in:
Favour Olayinka 2024-05-29 11:03:41 +01:00 committed by GitHub
parent 0cb7f86d93
commit 68b610bc15
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 99 additions and 1 deletions

View File

@ -0,0 +1,26 @@
<?php
namespace App\Events;
use App\Models\Billing\Subscription;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
class SubscriptionCreated
{
use Dispatchable;
use InteractsWithSockets;
use SerializesModels;
/**
* Create a new event instance.
*
* @return void
*/
public function __construct(public Subscription $subscription)
{
}
}

View File

@ -0,0 +1,26 @@
<?php
namespace App\Listeners;
use App\Events\SubscriptionCreated;
class HandleSubscriptionCreated
{
/**
* Handle the event.
*
* @param object $event
* @return void
*/
public function handle(SubscriptionCreated $event)
{
$user = $event->subscription->user;
// Remove branding
$user->workspaces()->with('forms')->get()->each(function ($workspace) {
$workspace->forms()->update(['no_branding' => true]);
});
}
}

View File

@ -2,6 +2,7 @@
namespace App\Models\Billing;
use App\Events\SubscriptionCreated;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Laravel\Cashier\Subscription as CashierSubscription;
@ -9,6 +10,10 @@ class Subscription extends CashierSubscription
{
use HasFactory;
protected $dispatchesEvents = [
'created' => SubscriptionCreated::class,
];
public static function booted(): void
{
static::saved(function (Subscription $sub) {

View File

@ -5,9 +5,11 @@ namespace App\Providers;
use App\Events\Forms\FormSubmitted;
use App\Events\Models\FormCreated;
use App\Events\Models\FormIntegrationsEventCreated;
use App\Events\SubscriptionCreated;
use App\Listeners\Forms\FormCreationConfirmation;
use App\Listeners\Forms\FormIntegrationsEventListener;
use App\Listeners\Forms\NotifyFormSubmission;
use App\Listeners\HandleSubscriptionCreated;
use Illuminate\Auth\Events\Registered;
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
@ -32,6 +34,9 @@ class EventServiceProvider extends ServiceProvider
FormIntegrationsEventCreated::class => [
FormIntegrationsEventListener::class,
],
SubscriptionCreated::class => [
HandleSubscriptionCreated::class
],
];
/**

View File

@ -69,6 +69,7 @@ function initUpdatedForm() {
watch(form, (form) => {
if (form?.value) {
initUpdatedForm()
}
})

View File

@ -99,7 +99,7 @@ onMounted(() => {
formStore.loadAll(workspace.value.id)
}
form.value = initForm({ workspace_id: workspace.value?.id }, true)
form.value = initForm({ workspace_id: workspace.value?.id, no_branding: workspace.value?.is_pro }, true)
formInitialHash.value = hash(JSON.stringify(form.value.data()))
if (route.query.template !== undefined && route.query.template) {
const template = templatesStore.getByKey(route.query.template)

View File

@ -0,0 +1,35 @@
<?php
use Illuminate\Support\Str;
it('can hide branding on upgrade', function () {
$user = $this->actingAsUser();
// Create workspaces and forms
for ($i = 0; $i < 3; $i++) {
$workspace = $this->createUserWorkspace($user);
for ($j = 0; $j < 3; $j++) {
$this->createForm($user, $workspace);
}
}
// Forms don't have branding removed when created
$forms = $user->workspaces()->with('forms')->get()->pluck('forms')->flatten();
$forms->each(function ($form) {
$this->assertEquals($form->no_branding, false);
});
// User subscribes
$user->subscriptions()->create([
'name' => 'default',
'stripe_id' => Str::random(),
'stripe_status' => 'active',
'stripe_price' => Str::random(),
'quantity' => 1,
]);
// Forms have branding removed after subscription
$forms = $user->workspaces()->with('forms')->get()->pluck('forms')->flatten();
$forms->each(function ($form) {
$this->assertEquals($form->no_branding, true);
});
});