diff --git a/app/common/Implement/Repository/Factory.php b/app/common/Implement/Repository/Factory.php
index 00fd799..10ec520 100644
--- a/app/common/Implement/Repository/Factory.php
+++ b/app/common/Implement/Repository/Factory.php
@@ -2,7 +2,9 @@
 namespace Incoviba\Common\Implement\Repository;
 
 use Closure;
+use Exception;
 use Incoviba\Common\Define;
+use Incoviba\Common\Implement\Exception\EmptyResult;
 
 class Factory implements Define\Repository\Factory
 {
@@ -20,8 +22,16 @@ class Factory implements Define\Repository\Factory
         return $this;
     }
 
+    /**
+     * @return mixed
+     * @throws EmptyResult
+     */
     public function run(): mixed
     {
-        return call_user_func_array($this->callable, $this->args);
+        try {
+            return call_user_func_array($this->callable, $this->args);
+        } catch (Exception $exception) {
+            throw new EmptyResult($exception->getMessage(), $exception);
+        }
     }
 }
diff --git a/app/resources/database/migrations/20250215133437_create_reservation.php b/app/resources/database/migrations/20250215133437_create_reservations.php
similarity index 78%
rename from app/resources/database/migrations/20250215133437_create_reservation.php
rename to app/resources/database/migrations/20250215133437_create_reservations.php
index db9c32a..1a8dec7 100644
--- a/app/resources/database/migrations/20250215133437_create_reservation.php
+++ b/app/resources/database/migrations/20250215133437_create_reservations.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
 
