From 5ef0aaae50117c92e48bc3ae7f30744e906d6ebe Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Mon, 14 Jun 2021 16:40:59 -0400
Subject: [PATCH 01/11] Mixed

---
 app/Controller/Informes.php                   | 63 +++++--------------
 app/Controller/Ventas.php                     | 54 ++++------------
 bin/informes/controllers/ventas.py            |  6 +-
 .../modelos/src/old/Proyecto/Proyecto.php     | 15 ++++-
 .../views/ventas/pies/cuotas/add.blade.php    |  2 +-
 5 files changed, 45 insertions(+), 95 deletions(-)

diff --git a/app/Controller/Informes.php b/app/Controller/Informes.php
index 6a65fe9..7edb4c0 100644
--- a/app/Controller/Informes.php
+++ b/app/Controller/Informes.php
@@ -434,7 +434,7 @@ class Informes
 
 			$columnas = [
 				'Propietario',
-				['name' => 'Departamento', 'style' => 'number'],
+				'Departamento',
 				['name' => 'Estacionamientos', 'style' => 'number'],
 				['name' => 'Bodegas', 'style' => 'number'],
 				'Fecha Venta',
@@ -457,7 +457,8 @@ class Informes
 				['name' => 'Valor Neto', 'style' => 'amount'],
 				['name' => 'UF/m²*', 'style' => 'amount'],
 				['name' => 'Comision', 'style' => 'amount'],
-				['name' => 'Venta s/Comision', 'style' => 'amount']
+				['name' => 'Venta s/Comision', 'style' => 'amount'].
+				['name' => 'Precio', 'style' => 'Amount']
 			];
 			//$informe->addColumns($columnas);
 
