', PHP_EOL; + } + } + } + protected function getType($type) + { + if (strpos($type, '(') !== false) { + $type = substr($type, 0, strpos($type, '(')); + } + if (strpos($type, ' ') !== false) { + $type = substr($type, 0, strpos($type, ' ')); + } + switch ($type) { + case 'int': + case 'float': + case 'double': + case 'char': + return trim($type); + case 'date': + case 'datetime': + return trim(strtolower($type)); + case 'varchar': + case 'text': + case 'blob': + return 'string'; + case 'bigint': + case 'tinyint': + case 'enum': + return 'int'; + default: + d($type); + } + } + protected function getTables() + { + $q = "SHOW TABLES"; + $st = $this->db->query($q); + $results = $st->fetchAll(\PDO::FETCH_COLUMN); + $this->tables = []; + foreach ($results as $result) { + $this->tables []= $result; + } + } + protected function getColumns($table) + { + $q = "SHOW COLUMNS FROM `" . $table . "`"; + $st = $this->db->query($q); + $results = $st->fetchAll(\PDO::FETCH_OBJ); + return $results; + } + protected function phpDoc($columns) + { + $str = ['/**']; + $str []= ' *'; + foreach ($columns as $column) { + $str []= ' * @property ' . $this->getType($column->Type) . ' ' . $column->Field; + } + $str []= ' *'; + $str []= ' */'; + + return implode(PHP_EOL, $str); + } + protected function className($table) + { + $name = Stringy::create($table)->upperCamelize(); + return $name; + } + protected function createClass($table) + { + $class = '' . $this->className($table); + $columns = $this->getColumns($table); + $docs = $this->phpDoc($columns); + + $output = ['name}';"; + $output []= '}'; + $output []= '?>'; + + //d(implode(PHP_EOL, $output)); + + $filename = realpath(root() . '/src') . DIRECTORY_SEPARATOR . $class . '.php'; + return file_put_contents($filename, implode(PHP_EOL, $output)); + } + public function create($namespace, $table) + { + $class = '' . $this->className($table); + $columns = $this->getColumns($table); + $docs = $this->phpDoc($columns); + + $namespace = trim($namespace, '\\'); + + $output = ['name}';"; + $output []= '}'; + $output []= '?>'; + $output = implode(PHP_EOL, $output); + + $namespace = explode('\\', $namespace); + array_shift($namespace); + $namespace = implode('/', $namespace); + + $filename = realpath(root() . '/src/' . $namespace) . DIRECTORY_SEPARATOR . $class . '.php'; + + $result = [ + 'result' => false, + 'filename' => $filename, + 'output' => $output + ]; + if (!file_exists($filename)) { + $result['result'] = file_put_contents($filename, $output); + } else { + $result['result'] = true; + } + return json_encode($result); + } + public function list() + { + $this->getTables(); + $output = []; + foreach ($this->tables as $table) { + $output []= ['table' => $table, 'model' => '' . $this->className($table)]; + } + + return json_encode(['models' => $output]); + } +} +?> \ No newline at end of file diff --git a/app_old/app/Service/Factory.php b/app_old/app/Service/Factory.php new file mode 100644 index 0000000..ac7386a --- /dev/null +++ b/app_old/app/Service/Factory.php @@ -0,0 +1,204 @@ +class = $class; + $this->is_aggregator = true; + if (is_subclass_of($class, 'Model')) { + $this->is_aggregator = false; + } + } + public function new() + { + $class = $this->class; + if ($this->is_aggregator) { + return new $class(); + } + return model($class)->create(); + } + public function create($data) + { + $class = $this->class; + if ($this->is_aggregator) { + $obj = new $class(); + $obj->create($data); + return $obj; + } + return model($class)->create($data); + } + /** + * [column => value, column => [value, operator]] + * @var array + */ + protected $conditions; + public function where(array $data) + { + if ($this->conditions == null) { + $this->conditions = $data; + return $this; + } + $this->conditions = array_merge($this->conditions, $data); + return $this; + } + /** + * [column, column => order] + * @var array + */ + protected $order; + public function order(array $data) + { + if ($this->order == null) { + $this->order = $data; + return $this; + } + $this->order = array_merge($this->order, $data); + return $this; + } + protected $limit; + public function limit(array $data) + { + if (!isset($data['limit'])) { + $data['limit'] = $data[0]; + } + if (!isset($data['offset'])) { + $data['offset'] = 0; + if (isset($data[1])) { + $data['offset'] = $data[1]; + } + } + $this->limit = (object) ['limit' => $data['limit'], 'offset' => $data['offset']]; + return $this; + } + protected $many; + public function find($many = false) + { + $this->many = $many; + if ($this->is_aggregator) { + return $this->findAggregator(); + } + return $this->findModel(); + } + + protected function findModel() + { + $objs = model($this->class); + $objs = $this->parseLimit($this->parseOrder($this->parseConditions($objs))); + + if ($this->many) { + return $objs->findMany(); + } + return $objs->findOne(); + } + protected function parseConditions($orm) + { + if ($this->conditions == null) { + return $orm; + } + foreach ($this->conditions as $column => $value) { + if (is_array($value)) { + list($value, $op) = $value; + switch ($op) { + case '>': + case 'gt': + $orm = $orm->whereGt($column, $value); + break; + } + } else { + $orm = $orm->where($column, $value); + } + } + return $orm; + } + protected function parseOrder($orm) + { + if ($this->order == null) { + return $orm; + } + foreach ($this->order as $column => $order) { + if (is_numeric($column)) { + $column = $order; + $order = 'asc'; + } + switch (strtolower($order)) { + case 'asc': + default: + $orm = $orm->orderByAsc($column); + break; + case 'desc': + $orm = $orm->orderByDesc($column); + break; + case 'expr': + $orm = $orm->orderByExpr($column); + break; + } + } + return $orm; + } + protected function parseLimit($orm) + { + if ($this->limit == null) { + return $orm; + } + $orm = $orm->limit($this->limit->limit); + if (isset($this->limit->offset)) { + $orm = $orm->offset($this->limit->offset); + } + return $orm; + } + protected function findAggregator() + { + $model = $this->modelName($this->class); + $ids = $this->getIds($model); + $class = $this->class; + if (count($ids) == 0) { + return false; + } + if ($this->many) { + $objs = []; + foreach ($ids as $id) { + $objs []= new $class($id); + } + } else { + $objs = new $class($ids[0]); + } + return $objs; + } + protected function getIds($model) + { + $id = $this->getModelId($model); + $table = $this->getTable($model); + $st = \ORM::forTable($table)->select($id); + $st = $this->parseConditions($st); + $results = $st->findArray(); + $output = array_map(function($a) use($id) { + return $a[$id]; + }, $results); + return $output; + } + protected function modelName($class) + { + $arr = explode("\\", $class); + \array_push($arr, end($arr)); + return implode("\\", $arr); + } + protected function getModelId($model) + { + $table = $this->getTable($model); + $query = "SHOW KEYS FROM {$table} WHERE Key_name = 'PRIMARY'"; + $st = \ORM::getDb()->query($query); + $results = $st->fetchAll(\PDO::FETCH_OBJ); + return $results[0]->Column_name; + } + protected function getTable($model) + { + $arr = explode("\\", $model); + return Stringy::create(end($arr))->toLowerCase() . ''; + } +} diff --git a/app_old/app/Service/Informador.php b/app_old/app/Service/Informador.php new file mode 100644 index 0000000..c64db26 --- /dev/null +++ b/app_old/app/Service/Informador.php @@ -0,0 +1,463 @@ +title = $title; + } else { + $this->title = 'Informe'; + } + } + + public function addColumn(string $title, $col = '') + { + if ($col == '') { + if ($this->columns == null) { + $i = 0; + } else{ + $i = count($this->columns); + } + $col = $this->mapColumn($i); + } + + if (isset($this->columns[$col])) { + $columns = []; + foreach ($this->columns as $c => $data) { + if (ord($c) < ord($col)) { + $columns[$c] = $data; + } elseif (ord($c) == ord($col)) { + $columns[$col] = $title; + } else { + $columns[chr(ord($c) + 1)] = $data; + } + } + $this->columns = $columns; + } else { + $this->columns[$col] = $title; + } + } + public function mapColumn($n) + { + $letters = range('A', 'Z'); + $max = count($letters); + $r = $n / $max + 1; + $p = floor($r - 1) - 1; + $i = $n % $max; + if ($r >= 2) { + return $letters[$p] . $letters[$i]; + } + return $letters[$i]; + } + public function getColumn($col_title) + { + return array_search($col_title, $this->columns); + } + public function getColumnNumber($col) + { + $letters = range('A', 'Z'); + if (strlen($col) > 1) { + $ls = str_split($col); + $n = 0; + foreach ($ls as $i => $l) { + $n += array_search($l, $letters) + $i * count($letters) + 1; + } + return $n; + } + return array_search($col, $letters); + } + public function addColumns(array $columns) + { + foreach ($columns as $column) { + $this->addColumn($column); + } + } + public function addData(int $row, $data, $col = '') + { + if (!isset($this->data[$row])) { + $this->data[$row] = []; + } + if ($col == '') { + $i = count($this->data[$row]); + $col = $this->mapColumn($i); + } elseif (ctype_print($col)) { + $col = $this->getColumn($col); + } else { + $col = $this->mapColumn($col); + } + + if (isset($this->data[$row][$col])) { + $data_array = []; + foreach ($this->data[$row] as $c => $d) { + if (ord($c) < ord($col)) { + $data_array[$c] = $d; + } elseif (ord($c) == ord($col)) { + $data_array[$col] = $this->parseData($data); + } else { + $data_array[chr(ord($c) + 1)] = $d; + } + } + $this->data[$row] = $data_array; + } else { + $this->data[$row][$col] = $this->parseData($data); + } + } + protected function parseData($data) + { + if ($this->isDate($data)) { + // Date + return Date::PHPToExcel($data); + } + return $data; + } + protected function isDate($data) + { + try { + if (strpos($data, '-') === false) { + return false; + } + $fecha = explode('-', $data); + if (count($fecha) != 3) { + return false; + } + list($year, $month, $day) = $fecha; + if (strlen($year) == 4 and strlen($month) <= 2 and strlen($day) <= 2) { + return true; + } + if (ctype_digit($year) and ctype_digit($month) and ctype_digit($day)) { + $f = Carbon::parse($data, config('app.timezone')); + return true; + } + return false; + } catch(\Exception $e) { + return false; + } + return false; + } + public function addDataRow(int $row, array $data_array) + { + foreach ($data_array as $data) { + $this->addData($row, $data); + } + } + public function addDatas(array $data_matrix) + { + foreach ($data_matrix as $row => $data_array) { + $this->addDataRow($row, $data_array); + } + } + protected function findTitleColumn($title) + { + return array_search($title, $this->columns); + } + public function addFormat($format, $title = '') + { + $col = 'A'; + if ($title == '') { + $i = count($this->col_formats); + $col = $this->mapColumn($i); + } else { + $col = $this->findTitleColumn($title); + } + + if (isset($this->col_formats[$col])) { + $columns = []; + foreach ($this->col_formats as $c => $data) { + if (ord($c) < ord($col)) { + $columns[$c] = $data; + } elseif (ord($c) == ord($col)) { + $columns[$col] = $this->translateFormat($format); + } else { + $columns[chr(ord($c) + 1)] = $data; + } + } + $this->col_formats = $columns; + } else { + $this->col_formats[$col] = $this->translateFormat($format); + } + + uksort($this->col_formats, function($ak, $bk) { + return strcmp($ak, $bk); + }); + } + protected function translateFormat(array $format) + { + $translated = []; + foreach ($format as $category => $values) { + switch ($category) { + case 'numberFormat': + $data = $this->translateNumberFormat($values); + break; + case 'alignment': + $data = $this->translateAlignment($values); + break; + case 'font': + $data = $this->translateFont($values); + break; + case 'fill': + $data = $this->translateFill($values); + break; + case 'borders': + $data = $this->translateBorders($values); + break; + } + $translated[$category] = $data; + } + return $translated; + } + protected function translateNumberFormat(array $values) + { + $translated = []; + foreach ($values as $value) { + switch ($value) { + case 'short-date': + $translated['formatCode'] = 'dd-mm-yyyy'; + break; + case 'date': + $translated['formatCode'] = 'dd mmmm, yyyy'; + break; + case 'thousands': + $translated['formatCode'] = NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1; + break; + case 'pesos': + $translated['formatCode'] = '$ #.###'; + break; + default: + $translated['formatCode'] = $value; + } + } + return $translated; + } + protected function translateAlignment(array $values) + { + $translated = []; + foreach ($values as $type => $value) { + switch ($type) { + case 'horizontal': + switch ($value) { + case 'center': + $new = Alignment::HORIZONTAL_CENTER; + break; + } + break; + case 'vertical': + switch ($value) { + case 'middle': + case 'center': + $new = Alignment::VERTICAL_CENTER; + } + default: + $new = $value; + break; + } + $translated[$type] = $new; + } + return $translated; + } + protected function translateFont(array $values) + { + $translated = []; + foreach ($values as $type => $value) { + switch ($type) { + case 'color': + $new = $this->translateColor($value); + break; + default: + $new = $value; + break; + } + $translated[$type] = $new; + } + return $translated; + } + protected function translateFill(array $values) + { + $translated = []; + foreach ($values as $type => $value) { + switch ($type) { + case 'fillType': + switch ($value) { + case 'solid': + $new = Fill::FILL_SOLID; + break; + default: + $new = $value; + break; + } + break; + case 'color': + $new = $this->translateColor($value); + break; + default: + $new = $value; + break; + } + $translated[$type] = $new; + } + return $translated; + } + protected function translateBorders(array $values) + { + $translated = []; + foreach ($format as $category => $value) { + switch ($category) { + case 'allBorders': + case 'left': + case 'right': + case 'top': + case 'bottom': + case 'diagonal': + case 'vertical': + case 'horizontal': + $data = $this->translateBorder($value); + break; + default: + $data = $value; + } + $translated[$category] = $data; + } + return $translated; + } + protected function translateBorder(array $values) + { + $translated = []; + foreach ($values as $type => $value) { + switch ($type) { + case 'color': + $new = $this->translateColor($value); + break; + default: + $new = $value; + break; + } + $translated[$type] = $new; + } + return $translated; + } + protected function translateColor($color) + { + $color_definitions = [ + 'red' => 'ff0000', + 'light-red' => 'ffcccc', + 'dark-red' => 'a00000' + ]; + if (is_array($color)) { + $t = dechex(255 * $color['transparency'] / 100); + $c = $color_definitions[$color['color']]; + $hex = $t . $c; + return ['argb' => $hex]; + } + return ['rgb' => $color_definitions[$color]]; + } + public function addFormats(array $formats) + { + foreach ($formats as $title => $format) { + $this->addFormat($format, $title); + } + } + public function addTotal(string $col) + { + if (isset($this->columns[$col])) { + $sum = 0; + foreach ($this->data as $row => $data) { + $sum += $data[$col]; + } + $this->totals[$col] = $sum; + } + } + public function addAverage(string $col) + { + $this->addTotal($col); + $this->totals[$col] /= count($this->data); + } + + protected function fillData() + { + foreach ($this->data as $row => $data) { + $this->data[$row] = $this->fillAndSort($data); + } + if (count($this->totals) > 0) { + $this->totals = $this->fillAndSort($this->totals); + } + } + protected function fillAndSort(array $row) + { + foreach ($this->columns as $val) { + if (!isset($row[$val])) { + $row[$val] = ''; + } + } + function sortArrayByArray(Array $array, Array $orderArray) { + $ordered = array(); + foreach($orderArray as $key) { + if(array_key_exists($key, $array)) { + $ordered[$key] = $array[$key]; + unset($array[$key]); + } + } + return $ordered + $array; + } + $row = sortArrayByArray($row, $this->columns); + + return $row; + } + + public function informe() + { + $ea = new Spreadsheet(); + $ea->getProperties()->setCreator('Juan Pablo Vial B.'); + $ea->getProperties()->setTitle($this->title); + $ea->getProperties()->setCompany('Incoviba S.A.'); + + $ews = $ea->getActiveSheet(); + + $ews->fromArray(array($this->columns), '', 'A1'); + $ews->fromArray($this->data, '', 'A2'); + $end = 2; + if ($this->totals != null and count($this->totals) > 0) { + $ews->fromArray($this->totals, '', 'A' . count($data) + 2); + $end = 3; + } + + if ($this->col_formats != null and count($this->col_formats) > 0) { + foreach ($this->col_formats as $col => $format) { + $ews->getStyleByColumnAndRow($this->getColumnNumber($col), 2, $this->getColumnNumber($col), count($this->data) + $end)->applyFromArray($format); + } + } + + for ($col = 0; $col < count($this->columns); $col ++) { + $ews->getColumnDimensionByColumn($col)->setAutoSize(true); + } + + $ews->setAutoFilterByColumnAndRow(0, 1, count($this->columns) - 1, count($this->data)); + + $hoy = Carbon::now(config('app.timezone')); + $filename = str_replace('ñ', 'n', $this->title . ' - ' . $hoy->format('Y-m-d') . '.xlsx'); + + $writer = IOFactory::createWriter($ea, "Xlsx"); + + header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; charset=utf-8"); + header('Content-Transfer-Encoding: binary'); + header('Content-Disposition: attachment; filename="' . $filename . '"'); + header('Cache-Control: max-age=0'); + + $writer->save('php://output'); + } +} +?> diff --git a/app_old/app/Service/Informe/Contabilidad/Resumen.php b/app_old/app/Service/Informe/Contabilidad/Resumen.php new file mode 100644 index 0000000..e20266a --- /dev/null +++ b/app_old/app/Service/Informe/Contabilidad/Resumen.php @@ -0,0 +1,190 @@ +separator = $separator; + } + + protected function getVentas($id_proyecto) + { + $proyecto = model(Proyecto::class)->findOne($id_proyecto); + $ventas = $proyecto->ventas(); + $output = []; + foreach ($ventas as $venta) { + $found = false; + foreach ($output as $v) { + if ($v->unidad()->descripcion == $venta->unidad()->descripcion) { + $found = true; + break; + } + } + if (!$found) { + $output []= $venta; + } + } + return $output; + } + protected function startOfYear(DateTimeInterface $up_to) + { + return new DateTimeImmutable((clone $up_to)->sub(new DateInterval('P1Y'))->format('31-12-Y')); + } + protected function defaultValueDate(DateTimeInterface $up_to, $glosa = '') + { + return (object) ['fecha' => $this->startOfYear($up_to), 'valor' => 0, 'glosa' => $glosa, 'estado' => '']; + } + protected function extractValueDate(Pago $pago, $glosa = '') + { + return (object) ['fecha' => $pago->fecha(), 'valor' => $pago->valor, 'glosa' => $glosa, 'estado' => $pago->estado()->tipo()->descripcion]; + } + protected function getAnticipos(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->pie == 0) { + return [$this->defaultValueDate($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 or strtolower($item->pago()->estado()->tipo()->descripcion) == 'no pagado') { + return $sum; + } + if ($item->pago()->fecha() >= $ly) { + return $sum; + } + return $sum + $item->pago()->valor; + }); + $current = array_filter($cuotas, function($item) use ($ly) { + return $item->pago()->fecha() >= $ly; + }); + foreach ($current as &$item) { + $item = $this->extractValueDate($item->pago(), "Cuota {$item->numero}"); + } + return array_merge([(object) ['fecha' => $ly, 'valor' => $older, 'glosa' => 'Anticipo acumulado', 'estado' => 'Pagado']], $current); + } + protected function getReajuste(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->pie == 0 or $venta->pie()->reajuste == null) { + return $this->defaultValueDate($up_to, 'Reajuste'); + } + return $this->extractValueDate($venta->pie()->reajuste(), 'Reajuste'); + } + protected function getAbono(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->escritura == 0) { + return $this->defaultValueDate($up_to, 'Abono'); + } + return $this->extractValueDate($venta->escritura()->pago(), 'Abono'); + } + protected function getBono(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->bono_pie == 0) { + return $this->defaultValueDate($up_to, 'Bono Pie'); + } + return $this->extractValueDate($venta->bonoPie()->pago(), 'Bono Pie'); + } + protected function getCredito(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->credito == 0) { + return $this->defaultValueDate($up_to, 'Credito'); + } + return $this->extractValueDate($venta->credito()->pago(), 'Credito'); + } + protected function getSubsidio(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->subsidio == 0) { + return [$this->defaultValueDate($up_to, 'Ahorro'), $this->defaultValueDate($up_to, 'Subsidio')]; + } + return [$this->extractValueDate($venta->subsidio()->pago(), 'Ahorro'), $this->extractValueDate($venta->subsidio()->subsidio(), 'Subsidio')]; + } + protected function getResciliacion(Venta $venta, DateTimeInterface $up_to) + { + if ($venta->resciliacion == null) { + return $this->defaultValueDate($up_to, 'Resciliacion'); + } + return $this->extractValueDate($venta->resciliacion()->pago(), 'Resciliacion'); + } + 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 buildLine(Venta $venta, $pago) + { + if ($pago->valor > 0) { + return ['', $venta->unidad()->descripcion, $pago->fecha->format('d/m/Y'), $pago->glosa, '', $pago->valor, $pago->estado]; + } + return ['', $venta->unidad()->descripcion, $pago->fecha->format('d/m/Y'), $pago->glosa, -$pago->valor, '', $pago->estado]; + } + protected function buildLibro(Venta $venta, DateTimeInterface $up_to) + { + $pagos = $this->getPagos($venta, $up_to); + $output = [ + ['', "Cuenta: Anticipos Dpto {$venta->unidad()->descripcion}"], + ['', 'Fecha', 'Glosa', 'Haber', 'Debe', 'Estado'] + ]; + $debe = 0; + $haber = 0; + foreach ($pagos as $pago) { + $output []= $this->buildLine($venta, $pago); + if ($pago->valor > 0) { + $debe += $pago->valor; + } + else { + $haber -= $pago->valor; + } + } + $output []= ['', '', '', 'Total', $haber, $debe]; + return $output; + } + + public function build(int $id_proyecto, DateTimeInterface $up_to) + { + ini_set('max_execution_time', 60 * 60); + $ventas = $this->getVentas($id_proyecto); + + $output = ["Libro Mayor {$ventas[0]->proyecto()->descripcion}", '']; + foreach ($ventas as $venta) { + $output = array_merge($output, $this->buildLibro($venta, $up_to)); + } + + $filename = "Contabilidad - Resumen - {$ventas[0]->proyecto()->descripcion} - {$up_to->format('Y-m-d')}.xlsx"; + $informe = new Informe(); + $informe->createSpreadsheet() + ->addArray($output) + ->formatColumn('E') + ->formatColumn('F') + ->send($filename); + } +} diff --git a/app_old/app/Service/Informe/Informe.php b/app_old/app/Service/Informe/Informe.php new file mode 100644 index 0000000..8254a10 --- /dev/null +++ b/app_old/app/Service/Informe/Informe.php @@ -0,0 +1,55 @@ +spreadsheet = new Spreadsheet(); + return $this; + } + protected function formatArray(array $data) + { + $maxCols = 0; + foreach ($data as $row) { + if (!is_array($row)) { + continue; + } + if (count($row) > $maxCols) { + $maxCols = count($row); + } + } + foreach ($data as &$row) { + if (!is_array($row)) { + $row = [$row]; + } + if (count($row) < $maxCols) { + $row = array_merge($row, array_fill(0, $maxCols - count($row), '')); + } + } + return $data; + } + public function addArray(array $data, string $start = 'A1') + { + $this->spreadsheet->getActiveSheet()->fromArray($this->formatArray($data), null, $start); + return $this; + } + public function formatColumn(string $column) + { + $this->spreadsheet->getActiveSheet()->getStyle("{$column}:{$column}")->getNumberFormat()->setFormatCode('#,##0'); + return $this; + } + public function send(string $filename) + { + header('Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'); + header("Content-Disposition: attachment;filename=\"{$filename}\""); + header('Cache-Control: max-age=0'); + + $writer = IOFactory::createWriter($this->spreadsheet, 'Xlsx'); + $writer->save('php://output'); + } +} diff --git a/app_old/app/Service/Money.php b/app_old/app/Service/Money.php new file mode 100644 index 0000000..2472e62 --- /dev/null +++ b/app_old/app/Service/Money.php @@ -0,0 +1,55 @@ +parseDate($date); + if (!$this->checkNextMonthValueCalculationByDate($date)) { + return $this->emptyResult(); + } + + $response = $this->client->get('api/uf/value/' . $date->format('Y-m-d')); + + if (!$this->isOk($response)) { + return $this->emptyResult(); + } + + $body = $response->getBody()->getContents(); + if (trim($response->getBody()) === '') { + return $this->emptyResult(); + } + return json_decode($body); + } + + protected function parseDate(string|DateTimeInterface $date): DateTimeInterface + { + if (is_string($date)) { + $date = Carbon::parse($date, config('app.timezone')); + } + return $date; + } + protected function checkNextMonthValueCalculationByDate(DateTimeInterface $date): bool + { + $next_m_9 = Carbon::today(config('app.timezone'))->copy()->endOfMonth()->addDays(9); + $date = Carbon::parse($date); + return $date->lessThan($next_m_9); + } + protected function isOk(ResponseInterface $response): bool + { + $statusCode = $response->getStatusCode(); + return $statusCode >= 200 and $statusCode < 300; + } + protected function emptyResult(): object + { + return (object) ['total' => 0]; + } +} diff --git a/app_old/app/Service/Register.php b/app_old/app/Service/Register.php new file mode 100644 index 0000000..03f96e0 --- /dev/null +++ b/app_old/app/Service/Register.php @@ -0,0 +1,34 @@ + $user, + 'action' => $action, + 'time' => Carbon::now(config('app.timezone'))->toDateTimeString()//->format('Y-m-d HH:mm:ss') + ]; + $registry = model(RModel::class) + ->where('user', $user) + ->where('action', $action) + ->where('time', $data['time']) + ->findOne(); + if (!$registry) { + $registry = model(RModel::class)->create($data); + $registry->save(); + } + foreach ($variables as $data) { + $data['registry'] = $registry->id; + $log = (new Factory(RegistryData::class))->where($data)->find(); + if (!$log) { + $log = model(RegistryData::class)->create($data); + $log->save(); + } + } + } +} diff --git a/app_old/app/Service/Remote.php b/app_old/app/Service/Remote.php new file mode 100644 index 0000000..77418a2 --- /dev/null +++ b/app_old/app/Service/Remote.php @@ -0,0 +1,19 @@ +connection->connect(); + $statement = $connection->query($query); + $result = $statement->fetch(PDO::FETCH_ASSOC); + return $result['ip']; + } +} diff --git a/app_old/app/Service/Replacer.php b/app_old/app/Service/Replacer.php new file mode 100644 index 0000000..bf61513 --- /dev/null +++ b/app_old/app/Service/Replacer.php @@ -0,0 +1,127 @@ +parseLine($line); + + $output = $line; + foreach ($instructions as $instruction) { + $output = str_replace($instruction['original'], $this->buildLine($instruction['instruction'], $data), $output); + } + return $output; + } + protected function parseLine($line) + { + $ini_el = '[['; + $end_el = ']]'; + + $instructions = []; + $offset = 0; + while (strpos($line, $ini_el, $offset) !== false) { + $ini = strpos($line, $ini_el, $offset) + strlen($ini_el); + $end = strpos($line, $end_el, $offset); + $find = substr($line, $ini, $end - $ini); + $instructions []= ['original' => $ini_el . $find . $end_el, 'instruction' => $find]; + $offset = $end + 1; + } + return $instructions; + } + protected function buildLine($instructions, $data) + { + if (strpos($instructions, '|') !== false) { + $instructions = explode('|', $instructions); + } else { + $instructions = [$instructions]; + } + $output = ''; + foreach ($instructions as $instruction) { + $output = $this->buildReplace($instruction, $data, $output); + } + return $output; + } + protected function buildReplace($instruction, $data, $output = null) + { + if (strpos($instruction, '(') !== false) { + $ini = strpos($instruction, '(') + 1; + $end = strpos($instruction, ')'); + $mod = substr($instruction, $ini, $end - $ini); + $instruction = substr($instruction, 0, $ini - 1); + } + switch ($instruction) { + case 'UPPER': + return strtoupper($output); + case 'LOWER': + return strtolower($output); + case 'ISSET': + if ($output != '') { + return ', ' . $output; + } + return ''; + case 'UFS': + return format('ufs', $output); + case 'PESOS': + return format('pesos', $output); + } + + if (isset($mod)) { + $obj = $this->find($instruction . '(' . $mod .')', $data); + } else { + $obj = $this->find($instruction, $data); + } + if ($obj) { + return $obj; + } + if (is_object($output) and method_exists($output, $instruction)) { + if (isset($mod)) { + return $output->$instruction($mod); + } + return $output->$instruction(); + } + if (is_object($output) and isset($output->$instruction)) { + return $output->$instruction; + } + if ($instruction == 'strftime') { + setlocale(LC_TIME, 'es-CL', 'es'); + $f = Carbon::parse($output, config('app.timezone')); + $output = strftime($mod, $f->timestamp); + return $output; + } + + d($output, $instruction, function_exists($instruction), is_object($output), is_object($output) and isset($output->$instruction)); + } + protected function find($instruction, $data) + { + if (strpos($instruction, '(') !== false) { + $ini = strpos($instruction, '(') + 1; + $end = strpos($instruction, ')'); + $mod = substr($instruction, $ini, $end - $ini); + $instruction = substr($instruction, 0, $ini - 1); + } + if (method_exists($data, $instruction)) { + if (isset($mod)) { + return $data->$instruction($mod); + } + return $data->$instruction(); + } + if (isset($data->$instruction)) { + return $data->$instruction; + } + switch ($instruction) { + case 'Unidades': + $str = 'Departamento ' . $data->reserva()->unidad()->numeracion; + foreach ($data->reserva()->unidades() as $unidad) { + $str .= ', ' . ucwords($unidad->unidadProyecto()->tipo()->descripcion) . ' ' . $unidad->numeracion; + } + return $str; + case 'inmobiliaria': + return $data->proyecto()->inmobiliaria(); + } + return false; + } +} +?> \ No newline at end of file diff --git a/app_old/app/Service/Route.php b/app_old/app/Service/Route.php new file mode 100644 index 0000000..f910f87 --- /dev/null +++ b/app_old/app/Service/Route.php @@ -0,0 +1,131 @@ +add($t, $query, $callback); + } + } else { + switch (strtoupper($type)) { + case 'GET': + $this->get($query, $callback); + break; + case 'POST': + $this->post($query, $callback); + break; + } + } + } + public function get($query, $callback) + { + if ($this->exists('get', $query)) { + return; + } + $this->routes['get'][$query] = (object) ['query' => $query, 'callback' => $this->parseCallback($callback)]; + } + public function post($query, $callback) + { + if ($this->exists('post', $query)) { + return; + } + $this->routes['post'][$query] = (object) ['query' => $query, 'callback' => $this->parseCallback($callback)]; + } + protected function exists($type, $query) + { + return isset($this->routes['post'][$query]); + } + protected function parseCallback($callback) + { + if (is_callable($callback)) { + return $callback; + } + elseif (is_object($callback)) { + return [$callback, 'index']; + } + elseif (is_string($callback) and strpos($callback, '@') !== false) { + list($class, $method) = explode('@', $callback); + $class = '\\App\\Controller\\' . $class; + if (method_exists($class, $method)) { + return [$class, $method]; + } + } + elseif (is_string($callback)) { + $class = '\\App\\Controller\\' . $callback; + return [$class, 'index']; + } + } + public function route() + { + $url = $_SERVER['SCRIPT_NAME']; + $query = $_SERVER['QUERY_STRING']; + $method = $_SERVER['REQUEST_METHOD']; + $route = null; + switch (strtoupper($method)) { + case 'GET': + $route = $this->getGet($url, $query); + break; + case 'POST': + $route = $this->getPost($url, $query); + break; + } + if ($route) { + return $this->run($route->callback); + } + return false; + } + protected function getGet($url, $query) + { + if (isset($this->routes['get'][$url])) { + return $this->routes['get'][$url]; + } + $p = get('p'); + if ($p == null) { + $p = get('page'); + if ($p == null) { + $p = get('m'); + if ($p == null) { + $p = get('module'); + } + } + } + if (isset($this->routes['get'][$p])) { + return $this->routes['get'][$p]; + } + return false; + } + protected function getPost($url, $query) + { + if (isset($this->routes['post'][$url])) { + return $this->routes['post'][$url]; + } + $p = get('p'); + if ($p == null) { + $p = get('page'); + if ($p == null) { + $p = get('m'); + if ($p == null) { + $p = get('module'); + } + } + } + if (isset($this->routes['post'][$p])) { + return $this->routes['post'][$p]; + } + return false; + } + protected function run($callback) + { + return call_user_func($callback); + } +} +?> \ No newline at end of file diff --git a/app_old/bin/Pipfile b/app_old/bin/Pipfile new file mode 100644 index 0000000..8108982 --- /dev/null +++ b/app_old/bin/Pipfile @@ -0,0 +1,12 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] + +[packages] +gunicorn = "*" + +[requires] +python_version = "3.8" diff --git a/app_old/bin/console b/app_old/bin/console new file mode 100644 index 0000000..11aaaef --- /dev/null +++ b/app_old/bin/console @@ -0,0 +1,3 @@ +#!/bin/bash + +php /code/bin/index.php "$@" diff --git a/app_old/bin/index.php b/app_old/bin/index.php new file mode 100644 index 0000000..ff23b96 --- /dev/null +++ b/app_old/bin/index.php @@ -0,0 +1,8 @@ +run(); diff --git a/app_old/bin/informes/Pipfile b/app_old/bin/informes/Pipfile new file mode 100644 index 0000000..e8687af --- /dev/null +++ b/app_old/bin/informes/Pipfile @@ -0,0 +1,16 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] + +[packages] +pandas = "*" +xlsxwriter = "*" +httpx = "*" +flask = "*" +numpy = "*" + +[requires] +python_version = "3.8" diff --git a/app_old/bin/informes/app.py b/app_old/bin/informes/app.py new file mode 100644 index 0000000..ff2a8f0 --- /dev/null +++ b/app_old/bin/informes/app.py @@ -0,0 +1,14 @@ +import argparse +from flask import Flask +from controllers.ventas import ventas_blueprint + + +app = Flask(__name__) +app.register_blueprint(ventas_blueprint, url_prefix='/ventas') + + +if __name__ == '__main__': + parser = argparse.ArgumentParser() + parser.add_argument('-p', '--port', default=8011) + args = parser.parse_args() + app.run(port=args.port, debug=True) diff --git a/app_old/bin/informes/controllers/ventas.py b/app_old/bin/informes/controllers/ventas.py new file mode 100644 index 0000000..ab3ffce --- /dev/null +++ b/app_old/bin/informes/controllers/ventas.py @@ -0,0 +1,141 @@ +from flask import Blueprint, request, Response +import io +import json +import pandas as pd +import numpy as np +import datetime + + +ventas_blueprint = Blueprint('ventas', __name__,) + + +def format_data(data): + df = pd.DataFrame(data) + int_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] + for col in int_columns: + 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', 'Precio'] + for col in float_columns: + if col in df.columns: + df[col] = pd.to_numeric(df[col], errors='coerce') + df = df.replace(np.nan, 0, regex=True) + + df['Fecha Venta'] = pd.to_datetime(df['Fecha Venta'], format='%Y-%m-%d') + df = df.sort_values(by=['Fecha Venta', 'Departamento']) + df['Fecha Venta'] = df['Fecha Venta'].dt.strftime('%d.%m.%Y') + + return df + + +def format_columns(workbook, columns): + column_settings = [{'header': column} for column in columns] + + center_format = workbook.add_format({'align': 'center'}) + amount_format = workbook.add_format({'num_format': '#,##0.00'}) + percent_format = workbook.add_format({'num_format': '0.00%'}) + + 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', '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'] + count_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] + + for (k, col) in enumerate(column_settings): + if col['header'] in amount_columns: + column_settings[k]['format'] = amount_format + if col['header'] in center_columns: + column_settings[k]['format'] = center_format + if col['header'] in sum_columns: + column_settings[k]['total_function'] = 'sum' + if col['header'] in count_columns: + column_settings[k]['total_function'] = 'count' + if col['header'] == '% Pie Pagado': + column_settings[k]['format'] = percent_format + if col['header'] == 'Propietario': + column_settings[k]['total_string'] = 'TOTAL' + + return column_settings + + +def format_excel(workbook, worksheet, data): + center_format = workbook.add_format({'align': 'center'}) + amount_format = workbook.add_format({'num_format': '#,##0.00'}) + percent_format = workbook.add_format({'num_format': '0.00%'}) + + 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', 'Precio'] + center_columns = ['Departamento', 'Estacionamientos', 'Bodegas'] + + for col in amount_columns: + if col not in data.columns: + continue + k = data.columns.get_loc(col) + 1 + worksheet.set_column(k, k, cell_format=amount_format) + for col in center_columns: + if col not in data.columns: + continue + k = data.columns.get_loc(col) + 1 + worksheet.set_column(k, k, cell_format=center_format) + col = '% Pie Pagado' + k = data.columns.get_loc(col) + 1 + worksheet.set_column(k, k, cell_format=percent_format) + + return worksheet + + +@ventas_blueprint.route('', methods=['POST']) +def ventas(): + data = json.loads(request.data) + output = io.BytesIO() + writer = pd.ExcelWriter('tmp.xlsx', engine='xlsxwriter') + df = format_data(data['data']) + + start_row = 4 + if 'CompañÃa' in data: + start_row += 1 + df.to_excel(writer, startrow=start_row+1, startcol=1, header=False, index=False, sheet_name='Ventas') + wb = writer.book + wb.filename = output + + title_format = wb.add_format({'font_size': 16, 'bold': True}) + ws = writer.sheets['Ventas'] + (max_row, max_col) = df.shape + + if 'CompañÃa' in data: + ws.merge_range(1, 1, 1, max_col, data['CompañÃa']) + ws.merge_range(start_row-3, 1, start_row-3, max_col, data['Proyecto'], cell_format=title_format) + ws.write_string(start_row-2, 1, 'Ventas') + column_settings = format_columns(wb, df.columns) + ws.add_table(start_row, 1, max_row+start_row+1, max_col, {'name': 'Ventas', 'total_row': 1, + 'columns': column_settings, + 'style': 'Table Style Medium 1'}) + ws = format_excel(wb, ws, df) + + column_widths = { + 'B': 46, + 'C': 16, + 'D': 18, + 'E': 10, + 'F': 13, + 'G': 7, + 'H': 8, + 'I': 16, + 'J': 16, + 'K': 13, + 'L': 14 + } + for (col, wd) in column_widths.items(): + ws.set_column('{0}:{0}'.format(col), wd) + + writer.save() + output.seek(0) + date = datetime.date.today() + filename = "Informe de Ventas - {0} - {1}.xlsx".format(data['Proyecto'], date.strftime('%Y-%m-%d')) + return Response(output, mimetype="application/ms-excel", + headers={"Content-Disposition": "attachment;filename={0}".format(filename), + "Content-Type": 'application/octet-stream; charset=utf-8'}) diff --git a/app_old/bootstrap/autoload.php b/app_old/bootstrap/autoload.php new file mode 100644 index 0000000..318f80d --- /dev/null +++ b/app_old/bootstrap/autoload.php @@ -0,0 +1,8 @@ + diff --git a/app_old/bootstrap/database.php b/app_old/bootstrap/database.php new file mode 100644 index 0000000..4372bf2 --- /dev/null +++ b/app_old/bootstrap/database.php @@ -0,0 +1,29 @@ + $data) { + load($data, $name); +} + +function load($data, $name = '') { + if (!isset($data['port'])) { + $port = 3306; + } else { + $port = $data['port']; + } + $dsn = 'mysql:host=' . $data['host'] . ';port=' . $port . ';dbname=' . $data['database'] . ';charset=utf8'; + + if ($name != '') { + ORM::configure($dsn, null, $name); + ORM::configure('username', $data['username'], $name); + ORM::configure('password', $data['password'], $name); + } else { + ORM::configure($dsn, null); + ORM::configure('username', $data['username']); + ORM::configure('password', $data['password']); + } +} + +Model::$short_table_names = true; diff --git a/app_old/bootstrap/dotenv.php b/app_old/bootstrap/dotenv.php new file mode 100644 index 0000000..799a5b1 --- /dev/null +++ b/app_old/bootstrap/dotenv.php @@ -0,0 +1,12 @@ +isDir() or $file->getExtension() != 'env') { + continue; + } + $env = Dotenv::createImmutable($file->getPath(), $file->getBasename()); + $env->load(); +} diff --git a/app_old/bootstrap/errors.php b/app_old/bootstrap/errors.php new file mode 100644 index 0000000..0e54dc4 --- /dev/null +++ b/app_old/bootstrap/errors.php @@ -0,0 +1,7 @@ +pushHandler(new \Whoops\Handler\PrettyPageHandler); + $whoops->register(); +}*/ +?> diff --git a/app_old/bootstrap/logs.php b/app_old/bootstrap/logs.php new file mode 100644 index 0000000..249be53 --- /dev/null +++ b/app_old/bootstrap/logs.php @@ -0,0 +1,26 @@ +underscored(); + Route::add(['GET', 'POST'], $route, $name); +} + +Route::add(['GET', 'POST'], 'buscar', 'Buscar'); +?> \ No newline at end of file diff --git a/setup/cli.app.php b/app_old/cli/app.php similarity index 100% rename from setup/cli.app.php rename to app_old/cli/app.php diff --git a/setup/cli/config.php b/app_old/cli/cli/config.php similarity index 100% rename from setup/cli/config.php rename to app_old/cli/cli/config.php diff --git a/setup/cli/middlewares.php b/app_old/cli/cli/middlewares.php similarity index 100% rename from setup/cli/middlewares.php rename to app_old/cli/cli/middlewares.php diff --git a/setup/cli/setups.php b/app_old/cli/cli/setups.php similarity index 82% rename from setup/cli/setups.php rename to app_old/cli/cli/setups.php index 33b847a..6c4a99f 100644 --- a/setup/cli/setups.php +++ b/app_old/cli/cli/setups.php @@ -1,4 +1,5 @@ function(ContainerInterface $container) { - return new App\Alias\RemoteConnection(); + \App\Alias\RemoteConnection::class => function(ContainerInterface $container) { + return new \App\Alias\RemoteConnection(); }, App\Service\Remote::class => function(ContainerInterface $container) { - return new App\Service\Remote($container->get(App\Alias\RemoteConnection::class)); + return new App\Service\Remote($container->get(\App\Alias\RemoteConnection::class)); }, App\Service\Money::class => function(ContainerInterface $container) { return new App\Service\Money($container->get(GuzzleHttp\Client::class)); }, - App\Alias\Connection::class => function(ContainerInterface $container) { + \App\Alias\Connection::class => function(ContainerInterface $container) { $data = $container->get('databases')->get(ORM::DEFAULT_CONNECTION); - return new App\Alias\Connection( + return new \App\Alias\Connection( $data->get('host'), $data->get('database'), $data->get('username'), diff --git a/setup/composer.php b/app_old/cli/composer.php similarity index 100% rename from setup/composer.php rename to app_old/cli/composer.php diff --git a/app_old/composer.json b/app_old/composer.json new file mode 100644 index 0000000..bfbfb8e --- /dev/null +++ b/app_old/composer.json @@ -0,0 +1,69 @@ +{ + "name" : "aldarien/incoviba", + "description" : "Intranet portal for Incoviba", + "type" : "project", + "require" : { + "aldarien/asset": "*", + "aldarien/config": "*", + "aldarien/format": "*", + "aldarien/response": "*", + "aldarien/session": "*", + "aldarien/url": "*", + "aldarien/view": "*", + "berrnd/slim-blade-view": "^0.1.1", + "guzzlehttp/guzzle": "*", + "incoviba/modelos": "*", + "j4mie/paris": "^1.5", + "monolog/monolog": "^3", + "nesbot/carbon": "^2", + "nyholm/psr7": "*", + "nyholm/psr7-server": "*", + "php-di/php-di": "*", + "php-di/slim-bridge": "*", + "phpoffice/phpspreadsheet": "^1", + "phpoffice/phpword": "^0", + "rubellum/slim-blade-view": "*", + "slam/php-excel": "^4.4", + "slim/slim": "^4", + "symfony/console": "6.4.x-dev", + "vlucas/phpdotenv": "^5.3", + "voku/stringy": "^6" + }, + "require-dev" : { + "phpunit/phpunit" : "*", + "kint-php/kint" : "*", + "filp/whoops" : "*" + }, + "license" : "GNU AGPLv3", + "authors" : [{ + "name" : "Aldarien", + "email" : "jpvial@gmail.com" + } + ], + "autoload" : { + "psr-4" : { + "App\\" : "app/", + "ProVM\\Common\\": "provm/common/" + }, + "files" : [ + "app/Helper/functions.php" + ] + }, + "minimum-stability": "dev", + "repositories": [ + { + "type": "path", + "url": "./aldarien/**", + "options": { + "symlink": true + } + }, + { + "type": "path", + "url": "./incoviba/modelos" + } + ], + "config": { + "sort-packages": true + } +} diff --git a/app_old/config/app.php b/app_old/config/app.php new file mode 100644 index 0000000..4db5c28 --- /dev/null +++ b/app_old/config/app.php @@ -0,0 +1,9 @@ + 'America/Santiago', + 'locale' => 'es', + 'database' => 'mysql', + 'debug' => false, + 'benchmark' => false, + 'login_hours' => 5*24 +]; diff --git a/app_old/config/databases.php b/app_old/config/databases.php new file mode 100644 index 0000000..14e279f --- /dev/null +++ b/app_old/config/databases.php @@ -0,0 +1,24 @@ + [ + 'host' => $_ENV['MYSQL_HOST'], + 'database' => $_ENV['MYSQL_DATABASE'], + 'username' => $_ENV['MYSQL_USER'], + 'password' => $_ENV['MYSQL_PASSWORD'] + ], + 'mysql_copy' => [ + 'host' => 'localhost', + 'database' => 'incoviba3', + 'username' => 'incoviba', + 'password' => $_ENV['MYSQL_PASSWORD'] + ] + ]; + if (isset($_ENV['MYSQL_PORT'])) { + $arr['mysql']['port'] = $_ENV['MYSQL_PORT']; + } + return $arr; +} +return buildDatabaseConfig(); diff --git a/app_old/config/incoviba.php b/app_old/config/incoviba.php new file mode 100644 index 0000000..d21d9e8 --- /dev/null +++ b/app_old/config/incoviba.php @@ -0,0 +1,6 @@ + [ + 'caducidad' => 30 + ] +]; diff --git a/app_old/config/locations.php b/app_old/config/locations.php new file mode 100644 index 0000000..05442b6 --- /dev/null +++ b/app_old/config/locations.php @@ -0,0 +1,16 @@ + root(), + 'cache' => '{locations.base}/cache', + 'public' => '{locations.base}/public', + 'resources' => '{locations.base}/resources', + 'views' => '{locations.resources}/views', + 'src' => '{locations.base}/src', + //'languages' => '{locations.resources}/languages' + 'app' => '{locations.base}/app', + 'controllers' => '{locations.app}/Controller', + 'money' => 'provm.cl/optimus/money', + 'api' => '192.168.1.100/intranet/api', + 'api_url' => '/api' +]; +?> diff --git a/app_old/fontify.json b/app_old/fontify.json new file mode 100644 index 0000000..923703c --- /dev/null +++ b/app_old/fontify.json @@ -0,0 +1,7 @@ +{ + "modules": [ + "bootstrap", + "font-awesome" + ], + "dest": "public" +} \ No newline at end of file diff --git a/incoviba/modelos/.gitignore b/app_old/incoviba/modelos/.gitignore similarity index 100% rename from incoviba/modelos/.gitignore rename to app_old/incoviba/modelos/.gitignore diff --git a/incoviba/modelos/common/Alias/Model.php b/app_old/incoviba/modelos/common/Alias/Model.php similarity index 100% rename from incoviba/modelos/common/Alias/Model.php rename to app_old/incoviba/modelos/common/Alias/Model.php diff --git a/incoviba/modelos/common/Alias/NewEstado.php b/app_old/incoviba/modelos/common/Alias/NewEstado.php similarity index 100% rename from incoviba/modelos/common/Alias/NewEstado.php rename to app_old/incoviba/modelos/common/Alias/NewEstado.php diff --git a/incoviba/modelos/common/Alias/NewModel.php b/app_old/incoviba/modelos/common/Alias/NewModel.php similarity index 100% rename from incoviba/modelos/common/Alias/NewModel.php rename to app_old/incoviba/modelos/common/Alias/NewModel.php diff --git a/incoviba/modelos/common/Alias/NewTipo.php b/app_old/incoviba/modelos/common/Alias/NewTipo.php similarity index 100% rename from incoviba/modelos/common/Alias/NewTipo.php rename to app_old/incoviba/modelos/common/Alias/NewTipo.php diff --git a/incoviba/modelos/common/Alias/OldModel.php b/app_old/incoviba/modelos/common/Alias/OldModel.php similarity index 100% rename from incoviba/modelos/common/Alias/OldModel.php rename to app_old/incoviba/modelos/common/Alias/OldModel.php diff --git a/incoviba/modelos/common/Factory/Model.php b/app_old/incoviba/modelos/common/Factory/Model.php similarity index 100% rename from incoviba/modelos/common/Factory/Model.php rename to app_old/incoviba/modelos/common/Factory/Model.php diff --git a/incoviba/modelos/composer.json b/app_old/incoviba/modelos/composer.json similarity index 100% rename from incoviba/modelos/composer.json rename to app_old/incoviba/modelos/composer.json diff --git a/incoviba/modelos/src/common/Action.php b/app_old/incoviba/modelos/src/common/Action.php similarity index 100% rename from incoviba/modelos/src/common/Action.php rename to app_old/incoviba/modelos/src/common/Action.php diff --git a/incoviba/modelos/src/common/Auth.php b/app_old/incoviba/modelos/src/common/Auth.php similarity index 100% rename from incoviba/modelos/src/common/Auth.php rename to app_old/incoviba/modelos/src/common/Auth.php diff --git a/incoviba/modelos/src/common/Location.php b/app_old/incoviba/modelos/src/common/Location.php similarity index 100% rename from incoviba/modelos/src/common/Location.php rename to app_old/incoviba/modelos/src/common/Location.php diff --git a/incoviba/modelos/src/common/Permission.php b/app_old/incoviba/modelos/src/common/Permission.php similarity index 100% rename from incoviba/modelos/src/common/Permission.php rename to app_old/incoviba/modelos/src/common/Permission.php diff --git a/incoviba/modelos/src/common/Registry.php b/app_old/incoviba/modelos/src/common/Registry.php similarity index 100% rename from incoviba/modelos/src/common/Registry.php rename to app_old/incoviba/modelos/src/common/Registry.php diff --git a/incoviba/modelos/src/common/RegistryData.php b/app_old/incoviba/modelos/src/common/RegistryData.php similarity index 100% rename from incoviba/modelos/src/common/RegistryData.php rename to app_old/incoviba/modelos/src/common/RegistryData.php diff --git a/incoviba/modelos/src/common/Role.php b/app_old/incoviba/modelos/src/common/Role.php similarity index 100% rename from incoviba/modelos/src/common/Role.php rename to app_old/incoviba/modelos/src/common/Role.php diff --git a/incoviba/modelos/src/common/User.php b/app_old/incoviba/modelos/src/common/User.php similarity index 100% rename from incoviba/modelos/src/common/User.php rename to app_old/incoviba/modelos/src/common/User.php diff --git a/incoviba/modelos/src/common/UserRole.php b/app_old/incoviba/modelos/src/common/UserRole.php similarity index 100% rename from incoviba/modelos/src/common/UserRole.php rename to app_old/incoviba/modelos/src/common/UserRole.php diff --git a/incoviba/modelos/src/nuevo/Common/Banco.php b/app_old/incoviba/modelos/src/nuevo/Common/Banco.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Banco.php rename to app_old/incoviba/modelos/src/nuevo/Common/Banco.php diff --git a/incoviba/modelos/src/nuevo/Common/Comuna.php b/app_old/incoviba/modelos/src/nuevo/Common/Comuna.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Comuna.php rename to app_old/incoviba/modelos/src/nuevo/Common/Comuna.php diff --git a/incoviba/modelos/src/nuevo/Common/Direccion.php b/app_old/incoviba/modelos/src/nuevo/Common/Direccion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Direccion.php rename to app_old/incoviba/modelos/src/nuevo/Common/Direccion.php diff --git a/incoviba/modelos/src/nuevo/Common/M2.php b/app_old/incoviba/modelos/src/nuevo/Common/M2.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/M2.php rename to app_old/incoviba/modelos/src/nuevo/Common/M2.php diff --git a/incoviba/modelos/src/nuevo/Common/Provincia.php b/app_old/incoviba/modelos/src/nuevo/Common/Provincia.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Provincia.php rename to app_old/incoviba/modelos/src/nuevo/Common/Provincia.php diff --git a/incoviba/modelos/src/nuevo/Common/Region.php b/app_old/incoviba/modelos/src/nuevo/Common/Region.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/Region.php rename to app_old/incoviba/modelos/src/nuevo/Common/Region.php diff --git a/incoviba/modelos/src/nuevo/Common/UF.php b/app_old/incoviba/modelos/src/nuevo/Common/UF.php similarity index 100% rename from incoviba/modelos/src/nuevo/Common/UF.php rename to app_old/incoviba/modelos/src/nuevo/Common/UF.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Agente.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CategoriaCuentaContable.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cobro.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Contrato.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Cuenta.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/CuentaContable.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/EstadoCobro.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Inmobiliaria.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Participacion.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Representante.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/Socio.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoAgente.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoCobro.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoContrato.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TipoEstadoCobro.php diff --git a/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php b/app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php similarity index 100% rename from incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php rename to app_old/incoviba/modelos/src/nuevo/Inmobiliaria/TransaccionContable.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/EstadoProyecto.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/Etapa.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Etapa.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/Etapa.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/Etapa.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/Participe.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Participe.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/Participe.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/Participe.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/Proyecto.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/Proyecto.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/ProyectoParticipe.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/Tema.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/Tema.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/Tema.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/Tema.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/TipoEstadoProyecto.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/TipoUnidad.php diff --git a/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php b/app_old/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php similarity index 100% rename from incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php rename to app_old/incoviba/modelos/src/nuevo/Proyecto/UnidadProyecto.php diff --git a/incoviba/modelos/src/nuevo/Venta/Cierre.php b/app_old/incoviba/modelos/src/nuevo/Venta/Cierre.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Cierre.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Cierre.php diff --git a/incoviba/modelos/src/nuevo/Venta/Comentario.php b/app_old/incoviba/modelos/src/nuevo/Venta/Comentario.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Comentario.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Comentario.php diff --git a/incoviba/modelos/src/nuevo/Venta/Cuota.php b/app_old/incoviba/modelos/src/nuevo/Venta/Cuota.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Cuota.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Cuota.php diff --git a/incoviba/modelos/src/nuevo/Venta/Entrega.php b/app_old/incoviba/modelos/src/nuevo/Venta/Entrega.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Entrega.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Entrega.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoCierre.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoCierre.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoObservacion.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoPago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoPago.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoPostventa.php diff --git a/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php b/app_old/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/EstadoVenta.php rename to app_old/incoviba/modelos/src/nuevo/Venta/EstadoVenta.php diff --git a/incoviba/modelos/src/nuevo/Venta/FondoVenta.php b/app_old/incoviba/modelos/src/nuevo/Venta/FondoVenta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/FondoVenta.php rename to app_old/incoviba/modelos/src/nuevo/Venta/FondoVenta.php diff --git a/incoviba/modelos/src/nuevo/Venta/FormaPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/FormaPago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/FormaPago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/FormaPago.php diff --git a/incoviba/modelos/src/nuevo/Venta/Medicion.php b/app_old/incoviba/modelos/src/nuevo/Venta/Medicion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Medicion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Medicion.php diff --git a/incoviba/modelos/src/nuevo/Venta/Observacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/Observacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Observacion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Observacion.php diff --git a/incoviba/modelos/src/nuevo/Venta/Pago.php b/app_old/incoviba/modelos/src/nuevo/Venta/Pago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Pago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Pago.php diff --git a/incoviba/modelos/src/nuevo/Venta/Pie.php b/app_old/incoviba/modelos/src/nuevo/Venta/Pie.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Pie.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Pie.php diff --git a/incoviba/modelos/src/nuevo/Venta/Postventa.php b/app_old/incoviba/modelos/src/nuevo/Venta/Postventa.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Postventa.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Postventa.php diff --git a/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/PostventaObservacion.php diff --git a/incoviba/modelos/src/nuevo/Venta/Premio.php b/app_old/incoviba/modelos/src/nuevo/Venta/Premio.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Premio.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Premio.php diff --git a/incoviba/modelos/src/nuevo/Venta/Propiedad.php b/app_old/incoviba/modelos/src/nuevo/Venta/Propiedad.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Propiedad.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Propiedad.php diff --git a/incoviba/modelos/src/nuevo/Venta/Propietario.php b/app_old/incoviba/modelos/src/nuevo/Venta/Propietario.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Propietario.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Propietario.php diff --git a/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php b/app_old/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/ProyectoTipoMedicion.php diff --git a/incoviba/modelos/src/nuevo/Venta/Reserva.php b/app_old/incoviba/modelos/src/nuevo/Venta/Reserva.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Reserva.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Reserva.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoCierre.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoObservacion.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPago.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoPostventa.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoEstadoVenta.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoFondo.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoFondo.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoFondo.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoFondo.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoMedicion.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoMedicion.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoPago.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoPago.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoPago.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoPago.php diff --git a/incoviba/modelos/src/nuevo/Venta/TipoPremio.php b/app_old/incoviba/modelos/src/nuevo/Venta/TipoPremio.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/TipoPremio.php rename to app_old/incoviba/modelos/src/nuevo/Venta/TipoPremio.php diff --git a/incoviba/modelos/src/nuevo/Venta/Unidad.php b/app_old/incoviba/modelos/src/nuevo/Venta/Unidad.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Unidad.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Unidad.php diff --git a/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php b/app_old/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php rename to app_old/incoviba/modelos/src/nuevo/Venta/UnidadPropiedad.php diff --git a/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php b/app_old/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/UnidadReserva.php rename to app_old/incoviba/modelos/src/nuevo/Venta/UnidadReserva.php diff --git a/incoviba/modelos/src/nuevo/Venta/Venta.php b/app_old/incoviba/modelos/src/nuevo/Venta/Venta.php similarity index 100% rename from incoviba/modelos/src/nuevo/Venta/Venta.php rename to app_old/incoviba/modelos/src/nuevo/Venta/Venta.php diff --git a/incoviba/modelos/src/old/Common/Banco.php b/app_old/incoviba/modelos/src/old/Common/Banco.php similarity index 100% rename from incoviba/modelos/src/old/Common/Banco.php rename to app_old/incoviba/modelos/src/old/Common/Banco.php diff --git a/incoviba/modelos/src/old/Common/Comuna.php b/app_old/incoviba/modelos/src/old/Common/Comuna.php similarity index 100% rename from incoviba/modelos/src/old/Common/Comuna.php rename to app_old/incoviba/modelos/src/old/Common/Comuna.php diff --git a/incoviba/modelos/src/old/Common/Direccion.php b/app_old/incoviba/modelos/src/old/Common/Direccion.php similarity index 100% rename from incoviba/modelos/src/old/Common/Direccion.php rename to app_old/incoviba/modelos/src/old/Common/Direccion.php diff --git a/incoviba/modelos/src/old/Common/Provincia.php b/app_old/incoviba/modelos/src/old/Common/Provincia.php similarity index 100% rename from incoviba/modelos/src/old/Common/Provincia.php rename to app_old/incoviba/modelos/src/old/Common/Provincia.php diff --git a/incoviba/modelos/src/old/Common/Region.php b/app_old/incoviba/modelos/src/old/Common/Region.php similarity index 100% rename from incoviba/modelos/src/old/Common/Region.php rename to app_old/incoviba/modelos/src/old/Common/Region.php diff --git a/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php similarity index 100% rename from incoviba/modelos/src/old/Inmobiliaria/Cuenta.php rename to app_old/incoviba/modelos/src/old/Inmobiliaria/Cuenta.php diff --git a/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php similarity index 100% rename from incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php rename to app_old/incoviba/modelos/src/old/Inmobiliaria/Inmobiliaria.php diff --git a/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php similarity index 100% rename from incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php rename to app_old/incoviba/modelos/src/old/Inmobiliaria/RelacionInmobiliarias.php diff --git a/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php b/app_old/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php similarity index 100% rename from incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php rename to app_old/incoviba/modelos/src/old/Inmobiliaria/TipoSociedad.php diff --git a/incoviba/modelos/src/old/Proyecto/Agente.php b/app_old/incoviba/modelos/src/old/Proyecto/Agente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Agente.php rename to app_old/incoviba/modelos/src/old/Proyecto/Agente.php diff --git a/incoviba/modelos/src/old/Proyecto/AgenteTipo.php b/app_old/incoviba/modelos/src/old/Proyecto/AgenteTipo.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/AgenteTipo.php rename to app_old/incoviba/modelos/src/old/Proyecto/AgenteTipo.php diff --git a/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php b/app_old/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php rename to app_old/incoviba/modelos/src/old/Proyecto/AvanceConstruccion.php diff --git a/incoviba/modelos/src/old/Proyecto/Cobro.php b/app_old/incoviba/modelos/src/old/Proyecto/Cobro.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Cobro.php rename to app_old/incoviba/modelos/src/old/Proyecto/Cobro.php diff --git a/incoviba/modelos/src/old/Proyecto/Costo.php b/app_old/incoviba/modelos/src/old/Proyecto/Costo.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Costo.php rename to app_old/incoviba/modelos/src/old/Proyecto/Costo.php diff --git a/incoviba/modelos/src/old/Proyecto/EstadoCobro.php b/app_old/incoviba/modelos/src/old/Proyecto/EstadoCobro.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/EstadoCobro.php rename to app_old/incoviba/modelos/src/old/Proyecto/EstadoCobro.php diff --git a/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/EstadoProyecto.php rename to app_old/incoviba/modelos/src/old/Proyecto/EstadoProyecto.php diff --git a/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php rename to app_old/incoviba/modelos/src/old/Proyecto/EstadoProyectoAgente.php diff --git a/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/EtapaProyecto.php rename to app_old/incoviba/modelos/src/old/Proyecto/EtapaProyecto.php diff --git a/incoviba/modelos/src/old/Proyecto/Pagare.php b/app_old/incoviba/modelos/src/old/Proyecto/Pagare.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Pagare.php rename to app_old/incoviba/modelos/src/old/Proyecto/Pagare.php diff --git a/incoviba/modelos/src/old/Proyecto/Proyectista.php b/app_old/incoviba/modelos/src/old/Proyecto/Proyectista.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Proyectista.php rename to app_old/incoviba/modelos/src/old/Proyecto/Proyectista.php diff --git a/incoviba/modelos/src/old/Proyecto/Proyectistas.php b/app_old/incoviba/modelos/src/old/Proyecto/Proyectistas.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Proyectistas.php rename to app_old/incoviba/modelos/src/old/Proyecto/Proyectistas.php diff --git a/incoviba/modelos/src/old/Proyecto/Proyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/Proyecto.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Proyecto.php rename to app_old/incoviba/modelos/src/old/Proyecto/Proyecto.php diff --git a/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/ProyectoAgente.php rename to app_old/incoviba/modelos/src/old/Proyecto/ProyectoAgente.php diff --git a/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php b/app_old/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php rename to app_old/incoviba/modelos/src/old/Proyecto/ProyectoTipoUnidad.php diff --git a/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php b/app_old/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/RelacionAgentes.php rename to app_old/incoviba/modelos/src/old/Proyecto/RelacionAgentes.php diff --git a/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php b/app_old/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/RenovacionPagare.php rename to app_old/incoviba/modelos/src/old/Proyecto/RenovacionPagare.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoAgente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoAgente.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoAgente.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoCobro.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoCobro.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoCobro.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoCobro.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoElemento.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoElemento.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoElemento.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoElemento.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoEstadoCobro.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoCobro.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoEstadoCobro.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoCobro.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyecto.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoEstadoProyectoAgente.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoMonedaPagare.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoMonedaPagare.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoMonedaPagare.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoMonedaPagare.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoProyectista.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoProyectista.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoProyectista.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoProyectista.php diff --git a/incoviba/modelos/src/old/Proyecto/TipoTipologia.php b/app_old/incoviba/modelos/src/old/Proyecto/TipoTipologia.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/TipoTipologia.php rename to app_old/incoviba/modelos/src/old/Proyecto/TipoTipologia.php diff --git a/incoviba/modelos/src/old/Proyecto/Tipologia.php b/app_old/incoviba/modelos/src/old/Proyecto/Tipologia.php similarity index 100% rename from incoviba/modelos/src/old/Proyecto/Tipologia.php rename to app_old/incoviba/modelos/src/old/Proyecto/Tipologia.php diff --git a/incoviba/modelos/src/old/Venta/BonoPie.php b/app_old/incoviba/modelos/src/old/Venta/BonoPie.php similarity index 100% rename from incoviba/modelos/src/old/Venta/BonoPie.php rename to app_old/incoviba/modelos/src/old/Venta/BonoPie.php diff --git a/incoviba/modelos/src/old/Venta/Cierre.php b/app_old/incoviba/modelos/src/old/Venta/Cierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Cierre.php rename to app_old/incoviba/modelos/src/old/Venta/Cierre.php diff --git a/incoviba/modelos/src/old/Venta/Comentario.php b/app_old/incoviba/modelos/src/old/Venta/Comentario.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Comentario.php rename to app_old/incoviba/modelos/src/old/Venta/Comentario.php diff --git a/incoviba/modelos/src/old/Venta/Credito.php b/app_old/incoviba/modelos/src/old/Venta/Credito.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Credito.php rename to app_old/incoviba/modelos/src/old/Venta/Credito.php diff --git a/incoviba/modelos/src/old/Venta/Cuota.php b/app_old/incoviba/modelos/src/old/Venta/Cuota.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Cuota.php rename to app_old/incoviba/modelos/src/old/Venta/Cuota.php diff --git a/incoviba/modelos/src/old/Venta/Entrega.php b/app_old/incoviba/modelos/src/old/Venta/Entrega.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Entrega.php rename to app_old/incoviba/modelos/src/old/Venta/Entrega.php diff --git a/incoviba/modelos/src/old/Venta/Escritura.php b/app_old/incoviba/modelos/src/old/Venta/Escritura.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Escritura.php rename to app_old/incoviba/modelos/src/old/Venta/Escritura.php diff --git a/incoviba/modelos/src/old/Venta/EstadoCierre.php b/app_old/incoviba/modelos/src/old/Venta/EstadoCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoCierre.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoCierre.php diff --git a/incoviba/modelos/src/old/Venta/EstadoPago.php b/app_old/incoviba/modelos/src/old/Venta/EstadoPago.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoPago.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoPago.php diff --git a/incoviba/modelos/src/old/Venta/EstadoPrecio.php b/app_old/incoviba/modelos/src/old/Venta/EstadoPrecio.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoPrecio.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoPrecio.php diff --git a/incoviba/modelos/src/old/Venta/EstadoProblema.php b/app_old/incoviba/modelos/src/old/Venta/EstadoProblema.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoProblema.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoProblema.php diff --git a/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php b/app_old/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoUnidadBloqueada.php diff --git a/incoviba/modelos/src/old/Venta/EstadoVenta.php b/app_old/incoviba/modelos/src/old/Venta/EstadoVenta.php similarity index 100% rename from incoviba/modelos/src/old/Venta/EstadoVenta.php rename to app_old/incoviba/modelos/src/old/Venta/EstadoVenta.php diff --git a/incoviba/modelos/src/old/Venta/Pago.php b/app_old/incoviba/modelos/src/old/Venta/Pago.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Pago.php rename to app_old/incoviba/modelos/src/old/Venta/Pago.php diff --git a/incoviba/modelos/src/old/Venta/Pie.php b/app_old/incoviba/modelos/src/old/Venta/Pie.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Pie.php rename to app_old/incoviba/modelos/src/old/Venta/Pie.php diff --git a/incoviba/modelos/src/old/Venta/Precio.php b/app_old/incoviba/modelos/src/old/Venta/Precio.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Precio.php rename to app_old/incoviba/modelos/src/old/Venta/Precio.php diff --git a/incoviba/modelos/src/old/Venta/Problema.php b/app_old/incoviba/modelos/src/old/Venta/Problema.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Problema.php rename to app_old/incoviba/modelos/src/old/Venta/Problema.php diff --git a/incoviba/modelos/src/old/Venta/Promocion.php b/app_old/incoviba/modelos/src/old/Venta/Promocion.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Promocion.php rename to app_old/incoviba/modelos/src/old/Venta/Promocion.php diff --git a/incoviba/modelos/src/old/Venta/PromocionVenta.php b/app_old/incoviba/modelos/src/old/Venta/PromocionVenta.php similarity index 100% rename from incoviba/modelos/src/old/Venta/PromocionVenta.php rename to app_old/incoviba/modelos/src/old/Venta/PromocionVenta.php diff --git a/incoviba/modelos/src/old/Venta/Propiedad.php b/app_old/incoviba/modelos/src/old/Venta/Propiedad.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Propiedad.php rename to app_old/incoviba/modelos/src/old/Venta/Propiedad.php diff --git a/incoviba/modelos/src/old/Venta/PropiedadUnidad.php b/app_old/incoviba/modelos/src/old/Venta/PropiedadUnidad.php similarity index 100% rename from incoviba/modelos/src/old/Venta/PropiedadUnidad.php rename to app_old/incoviba/modelos/src/old/Venta/PropiedadUnidad.php diff --git a/incoviba/modelos/src/old/Venta/Propietario.php b/app_old/incoviba/modelos/src/old/Venta/Propietario.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Propietario.php rename to app_old/incoviba/modelos/src/old/Venta/Propietario.php diff --git a/incoviba/modelos/src/old/Venta/Subsidio.php b/app_old/incoviba/modelos/src/old/Venta/Subsidio.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Subsidio.php rename to app_old/incoviba/modelos/src/old/Venta/Subsidio.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoCierre.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoCierre.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoPago.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoPago.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoPago.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoPago.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoPrecio.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoUnidadBloqueada.php diff --git a/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php b/app_old/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoEstadoVenta.php rename to app_old/incoviba/modelos/src/old/Venta/TipoEstadoVenta.php diff --git a/incoviba/modelos/src/old/Venta/TipoPago.php b/app_old/incoviba/modelos/src/old/Venta/TipoPago.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoPago.php rename to app_old/incoviba/modelos/src/old/Venta/TipoPago.php diff --git a/incoviba/modelos/src/old/Venta/TipoUnidad.php b/app_old/incoviba/modelos/src/old/Venta/TipoUnidad.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoUnidad.php rename to app_old/incoviba/modelos/src/old/Venta/TipoUnidad.php diff --git a/incoviba/modelos/src/old/Venta/TipoValorCierre.php b/app_old/incoviba/modelos/src/old/Venta/TipoValorCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/TipoValorCierre.php rename to app_old/incoviba/modelos/src/old/Venta/TipoValorCierre.php diff --git a/incoviba/modelos/src/old/Venta/Unidad.php b/app_old/incoviba/modelos/src/old/Venta/Unidad.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Unidad.php rename to app_old/incoviba/modelos/src/old/Venta/Unidad.php diff --git a/incoviba/modelos/src/old/Venta/UnidadBloqueada.php b/app_old/incoviba/modelos/src/old/Venta/UnidadBloqueada.php similarity index 100% rename from incoviba/modelos/src/old/Venta/UnidadBloqueada.php rename to app_old/incoviba/modelos/src/old/Venta/UnidadBloqueada.php diff --git a/incoviba/modelos/src/old/Venta/UnidadCierre.php b/app_old/incoviba/modelos/src/old/Venta/UnidadCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/UnidadCierre.php rename to app_old/incoviba/modelos/src/old/Venta/UnidadCierre.php diff --git a/incoviba/modelos/src/old/Venta/ValorCierre.php b/app_old/incoviba/modelos/src/old/Venta/ValorCierre.php similarity index 100% rename from incoviba/modelos/src/old/Venta/ValorCierre.php rename to app_old/incoviba/modelos/src/old/Venta/ValorCierre.php diff --git a/incoviba/modelos/src/old/Venta/Venta.php b/app_old/incoviba/modelos/src/old/Venta/Venta.php similarity index 100% rename from incoviba/modelos/src/old/Venta/Venta.php rename to app_old/incoviba/modelos/src/old/Venta/Venta.php diff --git a/incoviba/modelos/src/old/Venta/Venta.php.save b/app_old/incoviba/modelos/src/old/Venta/Venta.php.save similarity index 100% rename from incoviba/modelos/src/old/Venta/Venta.php.save rename to app_old/incoviba/modelos/src/old/Venta/Venta.php.save diff --git a/package.json b/app_old/package.json similarity index 100% rename from package.json rename to app_old/package.json diff --git a/public/Pipfile b/app_old/public/Pipfile similarity index 100% rename from public/Pipfile rename to app_old/public/Pipfile diff --git a/public/api/.htaccess b/app_old/public/api/.htaccess similarity index 100% rename from public/api/.htaccess rename to app_old/public/api/.htaccess diff --git a/public/api/index.php b/app_old/public/api/index.php similarity index 100% rename from public/api/index.php rename to app_old/public/api/index.php diff --git a/public/api/keys b/app_old/public/api/keys similarity index 100% rename from public/api/keys rename to app_old/public/api/keys diff --git a/public/css/app.css b/app_old/public/css/app.css similarity index 100% rename from public/css/app.css rename to app_old/public/css/app.css diff --git a/public/css/custom.css b/app_old/public/css/custom.css similarity index 100% rename from public/css/custom.css rename to app_old/public/css/custom.css diff --git a/public/fonts/FontAwesome.otf b/app_old/public/fonts/FontAwesome.otf similarity index 100% rename from public/fonts/FontAwesome.otf rename to app_old/public/fonts/FontAwesome.otf diff --git a/public/fonts/fontawesome-webfont.eot b/app_old/public/fonts/fontawesome-webfont.eot similarity index 100% rename from public/fonts/fontawesome-webfont.eot rename to app_old/public/fonts/fontawesome-webfont.eot diff --git a/public/fonts/fontawesome-webfont.svg b/app_old/public/fonts/fontawesome-webfont.svg similarity index 100% rename from public/fonts/fontawesome-webfont.svg rename to app_old/public/fonts/fontawesome-webfont.svg diff --git a/public/fonts/fontawesome-webfont.ttf b/app_old/public/fonts/fontawesome-webfont.ttf similarity index 100% rename from public/fonts/fontawesome-webfont.ttf rename to app_old/public/fonts/fontawesome-webfont.ttf diff --git a/public/fonts/fontawesome-webfont.woff b/app_old/public/fonts/fontawesome-webfont.woff similarity index 100% rename from public/fonts/fontawesome-webfont.woff rename to app_old/public/fonts/fontawesome-webfont.woff diff --git a/public/fonts/fontawesome-webfont.woff2 b/app_old/public/fonts/fontawesome-webfont.woff2 similarity index 100% rename from public/fonts/fontawesome-webfont.woff2 rename to app_old/public/fonts/fontawesome-webfont.woff2 diff --git a/public/fonts/glyphicons-halflings-regular.eot b/app_old/public/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from public/fonts/glyphicons-halflings-regular.eot rename to app_old/public/fonts/glyphicons-halflings-regular.eot diff --git a/public/fonts/glyphicons-halflings-regular.svg b/app_old/public/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from public/fonts/glyphicons-halflings-regular.svg rename to app_old/public/fonts/glyphicons-halflings-regular.svg diff --git a/public/fonts/glyphicons-halflings-regular.ttf b/app_old/public/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from public/fonts/glyphicons-halflings-regular.ttf rename to app_old/public/fonts/glyphicons-halflings-regular.ttf diff --git a/public/fonts/glyphicons-halflings-regular.woff b/app_old/public/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from public/fonts/glyphicons-halflings-regular.woff rename to app_old/public/fonts/glyphicons-halflings-regular.woff diff --git a/public/fonts/glyphicons-halflings-regular.woff2 b/app_old/public/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from public/fonts/glyphicons-halflings-regular.woff2 rename to app_old/public/fonts/glyphicons-halflings-regular.woff2 diff --git a/public/images/Isotipo 16.png b/app_old/public/images/Isotipo 16.png similarity index 100% rename from public/images/Isotipo 16.png rename to app_old/public/images/Isotipo 16.png diff --git a/public/images/Isotipo 32.png b/app_old/public/images/Isotipo 32.png similarity index 100% rename from public/images/Isotipo 32.png rename to app_old/public/images/Isotipo 32.png diff --git a/public/images/Isotipo 64.png b/app_old/public/images/Isotipo 64.png similarity index 100% rename from public/images/Isotipo 64.png rename to app_old/public/images/Isotipo 64.png diff --git a/public/images/logo_cabezal.png b/app_old/public/images/logo_cabezal.png similarity index 100% rename from public/images/logo_cabezal.png rename to app_old/public/images/logo_cabezal.png diff --git a/app_old/public/index.php b/app_old/public/index.php new file mode 100644 index 0000000..7c36a8c --- /dev/null +++ b/app_old/public/index.php @@ -0,0 +1,8 @@ +run(); diff --git a/public/index.php b/app_old/public/index.php.old similarity index 100% rename from public/index.php rename to app_old/public/index.php.old diff --git a/public/install/create_admin.php b/app_old/public/install/create_admin.php similarity index 100% rename from public/install/create_admin.php rename to app_old/public/install/create_admin.php diff --git a/public/install/create_guest.php b/app_old/public/install/create_guest.php similarity index 100% rename from public/install/create_guest.php rename to app_old/public/install/create_guest.php diff --git a/public/install/create_user_base.php b/app_old/public/install/create_user_base.php similarity index 100% rename from public/install/create_user_base.php rename to app_old/public/install/create_user_base.php diff --git a/public/install/end_install.php b/app_old/public/install/end_install.php similarity index 100% rename from public/install/end_install.php rename to app_old/public/install/end_install.php diff --git a/public/install/index.php b/app_old/public/install/index.php similarity index 100% rename from public/install/index.php rename to app_old/public/install/index.php diff --git a/public/install/log_locations.php b/app_old/public/install/log_locations.php similarity index 100% rename from public/install/log_locations.php rename to app_old/public/install/log_locations.php diff --git a/public/install/next_step.php b/app_old/public/install/next_step.php similarity index 100% rename from public/install/next_step.php rename to app_old/public/install/next_step.php diff --git a/public/js/admin.js b/app_old/public/js/admin.js similarity index 100% rename from public/js/admin.js rename to app_old/public/js/admin.js diff --git a/public/js/app.js b/app_old/public/js/app.js similarity index 100% rename from public/js/app.js rename to app_old/public/js/app.js diff --git a/public/js/ventas/pies/cuotas/add.js b/app_old/public/js/ventas/pies/cuotas/add.js similarity index 100% rename from public/js/ventas/pies/cuotas/add.js rename to app_old/public/js/ventas/pies/cuotas/add.js diff --git a/public/links.log b/app_old/public/links.log similarity index 100% rename from public/links.log rename to app_old/public/links.log diff --git a/public/precios.csv b/app_old/public/precios.csv similarity index 100% rename from public/precios.csv rename to app_old/public/precios.csv diff --git a/resources/js/app.js b/app_old/resources/js/app.js similarity index 100% rename from resources/js/app.js rename to app_old/resources/js/app.js diff --git a/resources/js/binaryIndexOf.js b/app_old/resources/js/binaryIndexOf.js similarity index 100% rename from resources/js/binaryIndexOf.js rename to app_old/resources/js/binaryIndexOf.js diff --git a/resources/js/bootstrap.js b/app_old/resources/js/bootstrap.js similarity index 100% rename from resources/js/bootstrap.js rename to app_old/resources/js/bootstrap.js diff --git a/resources/js/chart.js b/app_old/resources/js/chart.js similarity index 100% rename from resources/js/chart.js rename to app_old/resources/js/chart.js diff --git a/resources/js/jquery.filterTable.js b/app_old/resources/js/jquery.filterTable.js similarity index 100% rename from resources/js/jquery.filterTable.js rename to app_old/resources/js/jquery.filterTable.js diff --git a/app_old/resources/less/Controller/Admin.php b/app_old/resources/less/Controller/Admin.php new file mode 100644 index 0000000..137057c --- /dev/null +++ b/app_old/resources/less/Controller/Admin.php @@ -0,0 +1,233 @@ +list(); + } + public static function listNamespaces() + { + $base = [ + 'Common', + 'Inmobiliaria', + 'Proyecto', + 'Venta' + ]; + $nss = [ + 'Incoviba' => [ + 'old' => $base, + 'new' => $base + ] + ]; + + echo json_encode(['namespaces' => self::collapseMultiArray($nss)]); + } + protected static function collapseMultiArray($array, $level = '') + { + $output = []; + foreach ($array as $key => $subarray) { + if (is_array($subarray)) { + $output = array_merge($output, self::collapseMultiArray($subarray, $level . '\\' . $key)); + } else { + $output []= $level . '\\' . $subarray; + } + } + + return $output; + } + public static function createModel() + { + $db = post('database'); + $ns = post('namespace'); + $table = post('table'); + + $modeler = new DBToModel($db); + echo $modeler->create($ns, $table); + } + public static function list_roles() + { + $roles = \Model::factory(\Incoviba\common\Role::class)->findMany(); + echo view('admin.roles.list', compact('roles')); + } + public static function add_role() + { + echo view('admin.roles.add'); + } + public static function do_add_role() + { + $role = \Model::factory(\Incoviba\common\Role::class)->where('description', post('description'))->findOne(); + if ($role === false) { + $role = \Model::factory(\Incoviba\common\Role::class)->create(['description' => post('description')]); + $role->save(); + } + header('Location: ' . nUrl('admin', 'add_role')); + } + public static function role() + { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + $actions = model(Action::class)->orderByAsc('description')->findMany(); + $permissions = []; + foreach ($actions as $action) { + $permissions []= (object) ['description' => $action->description, 'status' => false, 'inherited' => false]; + } + array_walk($permissions, function(&$el, $i, $role) { + if ($role->checkAccess($el->description)) { + $el->status = true; + if ($role->isInherited($el->description)) { + $el->inherited = true; + } + } + }, $role); + echo view('admin.roles.show', compact('role', 'permissions')); + } + public static function add_role_permissions() + { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + $locations = \Model::factory(\Incoviba\common\Location::class)->findMany(); + $actions = model(\Incoviba\common\Action::class)->findMany(); + echo view('admin.roles.add_permissions', compact('role', 'locations', 'actions')); + } + public static function do_add_role_permissions() + { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + $actions = model(\Incoviba\common\Action::class)->findMany(); + foreach ($actions as $action) { + $p = \Model::factory(\Incoviba\common\Permission::class)->where('type', 2)->where('ext_id', $role->id)->where('action_id', $action->id)->findOne(); + if (array_search($action->id, post('allowed'))) { + if (!$p) { + $data = [ + 'type' => 2, + 'ext_id' => $role->id, + 'action_id' => $action->id + ]; + $p = model(\Incoviba\common\Permission::class)->create($data); + } + $p->status = 1; + } else { + if ($p !== false) { + $p->status = 0; + } + } + if ($p !== false) { + $p->save(); + } + } + header('Location: ' . nUrl('admin', 'role', ['role' => $role->id])); + } + public static function list_users() + { + $users = \Model::factory(\Incoviba\common\User::class)->orderByAsc('name')->findMany(); + echo view('admin.users.list', compact('users')); + } + public static function add_user() + { + echo view('admin.users.add'); + } + public static function do_add_user() + { + $user = \Model::factory(\Incoviba\common\User::class)->where('name', post('name'))->findOne(); + if ($user === false) { + $user = \Model::factory(\Incoviba\common\User::class)->create(); + $user->name = post('name'); + $user->password(post('password')); + + $user->save(); + } + header('Location: ' . url('', ['p' => 'admin', 'a' => 'add_user'])); + } + public static function user() + { + $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); + echo view('admin.users.show', compact('user')); + } + public static function add_user_role() + { + if (get('user') !== false) { + $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); + $roles = \Model::factory(\Incoviba\common\Role::class)->findMany(); + return view('admin.users.add_role', compact('user', 'roles')); + } elseif (get('role') !== false) { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + $users = \Model::factory(\Incoviba\common\User::class)->findMany(); + return view('admin.roles.add_users', compact('users', 'role')); + } + } + public static function do_add_user_role() + { + if (get('user') !== false) { + $user = \Model::factory(\Incoviba\common\User::class)->findOne(get('user')); + foreach (post('role') as $r_id) { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne($r_id); + + $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); + if ($usrRl === false) { + $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); + $usrRl->save(); + } + } + header('Location: ' . url('', ['p' => 'admin', 'a' => 'user', 'user' => $user->id])); + } elseif (get('role') !== false) { + $role = \Model::factory(\Incoviba\common\Role::class)->findOne(get('role')); + foreach (post('users') as $u_id) { + $user = \Model::factory(\Incoviba\common\User::class)->findOne($u_id); + + $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->where('user', $user->id)->where('role', $role->id)->findOne(); + if ($usrRl === false) { + $usrRl = \Model::factory(\Incoviba\common\UserRole::class)->create(['user' => $user->id, 'role' => $role->id]); + $usrRl->save(); + } + } + header('Location: ' . url('', ['p' => 'admin', 'a' => 'role', 'role' => $role->id])); + } + } + public static function remove_user_role() + { + $q = "DELETE FROM user_roles WHERE user = ? AND role = ?"; + $st = \ORM::getDb()->prepare($q); + $st->execute([get('user'), get('role')]); + header('Location: ' . nUrl('admin')); + } + public static function delete_user() + { + $q = "DELETE FROM user_roles WHERE user = ?"; + $st = \ORM::getDb()->prepare($q); + $st->execute([get('user')]); + $q = "DELETE FROM logins WHERE user = ?"; + $st = \ORM::getDb()->prepare($q); + $st->execute([get('user')]); + $q = "DELETE FROM permissions WHERE type = 1 AND ext_id = ?"; + $st = \ORM::getDb()->prepare($q); + $st->execute([get('user')]); + $user = \model(\Incoviba\common\User::class)->findOne(get('user')); + $user->delete(); + header('Location: ' . nUrl('admin', 'list_users')); + } + public static function reset_user() + { + $user = model(\Incoviba\common\User::class)->findOne(get('user')); + $user->password('123456'); + $user->save(); + header('Location: ' . nUrl('admin', 'user', ['user' => $user->id])); + } +} +?> diff --git a/app_old/resources/less/Controller/Ajax.php b/app_old/resources/less/Controller/Ajax.php new file mode 100644 index 0000000..912c979 --- /dev/null +++ b/app_old/resources/less/Controller/Ajax.php @@ -0,0 +1,215 @@ +whereNotEqual('nombre', '')->order_by_asc('nombre')->findMany(); + foreach ($bancos as &$banco) { + $banco = $banco->as_array('nombre')['nombre']; + } + return json_encode($bancos); + } + protected static function buscarBanco() + { + $q = get('q'); + if ($q == null) { + $q = get('query'); + if ($q == null) { + return ''; + } + } + $bancos = \Model::factory(\Incoviba\old\Common\Banco::class)->whereLike('nombre', '%' . $q . '%')->order_by_asc('nombre')->findMany(); + foreach ($bancos as &$banco) { + $banco = $banco->as_array('nombre')['nombre']; + } + return json_encode($bancos); + } + public static function comunas() + { + $id = post('region'); + $comunas = \Model::factory(\Incoviba\old\Common\Comuna::class) + ->select('comuna.*') + ->join('provincia', ['provincia.id', '=', 'comuna.provincia']) + ->where('provincia.region', $id) + ->order_by_asc('comuna.descripcion') + ->findMany(); + + foreach ($comunas as &$comuna) { + $comuna = $comuna->as_array('id', 'descripcion'); + } + return json_encode($comunas); + } + public static function propietario() + { + $id = post('rut'); + $propietario = \Model::factory(\Incoviba\old\Venta\Propietario::class)->where('rut', $id)->findOne(); + if ($propietario) { + $propietario = $propietario->as_array(); + return json_encode($propietario); + } + return null; + } + public static function direccion() + { + $id = post('direccion'); + $direccion = \Model::factory(\Incoviba\old\Common\Direccion::class)->findOne($id); + $comuna = $direccion->comuna(); + $provincia = $comuna->provincia(); + $region = $provincia->region(); + $direccion = $direccion->as_array(); + $direccion['comuna'] = $comuna->as_array(); + $direccion['comuna']['provincia'] = $provincia->as_array(); + $direccion['comuna']['provincia']['region'] = $region->as_array(); + return json_encode($direccion); + } + public static function tipo_unidades() + { + $id = post('proyecto'); + $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id); + $tipos = $proyecto->tipoUnidades(); + foreach ($tipos as &$tipo) { + $tipo = $tipo->as_array(); + } + return json_encode($tipos); + } + public static function unidades() + { + $id_proyecto = post('proyecto'); + $id_tipo = post('tipo'); + + $proyecto = model(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id_proyecto); + $unidades = $proyecto->unidadesDisponibles($id_tipo); + foreach ($unidades as &$unidad) { + $tipologia = $unidad->tipologia(); + $unidad = $unidad->as_array(); + $unidad['tipologia'] = $tipologia->as_array(); + if ($tipologia->tipologia()) { + $unidad['tipologia']['tipologia'] = (array) $tipologia->tipologia(); + continue; + } + $unidad['tipologia']['tipologia'] = ['descripcion' => $tipologia->abreviacion]; + } + return json_encode($unidades); + } + public static function unidades_precios() + { + $proyecto = model(\Incoviba\old\Proyecto\Proyecto::class)->findOne(post('proyecto')); + $unidades = $proyecto->unidades(); + usort($unidades, function($a, $b) { + $t = $a->tipo - $b->tipo; + if ($t == 0) { + return (int) $a->descripcion - (int) $b->descripcion; + } + return $t; + }); + $output = []; + foreach ($unidades as $u) { + $info = [ + 'id' => $u->id, + 'abreviacion' => $u->abreviacion, + 'descripcion' => $u->descripcion, + 'valor' => '--' + ]; + if ($u->precio()) { + $info['valor'] = format('ufs', $u->precio()->valor, null, true); + } + $output []= $info; + } + return json_encode($output); + } + public static function operadores() + { + $id_proyecto = post('proyecto'); + $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id_proyecto); + $operadores = $proyecto->operadores(); + foreach ($operadores as &$operador) { + $operador = [ + 'id' => $operador->id, + 'abreviacion' => $operador->abreviacion + ]; + } + return json_encode($operadores); + } + public static function promociones() + { + $id = post('proyecto'); + $proyecto = \Model::factory(\Incoviba\old\Proyecto\Proyecto::class)->findOne($id); + $promociones = $proyecto->promociones(); + foreach ($promociones as &$promocion) { + $promocion = $promocion->as_array(); + } + return json_encode($promociones); + } + public static function nombres() + { + $nss = model(Propietario::class)->select('nombres')->orderByAsc('nombres')->findMany(); + $nombres = []; + foreach ($nss as $n) { + $ns = explode(' ', $n->nombres); + foreach ($ns as $nombre) { + $nombres []= $nombre; + } + } + $nombres = array_values(array_unique($nombres)); + return json_encode($nombres); + } + public static function apellidos() + { + $aps = model(Propietario::class)->select('apellido_paterno')->orderByAsc('apellido_paterno')->findMany(); + $apellidos = []; + foreach ($aps as $ap) { + $apellidos []= $ap->apellido_paterno; + } + $aps = model(Propietario::class)->select('apellido_materno')->orderByAsc('apellido_materno')->findMany(); + foreach ($aps as $ap) { + $apellidos []= $ap->apellido_paterno; + } + $apellidos = array_values(array_unique($apellidos)); + sort($apellidos); + return json_encode($apellidos); + } + public static function calles() + { + $results = model(Direccion::class)->select('calle')->orderByAsc('calle')->findMany(); + $calles = []; + foreach ($results as $result) { + $calles []= $result->calle; + } + $calles = array_values(array_unique($calles)); + return json_encode($calles); + } + public static function inmobiliarias() + { + $q = post('rut'); + $inmobiliaria = model(Inmobiliaria::class)->findOne($q); + return json_encode($inmobiliaria->as_array()); + } +} +?> diff --git a/resources/less/Controller/Auth.php b/app_old/resources/less/Controller/Auth.php similarity index 100% rename from resources/less/Controller/Auth.php rename to app_old/resources/less/Controller/Auth.php diff --git a/resources/less/Controller/Bonos.php b/app_old/resources/less/Controller/Bonos.php similarity index 100% rename from resources/less/Controller/Bonos.php rename to app_old/resources/less/Controller/Bonos.php diff --git a/app_old/resources/less/Controller/Buscar.php b/app_old/resources/less/Controller/Buscar.php new file mode 100644 index 0000000..ef62a9e --- /dev/null +++ b/app_old/resources/less/Controller/Buscar.php @@ -0,0 +1,340 @@ + $results]); + } + protected static function getResults() + { + $q = get('q'); + if ($q == null) { + $q = get('query'); + } + $t = get('t'); + if ($t == null) { + $t = get('tipo'); + } + $t = urldecode($t); + if ($t == null) { + $t = 'cualquiera'; + } + + $results = null; + if ($q != null) { + $q = urldecode($q); + $results = self::buscar($q, $t); + } + return $results; + } + public static function buscar($query, $tipo) + { + $method = 'buscar' . str_replace(' ', '', ucwords($tipo)); + if (is_callable(['self', $method])) { + $results = self::$method(self::prepareQuery($query)); + $results = self::removeDuplicates($results); + $results = self::sort($results); + return $results; + } + return []; + } + protected static function prepareQuery($query) + { + $query = str_replace('"', '"', $query); + $data = explode(' ', $query); + $regex = "~(?=\\S)[^'\"\\s]*(?:'[^']*'[^'\"\\s]*|\"[^\"]*\"[^'\"\\s]*)*~"; + preg_match_all($regex, $query, $data); + $data = $data[0]; + foreach ($data as &$l) { + $l = str_replace('"', '', str_replace("'", '', $l)); + } + if (is_array($data) and count($data) == 1) { + $data = $data[0]; + } + return $data; + } + protected static function removeDuplicates($results) + { + $output = []; + foreach ($results as $result) { + if (array_search($result, $output) === false) { + $output []= $result; + } + } + return $output; + } + protected static function sort($results) + { + usort($results, function($a, $b) { + $py = strcmp($a->proyecto()->descripcion, $b->proyecto()->descripcion); + if ($py == 0) { + if (!method_exists($a, 'unidad') and !method_exists($b, 'unidad')) { + return $a->descripcion - $b->descripcion; + } + if (!method_exists($a, 'unidad')) { + return $a->descripcion - $b->unidad()->descripcion; + } + if (!method_exists($b, 'unidad')) { + return $a->unidad()->descripcion - $b->descripcion; + } + + $u = $a->unidad()->descripcion - $b->unidad()->descripcion; + if ($u == 0) { + return strcmp($a->propietario()->apellido_paterno, $b->propietario()->apellido_paterno); + } + return $u; + } + return $py; + }); + return $results; + } + protected static function buscarCualquiera($query) + { + $results = []; + foreach (self::$tipos as $tipo) { + if ($tipo == 'cualquiera') { + continue; + } + $method = 'buscar' . str_replace(' ', '', ucwords($tipo)); + + if (is_callable(['self', $method])) { + $results = array_merge($results, self::$method($query)); + } + } + return $results; + } + protected static function buscarDepartamento($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarDepartamento($segment)); + } + } else { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) + ->whereLike('unidad.descripcion', '%' . $query . '%') + ->findMany(); + } + return $results; + } + protected static function buscarEstacionamiento($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarEstacionamiento($segment)); + } + } else { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', "`propiedad`.`estacionamientos` LIKE `unidad`.`id` OR `propiedad`.`estacionamientos` LIKE CONCAT('%;', `unidad`.`id`) OR `propiedad`.`estacionamientos` LIKE CONCAT(`unidad`.`id`, ';%') OR `propiedad`.`estacionamientos` LIKE CONCAT('%;', `unidad`.`id`, ';%')") + ->where('unidad.descripcion', $query) + ->findMany(); + } + return $results; + } + protected static function buscarBodega($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarBodega($segment)); + } + } else { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', "`propiedad`.`bodegas` LIKE `unidad`.`id` OR `propiedad`.`bodegas` LIKE CONCAT('%;', `unidad`.`id`) OR `propiedad`.`bodegas` LIKE CONCAT(`unidad`.`id`, ';%') OR `propiedad`.`bodegas` LIKE CONCAT('%;', `unidad`.`id`, ';%')") + ->where('unidad.descripcion', $query) + ->findMany(); + } + return $results; + } + protected static function buscarPropietario($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarPropietario($segment)); + } + } else { + $results = self::buscarPropietarioNombres($query); + $results = array_merge($results, self::buscarPropietarioApellido($query)); + $results = array_merge($results, self::buscarPropietarioNombreCompleto($query)); + } + return $results; + } + protected static function buscarPropietarioNombres($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) + ->whereLike('propietario.nombres', '%' . $query . '%') + ->findMany(); + return $results; + } + protected static function buscarPropietarioApellido($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) + ->whereAnyIs([ + ['propietario.apellido_paterno' => '%' . $query . '%'], + ['propietario.apellido_materno' => '%' . $query . '%'] + ], 'LIKE') + ->findMany(); + return $results; + } + protected static function buscarPropietarioNombreCompleto($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('propietario', ['propietario.rut', '=', 'venta.propietario']) + ->whereRaw("CONCAT_WS(' ', propietario.nombres, propietario.apellido_paterno, propietario.apellido_materno) LIKE '%" . $query . "%'") + ->findMany(); + return $results; + } + protected static function buscarPrecioVenta($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarPrecioVenta($segment)); + } + } else { + $query = str_replace([',', '.'], ['.', ''], $query); + $results = \Model::factory(Venta::class)->where('valor_uf', $query)->findMany(); + } + return $results; + } + protected static function buscarProyecto($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarProyecto($segment)); + } + } else { + $results = model(Venta::class) + ->select('venta.*') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) + ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) + ->whereLike('proyecto.descripcion', '%' . $query . '%') + ->findMany(); + } + return $results; + } + protected static function buscarPago($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarPrecioVenta($segment)); + } + } else { + $query = str_replace(',', '.', str_replace('.', '', $query)); + $query2 = (float) $query; + if ($query != $query2) { + return []; + } + if (!is_float($query2)) { + return []; + } + $query = $query2; + $results = self::buscarValorCuota($query); + $results = array_merge($results, self::buscarReajuste($query)); + $results = array_merge($results, self::buscarEscritura($query)); + $results = array_merge($results, self::buscarSubsidio($query)); + $results = array_merge($results, self::buscarCredito($query)); + } + return $results; + } + protected static function buscarValorCuota($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('cuota', ['cuota.pie', '=', 'venta.pie']) + ->join('pago', ['pago.id', '=', 'cuota.pago']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarReajuste($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('pie', ['pie.id', '=', 'venta.pie']) + ->join('pago', ['pago.id', '=', 'pie.reajuste']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarEscritura($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('escritura', ['escritura.id', '=', 'venta.escritura']) + ->join('pago', ['pago.id', '=', 'escritura.pago']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarSubsidio($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('subsidio', ['subsidio.id', '=', 'venta.subsidio']) + ->join('pago', ['pago.id', '=', 'subsidio.pago']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarCredito($query) + { + $results = \Model::factory(Venta::class) + ->select('venta.*') + ->join('credito', ['credito.id', '=', 'venta.credito']) + ->join('pago', ['pago.id', '=', 'credito.pago']) + ->whereRaw("`pago`.`valor` = " . $query . " OR `pago`.`valor` / `pago`.`uf` = " . $query) + ->findMany(); + return $results; + } + protected static function buscarUnidad($query) + { + if (is_array($query)) { + $results = []; + foreach ($query as $segment) { + $results = array_merge($results, self::buscarUnidad($segment)); + } + } else { + $results = model(Unidad::class)->where('descripcion', $query)->findMany(); + foreach ($results as $i => $u) { + if ($u->venta()) { + unset($results[$i]); + } + } + } + return $results; + } +} +?> diff --git a/resources/less/Controller/Cierres.php b/app_old/resources/less/Controller/Cierres.php similarity index 100% rename from resources/less/Controller/Cierres.php rename to app_old/resources/less/Controller/Cierres.php diff --git a/app_old/resources/less/Controller/Comentarios.php b/app_old/resources/less/Controller/Comentarios.php new file mode 100644 index 0000000..494fcc6 --- /dev/null +++ b/app_old/resources/less/Controller/Comentarios.php @@ -0,0 +1,39 @@ +findOne(get('venta')); + echo view('ventas.comentarios.add', compact('venta')); + } + public static function agregar() + { + $venta = \Model::factory(\Incoviba\old\Venta\Venta::class)->findOne(get('venta')); + if ($venta === false) { + throw new Exception('Venta no existe.'); + } + $data = [ + 'venta' => $venta->id, + 'fecha' => \Carbon\Carbon::now(config('app.timezone'))->format('Y-m-d H:i:s'), + 'texto' => post('comentario') + ]; + $comentario = \Model::factory(\Incoviba\old\Venta\Comentario::class)->create($data); + $comentario->save(); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } + public static function delete() + { + $comentario = \Model::factory(\Incoviba\old\Venta\Comentario::class)->findOne(get('comentario')); + $venta = $comentario->venta(); + $comentario->estado = 0; + $comentario->save(); + header('Location: ' . nUrl('ventas', 'show', ['venta' => $venta->id])); + } +} +?> diff --git a/resources/less/Controller/Contabilidad.php b/app_old/resources/less/Controller/Contabilidad.php similarity index 100% rename from resources/less/Controller/Contabilidad.php rename to app_old/resources/less/Controller/Contabilidad.php diff --git a/app_old/resources/less/Controller/Creditos.php b/app_old/resources/less/Controller/Creditos.php new file mode 100644 index 0000000..60a72da --- /dev/null +++ b/app_old/resources/less/Controller/Creditos.php @@ -0,0 +1,207 @@ +findOne($id); + return view('ventas.creditos.add', compact('venta')); + } + public static function agregado() + { + $id = get('venta'); + if ($id == null) { + header('Location: .'); + } + $venta = \Model::factory(Venta::class)->findOne($id); + + $banco = \Model::factory(Banco::class)->where('nombre', post('banco'))->findOne(); + $f = Carbon::createFromDate(post('y'), post('m'), post('d'), config('app.timezone')); + $uf = uf($f); + + $pago = \Model::factory(Pago::class)->create(); + $pago->banco = $banco->id; + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = $uf->uf->value; + $pago->valor = post('valor') * $pago->uf; + $pago->tipo = 2; + + $credito = \Model::factory(Credito::class)->create(); + $credito->banco = $pago->banco; + $credito->valor = $pago->valor; + $credito->fecha = $pago->fecha; + $credito->uf = $pago->uf; + + $pago->new(); + + $credito->pago = $pago->id; + $credito->save(); + + $venta->credito = $credito->id; + $venta->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function pagar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + return view('ventas.creditos.pagar', compact('venta')); + } + public static function pagando() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + $valor = str_replace(',', '.', str_replace('.', '', post('valor'))); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $pago = $venta->credito()->pago(); + if ($pago->valor != $valor) { + $pago->valor = $valor; + } + + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $pago->id; + $estado->fecha = $f->format('Y-m-d'); + $estado->estado = 1; + $estado->save(); + + if ($pago->is_dirty('valor')) { + $pago->save(); + } + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function abonar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + return view('ventas.creditos.abonar', compact('venta')); + } + public static function abonando() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + $valor = str_replace(',', '.', str_replace('.', '', post('valor'))); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $pago = $venta->credito()->pago(); + if ($pago->valor != $valor) { + $pago->valor = $valor; + } + + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $pago->id; + $estado->fecha = $f->format('Y-m-d'); + $estado->estado = 2; + + $estado->save(); + + if ($pago->is_dirty('valor')) { + $pago->save(); + } + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function show() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.creditos.show', compact('venta')); + } + public static function edit() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.creditos.edit', compact('venta')); + } + public static function editado() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $pago = $venta->credito()->pago(); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $uf = uf($f); + $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); + $valor = correctNumber(post('valor')) * $uf->uf->value; + + $fields = ['valor', 'uf', 'fecha', 'banco']; + $data = ['valor' => $valor, 'uf' => $uf->uf->value, 'fecha' => $f->format('Y-m-d'), 'banco' => $banco->id]; + + $change = false; + foreach ($fields as $field) { + if ($pago->$field != $data[$field]) { + $change = true; + $pago->$field = $data[$field]; + if ($field == 'fecha') { + $eps = $pago->estados(); + foreach ($eps as $ep) { + if ($ep->estado == 0) { + $ep->fecha = $data[$field]; + $ep->save(); + break; + } + } + } + } + } + + if ($change) { + $pago->save(); + } + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function remove() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $pago = $venta->credito()->pago(); + $f = Carbon::today(config('app.timezone')); + + $data = [ + 'pago' => $pago->id, + 'estado' => -3, + 'fecha' => $f->format('Y-m-d') + ]; + $estado = model(EstadoPago::class)->create($data); + $estado->save(); + $venta->credito = 0; + $venta->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function pendientes() + { + $creditos = model(Credito::class) + ->select('credito.*') + ->join('venta', ['venta.credito', '=', 'credito.id']) + ->join('pago', ['pago.id', '=', 'credito.pago']) + ->rawJoin('JOIN (SELECT ep.* FROM (SELECT pago, MAX(id) AS id FROM estado_pago GROUP BY pago) e0 JOIN estado_pago ep ON ep.id = e0.id)', ['estado_pago.pago', '=', 'pago.id'], 'estado_pago') + ->whereLt('estado_pago.estado', 2) + ->where('venta.estado', 1) + ->orderByAsc('estado_pago.fecha') + ->findMany(); + return view('ventas.creditos.pendientes', compact('creditos')); + } +} +?> diff --git a/app_old/resources/less/Controller/Cuotas.php b/app_old/resources/less/Controller/Cuotas.php new file mode 100644 index 0000000..4d457ba --- /dev/null +++ b/app_old/resources/less/Controller/Cuotas.php @@ -0,0 +1,230 @@ +findOne($id); + + return view('ventas.pies.cuotas.show', compact('cuota')); + } + public static function edit() + { + $id = get('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + return view('ventas.pies.cuotas.edit', compact('cuota')); + } + public static function editar() + { + $id = get('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + + $cuota->numero = post('numero'); + $cuota->{'valor_$'} = post('valor'); + $banco = \Model::factory(\Incoviba\old\Common\Banco::class)->where('nombre', post('banco'))->findOne(); + if ($banco) { + $cuota->banco = $banco->id; + } else { + $cuota->banco = 0; + } + $f = \Carbon\Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $cuota->fecha = $f->format('Y-m-d'); + $pago = $cuota->pago(); + $pago->valor = post('valor'); + $pago->banco = $banco->id; + $pago->identificador = post('identificador'); + $pago->fecha = $f->format('Y-m-d'); + $uf = uf($f); + if ($uf->total > 0) { + $pago->uf = $uf->uf->value; + } else { + $pago->uf = 0; + } + + $pago->save(); + $cuota->save(); + header('Location: ' . url('', ['p' => 'pies', 'a' => 'resumen', 'pie' => $cuota->pie()->id])); + } + public static function edited() + { + $id = get('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + $pago = $cuota->pago(); + foreach ($_POST as $key => $value) { + $pago->$key = $value; + } + $pago->save(); + } + public static function pendientes() + { + $f = \Carbon\Carbon::today(config('app.timezone')); + $cuotas = \Model::factory(Cuota::class) + ->select('cuota.*') + ->join('pago', ['pago.id', '=', 'cuota.pago']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->raw_join('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'], 'ep') + ->where('ep.estado', 0) + ->where('venta.estado', 1) + ->whereLte('pago.fecha', $f->format('Y-m-d')) + ->order_by_asc('pago.fecha') + ->findMany(); + $sum = 0; + if (count($cuotas) > 0) { + $sum = array_reduce($cuotas, function($carry, $item) { + $carry += $item->pago()->valor; + return $carry; + }); + } + setlocale(LC_TIME, 'es'); + return view('ventas.pies.cuotas.pendientes', compact('cuotas', 'sum')); + } + public static function depositar() + { + $id = post('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + if ($cuota->pago()->estado()->estado == 1) { + return 'ok'; + } + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $cuota->pago()->id; + $estado->estado = 1; + $f = Carbon::parse(post('fecha'), config('app.timezone')); + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + return 'ok'; + } + public static function remove() + { + $id = get('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $cuota->pago()->id; + $estado->estado = -3; + $f = Carbon::today(config('app.timezone')); + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + header('Location: ' . url('', ['p' => 'pies', 'a' => 'resumen', 'pie' => $cuota->pie()->id])); + } + public static function para_abonar() + { + $cuotas = \Model::factory(Cuota::class) + ->select('cuota.*') + ->join('pago', ['pago.id', '=', 'cuota.pago']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->raw_join('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'], 'ep') + ->where('ep.estado', 1) + ->where('venta.estado', 1) + ->order_by_asc('ep.fecha') + ->findMany(); + $ini = get('start'); + if ($ini == null) { + $ini = 0; + } + $n = get('step'); + if ($n == 0) { + $n = 30; + } + $total = count($cuotas); + $cuotas = array_slice($cuotas, $ini, $n); + $pages = ceil($total / $n); + $current = ($ini + $n) / $n; + return view('ventas.pies.cuotas.abonar', compact('cuotas', 'total', 'pages', 'current')); + } + public static function abonar() + { + $id = post('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + if ($cuota->pago()->estado()->estado == 2) { + return 'ok'; + } + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $cuota->pago()->id; + $estado->estado = 2; + $f = Carbon::parse(post('fecha'), config('app.timezone')); + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + return 'ok'; + } + public static function rebotar() + { + $id = post('cuota'); + $cuota = \Model::factory(Cuota::class)->findOne($id); + if ($cuota->pago()->estado()->estado == -1) { + return 'ok'; + } + $estado = \Model::factory(EstadoPago::class)->create(); + $estado->pago = $cuota->pago()->id; + $estado->estado = -1; + $f = Carbon::parse(post('fecha'), config('app.timezone')); + $estado->fecha = $f->format('Y-m-d'); + $estado->save(); + return 'ok'; + } + public static function add() + { + $id = get('pie'); + $pie = \Model::factory(Pie::class)->findOne($id); + return view('ventas.pies.cuotas.add', compact('pie')); + } + public static function agregar() + { + $id = get('pie'); + $pie = \Model::factory(Pie::class)->findOne($id); + + $cant = $pie->cuotas - count($pie->cuotas()); + for ($i = 0; $i < $cant; $i ++) { + if (trim(post('valor' . $i)) == '') { + continue; + } + $banco = \Model::factory(Banco::class)->where('nombre', post('banco' . $i))->findOne(); + $f = Carbon::createFromDate(post('year' . $i), post('month' . $i), post('day' . $i), config('app.timezone')); + $uf = uf($f); + $valor = correctNumber(post('valor' . $i)); + + $pago = \Model::factory(Pago::class)->create(); + $pago->banco = $banco->id; + $pago->fecha = $f->format('Y-m-d'); + if ($uf and $uf->total > 0) { + $pago->uf = $uf->uf->value; + } else { + $pago->uf = 0; + } + $pago->tipo = 1; + $pago->valor = $valor; + $pago->identificador = post('identificador' . $i); + + $cuota = \Model::factory(Cuota::class)->create(); + $cuota->pie = $pie->id; + $cuota->fecha = $pago->fecha; + $cuota->{'valor_$'} = $pago->valor; + $cuota->estado = 0; + $cuota->banco = $pago->banco; + $cuota->uf = $pago->uf; + $cuota->numero = post('numero' . $i); + + $pago->new(); + + $cuota->pago = $pago->id; + $cuota->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $pie->venta()->id])); + } + } +} +?> diff --git a/app_old/resources/less/Controller/Devoluciones.php b/app_old/resources/less/Controller/Devoluciones.php new file mode 100644 index 0000000..8d9c41c --- /dev/null +++ b/app_old/resources/less/Controller/Devoluciones.php @@ -0,0 +1,19 @@ +findOne($id); + + return view('print.devolucion', compact('venta')); + } +} +?> diff --git a/app_old/resources/less/Controller/Escrituras.php b/app_old/resources/less/Controller/Escrituras.php new file mode 100644 index 0000000..f2cb056 --- /dev/null +++ b/app_old/resources/less/Controller/Escrituras.php @@ -0,0 +1,212 @@ +findOne($id); + return view('ventas.escrituras.add', compact('venta')); + } + public static function agregar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('escritura_year'), post('escritura_month'), post('escritura_day'), config('app.timezone')); + $venta->escriturado = $f->format('Y-m-d'); + + if (post('valor_reajuste')) { + $reajuste = \Model::factory(Pago::class)->create(); + $reajuste->valor = correctNumber(post('valor_reajuste')); + $fp = Carbon::createFromDate(post('reajuste_year'), post('reajuste_month'), post('reajuste_day'), config('app.timezone')); + $reajuste->fecha = $fp->format('Y-m-d'); + $reajuste->uf = (float) uf($fp)->uf->value; + $reajuste->newPagado(); + + $pie = $venta->pie(); + $pie->reajuste = $reajuste->id; + $pie->save(); + } + if (post('escritura_valor') or post('escritura_valor_uf')) { + $pago = \Model::factory(Pago::class)->create(); + $fp = Carbon::createFromDate(post('pago_escritura_year'), post('pago_escritura_month'), post('pago_escritura_day'), config('app.timezone')); + $pago->fecha = $fp->format('Y-m-d'); + $pago->uf = (float) uf($fp)->uf->value; + if (post('escritura_valor')) { + $pago->valor = correctNumber(post('escritura_valor')); + $pago->newPagado(); + } else { + $pago->valor = correctNumber(post('escritura_valor_uf')) * $pago->uf; + $pago->new(); + } + + $escritura = \Model::factory(Escritura::class)->create(); + $escritura->pago = $pago->id; + $escritura->valor = $pago->valor('uf'); + $escritura->fecha = $pago->fecha; + $escritura->save(); + + $venta->escritura = $escritura->id; + } + if (post('subsidio_ahorrado') or post('subsidio_valor')) { + $total = post('subsidio_ahorrado') + post('subsidio_valor'); + $subsidio = \Model::factory(Subsidio::class)->create(); + $pago = \Model::factory(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = (float) uf($f)->uf->value; + $pago->valor = correctNumber(post('subsidio_ahorrado')) * $pago->uf; + $pago->new(); + $subsidio->pago = $pago->id; + $pago = \Model::factory(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = (float) uf($f)->uf->value; + $pago->valor = correctNumber(post('subsidio_valor')) * $pago->uf; + $pago->new(); + $subsidio->subsidio = $pago->id; + $subsidio->save(); + + $venta->subsidio = $subsidio->id; + } + if (post('credito_valor')) { + $pago = \Model::factory(Pago::class)->create(); + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = (float) uf($f)->uf->value; + $valor = post('credito_valor'); + if (strpos($valor, ',') !== false) { + $valor = correctNumber($valor); + } + $pago->valor = $valor * $pago->uf; + $banco = \Model::factory(Banco::class)->where('nombre', post('credito_banco'))->findOne(); + $pago->banco = $banco->id; + $pago->new(); + + $credito = \Model::factory(Credito::class)->create(); + $credito->pago = $pago->id; + $credito->save(); + + $venta->credito = $credito->id; + } elseif (post('credito_banco')) { + $pago = $venta->credito()->pago(); + $banco = \Model::factory(Banco::class)->where('nombre', post('credito_banco'))->findOne(); + $pago->banco = $banco->id; + $pago->save(); + } + + $tipo = \Model::factory(TipoEstadoVenta::class)->where('descripcion', 'escriturando')->findOne(); + $data = [ + 'venta' => $venta->id, + 'estado' => $tipo->id, + 'fecha' => $venta->escriturado + ]; + $estado = \Model::factory(EstadoVenta::class)->create($data); + $estado->save(); + $venta->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function edit() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + echo view('ventas.escrituras.edit', compact('venta')); + } + public static function editar() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $uf = uf($f); + + $valor = correctNumber(post('valor')); + if ($valor == '') { + $valor_uf = correctNumber(post('valor_uf')); + $valor = $valor_uf * $uf->uf->value; + } + $pago = $venta->escritura()->pago(); + if ($pago->valor != $valor) { + $pago->valor = $valor; + } + if ($pago->fecha != $f->format('Y-m-d')) { + $pago->fecha = $f->format('Y-m-d'); + $pago->uf = $uf->uf->value; + } + + $pago->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function informe() + { + $id = get('venta'); + $venta = \Model::factory(Venta::class)->findOne($id); + return view('ventas.escrituras.informe', compact('venta')); + } + public static function pagar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.escrituras.pagar', compact('venta')); + } + public static function pagado() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $data = [ + 'pago' => $venta->escritura()->pago()->id, + 'fecha' => $f->format('Y-m-d'), + 'estado' => 1 + ]; + $estado = model(EstadoPago::class)->create($data); + $estado->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } + public static function abonar() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + return view('ventas.escrituras.abonar', compact('venta')); + } + public static function abonado() + { + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $f = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + + $data = [ + 'pago' => $venta->escritura()->pago()->id, + 'fecha' => $f->format('Y-m-d'), + 'estado' => 2 + ]; + $estado = model(EstadoPago::class)->create($data); + $estado->save(); + header('Location: ' . url('', ['p' => 'ventas', 'a' => 'show', 'venta' => $venta->id])); + } +} +?> diff --git a/app_old/resources/less/Controller/FormaPago.php b/app_old/resources/less/Controller/FormaPago.php new file mode 100644 index 0000000..6ccc7b3 --- /dev/null +++ b/app_old/resources/less/Controller/FormaPago.php @@ -0,0 +1,98 @@ +findOne($id); + + return view('ventas.forma_pago.edit', compact('venta')); + } + public static function editar() + { + d(post()); + $id = get('venta'); + $venta = model(Venta::class)->findOne($id); + + $valor = correctNumber(post('valor_pie')); + $cuotas = post('cuotas_pie'); + if ($venta->pie != 0) { + $pie = $venta->pie(); + $changed = false; + if ($pie->valor != $valor) { + $pie->valor = $valor; + $changed = true; + } + if ($pie->cuotas != $cuotas) { + $pie->cuotas = $cuotas; + $changed = true; + } + if ($changed) { + d($pie); + } + + $valor = correctNumber(post('valor_reajuste')); + $f = Carbon::createFromDate(post('year_reajuste'), post('month_reajuste'), post('day_reajuste'), config('app.timezone')); + $uf = uf($f); + $reajuste = $pie->reajuste(); + $changed = false; + if ($reajuste->valor != $valor) { + $reajuste->valor = $valor; + $changed = true; + } + if ($reajuste->fecha != $f->format('Y-m-d')) { + $reajuste->fecha = $f->format('Y-m-d'); + $reajuste->uf = $uf->uf->value; + $changed = true; + } + if ($changed) { + d($reajuste); + } + } elseif ($valor != '') { + $f = Carbon::parse($venta->fecha, config('app.timezone')); + $uf = uf($f); + $data = [ + 'valor' => $valor, + 'cuotas' => $cuotas, + 'uf' => $uf->uf->value, + 'fecha' => $f->format('Y-m-d') + ]; + $pie = model(Pie::class)->create($data); + d($pie); + } + + $valor = correctNumber(post('valor_escritura')); + $f = Carbon::createFromDate(post('year_escritura'), post('month_escritura'), post('day_escritura'), config('app.timezone')); + if ($venta->escritura != 0) { + $escritura = $venta->escritura(); + d($escritura); + } elseif ($valor != '') { + $data = [ + 'valor' => $valor, + 'fecha' => $f->format('Y-m-d'), + 'uf' => $uf->uf->value, + 'tipo' => 7 + ]; + $pago = model(Pago::class)->create($data); + $pago->newPagado(); + $data['pago'] = $pago->id; + unset($data['tipo']); + $escritura = model(Escritura::class)->create($data); + $escritura->save(); + $venta->escritura = $escritura->id; + $venta->save(); + } + } +} +?> diff --git a/resources/less/Controller/Informes.php b/app_old/resources/less/Controller/Informes.php similarity index 99% rename from resources/less/Controller/Informes.php rename to app_old/resources/less/Controller/Informes.php index 965a88b..e93d4c8 100644 --- a/resources/less/Controller/Informes.php +++ b/app_old/resources/less/Controller/Informes.php @@ -1,17 +1,16 @@ orderByAsc('abreviacion')->findMany(); + return view('inmobiliarias.list', compact('inmobiliarias')); + } + public static function show() + { + $rut = get('rut'); + $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); + return view('inmobiliarias.show', compact('inmobiliaria')); + } + public static function add() + { + $sociedades = model(TipoSociedad::class)->findMany(); + return view('inmobiliarias.add', compact('sociedades')); + } + public static function agregar() + { + list($rut, $dv) = explode('-', str_replace('.', '', post('rut'))); + + $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); + if ($inmobiliaria) { + header('Location: ' . url('', ['p' => 'inmobiliarias', 'a' => 'show', 'rut' => $inmobiliaria->rut])); + die(); + } + + $inmobiliaria = model(Inmobiliaria::class)->create(); + $inmobiliaria->rut = $rut; + $inmobiliaria->dv = $dv; + $inmobiliaria->razon = post('razon'); + $inmobiliaria->abreviacion = post('abrev'); + $inmobiliaria->sociedad = post('sociedad'); + + $inmobiliaria->save(); + header('Location: ' . url('', ['p' => 'inmobiliarias', 'a' => 'show', 'rut' => $inmobiliaria->rut])); + } + public static function edit() + { + $sociedades = model(TipoSociedad::class)->findMany(); + $rut = get('rut'); + $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); + $bancos = model(Banco::class)->findMany(); + usort($bancos, function($a, $b) { + return strcmp($a->nombre, $b->nombre); + }); + return view('inmobiliarias.edit', compact('inmobiliaria', 'bancos', 'sociedades')); + } + public static function do_edit() + { + $rut = get('rut'); + $inmobiliaria = model(Inmobiliaria::class)->findOne($rut); + foreach (post() as $field => $value) { + if ($value != '' and $inmobiliaria->{$field} != $value) { + $inmobiliaria->{$field} = $value; + } + } + + $inmobiliaria->save(); + header('Location: ' . nUrl('inmobiliarias', 'show', ['rut' => $inmobiliaria->rut])); + } +} +?> diff --git a/app_old/resources/less/Controller/Operadores.php b/app_old/resources/less/Controller/Operadores.php new file mode 100644 index 0000000..765ba2a --- /dev/null +++ b/app_old/resources/less/Controller/Operadores.php @@ -0,0 +1,47 @@ +findOne(get('proyecto')); + $operadores = model(Agente::class) + ->select('agente.*') + ->join('agente_tipo', ['agente_tipo.agente', '=', 'agente.id']) + ->join('tipo_agente', ['tipo_agente.id', '=', 'agente_tipo.tipo']) + ->where('tipo_agente.descripcion', 'operador') + ->orderByAsc('agente.abreviacion') + ->findMany(); + $vigentes = array_map(function($item) { + return $item->agente()->agente(); + }, $proyecto->operadoresVigentes()); + echo view('proyectos.operadores.add', compact('proyecto', 'operadores', 'vigentes')); + } + public static function add() + { + $proyecto = model(Proyecto::class)->findOne(get('proyecto')); + $fecha = Carbon::today(config('app.timezone')); + foreach (post('operadores') as $op) { + $operador = model(Agente::class)->findOne($op); + $at = $operador->tipos(19); + $data = [ + 'proyecto' => $proyecto->id, + 'agente' => $at->id, + 'fecha' => $fecha->format('Y-m-d'), + 'comision' => 2 + ]; + $pa = model(ProyectoAgente::class)->create($data); + $pa->new(); + } + header('Location: ' . nUrl('proyectos', 'show', ['proyecto' => $proyecto->id])); + } +} diff --git a/app_old/resources/less/Controller/Other.php b/app_old/resources/less/Controller/Other.php new file mode 100644 index 0000000..eb90f31 --- /dev/null +++ b/app_old/resources/less/Controller/Other.php @@ -0,0 +1,71 @@ +create(); + $unidad = \Model::factory(Unidad::class)->where('descripcion', $info[0])->where('proyecto', post('proyecto'))->find_one(); + if (!$unidad->venta()->find_one()) { + echo 'x'; + continue; + } + $venta = $unidad->venta()->find_one(); + $entrega->fecha = \Carbon\Carbon::parse($info[1])->format('Y-m-d'); + if ($venta->entrega == '0') { + $entrega->save(); + $venta->entrega = $entrega->id; + $venta->save(); + echo '.'; + } else { + echo 'x'; + } + } + } else { + $proyectos = \Model::factory(Proyecto::class)->order_by_asc('descripcion')->find_many(); + return view('other.entregar_multiple', compact('proyectos')); + } + } + public static function capacidades() + { + $capacidades = []; + $controllers = glob(config('locations.app') . '/Controller/*.php'); + foreach ($controllers as $controller) { + if (basename($controller) == 'Admin.php' or basename($controller) == 'Other.php') { + continue; + } + $class = Stringy::create($controller)->replace(config('locations.app'), '/App')->replace('.php', '')->replace('/', '\\')->__toString(); + $ref = new \ReflectionClass($class); + $static = $ref->getMethods(\ReflectionMethod::IS_STATIC && \ReflectionMethod::IS_PUBLIC); + foreach ($static as $method) { + if ($method->name == 'setDefault' or $method->name == 'index') { + continue; + } + $capacidades []= $method; + } + } + return view('other.capacidades', compact('capacidades')); + } +} +?> \ No newline at end of file diff --git a/app_old/resources/less/Controller/Pagares.php b/app_old/resources/less/Controller/Pagares.php new file mode 100644 index 0000000..f05b24e --- /dev/null +++ b/app_old/resources/less/Controller/Pagares.php @@ -0,0 +1,271 @@ +findOne(get('pagare')); + return view('proyectos.pagares.show', compact('pagare')); + } + public static function add() + { + $proyecto = model(Proyecto::class)->findOne(get('proyecto')); + return view('proyectos.pagares.add', compact('proyecto')); + } + public static function do_add() + { + $proyecto = model(Proyecto::class)->findOne(get('proyecto')); + $data = post(); + + $data['id'] = $data['numero']; + unset($data['numero']); + $data['proyecto'] = $proyecto->id; + $moneda = model(TipoMonedaPagare::class)->where('descripcion', $data['moneda'])->findOne(); + $data['moneda'] = $moneda->id; + + $fecha = ['year', 'month', 'day']; + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha'] = implode('-', $fecha_arr); + + foreach ($fecha as &$key) { + $key .= '_banco'; + } + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha_banco'] = implode('-', $fecha_arr); + + $data['abonado'] = (int) $data['abonado']; + if ($data['abonado'] == 0) { + $data['fecha'] = '0000-00-00'; + } + + $pagare = model(Pagare::class)->create($data); + $pagare->save(); + header('Location: ' . nUrl('pagares', 'show', ['pagare' => $pagare->id])); + } + public static function edit() + { + $pagare = model(Pagare::class)->findOne(get('pagare')); + return view('proyectos.pagares.edit', compact('pagare')); + } + public static function do_edit() + { + $pagare = model(Pagare::class)->findOne(get('pagare')); + + $data = post(); + if ($pagare->id != $data['numero']) { + foreach ($pagare->renovaciones() as $renovacion) { + $renovacion->pagare = $data['numero']; + $renovacion->save(); + } + $pagare->id = $data['numero']; + $changed = true; + } + unset($data['numero']); + $moneda = model(TipoMonedaPagare::class)->where('descripcion', $data['moneda'])->findOne(); + $data['moneda'] = $moneda->id; + $fecha = ['year', 'month', 'day']; + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha'] = implode('-', $fecha_arr); + + foreach ($fecha as &$key) { + $key .= '_banco'; + } + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha_banco'] = implode('-', $fecha_arr); + + $data['abonado'] = (int) $data['abonado']; + if ($data['abonado'] == 0) { + $data['fecha'] = '0000-00-00'; + } + + $changed = false; + foreach ($data as $k => $v) { + if ($pagare->$k != $v) { + $pagare->$k = $v; + $changed = true; + if (strpos($k, 'fecha') !== false) { + $pagare->uf = 0; + } + } + } + + if ($changed) { + $pagare->save(); + } + header('Location: ' . nUrl('pagares', 'show', ['pagare' => $pagare->id])); + } + public static function edit_renovacion() + { + $renovacion = model(RenovacionPagare::class)->findOne(get('renovacion')); + return view('proyectos.pagares.edit_renovacion', compact('renovacion')); + } + public static function do_edit_renovacion() + { + $renovacion = model(RenovacionPagare::class)->findOne(get('renovacion')); + + $data = post(); + $fecha = ['year', 'month', 'day']; + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha'] = implode('-', $fecha_arr); + + foreach ($fecha as &$key) { + $key .= '_banco'; + } + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha_banco'] = implode('-', $fecha_arr); + + $changed = false; + foreach ($data as $k => $v) { + if ($renovacion->$k != $v) { + $renovacion->$k = $v; + $changed = true; + if (strpos($k, 'fecha') !== false) { + $renovacion->uf = 0; + } + } + } + if ($changed) { + $renovacion->save(); + } + header('Location: ' . nUrl('pagares', 'show', ['pagare' => $renovacion->pagare])); + } + public static function add_renovacion() + { + $pagare = model(Pagare::class)->findOne(get('pagare')); + return view('proyectos.pagares.add_renovacion', compact('pagare')); + } + public static function do_add_renovacion() + { + $pagare = model(Pagare::class)->findOne(get('pagare')); + $data = post(); + + $data['pagare'] = $pagare->id; + $fecha = ['year', 'month', 'day']; + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha'] = implode('-', $fecha_arr); + + foreach ($fecha as &$key) { + $key .= '_banco'; + } + $fecha_arr = array_filter($data, function($item) use ($fecha) { + return (array_search($item, $fecha) !== false); + }, \ARRAY_FILTER_USE_KEY); + uksort($fecha_arr, function($a, $b) use ($fecha) { + return array_search($a, $fecha) - array_search($b, $fecha); + }); + foreach ($fecha as $f) { + unset($data[$f]); + } + array_walk($fecha_arr, function(&$item) { + if (strlen($item) < 4) { + $item = str_pad($item, 2, '0', \STR_PAD_LEFT); + } + }); + $data['fecha_banco'] = implode('-', $fecha_arr); + + $renovacion = model(RenovacionPagare::class)->create($data); + $renovacion->save(); + + header('Location: ' . nUrl('pagares', 'show', ['pagare' => $renovacion->pagare])); + } +} diff --git a/app_old/resources/less/Controller/Pagos.php b/app_old/resources/less/Controller/Pagos.php new file mode 100644 index 0000000..f279b9e --- /dev/null +++ b/app_old/resources/less/Controller/Pagos.php @@ -0,0 +1,358 @@ +findOne($id); + $tipos = model(TipoPago::class)->orderByAsc('descripcion')->findMany(); + $estados = model(TipoEstadoPago::class)->orderByAsc('descripcion')->findMany(); + + return view('ventas.pagos.edit', compact('pago', 'asociado', 'id_asociado', 'tipos', 'estados')); + } + public static function editar() + { + $id = get('pago'); + $pago = model(Pago::class)->findOne($id); + + $fp = Carbon::createFromDate(post('year'), post('month'), post('day'), config('app.timezone')); + $tipo = model(TipoPago::class)->findOne(post('tipo')); + $valor = correctNumber(post('valor')); + $banco = model(Banco::class)->where('nombre', post('banco'))->findOne(); + + $fe = Carbon::createFromDate(post('yearestado'), post('monthestado'), post('dayestado'), config('app.timezone')); + $estado = model(TipoEstadoPago::class)->findOne(post('estado')); + $uf = uf($fe); + + $est = $pago->estado(); + if ($est->fecha != $fe->format('Y-m-d')) { + $est->fecha = $fe->format('Y-m-d'); + $pago->uf = $uf->uf->value; + } + if ($est->estado != $estado->id) { + $est->estado = $estado->id; + } + + if ($pago->fecha != $fp->format('Y-m-d')) { + $pago->fecha = $fp->format('Y-m-d'); + } + if ($pago->tipo != $tipo->id) { + $pago->tipo = $tipo->id; + } + if ($pago->valor != $valor) { + $pago->valor = $valor; + } + if ($pago->identificador != post('identificador')) { + $pago->identificador = post('identificador'); + } + if ($pago->pagador != post('pagador')) { + $pago->pagador = post('pagador'); + } + if ($pago->banco != $banco->id) { + $pago->banco = $banco->id; + } + + $est->save(); + $pago->save(); + header('Location: ' . url('', ['p' => get('asociado') . 's', 'a' => 'show', get('asociado') => get(get('asociado'))])); + } + public static function pendientes() + { + $ventas = model(Venta::class) + ->select('venta.*') + ->rawJoin('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.venta', '=', 'venta.id'], 'ev') + ->join('tipo_estado_venta', ['te.id', '=', 'ev.estado'], 'te') + ->join('propiedad', ['propiedad.id', '=', 'venta.propiedad']) + ->join('unidad', ['unidad.id', '=', 'propiedad.unidad_principal']) + ->join('proyecto', ['proyecto.id', '=', 'unidad.proyecto']) + ->where('te.activa', 1) + ->orderByAsc('proyecto.descripcion') + ->orderByExpr('LPAD(unidad.descripcion, 4, "0")') + ->findMany(); + $n = 30; + $mod = floor(count($ventas) / $n); + $i_rest = count($ventas) - count($ventas) % $mod + 1; + $rest = count($ventas) - $i_rest; + $lots = (object) ['size' => $mod, 'N' => $n, 'rest' => (object) [ + 'size' => $rest, + 'start' => $i_rest + ] + ]; + return view('ventas.pagos.pendientes', compact('ventas', 'lots')); + } + public static function para_pendientes() + { + $timezone = config('app.timezone'); + $today = Carbon::today($timezone); + $days = []; + $fechas = []; + for ($i = $today->copy()->subDays(15); $i <= $today->copy()->addDays(15); $i = $i->copy()->addDay()) { + $days []= $i->format('Y-m-d'); + $fechas []= $i->format('d-m-Y'); + } + $pagos_pendientes = model(Pago::class) + ->select('estado_pago.fecha') + ->selectExpr('COUNT(pago.id)', 'cantidad') + ->join('cuota', ['cuota.pago', '=', 'pago.id']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->filter('filterEstado') + ->where('estado_pago.estado', 0) + ->where('venta.estado', 1) + ->whereGte('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) + ->whereLte('estado_pago.fecha', $today->copy()->addDays(15)->format('Y-m-d')) + ->orderByAsc('estado_pago.fecha') + ->groupBy('estado_pago.fecha') + ->findMany(); + $valores = array_fill(0, count($days), 0); + $anteriores = model(Pago::class) + ->join('cuota', ['cuota.pago', '=', 'pago.id']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->filter('filterEstado') + ->where('estado_pago.estado', 0) + ->where('venta.estado', 1) + ->whereLt('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) + ->count(); + foreach ($pagos_pendientes as $pago) { + $valores[array_search($pago->fecha()->format('Y-m-d'), $days)] = $pago->cantidad; + } + $acum = []; + $sum = 0; + foreach ($valores as $valor) { + $sum += $valor; + $acum []= $sum; + } + $t = array_search($today->format('Y-m-d'), $days); + $color = array_merge( + array_fill(0, $t, 'red'), + ['blue'], + array_fill(0, count($days) - $t, 'green') + ); + $pagos = ['data' => $acum, 'historico' => $anteriores, 'backgroundColor' => $color]; + $abonos_pendientes = model(Pago::class) + ->select('estado_pago.fecha') + ->selectExpr('COUNT(pago.id)', 'cantidad') + ->filter('filterEstado') + ->where('estado_pago.estado', 1) + ->whereGte('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) + ->whereLt('estado_pago.fecha', $today->copy()->format('Y-m-d')) + ->orderByAsc('estado_pago.fecha') + ->groupBy('estado_pago.fecha') + ->findMany(); + $anteriores = model(Pago::class) + ->join('cuota', ['cuota.pago', '=', 'pago.id']) + ->join('venta', ['venta.pie', '=', 'cuota.pie']) + ->filter('filterEstado') + ->where('estado_pago.estado', 1) + ->where('venta.estado', 1) + ->whereLt('estado_pago.fecha', $today->copy()->subDays(15)->format('Y-m-d')) + ->count(); + $valores = array_fill(0, count($days), 0); + foreach ($abonos_pendientes as $pago) { + $valores[array_search($pago->fecha()->format('Y-m-d'), $days)] = $pago->cantidad; + } + $acum = []; + $sum = 0; + foreach ($valores as $valor) { + $sum += $valor; + $acum []= $sum; + } + $color = array_fill(0, count($pagos), 'rgb(200, 0, 0)'); + $abonos = ['data' => $acum, 'historico' => $anteriores, 'backgroundColor' => $color]; + $output = ['count' => count($days), 'fechas' => $fechas, 'pagos' => $pagos, 'abonos' => $abonos]; + echo json_encode($output); + } + public static function para_abonar() + { + $ids = json_decode(post('ids')); + //$id = get('id'); + function checkPago(&$pagos, $tipo, $pago) { + if (!$pago) { + return; + } + if (!$pago->estado()) { + $pagos []= [ + 'tipo' => $tipo, + 'pago' => $pago->asArray(), + 'estado' => -1 + ]; + return; + } + if ($pago->estado()->tipo()->descripcion == 'depositado') { + $pagos []= [ + 'tipo' => $tipo, + 'pago' => $pago->asArray(), + 'fecha' => format('shortDate', $pago->estado()->fecha), + 'valor' => format('pesos', $pago->valor, true), + 'estado' => 1 + ]; + } + } + $output = []; + foreach ($ids as $id) { + $venta = model(Venta::class)->findOne($id); + if ($venta->estado()->tipo()->activa == 0) { + $output []= ['status' => -1, 'venta' => $venta->id]; + continue; + } + $pagos = []; + if ($venta->pie()) { + foreach ($venta->pie()->cuotas() as $cuota) { + checkPago($pagos, 'Pie', $cuota->pago()); + } + if ($venta->pie()->reajuste()) { + checkPago($pagos, 'Reajuste', $venta->pie()->reajuste()); + } + } + if ($venta->credito()) { + checkPago($pagos, 'Credito', $venta->credito()->pago()); + } + if ($venta->escritura()) { + checkPago($pagos, 'Abono Escritura', $venta->escritura()->pago()); + } + if ($venta->subsidio()) { + checkPago($pagos, 'Subsidio', $venta->subsidio()->subsidio()); + checkPago($pagos, 'Ahorro', $venta->subsidio()->pago()); + } + if (count($pagos) <= 0) { + $output []= ['status' => -1, 'venta' => $venta->id]; + continue; + } + $output []= [ + 'status' => 1, + 'proyecto' => $venta->proyecto()->descripcion, + 'venta' => $venta->id, + 'propietario' => $venta->propietario()->nombreCompleto(), + 'departamento' => $venta->unidad()->descripcion, + 'pagos' => $pagos + ]; + } + return json_encode($output); + } + public static function rebotes() + { + $ids = json_decode(post('ids')); + $response = []; + foreach ($ids as $id) { + //$id = get('id'); + $venta = model(Venta::class)->findOne($id); + $rebotes = $venta->pagos(-1); + if (count($rebotes) < 1) { + $response []= ['status' => -1, 'venta' => $venta->id]; + continue; + } + usort($rebotes, function($a, $b) { + return $b->estado()->fecha()->diffInDays($a->estado()->fecha(), false); + }); + + $output = []; + $textos = []; + foreach ($rebotes as $rebote) { + $fuente = $rebote->fuente()[0]; + $text = '
- 
+ 
+
-
+
+
-
+
@endif