-final class CreateReservation extends AbstractMigration
+final class CreateReservations extends AbstractMigration
 {
     /**
      * Change Method.
@@ -23,9 +23,11 @@ final class CreateReservation extends AbstractMigration
         $this->execute("ALTER DATABASE CHARACTER SET 'utf8mb4';");
         $this->execute("ALTER DATABASE COLLATE='utf8mb4_general_ci';");
 
-        $this->table('reservation')
+        $this->table('reservations')
+            ->addColumn('project_id', 'integer', ['signed' => false, 'null' => false])
             ->addColumn('buyer_rut', 'integer', ['signed' => false, 'null' => false])
             ->addColumn('date', 'date', ['null' => false])
+            ->addForeignKey('project_id', 'proyecto', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
             ->addForeignKey('buyer_rut', 'personas', 'rut', ['delete' => 'cascade', 'update' => 'cascade'])
             ->create();
 
diff --git a/app/resources/database/migrations/20250215135457_create_reservation_datas.php b/app/resources/database/migrations/20250215135457_create_reservation_details.php
similarity index 73%
rename from app/resources/database/migrations/20250215135457_create_reservation_datas.php
rename to app/resources/database/migrations/20250215135457_create_reservation_details.php
index ad85f98..3bdcac7 100644
--- a/app/resources/database/migrations/20250215135457_create_reservation_datas.php
+++ b/app/resources/database/migrations/20250215135457_create_reservation_details.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 use Phinx\Migration\AbstractMigration;
 
-final class CreateReservationDatas extends AbstractMigration
+final class CreateReservationDetails extends AbstractMigration
 {
     /**
      * Change Method.
@@ -23,11 +23,13 @@ final class CreateReservationDatas extends AbstractMigration
         $this->execute("ALTER DATABASE CHARACTER SET 'utf8mb4';");
         $this->execute("ALTER DATABASE COLLATE='utf8mb4_general_ci';");
 
-        $this->table('reservation_data')
+        $this->table('reservation_details')
             ->addColumn('reservation_id', 'integer', ['signed' => false, 'null' => false])
             ->addColumn('type', 'integer', ['length' => 1, 'signed' => false, 'null' => false])
             ->addColumn('reference_id', 'integer', ['signed' => false, 'null' => false])
-            ->addColumn('value', 'decimal', ['precision' => 10, 'scale' => 2, 'signed' => false, 'default' => 0.00, 'null' => true])
+            ->addColumn('value', 'decimal', ['precision' => 10, 'scale' => 2, 'signed' => false, 'default' => null, 'null' => true])
+            ->addForeignKey('reservation_id', 'reservations', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
+            ->addIndex(['reservation_id', 'type', 'reference_id'], ['unique' => true, 'name' => 'idx_reservation_details'])
             ->create();
 
         $this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
diff --git a/app/resources/database/migrations/20250215135822_create_reservation_states.php b/app/resources/database/migrations/20250215135822_create_reservation_states.php
index e617ef5..490d3dc 100644
--- a/app/resources/database/migrations/20250215135822_create_reservation_states.php
+++ b/app/resources/database/migrations/20250215135822_create_reservation_states.php
@@ -27,7 +27,7 @@ final class CreateReservationStates extends AbstractMigration
             ->addColumn('reservation_id', 'integer', ['signed' => false, 'null' => false])
             ->addColumn('date', 'date', ['null' => false])
             ->addColumn('type', 'integer', ['length' => 3, 'null' => false, 'default' => 0])
-            ->addForeignKey('reservation_id', 'reservation', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
+            ->addForeignKey('reservation_id', 'reservations', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
             ->create();
 
         $this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
diff --git a/app/resources/database/migrations/20250805192903_change_telefono_size_in_propietario.php b/app/resources/database/migrations/20250805192903_change_telefono_size_in_propietario.php
new file mode 100644
index 0000000..54a7f08
--- /dev/null
+++ b/app/resources/database/migrations/20250805192903_change_telefono_size_in_propietario.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class ChangeTelefonoSizeInPropietario extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $this->table('propietario')
+            ->changeColumn('telefono', 'biginteger', ['null' => true, 'signed' => false, 'default' => null])
+            ->update();
+    }
+}
diff --git a/app/resources/database/migrations/20250805212635_add_comments_to_estado_cierre.php b/app/resources/database/migrations/20250805212635_add_comments_to_estado_cierre.php
new file mode 100644
index 0000000..bbd9cae
--- /dev/null
+++ b/app/resources/database/migrations/20250805212635_add_comments_to_estado_cierre.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+use Phinx\Migration\AbstractMigration;
+
+final class AddCommentsToEstadoCierre extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change(): void
+    {
+        $this->table('estado_cierre_comentarios')
+            ->addColumn('estado_cierre_id', 'integer', ['signed' => false])
+            ->addColumn('fecha', 'datetime', ['default' => 'CURRENT_TIMESTAMP'])
+            ->addColumn('comments', 'text')
+            ->addForeignKey('estado_cierre_id', 'estado_cierre', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
+            ->create();
+    }
+}
diff --git a/app/resources/routes/api/personas.php b/app/resources/routes/api/personas.php
new file mode 100644
index 0000000..b01069c
--- /dev/null
+++ b/app/resources/routes/api/personas.php
@@ -0,0 +1,7 @@
+<?php
+use Incoviba\Controller\API\Personas;
+
+//$app->group('/personas', function($app) {});
+$app->group('/persona/{rut}', function($app) {
+    $app->get('[/]', [Personas::class, 'get']);
+});
diff --git a/app/resources/routes/api/proyectos.php b/app/resources/routes/api/proyectos.php
index 15d0445..5ff5f90 100644
--- a/app/resources/routes/api/proyectos.php
+++ b/app/resources/routes/api/proyectos.php
@@ -30,4 +30,5 @@ $app->group('/proyecto/{proyecto_id}', function($app) {
         $app->post('/edit[/]', [Proyectos::class, 'terreno']);
     });
     $app->get('/brokers', [Proyectos::class, 'brokers']);
+    $app->get('/promotions', [Proyectos::class, 'promotions']);
 });
diff --git a/app/resources/routes/api/ventas/reservations.php b/app/resources/routes/api/ventas/reservations.php
index 7e2e194..7625931 100644
--- a/app/resources/routes/api/ventas/reservations.php
+++ b/app/resources/routes/api/ventas/reservations.php
@@ -3,6 +3,11 @@ use Incoviba\Controller\API\Ventas\Reservations;
 
 $app->group('/reservations', function($app) {
     $app->post('/add[/]', [Reservations::class, 'add']);
+    $app->group('/project/{project_id}', function($app) {
+        $app->get('/active[/]', [Reservations::class, 'active']);
+        $app->get('/pending[/]', [Reservations::class, 'pending']);
+        $app->get('/rejected[/]', [Reservations::class, 'rejected']);
+    });
     $app->get('[/]', Reservations::class);
 });
 $app->group('/reservation/{reservation_id}', function($app) {
diff --git a/app/resources/routes/ventas/cierres.php b/app/resources/routes/ventas/cierres.php
index 62e3084..bf57def 100644
--- a/app/resources/routes/ventas/cierres.php
+++ b/app/resources/routes/ventas/cierres.php
@@ -1,5 +1,6 @@
 <?php
-use Incoviba\Controller\Ventas\Cierres;
+//use Incoviba\Controller\Ventas\Cierres;
+use Incoviba\Controller\Ventas\Reservations as Cierres;
 
 $app->group('/cierres', function($app) {
     $app->get('[/]', Cierres::class);
diff --git a/app/resources/views/ventas/add.blade.php b/app/resources/views/ventas/add.blade.php
index e870736..c8aa737 100644
--- a/app/resources/views/ventas/add.blade.php
+++ b/app/resources/views/ventas/add.blade.php
@@ -156,7 +156,7 @@
     <script>
         const regiones = [
             @foreach ($regiones as $region)
-            '<div class="item" data-value="{{$region->id}}">{{$region->descripcion}}</div>',
+            '<div class="item" data-value="{{$region->id}}">{{$region->numeral}} - {{$region->descripcion}}</div>',
             @endforeach
         ]
 
diff --git a/app/resources/views/ventas/reservations.blade.php b/app/resources/views/ventas/reservations.blade.php
new file mode 100644
index 0000000..2a0a4a4
--- /dev/null
+++ b/app/resources/views/ventas/reservations.blade.php
@@ -0,0 +1,554 @@
+@extends('layout.base')
+
+@section('page_title')
+    Cierres -Reservas
+@endsection
+
+@section('page_content')
+    <div class="ui container">
+        <h2 class="ui header">Cierres - Reservas</h2>
+
+        <div class="ui compact segment" id="projects">
+            <div class="ui header">Proyectos</div>
+        @if (count($projects) == 0)
+            <div class="ui message">
+                No hay proyectos en venta.
+            </div>
+        @else
+            <div class="ui link list">
+            @foreach ($projects as $project)
+                <div class="item link" data-id="{{ $project->id }}">
+                    {{ $project->descripcion }}
+                </div>
+            @endforeach
+            </div>
+        @endif
+        </div>
+        <div class="ui two column grid">
+            <div class="column">
+                <h3 class="ui header" id="project"></h3>
+            </div>
+            <div class="column">
+                <div class="ui active inline loader" id="loader"></div>
+            </div>
+        </div>
+        <div id="results">
+            <div class="ui right aligned top attached basic segment" id="controls">
+                <div class="ui tiny icon buttons">
+                    <button class="ui button" id="up_button">
+                        <i class="up arrow icon"></i>
+                    </button>
+                    <button class="ui button" id="refresh_button">
+                        <i class="refresh icon"></i>
+                    </button>
+                    <button class="ui green icon button" id="add_button">
+                        <i class="plus icon"></i>
+                    </button>
+                </div>
+            </div>
+            <div class="ui top attached tabular menu" id="tabs">
+                <div class="yellow active item" data-tab="pending">Pendientes</div>
+                <div class="green item" data-tab="active">Activas</div>
+                <div class="red item" data-tab="rejected">Rechazadas</div>
+            </div>
+            <div class="ui bottom attached tab fitted segment active" data-tab="pending">
+                <table class="ui yellow striped table" id="pending_reservations">
+                    <thead>
+                    <tr>
+                        <th>Unidades</th>
+                        <th>Cliente</th>
+                        <th>Fecha</th>
+                        <th>Oferta</th>
+                        <th>¿Valida?</th>
+                        <th>Operador</th>
+                        <th></th>
+                    </tr>
+                    </thead>
+                    <tbody></tbody>
+                </table>
+            </div>
+            <div class="ui bottom attached tab fitted segment" data-tab="active">
+                <table class="ui green striped table" id="active_reservations">
+                    <thead>
+                    <tr>
+                        <th>Unidades</th>
+                        <th>Cliente</th>
+                        <th>Fecha</th>
+                        <th>Oferta</th>
+                        <th>Operador</th>
+                        <th></th>
+                    </tr>
+                    </thead>
+                    <tbody></tbody>
+                </table>
+            </div>
+            <div class="ui bottom attached tab fitted segment" data-tab="rejected">
+                <table class="ui red striped table" id="rejected_reservations">
+                    <thead>
+                    <tr>
+                        <th>Unidades</th>
+                        <th>Cliente</th>
+                        <th>Fecha</th>
+                        <th>Oferta</th>
+                        <th>Estado</th>
+                        <th>Operador</th>
+                        <th>Comentarios</th>
+                    </tr>
+                    </thead>
+                    <tbody></tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+
+    @include('ventas.reservations.add_modal')
+@endsection
+
+@push('page_styles')
+    <style>
+        .item.link {
+            cursor: pointer;
+            text-decoration: underline;
+        }
+    </style>
+@endpush
+
+@push('page_scripts')
+    <script>
+        class Projects {
+            display = {
+                projects: '',
+                project: ''
+            }
+            component_id = ''
+            component = null
+            current_project = null;
+            title_id = ''
+            title_component = null
+
+            constructor({component_id, title_id}) {
+                this.component_id = component_id
+                this.component = document.getElementById(this.component_id)
+                this.display.projects = this.component.style.display
+                this.title_id = title_id
+                this.title_component = document.getElementById(this.title_id)
+                this.display.project = this.title_component.style.display
+
+                this.show()
+                this.watch()
+            }
+
+            select(event) {
+                event.preventDefault()
+
+                const project_id = event.currentTarget.dataset.id
+                reservations.show.results()
+
+                if (project_id === this.current_project) {
+                    this.hide()
+                    this.title_component.innerHTML = event.currentTarget.innerHTML
+
+                    reservations.action.reservations()
+
+                    return
+                }
+                this.current_project = project_id
+
+                reservations.get.reservations(project_id)
+                reservations.components.modals.add.load(project_id)
+                this.hide()
+
+                this.title_component.innerHTML = event.currentTarget.innerHTML
+            }
+            watch() {
+                this.component.querySelectorAll('.item.link').forEach(item => {
+                    item.addEventListener('click', this.select.bind(this))
+                })
+            }
+            show() {
+                this.component.style.display = this.display.projects
+                this.title_component.style.display = 'none'
+            }
+            hide() {
+                this.component.style.display = 'none'
+                this.title_component.style.display = this.display.project
+            }
+        }
+        class Controls {
+            display = {
+                up: '',
+                reset: '',
+            }
+            component_id = ''
+            component = null
+
+            buttons = {
+                up: null,
+                reset: null,
+                add: null
+            }
+
+            constructor({component_id}) {
+                this.component_id = component_id
+                this.component = document.getElementById(this.component_id)
+                const buttons = this.component.querySelectorAll('button')
+                this.buttons.up = buttons[0]
+                this.buttons.reset = buttons[1]
+                this.buttons.add = buttons[2]
+                this.display.up = buttons[0].style.display
+                this.display.reset = buttons[1].style.display
+
+                this.watch()
+                this.hide()
+            }
+
+            watch() {
+                Object.entries(this.buttons).forEach(([key, value]) => {
+                    const name = key.replace('_button', '')
+                    value.addEventListener('click', this.action[name].bind(this))
+                })
+            }
+            hide() {
+                this.buttons.up.style.display = this.display.up
+                this.buttons.reset.style.display = this.display.reset
+            }
+            show() {
+                this.buttons.up.style.display = 'none'
+                this.buttons.reset.style.display = 'none'
+            }
+
+            action = {
+                reset: event => {
+                    event.preventDefault()
+                    reservations.action.reset(event)
+                    return false
+                },
+                up: event => {
+                    event.preventDefault()
+                    reservations.action.up(event)
+                    return false
+                },
+                add: event => {
+                    event.preventDefault()
+                    reservations.action.add(event)
+                    return false
+                }
+            }
+        }
+        class Reservations {
+            display = {
+                reservations: '',
+            }
+            component_id = ''
+            component = null
+            formatters = {
+                date: null,
+                ufs: null
+            }
+
+            columnNames = []
+            reservations = []
+
+            constructor({component_id, formatters = {date, ufs}}) {
+                this.component_id = component_id
+                this.component = document.getElementById(this.component_id)
+                this.display.reservations = this.component.style.display
+
+                this.formatters = formatters
+
+                this.set().columnNames()
+
+                this.hide()
+            }
+
+            set() {
+                return {
+                    reservations: reservations => {
+                        this.reservations = reservations
+                        return this
+                    },
+                    columnNames: () => {
+                        const tds = this.component.querySelector('thead tr').querySelectorAll('th')
+                        this.columnNames = []
+                        tds.forEach(td => {
+                            let name = td.innerHTML.toLowerCase()
+                            if (name === '') {
+                                return
+                            }
+                            if (name.includes('?')) {
+                                name = name.replaceAll(/[¿?]/g, '')
+                            }
+                            this.columnNames.push(name)
+                        })
+                        return this
+                    }
+                }
+            }
+            columnsData() {
+                return this.reservations.map(reservation => {
+                    const date = new Date(Date.parse(reservation.fecha) + 24 * 60 * 60 * 1000)
+                    return {
+                        id: reservation.id,
+                        unidades: reservation.summary,
+                        cliente: reservation.buyer.nombreCompleto,
+                        fecha: this.formatters.date.format(date),
+                        oferta: `${this.formatters.ufs.format(reservation.offer)} UF`,
+                        valida: reservation.valid ? '<span class="ui green text">Si</span>' : '<span class="ui red text">No</span>',
+                        operador: reservation.broker?.name ?? '',
+                    }
+                })
+            }
+            draw() {
+                const tbody = this.component.querySelector('tbody')
+                tbody.innerHTML = ''
+                this.columnsData().forEach(column => {
+                    const tr = document.createElement('tr')
+                    const contents = []
+                    const id = column.id
+                    this.columnNames.forEach(name => {
+                        contents.push(`<td>${column[name]}</td>`)
+                    })
+                    const actions = this.drawActions(id)
+                    if (actions !== '') {
+                        contents.push(actions)
+                    }
+                    tr.innerHTML = contents.join("\n")
+                    tbody.appendChild(tr)
+                })
+                this.show()
+            }
+            drawActions(id) {
+                return `
+                    <td class="right aligned">
+                        <button class="ui green mini icon button approve" data-id="${id}" title="Aprobar">
+                            <i class="check icon"></i>
+                        </button>
+                        <button class="ui red mini icon button reject" data-id="${id}" title="Rechazar">
+                            <i class="trash icon"></i>
+                        </button>
+                    </td>`
+            }
+            empty() {
+                const tbody = this.component.querySelector('tbody')
+                tbody.innerHTML = ''
+                const col_span = this.columnNames.length + 1
+                const tr = document.createElement('tr')
+                tr.innerHTML = `<td colspan="${col_span}">No hay cierres</td>`
+                tbody.appendChild(tr)
+
+                this.show()
+            }
+
+            show() {
+                this.component.style.display = this.display.reservations
+            }
+            hide() {
+                this.component.style.display = 'none'
+            }
+        }
+        class ActiveReservations extends Reservations {
+            constructor({component_id, formatters = {date, ufs}}) {
+                super({component_id, formatters})
+            }
+            columnsData() {
+                const data = super.columnsData();
+                return data.map(row => {
+                    delete(row['valida'])
+                    return row
+                })
+            }
+            drawActions(id) {
+                return `
+                    <td class="right aligned">
+                        <button class="ui green mini icon button edit" data-id="${id}" title="Promesar">
+                            <i class="right chevron icon"></i>
+                        </button>
+                        <button class="ui red mini icon button remove" data-id="${id}" title="Abandonar">
+                            <i class="trash icon"></i>
+                        </button>
+                    </td>`
+            }
+        }
+        class PendingReservations extends Reservations {
+            constructor({component_id, formatters = {date, ufs}}) {
+                super({component_id, formatters})
+            }
+        }
+        class RejectedReservations extends Reservations {
+            constructor({component_id, formatters = {date, ufs}}) {
+                super({component_id, formatters})
+            }
+
+            columnsData() {
+                const data = super.columnsData()
+                return this.reservations.map((reservation, idx) => {
+                    data[idx]['estado'] = reservation.state.charAt(0).toUpperCase() + reservation.state.slice(1)
+                    data[idx]['comentarios'] = reservation.comments?.join('<br />\n') ?? ''
+                    return data[idx]
+                })
+            }
+
+            drawActions(id) {
+                return ''
+            }
+        }
+        const reservations = {
+            components: {
+                projects: null,
+                loader: null,
+                results: null,
+                controls: null,
+                reservations: {
+                    active: null,
+                    pending: null,
+                    rejected: null
+                },
+                modals: {
+                    add: null
+                }
+            },
+            display: {
+                loader: '',
+                results: '',
+            },
+            get: {
+                send: (project_id, url_segment, component) => {
+                    const url = `/api/ventas/reservations/project/${project_id}/${url_segment}`
+                    return APIClient.fetch(url).then(response => response.json()).then(json => {
+                        if (json.reservations.length === 0) {
+                            component.empty()
+                            return
+                        }
+                        component.set().reservations(json.reservations).draw()
+                    })
+                },
+                active: project_id => {
+                    return reservations.get.send(project_id, 'active', reservations.components.reservations.active)
+                    /*const url = `/ventas/reservations/project/${project_id}/active`
+                    return APIClient.fetch(url).then(json => {
+                        if (json.reservations.length === 0) {
+                            return
+                        }
+                        this.components.reservations.active.set().reservations(json.reservations).draw()
+                    })*/
+                },
+                pending: project_id => {
+                    return reservations.get.send(project_id, 'pending', reservations.components.reservations.pending)
+                    /*const url = `/ventas/reservations/project/${project_id}/pending`
+                    return APIClient.fetch(url).then(json => {
+                        if (json.reservations.length === 0) {
+                            return
+                        }
+                        this.components.reservations.pending.set().reservations(json.reservations).draw()
+                    })*/
+                },
+                rejected: project_id => {
+                    return reservations.get.send(project_id, 'rejected', reservations.components.reservations.rejected)
+                    /*const url = `/ventas/reservations/project/${project_id}/rejected`
+                    return APIClient.fetch(url).then(json => {
+                        if (json.reservations.length === 0) {
+                            return
+                        }
+                        this.components.reservations.rejected.set().reservations(json.reservations).draw()
+                    })*/
+                },
+                reservations: project_id => {
+                    reservations.loading.show()
+
+                    const promises = []
+
+                    promises.push(reservations.get.active(project_id))
+                    promises.push(reservations.get.pending(project_id))
+                    promises.push(reservations.get.rejected(project_id))
+
+                    return Promise.any(promises).then(() => {
+                        reservations.loading.hide()
+                    })
+                }
+            },
+            loading: {
+                show: () => {
+                    reservations.components.loader.style.display = reservations.display.loader
+                },
+                hide: () => {
+                    reservations.components.loader.style.display = 'none'
+                }
+            },
+            action: {
+                reset: event => {
+                    event.preventDefault()
+                    reservations.components.projects.current_project = null
+                    Object.entries(reservations.components.reservations).forEach(([key, value]) => {
+                        reservations.components.reservations[key].reservations = []
+                        reservations.components.reservations[key].hide()
+                    })
+                    reservations.show.projects()
+                    return false
+                },
+                up: event => {
+                    event.preventDefault()
+                    Object.values(reservations.components.reservations).forEach(reservations => reservations.hide())
+                    reservations.show.projects()
+                    return false
+                },
+                add: event => {
+                    event.preventDefault()
+                    reservations.components.modals.add.show()
+                    return false
+                },
+                reservations: () => {
+                    Object.values(reservations.components.reservations).forEach(reservations => {
+                        reservations.draw()
+                    })
+                }
+            },
+            show: {
+                projects: () => {
+                    reservations.components.projects.show()
+                    reservations.components.results.style.display = 'none'
+                },
+                results: () => {
+                    reservations.components.projects.hide()
+                    reservations.components.results.style.display = reservations.display.results
+                }
+            },
+            setup(configuration) {
+                const formatters = {
+                    date: new Intl.DateTimeFormat('es-CL', {year: 'numeric', month: 'long', day: 'numeric'}),
+                    ufs: new Intl.NumberFormat('es-CL', {minimumFractionDigits: 2, maximumFractionDigits: 2})
+                }
+                this.components.loader = document.getElementById(configuration.ids.loader)
+                this.components.projects = new Projects({component_id: configuration.ids.projects, title_id: configuration.ids.project})
+                this.components.controls = new Controls({component_id: configuration.ids.controls})
+                this.components.reservations.active = new ActiveReservations({component_id: configuration.ids.active, formatters})
+                this.components.reservations.pending = new PendingReservations({component_id: configuration.ids.pending, formatters})
+                this.components.reservations.rejected = new RejectedReservations({component_id: configuration.ids.rejected, formatters})
+
+                this.display.loader = this.components.loader.style.display
+                this.loading.hide()
+
+                $(`#${configuration.ids.tabs} .item`).tab()
+                this.components.results = document.getElementById(configuration.ids.results)
+                this.display.results = this.components.results.style.display
+                this.show.projects()
+
+                this.components.modals.add = new AddReservationModal()
+            }
+        }
+        $(document).ready(() => {
+            reservations.setup({
+                ids: {
+                    projects: 'projects',
+                    project: 'project',
+                    results: 'results',
+                    loader: 'loader',
+                    controls: 'controls',
+                    tabs: 'tabs',
+                    active: 'active_reservations',
+                    pending: 'pending_reservations',
+                    rejected: 'rejected_reservations',
+                }
+            })
+        })
+    </script>
+@endpush
diff --git a/app/resources/views/ventas/reservations/add_modal.blade.php b/app/resources/views/ventas/reservations/add_modal.blade.php
new file mode 100644
index 0000000..3f137b1
--- /dev/null
+++ b/app/resources/views/ventas/reservations/add_modal.blade.php
@@ -0,0 +1,733 @@
+<div class="ui modal" id="add_reservation_modal">
+    <div class="header">
+        Agregar Cierre
+    </div>
+    <div class="content">
+        <form class="ui form" id="add_reservation_form">
+            <input type="hidden" name="project_id" />
+            <div class="three wide required field">
+                <label>Fecha</label>
+                <div class="ui calendar" id="add_date">
+                    <div class="ui icon input">
+                        <i class="calendar icon"></i>
+                        <input type="text" name="date" />
+                    </div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="three wide required field">
+                    <label>RUT</label>
+                    <div class="ui right labeled input" id="add_rut">
+                        <input type="text" name="rut" placeholder="RUT" />
+                        <div class="ui basic label">-<span id="add_digit"></span></div>
+                    </div>
+                </div>
+                <div class="field">
+                    <label></label>
+                    <div class="ui inline loader" id="add_rut_loader"></div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="three wide required field">
+                    <label>Nombre</label>
+                    <input type="text" name="name" placeholder="Nombre" />
+                </div>
+                <div class="six wide required field">
+                    <label>Apellidos</label>
+                    <input type="text" name="last_name" placeholder="Apellido Paterno" />
+                </div>
+                <div class="six wide field">
+                    <label></label>
+                    <input type="text" name="last_name2" placeholder="Apellido Materno" />
+                </div>
+            </div>
+            <div class="fields">
+                <div class="three wide field">
+                    <label>Dirección</label>
+                    <input type="text" name="calle" placeholder="Calle" />
+                </div>
+                <div class="field">
+                    <label></label>
+                    <input type="text" name="numero" placeholder="N°" />
+                </div>
+                <div class="three wide field">
+                    <label></label>
+                    <input type="text" name="extra" placeholder="Otros Detalles" />
+                </div>
+            </div>
+            <div class="fields">
+                <div class="three wide field">
+                    <label>Comuna</label>
+                    <div class="ui search selection dropdown" id="add_comuna">
+                        <input type="hidden" name="comuna" />
+                        <i class="dropdown icon"></i>
+                        <div class="default text">Comuna</div>
+                        <div class="menu"></div>
+                    </div>
+                </div>
+                <div class="seven wide field">
+                    <label>Región</label>
+                    <div class="ui search selection dropdown" id="add_region">
+                        <input type="hidden" name="region" />
+                        <i class="dropdown icon"></i>
+                        <div class="default text">Región</div>
+                        <div class="menu">
+                            @foreach($regions as $region)
+                                <div class="item" data-value="{{$region->id}}">{{$region->numeral}} - {{$region->descripcion}}</div>
+                            @endforeach
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="field">
+                    <label>Telefono</label>
+                    <input type="text" name="phone" placeholder="Telefono" />
+                </div>
+                <div class="field">
+                    <label>Correo</label>
+                    <div class="ui labeled input">
+                        <input type="text" name="email_name" placeholder="Correo" />
+                        <div class="ui basic label">@</div>
+                        <input type="text" name="email_domain" placeholder="Dominio" />
+                    </div>
+                </div>
+            </div>
+            <div class="fields">
+                <div class="field">
+                    <label>Estado Civil</label>
+                    <input type="text" name="civil_status" placeholder="Estado Civil" />
+                </div>
+                <div class="field">
+                    <label>Profesión</label>
+                    <input type="text" name="profession" placeholder="Profesión" />
+                </div>
+                <div class="field">
+                    <label>Fecha de Nacimiento</label>
+                    <div class="ui calendar" id="add_birthdate">
+                        <div class="ui icon input">
+                            <i class="calendar icon"></i>
+                            <input type="text" name="birthdate" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="six wide field">
+                <label>Operador *</label>
+                <div class="ui clearable search selection dropdown" id="add_broker">
+                    <input type="hidden" name="broker" />
+                    <i class="dropdown icon"></i>
+                    <div class="default text">Operador</div>
+                    <div class="menu"></div>
+                </div>
+            </div>
+            <div class="field">
+                <label>Agregar Promoción</label>
+                <button type="button" class="ui icon button" id="add_promotion">
+                    <i class="plus icon"></i>
+                </button>
+            </div>
+            <div id="add_promotions"></div>
+            <h4 class="ui dividing header">Unidades</h4>
+            <div class="fields" id="add_unit_buttons"></div>
+            <div id="add_units"></div>
+        </form>
+    </div>
+    <div class="actions">
+        <div class="ui cancel button">
+            Cancelar
+        </div>
+        <div class="ui green ok button">
+            Agregar
+        </div>
+    </div>
+</div>
+
+@include('layout.body.scripts.rut')
+
+@push('page_scripts')
+    <script>
+        class AddModalPromotions {
+            ids = {
+                button: '',
+                elements: ''
+            }
+            data = {
+                promotions: []
+            }
+            components = {
+                button: null,
+                promotions: null,
+            }
+            display = {
+                button: ''
+            }
+
+            constructor() {
+                this.ids = {
+                    button: 'add_promotion',
+                    elements: 'add_promotions'
+                }
+                this.setup()
+            }
+            add() {
+                const idx = Math.max(this.data.promotions.length, 0, Math.max(...this.data.promotions) + 1)
+                this.data.promotions.push(idx)
+                this.draw.promotions()
+            }
+            reset() {
+                this.data.promotions = []
+                this.draw.promotions()
+            }
+            remove(idx) {
+                this.data.promotions = this.data.promotions.filter(promotion => promotion !== idx)
+                this.draw.promotions()
+            }
+            draw = {
+                promotion: idx => {
+                    const promotions = this.data.promotions.map(promotion => {
+                        return `<div class="item" data-value="${promotion.id}">${promotion.name}</div>`
+                    })
+                    return [
+                        `<div class="fields promotion" data-id="${idx}">`,
+                            '<div class="three wide field">',
+                                '<label>Promoción</label>',
+                                `<div class="ui search selection dropdown">`,
+                                    '<input type="hidden" name="promotions[]" />',
+                                    '<i class="dropdown icon"></i>',
+                                    '<div class="default text">Promoción</div>',
+                                    `<div class="menu">${promotions.join('')}</div>`,
+                                '</div>',
+                            '</div>',
+                            '<div class="two wide field">',
+                                '<label></label>',
+                                `<button class="ui red tiny icon button remove_promotion" type="button" data-id="${idx}"><i class="trash icon"></i></button>`,
+                            '</div>',
+                        '</div>'
+                    ].join('')
+                },
+                promotions: () => {
+                    if (this.data.promotions.length === 0) {
+                        this.components.button.parentElement.style.display = 'none'
+                        this.components.promotions.innerHTML = ''
+                        return
+                    }
+                    this.components.button.parentElement.style.display = this.display.button
+                    this.components.promotions.innerHTML = this.data.promotions.map((promotion, idx) => {
+                        return this.draw.promotion(idx)
+                    }).join('')
+                    this.components.promotions.querySelectorAll('.dropdown').forEach(dropdown => {
+                        $(dropdown).dropdown()
+                    })
+                    this.components.promotions.querySelectorAll('.remove_promotion').forEach(button => {
+                        button.addEventListener('click', () => {
+                            const idx = Number(button.dataset.id)
+                            this.remove(idx)
+                        })
+                    })
+                }
+            }
+            setup() {
+                this.components.button = document.getElementById(this.ids.button)
+                this.components.promotions = document.getElementById(this.ids.elements)
+                this.components.button.addEventListener('click', () => {
+                    this.add()
+                })
+                this.display.button = this.components.button.parentElement.style.display
+                this.draw.promotions()
+            }
+        }
+        class AddModalUnits {
+            ids = {
+                buttons_holder: '',
+                units: ''
+            }
+            data = {
+                button_map: {},
+                types: {},
+                units: [],
+            }
+            components = {
+                buttons_holder: null,
+                units: null,
+            }
+
+            constructor() {
+                this.ids = {
+                    buttons_holder: 'add_unit_buttons',
+                    units: 'add_units'
+                }
+                this.data.button_map = {
+                    'departamento': 'building',
+                    'estacionamiento': 'car',
+                    'bodega': 'warehouse',
+                    'terraza': 'vector square'
+                }
+                this.setup()
+            }
+            draw = {
+                button: type => {
+                    return [
+                        '<div class="field">',
+                            `<button class="ui icon button" type="button" data-type="${type}" title="${type.charAt(0).toUpperCase() + type.slice(1)}">`,
+                                '<i class="plus icon"></i>',
+                                `<i class="${this.data.button_map[type]} icon"></i>`,
+                            '</button>',
+                        '</div>'
+                    ].join('')
+                },
+                buttons: () => {
+                    this.components.buttons_holder.innerHTML = Object.keys(this.data.types).map(type => {
+                        return this.draw.button(type)
+                    }).join('')
+                    this.components.buttons_holder.querySelectorAll('.button').forEach(button => {
+                        button.addEventListener('click', () => {
+                            const type = button.dataset.type
+                            this.add(type)
+                        })
+                    })
+                },
+                units: () => {
+                    if (this.data.units.length === 0) {
+                        this.components.units.innerHTML = ''
+                        return
+                    }
+                    this.components.units.innerHTML = this.data.units.map(unit => {
+                        return [
+                            '<div class="fields">',
+                                '<div class="four wide field">',
+                                    `<label>${unit.type.charAt(0).toUpperCase() + unit.type.slice(1)}</label>`,
+                                    `<div class="ui search selection dropdown">`,
+                                        '<input type="hidden" name="units[]" />',
+                                        '<i class="dropdown icon"></i>',
+                                        `<div class="default text">${unit.type.charAt(0).toUpperCase() + unit.type.slice(1)}</div>`,
+                                        '<div class="menu">',
+                                        this.data.types[unit.type].map(unit => {
+                                            return `<div class="item" data-value="${unit.value}">${unit.name}</div>`
+                                        }).join(''),
+                                        '</div>',
+                                    '</div>',
+                                '</div>',
+                                '<div class="field">',
+                                    '<label></label>',
+                                    `<button class="ui red tiny icon button remove_unit" type="button" data-id="${unit.idx}"><i class="trash icon"></i></button>`,
+                                '</div>',
+                            '</div>',
+                        ].join('')
+                    }).join('')
+                    this.components.units.querySelectorAll('.dropdown').forEach(dropdown => {
+                        $(dropdown).dropdown()
+                    })
+                    this.components.units.querySelectorAll('.remove_unit').forEach(button => {
+                        button.addEventListener('click', () => {
+                            const idx = Number(button.dataset.id)
+                            this.remove(idx)
+                        })
+                    })
+                }
+            }
+            reset() {
+                this.data.units = []
+                this.draw.units()
+            }
+            add(type) {
+                const idx = Math.max(this.data.units.length, 0, Math.max(...this.data.units.map(unit => unit.idx)) + 1)
+                this.data.units.push({idx, type})
+                this.draw.units()
+            }
+            remove(idx) {
+                this.data.units = this.data.units.filter(unit => unit.idx !== idx)
+                this.draw.units()
+            }
+            setup() {
+                this.components.buttons_holder = document.getElementById(this.ids.buttons_holder)
+                this.components.units = document.getElementById(this.ids.units)
+                this.draw.buttons()
+            }
+        }
+        class AddReservationModal {
+            ids = {
+                modal: '',
+                form: '',
+                date: '',
+                rut: '',
+                digit: '',
+                birthdate: '',
+                comuna: '',
+                region: '',
+                broker: '',
+                promotion_button: '',
+                promotions: '',
+                unit_buttons: '',
+                units: ''
+            }
+            components = {
+                $modal: null,
+                form: null,
+                $date: null,
+                $rut: null,
+                rut: null,
+                digit: null,
+                $birthdate: null,
+                $comuna: null,
+                $region: null,
+                $broker: null,
+                promotion_button: null,
+                promotions: null,
+                unit_buttons: null,
+                units: null,
+                $loader: null
+            }
+            data = {
+                current_project: null,
+                comunas: {},
+                brokers: {},
+                promotions: {},
+                unit_buttons: [],
+                units: {},
+                added_units: {},
+                current_user: null
+            }
+            maps = {
+                unit_types: {
+                    departamento: 'building',
+                    estacionamiento: 'car',
+                    bodega: 'warehouse',
+                    terraza: 'tree',
+                }
+            }
+            constructor() {
+                this.ids = {
+                    modal: 'add_reservation_modal',
+                    form: 'add_reservation_form',
+                    date: 'add_date',
+                    rut: 'add_rut',
+                    digit: 'add_digit',
+                    birthdate: 'add_birthdate',
+                    comuna: 'add_comuna',
+                    region: 'add_region',
+                    broker: 'add_broker',
+                    promotion_button: 'add_promotion',
+                    promotions: 'add_promotions',
+                    unit_buttons: 'add_unit_buttons',
+                    units: 'add_units',
+                    loader: 'add_rut_loader'
+                }
+                this.setup()
+            }
+            load(project_id) {
+                this.reset()
+                this.data.current_project = project_id
+                this.components.form.querySelector('input[name="project_id"]').value = project_id
+
+                this.get.brokers(project_id)
+                this.get.promotions(project_id).then(promotions => {
+                    this.components.promotions.data.promotions = promotions
+                    this.components.promotions.draw.promotions()
+                })
+                this.get.units(project_id).then(units => {
+                    this.components.units.data.types = units
+                    this.components.units.draw.buttons()
+                })
+            }
+            reset() {
+                this.components.form.reset()
+                this.components.promotions.reset()
+                this.components.units.reset()
+            }
+            add() {
+                const url = '/api/ventas/reservations/add'
+                const form = document.getElementById(this.ids.form)
+                const body = new FormData(form)
+                const date = this.components.$date.calendar('get date')
+                console.debug(date)
+                body.set('date', [date.getFullYear(), date.getMonth() + 1, date.getDate()].join('-'))
+                body.set('comuna', this.components.$comuna.dropdown('get value'))
+                body.set('region', this.components.$region.dropdown('get value'))
+                body.set('broker_rut', this.components.$broker.dropdown('get value'))
+                /*body.set('promotions[]', '')
+                this.components.promotions.forEach(promotion => {
+                    body.append('promotions[]', promotion.querySelector('promotion').value)
+                })*/
+                /*body.set('units[]', '')
+                this.components.units.forEach(unit => {
+                    body.append('units[]', unit.querySelector('unit').value)
+                })*/
+                const method = 'post'
+                return APIClient.fetch(url, {method, body}).then(response => response.json()).then(json => {
+                    if (json.success) {
+                        window.location.reload()
+                    }
+                })
+            }
+            get = {
+                comunas: region_id => {
+                    if (region_id in this.data.comunas) {
+                        this.components.$comuna.dropdown('change values', this.data.comunas[region_id])
+                        if (this.data.current_user !== null && this.data.current_user?.direccion?.comuna !== null) {
+                            this.components.$comuna.dropdown('set selected', this.data.current_user.direccion.comuna.id)
+                        }
+                        return
+                    }
+                    const uri = `/api/region/${region_id}/comunas`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (json.comunas.length === 0) {
+                            return
+                        }
+                        this.data.comunas[region_id] = json.comunas.map(comuna => {
+                            return {
+                                text: comuna.descripcion,
+                                name: comuna.descripcion,
+                                value: comuna.id
+                            }
+                        })
+                        this.components.$comuna.dropdown('change values', this.data.comunas[region_id])
+
+                        if (this.data.current_user !== null && this.data.current_user?.direccion?.comuna !== null) {
+                            this.components.$comuna.dropdown('set selected', this.data.current_user.direccion.comuna.id)
+                        }
+                    })
+                },
+                brokers: project_id => {
+                    if (project_id in this.data.brokers) {
+                        return new Promise((resolve, reject) => {
+                            resolve(this.data.brokers[project_id])
+                        })
+                    }
+                    const uri = `/api/proyecto/${project_id}/brokers`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (json.contracts.length === 0) {
+                            return
+                        }
+                        const formatter = new Intl.NumberFormat('es-CL', { style: 'percent', minimumFractionDigits: 2 })
+                        this.data.brokers[project_id] = json.contracts.map(contract => {
+                            return {
+                                id: contract.id,
+                                broker_rut: contract.broker_rut,
+                                commission: formatter.format(contract.commission),
+                                name: '',
+                                text: '',
+                            }
+                        })
+                        const promises = []
+                        json.contracts.forEach(contract => {
+                            promises.push(this.get.broker(contract.broker_rut))
+                        })
+
+                        return Promise.all(promises).then(data => {
+                            data.forEach(broker => {
+                                if (!('rut' in broker)) {
+                                    return
+                                }
+                                const idx = this.data.brokers[project_id].findIndex(contract => contract.broker_rut === broker.rut)
+                                this.data.brokers[project_id][idx].name = this.data.brokers[project_id][idx].text = `${broker.name} - ${this.data.brokers[project_id][idx].commission}`
+                            })
+                            this.fill.brokers()
+                        })
+                    })
+                },
+                broker: (broker_rut) => {
+                    const uri = `/api/proyectos/broker/${broker_rut}`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (!('broker' in json)) {
+                            return []
+                        }
+                        return json.broker
+                    })
+                },
+                promotions: project_id => {
+                    if (project_id in this.data.promotions) {
+                        return new Promise((resolve, reject) => {
+                            resolve(this.data.promotions[project_id])
+                        })
+                    }
+                    const uri = `/api/proyecto/${project_id}/promotions`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (json.promotions.length === 0) {
+                            return this.data.promotions[project_id] = []
+                        }
+                        return this.data.promotions[project_id] = json.promotions.map(promotion => {
+                            return {
+                                text: promotion.name,
+                                name: promotion.name,
+                                value: promotion.id
+                            }
+                        })
+                    })
+                },
+                units: project_id => {
+                    if (project_id in this.data.units) {
+                        return new Promise((resolve, reject) => {
+                            resolve(this.data.units[project_id])
+                        })
+                    }
+                    const uri = `/api/proyecto/${project_id}/unidades`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        if (json.total === 0) {
+                            this.data.units[project_id] = {}
+                            return this.data.units[project_id]
+                        }
+                        if (!(project_id in this.data.units)) {
+                            this.data.units[project_id] = {}
+                        }
+                        Object.entries(json.unidades).forEach(([type, units]) => {
+                            if (!(type in this.data.units[project_id])) {
+                                this.data.units[project_id][type] = []
+                            }
+                            units.forEach(unit => {
+                                this.data.units[project_id][type].push({
+                                    text: unit.descripcion,
+                                    name: unit.descripcion,
+                                    value: unit.id
+                                })
+                            })
+                        })
+                        return this.data.units[project_id]
+                    })
+                },
+                user: rut => {
+                    if (this.data.current_user !== null && this.data.current_user?.rut === rut) {
+                        return this.data.current_user
+                    }
+                    this.loader.show()
+                    const uri = `/api/persona/${rut}`
+                    return APIClient.fetch(uri).then(response => response.json()).then(json => {
+                        this.loader.hide()
+                        if (!json.success) {
+                            return
+                        }
+                        this.data.current_user = json.persona
+                        return json.persona
+                    })
+                }
+            }
+            fill = {
+                user: user => {
+                    const form = this.components.form
+                    form.querySelector('input[name="name"]').value = user.nombres || ''
+                    form.querySelector('input[name="last_name"]').value = user.apellidoPaterno || ''
+                    form.querySelector('input[name="last_name2"]').value = user.apellidoMaterno || ''
+                    form.querySelector('input[name="calle"]').value = user.datos?.direccion?.calle || ''
+                    form.querySelector('input[name="numero"]').value = user.datos?.direccion?.numero || ''
+                    form.querySelector('input[name="extra"]').value = user.datos?.direccion?.extra || ''
+                    if (parseInt(this.components.$region.dropdown('get value')) !== user.datos?.direccion?.comuna?.provincia?.region?.id) {
+                        this.components.$region.dropdown('set selected', user.datos?.direccion?.comuna?.provincia?.region?.id)
+                    } else {
+                        this.components.$comuna.dropdown('set selected', user.datos?.direccion?.comuna?.id)
+                    }
+                    form.querySelector('input[name="phone"]').value = user.datos?.telefono
+                    const email_parts = user.datos?.email.split('@')
+                    form.querySelector('input[name="email_name"]').value = email_parts[0]
+                    form.querySelector('input[name="email_domain"]').value = email_parts[1]
+                    if ('estadoCivil' in user.datos) {
+                        form.querySelector('input[name="civil_status"]').value = user.datos?.estadoCivil.charAt(0).toUpperCase() + user.datos?.estadoCivil.slice(1)
+                    } else {
+                        form.querySelector('input[name="civil_status"]').value = ''
+                    }
+                    if ('ocupacion' in user.datos) {
+                        form.querySelector('input[name="profession"]').value = user.datos?.ocupacion
+                    } else {
+                        form.querySelector('input[name="profession"]').value = ''
+                    }
+                    if ('fechaNacimiento' in user.datos) {
+                        this.components.$birthdate.calendar('set date', user.datos?.fechaNacimiento)
+                    }
+                },
+                brokers: () => {
+                    this.components.$broker.dropdown('change values', this.data.brokers[this.data.current_project])
+                },
+                units: () => {
+                    const buttons = []
+                    Object.entries(this.maps.unit_types).forEach(([type, map]) => {
+                        if (!(type in this.data.units[this.data.current_project])) {
+                            return
+                        }
+                        buttons.push(`<div class="field"><div class="ui icon button" data-type="${type}" title="${type.charAt(0).toUpperCase() + type.slice(1)}"><i class="plus icon"></i><i class="${map} icon"></i></div></div>`)
+                    })
+
+                    this.components.unit_buttons.innerHTML = buttons.join('')
+                    this.components.unit_buttons.querySelectorAll('.ui.icon.button').forEach(button => {
+                        button.addEventListener('click', () => {
+                            this.units.add(button.dataset.type)
+                        })
+                    })
+                }
+            }
+            watch = {
+                region: (value, text, $choice) => {
+                    this.get.comunas(value)
+                },
+            }
+            loader = {
+                show: () => {
+                    this.components.$loader.show()
+                },
+                hide: () => {
+                    this.components.$loader.hide()
+                }
+            }
+            show() {
+                this.reset()
+                this.components.$modal.modal('show')
+            }
+            setup() {
+                this.components.$modal = $(`#${this.ids.modal}`)
+                this.components.form = document.getElementById(this.ids.form)
+                this.components.$date = $(`#${this.ids.date}`)
+                this.components.rut = document.getElementById(this.ids.rut)
+                this.components.digit = document.getElementById(this.ids.digit)
+                this.components.$birthdate = $(`#${this.ids.birthdate}`)
+                this.components.$comuna = $(`#${this.ids.comuna}`)
+                this.components.$region = $(`#${this.ids.region}`)
+                this.components.$broker = $(`#${this.ids.broker}`)
+                this.components.promotions = new AddModalPromotions()
+                this.components.units = new AddModalUnits()
+
+                this.components.$modal.modal({
+                    onApprove: () => {
+                        this.add()
+                    }
+                })
+                this.components.form.addEventListener('submit', event => {
+                    event.preventDefault()
+                    this.add()
+                    return false
+                })
+                const cdo = structuredClone(calendar_date_options)
+                cdo['startDate'] = new Date()
+                cdo['maxDate'] = new Date()
+                this.components.$date.calendar(cdo)
+                const rutInput = this.components.rut.querySelector('input')
+                rutInput.addEventListener('input', event => {
+                    const value = event.currentTarget.value.replace(/\D/g, '')
+                    if (value.length <= 3) {
+                        return
+                    }
+                    this.components.digit.textContent = Rut.digitoVerificador(value)
+                })
+                rutInput.addEventListener('blur', event => {
+                    const value = event.currentTarget.value.replace(/\D/g, '')
+                    if (value.length <= 3) {
+                        return
+                    }
+                    event.currentTarget.value = Rut.format(value)
+                    this.get.user(value).then(user => {
+                        this.fill.user(user)
+                    })
+                })
+                const cdo2 = structuredClone(cdo)
+                cdo2['startDate'].setFullYear(cdo2['startDate'].getFullYear() - 18)
+                cdo2['maxDate'].setFullYear(cdo2['maxDate'].getFullYear() - 18)
+                this.components.$birthdate.calendar(cdo2)
+                this.components.$region.dropdown({
+                    fireOnInit: true,
+                    onChange: this.watch.region
+                })
+                this.components.$region.dropdown('set selected', 13)
+                this.components.$comuna.dropdown()
+                this.components.$broker.dropdown()
+                this.components.$loader = $(`#${this.ids.loader}`)
+            }
+        }
+    </script>
+@endpush
diff --git a/app/setup/setups/services.php b/app/setup/setups/services.php
index 9cdecfc..5b396f1 100644
--- a/app/setup/setups/services.php
+++ b/app/setup/setups/services.php
@@ -116,7 +116,18 @@ return [
             ->registerSub($container->get(Incoviba\Service\Contabilidad\Cartola\BCI\Mes::class));
     },
     'TokuClient' => function(ContainerInterface $container) {
+        $logger = $container->get('externalLogger');
+        $stack = GuzzleHttp\HandlerStack::create();
+        $stack->push(GuzzleHttp\Middleware::mapRequest(function(Psr\Http\Message\RequestInterface $request) use ($logger) {
+            $logger->info('Toku Request', [
+                'method' => $request->getMethod(),
+                'uri' => (string) $request->getUri(),
+                'headers' => $request->getHeaders(),
+                'body' => $request->getBody()->getContents(),
+            ]);
+        }));
         return new GuzzleHttp\Client([
+            'handler' => $stack,
             'base_uri' => $container->get('TOKU_URL'),
             'headers' => [
                 'x-api-key' => $container->get('TOKU_TOKEN'),
diff --git a/app/src/Controller/API/Personas.php b/app/src/Controller/API/Personas.php
new file mode 100644
index 0000000..ab424a9
--- /dev/null
+++ b/app/src/Controller/API/Personas.php
@@ -0,0 +1,34 @@
+<?php
+namespace Incoviba\Controller\API;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Ideal;
+use Incoviba\Common\Implement;
+use Incoviba\Exception\ServiceAction;
+use Incoviba\Repository;
+use Incoviba\Service;
+
+class Personas extends Ideal\Controller
+{
+    use withJson;
+
+    public function get(ServerRequestInterface $request, ResponseInterface $response,
+                        Service\Persona $personaService, int $rut): ResponseInterface
+    {
+        $output = [
+            'rut' => $rut,
+            'persona' => null,
+            'success' => false
+        ];
+        try {
+            $persona = $personaService->getById($rut);
+            $output['persona'] = $persona;
+            $output['success'] = true;
+        } catch (ServiceAction\Read $exception) {
+            $this->logger->error($exception->getMessage(), ['exception' => $exception]);
+        }
+
+        return $this->withJson($response, $output);
+    }
+}
diff --git a/app/src/Controller/API/Proyectos.php b/app/src/Controller/API/Proyectos.php
index e6994ec..d30adb8 100644
--- a/app/src/Controller/API/Proyectos.php
+++ b/app/src/Controller/API/Proyectos.php
@@ -187,5 +187,18 @@ class Proyectos
         }
         return $this->withJson($response, $output);
     }
-
+    public function promotions(ServerRequestInterface  $request, ResponseInterface $response,
+                               Service\Venta\Promotion $promotionService, int $proyecto_id): ResponseInterface
+    {
+        $output = [
+            'project_id' => $proyecto_id,
+            'promotions' => []
+        ];
+        try {
+            $output['promotions'] = $promotionService->getByProject($proyecto_id);
+        } catch (Read $exception) {
+            return $this->withError($response, $exception);
+        }
+        return $this->withJson($response, $output);
+    }
 }
diff --git a/app/src/Controller/API/Ventas/Reservations.php b/app/src/Controller/API/Ventas/Reservations.php
index 01c65db..83fc3f7 100644
--- a/app/src/Controller/API/Ventas/Reservations.php
+++ b/app/src/Controller/API/Ventas/Reservations.php
@@ -11,7 +11,8 @@ class Reservations
 {
     use withJson;
 
-    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Reservation $reservationService): ResponseInterface
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response,
+                             Service\Venta\Reservation $reservationService): ResponseInterface
     {
         $reservations = [];
         try {
@@ -22,6 +23,18 @@ class Reservations
 
         return $this->withJson($response, compact('reservations'));
     }
+    public function getByProject(ServerRequestInterface $request, ResponseInterface $response,
+                                 Service\Venta\Reservation $reservationService, int $project_id): ResponseInterface
+    {
+        $reservations = [];
+        try {
+            $reservations = $reservationService->getByProject($project_id);
+        } catch (ServiceAction\Read $exception) {
+            return $this->withError($response, $exception);
+        }
+
+        return $this->withJson($response, compact('reservations'));
+    }
     public function get(ServerRequestInterface $request, ResponseInterface $response, Service\Venta\Reservation $reservationService, int $reservation_id): ResponseInterface
     {
         $output = [
@@ -100,4 +113,47 @@ class Reservations
 
         return $this->withJson($response, $output);
     }
+
+    public function active(ServerRequestInterface $request, ResponseInterface $response,
+                           Service\Venta\Reservation $reservationService, int $project_id): ResponseInterface
+    {
+        $output = [
+            'project_id' => $project_id,
+            'reservations' => [],
+            'success' => false,
+        ];
+        try {
+            $output['reservations'] = $reservationService->getActive($project_id);
+            $output['success'] = true;
+        } catch (ServiceAction\Read) {}
+        return $this->withJson($response, $output);
+    }
+    public function pending(ServerRequestInterface $request, ResponseInterface $response,
+                            Service\Venta\Reservation $reservationService, int $project_id): ResponseInterface
+    {
+        $output = [
+            'project_id' => $project_id,
+            'reservations' => [],
+            'success' => false,
+        ];
+        try {
+            $output['reservations'] = $reservationService->getPending($project_id);
+            $output['success'] = true;
+        } catch (ServiceAction\Read) {}
+        return $this->withJson($response, $output);
+    }
+    public function rejected(ServerRequestInterface $request, ResponseInterface $response,
+                             Service\Venta\Reservation $reservationService, int $project_id): ResponseInterface
+    {
+        $output = [
+            'project_id' => $project_id,
+            'reservations' => [],
+            'success' => false,
+        ];
+        try {
+            $output['reservations'] = $reservationService->getRejected($project_id);
+            $output['success'] = true;
+        } catch (ServiceAction\Read) {}
+        return $this->withJson($response, $output);
+    }
 }
diff --git a/app/src/Controller/Ventas/Reservations.php b/app/src/Controller/Ventas/Reservations.php
new file mode 100644
index 0000000..9ee1edc
--- /dev/null
+++ b/app/src/Controller/Ventas/Reservations.php
@@ -0,0 +1,28 @@
+<?php
+namespace Incoviba\Controller\Ventas;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Incoviba\Common\Alias\View;
+use Incoviba\Common\Implement\Exception\EmptyResult;
+use Incoviba\Exception\ServiceAction\Read;
+use Incoviba\Repository;
+use Incoviba\Service;
+
+class Reservations
+{
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response,
+                             Service\Proyecto $proyectoService, Repository\Region $regionRepository,
+                             View $view): ResponseInterface
+    {
+        $projects = [];
+        try {
+            $projects = $proyectoService->getVendibles('descripcion');
+        } catch (Read) {}
+        $regions = [];
+        try {
+            $regions = $regionRepository->fetchAll();
+        } catch (EmptyResult) {}
+        return $view->render($response, 'ventas.reservations', compact('projects', 'regions'));
+    }
+}
diff --git a/app/src/Exception/Model/InvalidState.php b/app/src/Exception/Model/InvalidState.php
new file mode 100644
index 0000000..3c82782
--- /dev/null
+++ b/app/src/Exception/Model/InvalidState.php
@@ -0,0 +1,13 @@
+<?php
+namespace Incoviba\Exception\Model;
+
+use Throwable;
+use Exception;
+
+class InvalidState extends Exception
+{
+    public function __construct(string $message = "Invalid state", int $code = 505, ?Throwable $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}
\ No newline at end of file
diff --git a/app/src/Model/Persona.php b/app/src/Model/Persona.php
index 35be13d..3d3a465 100644
--- a/app/src/Model/Persona.php
+++ b/app/src/Model/Persona.php
@@ -1,6 +1,7 @@
 <?php
 namespace Incoviba\Model;
 
+use Incoviba\Common\Implement\Exception\EmptyResult;
 use InvalidArgumentException;
 use Incoviba\Common\Ideal;
 use Incoviba\Model\Persona\Datos;
@@ -27,7 +28,11 @@ class Persona extends Ideal\Model
     public function datos(): ?Datos
     {
         if (!isset($this->datos)) {
-            $this->datos = $this->runFactory('datos');
+            try {
+                $this->datos = $this->runFactory('datos');
+            } catch (EmptyResult) {
+                $this->datos = null;
+            }
         }
         return $this->datos;
     }
diff --git a/app/src/Model/Proyecto/Broker.php b/app/src/Model/Proyecto/Broker.php
index e55df74..342e668 100644
--- a/app/src/Model/Proyecto/Broker.php
+++ b/app/src/Model/Proyecto/Broker.php
@@ -1,7 +1,10 @@
 <?php
 namespace Incoviba\Model\Proyecto;
 
+use DateTimeImmutable;
+use DateTimeInterface;
 use Incoviba\Common;
+use Incoviba\Model\Proyecto;
 
 class Broker extends Common\Ideal\Model
 {
@@ -26,6 +29,36 @@ class Broker extends Common\Ideal\Model
         }
         return $this->contracts;
     }
+    public function getContract(Proyecto $proyecto, ?DateTimeInterface $date = null): ?Proyecto\Broker\Contract
+    {
+        if ($date === null) {
+            $date = new DateTimeImmutable();
+        }
+        $contracts = $this->contracts();
+        $valid = array_filter($contracts, fn(Proyecto\Broker\Contract $contract) => $contract->project->id === $proyecto->id);
+        $valid = array_filter($valid, fn(Proyecto\Broker\Contract $contract) => $contract->wasActive($date));
+        if (count($valid) === 0) {
+            return null;
+        }
+        return last($valid);
+    }
+
+    public function applyCommission(Proyecto $proyecto, float $price, ?DateTimeInterface $date = null): float
+    {
+        $contract = $this->getContract($proyecto, $date);
+        if ($contract === null) {
+            return $price;
+        }
+        return $contract->activate()->apply($proyecto, $price);
+    }
+    public function reverseCommission(Proyecto $proyecto, float $price, ?DateTimeInterface $date = null): float
+    {
+        $contract = $this->getContract($proyecto, $date);
+        if ($contract === null) {
+            return $price;
+        }
+        return $contract->activate()->reverse($proyecto, $price);
+    }
 
     public function rutFull(): string
     {
diff --git a/app/src/Model/Proyecto/Broker/Contract.php b/app/src/Model/Proyecto/Broker/Contract.php
index 89f6014..feb5625 100644
--- a/app/src/Model/Proyecto/Broker/Contract.php
+++ b/app/src/Model/Proyecto/Broker/Contract.php
@@ -1,6 +1,7 @@
 <?php
 namespace Incoviba\Model\Proyecto\Broker;
 
+use DateTimeInterface;
 use Incoviba\Common;
 use Incoviba\Model;
 
@@ -41,6 +42,51 @@ class Contract extends Common\Ideal\Model
         return $this->promotions;
     }
 
+    public function isActive(): bool
+    {
+        $state = $this->current();
+        return $state !== null and $state->isActive();
+    }
+    public function activate(): self
+    {
+        $this->current()->activate();
+        return $this;
+    }
+    public function wasActive(DateTimeInterface $date): bool
+    {
+        $states = $this->states();
+        return array_any($states, fn($state) => $state->date <= $date);
+    }
+
+    public function value(float $price): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        return $price * (1 + $this->commission);
+    }
+    public function inverse(float $price): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        return $price / (1 + $this->commission);
+    }
+    public function apply(Model\Proyecto $project, float $price): float
+    {
+        if (!$this->isActive() or $this->project->id !== $project->id) {
+            return $price;
+        }
+        return $this->value($price);
+    }
+    public function reverse(Model\Proyecto $project, float $price): float
+    {
+        if (!$this->isActive() or $this->project->id !== $project->id) {
+            return $price;
+        }
+        return $this->inverse($price);
+    }
+
     protected function jsonComplement(): array
     {
         return [
diff --git a/app/src/Model/Proyecto/Broker/Contract/State.php b/app/src/Model/Proyecto/Broker/Contract/State.php
index c773d6d..c3a982c 100644
--- a/app/src/Model/Proyecto/Broker/Contract/State.php
+++ b/app/src/Model/Proyecto/Broker/Contract/State.php
@@ -11,6 +11,16 @@ class State extends Common\Ideal\Model
     public DateTimeInterface $date;
     public State\Type $type;
 
+    public function isActive(): bool
+    {
+        return $this->type === State\Type::ACTIVE;
+    }
+    public function activate(): self
+    {
+        $this->type = State\Type::ACTIVE;
+        return $this;
+    }
+
     protected function jsonComplement(): array
     {
         return [
diff --git a/app/src/Model/Venta/Promotion.php b/app/src/Model/Venta/Promotion.php
index 8a1cb25..49b9676 100644
--- a/app/src/Model/Venta/Promotion.php
+++ b/app/src/Model/Venta/Promotion.php
@@ -3,6 +3,7 @@ namespace Incoviba\Model\Venta;
 
 use DateTimeInterface;
 use Incoviba\Common;
+use Incoviba\Model\Proyecto;
 use Incoviba\Model\Proyecto\Broker;
 use Incoviba\Model\Venta\Promotion\State;
 use Incoviba\Model\Venta\Promotion\Type;
@@ -61,13 +62,95 @@ class Promotion extends Common\Ideal\Model
         return $this->units;
     }
 
+    public function isActive(): bool
+    {
+        return $this->state === State::ACTIVE;
+    }
+    public function activate(): self
+    {
+        $this->state = State::ACTIVE;
+        return $this;
+    }
+
     public function value(float $price): float
     {
+        if (!$this->isActive()) {
+            return $price;
+        }
         if ($this->type === Type::FIXED) {
             return $price + $this->amount;
         }
         return $price / (1 - $this->amount);
     }
+    public function inverse(float $price): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        if ($this->type === Type::FIXED) {
+            return $price - $this->amount;
+        }
+        return $price * (1 - $this->amount);
+    }
+
+    public function apply(Unidad $unit, float $price, ?Broker $broker = null): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        $projectIds = array_map(fn(Proyecto $proyecto) => $proyecto->id, $this->projects());
+        if (in_array($unit->proyectoTipoUnidad->proyecto->id, $projectIds)) {
+            return $this->value($price);
+        }
+        if ($broker !== null) {
+            $brokerIds = array_map(fn(Broker $broker) => $broker->id, $this->brokers());
+            if (in_array($broker->id, $brokerIds)) {
+                return $this->value($price);
+            }
+        }
+        $typeIds = array_map(fn(Proyecto\TipoUnidad $type) => $type->id, $this->unitTypes());
+        if (in_array($unit->proyectoTipoUnidad->tipoUnidad->id, $typeIds)) {
+            return $this->value($price);
+        }
+        $lineIds = array_map(fn(Proyecto\ProyectoTipoUnidad $line) => $line->id, $this->unitLines());
+        if (in_array($unit->proyectoTipoUnidad->id, $lineIds)) {
+            return $this->value($price);
+        }
+        $unitIds = array_map(fn(Unidad $unit) => $unit->id, $this->units());
+        if (in_array($unit->id, $unitIds)) {
+            return $this->value($price);
+        }
+        return $price;
+    }
+    public function reverse(Unidad $unit, float $price, ?Broker $broker = null): float
+    {
+        if (!$this->isActive()) {
+            return $price;
+        }
+        $projectIds = array_map(fn(Proyecto $proyecto) => $proyecto->id, $this->projects());
+        if (in_array($unit->proyectoTipoUnidad->proyecto->id, $projectIds)) {
+            return $this->inverse($price);
+        }
+        if ($broker !== null) {
+            $brokerIds = array_map(fn(Broker $broker) => $broker->id, $this->brokers());
+            if (in_array($broker->id, $brokerIds)) {
+                return $this->inverse($price);
+            }
+        }
+        $typeIds = array_map(fn(Proyecto\TipoUnidad $type) => $type->id, $this->unitTypes());
+        if (in_array($unit->proyectoTipoUnidad->tipoUnidad->id, $typeIds)) {
+            return $this->inverse($price);
+        }
+        $lineIds = array_map(fn(Proyecto\ProyectoTipoUnidad $line) => $line->id, $this->unitLines());
+        if (in_array($unit->proyectoTipoUnidad->id, $lineIds)) {
+            return $this->inverse($price);
+        }
+        $unitIds = array_map(fn(Unidad $unit) => $unit->id, $this->units());
+        if (in_array($unit->id, $unitIds)) {
+            return $this->inverse($price);
+        }
+        return $price;
+    }
 
     protected function jsonComplement(): array
     {
diff --git a/app/src/Model/Venta/Reservation.php b/app/src/Model/Venta/Reservation.php
index 3a94ebf..bce17b4 100644
--- a/app/src/Model/Venta/Reservation.php
+++ b/app/src/Model/Venta/Reservation.php
@@ -7,11 +7,44 @@ use Incoviba\Model;
 
 class Reservation extends Common\Ideal\Model
 {
+    public Model\Proyecto $project;
     public Model\Persona $buyer;
     public DateTimeInterface $date;
     public array $units = [];
     public array $promotions = [];
     public ?Model\Proyecto\Broker $broker = null;
+
+    public function offer(): float
+    {
+        return array_sum(array_column($this->units, 'value'));
+    }
+    public function withCommission(): float
+    {
+        $base = 0;
+        foreach ($this->units as $unit) {
+            foreach ($this->promotions as $promotion) {
+                $base += $promotion->activate()->reverse($unit['unit'], $unit['value'], $this->broker);
+            }
+        }
+        return $base;
+    }
+    public function base(): float
+    {
+        $base = $this->withCommission();
+        if ($this->broker !== null) {
+            $base = $this->broker->reverseCommission($this->project, $base, $this->date);
+        }
+        return $base;
+    }
+    public function price(): float
+    {
+        $price = 0;
+        foreach ($this->units as $unit) {
+            $price += $unit->unit->precio($this->date);
+        }
+        return $price;
+    }
+
     protected array $states = [];
 
     public function states(): array
@@ -38,13 +71,12 @@ class Reservation extends Common\Ideal\Model
             $this->units[$i]['value'] = $value;
             return $this;
         }
-        $this->units[] = [
+        $this->units[] = (object) [
             'unit' => $unit,
             'value' => $value,
         ];
         return $this;
     }
-
     public function removeUnit(int $unit_id): self
     {
         if (($i = $this->findUnit($unit_id)) === null) {
@@ -54,7 +86,6 @@ class Reservation extends Common\Ideal\Model
         $this->units = array_values($this->units);
         return $this;
     }
-
     public function findUnit(int $unit_id): ?int
     {
         foreach ($this->units as $idx => $unit) {
@@ -64,20 +95,43 @@ class Reservation extends Common\Ideal\Model
         }
         return null;
     }
-
     public function hasUnit(int $unit_id): bool
     {
         return $this->findUnit($unit_id) !== null;
     }
 
+    public function summary(): string
+    {
+        $unitSummary = array_map(function($unit) {
+            $type = $unit->unit->proyectoTipoUnidad->tipoUnidad->descripcion;
+            $cap = strtoupper(strstr($type, 0, 1));
+            return "{$cap}{$unit->unit->descripcion}";
+        }, $this->units);
+        return implode('', $unitSummary);
+    }
+
+    public function valid(): bool
+    {
+        $base = $this->base();
+        $price = $this->price();
+        return $base >= $price;
+    }
+
     protected function jsonComplement(): array
     {
         return [
-            'buyer_rut' => $this->buyer->rut,
+            'project_id' => $this->project->id,
+            'buyer' => $this->buyer,
             'date' => $this->date->format('Y-m-d'),
             'units' => $this->units,
             'promotions' => $this->promotions,
-            'broker_rut' => $this->broker?->rut,
+            'broker' => $this->broker,
+            'offer' => $this->offer(),
+            'with_commission' => $this->withCommission(),
+            'base' => $this->base(),
+            'price' => $this->price(),
+            'valid' => $this->valid(),
+            'summary' => $this->summary()
         ];
     }
 }
diff --git a/app/src/Model/Venta/Reservation/Detail/Type.php b/app/src/Model/Venta/Reservation/Detail/Type.php
new file mode 100644
index 0000000..4129449
--- /dev/null
+++ b/app/src/Model/Venta/Reservation/Detail/Type.php
@@ -0,0 +1,17 @@
+<?php
+namespace Incoviba\Model\Venta\Reservation\Detail;
+
+enum Type: int
+{
+    case Unit = 1;
+    case Promotion = 2;
+    case Broker = 3;
+
+    public function jsonSerialize(): array
+    {
+        return [
+            'id' => $this->value,
+            'description' => $this->name
+        ];
+    }
+}
diff --git a/app/src/Model/Venta/Reservation/State.php b/app/src/Model/Venta/Reservation/State.php
index a24771b..64eeed5 100644
--- a/app/src/Model/Venta/Reservation/State.php
+++ b/app/src/Model/Venta/Reservation/State.php
@@ -9,17 +9,14 @@ class State extends Common\Ideal\Model
 {
     public Model\Venta\Reservation $reservation;
     public DateTimeInterface $date;
-    public int $type;
+    public Model\Venta\Reservation\State\Type $type;
 
     protected function jsonComplement(): array
     {
         return [
             'reservation_id' => $this->reservation->id,
             'date' => $this->date->format('Y-m-d'),
-            'type' => [
-                'id' => $this->type,
-                'description' => State\Type::name($this->type)
-            ]
+            'type' => $this->type
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/Model/Venta/Reservation/State/Type.php b/app/src/Model/Venta/Reservation/State/Type.php
index 464ec24..35366ad 100644
--- a/app/src/Model/Venta/Reservation/State/Type.php
+++ b/app/src/Model/Venta/Reservation/State/Type.php
@@ -7,13 +7,15 @@ enum Type: int
     case INACTIVE = 0;
     case REJECTED = -1;
 
-    public static function name(int $type): string
+    public function jsonSerialize(): array
     {
-        return match ($type) {
-            self::ACTIVE => 'active',
-            self::INACTIVE => 'inactive',
-            self::REJECTED => 'rejected',
-            default => throw new \InvalidArgumentException('Unexpected match value')
-        };
+        return [
+            'id' => $this->value,
+            'description' => $this->name
+        ];
     }
-}
\ No newline at end of file
+    public static function getTypes(): array
+    {
+        return [self::ACTIVE->value, self::INACTIVE->value, self::REJECTED->value];
+    }
+}
diff --git a/app/src/Repository/Persona/Datos.php b/app/src/Repository/Persona/Datos.php
index bfec12b..3d71052 100644
--- a/app/src/Repository/Persona/Datos.php
+++ b/app/src/Repository/Persona/Datos.php
@@ -29,6 +29,9 @@ class Datos extends Ideal\Repository
             ->register('direccion_id', (new Implement\Repository\Mapper())
                 ->setProperty('direccion')
                 ->setFunction(function($data) {
+                    if ($data['direccion_id'] === null) {
+                        return null;
+                    }
                     return $this->direccionRepository->fetchById($data['direccion_id']);
                 })->setDefault(null))
             ->register('telefono', (new Implement\Repository\Mapper())->setFunction(function($data) {
diff --git a/app/src/Repository/Venta/Reservation.php b/app/src/Repository/Venta/Reservation.php
index 8ff13c7..c967189 100644
--- a/app/src/Repository/Venta/Reservation.php
+++ b/app/src/Repository/Venta/Reservation.php
@@ -3,14 +3,19 @@ namespace Incoviba\Repository\Venta;
 
 use DateTimeInterface;
 use DateInterval;
+use Incoviba\Common\Define;
+use Incoviba\Exception\Model\InvalidState;
 use PDO;
 use Incoviba\Common;
 use Incoviba\Model;
 use Incoviba\Repository;
+use PDOException;
 
 class Reservation extends Common\Ideal\Repository
 {
-    public function __construct(Common\Define\Connection $connection, protected Repository\Persona $personaRepository,
+    public function __construct(Common\Define\Connection $connection,
+                                protected Repository\Proyecto $proyectoRepository,
+                                protected Repository\Persona $personaRepository,
                                 protected Repository\Proyecto\Broker $brokerRepository,
                                 protected Unidad $unitRepository, protected Promotion $promotionRepository)
     {
@@ -25,37 +30,33 @@ class Reservation extends Common\Ideal\Repository
     public function create(?array $data = null): Model\Venta\Reservation
     {
         $map = (new Common\Implement\Repository\MapperParser())
+            ->register('project_id', (new Common\Implement\Repository\Mapper())
+                ->setProperty('project')
+                ->setFunction(function($data) {
+                    return $this->proyectoRepository->fetchById($data['project_id']);
+                }))
             ->register('buyer_rut', (new Common\Implement\Repository\Mapper())
                 ->setProperty('buyer')
-                ->setFunction(function($data) use ($data) {
+                ->setFunction(function($data) {
                     return $this->personaRepository->fetchById($data['buyer_rut']);
                 }))
-            ->register('date', new Common\Implement\Repository\Mapper\DateTime('date'))
-            ->register('broker_rut', (new Common\Implement\Repository\Mapper())
-                ->setProperty('broker')
-                ->setDefault(null)
-                ->setFunction(function($data) use ($data) {
-                    try {
-                        return $this->brokerRepository->fetchById($data['broker_rut']);
-                    } catch (Common\Implement\Exception\EmptyResult) {
-                        return null;
-                    }
-                }));
+            ->register('date', new Common\Implement\Repository\Mapper\DateTime('date'));
         return $this->parseData(new Model\Venta\Reservation(), $data, $map);
     }
     public function save(Common\Define\Model $model): Model\Venta\Reservation
     {
         $model->id = $this->saveNew([
+            'project_id',
             'buyer_rut',
-            'date',
-            'broker_rut'
+            'date'
         ], [
+            $model->project->id,
             $model->buyer->rut,
-            $model->date->format('Y-m-d'),
-            $model->broker?->rut
+            $model->date->format('Y-m-d')
         ]);
         $this->saveUnits($model);
         $this->savePromotions($model);
+        $this->saveBroker($model);
         return $model;
     }
 
@@ -67,15 +68,20 @@ class Reservation extends Common\Ideal\Repository
      */
     public function edit(Common\Define\Model $model, array $new_data): Model\Venta\Reservation
     {
-        return $this->update($model, ['buyer_rut', 'date', 'broker_rut'], $new_data);
+        $model = $this->update($model, ['project_id', 'buyer_rut', 'date'], $new_data);
+        $this->editUnits($model, $new_data);
+        $this->editPromotions($model, $new_data);
+        $this->editBroker($model, $new_data);
+        return $model;
     }
 
     public function load(array $data_row): Model\Venta\Reservation
     {
         $model = parent::load($data_row);
 
-        $this->fetchUnits($model);
-        $this->fetchPromotions($model);
+        $this->fetchUnits($model, $data_row);
+        $this->fetchBroker($model, $data_row);
+        $this->fetchPromotions($model, $data_row);
         return $model;
     }
 
@@ -93,6 +99,86 @@ class Reservation extends Common\Ideal\Repository
             ->where('buyer_rut = :buyer_rut AND date >= :date');
         return $this->fetchOne($query, ['buyer_rut' => $buyer_rut, 'date' => $date->sub(new DateInterval('P10D'))->format('Y-m-d')]);
     }
+    public function fetchByProject(int $project_id): array
+    {
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from('reservations')
+            ->where('project_id = :project_id');
+        return $this->fetchMany($query, ['project_id' => $project_id]);
+    }
+
+    /**
+     * @param int $project_id
+     * @param int $state
+     * @return array
+     * @throws Common\Implement\Exception\EmptyResult
+     * @throws InvalidState
+     */
+    public function fetchState(int $project_id, int $state): array
+    {
+        if (!in_array($state, Model\Venta\Reservation\State\Type::getTypes())) {
+            throw new InvalidState();
+        }
+        $sub1 = $this->connection->getQueryBuilder()
+            ->select('MAX(id) AS id, reservation_id')
+            ->from('reservation_states')
+            ->group('reservation_id');
+        $sub2 = $this->connection->getQueryBuilder()
+            ->select('er1.*')
+            ->from('reservation_states er1')
+            ->joined("INNER JOIN ({$sub1}) er0 ON er0.id = er1.id");
+
+        $query = $this->connection->getQueryBuilder()
+            ->select()
+            ->from('reservations')
+            ->joined("INNER JOIN ({$sub2}) er ON er.reservation_id = reservations.id")
+            ->where('project_id = :project_id AND er.type = :state');
+
+        return $this->fetchMany($query, ['project_id' => $project_id,
+            'state' => $state]);
+    }
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws Common\Implement\Exception\EmptyResult
+     */
+    public function fetchActive(int $project_id): array
+    {
+        try {
+            return $this->fetchState($project_id, Model\Venta\Reservation\State\Type::ACTIVE->value);
+        } catch (InvalidState $exception) {
+            throw new Common\Implement\Exception\EmptyResult('Select active reservations', $exception);
+        }
+    }
+
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws Common\Implement\Exception\EmptyResult
+     */
+    public function fetchPending(int $project_id): array
+    {
+        try {
+            return $this->fetchState($project_id, Model\Venta\Reservation\State\Type::INACTIVE->value);
+        } catch (InvalidState $exception) {
+            throw new Common\Implement\Exception\EmptyResult('Select pending reservations', $exception);
+        }
+    }
+
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws Common\Implement\Exception\EmptyResult
+     */
+    public function fetchRejected(int $project_id): array
+    {
+        try {
+            return $this->fetchState($project_id, Model\Venta\Reservation\State\Type::REJECTED->value);
+        } catch (InvalidState $exception) {
+            throw new Common\Implement\Exception\EmptyResult('Select rejected reservations', $exception);
+        }
+    }
 
     protected function saveUnits(Model\Venta\Reservation $reservation): void
     {
@@ -101,22 +187,71 @@ class Reservation extends Common\Ideal\Repository
         }
         $queryCheck = $this->connection->getQueryBuilder()
             ->select('COUNT(id) AS cnt')
-            ->from('reservation_data')
-            ->where('reservation_id = :id AND type = "Unit" AND reference_id = :unit_id');
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type AND reference_id = :unit_id');
         $statementCheck = $this->connection->prepare($queryCheck);
         $queryInsert = $this->connection->getQueryBuilder()
             ->insert()
-            ->into('reservation_data')
+            ->into('reservation_details')
             ->columns(['reservation_id', 'type', 'reference_id', 'value'])
             ->values([':reservation_id', ':type', ':reference_id', ':value']);
         $statementInsert = $this->connection->prepare($queryInsert);
         foreach ($reservation->units as $unit) {
-            $statementCheck->execute(['id' => $reservation->id, 'unit_id' => $unit['unit']->id]);
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'unit_id' => $unit->unit->id
+            ]);
             $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
             if ($result['cnt'] > 0) {
                 continue;
             }
-            $statementInsert->execute(['reservation_id' => $reservation->id, 'type' => 'Unit', 'reference_id' => $unit['unit']->id, 'value' => $unit['value']]);
+            $statementInsert->execute([
+                'reservation_id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'reference_id' => $unit->unit->id,
+                'value' => $unit->value
+            ]);
+        }
+
+        $this->cleanUpUnits($reservation);
+    }
+    protected function cleanUpUnits(Model\Venta\Reservation $reservation): void
+    {
+        $this->cleanUpDetails($reservation,
+            Model\Venta\Reservation\Detail\Type::Unit->value,
+            array_map(fn($unit) => $unit->unit->id, $reservation->units));
+    }
+    protected function saveBroker(Model\Venta\Reservation &$reservation): void
+    {
+        if ($reservation->broker === null) {
+            $this->removeBroker($reservation);
+            return;
+        }
+        try {
+            $queryCheck = $this->connection->getQueryBuilder()
+                ->select('id')
+                ->from('reservation_details')
+                ->where('reservation_id = :id AND type = :type');
+            $statementCheck = $this->connection->execute($queryCheck, [
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Broker->value
+            ]);
+            $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
+            $new_id = $reservation->broker->id;
+            $reservation->broker = $this->brokerRepository->fetchById($result['id']);
+            $this->editBroker($reservation, ['broker_id' => $new_id]);
+        } catch (PDOException) {
+            $queryInsert = $this->connection->getQueryBuilder()
+                ->insert()
+                ->into('reservation_details')
+                ->columns(['reservation_id', 'type', 'reference_id'])
+                ->values([':reservation_id', ':type', ':reference_id']);
+            $this->connection->execute($queryInsert, [
+                'reservation_id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Broker->value,
+                'reference_id' => $reservation->broker->id
+            ]);
         }
     }
     protected function savePromotions(Model\Venta\Reservation $reservation): void
@@ -126,60 +261,152 @@ class Reservation extends Common\Ideal\Repository
         }
         $queryCheck = $this->connection->getQueryBuilder()
             ->select('COUNT(id) AS cnt')
-            ->from('reservation_data')
-            ->where('reservation_id = :id AND type = "Promotion" AND reference_id = :promotion_id');
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type AND reference_id = :promotion_id');
         $statementCheck = $this->connection->prepare($queryCheck);
         $queryInsert = $this->connection->getQueryBuilder()
             ->insert()
-            ->into('reservation_data')
+            ->into('reservation_details')
             ->columns(['reservation_id', 'type', 'reference_id'])
             ->values([':reservation_id', ':type', ':reference_id']);
         $statementInsert = $this->connection->prepare($queryInsert);
         foreach ($reservation->promotions as $promotion) {
-            $statementCheck->execute(['id' => $reservation->id, 'promotion_id' => $promotion->id]);
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Promotion->value,
+                'promotion_id' => $promotion->id
+            ]);
             $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
             if ($result['cnt'] > 0) {
                 continue;
             }
-            $statementInsert->execute(['reservation_id' => $reservation->id, 'type' => 'Promotion', 'reference_id' => $promotion->id]);
+            $statementInsert->execute([
+                'reservation_id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Promotion->value,
+                'reference_id' => $promotion->id
+            ]);
         }
+
+        $this->cleanUpPromotions($reservation);
     }
-    protected function editUnits(Model\Venta\Reservation $reservation, array $new_data): void
+    protected function cleanUpPromotions(Model\Venta\Reservation $reservation): void
+    {
+        $this->cleanUpDetails($reservation,
+            Model\Venta\Reservation\Detail\Type::Promotion->value,
+            array_map(fn($promotion) => $promotion->id, $reservation->promotions));
+    }
+    protected function cleanUpDetails(Model\Venta\Reservation $reservation, int $type_id, array $currentIds): void
+    {
+        $queryCheck = $this->connection->getQueryBuilder()
+            ->select('COUNT(id) AS cnt')
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type');
+        $statementCheck = $this->connection->prepare($queryCheck);
+        $deleteParam = implode(', ', array_map(fn($id) => ":id$id", $currentIds));
+        $queryDelete = $this->connection->getQueryBuilder()
+            ->delete()
+            ->from('reservation_details')
+            ->where("reservation_id = :id AND type = :type AND reference_id NOT IN ({$deleteParam})");
+        $statementDelete = $this->connection->prepare($queryDelete);
+
+        try {
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'type' => $type_id
+            ]);
+            $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
+            if ($result['cnt'] <= count($currentIds)) {
+                return;
+            }
+            $deleteIdValues = array_combine(array_map(fn($id) => "id$id", $currentIds), $currentIds);
+            $statementDelete->execute(array_merge(
+                ['id' => $reservation->id, 'type' => $type_id],
+                $deleteIdValues));
+        } catch (PDOException) {}
+    }
+
+    protected function editUnits(Model\Venta\Reservation &$reservation, array $new_data): void
     {
         $querySelect = $this->connection->getQueryBuilder()
             ->select()
-            ->from('reservation_data')
-            ->where('reservation_id = :id AND type = "Unit" AND reference_id = :unit_id');
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type AND reference_id = :unit_id');
         $statementSelect = $this->connection->prepare($querySelect);
         $queryUpdate = $this->connection->getQueryBuilder()
-            ->update('reservation_data')
+            ->update('reservation_details')
             ->set('value = :value')
-            ->where('reservation_id = :id AND type = "Unit" AND reference_id = :unit_id');
+            ->where('reservation_id = :id AND type = :type AND reference_id = :unit_id');
         $statementUpdate = $this->connection->prepare($queryUpdate);
-        foreach ($new_data as $unit_id => $value) {
-            $idx = $reservation->findUnit($unit_id);
+        $queryInsert = $this->connection->getQueryBuilder()
+            ->insert()
+            ->into('reservation_details')
+            ->columns(['reservation_id', 'type', 'reference_id', 'value'])
+            ->values([':reservation_id', ':type', ':reference_id', ':value']);
+        $statementInsert = $this->connection->prepare($queryInsert);
+        foreach ($new_data['units'] as $unit) {
+            $idx = $reservation->findUnit($unit['unit_id']);
             if ($idx === null) {
-                $reservation->addUnit($this->unitRepository->fetchById($unit_id), $value);
+                $reservation->addUnit($this->unitRepository->fetchById($unit['unit_id']), $unit['value']);
+                $statementInsert->execute([
+                    'reservation_id' => $reservation->id,
+                    'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                    'reference_id' => $unit['unit_id'],
+                    'value' => $unit['value']
+                ]);
                 continue;
             }
-            $statementSelect->execute(['id' => $reservation->id, 'unit_id' => $unit_id]);
+            $statementSelect->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'unit_id' => $unit['unit_id']
+            ]);
             $result = $statementSelect->fetch(PDO::FETCH_ASSOC);
             if (!$result) {
+                $reservation->addUnit($this->unitRepository->fetchById($unit['unit_id']), $unit['value']);
+                $statementInsert->execute([
+                    'reservation_id' => $reservation->id,
+                    'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                    'reference_id' => $unit['unit_id'],
+                    'value' => $unit['value']
+                ]);
                 continue;
             }
-            $statementUpdate->execute(['id' => $reservation->id, 'unit_id' => $unit_id, 'value' => $value]);
-            $reservation->units[$idx]['value'] = $value;
+            $statementUpdate->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'unit_id' => $unit['unit_id'],
+                'value' => $unit['value']
+            ]);
+            $reservation->units[$idx]['value'] = $unit['value'];
         }
     }
-    protected function editPromotions(Model\Venta\Reservation $reservation, array $new_data): void
+    protected function editBroker(Model\Venta\Reservation &$reservation, array $new_data): void
+    {
+        if (!array_key_exists('broker_id', $new_data) or $new_data['broker_id'] === $reservation->broker->id) {
+            return;
+        }
+        try {
+            $query = $this->connection->getQueryBuilder()
+                ->update('reservation_details')
+                ->set('reference_id = :broker_id')
+                ->where('reservation_id = :id AND type = :type');
+            $this->connection->execute($query, [
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Broker->value,
+                'broker_id' => $new_data['broker_id']
+            ]);
+            $reservation->broker = $this->brokerRepository->fetchById($new_data['broker_id']);
+        } catch (PDOException) {}
+    }
+    protected function editPromotions(Model\Venta\Reservation &$reservation, array $new_data): void
     {
         $querySelect = $this->connection->getQueryBuilder()
             ->select()
-            ->from('reservation_data')
+            ->from('reservation_details')
             ->where('reservation_id = :id AND type = "Promotion" AND reference_id = :promotion_id');
         $statementSelect = $this->connection->prepare($querySelect);
         $queryUpdate = $this->connection->getQueryBuilder()
-            ->update('reservation_data')
+            ->update('reservation_details')
             ->set('value = :value')
             ->where('reservation_id = :id AND type = "Promotion" AND reference_id = :promotion_id');
         $statementUpdate = $this->connection->prepare($queryUpdate);
@@ -198,13 +425,26 @@ class Reservation extends Common\Ideal\Repository
             $reservation->promotions[$idx] = $this->promotionRepository->fetchById($promotion_id);
         }
     }
-    protected function fetchUnits(Model\Venta\Reservation &$reservation): Model\Venta\Reservation
+
+    protected function fetchUnits(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        $this->fetchSavedUnits($reservation);
+
+        if (array_key_exists('units', $new_data) and count($new_data['units']) > 0) {
+            $this->fetchUnsavedUnits($reservation, $new_data);
+        }
+        return $reservation;
+    }
+    protected function fetchSavedUnits(Model\Venta\Reservation &$reservation): Model\Venta\Reservation
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
-            ->from('reservation_data')
-            ->where('reservation_id = :id AND type = "Unit"');
-        $statement = $this->connection->execute($query, ['id' => $reservation->id]);
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = ?');
+        $statement = $this->connection->execute($query, [
+            'id' => $reservation->id,
+            Model\Venta\Reservation\Detail\Type::Unit->value
+        ]);
 
         while ($result = $statement->fetch(PDO::FETCH_ASSOC)) {
             try {
@@ -213,13 +453,69 @@ class Reservation extends Common\Ideal\Repository
         }
         return $reservation;
     }
-    protected function fetchPromotions(Model\Venta\Reservation $reservation): Model\Venta\Reservation
+    protected function fetchUnsavedUnits(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        if (!array_key_exists('units', $new_data) or count($new_data['units']) > 0) {
+            return $reservation;
+        }
+        $queryCheck = $this->connection->getQueryBuilder()
+            ->select('COUNT(id) AS cnt')
+            ->from('reservation_details')
+            ->where('reservation_id = :id AND type = :type AND reference_id = :unit_id');
+        $statementCheck = $this->connection->prepare($queryCheck);
+        foreach ($new_data['units'] as $unit) {
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Unit->value,
+                'unit_id' => $unit['unit_id']
+            ]);
+            $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
+            if ($result['cnt'] > 0) {
+                continue;
+            }
+            try {
+                $reservation->addUnit($this->unitRepository->fetchById($unit['unit_id']), $unit['value']);
+            } catch (Common\Implement\Exception\EmptyResult) {}
+        }
+        return $reservation;
+    }
+    protected function fetchBroker(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        if (!array_key_exists('broker_id', $new_data)) {
+            $query = $this->connection->getQueryBuilder()
+                ->select('reference_id')
+                ->from('reservation_details')
+                ->where('reservation_id = :id AND type = :type');
+            try {
+                $statement =$this->connection->execute($query, [
+                    'id' => $reservation->id,
+                    'type' => Model\Venta\Reservation\Detail\Type::Broker->value
+                ]);
+                $result = $statement->fetch(PDO::FETCH_ASSOC);
+                $reservation->broker = $this->brokerRepository->fetchById($result['reference_id']);
+            } catch (PDOException) {}
+
+            return $reservation;
+        }
+        try {
+            $reservation->broker = $this->brokerRepository->fetchById($new_data['broker_id']);
+        } catch (Common\Implement\Exception\EmptyResult) {}
+        return $reservation;
+    }
+    protected function fetchPromotions(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        $this->fetchSavedPromotions($reservation);
+        $this->fetchUnsavedPromotions($reservation, $new_data);
+        return $reservation;
+    }
+    protected function fetchSavedPromotions(Model\Venta\Reservation &$reservation): Model\Venta\Reservation
     {
         $query = $this->connection->getQueryBuilder()
             ->select()
-            ->from('reservation_data')
-            ->where('type = "Promotion" AND reservation_id = :id');
-        $statement = $this->connection->execute($query, ['id' => $reservation->id]);
+            ->from('reservation_details')
+            ->where('type = :type AND reservation_id = :id');
+        $statement = $this->connection->execute($query,
+            ['id' => $reservation->id, 'type' => Model\Venta\Reservation\Detail\Type::Promotion->value]);
         while ($result = $statement->fetch(PDO::FETCH_ASSOC)) {
             try {
                 $reservation->promotions []= $this->promotionRepository->fetchById($result['reference_id']);
@@ -227,4 +523,43 @@ class Reservation extends Common\Ideal\Repository
         }
         return $reservation;
     }
+    protected function fetchUnsavedPromotions(Model\Venta\Reservation &$reservation, array $new_data): Model\Venta\Reservation
+    {
+        if (!array_key_exists('promotions', $new_data) or count($new_data['promotions']) > 0) {
+            return $reservation;
+        }
+        $queryCheck = $this->connection->getQueryBuilder()
+            ->select('COUNT(id) AS cnt')
+            ->from('reservation_details')
+            ->where('type = :type AND reservation_id = :id AND reference_id = :promotion_id');
+        $statementCheck = $this->connection->prepare($queryCheck);
+        foreach ($new_data['promotions'] as $promotion) {
+            $statementCheck->execute([
+                'id' => $reservation->id,
+                'promotion_id' => $promotion
+            ]);
+            $result = $statementCheck->fetch(PDO::FETCH_ASSOC);
+            if ($result['cnt'] > 0) {
+                continue;
+            }
+            try {
+                $reservation->promotions []= $this->promotionRepository->fetchById($promotion);
+            } catch (Common\Implement\Exception\EmptyResult) {}
+        }
+        return $reservation;
+    }
+    protected function removeBroker(Model\Venta\Reservation &$reservation): void
+    {
+        try {
+            $query = $this->connection->getQueryBuilder()
+                ->delete()
+                ->from('reservation_details')
+                ->where('reservation_id = :id AND type = :type');
+            $this->connection->execute($query, [
+                'id' => $reservation->id,
+                'type' => Model\Venta\Reservation\Detail\Type::Broker->value
+            ]);
+            $reservation->broker = null;
+        } catch (PDOException) {}
+    }
 }
