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

app/resources/views/search.blade.php

@@ -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}}')

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->has('DB_HOST') ? $container->get('DB_HOST') : 'db',
-            $container->get('MYSQL_DATABASE'),
+            $container->get('DB_DATABASE'),
-            $container->get('MYSQL_USER'),
+            $container->get('DB_USER'),
-            $container->get('MYSQL_PASSWORD')
+            $container->get('DB_PASSWORD')
         );
     },
     Incoviba\Common\Define\Connection::class => function(ContainerInterface $container) {

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: