Todos los cambios

app/Contrato.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Spatie\Activitylog\Traits\LogsActivity;
+
+class Contrato extends Model
+{
+    use HasFactory;
+    use SoftDeletes;
+    use LogsActivity;
+
+    protected $fillable=[
+		"denominacion",
+		"fecha",
+		"plazo",
+		"valor",
+    "gasolinera_id"];
+
+    protected static $logFillable = true;
+
+    public function gasolinera(){
+		  return $this->belongsTo(Gasolinera::class);
+	}
+}

app/Exports/ClavesExport.php

@@ -26,9 +26,14 @@ public function headings(): array
             'Combustible',
             'Nro Orden',
             'Factura',
+            'Station_id',
             'Razonsocial',
+            'Vehiculo_id',
             'Vehiculo',
+            'usr_creador',
+            'Conductor_id',
             'Conductor',
+            'usr_editor'
         ];
     }
 
@@ -38,7 +43,7 @@ public function collection()
         ->join('vehiculos','vehiculos.id','=','claves.vehiculo_id')
         ->join('users','users.id','=','claves.user_id')
         ->join('gasolineras','gasolineras.id','=','claves.gasolinera_id')
-        ->select('claves.id','claves.created_at','claves.km_salida','claves.km_gasolinera','claves.km_llegada','claves.dolares','claves.galones','claves.combustible','claves.orden','claves.factura','gasolineras.razonsocial','vehiculos.codigodis','users.name')
+        ->select('claves.id','claves.created_at','claves.km_salida','claves.km_gasolinera','claves.km_llegada','claves.dolares','claves.galones','claves.combustible','claves.orden','claves.factura','claves.gasolinera_id','gasolineras.razonsocial','claves.vehiculo_id','vehiculos.codigodis','usr_creador','claves.user_id','users.name','usr_editor')
         ->get();
     }
 

app/Gasolinera.php

@@ -12,11 +12,19 @@ class Gasolinera extends Model
 	use SoftDeletes;
 	use LogsActivity;
 
-	protected $fillable=["razonsocial","ruc","direccion","email","monto_contrato"];
+	protected $fillable=["razonsocial","ruc","direccion","email","status"];
 	protected static $logFillable = true;
 
 	public function clave(){
-		//Muestra informacion de las Claves Realizadas por gasolinera
 	return $this->hasMany(Clave::class);
-}
+	}
+
+	public function contrato(){
+		return $this->hasMany(Contrato::class);
+	}
+
+	public function solicitud(){
+		return $this->hasMany(Solicitud::class);
+	}
+
 }

app/Http/Controllers/ClaveController.php

@@ -15,7 +15,8 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use App\Exports\ClavesExport;
-
+use App\Imports\ClavesImport;
+use App\Solicitud;
 use Illuminate\Support\Facades\App;
 
 