@@ -465,28 +466,14 @@ class Informes
 			foreach ($ventas as $venta) {
 				$info = [];
 				$info['Propietario'] = mb_strtoupper($venta->propietario()->nombreCompleto());
-				$info['Departamento'] = trim(array_reduce($venta->propiedad()->departamentos(), function($carry, $item) {
-                                          return implode(' - ', [$carry, $item->descripcion]);
-                                        }), ' -');
-				//$ests = [];
+				$info['Departamento'] = implode(' - ', array_map(function($item) {
+					return $item->descripcion;
+				}, $venta->propiedad()->departamentos()));
         $es = $venta->propiedad()->estacionamientos();
-        /*if (count($es) > 0) {
-          foreach ($es as $e) {
-            $ests []= $e->descripcion;
-          }
-        }
-				$info['Estacionamientos'] = implode(', ', $ests);*/
 				$info['Estacionamientos'] = implode(', ', array_map(function($item) {
 					return $item->descripcion;
 				}, $es));
-				//$bods = [];
         $bs = $venta->propiedad()->bodegas();
-        /*if (count($bs) > 0) {
-          foreach ($bs as $b) {
-						$bods []= $b->descripcion;
-					}
-				}
-				$info['Bodegas'] = implode(', ', $bods);*/
 				$info['Bodegas'] = implode(', ', array_map(function($item) {
 					return $item->descripcion;
 				}, $bs));
@@ -495,7 +482,7 @@ class Informes
 				$info['Tipo'] = $venta->unidad()->abreviacion;
 				$info['m² Ponderados'] = $venta->unidad()->m2('vendible');
 				$info['Valor Promesa'] = $venta->valor_uf;
-                                $info['Pie'] = $venta->pie()->valor;
+        $info['Pie'] = $venta->pie()->valor;
 				$info['Pie Pagado'] = 0;
 				$info['% Pie Pagado'] = 0;
 				if ($venta->pie()) {
@@ -508,12 +495,6 @@ class Informes
 				$info['Valor Operador'] = $venta->valorComision();
 				//$promos = 0;
 				$ps = $venta->promociones();
-				/*if (count($ps) > 0) {
-					foreach ($ps as $promo) {
-						$promos += $promo->valor;
-					}
-				}
-				$info['Premios'] = $promos;*/
 				$info['Premios'] = array_reduce($ps, function($sum, $item) {
 					return $sum + $item->valor;
 				});
@@ -536,31 +517,17 @@ class Informes
 				$info['UF/m²*'] = $venta->uf_m2();
 				$info['Comision'] = $venta->valorFinal() * $comision;
 				$info['Venta s/Comision'] = $venta->valorFinal() - $info['Comision'];
+				$fecha = $venta->fecha();
+				$info['Precio'] = 0;
+				try {
+					$info['Precio'] = array_reduce($venta->propiedad()->departamentos(), function($sum, $item) use ($fecha) {
+						return $sum + $item->precio($fecha)->valor;
+					});
+				} catch (\Exception $e) {
+				}
 
 				$data []= $info;
 			}
-      /*$informe->addData($data);
-
-			$totals = [
-				'Propietario' => 'TOTAL',
-				'Departamento' => 'count',
-				'Estacionamientos' => 'count',
-				'Bodegas' => 'count',
-				'm² Ponderados' => 'sum',
-				'Valor Promesa' => 'sum',
-				'Bono Pie' => 'sum',
-				'Subsidio' => 'sum',
-				'Ahorro' => 'sum',
-				'Credito' => 'sum',
-				'Valor Operador' => 'sum',
-				'Premios' => 'sum',
-				'Valor Ests & Bods' => 'sum',
-				'Valor Neto' => 'sum',
-				'Comision' => 'sum'
-			];
-			$informe->addTotals($totals);
-
-			return $informe->informe();*/
 
 			$body = [
 				"Proyecto" => $proyecto->descripcion,
diff --git a/app/Controller/Ventas.php b/app/Controller/Ventas.php
index e66faf2..8bd60b3 100644
--- a/app/Controller/Ventas.php
+++ b/app/Controller/Ventas.php
@@ -163,53 +163,25 @@ class Ventas
 		$unis = json_decode(post('unidades'));
 		$id_principal = array_shift($unis);
 		$principal = model(Unidad::class)->findOne(post('unidad' . $id_principal));
-		$propiedad = model(Propiedad::class)
-		->select('propiedad.*')
-		->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal'])
-		->where('propiedad.unidad_principal', $principal->id)
-		->where('unidad.proyecto', post('proyecto'))
-		->orderByDesc('propiedad.id')
-		->findOne();
 		// Revisar si existe la propiedad y si está vigente.
-		if (!$propiedad or ($propiedad->venta() and $propiedad->venta()->estado() and $propiedad->venta()->estado()->tipo()->descripcion != 'vigente')) {
-			if (!$propiedad) {
-				$propiedad = model(Propiedad::class)->create();
-			}
-			$propiedad->unidad_principal = $principal->id;
-			$propiedad->save();
+		$propiedad = model(Propiedad::class)->create();
+		$propiedad->unidad_principal = $principal->id;
+		$propiedad->save();
+		$data = [
+			'propiedad' => $propiedad->id,
+			'unidad' => $principal->id,
+			'principal' => 1
+		];
+		$pu = model(PropiedadUnidad::class)->create($data);
+		$pu->save();
+		foreach ($unis as $id_unidad) {
 			$data = [
 				'propiedad' => $propiedad->id,
-				'unidad' => $principal->id,
-				'principal' => 1
+				'unidad' => post('unidad' . $id_unidad),
+				'principal' => 0
 			];
 			$pu = model(PropiedadUnidad::class)->create($data);
 			$pu->save();
-			foreach ($unis as $id_unidad) {
-				$data = [
-					'propiedad' => $propiedad->id,
-					'unidad' => post('unidad' . $id_unidad),
-					'principal' => 0
-				];
-				$pu = model(PropiedadUnidad::class)->create($data);
-				$pu->save();
-			}
-			/*$ests = [];
-			$bods = [];
-			foreach ($unis as $id_unidad) {
-				$unidad = model(Unidad::class)->findOne(post('unidad' . $id_unidad));
-				if ($unidad->tipo == 2) {
-					$ests []= $unidad->id;
-				}
-				if ($unidad->tipo == 3) {
-					$bods []= $unidad->id;
-				}
-			}
-			$propiedad->estacionamientos = implode(';', $ests);
-			$propiedad->bodegas = implode(';', $bods);
-			$propiedad->save();*/
-		} elseif ($propiedad->venta() and $propiedad->venta()->estado()->tipo()->descripcion == 'vigente') {
-			// Existe la propiedad en este proyecto y está vigente. Error, no se debiese vender si está vigente.
-			throw new \Exception('Existe la propiedad en este proyecto y está vigente. Error, no se debiese vender si está vigente.');
 		}
 
 		$venta = model(Venta::class)->create();
diff --git a/bin/informes/controllers/ventas.py b/bin/informes/controllers/ventas.py
index 8b059ce..ab3ffce 100644
--- a/bin/informes/controllers/ventas.py
+++ b/bin/informes/controllers/ventas.py
@@ -16,7 +16,7 @@ def format_data(data):
         df[col] = pd.to_numeric(df[col], errors='ignore')
     float_columns = ['Valor Promesa', 'Pie', 'Pie Pagado', '% Pie Pagado', 'Bono Pie', 'Valor Operador',
                      'Premios', 'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto',
-                     'UF/m²*', 'Comision', 'Venta s/Comision']
+                     'UF/m²*', 'Comision', 'Venta s/Comision', 'Precio']
     for col in float_columns:
         if col in df.columns:
             df[col] = pd.to_numeric(df[col], errors='coerce')
@@ -38,7 +38,7 @@ def format_columns(workbook, columns):
 
     amount_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Valor Operador', 'Premios',
                       'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', 'UF/m²*', 'Comision',
-                      'Venta s/Comision']
+                      'Venta s/Comision', 'Precio']
     center_columns = ['Departamento', 'Estacionamientos', 'Bodegas']
     sum_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Subsidio', 'Ahorro', 'Credito',
                    'Valor Operador', 'Premios', 'Valor Ests & Bods', 'Valor Neto', 'Comision']
@@ -68,7 +68,7 @@ def format_excel(workbook, worksheet, data):
 
     amount_columns = ['m² Ponderados', 'Valor Promesa', 'Pie', 'Pie Pagado', 'Bono Pie', 'Valor Operador', 'Premios',
                       'Subsidio', 'Ahorro', 'Credito', 'Valor Ests & Bods', 'Valor Neto', 'UF/m²*', 'Comision',
-                      'Venta s/Comision']
+                      'Venta s/Comision', 'Precio']
     center_columns = ['Departamento', 'Estacionamientos', 'Bodegas']
 
     for col in amount_columns:
diff --git a/incoviba/modelos/src/old/Proyecto/Proyecto.php b/incoviba/modelos/src/old/Proyecto/Proyecto.php
index 5611ef6..aac09ae 100644
--- a/incoviba/modelos/src/old/Proyecto/Proyecto.php
+++ b/incoviba/modelos/src/old/Proyecto/Proyecto.php
@@ -131,7 +131,7 @@ class Proyecto extends Model
 					$unidades['disponibles'] = (array) $this->unidades->disponibles;
 				}
 			}
-			$q_s = "SELECT u.*
+			/*$q_s = "SELECT u.*
 				  FROM
 					  (SELECT * FROM unidad WHERE proyecto = ? ORDER BY tipo) AS u
 					LEFT JOIN
@@ -158,7 +158,18 @@ class Proyecto extends Model
 					                       OR propiedad.bodegas LIKE CONCAT('%;', unidad.id)
 					                       OR propiedad.bodegas LIKE CONCAT('%;', unidad.id, ';%')
 					    WHERE venta.estado = 1) AS b ON b.id = u.id
-				  WHERE v.id IS NULL AND e.id IS NULL AND b.id IS NULL";
+				  WHERE v.id IS NULL AND e.id IS NULL AND b.id IS NULL";*/
+			$q_s = "SELECT u.*
+					FROM
+						(SELECT * FROM unidad WHERE proyecto = ? ORDER BY tipo) AS u
+						LEFT JOIN (SELECT unidad.*
+							FROM unidad
+								JOIN propiedad_unidad pu ON pu.unidad = unidad.id
+								JOIN venta ON venta.propiedad = pu.propiedad
+								JOIN (SELECT e1.* FROM estado_venta e1
+									JOIN (SELECT venta, MAX(id) AS id FROM estado_venta GROUP BY venta) e0 ON e0.id = e1.id) ev ON ev.venta = venta.id
+							WHERE ev.estado = 1) AS v ON v.id = u.id
+					WHERE v.id IS NULL";
 			$q_p = " ORDER BY u.tipo, LPAD(u.descripcion, 4, '0')";
 			switch (strtolower($id_tipo)) {
 				case null:
diff --git a/resources/views/ventas/pies/cuotas/add.blade.php b/resources/views/ventas/pies/cuotas/add.blade.php
index 941fbef..079543e 100644
--- a/resources/views/ventas/pies/cuotas/add.blade.php
+++ b/resources/views/ventas/pies/cuotas/add.blade.php
@@ -8,7 +8,7 @@
 				<div class="col-md-3">
 					<select name="asociado" class="form-control">
 						@foreach ($pie->venta()->propietario()->ventas() as $v)
-							@if ($v->unidad()->id == $pie->venta()->unidad()->id)
+							@if ($v->unidad()->id == $pie->venta()->unidad()->id or $v->pie == 0)
 								@continue
 							@endif
 						<option value="{{$v->pie()->id}}">

From 8da6b4f160ed871cf1840e4a0346b0b96babac2e Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Mon, 14 Jun 2021 17:41:40 -0400
Subject: [PATCH 02/11] .\config\

---
 bootstrap/autoload.php |  3 ++-
 bootstrap/dotenv.php   | 12 ++++++++++++
 composer.json          |  3 ++-
 docker-compose.yml     | 16 +++-------------
 4 files changed, 19 insertions(+), 15 deletions(-)
 create mode 100644 bootstrap/dotenv.php

diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index b346078..7595f12 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -1,6 +1,7 @@
 <?php
 include_once dirname(__DIR__) . '/vendor/autoload.php';
 include_once 'errors.php';
+include_once 'dotenv.php';
 include_once 'database.php';
 include_once 'routes.php';
-?>
\ No newline at end of file
+?>
diff --git a/bootstrap/dotenv.php b/bootstrap/dotenv.php
new file mode 100644
index 0000000..799a5b1
--- /dev/null
+++ b/bootstrap/dotenv.php
@@ -0,0 +1,12 @@
+<?php
+use Dotenv\Dotenv;
+
+$folder = dirname(__DIR__);
+$files = new DirectoryIterator($folder);
+foreach ($files as $file) {
+  if ($file->isDir() or $file->getExtension() != 'env') {
+    continue;
+  }
+  $env = Dotenv::createImmutable($file->getPath(), $file->getBasename());
+  $env->load();
+}
diff --git a/composer.json b/composer.json
index 62af58a..f32275b 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
 		"php-di/slim-bridge": "dev-master",
 		"rubellum/slim-blade-view": "dev-master",
 		"nyholm/psr7": "1.4.x-dev",
-		"nyholm/psr7-server": "dev-master"
+		"nyholm/psr7-server": "dev-master",
+		"vlucas/phpdotenv": "5.3.x-dev"
 	},
 	"require-dev" : {
 		"phpunit/phpunit" : "^6.3",
diff --git a/docker-compose.yml b/docker-compose.yml
index ba91d4a..df1c290 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,8 +13,6 @@ services:
   php:
     build: .
     container_name: php
-    ports:
-      - 9123:9000
     volumes:
       - .:/code
 
@@ -22,13 +20,7 @@ services:
     container_name: db
     image: mariadb:latest
     restart: unless-stopped
-    ports:
-      - 3307:3306
-    environment:
-      MYSQL_ROOT_PASSWORD: 'password'
-      MYSQL_DATABASE: 'incoviba'
-      MYSQL_USER: 'incoviba'
-      MYSQL_PASSWORD: '5GQYFvRjVw2A4KcD'
+    env_file: .db.env
     volumes:
       - dbdata:/var/lib/mysql
 
@@ -37,10 +29,8 @@ services:
     image: adminer:latest
     restart: unless-stopped
     ports:
-      - 8082:8080
-    environment:
-      ADMINER_DESIGN: 'dracula'
-      ADMINER_PLUGINS: 'dump-json'
+      - 8083:8080
+    env_file: .adminer.env
 
 volumes:
   dbdata:

From 33669f34b55c3a780f641b20a123d1d0865d2a72 Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Mon, 14 Jun 2021 17:41:59 -0400
Subject: [PATCH 03/11] Database

---
 config/databases.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/databases.php b/config/databases.php
index 16cd719..470a4cf 100644
--- a/config/databases.php
+++ b/config/databases.php
@@ -3,9 +3,9 @@ return [
 		'mysql' => [
 				'host' => 'localhost',
 				//'port' => 3306,
-				'database' => 'incoviba',
-				'username' => 'incoviba',
-				'password' => '5GQYFvRjVw2A4KcD'
+				'database' => $_ENV['MYSQL_DATABASE'],
+				'username' => $_ENV['MYSQL_USER'],
+				'password' => $_ENV['MYSQL_PASSWORD']
 		],
 		'mysql_copy' => [
 				'host' => 'localhost',

From d5adec213721b66e8c374fa8c200a2db04832af3 Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Mon, 14 Jun 2021 17:44:21 -0400
Subject: [PATCH 04/11] Env files

---
 .adminer.env.sample | 2 ++
 .db.env.sample      | 4 ++++
 .gitignore          | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .adminer.env.sample
 create mode 100644 .db.env.sample

diff --git a/.adminer.env.sample b/.adminer.env.sample
new file mode 100644
index 0000000..7e78794
--- /dev/null
+++ b/.adminer.env.sample
@@ -0,0 +1,2 @@
+ADMINER_DESIGN=dracula
+ADMINER_PLUGINS=dump-json
diff --git a/.db.env.sample b/.db.env.sample
new file mode 100644
index 0000000..18b1117
--- /dev/null
+++ b/.db.env.sample
@@ -0,0 +1,4 @@
+MYSQL_DATABASE=
+MYSQL_PASSWORD=
+MYSQL_ROOT_PASSWORD=
+MYSQL_USER=
diff --git a/.gitignore b/.gitignore
index d51536b..c65adda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-.env
+*.env
 /vendor/
 composer.lock
 /node_modules/

From 7206fa1c3c6f86694c95d110efbf4bc7ef61bd3f Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Mon, 14 Jun 2021 17:49:12 -0400
Subject: [PATCH 05/11] ENV

---
 .env.sample | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .env.sample

diff --git a/.env.sample b/.env.sample
new file mode 100644
index 0000000..31fe938
--- /dev/null
+++ b/.env.sample
@@ -0,0 +1,2 @@
+BASE_URL=
+MYSQL_HOST=

From 606fdc4d960ef7c3c9fbde309e1c752b7f22dd84 Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Mon, 14 Jun 2021 17:49:21 -0400
Subject: [PATCH 06/11] Env settings

---
 config/databases.php    |  4 +++-
 setup/common/config.php |  8 ++++----
 setup/env/config.php    | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/config/databases.php b/config/databases.php
index 470a4cf..be9c0d4 100644
--- a/config/databases.php
+++ b/config/databases.php
@@ -1,7 +1,9 @@
 <?php
+include_once dirname(__DIR__) . '/bootstrap/dotenv.php';
+
 return [
 		'mysql' => [
-				'host' => 'localhost',
+				'host' => $_ENV['MYSQL_HOST'],
 				//'port' => 3306,
 				'database' => $_ENV['MYSQL_DATABASE'],
 				'username' => $_ENV['MYSQL_USER'],
diff --git a/setup/common/config.php b/setup/common/config.php
index d216b5f..b16515e 100644
--- a/setup/common/config.php
+++ b/setup/common/config.php
@@ -10,11 +10,11 @@ return [
   'databases' => function() {
     $arr = [
       'mysql' => [
-  				'host' => 'localhost',
+  				'host' => $_ENV['MYSQL_HOST'],
   				//'port' => 3306,
-  				'database' => 'incoviba',
-  				'username' => 'incoviba',
-  				'password' => '5GQYFvRjVw2A4KcD'
+  				'database' => $_ENV['MYSQL_DATABASE'],
+  				'username' => $_ENV['MYSQL_USER'],
+  				'password' => $_ENV['MYSQL_PASSWORD']
   		],
   		'mysql_copy' => [
   				'host' => 'localhost',
diff --git a/setup/env/config.php b/setup/env/config.php
index 48b0973..a38e55d 100644
--- a/setup/env/config.php
+++ b/setup/env/config.php
@@ -1,6 +1,18 @@
 <?php
+use Dotenv\Dotenv;
+
+$folder = dirname(__DIR__, 2);
+$files = new DirectoryIterator($folder);
+foreach ($files as $file) {
+  if ($file->isDir() or $file->getExtension() != 'env') {
+    continue;
+  }
+  $env = Dotenv::createImmutable($file->getPath(), $file->getBasename());
+  $env->load();
+}
+
 return [
   'debug' => false,
   'benchmark' => false,
-  'base_url' => '/incoviba'
+  'base_url' => $_ENV['BASE_URL']//'/incoviba'
 ];

From 8ce0b75bb4415029f3429f560812c2693d6a7319 Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Mon, 7 Mar 2022 09:54:45 -0300
Subject: [PATCH 07/11] Ignore modules

---
 .gitignore | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index c65adda..33cc76d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
-*.env
-/vendor/
-composer.lock
-/node_modules/
-package-lock.json
-Pipfile.lock
-/logs/
-/cache/
+**/*.env
+**/vendor/
+**/composer.lock
+**/node_modules/
+**/package-lock.json
+**/Pipfile.lock
+**/logs/
+**/cache/
+**/modules/

From 20ae31b7bf5bd2395b1ee8b5b5d0659462beb8e3 Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Mon, 7 Mar 2022 09:59:09 -0300
Subject: [PATCH 08/11] Ignore IDE files

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 33cc76d..94a1003 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 **/logs/
 **/cache/
 **/modules/
+**/.idea/

From 0c62ed05824e750acaf4fa414be61d6f3caf8949 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvial@goacegroup.com>
Date: Mon, 7 Mar 2022 14:16:37 -0300
Subject: [PATCH 09/11] Update to PHP 8

---
 Dockerfile    | 8 ++++----
 composer.json | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1189fae..33834f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM php:7.4-fpm
+FROM php:8.1-fpm
 
-RUN apt-get update && apt-get install -y libzip-dev libicu-dev git
+RUN apt-get update && apt-get install -y libzip-dev libicu-dev git libpng-dev unzip
 
-RUN docker-php-ext-install pdo pdo_mysql zip intl
+RUN docker-php-ext-install pdo pdo_mysql zip intl gd
 
-RUN pecl install xdebug-3.0.3 \
+RUN pecl install xdebug-3.1.3 \
     && docker-php-ext-enable xdebug
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
diff --git a/composer.json b/composer.json
index 5b75c1b..9371935 100644
--- a/composer.json
+++ b/composer.json
@@ -12,9 +12,9 @@
 		"aldarien/url": "*",
 		"j4mie/paris" : "^1.5",
 		"danielstjules/stringy" : "^3.1",
-		"phpoffice/phpspreadsheet": "1-beta",
+		"phpoffice/phpspreadsheet": "^1",
 		"nesbot/carbon": "^2",
-		"phpoffice/phpword": "^0.14.0",
+		"phpoffice/phpword": "^0",
 		"slam/php-excel": "^4.4",
 		"fabpot/goutte": "^3.2",
 		"incoviba/modelos": "*",
@@ -26,7 +26,7 @@
 		"vlucas/phpdotenv": "^5.3"
 	},
 	"require-dev" : {
-		"phpunit/phpunit" : "^6.3",
+		"phpunit/phpunit" : "^8",
 		"kint-php/kint" : "^2.1",
 		"filp/whoops" : "^2.1"
 	},

From 6a5efba272d0dd15bd1ded75f387bce9b47d47a2 Mon Sep 17 00:00:00 2001
From: Juan Pablo Vial <jpvial@goacegroup.com>
Date: Mon, 7 Mar 2022 16:36:21 -0300
Subject: [PATCH 10/11] Informe de Contabilidad Resumen

---
 app/Controller/Informes.php                  |  10 +-
 app/Service/Informe/Contabilidad/Resumen.php | 155 +++++++++++++++++++
 2 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 app/Service/Informe/Contabilidad/Resumen.php

diff --git a/app/Controller/Informes.php b/app/Controller/Informes.php
index 67cb000..43862a2 100644
--- a/app/Controller/Informes.php
+++ b/app/Controller/Informes.php
@@ -1,10 +1,12 @@
 <?php
 namespace App\Controller;
 
+use App\Service\Informe\Contabilidad\Resumen;
 use Carbon\Carbon;
 use GuzzleHttp\Client;
 use App\Definition\Controller;
 use App\Alias\PHPExcel;
+use Incoviba\Common\Factory\Model;
 use Incoviba\old\Proyecto\Proyecto;
 use Incoviba\old\Proyecto\Agente;
 use Incoviba\old\Proyecto\ProyectoAgente;
@@ -555,8 +557,14 @@ class Informes
 	{
 		if (get('proyecto')) {
 			$id = get('proyecto');
-			$proyecto = model(Proyecto::class)->findOne($id);
 			$fecha = get('fecha');
+
+            $service = new Resumen();
+            $service->build($id, new \DateTimeImmutable($fecha));
+
+            return;
+
+            $proyecto = model(Proyecto::class)->findOne($id);
 			$mes = null;
 			if ($fecha != null) {
 				$mes = Carbon::parse($fecha)->addMonths(1)->subDays(1);
diff --git a/app/Service/Informe/Contabilidad/Resumen.php b/app/Service/Informe/Contabilidad/Resumen.php
new file mode 100644
index 0000000..cad97df
--- /dev/null
+++ b/app/Service/Informe/Contabilidad/Resumen.php
@@ -0,0 +1,155 @@
+<?php
+namespace App\Service\Informe\Contabilidad;
+
+use DateTimeInterface;
+use DateTimeImmutable;
+use Incoviba\old\Proyecto\Proyecto;
+use Incoviba\old\Venta\Venta;
+use Incoviba\old\Venta\Pago;
+
+/**
+ * Resumen para revisar el libro mayor de un proyecto para cierto mes (sumando el año anterior)
+ * Obtiene lo pagado para cada departamento
+ *  - anticipo (cuotas)
+ *  - reajuste
+ *  - abonos
+ *  - credito
+ *  - subsidio
+ *  - bono
+ *  - promociones
+ */
+class Resumen
+{
+    protected string $separator;
+    public function __construct(string $separator = ';')
+    {
+        $this->separator = $separator;
+    }
+
+    protected function getVentas($id_proyecto)
+    {
+        $proyecto = model(Proyecto::class)->findOne($id_proyecto);
+        return $proyecto->ventas();
+    }
+    protected function startOfYear(DateTimeInterface $up_to)
+    {
+        return new DateTimeImmutable(DateTimeImmutable::createFromInterface($up_to)->format('1-1-Y'));
+    }
+    protected function defaultValueDate(DateTimeInterface $up_to)
+    {
+        return (object) ['fecha' => $this->startOfYear($up_to), 'valor' => 0];
+    }
+    protected function extractValueDate(Pago $pago)
+    {
+        return (object) ['fecha' => $pago->fecha(), 'valor' => $pago->valor];
+    }
+    protected function getAnticipos(Venta $venta, DateTimeInterface $up_to)
+    {
+        $cuotas = $venta->pie()->cuotas('fecha', $up_to);
+        $ly = $this->startOfYear($up_to);
+        $older = array_reduce($cuotas, function($sum, $item) use ($ly) {
+            if ($item->pago()->estado()->tipo()->active != 1) {
+                return $sum;
+            }
+            if ($item->pago()->fecha() >= $ly) {
+                return $sum;
+            }
+            return $sum + $item->pago()->valor;
+        });
+        $current = array_map([$this, 'extractValueDate'], array_filter($cuotas, function($item) use ($ly) {
+            return $item->pago()->fecha() >= $ly;
+        }));
+        return array_merge([(object) ['fecha' => $ly, 'valor' => $older]], $current);
+    }
+    protected function getReajuste(Venta $venta, DateTimeInterface $up_to)
+    {
+        if ($venta->pie()->reajuste == null) {
+            return $this->defaultValueDate($up_to);
+        }
+        return $this->extractValueDate($venta->pie()->reajuste());
+    }
+    protected function getAbono(Venta $venta, DateTimeInterface $up_to)
+    {
+        if ($venta->escritura == null) {
+            return $this->defaultValueDate($up_to);
+        }
+        return $this->extractValueDate($venta->escritura()->pago());
+    }
+    protected function getBono(Venta $venta, DateTimeInterface $up_to)
+    {
+        if ($venta->bono_pie == null) {
+            return $this->defaultValueDate($up_to);
+        }
+        return $this->extractValueDate($venta->bonoPie()->pago());
+    }
+    protected function getCredito(Venta $venta, DateTimeInterface $up_to)
+    {
+        if ($venta->credito == null) {
+            return $this->defaultValueDate($up_to);
+        }
+        return $this->extractValueDate($venta->credito()->pago());
+    }
+    protected function getSubsidio(Venta $venta, DateTimeInterface $up_to)
+    {
+        if ($venta->subsidio == null) {
+            return $this->defaultValueDate($up_to);
+        }
+        return [$this->extractValueDate($venta->subsidio()->pago()), $this->extractValueDate($venta->subsidio()->subsidio())];
+    }
+    protected function getPagos(Venta $venta, DateTimeInterface $up_to)
+    {
+        $pagos = [];
+        $pagos = array_merge($pagos, $this->getAnticipos($venta, $up_to));
+        $pagos []= $this->getReajuste($venta, $up_to);
+        $pagos []= $this->getAbono($venta, $up_to);
+        $pagos []= $this->getBono($venta, $up_to);
+        $pagos []= $this->getCredito($venta, $up_to);
+        $pagos = array_merge($pagos, $this->getSubsidio($venta, $up_to));
+        return array_filter($pagos, function($item) {
+            return $item->valor != 0;
+        });
+    }
+
+    protected function formatValue(float $value)
+    {
+        return number_format($value, 0, ',', '.');
+    }
+    protected function buildLibro(Venta $venta, DateTimeInterface $up_to)
+    {
+        $pagos = $this->getPagos($venta, $up_to);
+        $output = ["Cuenta: Anticipos Dpto {$venta->unidad()->descripcion}"];
+        $debe = 0;
+        $haber = 0;
+        foreach ($pagos as $pago) {
+            if ($pago->valor > 0) {
+                $output []= implode($this->separator, [$pago->fecha->format('d/m/Y'), $this->formatValue($pago->valor), '']);
+                $debe += $pago->valor;
+            }
+            else {
+                $output []= implode($this->separator, [$pago->fecha->format('d/m/Y'), '', $this->formatValue(-$pago->valor)]);
+                $haber -= $pago->valor;
+            }
+        }
+        $output []= implode($this->separator, ['', $debe, $haber]);
+        return $output;
+    }
+
+    public function build(int $id_proyecto, DateTimeInterface $up_to)
+    {
+        $ventas = $this->getVentas($id_proyecto);
+
+
+        $output = [];
+        foreach ($ventas as $venta) {
+            $output = array_merge($output, $this->buildLibro($venta, $up_to), []);
+        }
+
+        $filename = "Contabilidad - Resumen - {$venta->proyecto()->descripcion} - {$up_to->format('Y-m-d')}.csv";
+
+        header("Content-Type: text/csv; charset=utf-8");
+        header('Content-Disposition: attachment; filename="' . $filename . '"');
+        header('Cache-Control: max-age=0');
+
+        file_put_contents('php://output', implode(PHP_EOL, $output));
+    }
+}

From 1754633475f6b5961c9ab36dd44d0d4d90fa5016 Mon Sep 17 00:00:00 2001
From: Aldarien <aldarien85@gmail.com>
Date: Mon, 7 Mar 2022 18:08:25 -0300
Subject: [PATCH 11/11] Profiles and cleanup

---
 .env.sample        |  1 +
 docker-compose.yml | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.env.sample b/.env.sample
index 31fe938..76074d2 100644
--- a/.env.sample
+++ b/.env.sample
@@ -1,2 +1,3 @@
+COMPOSE_PROFILES=
 BASE_URL=
 MYSQL_HOST=
diff --git a/docker-compose.yml b/docker-compose.yml
index df1c290..d6f865f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,21 +2,29 @@ version: '3'
 
 services:
   web:
+    profiles:
+      - app
     image: nginx:alpine
     container_name: web
     ports:
-      - 8080:80
+      - "8080:80"
     volumes:
       - .:/code
       - ./nginx.conf:/etc/nginx/conf.d/default.conf
 
   php:
+    profiles:
+      - app
     build: .
     container_name: php
+    env_file:
+      - .env
     volumes:
       - .:/code
 
   db:
+    profiles:
+      - db
     container_name: db
     image: mariadb:latest
     restart: unless-stopped
@@ -25,11 +33,13 @@ services:
       - dbdata:/var/lib/mysql
 
   adminer:
+    profiles:
+      - db
     container_name: adminer
     image: adminer:latest
     restart: unless-stopped
     ports:
-      - 8083:8080
+      - "8083:8080"
     env_file: .adminer.env
 
 volumes: