Assign the existing site to one landlord so stommer.info can run tenancy.
Seebad 0.3 stays in this release. With a single landlord every host still reaches the default website. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
d9e52c4789
commit
8ebc1a3878
93 files changed
+2506
-112
No files matched your search
@@ -20,7 +20,8 @@ public function confirm(Guest $guest): View
|
||||
return view('marketing-consent', [
|
||||
'title' => 'Anmeldung bestätigt',
|
||||
'message' => 'Vielen Dank! Wir informieren Sie künftig über freie Termine und Angebote. Sie können sich jederzeit wieder abmelden.',
|
||||
'unsubscribeUrl' => URL::signedRoute('marketing.unsubscribe', $guest),
|
||||
'unsubscribeUrl' => $guest->website()?->signedRoute('marketing.unsubscribe', $guest)
|
||||
?? URL::signedRoute('marketing.unsubscribe', $guest),
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
use App\Enums\BookingStatus;
|
||||
use App\Exceptions\ReservationException;
|
||||
use App\Models\Booking;
|
||||
use DateTimeInterface;
|
||||
use Illuminate\Contracts\View\View;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -38,8 +39,8 @@ public function show(Request $request, Booking $booking, AcceptOffer $accept): V
|
||||
'booking' => $booking,
|
||||
'problem' => $problem,
|
||||
'canAnswer' => $booking->status === BookingStatus::OfferSent && $problem === null,
|
||||
'acceptUrl' => URL::temporarySignedRoute('offers.accept', $expires, ['booking' => $booking, 'v' => $version]),
|
||||
'rejectUrl' => URL::temporarySignedRoute('offers.reject', $expires, ['booking' => $booking, 'v' => $version]),
|
||||
'acceptUrl' => $this->signed($booking, 'offers.accept', $expires, $version),
|
||||
'rejectUrl' => $this->signed($booking, 'offers.reject', $expires, $version),
|
||||
'title' => 'Ihr Angebot',
|
||||
]);
|
||||
}
|
||||
@@ -62,7 +63,7 @@ public function reject(Request $request, Booking $booking, RejectOffer $reject):
|
||||
private function answer(Request $request, Booking $booking, callable $action, string $success): RedirectResponse
|
||||
{
|
||||
$version = (int) $request->query('v');
|
||||
$back = URL::temporarySignedRoute('offers.show', now()->addDays(30), ['booking' => $booking, 'v' => $version]);
|
||||
$back = $this->signed($booking, 'offers.show', now()->addDays(30), $version);
|
||||
|
||||
try {
|
||||
$action($version);
|
||||
@@ -72,4 +73,12 @@ private function answer(Request $request, Booking $booking, callable $action, st
|
||||
|
||||
return redirect()->to($back)->with('offer.success', $success);
|
||||
}
|
||||
|
||||
private function signed(Booking $booking, string $name, DateTimeInterface $expiration, int $version): string
|
||||
{
|
||||
$parameters = ['booking' => $booking, 'v' => $version];
|
||||
|
||||
return $booking->website()?->temporarySignedRoute($name, $expiration, $parameters)
|
||||
?? URL::temporarySignedRoute($name, $expiration, $parameters);
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,9 @@
|
||||
|
||||
namespace App\Http\Middleware;
|
||||
|
||||
use App\Models\Tenant;
|
||||
use App\Models\User;
|
||||
use App\Tenancy\TenantContext;
|
||||
use App\Themes\Theme;
|
||||
use App\Themes\ThemeFactory;
|
||||
use Closure;
|
||||
@@ -17,8 +20,42 @@ public function __construct(private ThemeFactory $factory) {}
|
||||
|
||||
public function handle(Request $request, Closure $next): Response
|
||||
{
|
||||
app()->instance(Theme::class, $this->factory->forRequest($request)->activate());
|
||||
$context = app(TenantContext::class);
|
||||
$context->forget();
|
||||
|
||||
$theme = $this->factory->forRequest($request)->activate();
|
||||
app()->instance(Theme::class, $theme);
|
||||
|
||||
$tenant = null;
|
||||
|
||||
if ($theme->site->exists && $theme->site->tenant_id !== null) {
|
||||
$tenant = $theme->site->tenant;
|
||||
} elseif (Tenant::query()->count() === 1) {
|
||||
$tenant = Tenant::query()->first();
|
||||
}
|
||||
|
||||
if ($tenant !== null) {
|
||||
if (! $tenant->is_active && ! $this->operatorMayPass($request)) {
|
||||
abort(404);
|
||||
}
|
||||
|
||||
$context->set($tenant);
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
/**
|
||||
* A suspended landlord stays reachable for the operator, and the operator panel itself stays open.
|
||||
*/
|
||||
private function operatorMayPass(Request $request): bool
|
||||
{
|
||||
if ($request->is('betreiber', 'betreiber/*')) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$user = $request->user();
|
||||
|
||||
return $user instanceof User && $user->is_operator;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user