@@ -76,6 +77,7 @@ function index(Request $request) {
 	public function create() {
 		//
 		$gasolineras = Gasolinera::all();
+		$solicitudes = Solicitud::whereRaw('user_id = ? and status = "Confirmado"',auth()->user()->id)->get();
 
 		$vehiculos = Vehiculo::orderBy('codigodis')->where('activo','1')->get();
 		$users = DB::table('users')->where([
@@ -85,7 +87,7 @@ public function create() {
         ->orderBy("name",'asc')
         ->get();
 		$sidebar = '2';
-			return view( "/clave.crear",compact("sidebar","gasolineras","vehiculos","users") );
+			return view( "/clave.crear",compact("solicitudes","sidebar","gasolineras","vehiculos","users") );
 	}
 
 	/**
@@ -165,9 +167,7 @@ function edit($id) {
 	 * @param  int  $id
 	 * @return \Illuminate\Http\Response
 	 */
-	public
-
-	function update( SaveClaveRequest $request , $id ) {
+	public function update( SaveClaveRequest $request , $id ) {
 
 			DB::begintransaction();
           	try
@@ -237,6 +237,21 @@ public function export()
         return Excel::download(new ClavesExport, 'claves.xlsx');
     }
 
+	public function importacion(Request $request)
+    {
+        $file = $request->file('file');
+
+        Excel::import(new ClavesImport, $file);
+        Session::flash('Importacion_Correcta',"Importacion Realizada con Exito!!!");
+        return redirect( "/clave" );
+    }
+
+	public function importar()
+    {
+      return view("clave.import");
+    }
+
+
     public function downloadPDF($id) {
 		$date = Carbon::now();
         $date = $date->format('l jS \\of F Y ');

app/Http/Controllers/ConsultasController.php

@@ -419,11 +419,34 @@ public function busquedaentrefechasclaveveh(Request $request)
 			->whereNull($tabla . '.deleted_at')
 			->whereBetween($tabla .'.created_at', array($fechaD, $fechaH))
 			->get(); 
-		//dd($busquedaentrefechasclaveveh);	
+		dd($busquedaentrefechasclaveveh);	
 
 		return view("/consulta/entrefechasclaveveh", compact('tabla','busquedaentrefechasclaveveh','fechaD','fechaH'));
 	}
 
+
+	public function busquedaentrefechasclavexvehiculo(Request $request)
+	{
+		$tabla= "claves";
+		$vehicle = $request->vehiculoclave;
+		$fechaD = $request->fechaDxvehiculo;
+		$fechaH = $request->fechaHxvehiculo;
+
+
+		$busquedaentrefechasclavexvehiculo = DB::table($tabla)
+		->select('vehiculos.id','codigodis','name','claves.created_at','orden','placa','factura')
+		->join('users',  $tabla . '.user_id', '=', 'users.id')
+		->join('vehiculos',  $tabla . '.vehiculo_id', '=', 'vehiculos.id')
+			->where('vehiculo_id','=',$vehicle)
+			->whereNull($tabla . '.deleted_at')
+			->whereBetween($tabla .'.created_at', array($fechaD, $fechaH))
+		->get(); 
+		($busquedaentrefechasclavexvehiculo);	
+
+		return view("/consulta/entrefechasclavexvehiculo", compact('tabla','busquedaentrefechasclavexvehiculo','fechaD','fechaH'));
+	}
+
+
 	public function busquedaentrefechasincidenteveh(Request $request)
 	{
 		$tabla= $request->eventosveh;
@@ -607,7 +630,7 @@ public function busquedaentrefechasclave(Request $request)
 		$busquedaentrefechas_xgasolineras = DB::table($tabla)
 			->join('gasolineras', $tabla . '.gasolinera_id', '=', 'gasolineras.id')
 			->select('razonsocial', DB::raw('count(gasolinera_id) Num_cargas'))
-			/* ->where('gasolinera_id','=',$gastation) */
+			->where('gasolinera_id','=',$gastation)
 			->whereYear( $tabla .'.created_at', '=', date('Y'))
 			->whereNull($tabla .'.deleted_at')
 			->whereBetween( $tabla .'.created_at', array($fechaDgas, $fechaHgas)) 
@@ -636,7 +659,7 @@ public function busquedaentrefechasclave(Request $request)
 			->havingRaw('count(vehiculos.codigodis) >= ?', [1])
 			->get(); 
 			$gastationname = Gasolinera::findOrFail( $gastation );
-		//return $Busquedaentrefechas_xcombustible;
+
 		return view("/consulta/entrefechasclaves", compact('gastationname','tabla','Busquedaentrefechas_xvehiculo','Busquedaentrefechas_xcombustible','busquedaentrefechas_xgasolineras','fechaDgas','fechaHgas'));
 	}
 

app/Http/Controllers/ContratoController.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+
+
+use App\Contrato;
+use App\Gasolinera;
+use Maatwebsite\Excel\Facades\Excel;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Session;
+
+use Illuminate\Support\Facades\App;
+use Illuminate\Support\Facades\Storage;
+
+
+class ContratoController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        if($request)
+        {
+          $busq_denominacion = trim($request->get('busq_denominacion'));
+          $busq_fecha = trim($request->get('busq_fecha'));
+          $contratos = Contrato::OrderBy('id','desc')
+          ->where("denominacion",'LIKE','%'.$busq_denominacion.'%')
+          ->where("fecha",'LIKE','%'.$busq_fecha.'%')
+          ->paginate(10);
+              return view( "contrato.index", compact( "contratos","busq_denominacion","busq_fecha") );
+        }
+    }
+
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+
+        $gasolineras = Gasolinera::all();
+        return view( "contrato.crear",compact('gasolineras'));
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $datosSolicitud = request()->except(['_token','_method']);
+        $movilizacion = Contrato::create($datosSolicitud);
+        Session::flash('Registro_Almacenado', "Registro Almacenado con Exito!!!");
+        return redirect("contrato");
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}

app/Http/Controllers/GasolineraController.php

@@ -52,7 +52,7 @@ public function store(CreateGasolineraRequest $request)
 			$gasolinera->ruc = $request->ruc;
 			$gasolinera->direccion = $request->direccion;
 			$gasolinera->email = $request->email;
-      $gasolinera->monto_contrato = $request->monto_contrato;
+      $gasolinera->status = 1;
 			$gasolinera->save();
 			Session::flash('Registro_Almacenado',"Registro Almacenado con Exito!!!");
 			return redirect( "/gasolinera" );