massive improvements to tests, streamlined and synced migrations, fixed a lot of wrong or old table field references. implemented a lot of pages in react for website frontend
This commit is contained in:
@@ -3,32 +3,31 @@
|
||||
namespace App\Http\Controllers\Auth;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Package;
|
||||
use App\Models\TenantPackage;
|
||||
use App\Models\User;
|
||||
use App\Models\Tenant;
|
||||
use App\Models\Package;
|
||||
use App\Models\TenantPackage;
|
||||
use App\Models\PackagePurchase;
|
||||
use Illuminate\Auth\Events\Registered;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
use Illuminate\Validation\Rules;
|
||||
use Illuminate\Support\Str;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\View\View;
|
||||
|
||||
class MarketingRegisterController extends Controller
|
||||
{
|
||||
/**
|
||||
* Show the registration form.
|
||||
* Show the registration page.
|
||||
*/
|
||||
public function create(Request $request): View
|
||||
public function create(Request $request, $package_id = null): \Illuminate\View\View
|
||||
{
|
||||
$package = null;
|
||||
if ($request->has('package_id')) {
|
||||
$package = Package::findOrFail($request->package_id);
|
||||
}
|
||||
$package = $package_id ? Package::find($package_id) : null;
|
||||
|
||||
return view('marketing.register', compact('package'));
|
||||
return view('marketing.register', [
|
||||
'package' => $package,
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -40,14 +39,14 @@ class MarketingRegisterController extends Controller
|
||||
{
|
||||
$request->validate([
|
||||
'name' => ['required', 'string', 'max:255'],
|
||||
'username' => ['required', 'string', 'max:255', 'unique:' . User::class, 'alpha_dash'],
|
||||
'email' => ['required', 'string', 'email', 'max:255', 'unique:' . User::class],
|
||||
'username' => ['required', 'string', 'max:255', 'unique:'.User::class],
|
||||
'email' => ['required', 'string', 'lowercase', 'email', 'max:255', 'unique:'.User::class],
|
||||
'password' => ['required', 'confirmed', Rules\Password::defaults()],
|
||||
'first_name' => ['required', 'string', 'max:255'],
|
||||
'last_name' => ['required', 'string', 'max:255'],
|
||||
'address' => ['required', 'string'],
|
||||
'address' => ['required', 'string', 'max:500'],
|
||||
'phone' => ['required', 'string', 'max:20'],
|
||||
'privacy_consent' => ['required', 'accepted'],
|
||||
'privacy_consent' => ['accepted'],
|
||||
'package_id' => ['nullable', 'exists:packages,id'],
|
||||
]);
|
||||
|
||||
@@ -55,12 +54,11 @@ class MarketingRegisterController extends Controller
|
||||
'name' => $request->name,
|
||||
'username' => $request->username,
|
||||
'email' => $request->email,
|
||||
'password' => Hash::make($request->password),
|
||||
'first_name' => $request->first_name,
|
||||
'last_name' => $request->last_name,
|
||||
'address' => $request->address,
|
||||
'phone' => $request->phone,
|
||||
'preferred_locale' => $request->preferred_locale ?? 'de',
|
||||
'password' => Hash::make($request->password),
|
||||
]);
|
||||
|
||||
$tenant = Tenant::create([
|
||||
@@ -68,27 +66,68 @@ class MarketingRegisterController extends Controller
|
||||
'name' => $request->name,
|
||||
'slug' => Str::slug($request->name . '-' . now()->timestamp),
|
||||
'email' => $request->email,
|
||||
'is_active' => true,
|
||||
'is_suspended' => false,
|
||||
'event_credits_balance' => 0,
|
||||
'subscription_tier' => 'free',
|
||||
'subscription_expires_at' => null,
|
||||
'settings' => json_encode([
|
||||
'branding' => [
|
||||
'logo_url' => null,
|
||||
'primary_color' => '#3B82F6',
|
||||
'secondary_color' => '#1F2937',
|
||||
'font_family' => 'Inter, sans-serif',
|
||||
],
|
||||
'features' => [
|
||||
'photo_likes_enabled' => false,
|
||||
'event_checklist' => false,
|
||||
'custom_domain' => false,
|
||||
'advanced_analytics' => false,
|
||||
],
|
||||
'custom_domain' => null,
|
||||
'contact_email' => $request->email,
|
||||
'event_default_type' => 'general',
|
||||
]),
|
||||
]);
|
||||
|
||||
// If package_id provided and free, assign immediately
|
||||
if ($request->package_id) {
|
||||
$package = Package::find($request->package_id);
|
||||
if ($package && $package->price == 0) {
|
||||
TenantPackage::create([
|
||||
'tenant_id' => $tenant->id,
|
||||
'package_id' => $package->id,
|
||||
'active' => true,
|
||||
'expires_at' => now()->addYear(), // or based on package duration
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
event(new Registered($user));
|
||||
|
||||
Auth::login($user);
|
||||
|
||||
// Send Welcome Email
|
||||
\Illuminate\Support\Facades\Mail::to($user)->send(new \App\Mail\Welcome($user));
|
||||
|
||||
if ($request->filled('package_id')) {
|
||||
$package = Package::find($request->package_id);
|
||||
if (!$package) {
|
||||
// Fallback for invalid package_id
|
||||
} else if ($package->price == 0) {
|
||||
// Assign free package
|
||||
TenantPackage::create([
|
||||
'tenant_id' => $tenant->id,
|
||||
'package_id' => $package->id,
|
||||
'active' => true,
|
||||
'price' => 0,
|
||||
]);
|
||||
|
||||
PackagePurchase::create([
|
||||
'tenant_id' => $tenant->id,
|
||||
'package_id' => $package->id,
|
||||
'type' => $package->type === 'endcustomer' ? 'endcustomer_event' : 'reseller_subscription',
|
||||
'price' => 0,
|
||||
'purchased_at' => now(),
|
||||
'provider_id' => 'free',
|
||||
]);
|
||||
|
||||
$tenant->update(['subscription_status' => 'active']);
|
||||
} else {
|
||||
// Redirect to buy for paid package
|
||||
return redirect()->route('buy.packages', $package->id);
|
||||
}
|
||||
}
|
||||
|
||||
return $user->hasVerifiedEmail()
|
||||
? redirect()->intended('/admin')
|
||||
? redirect()->intended(route('dashboard'))
|
||||
: redirect()->route('verification.notice');
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user