Embed Ladill Queue on role pages and add specialty modules under Settings.
Deploy Ladill Care / deploy (push) Successful in 53s
Deploy Ladill Care / deploy (push) Successful in 53s
Remove the standalone Service Queues nav so call-next/now-serving lives on clinical queue, appointments, pharmacy, lab, and specialty surfaces; Pro orgs can activate dentistry and related modules with branch departments and queue stubs. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Care;
|
||||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Controllers\Care\Concerns\ScopesToAccount;
|
||||
use App\Models\Branch;
|
||||
use App\Services\Care\ServiceQueuePresenter;
|
||||
use App\Services\Queue\QueueClient;
|
||||
use Illuminate\Http\Client\RequestException;
|
||||
use Illuminate\Http\RedirectResponse;
|
||||
@@ -15,40 +15,19 @@ class ServiceQueueController extends Controller
|
||||
{
|
||||
use ScopesToAccount;
|
||||
|
||||
public function index(Request $request, QueueClient $queue): View|RedirectResponse
|
||||
public function index(Request $request): RedirectResponse
|
||||
{
|
||||
$this->authorizeAbility($request, 'service_queues.console');
|
||||
$organization = $this->organization($request);
|
||||
|
||||
if (! $this->integrationEnabled($organization)) {
|
||||
return redirect()->route('care.settings')->with('error', 'Enable Ladill Queue integration in settings first.');
|
||||
}
|
||||
|
||||
$owner = $this->ownerRef($request);
|
||||
|
||||
try {
|
||||
$counters = $queue->counters($owner);
|
||||
} catch (RequestException $e) {
|
||||
if ($queue->configured() && $e->response?->status() === 403) {
|
||||
try {
|
||||
$queue->syncIntegration($owner, true);
|
||||
$counters = $queue->counters($owner);
|
||||
} catch (RequestException) {
|
||||
return redirect()->route('care.settings')->with('error', 'Ladill Queue integration is not enabled. Save settings with Queue integration checked, and enable Care in Queue settings.');
|
||||
}
|
||||
} else {
|
||||
return redirect()->route('care.settings')->with('error', 'Could not reach Ladill Queue. Check API keys and enable integration in Queue settings.');
|
||||
}
|
||||
}
|
||||
|
||||
return view('care.service-queues.index', compact('counters', 'organization'));
|
||||
// Natural Queue: counters live on role pages (clinical queue, pharmacy, lab, specialties).
|
||||
return redirect()->route('care.queue.index');
|
||||
}
|
||||
|
||||
public function console(Request $request, string $counterUuid, QueueClient $queue): View|RedirectResponse
|
||||
{
|
||||
$this->authorizeAbility($request, 'service_queues.console');
|
||||
$organization = $this->organization($request);
|
||||
$owner = $this->ownerRef($request);
|
||||
$owner = (string) $organization->owner_ref;
|
||||
|
||||
if (! $this->integrationEnabled($organization)) {
|
||||
return redirect()->route('care.settings');
|
||||
@@ -57,7 +36,7 @@ class ServiceQueueController extends Controller
|
||||
try {
|
||||
$state = $queue->console($owner, $counterUuid);
|
||||
} catch (RequestException) {
|
||||
return redirect()->route('care.service-queues.index')->with('error', 'Counter console unavailable.');
|
||||
return redirect()->route('care.queue.index')->with('error', 'Counter console unavailable.');
|
||||
}
|
||||
|
||||
return view('care.service-queues.console', [
|
||||
@@ -70,7 +49,8 @@ class ServiceQueueController extends Controller
|
||||
public function action(Request $request, string $counterUuid, QueueClient $queue): RedirectResponse
|
||||
{
|
||||
$this->authorizeAbility($request, 'service_queues.console');
|
||||
$owner = $this->ownerRef($request);
|
||||
$organization = $this->organization($request);
|
||||
$owner = (string) $organization->owner_ref;
|
||||
|
||||
$validated = $request->validate([
|
||||
'action' => ['required', 'string'],
|
||||
|
||||
Reference in New Issue
Block a user