diff --git a/app/Http/Controllers/AreaController.php b/app/Http/Controllers/AreaController.php index 9d7757f0..2d70bc20 100644 --- a/app/Http/Controllers/AreaController.php +++ b/app/Http/Controllers/AreaController.php @@ -4,7 +4,7 @@ namespace App\Http\Controllers; use App\Models\Area; use Illuminate\Http\Request; use Illuminate\Routing\Controller; -use Spatie\Permission\Models\Role; +use App\Models\Role; class AreaController extends Controller { diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 57c1ce8c..a38be054 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -10,7 +10,7 @@ use Illuminate\Routing\Controller; use Illuminate\Support\Facades\Password; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Str; -use Spatie\Permission\Models\Role; +use App\Models\Role; use Illuminate\Auth\Notifications\ResetPassword; class UserController extends Controller diff --git a/app/Livewire/DataProspecto.php b/app/Livewire/DataProspecto.php index dee9c241..d61a2a16 100644 --- a/app/Livewire/DataProspecto.php +++ b/app/Livewire/DataProspecto.php @@ -255,9 +255,11 @@ class DataProspecto extends Component $q->where('plantels.id', $this->pplantels) )->get(); - $this->planesPago = Plane::whereHas('planPlantel', function ($q) { - $q->where('plantels.id', $this->pplantels); - })->get(); + $this->planesPago = Plane::where('nivel', $this->selectedNivel) + ->whereHas('planPlantel', function ($q) { + $q->where('plantels.id', $this->pplantels); + }) + ->get(); $this->conceptosNombres = Concepto::where('tipo','=','3' )->get(); diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php index c5cb2111..3ac549f2 100644 --- a/resources/views/auth/reset-password.blade.php +++ b/resources/views/auth/reset-password.blade.php @@ -41,7 +41,7 @@