This commit is contained in:
2021-12-25 23:17:47 -03:00
parent 7e01974ec8
commit d7d671fb51
68 changed files with 2991 additions and 160 deletions

View File

@ -0,0 +1,4 @@
<?php
use Incoviba\UI\Common\Controller\Base;
$app->get('[/]', Base::class);

View File

@ -0,0 +1,10 @@
<?php
use Incoviba\UI\Common\Controller\Auth;
$app->group('/auth', function($app) {
$app->group('/login', function ($app) {
$app->get('[/]', [Auth::class, 'login']);
$app->post('[/]', [Auth::class, 'doLogin']);
});
$app->get('/logout', [Auth::class, 'logout']);
});

View File

@ -0,0 +1,6 @@
<?php
$app->group('/inmobiliarias', function ($app) {
$app->get('[/]', function ($request, $response) {
return $response;
});
});

View File

@ -0,0 +1,12 @@
@extends('layout.base')
@section('page_title')
No Encontrada
@endsection
@section('content')
<div class="ui warning message">
<i class="big exclamation triangle icon"></i>
P&aacute;gina {{$page}} no encontrada.
</div>
@endsection

View File

@ -1,7 +1,7 @@
<nav class="navbar navbar-default">
<ul class="nav navbar-nav">
<li><a href=".">Inicio</a></li>
<li><a href="{{url('', ['p' => 'admin'])}}">Administraci&oacute;n</a>
<li><a href="{{$urls->base}}/admin">Administraci&oacute;n</a>
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Modelos <span class="caret"></span>
@ -20,7 +20,7 @@
</a>
@include('admin.menu.users')
</li>
<li><a href="{{url('admin/registros')}}">Registros</a></li>
<li><a href="{{$urls->base}}/admin/registros">Registros</a></li>
<?php
/*
<li role="presentation" class="dropdown">
@ -32,7 +32,7 @@
*/ ?>
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
{{\App\Contract\Auth::User()->name}} <span class="caret"></span>
{{$user->name}} <span class="caret"></span>
</a>
@include('layout.menu.login')
</li>

View File

@ -1,3 +1,3 @@
<ul class="dropdown-menu">
<li><a href="{{url('', ['p' => 'admin', 'a' => 'listModels'])}}">Listar Modelos</a></li>
<li><a href="{{$urls->base}}/admin/models">Listar Modelos</a></li>
</ul>

View File

@ -1,3 +1,3 @@
<ul class="dropdown-menu">
<li><a href="{{nUrl('registros', 'list')}}">Listar Registros</a></li>
<li><a href="{{$urls->base}}/registros">Listar Registros</a></li>
</ul>

View File

@ -1,4 +1,4 @@
<ul class="dropdown-menu">
<li><a href="{{nUrl('admin', 'list_roles')}}">Listar Roles</a></li>
<li><a href="{{nUrl('admin', 'add_role')}}">Agregar Rol</a></li>
<li><a href="{{$urls->base}}/admin/roles">Listar Roles</a></li>
<li><a href="{{$urls->base}}/admin/roles/add">Agregar Rol</a></li>
</ul>

View File

@ -1,4 +1,4 @@
<ul class="dropdown-menu">
<li><a href="{{url('', ['p' => 'admin', 'a' => 'list_users'])}}">Listar Usuarios</a></li>
<li><a href="{{url('', ['p' => 'admin', 'a' => 'add_user'])}}">Agregar Usuario</a></li>
<li><a href="{{$urls->base}}/admin/users">Listar Usuarios</a></li>
<li><a href="{{$urls->base}}/admin/users/add">Agregar Usuario</a></li>
</ul>

View File

@ -4,7 +4,7 @@
<div class="panel panel-default">
<div class="panel-heading">DB to Models</div>
<div class="panel-body">
<form action="{{url('', ['p' => 'admin', 'a' => 'models'])}}" method="post" class="form-horizontal" id="databases">
<form action="{{$urls->base}}/admin/models" method="post" class="form-horizontal" id="databases">
<div class="row form-group">
<div class="col-md-3">DB</div>
<div class="col-md-4">
@ -28,4 +28,4 @@
@push('scripts')
<script type="text/javascript" src="js/admin.js"></script>
@endpush
@endpush

View File

@ -1,14 +1,14 @@
<div class="row">
<div class="col-md-1">
@if ($start > 0)
<a href="{{url('admin/registros')}}">
<a href="{{$urls->base}}/admin/registros">
<span class="glyphicon glyphicon-fast-backward"></span>
</a>
@endif
</div>
<div class="col-md-1">
@if ($start > 0)
<a href="{{url('admin/registros/') . ($start - $step + 1) . '/' . (($end > 0) ? $end - $step : $step * 2)}}">
<a href="{{$urls->base}}/admin/registros/{{$start - $step + 1}}/{{(($end > 0) ? $end - $step : $step * 2)}}">
<span class="glyphicon glyphicon-chevron-left"></span>
</a>
@endif
@ -16,14 +16,14 @@
<div class="col-md-offset-3 col-md-2 text-center">{{$start + 1}} - {{$end}}</div>
<div class="col-md-offset-3 col-md-1 text-right">
@if ($end < $total)
<a href="{{url('admin/registros/') . (($end > 0) ? $end + 1 : $step) . '/' . (($end > 0) ? $end + $step : $step * 2)}}">
<a href="{{$urls->base}}/admin/registros/{{(($end > 0) ? $end + 1 : $step)}}/{{(($end > 0) ? $end + $step : $step * 2)}}">
<span class="glyphicon glyphicon-chevron-right"></span>
</a>
@endif
</div>
<div class="col-md-1 text-right">
@if ($end < $total)
<a href="{{url('admin/registros/') . (round($total / $step, 0) * $step + 1) . '/' . (round($total / $step, 0) *$step + $step)}}">
<a href="{{$urls->base}}/admin/registros/{{(round($total / $step, 0) * $step + 1)}}/{{(round($total / $step, 0) *$step + $step)}}">
<span class="glyphicon glyphicon-fast-forward"></span>
</a>
@endif

View File

@ -28,7 +28,7 @@
">{{ucwords($rol->description)}}</span>
@endforeach
</td>
<td><a href="{{url('admin/registro/' . $registro->id)}}">{{$registro->time()->format('d-m-Y - H:i:s')}} hrs.</a></td>
<td><a href="{{$urls->base}}/admin/registro/{{$registro->id}}">{{$registro->time()->format('d-m-Y - H:i:s')}} hrs.</a></td>
<td>{{$registro->model()}}</td>
<td>{{count($registro->actions())}}</td>
</tr>

View File

@ -55,7 +55,7 @@
</div>
</div>
<div class="row">
<a href="{{nUrl('registros', 'list')}}"><span class="glyphicon glyphicon-chevron-left"></span> Volver</a>
<a href="{{$urls->base}}/registros"><span class="glyphicon glyphicon-chevron-left"></span> Volver</a>
</div>
</div>
</div>

View File

@ -5,7 +5,7 @@
<div class="col-md-12 h3">Agregar Rol</div>
</div>
<br />
<form action="{{url('', ['p' => 'admin', 'a' => 'do_add_role'])}}" method="post" class="form-horizontal">
<form action="{{$urls->base}}/admin/roles/add" method="post" class="form-horizontal">
<div class="form-group">
<div class="col-md-2">Descripci&oacute;n</div>
<div class="col-md-3"><input type="text" name="description" class="form-control" /></div>

View File

@ -5,7 +5,7 @@
<div class="col-md-12 h3">Agregar Permisos - {{$role->description}}</div>
</div>
<br />
<form class="form-horizontal" method="post" action="{{nUrl('admin', 'do_add_role_permissions', ['role' => $role->id])}}">
<form class="form-horizontal" method="post" action="{{$urls->base}}/admin/role/{{$role->id}}/permissions/add">
<div class="form-group">
<div class="col-md-2">Permitidos</div>
<div class="col-md-3"><select name="allowed[]" class="form-control" multiple="multiple">

View File

@ -5,7 +5,7 @@
<div class="col-md-12 h3">Agregar Usuario - {{$role->description}}</div>
</div>
<br />
<form class="form-horizontal" method="post" action="{{url('', ['p' => 'admin', 'a' => 'do_add_user_role', 'role' => $role->id])}}">
<form class="form-horizontal" method="post" action="{{$urls->base}}/admin/role/{{$role->id}}/users/add">
<div class="form-group">
<div class="col-md-2">Ususarios</div>
<div class="col-md-3"><select name="users[]" class="form-control" multiple="multiple">

View File

@ -3,7 +3,7 @@
@section('content')
<div class="page-heading row">
<div class="col-md-6 h3">Roles</div>
<div class="col-md-6 text-right h3"><a href="{{url('', ['p' => 'admin', 'a' => 'add_role'])}}"><span class="glyphicon glyphicon-plus"></span></a></div>
<div class="col-md-6 text-right h3"><a href="{{$urls->base}}/admin/roles/add"><span class="glyphicon glyphicon-plus"></span></a></div>
</div>
<table class="table">
<thead>
@ -17,14 +17,14 @@
<tbody>
@foreach ($roles as $role)
<tr>
<td><a href="{{nUrl('admin', 'role', ['role' => $role->id])}}">{{$role->description}}</a></td>
<td><a href="{{$urls->base}}/admin/role/{{$role->id}}">{{$role->description}}</a></td>
<td>{{$role->level}}</td>
<td>
@foreach ($role->users() as $user)
{{$user->name}}
@endforeach
</td>
<td><a href="{{url('', ['p' => 'admin', 'a' => 'delete_role'])}}"><span class="glyphicon glyphicon-minus"></span></a></td>
<td><a href="{{$urls->base}}/admin/role/{{$role->id}}/delete"><span class="glyphicon glyphicon-minus"></span></a></td>
</tr>
@endforeach
</tbody>

View File

@ -6,19 +6,19 @@
</div>
<div class="section-heading row">
<div class="col-md-6 h4">Usuarios</div>
<div class="col-md-6 h4 text-right"><a href="{{url('', ['p' => 'admin', 'a' => 'add_user_role', 'role' => $role->id])}}"><span class="glyphicon glyphicon-plus"></span></a></div>
<div class="col-md-6 h4 text-right"><a href="{{$urls->base}}/admin/role/{{$role->id}}/users/add"><span class="glyphicon glyphicon-plus"></span></a></div>
</div>
<table class="table">
@foreach ($role->users() as $user)
<tr>
<td><a href="{{nUrl('admin', 'user', ['user' => $user->id])}}">{{$user->name}}</a></td>
<td><a href="{{url('', ['p' => 'admin', 'a' => 'remove_user_role', 'user' => $user->id, 'role' => $role->id])}}"><span class="glyphicon glyphicon-minus"></span></a></td>
<td><a href="{{$urls->base}}/admin/user/{{$user->id}}">{{$user->name}}</a></td>
<td><a href="{{$urls->base}}/admin/role/{{$role->id}}/user/{{$user->id}}/remove"><span class="glyphicon glyphicon-minus"></span></a></td>
</tr>
@endforeach
</table>
<div class="row section-heading">
<div class="col-md-6 h4">Permisos</div>
<div class="col-md-6 h4 text-right"><a href="{{nUrl('admin', 'add_role_permissions', ['role' => $role->id])}}"><span class="glyphicon glyphicon-plus"></span></a></div>
<div class="col-md-6 h4 text-right"><a href="{{$urls->base}}/admin/role/{{$role->id}}/permissions"><span class="glyphicon glyphicon-plus"></span></a></div>
</div>
@if ($role->permissions())
<table class="table table-striped">

View File

@ -5,7 +5,7 @@
<div class="col-md-12 h3">Agregar Ususario</div>
</div>
<br />
<form action="{{url('', ['p' => 'admin', 'a' => 'do_add_user'])}}" method="post" class="form-horizontal">
<form action="{{$urls->base}}/admin/users/add" method="post" class="form-horizontal">
<div class="form-group">
<div class="col-md-2">Usuario</div>
<div class="col-md-3"><input type="text" name="name" class="form-control" /></div>

View File

@ -5,7 +5,7 @@
<div class="col-md-12 h3">Agregar Rol - {{$user->name}}</div>
</div>
<br />
<form class="form-horizontal" method="post" action="{{url('', ['p' => 'admin', 'a' => 'do_add_user_role', 'user' => $user->id])}}">
<form class="form-horizontal" method="post" action="{{$urls->base}}/admin/user/{{$user->id}}/roles/add">
<div class="form-group">
<div class="col-md-2">Rol</div>
<div class="col-md-3"><select name="role[]" class="form-control" multiple="multiple">

View File

@ -3,7 +3,7 @@
@section('content')
<div class="page-heading row">
<div class="col-md-6 h3">Usuarios</div>
<div class="col-md-6 text-right h3"><a href="{{url('', ['p' => 'admin', 'a' => 'add_user'])}}"><span class="glyphicon glyphicon-plus"></span></a></div>
<div class="col-md-6 text-right h3"><a href="{{$urls->base}}/admin/users/add"><span class="glyphicon glyphicon-plus"></span></a></div>
</div>
<table class="table">
<thead>
@ -15,13 +15,13 @@
<tbody>
@foreach ($users as $user)
<tr>
<td><a href="{{url('', ['p' => 'admin', 'a' => 'user', 'user' => $user->id])}}">{{$user->name}}</a></td>
<td><a href="{{$urls->base}}/admin/user/{{$user->id}}">{{$user->name}}</a></td>
<td>
@foreach ($user->roles() as $role)
{{$role->description}}
@endforeach
</td>
<td><a href="{{url('', ['p' => 'admin', 'a' => 'delete_user', 'user' => $user->id])}}"><span class="glyphicon glyphicon-minus"></span></a></td>
<td><a href="{{$urls->base}}/admin/user/{{$user->id}}/delete"><span class="glyphicon glyphicon-minus"></span></a></td>
</tr>
@endforeach
</tbody>

View File

@ -4,24 +4,24 @@
<div class="row page-heading">
<div class="col-md-12 h3">{{$user->name}}</div>
</div>
<a href="{{nUrl('admin', 'reset_user', ['user' => $user->id])}}">
<a href="{{$urls->base}}/admin/user/{{$user->id}}/reset">
Resetear Clave
</a>
<div class="section-heading row">
<div class="col-md-6 h4">Roles</div>
<div class="col-md-6 h4 text-right"><a href="{{url('', ['p' => 'admin', 'a' => 'add_user_role', 'user' => $user->id])}}"><span class="glyphicon glyphicon-plus"></span></a></div>
<div class="col-md-6 h4 text-right"><a href="{{$url->base}}/admin/user/{{$user->id}}/roles/add"><span class="glyphicon glyphicon-plus"></span></a></div>
</div>
<table class="table">
@foreach ($user->roles() as $role)
<tr>
<td><a href="{{nUrl('admin', 'role', ['role' => $role->id])}}">{{$role->description}}</a></td>
<td><a href="{{url('', ['p' => 'admin', 'a' => 'remove_user_role', 'user' => $user->id, 'role' => $role->id])}}"><span class="glyphicon glyphicon-minus"></span></a></td>
<td><a href="{{$urls->base}}/admin/role/{{$role->id}}">{{$role->description}}</a></td>
<td><a href="{{$urls->base}}/admin/user/{{$user->id}}/role/{{$role->id}}/remove"><span class="glyphicon glyphicon-minus"></span></a></td>
</tr>
@endforeach
</table>
<div class="row section-heading">
<div class="col-md-6 h4">Permisos</div>
<div class="col-md-6 h4 text-right"><a href="{{nUrl('admin', 'add_user_permissions', ['user' => $user->id])}}"><span class="glyphicon glyphicon-plus"></span></a></div>
<div class="col-md-6 h4 text-right"><a href="{{$urls->base}}/admin/user/{{$user->id}}/permissions/add"><span class="glyphicon glyphicon-plus"></span></a></div>
</div>
@if ($user->permissions())
<table class="table">

View File

@ -7,9 +7,9 @@
{{$titulo}} -
@endif
Incoviba S. A.</title>
<link rel="stylesheet" type="text/css" href="css/app.css" />
<link rel="icon" type="image/png" href="images/Isotipo 32.png" />
<script type="text/javascript" src="js/app.js"></script>
<link rel="stylesheet" type="text/css" href="{{$urls->styles}}/app.css" />
<link rel="icon" type="image/png" href="{{$urls->images}}/Isotipo 32.png" />
<script type="text/javascript" src="{{$urls->scripts}}/app.js"></script>
@stack('styles')
</head>
@ -19,7 +19,7 @@
<div class="row">
<div class="col-md-12">
<div class="logo_cabezal">
<a href="."><img src="images/logo_cabezal.png" /></a>
<a href="."><img src="{{$urls->images}}/logo_cabezal.png" /></a>
</div>
</div>
</div>
@ -28,15 +28,15 @@
<nav class="navbar navbar-default">
<ul class="nav navbar-nav">
<li><a href=".">Inicio</a></li>
@if (\App\Contract\Auth::isIn())
@if ($auth->isIn())
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
{{\App\Contract\Auth::User()->name}} <span class="caret"></span>
{{$auth->user()}} <span class="caret"></span>
</a>
@include('layout.menu.login')
</li>
@else
<li><a href="{{url('', ['p' => 'auth', 'a' => 'login'])}}">Ingresar</a></li>
<li><a href="{{$urls->base}}/auth/login">Ingresar</a></li>
@endif
</ul>
</nav>

View File

@ -5,7 +5,7 @@
<div class="col-md-12 h3">Cambio de Cl&aacute;ve</div>
</div>
<br />
<form class="form-horizontal" method="post" action="{{url('', ['p' => 'auth', 'a' => 'do_change_pass'])}}">
<form class="form-horizontal" method="post" action="{{$urls->base}}/auth/password/change">
<div class="form-group">
<div class="col-md-2">Cl&aacute;ve anterior</div>
<div class="col-md-3"><input type="password" name="old" class="form-control" /></div>
@ -32,7 +32,7 @@
$(document).ready(function() {
var status = [0, 0, 0, 0];
$("input[name='old']").blur(function(e) {
$.post('{!!nUrl('auth', 'check_pass', ['ajax' => 'true'])!!}', {"password": $(this).val()}, function(data) {
$.post('{!!$urls->base!!}}/auth/password/check', {"password": $(this).val()}, function(data) {
if (data == 'KO') {
$('#msg1').html('<span class="label label-danger"><span class="glyphicon glyphicon-warning-sign"></span> Cl&aacute;ve anterior inv&aacute;lida.</span>');
status[1] = 0;
@ -43,7 +43,7 @@ $(document).ready(function() {
});
})
$("input[name='new']").blur(function(e) {
var result = zxcvbn($(this).val(), user_inputs=[$("input[name='old']").val(), '{{\App\Contract\Auth::User()->name}}']);
var result = zxcvbn($(this).val(), user_inputs=[$("input[name='old']").val(), '{{$user->name}}']);
if (result.score < 3) {
$('#msg2').html('<span class="label label-danger"><span class="glyphicon glyphicon-warning-sign"></span> Nivel ' + result.score + '</span>');
status[2] = 0;

View File

@ -1,7 +1,7 @@
@extends('auth.base')
@section('content')
<form class="form-horizontal" action="{{url('', ['p' => 'auth', 'a' => 'do_login'])}}" method="post">
<form class="form-horizontal" id="login_form" method="post">
<div class="form-group">
<div class="col-md-2">Usuario</div>
<div class="col-md-3"><input type="text" name="name" class="form-control" /></div>
@ -15,3 +15,28 @@
</div>
</form>
@endsection
@push('scripts')
<script type="text/javascript">
function doLogin(e) {
e.preventDefault()
const form = $(e.currentTarget)
const url = '{{$urls->base}}/auth/login'
const data = {
name: form.find("[name='name']").val(),
password: form.find("[name='password']").val()
}
$.post(url, data).then((data) => {
if (data.login) {
window.location = '{{$route}}'
return
}
console.debug(data)
})
return false
}
$(document).ready(() => {
$('#login_form').submit(doLogin)
})
</script>
@endpush

View File

@ -4,7 +4,7 @@
<div class="panel panel-default">
<div class="panel-heading">Buscar</div>
<div class="panel-body">
<form action="{{url('', ['p' => 'buscar'])}}" method="get" class="form form-horizontal">
<form action="{{$urls->base}}/buscar" method="get" class="form form-horizontal">
<input type="hidden" name="p" value="buscar" />
<div class="form-group">
<div class="col-md-6"><input type="text" name="q" class="form-control"

View File

@ -1,12 +1,12 @@
<tr>
<td>
<a href="{{url('', ['p' => 'buscar', 'q' => urlencode('"' . $resultado->proyecto()->descripcion . '"'), 't' => 'proyecto'])}}">
<a href="{{$urls->base}}/buscar/{{urlencode('"' . $resultado->proyecto()->descripcion . '"')}}/proyecto">
{{$resultado->proyecto()->descripcion}} <span class="small glyphicon glyphicon-search"></span>
</a>
</td>
@if (method_exists($resultado, 'unidad'))
<td>
<a href="{{url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $resultado->id])}}">
<a href="{{$urls->base}}/ventas/{{$resultado->id}}">
{{$resultado->unidad()->descripcion}}
@if ($resultado->estado == 0)
(r)
@ -17,17 +17,17 @@
</a>
</td>
<td>
<a href="{{url('', ['p' => 'buscar', 'q' => urlencode('"' . $resultado->propietario()->nombreCompleto() . '"'), 't' => 'propietario'])}}">
<a href="{{$urls->base}}/buscar/{{urlencode('"' . $resultado->propietario()->nombreCompleto() . '"')}}/propietario">
{{$resultado->propietario()->nombreCompleto()}} <span class="small glyphicon glyphicon-search"></span>
</a>
</td>
<td>{{ucwords($resultado->unidad()->tipo()->descripcion)}}</td>
<td>{{\App\Helper\Format::m2($resultado->unidad()->m2())}}</td>
<td>{{\App\Helper\Format::ufs($resultado->valor_uf)}}</td>
<td>{{\App\Helper\Format::shortDate($resultado->fecha)}}</td>
<td>{{$format->m2($resultado->unidad()->m2())}}</td>
<td>{{$format->ufs($resultado->valor_uf)}}</td>
<td>{{$format->shortDate($resultado->fecha)}}</td>
<td>
@if ($resultado->entrega != 0)
{{\App\Helper\Format::shortDate($resultado->entrega()->fecha)}}
{{$format->shortDate($resultado->entrega()->fecha)}}
@endif
</td>
@else
@ -35,7 +35,7 @@
{{$resultado->descripcion}} <span class="glyphicon glyphicon-ban-circle"></span>
</td><td>
<td>{{ucwords($resultado->tipo()->descripcion)}}</td>
<td>{{\App\Helper\Format::m2($resultado->m2())}}</td>
<td>{{$format->m2($resultado->m2())}}</td>
@if ($resultado->valor)
<td>{{format('ufs', $resultado->valor)}}</td>
@else
@ -43,4 +43,4 @@
@endif
<td></td>
@endif
</tr>
</tr>

View File

@ -28,15 +28,15 @@
<nav class="navbar navbar-default">
<ul class="nav navbar-nav">
<li><a href=".">Inicio</a></li>
@if (\App\Contract\Auth::isIn())
@if ($auth->isIn)
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
{{Auth::User()}} <span class="caret"></span>
{{$user->name}} <span class="caret"></span>
</a>
@include('layout.menu.login')
</li>
@else
<li><a href="{{url('', ['p' => 'auth', 'a' => 'login'])}}">Ingresar</a></li>
<li><a href="{{$urls->base}}/auth/login">Ingresar</a></li>
@endif
</ul>
</nav>
@ -54,4 +54,4 @@
@include('layout.footer')
@stack('scripts')
</body>
</html>
</html>

View File

@ -1,28 +1,27 @@
@extends('layout.base')
@section('content')
@if ($hoy > 0)
<div clasS="row">
<div class="col-md-12">Hay {{$hoy}} deposito{{($hoy > 1) ? 's' : ''}} para hoy.</div>
</div>
@endif
@if ($pendientes > 0)
<div class="row">
<div class="col-md-12"><a href="{{url('', ['p' => 'cuotas', 'a' => 'pendientes'])}}">Existe{{($pendientes > 1) ? 'n' : ''}} {{$pendientes}} cuota{{($pendientes > 1) ? 's' : ''}} pendiente{{($pendientes > 1) ? 's' : ''}}. <span class="glyphicon glyphicon-arrow-right"></span></a></div>
</div>
@endif
<table class="ui table">
<tr>
@if (count($dias) > 0)
<td>
@include('calendario')
</td>
@endif
@if (count($cierres) > 0)
<td>
@include('cierres')
</td>
@endif
</tr>
</table>
<div id="hoy"></div>
<div id="pendientes"></div>
<table class="ui basic table">
<tr>
<td>
<div id="calendario"></div>
</td>
<td>
<div id="cierres"></div>
</td>
</tr>
</table>
@endsection
@push('scripts')
<script type="text/javascript" src="{{$urls->scripts}}/home.js"></script>
<script type="text/javascript">
$(document).ready(() => {
home.token = '{{$_COOKIE['rememberMe']}}'
home.setup()
})
</script>
@endpush

View File

@ -3,15 +3,18 @@
<head>
<meta charset="utf-8" />
<title>
@hasSection('page_title')
@yield('page_title') -
@endif
@if (isset($titulo))
{{$titulo}} -
@endif
Incoviba S. A.</title>
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.7.8/semantic.min.css" />
<link rel="stylesheet" type="text/css" href="css/app.css" />
<link rel="stylesheet" type="text/css" href="css/custom.css" />
<link rel="icon" type="image/png" href="images/Isotipo 32.png" />
<script type="text/javascript" src="js/app.js"></script>
<link rel="stylesheet" type="text/css" href="{{$urls->styles}}/app.css" />
<link rel="stylesheet" type="text/css" href="{{$urls->styles}}/custom.css" />
<link rel="icon" type="image/png" href="{{$urls->images}}/Isotipo 32.png" />
<script type="text/javascript" src="{{$urls->scripts}}/app.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.7.8/semantic.min.js"></script>
@stack('styles')
@ -26,6 +29,53 @@
</div>
</div>
@include('layout.footer')
<script type="text/javascript">
const API_KEY = '{{$api_key}}'
const _urls = {
base: '{{$urls->base}}',
api: 'http://localhost:8081'
}
function buildAjax(uri, method, files=false) {
const url = _urls.api + uri
if (files) {
return {
url,
headers: {
'Authorization': 'Bearer ' + API_KEY
},
method,
processData: false,
contentType: false
}
}
return {
url,
headers: {
'Authorization': 'Bearer ' + API_KEY
},
method,
dataType: 'json'
}
}
function sendGet(uri) {
let ajax_obj = buildAjax(uri, 'GET')
return $.ajax(ajax_obj)
}
function sendPost(uri, data, files=false) {
let ajax_obj = buildAjax(uri, 'POST', files)
ajax_obj['data'] = data
return $.ajax(ajax_obj)
}
function sendPut(uri, data) {
let ajax_obj = buildAjax(uri, 'PUT')
ajax_obj['data'] = data
return $.ajax(ajax_obj)
}
function sendDelete(uri) {
let ajax_obj = buildAjax(uri, 'DELETE')
return $.ajax(ajax_obj)
}
</script>
@stack('scripts')
</body>
</html>

View File

@ -3,7 +3,7 @@
<div class="row">
<div class="col-md-12">
<div class="logo_cabezal">
<a href="."><img src="images/logo_cabezal.png" /></a>
<a href="."><img src="{{$urls->images}}/logo_cabezal.png" /></a>
</div>
</div>
</div>
@ -13,4 +13,4 @@
</div>
</div>
</div>
</header>
</header>

View File

@ -1,8 +1,8 @@
<nav class="navbar navbar-default">
<ul class="nav navbar-nav">
<li><a href=".">Inicio</a></li>
@if (\App\Contract\Auth::isIn())
@if (\App\Contract\Auth::checkAccess('ventas'))
<li><a href="{{$urls->base}}">Inicio</a></li>
@if ($auth->isIn())
@if ($auth->checkAccess('ventas'))
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Ventas <span class="caret"></span>
@ -11,7 +11,7 @@
</li>
@endif
@if (\App\Contract\Auth::checkAccess('proyectos'))
@if ($auth->checkAccess('proyectos'))
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Proyectos <span class="caret"></span>
@ -20,11 +20,11 @@
</li>
@endif
@if (\App\Contract\Auth::checkAccess('inmobiliarias'))
<li><a href="{{url('', ['p' => 'inmobiliarias', 'a' => 'list'])}}">Inmobiliarias</a></li>
@if ($auth->checkAccess('inmobiliarias'))
<li><a href="{{$urls->base}}/inmobiliarias">Inmobiliarias</a></li>
@endif
@if (\App\Contract\Auth::checkAccess('viewInformesContabilidad'))
@if ($auth->checkAccess('viewInformesContabilidad'))
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Contabilidad <span class="caret"></span>
@ -40,7 +40,7 @@
@include('layout.menu.operadores')
</li>
@if (\App\Contract\Auth::checkAccess('viewHerramientas'))
@if ($auth->checkAccess('viewHerramientas'))
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Herramientas <span class="caret"></span>
@ -49,19 +49,19 @@
</li>
@endif
@else
<li><a href="{{url('', ['p' => 'auth', 'a' => 'login'])}}">Ingresar</a></li>
<li><a href="{{$urls->base}}/auth/login">Ingresar</a></li>
@endif
</ul>
@if (\App\Contract\Auth::isIn())
@if ($auth->isIn())
<ul class="nav navbar-nav navbar-right">
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
{{\App\Contract\Auth::User()->name}} <span class="caret"></span>
{{$auth->user()}} <span class="caret"></span>
</a>
@include('layout.menu.login')
</li>
@if (\App\Contract\Auth::checkAccess('buscar'))
<li style="font-size: large; border-left: 1px solid #e7e7e7;"><a href="{{url('', ['p' => 'buscar'])}}"><span class="glyphicon glyphicon-search"></span></a></li>
@if ($auth->checkAccess('buscar'))
<li style="font-size: large; border-left: 1px solid #e7e7e7;"><a href="{{$urls->base}}/buscar"><span class="glyphicon glyphicon-search"></span></a></li>
<li style="margin-right: 15px;">&nbsp;</li>
@endif
</ul>

View File

@ -1,8 +1,8 @@
<nav class="navbar navbar-default">
<ul class="nav navbar-nav">
<li><a href=".">Inicio</a></li>
@if (\App\Contract\Auth::isIn())
@if (\App\Contract\Auth::checkAccess('ventas'))
@if ($auth->isIn())
@if ($auth->checkAccess('ventas'))
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Ventas <span class="caret"></span>
@ -11,7 +11,7 @@
</li>
@endif
@if (\App\Contract\Auth::checkAccess('proyectos'))
@if ($auth->checkAccess('proyectos'))
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Proyectos <span class="caret"></span>
@ -20,11 +20,11 @@
@endif
@if (\App\Contract\Auth::checkAccess('inmobiliarias'))
@if ($auth->checkAccess('inmobiliarias'))
<li><a href="{{url('', ['p' => 'inmobiliarias', 'a' => 'list'])}}">Inmobiliarias</a></li>
@endif
@if (\App\Contract\Auth::checkAccess('viewInformesContabilidad'))
@if ($auth->checkAccess('viewInformesContabilidad'))
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Contabilidad <span class="caret"></span>
@ -33,7 +33,7 @@
</li>
@endif
@if (\App\Contract\Auth::checkAccess('viewHerramientas'))
@if ($auth->checkAccess('viewHerramientas'))
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
Herramientas <span class="caret"></span>
@ -45,15 +45,15 @@
<li><a href="{{url('', ['p' => 'auth', 'a' => 'login'])}}">Ingresar</a></li>
@endif
</ul>
@if (\App\Contract\Auth::isIn())
@if ($auth->isIn())
<ul class="nav navbar-nav navbar-right">
<li role="presentation" class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
{{\App\Contract\Auth::User()->name}} <span class="caret"></span>
{{$auth->User()->name}} <span class="caret"></span>
</a>
@include('layout.menu.login')
</li>
@if (\App\Contract\Auth::checkAccess('buscar'))
@if ($auth->checkAccess('buscar'))
<li style="font-size: large; border-left: 1px solid #e7e7e7;"><a href="{{url('', ['p' => 'buscar'])}}"><span class="glyphicon glyphicon-search"></span></a></li>
<li style="margin-right: 15px;">&nbsp;</li>
@endif

View File

@ -1,3 +1,3 @@
<ul class="dropdown-menu">
<li><a href="http://{{config('locations.money')}}">Valores Monetarios</a></li>
<li><a href="http://{{$urls->money}}">Valores Monetarios</a></li>
</ul>

View File

@ -1,4 +1,4 @@
<ul class="dropdown-menu">
<li><a href="{{url('', ['p' => 'informes', 'a' => 'contabilidad'])}}">Pagos Mes</a></li>
<li><a href="{{url('', ['p' => 'informes', 'a' => 'resumen_contabilidad'])}}">Resumen</a></li>
<li><a href="{{$urls->base}}/informes/contabilidad">Pagos Mes</a></li>
<li><a href="{{$urls->base}}/informes/contabilidad/resumen">Resumen</a></li>
</ul>

View File

@ -1,8 +1,8 @@
<ul class="dropdown-menu">
<li><a href="{{url('', ['p' => 'auth', 'a' => 'change_pass'])}}">Cambiar Cl&aacute;ve</a></li>
@if (\App\Contract\Auth::checkAccess('admin'))
<li><a href="{{url('', ['p' => 'admin'])}}">Administraci&oacute;n</a></li>
<li><a href="{{$urls->base}}/auth/password">Cambiar Cl&aacute;ve</a></li>
@if ($auth->checkAccess('admin'))
<li><a href="{{$urls->base}}/admin">Administraci&oacute;n</a></li>
@endif
<li><a href="{{url('', ['p' => 'auth', 'a' => 'logout'])}}">Salir</a></li>
<li><a href="{{$urls->base}}/auth/logout">Salir</a></li>
</ul>

View File

@ -1,4 +1,4 @@
<ul class="dropdown-menu">
<li><a href="{{url('', ['p' => 'proyectos', 'a' => 'list'])}}">Listado</a></li>
<li><a href="{{url('', ['p' => 'proyectos', 'a' => 'unidades'])}}">Unidades</a></li>
<li><a href="{{$urls->base}}/proyectos">Listado</a></li>
<li><a href="{{$urls->base}}/proyectos/unidades">Unidades</a></li>
</ul>

View File

@ -1,24 +1,24 @@
<ul class="dropdown-menu">
<li class="dropdown-submenu"><a>Listado</a>
<ul class="dropdown-menu">
<li><a href="{{nUrl('precios', 'listProyectos')}}">Precios</a></li>
<li><a href="{{url('', ['p' => 'cierres', 'a' => 'list'])}}">Cierres</a></li>
<li><a href="{{url('', ['p' => 'ventas', 'a' => 'list'])}}">Ventas</a></li>
<li><a href="{{url('', ['p' => 'cuotas', 'a' => 'pendientes'])}}">Cuotas Pendientes</a></li>
<li><a href="{{url('', ['p' => 'cuotas', 'a' => 'para_abonar'])}}">Abonar Cuotas</a></li>
<li><a href="{{url('', ['p' => 'pagos', 'a' => 'pendientes'])}}">Pagos Pendientes</a></li>
<li><a href="{{url('', ['p' => 'ventas', 'a' => 'consolidacion'])}}">Consolidado Ventas</a>
<li><a href="{{$urls->base}}/precios">Precios</a></li>
<li><a href="{{$urls->base}}/cierres">Cierres</a></li>
<li><a href="{{$urls->base}}/ventas">Ventas</a></li>
<li><a href="{{$urls->base}}/cuotas/pendientes">Cuotas Pendientes</a></li>
<li><a href="{{$urls->base}}/cuotas/abonar">Abonar Cuotas</a></li>
<li><a href="{{$urls->base}}/pagos/pendientes">Pagos Pendientes</a></li>
<li><a href="{{$urls->base}}/ventas/consolidado">Consolidado Ventas</a>
</ul>
</li>
<li class="dropdown-submenu"><a>Informes</a>
<ul class="dropdown-menu">
<li><a href="{{url('', ['p' => 'informes', 'a' => 'ventas'])}}">Ventas</a></li>
<li><a href="{{url('', ['p' => 'informes', 'a' => 'escrituras'])}}">Escrituras</a></li>
<li><a href="{{url('', ['p' => 'informes', 'a' => 'gantt_entregas'])}}">Gantt de Entregas</a></li>
<li><a href="{{nUrl('informes', 'resciliaciones')}}">Resciliaciones</a></li>
<li><a href="{{$urls->base}}/informes/ventas">Ventas</a></li>
<li><a href="{{$urls->base}}/informes/escrituras">Escrituras</a></li>
<li><a href="{{$urls->base}}/informes/entregas/gantt">Gantt de Entregas</a></li>
<li><a href="{{$urls->base}}/informes/resciliaciones">Resciliaciones</a></li>
</ul>
</li>
<li><a href="{{nUrl('precios', 'import')}}">Importar Precios</a></li>
<li><a href="{{nUrl('cierres', 'evalue')}}">Evaluar Cierre</a></li>
<li><a href="{{url('', ['p' => 'ventas', 'a' => 'new'])}}">Nueva Venta <span class="glyphicon glyphicon-plus"></span></a></li>
<li><a href="{{$urls->base}}/precios/import">Importar Precios</a></li>
<li><a href="{{$urls->base}}/cierres/evaluar">Evaluar Cierre</a></li>
<li><a href="{{$urls->base}}/ventas/add">Nueva Venta <span class="glyphicon glyphicon-plus"></span></a></li>
</ul>

View File

@ -13,7 +13,7 @@
<tbody>
<tr>
<td>{{$proyecto->valores()->estimados->departamentos->cantidad}}</td>
<td>{{\App\Helper\Format::number($proyecto->valores()->estimados->departamentos->cantidad / count($proyecto->unidades(1)) * 100, 2)}} %</td>
<td>{{$format->number($proyecto->valores()->estimados->departamentos->cantidad / count($proyecto->unidades(1)) * 100, 2)}} %</td>
<td>{!!format('m2', $proyecto->valores()->estimados->departamentos->mts->vendibles->promedio, null, true)!!}</td>
</tr>
</tbody>

View File

@ -21,8 +21,8 @@
<tbody>
<tr>
<td>{{count($proyecto->ventas())}}</td>
<td>{{\App\Helper\Format::number(count($proyecto->ventas())/count($proyecto->unidades(1)) * 100, 2)}} %</td>
<td>{{\App\Helper\Format::number($proyecto->valores()->vendidos->departamentos->mts->vendibles->promedio, 2)}}</td>
<td>{{$format->number(count($proyecto->ventas())/count($proyecto->unidades(1)) * 100, 2)}} %</td>
<td>{{$format->number($proyecto->valores()->vendidos->departamentos->mts->vendibles->promedio, 2)}}</td>
</tr>
</tbody>
<thead>
@ -38,12 +38,12 @@
<tbody>
<tr>
<td>
{{format('ufs', $proyecto->valores()->vendidos->ingreso->bruto, null, true)}} - {{\App\Helper\Format::ufs($proyecto->valores()->vendidos->ingreso->neto, true)}}
{{format('ufs', $proyecto->valores()->vendidos->ingreso->bruto, null, true)}} - {{$format->ufs($proyecto->valores()->vendidos->ingreso->neto, true)}}
<br />
{{format('ufs', $proyecto->valores()->vendidos->ingreso->abonado, null, true)}} ({{format('ufs', $proyecto->valores()->vendidos->ingreso->pagado, null, true)}})
</td>
<td>{{\App\Helper\Format::ufs($proyecto->valores()->vendidos->departamentos->uf_m2->promedio, true)}}</td>
<td>{{\App\Helper\Format::ufs($proyecto->valores()->vendidos->departamentos->precio->promedio, true)}}</td>
<td>{{$format->ufs($proyecto->valores()->vendidos->departamentos->uf_m2->promedio, true)}}</td>
<td>{{$format->ufs($proyecto->valores()->vendidos->departamentos->precio->promedio, true)}}</td>
</tr>
</tbody>
<thead>

View File

@ -88,8 +88,8 @@
@if ($venta->saldo() > 0.0001)
<br />
<br />
Diferencia {{format('ufs', $venta->saldo())}} UF ({{\App\Helper\Format::number(($venta->saldo()) / $venta->valor_uf * 100, 2)}}%).
Diferencia {{format('ufs', $venta->saldo())}} UF ({{$format->number(($venta->saldo()) / $venta->valor_uf * 100, 2)}}%).
@endif
</div>
</div>
@endsection
@endsection

View File

@ -30,9 +30,9 @@
</a>
</td>
<td><a href="?p=search&q={{urlencode('"' . $venta->propietario()->nombreCompleto() . '"')}}">{{$venta->propietario()->nombreCompleto()}} <span class="glyphicon glyphicon-search small"></span></a></td>
<td>{{\App\Helper\Format::ufs($venta->valor_uf)}}</td>
<td>{{$format->ufs($venta->valor_uf)}}</td>
<td>{{$venta->propiedad()->unidad()->tipologia()->tipologia()->descripcion}} ({{format('m2', $venta->propiedad()->unidad()->tipologia()->m2())}} m&#0178;)</td>
<td>{{\App\Helper\Format::ufs($venta->uf_m2())}}</td>
<td>{{$format->ufs($venta->uf_m2())}}</td>
<td>{{$venta->fecha()->format('d-m-Y')}}</td>
<td>{{ucwords($venta->estado()->tipo()->descripcion)}}</td>
</tr>

View File

@ -32,10 +32,10 @@
<tbody>
<tr>
<td>Fecha</td>
<td>{{\App\Helper\Format::shortDate($venta->pie()->fecha)}}</td>
<td>{{$format->shortDate($venta->pie()->fecha)}}</td>
<td>Valor</td>
<td>{{\App\Helper\Format::ufs($venta->pie()->valor)}} UF</td>
<td>$ {{\App\Helper\Format::pesos($venta->pie()->valorPesos())}}</td>
<td>{{$format->ufs($venta->pie()->valor)}} UF</td>
<td>$ {{$format->pesos($venta->pie()->valorPesos())}}</td>
<td>Cuotas</td>
<td>({{count($venta->pie()->abonadas())}}) {{count($venta->pie()->pagadas())}} / {{$venta->pie()->cuotas}}
</tr>
@ -85,7 +85,7 @@
<td class="@include('ventas.pies.cuotas.estado')">
<a href="{{url('', ['p' => 'cuotas', 'a' => 'show', 'cuota' => $cuota->id])}}">{{++$cnt}} <span class="glyphicon glyphicon-edit small"></span></a>
</td>
<td>{{\App\Helper\Format::shortDate($cuota->pago()->fecha)}}</td>
<td>{{$format->shortDate($cuota->pago()->fecha)}}</td>
<td>{{($cuota->pago()->banco()) ? $cuota->pago()->banco()->nombre : ''}}</td>
<td>
@if ($cuota->pago()->identificador == '')
@ -94,10 +94,10 @@
{{$cuota->pago()->identificador}}
@endif
</td>
<td class="text-right">$ {{\App\Helper\Format::pesos($cuota->valor())}}</td>
<td class="text-right">{{\App\Helper\Format::ufs($cuota->valor('ufs'))}} UF</td>
<td class="text-right">$ {{$format->pesos($cuota->valor())}}</td>
<td class="text-right">{{$format->ufs($cuota->valor('ufs'))}} UF</td>
<td class="text-center @include('ventas.pies.cuotas.estado')">
{{\App\Helper\Format::shortDate($cuota->pago()->estado()->fecha)}}
{{$format->shortDate($cuota->pago()->estado()->fecha)}}
<a href="{{url('', ['p' => 'pagos', 'a' => 'edit', 'pago' => $cuota->pago()->id, 'asociado' => 'venta', 'venta' => $venta->id])}}"><span class="glyphicon glyphicon-edit small"></span></a>
</td>
<td>

View File

@ -8,7 +8,7 @@
<form method="post" class="form-horizontal" action="{{url('', ['p' => 'propietarios', 'a' => 'editar', 'venta' => $venta->id])}}">
<div class="form-group">
<div class="col-md-2">RUT</div>
<div class="col-md-2"><input type="text" name="rut" value="{{\App\Helper\Format::number($propietario->rut, 0)}}-{{$propietario->dv}}" class="form-control" /></div>
<div class="col-md-2"><input type="text" name="rut" value="{{$format->number($propietario->rut, 0)}}-{{$propietario->dv}}" class="form-control" /></div>
<div class="col-md-2 checkbox"><label><input type="checkbox" name="empresa" /> Empresa?</label></div>
</div>
<div class="form-group">
@ -243,4 +243,4 @@ function removeRepresentante() {
$("input[name='rep_rut']").parent().parent().remove();
}
</script>
@endpush
@endpush

View File

@ -26,7 +26,7 @@
</thead>
<tbody>
<tr>
<td>{{\App\Helper\Format::number($venta->propietario()->rut, 0)}}-{{$venta->propietario()->dv}}</td>
<td>{{$format->number($venta->propietario()->rut, 0)}}-{{$venta->propietario()->dv}}</td>
<td>{{($venta->propietario()->direccion()) ? $venta->propietario()->direccion()->completa() : ''}}</td>
</tr>
<tr>
@ -79,7 +79,7 @@
<td>{{ucwords($venta->unidad()->tipo()->descripcion)}} {{$venta->unidad()->tipologia()->tipologia()->descripcion}}</td>
<td>{{$venta->unidad()->descripcion}}</td>
<td>{{$venta->unidad()->piso}}</td>
<td>{{\App\Helper\Format::number($venta->unidad()->m2(), 2)}} m&#0178;</td>
<td>{{$format->number($venta->unidad()->m2(), 2)}} m&#0178;</td>
<td class="text-right">
@if ($venta->unidad()->precio($venta->fecha()))
{{format('ufs', $venta->unidad()->precio($venta->fecha())->valor)}} UF
@ -111,7 +111,7 @@
<td>{{$unidad->unidad()->piso}}</td>
<td>
@if ($unidad->unidad()->tipo()->descripcion == 'departamento')
{{\App\Helper\Format::number($unidad->unidad()->m2(), 2)}} m&#0178;
{{$format->number($unidad->unidad()->m2(), 2)}} m&#0178;
@endif
</td>
<td class="text-right">
@ -171,7 +171,7 @@
<td>{{format('ufs', $venta->valor_uf)}} UF</td>
<td>{{format('ufs', $venta->valorFinal())}} UF</td>
<td>{{format('ufs', $venta->uf_m2(), null, true)}}/m&#0178;</td>
<td>{{format('ufs', $venta->valorComision())}} UF ({{\App\Helper\Format::number($venta->comision() * 100, 2)}}%)
<td>{{format('ufs', $venta->valorComision())}} UF ({{$format->number($venta->comision() * 100, 2)}}%)
@if ($venta->agente != 0)
<br />
{{$venta->agente()->agente()->agente()->descripcion}}