subir cambios

app/Console/Kernel.php

@@ -12,8 +12,6 @@ class Kernel extends ConsoleKernel {
 	 */
 	protected $commands = [
 		'App\Console\Commands\Inspire',
-		'App\Console\Commands\bajaEmpleado',
-		'App\Console\Commands\avisoPago',
 	];
 
 	/**
@@ -26,10 +24,6 @@ protected function schedule(Schedule $schedule)
 	{
 		$schedule->command('inspire')
 				 ->hourly();
-		/*$schedule->command('bajaEmpleado')
-				 ->thursday()->at('09:48')->evenInMaintenanceMode();*/
-		$schedule->command('avisoPago')
-				 ->dailyAt('08:47')->evenInMaintenanceMode();
 	}
 
 }

app/EmpleadoCt.php

@@ -8,5 +8,5 @@ class EmpleadoCt extends Model {
 	protected $table = 'empleados_ct';
 	protected $primaryKey = 'idEmpleadoCt';
 
-	protected $fillable = ['idEmpleadoCt','ap_paterno','ap_materno','nombres','curp','imss','idestado','fecha_nacimiento','rfc','genero','area','no_cuenta','estado'];
+	protected $fillable = ['idEmpleadoCt','ap_paterno','ap_materno','nombres','curp','imss','idestado','fecha_nacimiento','rfc','genero','area','no_cuenta','fecha_ingreso','estado'];
 }

app/Exceptions/Handler.php

@@ -36,7 +36,14 @@ public function report(Exception $e)
 	 */
 	public function render($request, Exception $e)
 	{
-		return parent::render($request, $e);
+		if ($this->isHttpException($e))
+		{
+			return $this->renderHttpException($e);
+		}
+		else
+		{
+			return parent::render($request, $e);
+		}
 	}
 
 }

app/Http/Controllers/Auth/AuthController.php

@@ -2,7 +2,7 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Contracts\Auth\Guard;
-use App\Services\Registrar;
+use Illuminate\Contracts\Auth\Registrar;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 
 class AuthController extends Controller {
@@ -20,15 +20,6 @@ class AuthController extends Controller {
 
 	use AuthenticatesAndRegistersUsers;
 
-	public function redirectPath()
-	{
-		if (property_exists($this, 'redirectPath'))
-		{
-			return $this->redirectPath;
-		}
-
-		return property_exists($this, 'redirectTo') ? $this->redirectTo : '/';
-	}
 	/**
 	 * Create a new authentication controller instance.
 	 *

app/Http/Controllers/Auth/PasswordController.php

@@ -19,7 +19,6 @@ class PasswordController extends Controller {
 	*/
 
 	use ResetsPasswords;
-	protected $redirectTo = '/';
 
 	/**
 	 * Create a new password controller instance.

app/Http/Controllers/AutorizacionController.php

@@ -57,6 +57,8 @@ public function HacerCotizacion()
 		}
 	}
 
+
+
 	//Envia correo con el formulario
 	public function enviarMensaje(Request $request)
 	{	

app/Http/Controllers/CURP.php

@@ -1,27 +1,29 @@
 <?php namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\Estado;
+use App\Modelos\Estado;
 
 class CURP{
 
 	public function generar(Request $request){
 
 		$curp = '';
 		$vocales = ['a','e','i','o','u'];
-		$consonantes = ['b','c','d','f','g','h','j','k','l','m','n','ñ','p','q','r','s','t','v','w','x','y','z'];
+		$consonantes = ['b','c','d','f','g','h','j','k','l','m','n','p','q','r','s','t','v','w','x','y','z'];
 
 		$estado = Estado::find($request->input('id_estados'));
-		$ap_paterno = strtolower($request->input('ap_paterno'));
+		$ap_paterno = mb_strtolower($request->input('ap_paterno'));
 		$ap_paterno = $this->quitarArticulos($ap_paterno);
-		$ap_materno = strtolower($request->input('ap_materno'));
+		$ap_materno = mb_strtolower($request->input('ap_materno'));
 		$ap_materno = $this->quitarArticulos($ap_materno);
 		if($ap_materno == null){
 			$ap_materno = 'xx';
 		}
-		$nombre = strtolower($request->input('nombres'));
+		$nombre = mb_strtolower($request->input('nombres'));
 		$nombre = $this->quitarNombresComunes($nombre);
 		$nombre = $this->quitarArticulos($nombre);
+		$unNombre = explode(" ", $nombre);
+		$nombre = $unNombre[0];
 		$fecha_nacimiento = (string)$request->input('fecha_nacimiento');
 
 
@@ -32,11 +34,40 @@ public function generar(Request $request){
 		    	$curp = $curp . $ap_paterno[$i];
 		    	break;
 		    }
+		    if ($i == (strlen($ap_paterno)-1)){
+		    	$curp = $curp . 'x';
+		    }
 		}
 
 		$curp = $curp . $ap_materno[0];
 		$curp = $curp . $nombre[0];
-
+		//Cambiar palabras altisonantes
+		$altisonantes = array("baca", "baka", "buei", "buey", 
+			"caca", "caco", "caga", "cago", "caka", "cako", "coge", 
+			"cogi", "coja", "coje", "coji", "cojo", "cola", "culo", 
+			"falo", "feto", "geta", "guei", "guey", "jeta", "joto", 
+			"kaca", "kaco", "kaga", "kago", "kaka", "kako", "koge", 
+			"kogi", "koja", "koje", "koji", "kojo", "kola", "kulo", 
+			"lilo", "loca", "loco", "loka", "loko", "mame", "mamo", 
+			"mear", "meas", "meon", "miar", "mion", "moco", "moko", 
+			"mula", "mulo", "naca", "naco", "peda", "pedo", "pene", 
+			"pipi", "pito", "popo", "puta", "puto", "qulo", "rata", 
+			"roba", "robe", "robo", "ruin", "seno", "teta", "vaca", 
+			"vaga", "vago", "vaka", "vuei", "vuey", "wuei", "wuey");
+
+		$reemplazo_altisonante = array("bxca", "bxka", "bxei", "bxey", "cxca", "cxco", 
+			"cxga", "cxgo", "cxka", "cxko", "cxge", "cxgi", "cxja", 
+			"cxje", "cxji", "cxjo", "cxla", "cxlo", "fxlo", "fxto", 
+			"gxta", "gxei", "gxey", "jxta", "jxto", "kxca", "kxco", 
+			"kxga", "kxgo", "kxka", "kxko", "kxge", "kxgi", "kxja", 
+			"kxje", "kxji", "kxjo", "kxla", "kxlo", "lxlo", "lxca", 
+			"lxco", "lxka", "lxko", "mxme", "mxmo", "mxar", "mxas", 
+			"mxon", "mxar", "mxon", "mxco", "mxko", "mxla", "mxlo", 
+			"nxca", "nxco", "pxda", "pxdo", "pxne", "pxpi", "pxto", 
+			"pxpo", "pxta", "pxto", "qxlo", "rxta", "rxba", "rxbe", 
+			"rxbo", "rxin", "sxno", "txta", "vxca", "vxga", "vxgo", 
+			"vxka", "vxei","vxey", "wxei", "wxey");
+		$curp = str_replace($altisonantes, $reemplazo_altisonante, $curp);
 		//agregar fecha de nacimiento en formato AAMMDD
 		$curp = $curp . $fecha_nacimiento[2] . $fecha_nacimiento[3] . $fecha_nacimiento[5] . $fecha_nacimiento[6] . $fecha_nacimiento[8] .$fecha_nacimiento[9];
 
@@ -54,25 +85,35 @@ public function generar(Request $request){
 		    	$curp = $curp . $ap_paterno[$i];
 		    	break;
 		    }
+		    if ($i == (strlen($ap_paterno)-1)){
+		    	$curp = $curp . 'x';
+		    }
 		}
 
 		for( $i = 1; $i < strlen($ap_materno); $i++ ) {
 		    if(in_array($ap_materno[$i], $consonantes)){
 		    	$curp = $curp . $ap_materno[$i];
 		    	break;
 		    }
+		    if ($i == (strlen($ap_materno)-1)){
+		    	$curp = $curp . 'x';
+		    }
 		}
 
 		for( $i = 1; $i < strlen($nombre); $i++ ) {
 		    if(in_array($nombre[$i], $consonantes)){
 		    	$curp = $curp . $nombre[$i];
 		    	break;
 		    }
+		    if ($i == (strlen($nombre)-1)){
+		    	$curp = $curp . 'x';
+		    }
 		}
 
 		//siguen dos caracteres al azar
 
 		return strtoupper($curp);
+		//return strtoupper($nombre);
 	}
 
 	public function validar(Request $request, $curpGenerada){
@@ -87,21 +128,31 @@ public function validar(Request $request, $curpGenerada){
 
 
 	function quitarArticulos($palabra) 
-	{ 
-		$palabra=str_replace("del ","",$palabra); 
-		$palabra=str_replace("las ","",$palabra); 
-		$palabra=str_replace("de ","",$palabra); 
-		$palabra=str_replace("la ","",$palabra); 
-		$palabra=str_replace("y ","",$palabra); 
-		$palabra=str_replace("a ","",$palabra); 
+	{ 	
+		/* palabras estipuladas en el instructivo normativo para la asignación
+		de la CURP que deben ser omitidas en los nombres y apellidos en caso de que estos
+		contengan alguna de estas palabras*/
+		$palabras = array(" da ", " das ", " de ", " del ", " der ", " di ", " die ", " dd ", " el "," la ", 
+			" los ", " las ", " le ", " les ", " mac ", " mc ", " van ", " von ", " y ", " a ");
+		/* se le agrega un espacion en blanco al inicio para poder quitar una de las palabras
+		anteriores si se encuentra al inicio del apellido o nombre */
+		$palabra = " ".$palabra;
+		/* se sustituyen cada una de las palabras a omitir por un espacio en blanco
+		por si una de las palabras a omitir queda al inicio */
+		$palabra = str_replace($palabras, " ", $palabra);
+		/* Ya sustituidas las palabras que deben ser omitidas, se quitan los espacios
+		en blanco para proceder con la generación de la CURP */
+		$palabra = trim($palabra); 
 		$palabra=str_replace("ñ",'x',$palabra);
+
 		return $palabra; 
 	} 
 
 	function quitarNombresComunes($palabra)
 	{
-		$palabra = str_replace("jose ","",$palabra);
-		$palabra = str_replace("maria ", "", $palabra);
+		$palabras = array("jose ", "maria ", "ma ", "ma. ", "j ", "j. ");
+		$palabra = str_replace($palabras, "", $palabra);
+
 		return $palabra;
 	}
 }