diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 6aeb98d..d653aac 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -10,6 +10,7 @@ use App\Models\School; use App\Services\Invoice\InvoiceDataService; use Illuminate\Support\Facades\Auth; +use function auditionSetting; use function redirect; class DashboardController extends Controller @@ -76,6 +77,11 @@ class DashboardController extends Controller if (! Auth::user()->school_id) { return redirect()->route('dashboard')->with('error', 'You do not have a school to get an invoice for'); } + + if (! auditionSetting('invoicing_enabled')) { + return redirect()->route('dashboard')->with('error', 'Invoicing is not enabled'); + } + $invoiceData = $this->invoiceService->allData(Auth::user()->school_id); $school = Auth::user()->school; diff --git a/resources/views/admin/schools/index.blade.php b/resources/views/admin/schools/index.blade.php index 61f351a..5a651c8 100644 --- a/resources/views/admin/schools/index.blade.php +++ b/resources/views/admin/schools/index.blade.php @@ -12,7 +12,9 @@ Name - Total Fees + @if(auditionSetting('invoicing_enabled')) + Total Fees + @endif Directors Students Entries @@ -22,12 +24,15 @@ @foreach($schools as $school) - {{ $school->name }} - - - ${{ number_format($schoolTotalFees[$school->id],2) }} - + {{ $school->name }} + @if(auditionSetting('invoicing_enabled')) + + + ${{ number_format($schoolTotalFees[$school->id],2) }} + + + @endif {{ $school->users->count() }} {{ $school->students->count() }} {{ $school->entries->count() }} diff --git a/resources/views/components/layout/navbar/menus/my_audition.blade.php b/resources/views/components/layout/navbar/menus/my_audition.blade.php index 10ea66d..00ea2ba 100644 --- a/resources/views/components/layout/navbar/menus/my_audition.blade.php +++ b/resources/views/components/layout/navbar/menus/my_audition.blade.php @@ -1,44 +1,51 @@
-{{-- + - -
-
- Dashboard - @if(Auth::user()->school_id) - My Students - My Entries - My Doubler Requests - My School - My Invoice - @endif - My Profile -
- @csrf - -
+ Entering: "transition ease-out duration-200" + From: "opacity-0 translate-y-1" + To: "opacity-100 translate-y-0" + Leaving: "transition ease-in duration-150" + From: "opacity-100 translate-y-0" + To: "opacity-0 translate-y-1" + --> +
+
+ Dashboard + @if(Auth::user()->school_id) + My Students + My Entries + My Doubler Requests + My School + @if(auditionSetting('invoicing_enabled')) + My Invoice + @endif + @endif + My Profile +
+ @csrf + +
+
-
diff --git a/resources/views/dashboard/dashboard.blade.php b/resources/views/dashboard/dashboard.blade.php index 506be34..a9f3856 100644 --- a/resources/views/dashboard/dashboard.blade.php +++ b/resources/views/dashboard/dashboard.blade.php @@ -20,7 +20,7 @@ My School - @if(Auth::user()->school_id) + @if(Auth::user()->school_id && auditionSetting('invoicing_enabled')) My Invoice