Incoviba/oficial
1
0
Fork 0
Code Issues Pull Requests 2 Releases Wiki Activity

Merge branch 'develop' of http://git.provm.cl/Incoviba/oficial into develop

Browse Source
This commit is contained in:
Juan Pablo Vial
2024-02-07 18:37:13 -03:00
parent d8b8787be9 62edca5335
commit 3cd699d2e2
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/resources/views/search.blade.php
View File

@ -56,7 +56,7 @@
unidad.html(unidad.html() + ' (I)')
}
propietario = $('<a></a>')
.attr('href','{{$urls->base}}/search/' + encodeURIComponent(this.venta.propietario.nombre_completo) + '/propietario')
.attr('href','{{$urls->base}}/search/"' + encodeURIComponent(this.venta.propietario.nombre_completo) + '"/propietario')
.html(this.venta.propietario.nombre_completo)
fecha = dateFormatter.format(new Date(this.venta.fecha))
if (typeof this.venta.entrega !== 'undefined') {
@ -309,15 +309,23 @@
}
}
},
set: function() {
return {
query: value => {
$("[name='query']").val(value)
this.get().results()
}
}
},
setup: function(id) {
this.id = id
this.get().results()
$('#tipo').dropdown().dropdown('set selected', '*')
@if (trim($post) !== '')
$("[name='query']").val('{{$post}}')
this.set().query('{!! $post !!}')
@elseif (trim($query) !== '')
$("[name='query']").val('{{$query}}')
this.set().query('{!! $query !!}')
@endif
@if (trim($tipo) !== '')
$('#tipo').dropdown('set selected', '{{$tipo}}')

8
app/setup/setups/database.php
View File

@ -4,10 +4,10 @@ use Psr\Container\ContainerInterface;
return [
Incoviba\Common\Define\Database::class => function(ContainerInterface $container) {
return new Incoviba\Common\Implement\Database\MySQL(
$container->has('MYSQL_HOST') ? $container->get('MYSQL_HOST') : 'db',
$container->get('MYSQL_DATABASE'),
$container->get('MYSQL_USER'),
$container->get('MYSQL_PASSWORD')
$container->has('DB_HOST') ? $container->get('DB_HOST') : 'db',
$container->get('DB_DATABASE'),
$container->get('DB_USER'),
$container->get('DB_PASSWORD')
);
},
Incoviba\Common\Define\Connection::class => function(ContainerInterface $container) {