From 1f0f25bbdeb3505eaf70cb5f8775678385d6801f Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Thu, 28 Nov 2024 11:39:19 -0300
Subject: [PATCH 1/8] Migraciones

---
 app/src/Model/Inmobiliaria/DatosProveedor.php | 23 ++++++++++++++
 app/src/Model/Inmobiliaria/Proveedor.php      | 30 +++++++++----------
 app/tests/unit/src/Model/ProveedorTest.php    | 22 ++++++++++++++
 3 files changed, 59 insertions(+), 16 deletions(-)
 create mode 100644 app/src/Model/Inmobiliaria/DatosProveedor.php
 create mode 100644 app/tests/unit/src/Model/ProveedorTest.php

diff --git a/app/src/Model/Inmobiliaria/DatosProveedor.php b/app/src/Model/Inmobiliaria/DatosProveedor.php
new file mode 100644
index 0000000..aacd447
--- /dev/null
+++ b/app/src/Model/Inmobiliaria/DatosProveedor.php
@@ -0,0 +1,23 @@
+<?php
+namespace Incoviba\Model\Inmobiliaria;
+
+use Incoviba\Common\Ideal;
+use Incoviba\Model\Direccion;
+
+class DatosProveedor extends Ideal\Model
+{
+    public Proveedor $proveedor;
+    public ?Direccion $direccion;
+    public ?int $telefono;
+    public ?string $giro;
+
+    public function jsonSerialize(): mixed
+    {
+        return [
+            'proveedor' => $this->proveedor,
+            'direccion' => $this->direccion,
+            'telefono' => $this->telefono,
+            'giro' => $this->giro
+        ];
+    }
+}
diff --git a/app/src/Model/Inmobiliaria/Proveedor.php b/app/src/Model/Inmobiliaria/Proveedor.php
index ccb8934..9a84059 100644
--- a/app/src/Model/Inmobiliaria/Proveedor.php
+++ b/app/src/Model/Inmobiliaria/Proveedor.php
@@ -6,24 +6,22 @@ use Incoviba\Model;
 
 class Proveedor extends Ideal\Model
 {
-    public Model\Inmobiliaria $inmobiliaria;
-    public Model\Sociedad $sociedad;
-
-    protected array $tipos;
-    public function tipos(): array
-    {
-        if (!isset($this->tipos)) {
-            $this->tipos = $this->runFactory('tipos');
-        }
-        return $this->tipos;
-    }
+    public int $rut;
+    public string $digito;
+    public string $nombre;
+    public ?string $razon;
+    public ?DatosProveedor $datos;
+    public ?Model\Persona $contacto;
 
     public function jsonSerialize(): mixed
     {
-        return array_merge(parent::jsonSerialize(), [
-            'inmobiliaria' => $this->inmobiliaria,
-            'sociedad' => $this->sociedad,
-            'tipos' => $this->tipos(),
-        ]);
+        return [
+            'rut' => $this->rut,
+            'digito' => $this->digito,
+            'nombre' => $this->nombre,
+            'razon' => $this->razon,
+            'datos' => $this->datos,
+            'contacto' => $this->contacto
+        ];
     }
 }
diff --git a/app/tests/unit/src/Model/ProveedorTest.php b/app/tests/unit/src/Model/ProveedorTest.php
new file mode 100644
index 0000000..044834d
--- /dev/null
+++ b/app/tests/unit/src/Model/ProveedorTest.php
@@ -0,0 +1,22 @@
+<?php
+use Incoviba\Model\Inmobiliaria\Proveedor;
+use PHPUnit\Framework\TestCase;
+
+class ProveedorTest extends TestCase
+{
+    public function testCreate()
+    {
+        $proveedor = new Proveedor();
+        $this->assertInstanceOf(Proveedor::class, $proveedor);
+    }
+    public function testProperties()
+    {
+        $proveedor = new Proveedor();
+
+        $this->assertObjectHasProperty('rut', $proveedor);
+        $this->assertObjectHasProperty('digito', $proveedor);
+        $this->assertObjectHasProperty('nombre', $proveedor);
+        $this->assertObjectHasProperty('razon', $proveedor);
+        $this->assertObjectHasProperty('contacto', $proveedor);
+    }
+}
-- 
2.49.0


From b2c55c08ce7f94e90e704c24518d3caad9d778e7 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Fri, 29 Nov 2024 17:47:12 -0300
Subject: [PATCH 2/8] Servicio y vista

---
 .../views/inmobiliarias/proveedores.blade.php | 52 ++++++++-----------
 .../Controller/Inmobiliarias/Proveedores.php  | 12 ++---
 app/src/Service/Inmobiliaria/Proveedor.php    | 35 +++++++++++++
 3 files changed, 61 insertions(+), 38 deletions(-)
 create mode 100644 app/src/Service/Inmobiliaria/Proveedor.php

diff --git a/app/resources/views/inmobiliarias/proveedores.blade.php b/app/resources/views/inmobiliarias/proveedores.blade.php
index 74f0178..c9ef3f6 100644
--- a/app/resources/views/inmobiliarias/proveedores.blade.php
+++ b/app/resources/views/inmobiliarias/proveedores.blade.php
@@ -15,15 +15,15 @@
             </tr>
             </thead>
             <tbody id="proveedores">
-            @foreach ($sociedades as $sociedad)
+            @foreach ($proveedores as $proveedor)
                 <tr>
-                    <td>{{$sociedad->nombre}}</td>
-                    <td>{{$sociedad->contacto->nombreCompleto()}}</td>
+                    <td>{{$proveedor->nombre}}</td>
+                    <td>{{$proveedor->contacto->nombreCompleto()}}</td>
                     <td class="right aligned">
-                        <button class="ui icon button" data-sociedad="{{$sociedad->rut}}">
+                        <button class="ui icon button" data-sociedad="{{$proveedor->rut}}">
                             <i class="edit icon"></i>
                         </button>
-                        <button class="ui red icon button" data-sociedad="{{$sociedad->rut}}">
+                        <button class="ui red icon button" data-sociedad="{{$proveedor->rut}}">
                             <i class="remove icon"></i>
                         </button>
                     </td>
@@ -38,62 +38,53 @@
                 <div class="three wide field">
                     <label for="rut">RUT</label>
                     <div class="ui right labeled input">
-                        <input class="right aligned" type="text" id="rut" name="rut" placeholder="RUT" maxlength="10" required />
+                        <input class="right aligned" type="text" id="rut" name="rut" placeholder="RUT" maxlength="10"
+                               required/>
                         <div class="ui basic label">-<span id="dv"></span></div>
                     </div>
                 </div>
                 <div class="five wide field">
                     <label for="nombre">Nombre</label>
-                    <input type="text" id="nombre" name="nombre" placeholder="Nombre" required />
+                    <input type="text" id="nombre" name="nombre" placeholder="Nombre" required/>
                 </div>
                 <div class="field">
                     <label for="razon">Razón Social</label>
-                    <input type="text" id="razon" name="razon" placeholder="Razón Social" required />
-                </div>
-                <div class="four wide field">
-                    <label for="tipo">Tipo</label>
-                    <div class="ui selection dropdown" id="tipo">
-                        <input type="hidden" name="tipo" required />
-                        <i class="dropdown icon"></i>
-                        <div class="default text">Tipo</div>
-                        <div class="menu">
-                            @foreach ($tiposSociedades as $tipo)
-                                <div class="item" data-value="{{$tipo->id}}">{{$tipo->descripcion}}</div>
-                            @endforeach
-                        </div>
-                    </div>
+                    <input type="text" id="razon" name="razon" placeholder="Razón Social" required/>
                 </div>
                 <div class="ui divider">Contacto</div>
                 <div class="three wide field">
                     <label for="rut_contacto">RUT</label>
                     <div class="ui right labeled input">
-                        <input type="text" id="rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10" required />
+                        <input type="text" id="rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10"
+                               required/>
                         <div class="ui basic label">-<span id="dv_contacto"></span></div>
                     </div>
                 </div>
                 <div class="fields">
                     <div class="five wide field">
                         <label for="nombre_contacto">Nombre</label>
-                        <input type="text" id="nombre_contacto" name="nombre_contacto" placeholder="Nombre" required />
+                        <input type="text" id="nombre_contacto" name="nombre_contacto" placeholder="Nombre" required/>
                     </div>
                     <div class="field">
                         <label for="apellido_paterno_contacto">Apellido Paterno</label>
-                        <input type="text" id="apellido_paterno_contacto" name="apellido_paterno_contacto" placeholder="Apellido Paterno" required />
+                        <input type="text" id="apellido_paterno_contacto" name="apellido_paterno_contacto"
+                               placeholder="Apellido Paterno" required/>
                     </div>
                     <div class="field">
                         <label for="apellido_materno_contacto">Apellido Materno</label>
-                        <input type="text" id="apellido_materno_contacto" name="apellido_materno_contacto" placeholder="Apellido Materno" />
+                        <input type="text" id="apellido_materno_contacto" name="apellido_materno_contacto"
+                               placeholder="Apellido Materno"/>
                     </div>
                 </div>
                 <div class="field">
                     <label for="email_contacto">Email</label>
-                    <input type="email" id="email_contacto" name="email_contacto" placeholder="Email" />
+                    <input type="email" id="email_contacto" name="email_contacto" placeholder="Email"/>
                 </div>
                 <div class="field">
                     <label for="telefono_contacto">Teléfono</label>
                     <div class="ui left labeled input">
                         <div class="ui basic label">+56</div>
-                        <input type="text" id="telefono_contacto" name="telefono_contacto" placeholder="Teléfono" />
+                        <input type="text" id="telefono_contacto" name="telefono_contacto" placeholder="Teléfono"/>
                     </div>
                 </div>
             </form>
@@ -133,7 +124,7 @@
                 },
                 proveedores: ''
             },
-            data: JSON.parse('{!! json_encode($sociedades) !!}'),
+            data: JSON.parse('{!! json_encode($proveedores) !!}'),
             add() {
                 return {
                     sociedad: () => {
@@ -175,7 +166,8 @@
                     }
                 }
             },
-            edit() {},
+            edit() {
+            },
             remove() {
                 return {
                     sociedad: rut => {
@@ -253,7 +245,7 @@
                 }
                 let suma = 0
                 let mul = 2
-                for (let i = rut.length-1; i >= 0; i--) {
+                for (let i = rut.length - 1; i >= 0; i--) {
                     suma += parseInt(rut[i]) * mul
                     mul = (mul + 1) % 8 || 2
                 }
diff --git a/app/src/Controller/Inmobiliarias/Proveedores.php b/app/src/Controller/Inmobiliarias/Proveedores.php
index 09d736e..f7b5750 100644
--- a/app/src/Controller/Inmobiliarias/Proveedores.php
+++ b/app/src/Controller/Inmobiliarias/Proveedores.php
@@ -11,17 +11,13 @@ use Incoviba\Service;
 class Proveedores
 {
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                             Service\Sociedad $sociedadService,
+                             Service\Inmobiliaria\Proveedor $proveedorService,
                              Repository\Inmobiliaria\TipoSociedad $tipoSociedad): ResponseInterface
     {
-        $sociedades = [];
+        $proveedores = [];
         try {
-            $sociedades = $sociedadService->getAll('nombre');
+            $proveedores = $proveedorService->getAll('nombre');
         } catch (EmptyResult) {}
-        $tiposSociedades = [];
-        try {
-            $tiposSociedades = $tipoSociedad->fetchAll('descripcion');
-        } catch (EmptyResult) {}
-        return $view->render($response, 'inmobiliarias.proveedores', compact('sociedades', 'tiposSociedades'));
+        return $view->render($response, 'inmobiliarias.proveedores', compact('proveedores'));
     }
 }
diff --git a/app/src/Service/Inmobiliaria/Proveedor.php b/app/src/Service/Inmobiliaria/Proveedor.php
new file mode 100644
index 0000000..d564b10
--- /dev/null
+++ b/app/src/Service/Inmobiliaria/Proveedor.php
@@ -0,0 +1,35 @@
+<?php
+namespace Incoviba\Service\Inmobiliaria;
+
+use Psr\Log\LoggerInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement;
+use Incoviba\Common\Define;
+use Incoviba\Repository;
+use Incoviba\Model;
+
+class Proveedor extends Ideal\Service
+{
+    public function __construct(LoggerInterface $logger, protected Repository\Inmobiliaria\Proveedor $proveedorRepository)
+    {
+        parent::__construct($logger);
+    }
+
+    public function getAll(?string $orderBy = null): array
+    {
+        try {
+            return $this->proveedorRepository->fetchAll($orderBy);
+        } catch (Implement\Exception\EmptyResult) {
+            return [];
+        }
+    }
+
+    public function getByRut(int $proveedor_rut): ?Model\Inmobiliaria\Proveedor
+    {
+        try {
+            return $this->proveedorRepository->fetchById($proveedor_rut);
+        } catch (Implement\Exception\EmptyResult) {
+            return null;
+        }
+    }
+}
-- 
2.49.0


From 5b442602451ccd7122fca0bec729c21de9a04c34 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Tue, 3 Dec 2024 16:45:04 -0300
Subject: [PATCH 3/8] Separacion logs

---
 app/setup/setups/logs.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/setup/setups/logs.php b/app/setup/setups/logs.php
index 4630add..fe62d82 100644
--- a/app/setup/setups/logs.php
+++ b/app/setup/setups/logs.php
@@ -17,19 +17,19 @@ return [
             ),
             new Monolog\Handler\FilterHandler(
                 ($container->has('ENVIRONMENT') and $container->get('ENVIRONMENT') === 'development')
-                    ? (new Monolog\Handler\RotatingFileHandler('/logs/notices.log', 10))
+                    ? (new Monolog\Handler\RotatingFileHandler('/logs/debug.log', 10))
                         ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true))
                     : new Monolog\Handler\RedisHandler($container->get(Predis\ClientInterface::class), 'logs:notices'),
-                Monolog\Level::Notice,
-                Monolog\Level::Warning
+                Monolog\Level::Debug,
+                Monolog\Level::Info
             ),
             new Monolog\Handler\FilterHandler(
                 ($container->has('ENVIRONMENT') and $container->get('ENVIRONMENT') === 'development')
-                    ? (new Monolog\Handler\RotatingFileHandler('/logs/debug.log', 10))
+                    ? (new Monolog\Handler\RotatingFileHandler('/logs/notices.log', 10))
                         ->setFormatter(new Monolog\Formatter\LineFormatter(null, null, false, false, true))
                     : (new Incoviba\Common\Implement\Log\MySQLHandler($container->get(Incoviba\Common\Define\Connection::class)))
                         ->setFormatter(new Incoviba\Common\Implement\Log\PDOFormatter()),
-                Monolog\Level::Debug,
+                Monolog\Level::Notice,
                 Monolog\Level::Warning
             )
         ], [
-- 
2.49.0


From 42e1dcdff70f5ffb1d27aee9a7edd15926fd23c7 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Tue, 3 Dec 2024 16:45:20 -0300
Subject: [PATCH 4/8] Agregar Proveedor

---
 app/common/Ideal/Repository.php               |   2 +-
 .../routes/api/inmobiliarias/proveedores.php  |  13 +-
 .../views/inmobiliarias/proveedores.blade.php | 214 +++---------------
 .../proveedores/add_modal.blade.php           | 137 +++++++++++
 .../views/layout/body/scripts/rut.blade.php   |   9 +
 .../API/Inmobiliarias/Proveedores.php         |  79 +++++++
 .../Controller/Inmobiliarias/Proveedores.php  |   3 +-
 app/src/Model/DatosPersona.php                |  32 ---
 app/src/Model/Inmobiliaria/Proveedor.php      |  20 +-
 .../Datos.php}                                |   5 +-
 app/src/Model/Persona.php                     |   7 +-
 app/src/Model/Persona/Datos.php               |  34 +++
 app/src/Repository/Inmobiliaria/Proveedor.php |  45 ++--
 .../Inmobiliaria/Proveedor/Datos.php          |  52 +++++
 app/src/Repository/Persona.php                |   7 +-
 .../{DatosPersona.php => Persona/Datos.php}   |  24 +-
 app/src/Repository/Sociedad.php               |   2 +-
 app/src/Service/Inmobiliaria/Proveedor.php    |  59 ++++-
 app/src/Service/Persona.php                   |  12 +-
 19 files changed, 473 insertions(+), 283 deletions(-)
 create mode 100644 app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
 create mode 100644 app/src/Controller/API/Inmobiliarias/Proveedores.php
 delete mode 100644 app/src/Model/DatosPersona.php
 rename app/src/Model/Inmobiliaria/{DatosProveedor.php => Proveedor/Datos.php} (78%)
 create mode 100644 app/src/Model/Persona/Datos.php
 create mode 100644 app/src/Repository/Inmobiliaria/Proveedor/Datos.php
 rename app/src/Repository/{DatosPersona.php => Persona/Datos.php} (83%)

diff --git a/app/common/Ideal/Repository.php b/app/common/Ideal/Repository.php
index e800bc6..0edb118 100644
--- a/app/common/Ideal/Repository.php
+++ b/app/common/Ideal/Repository.php
@@ -34,7 +34,7 @@ abstract class Repository implements Define\Repository
         $query = $this->connection->getQueryBuilder()
             ->delete()->from($this->getTable())
             ->where("{$this->getKey()} = ?");
-        $this->connection->execute($query, [$model->id]);
+        $this->connection->execute($query, [$model->{$this->getKey()}]);
     }
 
     /**
diff --git a/app/resources/routes/api/inmobiliarias/proveedores.php b/app/resources/routes/api/inmobiliarias/proveedores.php
index df5ab4b..306c496 100644
--- a/app/resources/routes/api/inmobiliarias/proveedores.php
+++ b/app/resources/routes/api/inmobiliarias/proveedores.php
@@ -1,11 +1,12 @@
 <?php
-use Incoviba\Controller\API\Inmobiliarias\Agentes;
+use Incoviba\Controller\API\Inmobiliarias\Proveedores;
 
 $app->group('/proveedores', function($app) {
-    $app->post('/add[/]', [Agentes::class, 'add']);
-    $app->post('/register[/]', [Agentes::class, 'register']);
-    $app->get('[/]', Agentes::class);
+    $app->post('/add[/]', [Proveedores::class, 'add']);
+    //$app->post('/register[/]', [Proveedores::class, 'register']);
+    $app->get('[/]', Proveedores::class);
 });
-$app->group('/proveedor/{agente_id}', function($app) {
-    $app->post('/edit[/]', [Agentes::class, 'edit']);
+$app->group('/proveedor/{proveedor_rut:[0-9]+}', function($app) {
+    $app->post('/edit[/]', [Proveedores::class, 'edit']);
+    $app->delete('/delete[/]', [Proveedores::class, 'delete']);
 });
diff --git a/app/resources/views/inmobiliarias/proveedores.blade.php b/app/resources/views/inmobiliarias/proveedores.blade.php
index c9ef3f6..0fe7d25 100644
--- a/app/resources/views/inmobiliarias/proveedores.blade.php
+++ b/app/resources/views/inmobiliarias/proveedores.blade.php
@@ -8,7 +8,7 @@
                 <th>Nombre</th>
                 <th>Contacto</th>
                 <th class="right aligned">
-                    <button class="ui green icon button" id="add_button">
+                    <button class="ui tertiary green icon button" id="add_button">
                         <i class="plus icon"></i>
                     </button>
                 </th>
@@ -20,10 +20,10 @@
                     <td>{{$proveedor->nombre}}</td>
                     <td>{{$proveedor->contacto->nombreCompleto()}}</td>
                     <td class="right aligned">
-                        <button class="ui icon button" data-sociedad="{{$proveedor->rut}}">
+                        <button class="ui tertiary icon button" data-proveedor="{{$proveedor->rut}}">
                             <i class="edit icon"></i>
                         </button>
-                        <button class="ui red icon button" data-sociedad="{{$proveedor->rut}}">
+                        <button class="ui tertiary red icon button" data-proveedor="{{$proveedor->rut}}">
                             <i class="remove icon"></i>
                         </button>
                     </td>
@@ -32,74 +32,16 @@
             </tbody>
         </table>
     </div>
-    <div class="ui modal" id="add_modal">
-        <div class="content">
-            <form class="ui form">
-                <div class="three wide field">
-                    <label for="rut">RUT</label>
-                    <div class="ui right labeled input">
-                        <input class="right aligned" type="text" id="rut" name="rut" placeholder="RUT" maxlength="10"
-                               required/>
-                        <div class="ui basic label">-<span id="dv"></span></div>
-                    </div>
-                </div>
-                <div class="five wide field">
-                    <label for="nombre">Nombre</label>
-                    <input type="text" id="nombre" name="nombre" placeholder="Nombre" required/>
-                </div>
-                <div class="field">
-                    <label for="razon">Razón Social</label>
-                    <input type="text" id="razon" name="razon" placeholder="Razón Social" required/>
-                </div>
-                <div class="ui divider">Contacto</div>
-                <div class="three wide field">
-                    <label for="rut_contacto">RUT</label>
-                    <div class="ui right labeled input">
-                        <input type="text" id="rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10"
-                               required/>
-                        <div class="ui basic label">-<span id="dv_contacto"></span></div>
-                    </div>
-                </div>
-                <div class="fields">
-                    <div class="five wide field">
-                        <label for="nombre_contacto">Nombre</label>
-                        <input type="text" id="nombre_contacto" name="nombre_contacto" placeholder="Nombre" required/>
-                    </div>
-                    <div class="field">
-                        <label for="apellido_paterno_contacto">Apellido Paterno</label>
-                        <input type="text" id="apellido_paterno_contacto" name="apellido_paterno_contacto"
-                               placeholder="Apellido Paterno" required/>
-                    </div>
-                    <div class="field">
-                        <label for="apellido_materno_contacto">Apellido Materno</label>
-                        <input type="text" id="apellido_materno_contacto" name="apellido_materno_contacto"
-                               placeholder="Apellido Materno"/>
-                    </div>
-                </div>
-                <div class="field">
-                    <label for="email_contacto">Email</label>
-                    <input type="email" id="email_contacto" name="email_contacto" placeholder="Email"/>
-                </div>
-                <div class="field">
-                    <label for="telefono_contacto">Teléfono</label>
-                    <div class="ui left labeled input">
-                        <div class="ui basic label">+56</div>
-                        <input type="text" id="telefono_contacto" name="telefono_contacto" placeholder="Teléfono"/>
-                    </div>
-                </div>
-            </form>
-        </div>
-        <div class="actions">
-            <button class="ui green approve button">Guardar</button>
-        </div>
-    </div>
+
+    @include('inmobiliarias.proveedores.add_modal')
 @endsection
 
+@include('layout.body.scripts.rut')
+
 @push('page_scripts')
     <script>
         const proveedores = {
             ids: {
-                modal: '',
                 buttons: {
                     add: '',
                     edit: '',
@@ -111,7 +53,6 @@
                     dv: '',
                     nombre: '',
                     razon: '',
-                    tipo: '',
                     contacto: {
                         rut: '',
                         dv: '',
@@ -125,69 +66,18 @@
                 proveedores: ''
             },
             data: JSON.parse('{!! json_encode($proveedores) !!}'),
-            add() {
-                return {
-                    sociedad: () => {
-                        const data = {
-                            rut: $(this.ids.add.rut).val().replace(/\D/g, ''),
-                            digito: $(this.ids.add.dv).text(),
-                            nombre: $(this.ids.add.nombre).val(),
-                            razon: $(this.ids.add.razon).val(),
-                            tipo_sociedad_id: $(this.ids.add.tipo).dropdown('get value'),
-                            contacto: {
-                                rut: $(this.ids.add.contacto.rut).val().replace(/\D/g, ''),
-                                digito: $(this.ids.add.contacto.dv).text(),
-                                nombres: $(this.ids.add.contacto.nombre).val(),
-                                apellido_paterno: $(this.ids.add.contacto.apellido_paterno).val(),
-                                apellido_materno: $(this.ids.add.contacto.apellido_materno).val(),
-                                email: $(this.ids.add.contacto.email).val(),
-                                telefono: $(this.ids.add.contacto.telefono).val().replace(/\D/g, ''),
-                            }
-                        }
-                        const body = new FormData()
-                        body.append('sociedades[]', JSON.stringify(data))
-                        const url = '{{$urls->api}}/sociedades/add'
-                        const method = 'post'
-                        fetchAPI(url, {method, body})
-                            .then(response => (response) ? response.json() : null)
-                            .then(data => {
-                                if (data.sociedades !== null) {
-                                    data.sociedades.forEach(sociedad => {
-                                        const exists = this.data.find(s => s.rut === sociedad.rut)
-                                        if (typeof exists !== 'undefined') {
-                                            return
-                                        }
-                                        this.data.push(sociedad)
-                                    })
-                                    this.draw().sociedades()
-                                    $(this.ids.modal).find('form.form').trigger('reset')
-                                }
-                            })
-                    }
-                }
-            },
             edit() {
             },
             remove() {
                 return {
-                    sociedad: rut => {
-                        const body = new FormData()
-                        body.append('sociedades_ruts[]', rut)
-                        const url = '{{$urls->api}}/sociedades/delete'
-                        const method = 'post'
-                        fetchAPI(url, {method, body})
+                    proveedor: rut => {
+                        const url = `{{$urls->api}}/inmobiliarias/proveedor/${rut}/delete`
+                        const method = 'delete'
+                        APIClient.fetch(url, {method})
                             .then(response => (response) ? response.json() : null)
                             .then(data => {
-                                if (data.sociedades !== null) {
-                                    data.sociedades.forEach(sociedad => {
-                                        if (sociedad.sociedad.rut !== rut) {
-                                            return
-                                        }
-                                        if (!sociedad.deleted) {
-                                            return
-                                        }
-                                        $(this.ids.proveedores).find(`button[data-sociedad="${rut}"]`).closest('tr').remove()
-                                    })
+                                if (data.success) {
+                                    window.location.reload()
                                 }
                             })
 
@@ -196,18 +86,18 @@
             },
             draw() {
                 return {
-                    sociedades: () => {
+                    proveedores: () => {
                         $(this.ids.proveedores).empty()
-                        this.data.forEach(sociedad => {
+                        this.data.forEach(proveedor => {
                             $(this.ids.proveedores).append(`
                             <tr>
-                                <td>${sociedad.nombre}</td>
-                                <td>${sociedad.contacto.nombreCompleto}</td>
+                                <td>${proveedor.nombre}</td>
+                                <td>${proveedor.contacto.nombreCompleto}</td>
                                 <td class="right aligned">
-                                    <button class="ui icon button" data-sociedad="${sociedad.rut}">
+                                    <button class="ui icon button" data-proveedor="${proveedor.rut}">
                                         <i class="edit icon"></i>
                                     </button>
-                                    <button class="ui red icon button" data-sociedad="${sociedad.rut}">
+                                    <button class="ui red icon button" data-proveedor="${proveedor.rut}">
                                         <i class="remove icon"></i>
                                     </button>
                                 </td>
@@ -215,7 +105,7 @@
                             `)
                         })
                         $(this.ids.buttons.remove).click((e) => {
-                            this.remove().sociedad($(e.target).data('sociedad'))
+                            this.remove().proveedor($(e.target).data('proveedor'))
                         })
                     }
                 }
@@ -223,11 +113,7 @@
             formatters() {
                 return {
                     rut: value => {
-                        const rut = value.replace(/[^0-9]/g, '')
-                        if (rut.length <= 1) {
-                            return rut
-                        }
-                        return rut.replace(/\B(?=(\d{3})+(?!\d))/g, '.')
+                        return Rut.format(value)
                     },
                     telefono: value => {
                         const phone = value.replace(/[^0-9]/g, '')
@@ -238,77 +124,35 @@
                     }
                 }
             },
-            digitoVerificador(value) {
-                let rut = value.replace(/[^0-9kK]/g, '')
-                if (rut.length < 1) {
-                    return ''
-                }
-                let suma = 0
-                let mul = 2
-                for (let i = rut.length - 1; i >= 0; i--) {
-                    suma += parseInt(rut[i]) * mul
-                    mul = (mul + 1) % 8 || 2
-                }
-                const dv = 11 - suma % 11
-                return dv === 10 ? 'K' : (dv === 11 ? '0' : dv.toString())
-            },
             setup(ids) {
                 this.ids = ids
+                const addModal = new AddModal(this.ids.add, this.formatters())
                 $(this.ids.buttons.add).click(() => {
-                    $(this.ids.modal).modal('show')
-                })
-                $(this.ids.add.rut).on('input', (e) => {
-                    e.target.value = this.formatters().rut(e.target.value)
-                    $(this.ids.add.dv).text(this.digitoVerificador(e.target.value))
-                })
-                if ($(this.ids.add.rut).val().length > 0) {
-                    $(this.ids.add.rut).val(this.formatters().rut($(this.ids.add.rut).val()))
-                    $(this.ids.add.dv).text(this.digitoVerificador($(this.ids.add.rut).val()))
-                }
-                $(this.ids.tipo).dropdown()
-                $(this.ids.add.contacto.rut).on('input', (e) => {
-                    e.target.value = this.formatters().rut(e.target.value)
-                    $(this.ids.add.contacto.dv).text(this.digitoVerificador(e.target.value))
-                })
-                if ($(this.ids.add.contacto.rut).val().length > 0) {
-                    $(this.ids.add.contacto.rut).val(this.formatters().rut($(this.ids.add.contacto.rut).val()))
-                    $(this.ids.add.contacto.dv).text(this.digitoVerificador($(this.ids.add.contacto.rut).val()))
-                }
-                $(this.ids.add.contacto.telefono).on('input', (e) => {
-                    e.target.value = this.formatters().telefono(e.target.value)
-                })
-                if ($(this.ids.add.contacto.telefono).val().length > 0) {
-                    $(this.ids.add.contacto.telefono).val(this.formatters().telefono($(this.ids.add.contacto.telefono).val()))
-                }
-                $(this.ids.modal).modal({
-                    onApprove: () => {
-                        this.add().sociedad()
-                    }
+                    addModal.show()
                 })
                 $(this.ids.buttons.remove).click((e) => {
-                    this.remove().sociedad($(e.target).data('sociedad'))
+                    this.remove().proveedor(e.currentTarget.parentNode.dataset.proveedor)
                 })
             }
         }
         $(document).ready(() => {
             proveedores.setup({
-                modal: '#add_modal',
                 buttons: {
                     add: '#add_button',
                     edit: '.edit',
                     remove: '.remove'
                 },
                 add: {
-                    form: '#add_modal form.form',
+                    modal: '#add_modal',
+                    form: 'add_form',
                     rut: '#rut',
-                    dv: '#dv',
+                    digito: '#dv',
                     nombre: '#nombre',
                     razon: '#razon',
-                    tipo: '#tipo',
                     contacto: {
                         rut: '#rut_contacto',
-                        dv: '#dv_contacto',
-                        nombre: '#nombre_contacto',
+                        digito: '#dv_contacto',
+                        nombres: '#nombre_contacto',
                         apellido_paterno: '#apellido_paterno_contacto',
                         apellido_materno: '#apellido_materno_contacto',
                         email: '#email_contacto',
diff --git a/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php b/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
new file mode 100644
index 0000000..d0bea75
--- /dev/null
+++ b/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
@@ -0,0 +1,137 @@
+<div class="ui modal" id="add_modal">
+    <div class="content">
+        <form class="ui form" id="add_form">
+            <div class="three wide field">
+                <label for="rut">RUT</label>
+                <div class="ui right labeled input">
+                    <input class="right aligned" type="text" id="rut" name="rut" placeholder="RUT" maxlength="10"
+                           required/>
+                    <div class="ui basic label">-<span id="dv"></span></div>
+                </div>
+            </div>
+            <div class="five wide field">
+                <label for="nombre">Nombre</label>
+                <input type="text" id="nombre" name="nombre" placeholder="Nombre" required/>
+            </div>
+            <div class="field">
+                <label for="razon">Razón Social</label>
+                <input type="text" id="razon" name="razon" placeholder="Razón Social" required/>
+            </div>
+            <div class="ui divider">Contacto</div>
+            <div class="three wide field">
+                <label for="rut_contacto">RUT</label>
+                <div class="ui right labeled input">
+                    <input type="text" id="rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10"
+                           required/>
+                    <div class="ui basic label">-<span id="dv_contacto"></span></div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="five wide field">
+                    <label for="nombre_contacto">Nombre</label>
+                    <input type="text" id="nombre_contacto" name="nombre_contacto" placeholder="Nombre" required/>
+                </div>
+                <div class="field">
+                    <label for="apellido_paterno_contacto">Apellido Paterno</label>
+                    <input type="text" id="apellido_paterno_contacto" name="apellido_paterno_contacto"
+                           placeholder="Apellido Paterno" required/>
+                </div>
+                <div class="field">
+                    <label for="apellido_materno_contacto">Apellido Materno</label>
+                    <input type="text" id="apellido_materno_contacto" name="apellido_materno_contacto"
+                           placeholder="Apellido Materno"/>
+                </div>
+            </div>
+            <div class="field">
+                <label for="email_contacto">Email</label>
+                <input type="email" id="email_contacto" name="email_contacto" placeholder="Email"/>
+            </div>
+            <div class="field">
+                <label for="telefono_contacto">Teléfono</label>
+                <div class="ui left labeled input">
+                    <div class="ui basic label">+56</div>
+                    <input type="text" id="telefono_contacto" name="telefono_contacto" placeholder="Teléfono"/>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="actions">
+        <button class="ui green approve button">Guardar</button>
+    </div>
+</div>
+
+@push('page_scripts')
+    <script>
+        class AddModal {
+            props
+
+            constructor(props, formatters) {
+                this.props = props
+                this.setup(formatters)
+            }
+            show() {
+                $(this.props.modal).modal('show')
+            }
+            add() {
+                const form = document.getElementById(this.props.form)
+                const data = {
+                    rut: form.querySelector(this.props.rut).value.replace(/\D/g, ''),
+                    digito: form.querySelector(this.props.digito).textContent,
+                    nombre: form.querySelector(this.props.nombre).value,
+                    razon: form.querySelector(this.props.razon).value,
+                    contacto: {
+                        rut: form.querySelector(this.props.contacto.rut).value.replace(/\D/g, ''),
+                        digito: form.querySelector(this.props.contacto.digito).textContent,
+                        nombres: form.querySelector(this.props.contacto.nombres).value,
+                        apellido_paterno: form.querySelector(this.props.contacto.apellido_paterno).value,
+                        apellido_materno: form.querySelector(this.props.contacto.apellido_materno).value,
+                        email: form.querySelector(this.props.contacto.email).value,
+                        telefono: form.querySelector(this.props.contacto.telefono).value.replace(/\D/g, ''),
+                    }
+                }
+                const body = new FormData()
+                body.append('proveedores[]', JSON.stringify(data))
+                const url = '{{$urls->api}}/inmobiliarias/proveedores/add'
+                const method = 'post'
+                APIClient.fetch(url, {method, body})
+                    .then(response => (response) ? response.json() : null)
+                    .then(data => {
+                        if (data.success.filter(s => s).length > 0) {
+                            window.location.reload()
+                        }
+                    })
+            }
+            setup(formatters) {
+                $(this.props.modal).modal({
+                    onApprove: () => {
+                        this.add()
+                    }
+                })
+
+                const form = document.getElementById(this.props.form)
+                form.querySelector(this.props.rut).addEventListener('input', (e) => {
+                    e.currentTarget.value = formatters.rut(e.currentTarget.value)
+                    form.querySelector(this.props.digito).textContent = Rut.digitoVerificador(e.currentTarget.value)
+                })
+                if (form.querySelector(this.props.rut).value.length > 0) {
+                    form.querySelector(this.props.rut).value = formatters.rut(form.querySelector(this.props.rut).value)
+                    form.querySelector(this.props.digito).textContent = Rut.digitoVerificador(form.querySelector(this.props.rut).value)
+                }
+                form.querySelector(this.props.contacto.rut).addEventListener('input', (e) => {
+                    e.currentTarget.value = formatters.rut(e.currentTarget.value)
+                    form.querySelector(this.props.contacto.digito).textContent = Rut.digitoVerificador(e.currentTarget.value)
+                })
+                if (form.querySelector(this.props.contacto.rut).value.length > 0) {
+                    form.querySelector(this.props.contacto.rut).value = formatters.rut(form.querySelector(this.props.contacto.rut).value)
+                    form.querySelector(this.props.contacto.digito).textContent = Rut.digitoVerificador(form.querySelector(this.props.contacto.rut).value)
+                }
+                form.querySelector(this.props.contacto.telefono).addEventListener('input', (e) => {
+                    e.currentTarget.value = formatters.telefono(e.currentTarget.value)
+                })
+                if (form.querySelector(this.props.contacto.telefono).value.length > 0) {
+                    form.querySelector(this.props.contacto.telefono).value = formatters.telefono(form.querySelector(this.props.contacto.telefono).value)
+                }
+            }
+        }
+    </script>
+@endpush
diff --git a/app/resources/views/layout/body/scripts/rut.blade.php b/app/resources/views/layout/body/scripts/rut.blade.php
index 3a93ebe..832d810 100644
--- a/app/resources/views/layout/body/scripts/rut.blade.php
+++ b/app/resources/views/layout/body/scripts/rut.blade.php
@@ -2,6 +2,9 @@
     <script>
         class Rut {
             static digitoVerificador(rut) {
+                if (!(typeof rut === 'string' || rut instanceof String)) {
+                    rut = rut.toString()
+                }
                 if (rut.length === 0) {
                     return ''
                 }
@@ -12,6 +15,9 @@
                 return S ? S - 1 : 'K'
             }
             static format(rut) {
+                if (!(typeof rut === 'string' || rut instanceof String)) {
+                    rut = rut.toString()
+                }
                 if (rut.length === 0) {
                     return ''
                 }
@@ -19,6 +25,9 @@
                 return rut.replace(/^(\d{1,2})(\d{3})(\d{3})$/, '$1.$2.$3')
             }
             static validar(rut, digito) {
+                if (!(typeof digito === 'string' || digito instanceof String)) {
+                    digito = digito.toString()
+                }
                 return Rut.digitoVerificador(rut) === digito
             }
         }
diff --git a/app/src/Controller/API/Inmobiliarias/Proveedores.php b/app/src/Controller/API/Inmobiliarias/Proveedores.php
new file mode 100644
index 0000000..572ccc0
--- /dev/null
+++ b/app/src/Controller/API/Inmobiliarias/Proveedores.php
@@ -0,0 +1,79 @@
+<?php
+namespace Incoviba\Controller\API\Inmobiliarias;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Implement;
+use Incoviba\Controller\API\withJson;
+use Incoviba\Common\Ideal;
+use Incoviba\Repository;
+use Incoviba\Service;
+
+class Proveedores extends Ideal\Controller
+{
+    use withJson;
+
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response,
+                             Service\Inmobiliaria\Proveedor $proveedorService): ResponseInterface
+    {
+        $output = ['proveedores' => []];
+        try {
+            $output['proveedores'] = $proveedorService->getAll('nombre');
+        } catch (Implement\Exception\EmptyResult) {}
+        return $this->withJson($response, $output);
+    }
+    public function add(ServerRequestInterface $request, ResponseInterface $response,
+                        Service\Inmobiliaria\Proveedor $proveedorService): ResponseInterface
+    {
+        $input = $request->getParsedBody();
+        $output = [
+            'input' => $input,
+            'proveedores' => [],
+            'success' => [],
+        ];
+        foreach ($input['proveedores'] as $json) {
+            $data = json_decode($json, true);
+            try {
+                $output['proveedores'] []= $proveedorService->add($data);
+                $output['success'] []= true;
+            } catch (Implement\Exception\EmptyResult) {
+                $output['success'] []= false;
+            }
+        }
+        return $this->withJson($response, $output);
+    }
+    public function edit(ServerRequestInterface $request, ResponseInterface $response,
+                         Service\Inmobiliaria\Proveedor $proveedorService): ResponseInterface
+    {
+        $input = $request->getParsedBody();
+        $output = [
+            'input' => $input,
+            'proveedores' => [],
+            'success' => [],
+        ];
+        foreach ($input['proveedores'] as $json) {
+            $data = json_decode($json, true);
+            try {
+                $output['proveedores'] []= $proveedorService->edit($data);
+                $output['success'] []= true;
+            } catch (Implement\Exception\EmptyResult) {
+                $output['success'] []= false;
+            }
+        }
+        return $this->withJson($response, $output);
+    }
+    public function delete(ServerRequestInterface $request, ResponseInterface $response,
+                           Service\Inmobiliaria\Proveedor $proveedorService, int $proveedor_rut): ResponseInterface
+    {
+        $output = [
+            'proveedor_rut' => $proveedor_rut,
+            'proveedor' => null,
+            'success' => false
+        ];
+        try {
+            $output['proveedor'] = $proveedorService->getById($proveedor_rut);
+            $output['success'] = $proveedorService->delete($output['proveedor']);
+        } catch (Implement\Exception\EmptyResult) {}
+        return $this->withJson($response, $output);
+    }
+}
diff --git a/app/src/Controller/Inmobiliarias/Proveedores.php b/app/src/Controller/Inmobiliarias/Proveedores.php
index f7b5750..29c4eb6 100644
--- a/app/src/Controller/Inmobiliarias/Proveedores.php
+++ b/app/src/Controller/Inmobiliarias/Proveedores.php
@@ -11,8 +11,7 @@ use Incoviba\Service;
 class Proveedores
 {
     public function __invoke(ServerRequestInterface $request, ResponseInterface $response, View $view,
-                             Service\Inmobiliaria\Proveedor $proveedorService,
-                             Repository\Inmobiliaria\TipoSociedad $tipoSociedad): ResponseInterface
+                             Service\Inmobiliaria\Proveedor $proveedorService): ResponseInterface
     {
         $proveedores = [];
         try {
diff --git a/app/src/Model/DatosPersona.php b/app/src/Model/DatosPersona.php
deleted file mode 100644
index 722c17f..0000000
--- a/app/src/Model/DatosPersona.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-namespace Incoviba\Model;
-
-use DateTimeInterface;
-use Incoviba\Common\Ideal;
-
-class DatosPersona extends Ideal\Model
-{
-    public Persona $persona;
-    public ?Direccion $direccion;
-    public ?int $telefono;
-    public ?string $email;
-    public ?DateTimeInterface $fechaNacimiento;
-    public ?string $sexo;
-    public ?string $estadoCivil;
-    public ?string $nacionalidad;
-    public ?string $ocupacion;
-
-    public function jsonSerialize(): mixed
-    {
-        return [
-            'direccion' => $this->direccion,
-            'telefono' => $this->telefono,
-            'email' => $this->email,
-            'fechaNacimiento' => $this->fechaNacimiento,
-            'sexo' => $this->sexo,
-            'estadoCivil' => $this->estadoCivil,
-            'nacionalidad' => $this->nacionalidad,
-            'profesion' => $this->ocupacion,
-        ];
-    }
-}
diff --git a/app/src/Model/Inmobiliaria/Proveedor.php b/app/src/Model/Inmobiliaria/Proveedor.php
index 9a84059..017ed54 100644
--- a/app/src/Model/Inmobiliaria/Proveedor.php
+++ b/app/src/Model/Inmobiliaria/Proveedor.php
@@ -2,7 +2,9 @@
 namespace Incoviba\Model\Inmobiliaria;
 
 use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Model;
+use Incoviba\Model\Inmobiliaria\Proveedor\Datos;
 
 class Proveedor extends Ideal\Model
 {
@@ -10,18 +12,30 @@ class Proveedor extends Ideal\Model
     public string $digito;
     public string $nombre;
     public ?string $razon;
-    public ?DatosProveedor $datos;
     public ?Model\Persona $contacto;
 
+    public ?Datos $datos;
+    public function datos(): ?Datos
+    {
+        if (!isset($this->datos)) {
+            $this->datos = $this->runFactory('datos');
+        }
+        return $this->datos;
+    }
+
     public function jsonSerialize(): mixed
     {
-        return [
+        $json = [
             'rut' => $this->rut,
             'digito' => $this->digito,
             'nombre' => $this->nombre,
             'razon' => $this->razon,
-            'datos' => $this->datos,
+            'datos' => null,
             'contacto' => $this->contacto
         ];
+        try {
+            $json['datos'] = $this->datos();
+        } catch (EmptyResult) {}
+        return $json;
     }
 }
diff --git a/app/src/Model/Inmobiliaria/DatosProveedor.php b/app/src/Model/Inmobiliaria/Proveedor/Datos.php
similarity index 78%
rename from app/src/Model/Inmobiliaria/DatosProveedor.php
rename to app/src/Model/Inmobiliaria/Proveedor/Datos.php
index aacd447..b5b9ac6 100644
--- a/app/src/Model/Inmobiliaria/DatosProveedor.php
+++ b/app/src/Model/Inmobiliaria/Proveedor/Datos.php
@@ -1,10 +1,11 @@
 <?php
-namespace Incoviba\Model\Inmobiliaria;
+namespace Incoviba\Model\Inmobiliaria\Proveedor;
 
 use Incoviba\Common\Ideal;
 use Incoviba\Model\Direccion;
+use Incoviba\Model\Inmobiliaria\Proveedor;
 
-class DatosProveedor extends Ideal\Model
+class Datos extends Ideal\Model
 {
     public Proveedor $proveedor;
     public ?Direccion $direccion;
diff --git a/app/src/Model/Persona.php b/app/src/Model/Persona.php
index 7e0c59a..dd28c05 100644
--- a/app/src/Model/Persona.php
+++ b/app/src/Model/Persona.php
@@ -2,6 +2,7 @@
 namespace Incoviba\Model;
 
 use Incoviba\Common\Ideal;
+use Incoviba\Model\Persona\Datos;
 
 class Persona extends Ideal\Model
 {
@@ -21,8 +22,8 @@ class Persona extends Ideal\Model
         return number_format($this->rut, 0, ',', '.') . '-' . $this->digito;
     }
 
-    protected ?DatosPersona $datos;
-    public function datos(): ?DatosPersona
+    protected ?Datos $datos;
+    public function datos(): ?Datos
     {
         if (!isset($this->datos)) {
             $this->datos = $this->runFactory('datos');
@@ -40,7 +41,7 @@ class Persona extends Ideal\Model
             'apellidoMaterno' => $this->apellidoMaterno,
             'nombreCompleto' => $this->nombreCompleto(),
             'rutCompleto' => $this->rutCompleto(),
-            'datos' => $this->datos(),
+            'datos' => $this->datos() ?? null,
         ];
     }
 }
diff --git a/app/src/Model/Persona/Datos.php b/app/src/Model/Persona/Datos.php
new file mode 100644
index 0000000..7158d39
--- /dev/null
+++ b/app/src/Model/Persona/Datos.php
@@ -0,0 +1,34 @@
+<?php
+namespace Incoviba\Model\Persona;
+
+use DateTimeInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Model\Direccion;
+use Incoviba\Model\Persona;
+
+class Datos extends Ideal\Model
+{
+    public Persona $persona;
+    public ?Direccion $direccion;
+    public ?int $telefono;
+    public ?string $email;
+    public ?DateTimeInterface $fechaNacimiento;
+    public ?string $sexo;
+    public ?string $estadoCivil;
+    public ?string $nacionalidad;
+    public ?string $ocupacion;
+
+    public function jsonSerialize(): mixed
+    {
+        return [
+            'direccion' => $this->direccion ?? null,
+            'telefono' => $this->telefono ?? null,
+            'email' => $this->email ?? null,
+            'fechaNacimiento' => $this->fechaNacimiento ?? null,
+            'sexo' => $this->sexo ?? null,
+            'estadoCivil' => $this->estadoCivil ?? null,
+            'nacionalidad' => $this->nacionalidad ?? null,
+            'ocupacion' => $this->ocupacion ?? null,
+        ];
+    }
+}
diff --git a/app/src/Repository/Inmobiliaria/Proveedor.php b/app/src/Repository/Inmobiliaria/Proveedor.php
index 2f9c27d..16d25f1 100644
--- a/app/src/Repository/Inmobiliaria/Proveedor.php
+++ b/app/src/Repository/Inmobiliaria/Proveedor.php
@@ -10,8 +10,8 @@ use Incoviba\Service;
 
 class Proveedor extends Ideal\Repository
 {
-    public function __construct(Define\Connection $connection, protected Repository\Inmobiliaria $inmobiliariaRepository,
-                                protected Repository\Sociedad $sociedadRepository)
+    public function __construct(Define\Connection         $connection,
+                                protected Service\Persona $personaService)
     {
         parent::__construct($connection);
         $this->setTable('proveedores');
@@ -19,43 +19,40 @@ class Proveedor extends Ideal\Repository
 
     public function create(?array $data = null): Model\Inmobiliaria\Proveedor
     {
-        $map = (new Implement\Repository\MapperParser())
-            ->register('inmobiliaria_rut', (new Implement\Repository\Mapper())
-                ->setProperty('inmobiliaria')
-                ->setFunction(function($data) {
-                    return $this->inmobiliariaRepository->fetchById($data['inmobiliaria_rut']);
-                }))
-            ->register('sociedad_rut', (new Implement\Repository\Mapper())
-                ->setProperty('sociedad')
-                ->setFunction(function($data) {
-                    return $this->sociedadRepository->fetchById($data['sociedad_rut']);
-                }));
+        $map = (new Implement\Repository\MapperParser(['rut', 'digito', 'nombre', 'razon']))
+            ->register('contacto_rut', (new Implement\Repository\Mapper())->setProperty('contacto')->setFunction(function($data) {
+                return $this->personaService->getById($data['contacto_rut']);
+            }));
         return $this->parseData(new Model\Inmobiliaria\Proveedor(), $data, $map);
     }
     public function save(Define\Model $model): Model\Inmobiliaria\Proveedor
     {
-        $model->id = $this->saveNew(['inmobiliaria_rut', 'sociedad_rut'], [$model->inmobiliaria->rut, $model->sociedad->rut]);
+        $this->saveNew(['rut', 'digito', 'nombre', 'razon', 'contacto_rut'], [
+            $model->rut, $model->digito, $model->nombre, $model->razon, $model->contacto->rut
+        ]);
         return $model;
     }
     public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria\Proveedor
     {
-        return $this->update($model, ['sociedad_id'], $new_data);
+        return $this->update($model, ['rut', 'digito', 'nombre', 'razon', 'contacto_rut'], $new_data);
     }
 
-    public function fetchByInmobiliaria(int $inmobiliaria_rut): array
+    public function fetchByNombre(string $nombre): Model\Inmobiliaria\Proveedor
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
             ->from($this->getTable())
-            ->where('inmobiliaria_rut = :inmobiliaria_rut');
-        return array_map([$this, 'load'], $this->fetchMany($query, compact('inmobiliaria_rut')));
+            ->where('nombre = :nombre');
+        return $this->fetchOne($query, compact('nombre'));
     }
-    public function fetchBySociedad(int $sociedad_rut): array
+
+    public function filterData(array $data): array
     {
-        $query = $this->connection->getQueryBuilder()
-            ->select()
-            ->from($this->getTable())
-            ->where('sociedad_rut = :sociedad_rut');
-        return array_map([$this, 'load'], $this->fetchMany($query, compact('sociedad_rut')));
+        return array_intersect_key($data, array_flip(['rut', 'digito', 'nombre', 'razon', 'contacto_rut']));
+    }
+
+    protected function getKey(): string
+    {
+        return 'rut';
     }
 }
diff --git a/app/src/Repository/Inmobiliaria/Proveedor/Datos.php b/app/src/Repository/Inmobiliaria/Proveedor/Datos.php
new file mode 100644
index 0000000..392f0a3
--- /dev/null
+++ b/app/src/Repository/Inmobiliaria/Proveedor/Datos.php
@@ -0,0 +1,52 @@
+<?php
+namespace Incoviba\Repository\Inmobiliaria\Proveedor;
+
+use Incoviba\Common\Define;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement;
+use Incoviba\Model;
+use Incoviba\Repository;
+use Incoviba\Service;
+
+class Datos extends Ideal\Repository
+{
+    public function __construct(Define\Connection $connection, protected Repository\Inmobiliaria\Proveedor $proveedorRepository,
+                                protected Repository\Direccion $direccionRepository)
+    {
+        parent::__construct($connection);
+        $this->setTable('datos_proveedores');
+    }
+    public function create(?array $data = null): Model\Inmobiliaria\Proveedor\Datos
+    {
+        $map = (new Implement\Repository\MapperParser(['telefono', 'giro']))
+            ->register('proveedor_rut', (new Implement\Repository\Mapper())->setProperty('proveedor')->setFunction(function($data) {
+                return $this->proveedorRepository->fetchById($data['proveedor_rut']);
+            }))
+            ->register('direccion_id', (new Implement\Repository\Mapper())->setProperty('direccion')->setFunction(function($data) {
+                return $this->direccionRepository->fetchById($data['direccion_id']);
+            }));
+        return $this->parseData(new Model\Inmobiliaria\Proveedor\Datos(), $data, $map);
+    }
+    public function save(Define\Model $model): Model\Inmobiliaria\Proveedor\Datos
+    {
+        $model->id = $this->saveNew([
+            'proveedor_rut', 'direccion_id', 'telefono', 'giro'
+        ], [
+            $model->proveedor->rut, $model->direccion->id, $model->telefono, $model->giro
+        ]);
+        return $model;
+    }
+    public function edit(Define\Model $model, array $new_data): Model\Inmobiliaria\Proveedor\Datos
+    {
+        return $this->update($model, ['proveedor_rut', 'direccion_id', 'telefono', 'giro'], $new_data);
+    }
+
+    public function fetchByProveedor(int $proveedor_rut): Model\Inmobiliaria\Proveedor\Datos
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from($this->getTable())
+            ->where('proveedor_rut = :proveedor_rut');
+        return $this->fetchOne($query, compact('proveedor_rut'));
+    }
+}
diff --git a/app/src/Repository/Persona.php b/app/src/Repository/Persona.php
index 774f844..89f2b15 100644
--- a/app/src/Repository/Persona.php
+++ b/app/src/Repository/Persona.php
@@ -33,13 +33,18 @@ class Persona extends Ideal\Repository
         return $this->update($model, $new_data, ['rut', 'digito', 'nombres', 'apellido_paterno', 'apellido_materno']);
     }
 
-    public function fetchByRut(int $rut): Model\Persona
+    /*public function fetchById(int $rut): Model\Persona
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
             ->from($this->getTable())
             ->where('rut = ?');
         return $this->fetchOne($query, [$rut]);
+    }*/
+
+    public function filterData(array $data): array
+    {
+        return array_intersect_key($data, array_flip(['rut', 'digito', 'nombres', 'apellido_paterno', 'apellido_materno']));
     }
 
     protected function getKey(): string
diff --git a/app/src/Repository/DatosPersona.php b/app/src/Repository/Persona/Datos.php
similarity index 83%
rename from app/src/Repository/DatosPersona.php
rename to app/src/Repository/Persona/Datos.php
index bc008b1..574b4cb 100644
--- a/app/src/Repository/DatosPersona.php
+++ b/app/src/Repository/Persona/Datos.php
@@ -1,12 +1,14 @@
 <?php
-namespace Incoviba\Repository;
+namespace Incoviba\Repository\Persona;
 
 use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Model;
+use Incoviba\Repository\Direccion;
+use Incoviba\Repository\Persona;
 
-class DatosPersona extends Ideal\Repository
+class Datos extends Ideal\Repository
 {
     public function __construct(Define\Connection $connection, protected Persona $personaRepository,
                                 protected Direccion $direccionRepository)
@@ -15,7 +17,7 @@ class DatosPersona extends Ideal\Repository
         $this->setTable('datos_personas');
     }
 
-    public function create(?array $data = null): Model\DatosPersona
+    public function create(?array $data = null): Model\Persona\Datos
     {
         $map = (new Implement\Repository\MapperParser())
             ->register('persona_rut', (new Implement\Repository\Mapper())
@@ -46,31 +48,31 @@ class DatosPersona extends Ideal\Repository
             ->register('nacionalidad', (new Implement\Repository\Mapper())->setFunction(function($data) {
                     return $data['nacionalidad'];
                 })->setDefault(null))
-            ->register('profesion', (new Implement\Repository\Mapper())->setFunction(function($data) {
-                    return $data['profesion'];
+            ->register('ocupacion', (new Implement\Repository\Mapper())->setFunction(function($data) {
+                    return $data['ocupacion'];
                 })->setDefault(null));
-        return $this->parseData(new Model\DatosPersona(), $data, $map);
+        return $this->parseData(new Model\Persona\Datos(), $data, $map);
     }
-    public function save(Define\Model $model): Model\DatosPersona
+    public function save(Define\Model $model): Model\Persona\Datos
     {
         $this->saveNew([
             'persona_rut', 'direccion_id', 'telefono', 'email', 'fecha_nacimiento', 'sexo', 'estado_civil',
-            'nacionalidad', 'profesion'
+            'nacionalidad', 'ocupacion'
         ], [
             $model->persona->rut, $model->direccion?->id, $model->telefono, $model->email, $model->fechaNacimiento,
             $model->sexo, $model->estadoCivil, $model->nacionalidad, $model->ocupacion
         ]);
         return $model;
     }
-    public function edit(Define\Model $model, array $new_data): Model\DatosPersona
+    public function edit(Define\Model $model, array $new_data): Model\Persona\Datos
     {
         return $this->update($model, [
             'direccion_id', 'telefono', 'email', 'fecha_nacimiento', 'sexo', 'estado_civil',
-            'nacionalidad', 'profesion'
+            'nacionalidad', 'ocupacion'
         ], $new_data);
     }
 
-    public function fetchByPersona(int $persona_rut): Model\DatosPersona
+    public function fetchByPersona(int $persona_rut): Model\Persona\Datos
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
diff --git a/app/src/Repository/Sociedad.php b/app/src/Repository/Sociedad.php
index dfc74ed..43b1b10 100644
--- a/app/src/Repository/Sociedad.php
+++ b/app/src/Repository/Sociedad.php
@@ -31,7 +31,7 @@ class Sociedad extends Ideal\Repository
             ->register('contacto_rut', (new Implement\Repository\Mapper())
                 ->setProperty('contacto')
                 ->setFunction(function ($data) {
-                    return $this->personaService->getByRut($data['contacto_rut']);
+                    return $this->personaService->getById($data['contacto_rut']);
                 }));
         return $this->parseData(new Model\Sociedad(), $data, $map);
     }
diff --git a/app/src/Service/Inmobiliaria/Proveedor.php b/app/src/Service/Inmobiliaria/Proveedor.php
index d564b10..ea40a32 100644
--- a/app/src/Service/Inmobiliaria/Proveedor.php
+++ b/app/src/Service/Inmobiliaria/Proveedor.php
@@ -1,16 +1,20 @@
 <?php
 namespace Incoviba\Service\Inmobiliaria;
 
+use PDOException;
 use Psr\Log\LoggerInterface;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
-use Incoviba\Common\Define;
-use Incoviba\Repository;
 use Incoviba\Model;
+use Incoviba\Repository;
+use Incoviba\Service;
 
 class Proveedor extends Ideal\Service
 {
-    public function __construct(LoggerInterface $logger, protected Repository\Inmobiliaria\Proveedor $proveedorRepository)
+    public function __construct(LoggerInterface $logger,
+                                protected Repository\Inmobiliaria\Proveedor $proveedorRepository,
+                                protected Repository\Inmobiliaria\Proveedor\Datos $datosRepository,
+                                protected Service\Persona $contactoService)
     {
         parent::__construct($logger);
     }
@@ -18,18 +22,61 @@ class Proveedor extends Ideal\Service
     public function getAll(?string $orderBy = null): array
     {
         try {
-            return $this->proveedorRepository->fetchAll($orderBy);
+            return array_map([$this, 'process'], $this->proveedorRepository->fetchAll($orderBy));
         } catch (Implement\Exception\EmptyResult) {
             return [];
         }
     }
 
-    public function getByRut(int $proveedor_rut): ?Model\Inmobiliaria\Proveedor
+    public function getById(int $proveedor_rut): ?Model\Inmobiliaria\Proveedor
     {
         try {
-            return $this->proveedorRepository->fetchById($proveedor_rut);
+            return $this->process($this->proveedorRepository->fetchById($proveedor_rut));
         } catch (Implement\Exception\EmptyResult) {
             return null;
         }
     }
+
+    public function add(array $data): Model\Inmobiliaria\Proveedor
+    {
+        $filteredData = $this->proveedorRepository->filterData($data);
+        try {
+            $proveedor = $this->process($this->proveedorRepository->fetchByNombre($filteredData['nombre']));
+            if ($proveedor->contacto->rut !== $data['contacto']['rut']) {
+                $contacto = $this->contactoService->add($data['contacto']);
+                return $this->proveedorRepository->edit($proveedor, ['contacto_rut' => $contacto->rut]);
+            }
+            return $proveedor;
+        } catch (Implement\Exception\EmptyResult) {
+            $contacto = $this->contactoService->add($data['contacto']);
+            $filteredData['contacto_rut'] = $contacto->rut;
+            $proveedor = $this->proveedorRepository->create($filteredData);
+            return $this->process($this->proveedorRepository->save($proveedor));
+        }
+    }
+    /**
+     * @TODO Implement
+     * @param Model\Inmobiliaria\Proveedor $proveedor
+     * @param array $data
+     * @return Model\Inmobiliaria\Proveedor
+     */
+    public function edit(Model\Inmobiliaria\Proveedor $proveedor, array $data): Model\Inmobiliaria\Proveedor
+    {
+        return $proveedor;
+    }
+    public function delete(Model\Inmobiliaria\Proveedor $proveedor): bool
+    {
+        try {
+            $this->proveedorRepository->remove($proveedor);
+            return true;
+        } catch (Implement\Exception\EmptyResult | PDOException) {
+            return false;
+        }
+    }
+
+    protected function process(Model\Inmobiliaria\Proveedor $proveedor): Model\Inmobiliaria\Proveedor
+    {
+        $proveedor->addFactory('datos', (new Implement\Repository\Factory())->setCallable([$this->datosRepository, 'fetchByProveedor'])->setArgs(['proveedor_rut' => $proveedor->rut]));
+        return $proveedor;
+    }
 }
diff --git a/app/src/Service/Persona.php b/app/src/Service/Persona.php
index 0330f08..b87af5c 100644
--- a/app/src/Service/Persona.php
+++ b/app/src/Service/Persona.php
@@ -1,28 +1,28 @@
 <?php
 namespace Incoviba\Service;
 
-use Psr\Log\LoggerInterface;
 use Incoviba\Common\Ideal;
 use Incoviba\Common\Implement;
 use Incoviba\Model;
 use Incoviba\Repository;
+use Psr\Log\LoggerInterface;
 
 class Persona extends Ideal\Service
 {
-    public function __construct(LoggerInterface $logger, protected Repository\Persona $personaRepository,
-                                protected Repository\DatosPersona $datosPersonaRepository)
+    public function __construct(LoggerInterface                    $logger, protected Repository\Persona $personaRepository,
+                                protected Repository\Persona\Datos $datosPersonaRepository)
     {
         parent::__construct($logger);
     }
 
-    public function getByRut(int $rut): Model\Persona
+    public function getById(int $rut): Model\Persona
     {
-        return $this->process($this->personaRepository->fetchByRut($rut));
+        return $this->process($this->personaRepository->fetchById($rut));
     }
     public function add(array $data): Model\Persona
     {
         try {
-            $persona = $this->personaRepository->fetchByRut($data['rut']);
+            $persona = $this->personaRepository->fetchById($data['rut']);
         } catch (Implement\Exception\EmptyResult) {
             $persona = $this->personaRepository->create($data);
             $persona = $this->personaRepository->save($persona);
-- 
2.49.0


From 187b6f6f05dba680d08bdd64e05e6a1e11f848f3 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Tue, 3 Dec 2024 17:35:29 -0300
Subject: [PATCH 5/8] Edit Proveedores

---
 .../routes/api/inmobiliarias/proveedores.php  |   3 +-
 .../views/inmobiliarias/proveedores.blade.php |  65 +++----
 .../proveedores/add_modal.blade.php           |   1 +
 .../proveedores/edit_modal.blade.php          | 158 ++++++++++++++++++
 .../API/Inmobiliarias/Proveedores.php         |  15 +-
 app/src/Repository/Persona.php                |  11 +-
 app/src/Repository/Persona/Datos.php          |   5 -
 app/src/Service/Inmobiliaria/Proveedor.php    |  12 +-
 app/src/Service/Persona.php                   |  11 ++
 9 files changed, 232 insertions(+), 49 deletions(-)
 create mode 100644 app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php

diff --git a/app/resources/routes/api/inmobiliarias/proveedores.php b/app/resources/routes/api/inmobiliarias/proveedores.php
index 306c496..6221b72 100644
--- a/app/resources/routes/api/inmobiliarias/proveedores.php
+++ b/app/resources/routes/api/inmobiliarias/proveedores.php
@@ -3,10 +3,11 @@ use Incoviba\Controller\API\Inmobiliarias\Proveedores;
 
 $app->group('/proveedores', function($app) {
     $app->post('/add[/]', [Proveedores::class, 'add']);
+    $app->post('/edit[/]', [Proveedores::class, 'edit']);
     //$app->post('/register[/]', [Proveedores::class, 'register']);
     $app->get('[/]', Proveedores::class);
 });
 $app->group('/proveedor/{proveedor_rut:[0-9]+}', function($app) {
-    $app->post('/edit[/]', [Proveedores::class, 'edit']);
     $app->delete('/delete[/]', [Proveedores::class, 'delete']);
+    $app->get('[/]', [Proveedores::class, 'get']);
 });
diff --git a/app/resources/views/inmobiliarias/proveedores.blade.php b/app/resources/views/inmobiliarias/proveedores.blade.php
index 0fe7d25..1e96b13 100644
--- a/app/resources/views/inmobiliarias/proveedores.blade.php
+++ b/app/resources/views/inmobiliarias/proveedores.blade.php
@@ -34,6 +34,8 @@
     </div>
 
     @include('inmobiliarias.proveedores.add_modal')
+
+    @include('inmobiliarias.proveedores.edit_modal')
 @endsection
 
 @include('layout.body.scripts.rut')
@@ -66,14 +68,12 @@
                 proveedores: ''
             },
             data: JSON.parse('{!! json_encode($proveedores) !!}'),
-            edit() {
-            },
             remove() {
                 return {
                     proveedor: rut => {
                         const url = `{{$urls->api}}/inmobiliarias/proveedor/${rut}/delete`
                         const method = 'delete'
-                        APIClient.fetch(url, {method})
+                        return APIClient.fetch(url, {method})
                             .then(response => (response) ? response.json() : null)
                             .then(data => {
                                 if (data.success) {
@@ -84,32 +84,6 @@
                     }
                 }
             },
-            draw() {
-                return {
-                    proveedores: () => {
-                        $(this.ids.proveedores).empty()
-                        this.data.forEach(proveedor => {
-                            $(this.ids.proveedores).append(`
-                            <tr>
-                                <td>${proveedor.nombre}</td>
-                                <td>${proveedor.contacto.nombreCompleto}</td>
-                                <td class="right aligned">
-                                    <button class="ui icon button" data-proveedor="${proveedor.rut}">
-                                        <i class="edit icon"></i>
-                                    </button>
-                                    <button class="ui red icon button" data-proveedor="${proveedor.rut}">
-                                        <i class="remove icon"></i>
-                                    </button>
-                                </td>
-                            </tr>
-                            `)
-                        })
-                        $(this.ids.buttons.remove).click((e) => {
-                            this.remove().proveedor($(e.target).data('proveedor'))
-                        })
-                    }
-                }
-            },
             formatters() {
                 return {
                     rut: value => {
@@ -130,8 +104,22 @@
                 $(this.ids.buttons.add).click(() => {
                     addModal.show()
                 })
+                const editModal = new EditModal(this.ids.edit, this.formatters())
+                $(this.ids.buttons.edit).click((e) => {
+                    e.currentTarget.classList.add('loading')
+                    e.currentTarget.classList.add('spinner')
+                    editModal.show(e.currentTarget.parentNode.dataset.proveedor).then(() => {
+                        e.currentTarget.classList.remove('loading')
+                        e.currentTarget.classList.remove('spinner')
+                    })
+                })
                 $(this.ids.buttons.remove).click((e) => {
-                    this.remove().proveedor(e.currentTarget.parentNode.dataset.proveedor)
+                    e.currentTarget.classList.add('loading')
+                    e.currentTarget.classList.add('spinner')
+                    this.remove().proveedor(e.currentTarget.parentNode.dataset.proveedor).then(() => {
+                        e.currentTarget.classList.remove('loading')
+                        e.currentTarget.classList.remove('spinner')
+                    })
                 })
             }
         }
@@ -159,6 +147,23 @@
                         telefono: '#telefono_contacto'
                     }
                 },
+                edit: {
+                    modal: '#edit_modal',
+                    form: 'edit_form',
+                    rut: '#edit_rut',
+                    digito: '#edit_digito',
+                    nombre: '#edit_nombre',
+                    razon: '#edit_razon',
+                    contacto: {
+                        rut: '#edit_rut_contacto',
+                        digito: '#edit_digito_contacto',
+                        nombres: '#edit_nombre_contacto',
+                        apellido_paterno: '#edit_apellido_paterno_contacto',
+                        apellido_materno: '#edit_apellido_materno_contacto',
+                        email: '#edit_email_contacto',
+                        telefono: '#edit_telefono_contacto'
+                    }
+                },
                 proveedores: '#proveedores'
             })
         })
diff --git a/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php b/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
index d0bea75..db1e816 100644
--- a/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
+++ b/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
@@ -1,4 +1,5 @@
 <div class="ui modal" id="add_modal">
+    <div class="header">Agregar Proveedor</div>
     <div class="content">
         <form class="ui form" id="add_form">
             <div class="three wide field">
diff --git a/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php b/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php
new file mode 100644
index 0000000..8471a83
--- /dev/null
+++ b/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php
@@ -0,0 +1,158 @@
+<div class="ui modal" id="edit_modal">
+    <div class="header">Editar Proveedor <span class="proveedor"></span></div>
+    <div class="content">
+        <form class="ui form" id="edit_form">
+            <div class="three wide field">
+                <label for="edit_rut">RUT</label>
+                <div class="ui right labeled input">
+                    <input class="right aligned" type="text" id="edit_rut" name="rut" placeholder="RUT" maxlength="10"
+                           required/>
+                    <div class="ui basic label">-<span id="edit_digito"></span></div>
+                </div>
+            </div>
+            <div class="five wide field">
+                <label for="edit_nombre">Nombre</label>
+                <input type="text" id="edit_nombre" name="nombre" placeholder="Nombre" required/>
+            </div>
+            <div class="field">
+                <label for="edit_razon">Razón Social</label>
+                <input type="text" id="edit_razon" name="razon" placeholder="Razón Social" required/>
+            </div>
+            <div class="ui divider">Contacto</div>
+            <div class="three wide field">
+                <label for="edit_rut_contacto">RUT</label>
+                <div class="ui right labeled input">
+                    <input type="text" id="edit_rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10"
+                           required/>
+                    <div class="ui basic label">-<span id="edit_digito_contacto"></span></div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="five wide field">
+                    <label for="edit_nombre_contacto">Nombre</label>
+                    <input type="text" id="edit_nombre_contacto" name="nombre_contacto" placeholder="Nombre" required/>
+                </div>
+                <div class="field">
+                    <label for="edit_apellido_paterno_contacto">Apellido Paterno</label>
+                    <input type="text" id="edit_apellido_paterno_contacto" name="apellido_paterno_contacto"
+                           placeholder="Apellido Paterno" required/>
+                </div>
+                <div class="field">
+                    <label for="edit_apellido_materno_contacto">Apellido Materno</label>
+                    <input type="text" id="edit_apellido_materno_contacto" name="apellido_materno_contacto"
+                           placeholder="Apellido Materno"/>
+                </div>
+            </div>
+            <div class="field">
+                <label for="edit_email_contacto">Email</label>
+                <input type="email" id="edit_email_contacto" name="email_contacto" placeholder="Email"/>
+            </div>
+            <div class="field">
+                <label for="edit_telefono_contacto">Teléfono</label>
+                <div class="ui left labeled input">
+                    <div class="ui basic label">+56</div>
+                    <input type="text" id="edit_telefono_contacto" name="telefono_contacto" placeholder="Teléfono"/>
+                </div>
+            </div>
+        </form>
+    </div>
+    <div class="actions">
+        <button class="ui green approve button">Guardar</button>
+    </div>
+</div>
+
+@push('page_scripts')
+    <script>
+        class EditModal {
+            props
+            data
+            constructor(props, formatter) {
+                this.props = props
+                this.setup(formatter)
+            }
+            show(id) {
+                return this.load(id).then(() => {
+                    $(this.props.modal).find('.proveedor').html(this.data.nombre)
+                    const form = document.getElementById(this.props.form)
+                    form.querySelector(this.props.rut).value = this.data.rut
+                    form.querySelector(this.props.digito).textContent = Rut.digitoVerificador(this.data.rut)
+                    form.querySelector(this.props.nombre).value = this.data.nombre
+                    form.querySelector(this.props.razon).value = this.data.razon
+                    form.querySelector(this.props.contacto.rut).value = this.data.contacto.rut
+                    form.querySelector(this.props.contacto.digito).textContent = Rut.digitoVerificador(this.data.contacto.rut)
+                    form.querySelector(this.props.contacto.nombres).value = this.data.contacto.nombres
+                    form.querySelector(this.props.contacto.apellido_paterno).value = this.data.contacto.apellidoPaterno
+                    form.querySelector(this.props.contacto.apellido_materno).value = this.data.contacto.apellidoMaterno
+                    form.querySelector(this.props.contacto.email).value = this.data.contacto.datos.email
+                    form.querySelector(this.props.contacto.telefono).value = this.data.contacto.datos.telefono
+
+                    $(this.props.modal).modal('show')
+                })
+            }
+            load(id) {
+                const url = `{{$urls->api}}/inmobiliarias/proveedor/${id}`
+                return APIClient.fetch(url).then(response => response.json()).then(json => {
+                    this.data = json.proveedor
+                })
+            }
+            edit() {
+                const form = document.getElementById(this.props.form)
+                const data = {
+                    rut: form.querySelector(this.props.rut).value.replace(/\D/g, ''),
+                    digito: form.querySelector(this.props.digito).textContent,
+                    nombre: form.querySelector(this.props.nombre).value,
+                    razon: form.querySelector(this.props.razon).value,
+                    contacto: {
+                        rut: form.querySelector(this.props.contacto.rut).value.replace(/\D/g, ''),
+                        digito: form.querySelector(this.props.contacto.digito).textContent,
+                        nombres: form.querySelector(this.props.contacto.nombres).value,
+                        apellido_paterno: form.querySelector(this.props.contacto.apellido_paterno).value,
+                        apellido_materno: form.querySelector(this.props.contacto.apellido_materno).value,
+                        email: form.querySelector(this.props.contacto.email).value,
+                        telefono: form.querySelector(this.props.contacto.telefono).value.replace(/\D/g, ''),
+                    }
+                }
+                const body = new FormData()
+                body.append('proveedores[]', JSON.stringify(data))
+                const url = '{{$urls->api}}/inmobiliarias/proveedores/edit'
+                const method = 'post'
+                return APIClient.fetch(url, {method, body}).then(response => response.json()).then(json => {
+                    if (json.success.filter(s => s).length > 0) {
+                        window.location.reload()
+                    }
+                })
+            }
+            setup(formatter) {
+                $(this.props.modal).modal({
+                    onApprove: () => {
+                        this.edit()
+                    }
+                })
+
+                const form = document.getElementById(this.props.form)
+                form.querySelector(this.props.rut).addEventListener('input', (e) => {
+                    e.currentTarget.value = formatter.rut(e.currentTarget.value)
+                    form.querySelector(this.props.digito).textContent = Rut.digitoVerificador(e.currentTarget.value)
+                })
+                if (form.querySelector(this.props.rut).value.length > 0) {
+                    form.querySelector(this.props.rut).value = formatter.rut(form.querySelector(this.props.rut).value)
+                    form.querySelector(this.props.digito).textContent = Rut.digitoVerificador(form.querySelector(this.props.rut).value)
+                }
+                form.querySelector(this.props.contacto.rut).addEventListener('input', (e) => {
+                    e.currentTarget.value = formatter.rut(e.currentTarget.value)
+                    form.querySelector(this.props.contacto.digito).textContent = Rut.digitoVerificador(e.currentTarget.value)
+                })
+                if (form.querySelector(this.props.contacto.rut).value.length > 0) {
+                    form.querySelector(this.props.contacto.rut).value = formatter.rut(form.querySelector(this.props.contacto.rut).value)
+                    form.querySelector(this.props.contacto.digito).textContent = Rut.digitoVerificador(form.querySelector(this.props.contacto.rut).value)
+                }
+                form.querySelector(this.props.contacto.telefono).addEventListener('input', (e) => {
+                    e.currentTarget.value = formatter.telefono(e.currentTarget.value)
+                })
+                if (form.querySelector(this.props.contacto.telefono).value.length > 0) {
+                    form.querySelector(this.props.contacto.telefono).value = formatter.telefono(form.querySelector(this.props.contacto.telefono).value)
+                }
+            }
+        }
+    </script>
+@endpush
diff --git a/app/src/Controller/API/Inmobiliarias/Proveedores.php b/app/src/Controller/API/Inmobiliarias/Proveedores.php
index 572ccc0..bd1d265 100644
--- a/app/src/Controller/API/Inmobiliarias/Proveedores.php
+++ b/app/src/Controller/API/Inmobiliarias/Proveedores.php
@@ -22,6 +22,18 @@ class Proveedores extends Ideal\Controller
         } catch (Implement\Exception\EmptyResult) {}
         return $this->withJson($response, $output);
     }
+    public function get(ServerRequestInterface $request, ResponseInterface $response,
+                        Service\Inmobiliaria\Proveedor $proveedorService, int $proveedor_rut): ResponseInterface
+    {
+        $output = [
+            'proveedor_rut' => $proveedor_rut,
+            'proveedor' => null,
+        ];
+        try {
+            $output['proveedor'] = $proveedorService->getById($proveedor_rut);
+        } catch (Implement\Exception\EmptyResult) {}
+        return $this->withJson($response, $output);
+    }
     public function add(ServerRequestInterface $request, ResponseInterface $response,
                         Service\Inmobiliaria\Proveedor $proveedorService): ResponseInterface
     {
@@ -54,7 +66,8 @@ class Proveedores extends Ideal\Controller
         foreach ($input['proveedores'] as $json) {
             $data = json_decode($json, true);
             try {
-                $output['proveedores'] []= $proveedorService->edit($data);
+                $proveedor = $proveedorService->getById($data['rut']);
+                $output['proveedores'] []= $proveedorService->edit($proveedor, $data);
                 $output['success'] []= true;
             } catch (Implement\Exception\EmptyResult) {
                 $output['success'] []= false;
diff --git a/app/src/Repository/Persona.php b/app/src/Repository/Persona.php
index 89f2b15..52ba83c 100644
--- a/app/src/Repository/Persona.php
+++ b/app/src/Repository/Persona.php
@@ -30,18 +30,9 @@ class Persona extends Ideal\Repository
     }
     public function edit(Define\Model $model, array $new_data): Model\Persona
     {
-        return $this->update($model, $new_data, ['rut', 'digito', 'nombres', 'apellido_paterno', 'apellido_materno']);
+        return $this->update($model, ['digito', 'nombres', 'apellido_paterno', 'apellido_materno'], $new_data);
     }
 
-    /*public function fetchById(int $rut): Model\Persona
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select()
-            ->from($this->getTable())
-            ->where('rut = ?');
-        return $this->fetchOne($query, [$rut]);
-    }*/
-
     public function filterData(array $data): array
     {
         return array_intersect_key($data, array_flip(['rut', 'digito', 'nombres', 'apellido_paterno', 'apellido_materno']));
diff --git a/app/src/Repository/Persona/Datos.php b/app/src/Repository/Persona/Datos.php
index 574b4cb..1f9338d 100644
--- a/app/src/Repository/Persona/Datos.php
+++ b/app/src/Repository/Persona/Datos.php
@@ -80,9 +80,4 @@ class Datos extends Ideal\Repository
             ->where('persona_rut = ?');
         return $this->fetchOne($query, [$persona_rut]);
     }
-
-    protected function getKey(): string
-    {
-        return 'persona_rut';
-    }
 }
diff --git a/app/src/Service/Inmobiliaria/Proveedor.php b/app/src/Service/Inmobiliaria/Proveedor.php
index ea40a32..219997c 100644
--- a/app/src/Service/Inmobiliaria/Proveedor.php
+++ b/app/src/Service/Inmobiliaria/Proveedor.php
@@ -55,14 +55,22 @@ class Proveedor extends Ideal\Service
         }
     }
     /**
-     * @TODO Implement
      * @param Model\Inmobiliaria\Proveedor $proveedor
      * @param array $data
      * @return Model\Inmobiliaria\Proveedor
      */
     public function edit(Model\Inmobiliaria\Proveedor $proveedor, array $data): Model\Inmobiliaria\Proveedor
     {
-        return $proveedor;
+        $filteredData = $this->proveedorRepository->filterData($data);
+        try {
+            if ($proveedor->contacto->rut !== $data['contacto']['rut']) {
+                $contacto = $this->contactoService->getById($data['contacto']['rut']);
+                $this->contactoService->edit($contacto, $data['contacto']);
+            }
+            return $this->process($this->proveedorRepository->edit($proveedor, $filteredData));
+        } catch (Implement\Exception\EmptyResult) {
+            return $proveedor;
+        }
     }
     public function delete(Model\Inmobiliaria\Proveedor $proveedor): bool
     {
diff --git a/app/src/Service/Persona.php b/app/src/Service/Persona.php
index b87af5c..5e8244e 100644
--- a/app/src/Service/Persona.php
+++ b/app/src/Service/Persona.php
@@ -45,6 +45,17 @@ class Persona extends Ideal\Service
         }
         return $this->process($persona);
     }
