Incoviba/modelos
2
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Aldarien
2020-03-10 15:23:32 -03:00
parent 280db5e3da d2bf5e9e3e
commit 78dc1ff1eb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/old/Proyecto/Proyecto.php
View File

@ -641,7 +641,7 @@ class Proyecto extends Model {
$cuotas['mes'] = $this->container->get('model')->find(Cuota::class) $cuotas['mes'] = $this->container->get('model')->find(Cuota::class)
->join([ ->join([
['venta', 'cuota.pie', 'venta.pie'], ['venta', 'cuota.pie', 'venta.pie'],
['propiedad', 'propiedad.id', 'venta.propiedad'] ['propiedad', 'propiedad.id', 'venta.propiedad'],
['unidad', 'unidad.id', 'cuota.pago'], ['unidad', 'unidad.id', 'cuota.pago'],
['pago', 'pago.id', 'cuota.pago'], ['pago', 'pago.id', 'cuota.pago'],
['JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', 'ep.pago', 'pago.id', 'alias' => 'ep', 'type' => 'raw'] ['JOIN (SELECT e1.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago e1 ON e1.id = e0.id)', 'ep.pago', 'pago.id', 'alias' => 'ep', 'type' => 'raw']
@ -694,13 +694,13 @@ class Proyecto extends Model {
case 'vendible': case 'vendible':
$superficies['vendible'] = 0; $superficies['vendible'] = 0;
if ($this->unidades()) { if ($this->unidades()) {
$metros = $this->setRelationship(Unidad:class, 'proyecto', 'id') $metros = $this->setRelationship(Unidad::class, 'proyecto', 'id')
->build() ->build()
->select([['SUM(m2 + logia + terraza /2)', 'metros']]) ->select([['SUM(m2 + logia + terraza /2)', 'metros']])
->where([ ->where([
['tipo', 1] ['tipo', 1]
]) ])
group('proyecto') ->group('proyecto')
->one(); ->one();
$superficies['vendible'] = $metros->metros; $superficies['vendible'] = $metros->metros;
} }