diff --git a/app/src/Repository/Venta/Reservation/State.php b/app/src/Repository/Venta/Reservation/State.php
index 0a98a6d..9a34efa 100644
--- a/app/src/Repository/Venta/Reservation/State.php
+++ b/app/src/Repository/Venta/Reservation/State.php
@@ -22,7 +22,7 @@ class State extends Common\Ideal\Repository
         $map = (new Common\Implement\Repository\MapperParser(['type']))
             ->register('reservation_id', (new Common\Implement\Repository\Mapper())
                 ->setProperty('reservation')
-                ->setFunction(function($data) use ($data) {
+                ->setFunction(function($data) {
                     return $this->reservationRepository->fetchById($data['reservation_id']);
                 }))
             ->register('date', new Common\Implement\Repository\Mapper\DateTime('date'));
diff --git a/app/src/Service/Persona.php b/app/src/Service/Persona.php
index bfabeca..625e6d1 100644
--- a/app/src/Service/Persona.php
+++ b/app/src/Service/Persona.php
@@ -35,7 +35,7 @@ class Persona extends Ideal\Service
     /**
      * @param int $rut
      * @return Model\Persona
-     * @throws Read|Create
+     * @throws Read
      */
     public function getById(int $rut): Model\Persona
     {
@@ -44,7 +44,11 @@ class Persona extends Ideal\Service
         } catch (Implement\Exception\EmptyResult) {
             try {
                 $this->propietarioRepository->fetchById($rut);
-                return $this->add(compact('rut'));
+                try {
+                    return $this->add(compact('rut'));
+                } catch (Create $exception) {
+                    throw new Read(__CLASS__, $exception);
+                }
             } catch (Implement\Exception\EmptyResult $exception) {
                 throw new Read(__CLASS__, $exception);
             }
diff --git a/app/src/Service/Valor.php b/app/src/Service/Valor.php
index 7789e84..1454611 100644
--- a/app/src/Service/Valor.php
+++ b/app/src/Service/Valor.php
@@ -4,7 +4,7 @@ namespace Incoviba\Service;
 use DateTimeInterface;
 use DateTimeImmutable;
 use DateMalformedStringException;
-use function PHPUnit\Framework\countOf;
+use Incoviba\Service\Valor\Phone;
 
 class Valor
 {
@@ -40,6 +40,14 @@ class Valor
         }
         return $value / $this->ufService->get($date);
     }
+    public function phone(): Phone
+    {
+        return new Phone();
+    }
+    public function telefono(): Phone
+    {
+        return $this->phone();
+    }
 
     protected function getDateTime(null|string|DateTimeInterface $date): DateTimeInterface
     {
diff --git a/app/src/Service/Valor/Phone.php b/app/src/Service/Valor/Phone.php
new file mode 100644
index 0000000..3fc4eec
--- /dev/null
+++ b/app/src/Service/Valor/Phone.php
@@ -0,0 +1,28 @@
+<?php
+namespace Incoviba\Service\Valor;
+
+class Phone
+{
+    public function toDatabase(?string $phone): ?int
+    {
+        if ($phone === null) {
+            return null;
+        }
+        return (int) str_replace([' ', '+'], '', $phone) ?? null;
+    }
+    public function toDisplay(?int $phone): ?string
+    {
+        if ($phone === null) {
+            return null;
+        }
+        $parts = preg_split('/(?=<country>\d{2})?(?=<area>\d)(?=<first>\d{4})(?=<last>\d{4})/', $phone);
+        $output = [];
+        if (array_key_exists('country', $parts)) {
+            $output [] = "+{$parts[0]}";
+        }
+        $output [] = $parts[1] ?? '';
+        $output [] = $parts[2] ?? '';
+        $output [] = $parts[3] ?? '';
+        return implode(' ', $output);
+    }
+}
diff --git a/app/src/Service/Venta/Promotion.php b/app/src/Service/Venta/Promotion.php
index 6dc0194..052be9b 100644
--- a/app/src/Service/Venta/Promotion.php
+++ b/app/src/Service/Venta/Promotion.php
@@ -48,6 +48,20 @@ class Promotion extends Ideal\Service
         }
     }
 
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws Exception\ServiceAction\Read
+     */
+    public function getByProject(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->promotionRepository->fetchByProject($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new Exception\ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
+
     /**
      * @param int $contract_id
      * @return array
diff --git a/app/src/Service/Venta/Propietario.php b/app/src/Service/Venta/Propietario.php
index 9ea89e5..cec026b 100644
--- a/app/src/Service/Venta/Propietario.php
+++ b/app/src/Service/Venta/Propietario.php
@@ -1,22 +1,24 @@
 <?php
 namespace Incoviba\Service\Venta;
 
+use PDOException;
+use Psr\Log\LoggerInterface;
 use Incoviba\Common\Ideal\Service;
 use Incoviba\Common\Implement\Exception\EmptyResult;
 use Incoviba\Exception\ServiceAction\Create;
 use Incoviba\Exception\ServiceAction\Read;
 use Incoviba\Exception\ServiceAction\Update;
-use Incoviba\Repository;
 use Incoviba\Model;
-use PDOException;
-use Psr\Log\LoggerInterface;
+use Incoviba\Repository;
+use Incoviba\Service\Valor;
 
 class Propietario extends Service
 {
     public function __construct(
         LoggerInterface $logger,
         protected Repository\Venta\Propietario $propietarioRepository,
-        protected Repository\Direccion $direccionRepository
+        protected Repository\Direccion $direccionRepository,
+        protected Valor $valorService
     ) {
         parent::__construct($logger);
     }
@@ -49,6 +51,9 @@ class Propietario extends Service
             $data['direccion'] = $direccion->id;
         }
         $filteredData = $this->propietarioRepository->filterData($data);
+        if (array_key_exists('telefono', $filteredData)) {
+            $filteredData['telefono'] = $this->valorService->telefono()->toDatabase($filteredData['telefono']);
+        }
         try {
             return $this->propietarioRepository->edit($propietario, $filteredData);
         } catch (PDOException | EmptyResult $exception) {
@@ -85,6 +90,10 @@ class Propietario extends Service
         ]);
         $filtered_data = array_intersect_key($data, $fields);
 
+        if (array_key_exists('telefono', $filtered_data)) {
+            $filtered_data['telefono'] = $this->valorService->telefono()->toDatabase($filtered_data['telefono']);
+        }
+
         try {
             $propietario = $this->propietarioRepository->fetchById($data['rut']);
             $edits = [];
@@ -95,6 +104,7 @@ class Propietario extends Service
         } catch (EmptyResult) {
             try {
                 $propietario = $this->propietarioRepository->create($filtered_data);
+                $this->logger->info('Propietario', ['propietario' => $propietario]);
                 $propietario = $this->propietarioRepository->save($propietario);
             } catch (PDOException $exception) {
                 throw new Create(__CLASS__, $exception);
diff --git a/app/src/Service/Venta/Reservation.php b/app/src/Service/Venta/Reservation.php
index 9ceca60..166f0d8 100644
--- a/app/src/Service/Venta/Reservation.php
+++ b/app/src/Service/Venta/Reservation.php
@@ -14,7 +14,9 @@ use Incoviba\Repository;
 
 class Reservation extends Ideal\Service\API
 {
-    public function __construct(LoggerInterface $logger, protected Repository\Venta\Reservation $reservationRepository)
+    public function __construct(LoggerInterface                              $logger,
+                                protected Repository\Venta\Reservation       $reservationRepository,
+                                protected Repository\Venta\Reservation\State $stateRepository)
     {
         parent::__construct($logger);
     }
@@ -22,11 +24,19 @@ class Reservation extends Ideal\Service\API
     public function getAll(null|string|array $order = null): array
     {
         try {
-            return $this->reservationRepository->fetchAll($order);
+            return array_map([$this, 'process'], $this->reservationRepository->fetchAll($order));
         } catch (Implement\Exception\EmptyResult) {
             return [];
         }
     }
+    public function getByProject(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->reservationRepository->fetchByProject($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
 
     public function get(int $id): Model\Venta\Reservation
     {
@@ -37,6 +47,48 @@ class Reservation extends Ideal\Service\API
         }
     }
 
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws ServiceAction\Read
+     */
+    public function getActive(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->reservationRepository->fetchActive($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
+
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws ServiceAction\Read
+     */
+    public function getPending(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->reservationRepository->fetchPending($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
+
+    /**
+     * @param int $project_id
+     * @return array
+     * @throws ServiceAction\Read
+     */
+    public function getRejected(int $project_id): array
+    {
+        try {
+            return array_map([$this, 'process'], $this->reservationRepository->fetchRejected($project_id));
+        } catch (Implement\Exception\EmptyResult $exception) {
+            throw new ServiceAction\Read(__CLASS__, $exception);
+        }
+    }
+
     public function add(array $data): Model\Venta\Reservation
     {
         try {
@@ -76,6 +128,12 @@ class Reservation extends Ideal\Service\API
     }
     protected function process(Define\Model $model): Model\Venta\Reservation
     {
+        $model->addFactory('states', new Implement\Repository\Factory()
+            ->setArgs(['reservation_id' => $model->id])
+            ->setCallable(function(int $reservation_id) {
+                return $this->stateRepository->fetchByReservation($reservation_id);
+            })
+        );
         return $model;
     }
 }