+    public function edit(Model\Persona $persona, array $data): Model\Persona
+    {
+        $filteredData = $this->personaRepository->filterData($data);
+        try {
+            $datosData = $this->datosPersonaRepository->filterData($data);
+            $this->datosPersonaRepository->edit($persona->datos(), $datosData);
+            return $this->personaRepository->edit($persona, $filteredData);
+        } catch (Implement\Exception\EmptyResult) {
+            return $persona;
+        }
+    }
 
     protected function process(Model\Persona $persona): Model\Persona
     {
-- 
2.49.0


From fc575c3078254910dabee0f628b11bbf0aaca308 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Tue, 3 Dec 2024 17:39:30 -0300
Subject: [PATCH 6/8] Menu incluye proveedores

---
 .../body/header/menu/inmobiliarias.blade.php  |  8 ++++-
 .../body/header/menu/proyectos.blade.php      |  3 +-
 .../layout/body/header/menu/ventas.blade.php  | 29 +++++++++----------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/resources/views/layout/body/header/menu/inmobiliarias.blade.php b/app/resources/views/layout/body/header/menu/inmobiliarias.blade.php
index 9aa161c..5c8eb87 100644
--- a/app/resources/views/layout/body/header/menu/inmobiliarias.blade.php
+++ b/app/resources/views/layout/body/header/menu/inmobiliarias.blade.php
@@ -1 +1,7 @@
-<a class="item" href="{{$urls->base}}/inmobiliarias">Inmobiliarias</a>
+<div class="ui simple dropdown item">
+    <a class="text" href="{{$urls->base}}/inmobiliarias">Inmobiliarias</a>
+    <i class="dropdown icon"></i>
+    <div class="menu">
+        <a class="item" href="{{$urls->base}}/inmobiliarias/proveedores">Proveedores</a>
+    </div>
+</div>
diff --git a/app/resources/views/layout/body/header/menu/proyectos.blade.php b/app/resources/views/layout/body/header/menu/proyectos.blade.php
index 86e5bc2..eceae0e 100644
--- a/app/resources/views/layout/body/header/menu/proyectos.blade.php
+++ b/app/resources/views/layout/body/header/menu/proyectos.blade.php
@@ -1,8 +1,7 @@
 <div class="ui simple dropdown item">
-    Proyectos
+    <a class="text" href="{{$urls->base}}/proyectos">Proyectos</a>
     <i class="dropdown icon"></i>
     <div class="menu">
-        <a class="item" href="{{$urls->base}}/proyectos">Listado</a>
         <a class="item" href="{{$urls->base}}/proyectos/unidades">Unidades</a>
     </div>
 </div>
diff --git a/app/resources/views/layout/body/header/menu/ventas.blade.php b/app/resources/views/layout/body/header/menu/ventas.blade.php
index 5df196e..a2ebf8f 100644
--- a/app/resources/views/layout/body/header/menu/ventas.blade.php
+++ b/app/resources/views/layout/body/header/menu/ventas.blade.php
@@ -1,26 +1,25 @@
 <div class="ui simple dropdown item">
-    Ventas
+    <a class="text" href="{{$urls->base}}/ventas">Ventas</a>
     <i class="dropdown icon"></i>
     <div class="menu">
+        <a class="item" href="{{$urls->base}}/ventas/precios">Precios</a>
+        <a class="item" href="{{$urls->base}}/ventas/cierres">Cierres</a>
         <div class="item">
+            Cuotas
+            <i class="dropdown icon"></i>
+            <div class="menu">
+                <a class="item" href="{{$urls->base}}/ventas/cuotas/pendientes">Pendientes</a>
+                <a class="item" href="{{$urls->base}}/ventas/cuotas/abonar">Abonar</a>
+            </div>
+        </div>
+        {{--<div class="item">
             Listados
             <i class="dropdown icon"></i>
             <div class="menu">
-                <a class="item" href="{{$urls->base}}/ventas/precios">Precios</a>
-                <a class="item" href="{{$urls->base}}/ventas/cierres">Cierres</a>
-                <a class="item" href="{{$urls->base}}/ventas/">Ventas</a>
-                <div class="item">
-                    Cuotas
-                    <i class="dropdown icon"></i>
-                    <div class="menu">
-                        <a class="item" href="{{$urls->base}}/ventas/cuotas/pendientes">Pendientes</a>
-                        <a class="item" href="{{$urls->base}}/ventas/cuotas/abonar">Abonar</a>
-                    </div>
-                </div>
-                {{--<a class="item" href="{{$urls->base}}/ventas/pagos/pendientes">Pagos Pendientes</a>--}}
-                {{--<a class="item" href="{{$urls->base}}/ventas/consolidado">Consolidado Ventas</a>--}}
+                --}}{{--<a class="item" href="{{$urls->base}}/ventas/pagos/pendientes">Pagos Pendientes</a>--}}{{--
+                --}}{{--<a class="item" href="{{$urls->base}}/ventas/consolidado">Consolidado Ventas</a>--}}{{--
             </div>
-        </div>
+        </div>--}}
         {{--<div class="item">
             Informes
             <i class="dropdown icon"></i>
-- 
2.49.0


From 0766cf7e94e93dc231f75efa3db6c58ab002f7f3 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Tue, 3 Dec 2024 19:08:43 -0300
Subject: [PATCH 7/8] FIX: apellidos no existentes

---
 app/src/Repository/Venta/Propietario.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/Repository/Venta/Propietario.php b/app/src/Repository/Venta/Propietario.php
index fb8b0da..6fb6ad1 100644
--- a/app/src/Repository/Venta/Propietario.php
+++ b/app/src/Repository/Venta/Propietario.php
@@ -33,7 +33,8 @@ class Propietario extends Ideal\Repository
                         $arr['materno'] = $data['apellido_materno'];
                     }
                     return $arr;
-                }))
+                })
+                ->setDefault([]))
             ->register('direccion', (new Implement\Repository\Mapper())
                 ->setProperty('datos')
                 ->setFunction(function($data) {
-- 
2.49.0


From fe746194821cd6507c026e8f7b3649f6ae0567d4 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvialb@incoviba.cl>
Date: Tue, 3 Dec 2024 20:32:29 -0300
Subject: [PATCH 8/8] Proveedores en movimientos

---
 .../contabilidad/cartolas/import.blade.php    | 19 ++++-
 .../scripts/movimientos_table.blade.php       | 13 +++-
 .../views/inmobiliarias/proveedores.blade.php |  2 +-
 .../proveedores/add_modal.blade.php           |  7 +-
 .../proveedores/edit_modal.blade.php          | 25 ++++---
 .../API/Contabilidad/Movimientos.php          | 14 ++++
 .../Contabilidad/Movimiento/Auxiliar.php      | 36 ----------
 .../Movimiento/Auxiliar/Detalle.php           | 39 ----------
 .../Model/Contabilidad/Movimiento/Detalle.php |  8 ++-
 .../Contabilidad/Movimiento/Auxiliar.php      | 62 ----------------
 .../Movimiento/Auxiliar/Detalle.php           | 72 -------------------
 app/src/Repository/Inmobiliaria/Proveedor.php | 11 +--
 app/src/Service/Contabilidad/Movimiento.php   | 14 +++-
 .../Contabilidad/Movimiento/Auxiliar.php      | 42 -----------
 .../Contabilidad/Movimiento/Detalle.php       | 63 ++++++++++++++++
 app/src/Service/Inmobiliaria/Proveedor.php    | 17 +++--
 16 files changed, 158 insertions(+), 286 deletions(-)
 delete mode 100644 app/src/Model/Contabilidad/Movimiento/Auxiliar.php
 delete mode 100644 app/src/Model/Contabilidad/Movimiento/Auxiliar/Detalle.php
 delete mode 100644 app/src/Repository/Contabilidad/Movimiento/Auxiliar.php
 delete mode 100644 app/src/Repository/Contabilidad/Movimiento/Auxiliar/Detalle.php
 delete mode 100644 app/src/Service/Contabilidad/Movimiento/Auxiliar.php
 create mode 100644 app/src/Service/Contabilidad/Movimiento/Detalle.php

diff --git a/app/resources/views/contabilidad/cartolas/import.blade.php b/app/resources/views/contabilidad/cartolas/import.blade.php
index 702eefb..365f734 100644
--- a/app/resources/views/contabilidad/cartolas/import.blade.php
+++ b/app/resources/views/contabilidad/cartolas/import.blade.php
@@ -179,7 +179,8 @@
         }
         class Movimiento {
             props
-            constructor({sociedad, fecha, glosa, cargo, abono, saldo, categoria, detalle, centro_costo, rut, nombres, identificador}) {
+            constructor({sociedad, fecha, glosa, cargo, abono, saldo, categoria, detalle, centro_costo, rut, nombres,
+                            identificador, relacionado, relacionadoType}) {
                 this.props = {
                     sociedad,
                     fecha,
@@ -192,11 +193,23 @@
                     centro_costo,
                     rut,
                     nombres,
-                    identificador
+                    identificador,
+                    relacionado,
+                    relacionadoType
                 }
             }
             draw({formatters}) {
                 const fecha = new Date(this.props.fecha)
+                let nombre = ''
+                if (this.props.nombres) {
+                    if (this.props.relacionado) {
+                        let type = this.props.relacionadoType
+                        type = type.charAt(0).toUpperCase() + type.slice(1)
+                        nombre = `<span data-tooltip="${type}">${this.props.nombres}</span>`
+                    } else {
+                        nombre = this.props.nombres
+                    }
+                }
                 return [
                     '<tr>',
                         `<td>${this.props.sociedad.sigla}</td>`,
@@ -209,7 +222,7 @@
                         `<td>${this.props.categoria ?? ''}</td>`,
                         `<td>${this.props.detalle ?? ''}</td>`,
                         `<td>${this.props.rut ?? ''}</td>`,
-                        `<td>${this.props.nombres ?? ''}</td>`,
+                        `<td>${nombre}</td>`,
                         `<td class="center aligned">${this.props.identificador ?? ''}</td>`,
                     '</tr>'
                 ].join("\n")
diff --git a/app/resources/views/contabilidad/movimientos/scripts/movimientos_table.blade.php b/app/resources/views/contabilidad/movimientos/scripts/movimientos_table.blade.php
index d1a74ef..56af7ee 100644
--- a/app/resources/views/contabilidad/movimientos/scripts/movimientos_table.blade.php
+++ b/app/resources/views/contabilidad/movimientos/scripts/movimientos_table.blade.php
@@ -203,6 +203,17 @@
                         return `<button class="ui${color} icon button ${className}" data-id="${movimiento.id}" data-index="${movimiento.index}" data-type="movimiento"><i class="${icon} icon"></i></button>`
                     }).join('')
 
+                    let nombre = ''
+                    if (movimiento.detalles) {
+                        if (movimiento.detalles.relacionado) {
+                            let type = movimiento.detalles.relacionadoType
+                            type = type.charAt(0).toUpperCase() + type.slice(1)
+                            nombre = `<span data-tooltip="${type}">${movimiento.detalles.nombres}</span>`
+                        } else {
+                            nombre = movimiento.detalles.nombres
+                        }
+                    }
+
                     const data = {
                         Sigla: movimiento.cuenta.inmobiliaria.sigla,
                         Banco: movimiento.cuenta.banco.nombre,
@@ -218,7 +229,7 @@
                         Categoria: (movimiento.detalles) ? movimiento.detalles.categoria : '',
                         Detalle: (movimiento.detalles) ? movimiento.detalles.detalle : '',
                         RUT: (movimiento.detalles && movimiento.detalles.digito) ? `${this.props.formatters.number.format(movimiento.detalles.rut)}-${movimiento.detalles.digito}` : '',
-                        Nombre: (movimiento.detalles) ? movimiento.detalles.nombres : '',
+                        Nombre: nombre,
                         Identificador: (movimiento.detalles) ? movimiento.detalles.identificador : '',
                         Editar: buttonsHTML,
                     }
diff --git a/app/resources/views/inmobiliarias/proveedores.blade.php b/app/resources/views/inmobiliarias/proveedores.blade.php
index 1e96b13..2147f63 100644
--- a/app/resources/views/inmobiliarias/proveedores.blade.php
+++ b/app/resources/views/inmobiliarias/proveedores.blade.php
@@ -18,7 +18,7 @@
             @foreach ($proveedores as $proveedor)
                 <tr>
                     <td>{{$proveedor->nombre}}</td>
-                    <td>{{$proveedor->contacto->nombreCompleto()}}</td>
+                    <td>{{$proveedor->contacto?->nombreCompleto()}}</td>
                     <td class="right aligned">
                         <button class="ui tertiary icon button" data-proveedor="{{$proveedor->rut}}">
                             <i class="edit icon"></i>
diff --git a/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php b/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
index db1e816..aecf45c 100644
--- a/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
+++ b/app/resources/views/inmobiliarias/proveedores/add_modal.blade.php
@@ -22,20 +22,19 @@
             <div class="three wide field">
                 <label for="rut_contacto">RUT</label>
                 <div class="ui right labeled input">
-                    <input type="text" id="rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10"
-                           required/>
+                    <input type="text" id="rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10"/>
                     <div class="ui basic label">-<span id="dv_contacto"></span></div>
                 </div>
             </div>
             <div class="fields">
                 <div class="five wide field">
                     <label for="nombre_contacto">Nombre</label>
-                    <input type="text" id="nombre_contacto" name="nombre_contacto" placeholder="Nombre" required/>
+                    <input type="text" id="nombre_contacto" name="nombre_contacto" placeholder="Nombre" />
                 </div>
                 <div class="field">
                     <label for="apellido_paterno_contacto">Apellido Paterno</label>
                     <input type="text" id="apellido_paterno_contacto" name="apellido_paterno_contacto"
-                           placeholder="Apellido Paterno" required/>
+                           placeholder="Apellido Paterno"/>
                 </div>
                 <div class="field">
                     <label for="apellido_materno_contacto">Apellido Materno</label>
diff --git a/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php b/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php
index 8471a83..b987431 100644
--- a/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php
+++ b/app/resources/views/inmobiliarias/proveedores/edit_modal.blade.php
@@ -22,25 +22,24 @@
             <div class="three wide field">
                 <label for="edit_rut_contacto">RUT</label>
                 <div class="ui right labeled input">
-                    <input type="text" id="edit_rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10"
-                           required/>
+                    <input type="text" id="edit_rut_contacto" name="rut_contacto" placeholder="RUT" maxlength="10" />
                     <div class="ui basic label">-<span id="edit_digito_contacto"></span></div>
                 </div>
             </div>
             <div class="fields">
                 <div class="five wide field">
                     <label for="edit_nombre_contacto">Nombre</label>
-                    <input type="text" id="edit_nombre_contacto" name="nombre_contacto" placeholder="Nombre" required/>
+                    <input type="text" id="edit_nombre_contacto" name="nombre_contacto" placeholder="Nombre" />
                 </div>
                 <div class="field">
                     <label for="edit_apellido_paterno_contacto">Apellido Paterno</label>
                     <input type="text" id="edit_apellido_paterno_contacto" name="apellido_paterno_contacto"
-                           placeholder="Apellido Paterno" required/>
+                           placeholder="Apellido Paterno" />
                 </div>
                 <div class="field">
                     <label for="edit_apellido_materno_contacto">Apellido Materno</label>
                     <input type="text" id="edit_apellido_materno_contacto" name="apellido_materno_contacto"
-                           placeholder="Apellido Materno"/>
+                           placeholder="Apellido Materno" />
                 </div>
             </div>
             <div class="field">
@@ -78,13 +77,13 @@
                     form.querySelector(this.props.digito).textContent = Rut.digitoVerificador(this.data.rut)
                     form.querySelector(this.props.nombre).value = this.data.nombre
                     form.querySelector(this.props.razon).value = this.data.razon
-                    form.querySelector(this.props.contacto.rut).value = this.data.contacto.rut
-                    form.querySelector(this.props.contacto.digito).textContent = Rut.digitoVerificador(this.data.contacto.rut)
-                    form.querySelector(this.props.contacto.nombres).value = this.data.contacto.nombres
-                    form.querySelector(this.props.contacto.apellido_paterno).value = this.data.contacto.apellidoPaterno
-                    form.querySelector(this.props.contacto.apellido_materno).value = this.data.contacto.apellidoMaterno
-                    form.querySelector(this.props.contacto.email).value = this.data.contacto.datos.email
-                    form.querySelector(this.props.contacto.telefono).value = this.data.contacto.datos.telefono
+                    form.querySelector(this.props.contacto.rut).value = (this.data.contacto) ? this.data.contacto.rut : ''
+                    form.querySelector(this.props.contacto.digito).textContent = (this.data.contact) ? Rut.digitoVerificador(this.data.contacto.rut) : ''
+                    form.querySelector(this.props.contacto.nombres).value = (this.data.contact) ? this.data.contacto.nombres : ''
+                    form.querySelector(this.props.contacto.apellido_paterno).value = (this.data.contact) ? this.data.contacto.apellidoPaterno : ''
+                    form.querySelector(this.props.contacto.apellido_materno).value = (this.data.contact) ? this.data.contacto.apellidoMaterno : ''
+                    form.querySelector(this.props.contacto.email).value = (this.data.contact) ? this.data.contacto.datos.email : ''
+                    form.querySelector(this.props.contacto.telefono).value = (this.data.contact) ? this.data.contacto.datos.telefono : ''
 
                     $(this.props.modal).modal('show')
                 })
@@ -97,7 +96,7 @@
             }
             edit() {
                 const form = document.getElementById(this.props.form)
-                const data = {
+                let data = {
                     rut: form.querySelector(this.props.rut).value.replace(/\D/g, ''),
                     digito: form.querySelector(this.props.digito).textContent,
                     nombre: form.querySelector(this.props.nombre).value,
diff --git a/app/src/Controller/API/Contabilidad/Movimientos.php b/app/src/Controller/API/Contabilidad/Movimientos.php
index 6a65d1f..fb290fc 100644
--- a/app/src/Controller/API/Contabilidad/Movimientos.php
+++ b/app/src/Controller/API/Contabilidad/Movimientos.php
@@ -126,6 +126,20 @@ class Movimientos extends Ideal\Controller
         } catch (EmptyResult) {}
         return $this->withJson($response, $output);
     }
+    public function findRut(ServerRequestInterface $request, ResponseInterface $response,
+                            Service\Contabilidad\Movimiento $movimientoService, int $rut): ResponseInterface
+    {
+        $output = [
+            'rut' => $rut,
+            'model' => null,
+            'success' => false
+        ];
+        try {
+            $output['model'] = $movimientoService->findRut($rut);
+            $output['success'] = true;
+        } catch (EmptyResult) {}
+        return $this->withJson($response, $output);
+    }
 
     protected function movimientosToArray(array $movimientos): array
     {
diff --git a/app/src/Model/Contabilidad/Movimiento/Auxiliar.php b/app/src/Model/Contabilidad/Movimiento/Auxiliar.php
deleted file mode 100644
index afbfe0a..0000000
--- a/app/src/Model/Contabilidad/Movimiento/Auxiliar.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-namespace Incoviba\Model\Contabilidad\Movimiento;
-
-use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement;
-use Incoviba\Model;
-
-class Auxiliar extends Ideal\Model
-{
-    public Model\Contabilidad\Movimiento $movimiento;
-    public int $cargo;
-    public int $abono;
-
-    protected ?Model\Contabilidad\Movimiento\Auxiliar\Detalle $detalles;
-    public function getDetalles(): ?Model\Contabilidad\Movimiento\Auxiliar\Detalle
-    {
-        if (!isset($this->detalles)) {
-            try {
-                $this->detalles = $this->runFactory('detalles');
-            } catch (Implement\Exception\EmptyResult) {
-                $this->detalles = null;
-            }
-        }
-        return $this->detalles;
-    }
-
-    public function jsonSerialize(): mixed
-    {
-        return array_merge(parent::jsonSerialize(), [
-            'movimiento_id' => $this->movimiento->id,
-            'cargo' => $this->cargo,
-            'abono' => $this->abono,
-            'detalles' => $this->getDetalles()
-        ]);
-    }
-}
diff --git a/app/src/Model/Contabilidad/Movimiento/Auxiliar/Detalle.php b/app/src/Model/Contabilidad/Movimiento/Auxiliar/Detalle.php
deleted file mode 100644
index ea2e854..0000000
--- a/app/src/Model/Contabilidad/Movimiento/Auxiliar/Detalle.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-namespace Incoviba\Model\Contabilidad\Movimiento\Auxiliar;
-
-use Incoviba\Common\Ideal;
-use Incoviba\Model;
-
-class Detalle extends Ideal\Model
-{
-    public Model\Contabilidad\Movimiento\Auxiliar $auxiliar;
-    public ?Model\Contabilidad\CentroCosto $centroCosto;
-    public ?int $rut;
-    public ?string $digito;
-    public ?string $nombre;
-    public ?string $categoria;
-    public ?string $detalle;
-
-    public function rut(): string
-    {
-        return $this->rut . '-' . $this->digito;
-    }
-    public function rutFormatted(): string
-    {
-        return number_format($this->rut, 0, ',', '.') . '-' . $this->digito;
-    }
-
-    public function jsonSerialize(): mixed
-    {
-        return [
-            'auxiliar_id' => $this->auxiliar->id,
-            'centro_costo' => $this->centroCosto,
-            'rut' => $this->rut,
-            'digito' => $this->digito,
-            'nombre' => $this->nombre,
-            'categoria' => $this->categoria,
-            'detalle' => $this->detalle,
-            'rutFormatted' => $this->rutFormatted(),
-        ];
-    }
-}
diff --git a/app/src/Model/Contabilidad/Movimiento/Detalle.php b/app/src/Model/Contabilidad/Movimiento/Detalle.php
index 8fabd68..fed5b85 100644
--- a/app/src/Model/Contabilidad/Movimiento/Detalle.php
+++ b/app/src/Model/Contabilidad/Movimiento/Detalle.php
@@ -1,6 +1,7 @@
 <?php
 namespace Incoviba\Model\Contabilidad\Movimiento;
 
+use Incoviba\Common\Define;
 use Incoviba\Common\Ideal;
 use Incoviba\Model;
 
@@ -24,6 +25,9 @@ class Detalle extends Ideal\Model
         return number_format($this->rut, 0, ',', '.') . '-' . $this->digito;
     }
 
+    public ?Define\Model $relacionado;
+    public ?string $relacionadoType;
+
     public function jsonSerialize(): mixed
     {
         return [
@@ -35,7 +39,9 @@ class Detalle extends Ideal\Model
             'categoria' => $this->categoria,
             'detalle' => $this->detalle,
             'identificador' => $this->identificador,
-            'rutFormatted' => $this->rutFormatted()
+            'rutFormatted' => $this->rutFormatted(),
+            'relacionado' => $this->relacionado ?? null,
+            'relacionadoType' => $this->relacionadoType ?? null
         ];
     }
 }
diff --git a/app/src/Repository/Contabilidad/Movimiento/Auxiliar.php b/app/src/Repository/Contabilidad/Movimiento/Auxiliar.php
deleted file mode 100644
index 065a792..0000000
--- a/app/src/Repository/Contabilidad/Movimiento/Auxiliar.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-namespace Incoviba\Repository\Contabilidad\Movimiento;
-
-use Incoviba\Common\Define;
-use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement;
-use Incoviba\Common\Implement\Exception\EmptyResult;
-use Incoviba\Model;
-use Incoviba\Repository;
-
-class Auxiliar extends Ideal\Repository
-{
-    public function __construct(Define\Connection $connection, protected Repository\Contabilidad\Movimiento $movimientoRepository)
-    {
-        parent::__construct($connection);
-        $this->setTable('movimientos_auxiliares');
-    }
-
-    public function create(?array $data = null): Model\Contabilidad\Movimiento\Auxiliar
-    {
-        $map = (new Implement\Repository\MapperParser(['cargo', 'abono']))
-            ->register('movimiento_id', (new Implement\Repository\Mapper())
-                ->setProperty('movimiento')
-                ->setFunction(function($data) {
-                    return $this->movimientoRepository->fetchById($data['movimiento_id']);
-                }));
-        return $this->parseData(new Model\Contabilidad\Movimiento\Auxiliar(), $data, $map);
-    }
-    public function save(Define\Model $model): Model\Contabilidad\Movimiento\Auxiliar
-    {
-        $model->id = $this->saveNew([
-            'movimiento_id',
-            'cargo',
-            'abono'
-        ],[
-            $model->movimiento->id,
-            $model->cargo,
-            $model->abono
-        ]);
-        return $model;
-    }
-    public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Movimiento\Auxiliar
-    {
-        return $this->update($model, [
-            'movimiento_id',
-            'cargo',
-            'abono'
-        ], $new_data);
-    }
-
-    /**
-     * @throws EmptyResult
-     */
-    public function fetchByMovimiento(int $movimiento_id): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select()
-            ->from($this->getTable())
-            ->where('movimiento_id = :movimiento_id');
-        return $this->fetchMany($query, ['movimiento_id' => $movimiento_id]);
-    }
-}
diff --git a/app/src/Repository/Contabilidad/Movimiento/Auxiliar/Detalle.php b/app/src/Repository/Contabilidad/Movimiento/Auxiliar/Detalle.php
deleted file mode 100644
index 77c0b2e..0000000
--- a/app/src/Repository/Contabilidad/Movimiento/Auxiliar/Detalle.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-namespace Incoviba\Repository\Contabilidad\Movimiento\Auxiliar;
-
-use Incoviba\Common\Define;
-use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement;
-use Incoviba\Common\Implement\Exception\EmptyResult;
-use Incoviba\Model;
-use Incoviba\Repository;
-
-class Detalle extends Ideal\Repository
-{
-    public function __construct(Define\Connection $connection,
-                                protected Repository\Contabilidad\Movimiento\Auxiliar $auxiliarRepository,
-                                protected Repository\Contabilidad\CentroCosto $centroCostoRepository)
-    {
-        parent::__construct($connection);
-        $this->setTable('auxiliar_detalles');
-    }
-
-    public function create(?array $data = null): Model\Contabilidad\Movimiento\Auxiliar\Detalle
-    {
-        $map = (new Implement\Repository\MapperParser(['rut', 'digito', 'nombre', 'categoria', 'detalle']))
-            ->register('auxiliar_id', (new Implement\Repository\Mapper())
-                ->setProperty('auxiliar')
-                ->setFunction(function($data) {
-                    return $this->auxiliarRepository->fetchById($data['auxiliar_id']);
-                }))
-            ->register('centro_costo_id', (new Implement\Repository\Mapper())
-                ->setProperty('centroCosto')
-                ->setFunction(function($data) {
-                    return $this->centroCostoRepository->fetchById($data['centro_costo_id']);
-                })
-                ->setDefault(null));
-        return $this->parseData(new Model\Contabilidad\Movimiento\Auxiliar\Detalle(), $data, $map);
-    }
-    public function save(Define\Model $model): Model\Contabilidad\Movimiento\Auxiliar\Detalle
-    {
-        $this->saveNew([
-            'auxiliar_id',
-            'rut',
-            'digito',
-            'nombre',
-            'categoria',
-            'detalle'
-        ], [
-            $model->auxiliar->id,
-            $model->rut,
-            $model->digito,
-            $model->nombre,
-            $model->categoria,
-            $model->detalle
-        ]);
-        return $model;
-    }
-    public function edit(Define\Model $model, array $new_data): Model\Contabilidad\Movimiento\Auxiliar\Detalle
-    {
-        return $this->update($model, ['rut', 'digito', 'nombre', 'categoria', 'detalle'], $new_data);
-    }
-
-    /**
-     * @throws EmptyResult
-     */
-    public function fetchByAuxiliar(int $auxiliar_id): array
-    {
-        $query = $this->connection->getQueryBuilder()
-            ->select()
-            ->from($this->getTable())
-            ->where('auxiliar_id = :auxiliar_id');
-        return $this->fetchMany($query, ['auxiliar_id' => $auxiliar_id]);
-    }
-}
diff --git a/app/src/Repository/Inmobiliaria/Proveedor.php b/app/src/Repository/Inmobiliaria/Proveedor.php
index 16d25f1..f337a9c 100644
--- a/app/src/Repository/Inmobiliaria/Proveedor.php
+++ b/app/src/Repository/Inmobiliaria/Proveedor.php
@@ -20,15 +20,18 @@ class Proveedor extends Ideal\Repository
     public function create(?array $data = null): Model\Inmobiliaria\Proveedor
     {
         $map = (new Implement\Repository\MapperParser(['rut', 'digito', 'nombre', 'razon']))
-            ->register('contacto_rut', (new Implement\Repository\Mapper())->setProperty('contacto')->setFunction(function($data) {
-                return $this->personaService->getById($data['contacto_rut']);
-            }));
+            ->register('contacto_rut', (new Implement\Repository\Mapper())
+                ->setProperty('contacto')
+                ->setFunction(function($data) {
+                    return $this->personaService->getById($data['contacto_rut']);
+                })
+                ->setDefault(null));
         return $this->parseData(new Model\Inmobiliaria\Proveedor(), $data, $map);
     }
     public function save(Define\Model $model): Model\Inmobiliaria\Proveedor
     {
         $this->saveNew(['rut', 'digito', 'nombre', 'razon', 'contacto_rut'], [
-            $model->rut, $model->digito, $model->nombre, $model->razon, $model->contacto->rut
+            $model->rut, $model->digito, $model->nombre, $model->razon, $model->contacto?->rut
         ]);
         return $model;
     }
diff --git a/app/src/Service/Contabilidad/Movimiento.php b/app/src/Service/Contabilidad/Movimiento.php
index ea86519..8e4ee2e 100644
--- a/app/src/Service/Contabilidad/Movimiento.php
+++ b/app/src/Service/Contabilidad/Movimiento.php
@@ -2,8 +2,10 @@
 namespace Incoviba\Service\Contabilidad;
 
 use DateTimeInterface;
+use Incoviba\Common\Define;
 use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Model;
 use Incoviba\Repository;
 use Psr\Log\LoggerInterface;
@@ -13,7 +15,7 @@ class Movimiento extends Service
     public function __construct(LoggerInterface                                      $logger,
                                 protected Repository\Contabilidad\Movimiento         $movimientoRepository,
                                 protected Repository\Contabilidad\Movimiento\Detalle $detalleRepository,
-                                protected Movimiento\Auxiliar                        $auxiliarService)
+                                protected Movimiento\Detalle                         $detalleService)
     {
         parent::__construct($logger);
     }
@@ -76,12 +78,20 @@ class Movimiento extends Service
         $this->movimientoRepository->remove($movimiento);
     }
 
+    /**
+     * @throws EmptyResult
+     */
+    public function findRut(int $rut): Define\Model
+    {
+        return $this->detalleService->findRut($rut);
+    }
+
     public function process(Model\Contabilidad\Movimiento $movimiento): Model\Contabilidad\Movimiento
     {
         $movimiento->addFactory('detalles', (new Implement\Repository\Factory())
             ->setCallable(function(int $movimiento_id) {
                 try {
-                    return $this->detalleRepository->fetchByMovimiento($movimiento_id);
+                    return $this->detalleService->getByMovimiento($movimiento_id);
                 } catch (Implement\Exception\EmptyResult) {
                     return null;
                 }
diff --git a/app/src/Service/Contabilidad/Movimiento/Auxiliar.php b/app/src/Service/Contabilidad/Movimiento/Auxiliar.php
deleted file mode 100644
index 23fba55..0000000
--- a/app/src/Service/Contabilidad/Movimiento/Auxiliar.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-namespace Incoviba\Service\Contabilidad\Movimiento;
-
-use Psr\Log\LoggerInterface;
-use Incoviba\Common\Ideal;
-use Incoviba\Common\Implement;
-use Incoviba\Model;
-use Incoviba\Repository;
-use Incoviba\Service;
-
-class Auxiliar extends Ideal\Service
-{
-    public function __construct(LoggerInterface $logger,
-                                protected Repository\Contabilidad\Movimiento\Auxiliar $auxiliarRepository,
-                                protected Repository\Contabilidad\Movimiento\Auxiliar\Detalle $detalleRepository)
-    {
-        parent::__construct($logger);
-    }
-
-    public function getByMovimiento(int $movimiento_id): ?array
-    {
-        try {
-            return array_map([$this, 'process'], $this->auxiliarRepository->fetchByMovimiento($movimiento_id));
-        } catch (Implement\Exception\EmptyResult) {
-            return null;
-        }
-    }
-
-    protected function process(Model\Contabilidad\Movimiento\Auxiliar $auxiliar): Model\Contabilidad\Movimiento\Auxiliar
-    {
-        $auxiliar->addFactory('detalles', (new Implement\Repository\Factory())
-            ->setCallable(function(int $auxiliar_id) {
-                try {
-                    return $this->detalleRepository->fetchByAuxiliar($auxiliar_id);
-                } catch (Implement\Exception\EmptyResult) {
-                    return null;
-                }
-            })
-            ->setArgs(['auxiliar_id' => $auxiliar->id]));
-        return $auxiliar;
-    }
-}
diff --git a/app/src/Service/Contabilidad/Movimiento/Detalle.php b/app/src/Service/Contabilidad/Movimiento/Detalle.php
new file mode 100644
index 0000000..3460cd8
--- /dev/null
+++ b/app/src/Service/Contabilidad/Movimiento/Detalle.php
@@ -0,0 +1,63 @@
+<?php
+namespace Incoviba\Service\Contabilidad\Movimiento;
+
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Psr\Log\LoggerInterface;
+use Incoviba\Common\Define;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement;
+use Incoviba\Repository;
+use Incoviba\Model;
+
+class Detalle extends Ideal\Service
+{
+    public function __construct(LoggerInterface $logger,
+                                protected Repository\Contabilidad\Movimiento\Detalle $detalleRepository,
+                                protected Repository\Venta\Propietario               $propietarioRepository,
+                                protected Repository\Inmobiliaria\Proveedor          $proveedorRepository,
+                                protected Repository\Inmobiliaria                    $inmobiliariaRepository)
+    {
+        parent::__construct($logger);
+    }
+
+    public function getByMovimiento(int $movimiento_id): ?Model\Contabilidad\Movimiento\Detalle
+    {
+        try {
+            return $this->process($this->detalleRepository->fetchByMovimiento($movimiento_id));
+        } catch (Implement\Exception\EmptyResult) {
+            return null;
+        }
+    }
+
+    /**
+     * @throws EmptyResult
+     */
+    public function findRut(int $rut): Define\Model
+    {
+        try {
+            return $this->inmobiliariaRepository->fetchById($rut);
+        } catch (Implement\Exception\EmptyResult) {}
+        try {
+            return $this->proveedorRepository->fetchById($rut);
+        } catch (Implement\Exception\EmptyResult) {}
+        try {
+            return $this->propietarioRepository->fetchById($rut);
+        } catch (Implement\Exception\EmptyResult) {}
+
+        throw new Implement\Exception\EmptyResult("{$rut} no encontrado.");
+    }
+
+    protected function process(Model\Contabilidad\Movimiento\Detalle $detalle): Model\Contabilidad\Movimiento\Detalle
+    {
+        if (empty($detalle->rut)) {
+            return $detalle;
+        }
+
+        try {
+            $detalle->relacionado = $this->findRut($detalle->rut);
+            $detalle->relacionadoType = strtolower(last(explode('\\', get_class($detalle->relacionado))));
+        } catch (Implement\Exception\EmptyResult) {}
+
+        return $detalle;
+    }
+}
diff --git a/app/src/Service/Inmobiliaria/Proveedor.php b/app/src/Service/Inmobiliaria/Proveedor.php
index 219997c..e7dedad 100644
--- a/app/src/Service/Inmobiliaria/Proveedor.php
+++ b/app/src/Service/Inmobiliaria/Proveedor.php
@@ -42,14 +42,16 @@ class Proveedor extends Ideal\Service
         $filteredData = $this->proveedorRepository->filterData($data);
         try {
             $proveedor = $this->process($this->proveedorRepository->fetchByNombre($filteredData['nombre']));
-            if ($proveedor->contacto->rut !== $data['contacto']['rut']) {
+            if (!empty($data['contacto']['rut']) and $proveedor->contacto->rut !== $data['contacto']['rut']) {
                 $contacto = $this->contactoService->add($data['contacto']);
                 return $this->proveedorRepository->edit($proveedor, ['contacto_rut' => $contacto->rut]);
             }
             return $proveedor;
         } catch (Implement\Exception\EmptyResult) {
-            $contacto = $this->contactoService->add($data['contacto']);
-            $filteredData['contacto_rut'] = $contacto->rut;
+            if (!empty($data['contacto']['rut'])) {
+                $contacto = $this->contactoService->add($data['contacto']);
+                $filteredData['contacto_rut'] = $contacto->rut;
+            }
             $proveedor = $this->proveedorRepository->create($filteredData);
             return $this->process($this->proveedorRepository->save($proveedor));
         }
@@ -61,12 +63,15 @@ class Proveedor extends Ideal\Service
      */
     public function edit(Model\Inmobiliaria\Proveedor $proveedor, array $data): Model\Inmobiliaria\Proveedor
     {
-        $filteredData = $this->proveedorRepository->filterData($data);
         try {
-            if ($proveedor->contacto->rut !== $data['contacto']['rut']) {
+            if (!empty($data['contacto']['rut'])) {
                 $contacto = $this->contactoService->getById($data['contacto']['rut']);
-                $this->contactoService->edit($contacto, $data['contacto']);
+                $contacto = $this->contactoService->edit($contacto, $data['contacto']);
+                $data['contacto_rut'] = $contacto->rut;
+            } elseif ($proveedor->contacto !== null) {
+                $data['contacto_rut'] = $proveedor->contacto->rut;
             }
+            $filteredData = $this->proveedorRepository->filterData($data);
             return $this->process($this->proveedorRepository->edit($proveedor, $filteredData));
         } catch (Implement\Exception\EmptyResult) {
             return $proveedor;
-- 
2.49.0