diff --git a/app/resources/views/search.blade.php b/app/resources/views/search.blade.php index 3d8f48b..0da8710 100644 --- a/app/resources/views/search.blade.php +++ b/app/resources/views/search.blade.php @@ -56,7 +56,7 @@ unidad.html(unidad.html() + ' (I)') } propietario = $('') - .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}}') diff --git a/app/setup/setups/database.php b/app/setup/setups/database.php index 5ef8d8f..cdea0d2 100644 --- a/app/setup/setups/database.php +++ b/app/setup/setups/database.php @@ -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) { diff --git a/docker-compose.yml b/docker-compose.yml index e73d660..ca32980 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -25,7 +25,7 @@ services: <<: *restart env_file: - ${APP_PATH:-.}/.env - - ${APP_PATH:-.}/.db.env +# - ${APP_PATH:-.}/.db.env - ./.key.env #- ${APP_PATH:-.}/.remote.env volumes: