Merge branch 'develop'

mauryparra · Sep 28, 2017 · e0d51e1 · e0d51e1
2 parents 93c4534 + 30d3fc1
commit e0d51e1
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 8 deletions.
diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return redirect('/');
         }
 
         return $next($request);

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
@@ -18,7 +18,7 @@
                 <!-- Default panel contents -->
                 <div class="panel-heading">@lang('Reports')</div>
                 <div class="panel-body">
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut semper sollicitudin libero eget finibus. Curabitur massa leo, suscipit vel eros ac, porttitor viverra neque. Vestibulum feugiat mauris ut dignissim molestie.</p>
+                    <p>A continuación se encuentran los reportes cargados en la página ordenados del más reciente al más antiguo. La gráfica corresponde a los Ingresos / Egresos trimestrales para los reportes mostrados en la tabla.</p>
 
                     <!-- Table -->
                     <div class="table-responsive">

diff --git a/resources/views/egresos/index.blade.php b/resources/views/egresos/index.blade.php
@@ -8,7 +8,7 @@
                 <!-- Default panel contents -->
                 <div class="panel-heading">Reportes Egresos</div>
                 <div class="panel-body">
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut semper sollicitudin libero eget finibus. Curabitur massa leo, suscipit vel eros ac, porttitor viverra neque. Vestibulum feugiat mauris ut dignissim molestie.</p>
+                    <p>Detalles de Egresos Trimestrales</p>
 
                     <!-- Table -->
                     <div class="table-responsive">
@@ -32,6 +32,9 @@
                                 @endforeach
                             </tbody>
                         </table>
+                        <div class="text-center">
+                            {{ $reportesEgresos->links() }}
+                        </div>
                     </div>
                     <!-- Table -->
                 </div>

diff --git a/resources/views/egresos/show.blade.php b/resources/views/egresos/show.blade.php
@@ -8,7 +8,7 @@
                 <!-- Default panel contents -->
                 <div class="panel-heading">Reporte de Egresos Seccional</div>
                 <div class="panel-body">
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut semper sollicitudin libero eget finibus. Curabitur massa leo, suscipit vel eros ac, porttitor viverra neque. Vestibulum feugiat mauris ut dignissim molestie.</p>
+                    <p>Egresos durante el trimestre por cuenta de la seccional y detalle mensual de gastos por categorias.</p>
 
                     <!-- Table -->
                     <div class="table-responsive">
@@ -66,6 +66,7 @@
                 <!-- Default panel contents -->
                 <div class="panel-heading">Reporte de Egresos por UDA Central</div>
                 <div class="panel-body">
+                    <p>Egresos durante el trimestre por cuenta de UDA Central y detalle mensual de gastos por categorias.</p>
 
                     <!-- Table -->
                     <div class="table-responsive">

diff --git a/resources/views/ingresos/index.blade.php b/resources/views/ingresos/index.blade.php
@@ -8,7 +8,7 @@
                 <!-- Default panel contents -->
                 <div class="panel-heading">Reportes Ingresos</div>
                 <div class="panel-body">
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut semper sollicitudin libero eget finibus. Curabitur massa leo, suscipit vel eros ac, porttitor viverra neque. Vestibulum feugiat mauris ut dignissim molestie.</p>
+                    <p>Detalles de Ingresos Trimestrales</p>
 
                     <!-- Table -->
                     <div class="table-responsive">
@@ -34,6 +34,9 @@
                                 @endforeach
                             </tbody>
                         </table>
+                        <div class="text-center">
+                            {{ $reportesIngresos->links() }}
+                        </div>
                     </div>
                     <!-- Table -->
                 </div>

diff --git a/resources/views/ingresos/show.blade.php b/resources/views/ingresos/show.blade.php
@@ -8,7 +8,7 @@
                 <!-- Default panel contents -->
                 <div class="panel-heading">Reportes Ingresos</div>
                 <div class="panel-body">
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut semper sollicitudin libero eget finibus. Curabitur massa leo, suscipit vel eros ac, porttitor viverra neque. Vestibulum feugiat mauris ut dignissim molestie.</p>
+                    <p>Fuentes de Ingresos durante el trimestre</p>
 
                     <!-- Table -->
                     <div class="table-responsive">

diff --git a/resources/views/reportes/index.blade.php b/resources/views/reportes/index.blade.php
@@ -11,7 +11,7 @@
                 <!-- Default panel contents -->
                 <div class="panel-heading">Reportes Trimestrales</div>
                 <div class="panel-body">
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut semper sollicitudin libero eget finibus. Curabitur massa leo, suscipit vel eros ac, porttitor viverra neque. Vestibulum feugiat mauris ut dignissim molestie.</p>
+                    <p>Reportes trimestrales cargados en la página ordenados del más reciente al más antiguo.</p>
 
                     <!-- Table -->
                     <div class="table-responsive">

diff --git a/resources/views/reportes/show.blade.php b/resources/views/reportes/show.blade.php
@@ -9,7 +9,7 @@
                 <!-- Default panel contents -->
                 <div class="panel-heading">Reporte Trimestral</div>
                 <div class="panel-body">
-                    <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ut semper sollicitudin libero eget finibus. Curabitur massa leo, suscipit vel eros ac, porttitor viverra neque. Vestibulum feugiat mauris ut dignissim molestie.</p>
+                    <p>En la siguiente tabla se muestran los balances generales del reporte trimestral, utilizar los botones para ver los reportes de egresos e ingresos.</p>
 
                     <!-- Table -->
                     <div class="table-responsive">