Compare commits
6 Commits
c3247838b3
...
feature/pr
Author | SHA1 | Date | |
---|---|---|---|
ad64ffa436 | |||
4e4c0b7648 | |||
47679cd4e4 | |||
0f8db5a3f8 | |||
c38e89d3f1 | |||
307f2ac7d7 |
@ -1,19 +1,22 @@
|
|||||||
FROM php:8.2-cli
|
FROM php:8.4-cli
|
||||||
|
|
||||||
ENV TZ "${TZ}"
|
ENV TZ "${TZ}"
|
||||||
ENV APP_NAME "${APP_NAME}"
|
ENV APP_NAME "${APP_NAME}"
|
||||||
ENV API_URL "${API_URL}"
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends cron rsyslog nano && rm -r /var/lib/apt/lists/*
|
RUN apt-get update && apt-get install -y --no-install-recommends cron rsyslog nano beanstalkd \
|
||||||
|
&& rm -r /var/lib/apt/lists/*
|
||||||
|
|
||||||
RUN pecl install xdebug-3.2.2 \
|
RUN pecl install xdebug-3.4.2 \
|
||||||
&& docker-php-ext-enable xdebug \
|
&& docker-php-ext-enable xdebug \
|
||||||
&& echo "#/bin/bash\nprintenv >> /etc/environment\ncron -f -L 11" > /root/entrypoint && chmod a+x /root/entrypoint
|
&& echo $TZ > /etc/timezone
|
||||||
|
|
||||||
|
COPY --chmod=550 ./cli/start_command /root/start_command
|
||||||
|
|
||||||
COPY ./php-errors.ini /usr/local/etc/php/conf.d/docker-php-errors.ini
|
COPY ./php-errors.ini /usr/local/etc/php/conf.d/docker-php-errors.ini
|
||||||
|
COPY ./php-timezone.ini /usr/local/etc/php/conf.d/docker-php-timezone.ini
|
||||||
|
|
||||||
WORKDIR /code/bin
|
WORKDIR /code/bin
|
||||||
|
|
||||||
COPY --chmod=644 ./cli/crontab /var/spool/cron/crontabs/root
|
COPY --chmod=644 ./cli/crontab /var/spool/cron/crontabs/root
|
||||||
|
|
||||||
CMD [ "/root/entrypoint" ]
|
CMD [ "/root/start_command" ]
|
||||||
|
@ -1,11 +1,12 @@
|
|||||||
FROM php:8.2-fpm
|
FROM php:8.4-fpm
|
||||||
|
|
||||||
ENV TZ=America/Santiago
|
ENV TZ=America/Santiago
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y --no-install-recommends libzip-dev libicu-dev git libpng-dev unzip tzdata \
|
RUN apt-get update && apt-get install -y --no-install-recommends libzip-dev libicu-dev git \
|
||||||
|
libpng-dev unzip tzdata libxml2-dev beanstalkd \
|
||||||
&& rm -r /var/lib/apt/lists/* \
|
&& rm -r /var/lib/apt/lists/* \
|
||||||
&& docker-php-ext-install pdo pdo_mysql zip intl gd bcmath \
|
&& docker-php-ext-install pdo pdo_mysql zip intl gd bcmath dom \
|
||||||
&& pecl install xdebug-3.3.2 \
|
&& pecl install xdebug-3.4.2 \
|
||||||
&& docker-php-ext-enable xdebug \
|
&& docker-php-ext-enable xdebug \
|
||||||
&& echo $TZ > /etc/timezone
|
&& echo $TZ > /etc/timezone
|
||||||
|
|
||||||
|
@ -2,17 +2,18 @@
|
|||||||
|
|
||||||
APP_URL=
|
APP_URL=
|
||||||
|
|
||||||
MYSQL_HOST=db
|
|
||||||
|
|
||||||
COOKIE_NAME=
|
COOKIE_NAME=
|
||||||
COOKIE_DOMAIN=
|
COOKIE_DOMAIN=
|
||||||
COOKIE_PATH=/
|
COOKIE_PATH=/
|
||||||
MAX_LOGIN_HOURS=120
|
MAX_LOGIN_HOURS=120
|
||||||
|
|
||||||
REDIS_HOST=redis
|
#REDIS_HOST=redis
|
||||||
REDIS_PORT=6379
|
#REDIS_PORT=6379
|
||||||
|
|
||||||
DB_HOST=db
|
DB_HOST=db
|
||||||
DB_DATABASE=incoviba
|
DB_DATABASE=incoviba
|
||||||
DB_USER=incoviba
|
DB_USER=incoviba
|
||||||
DB_PASSWORD=
|
DB_PASSWORD=
|
||||||
|
|
||||||
|
TOKU_URL=
|
||||||
|
TOKU_TOKEN=
|
||||||
|
1
app/.gitignore
vendored
1
app/.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
**/bin
|
**/bin
|
||||||
|
**/public/tests
|
||||||
|
@ -10,5 +10,5 @@ notifications:
|
|||||||
failingTests: false
|
failingTests: false
|
||||||
hideManual: true
|
hideManual: true
|
||||||
phpunit:
|
phpunit:
|
||||||
arguments: '--log-events-text /logs/output.txt --stop-on-failure'
|
arguments: '--testsuite unit --log-events-text /logs/output.txt --stop-on-failure'
|
||||||
timeout: 180
|
timeout: 180
|
||||||
|
3
app/bin/console
Executable file
3
app/bin/console
Executable file
@ -0,0 +1,3 @@
|
|||||||
|
#!/usr/bin/bash
|
||||||
|
|
||||||
|
php -d auto_prepend_file=test.bootstrap.php -a
|
3
app/bin/integration_tests
Executable file
3
app/bin/integration_tests
Executable file
@ -0,0 +1,3 @@
|
|||||||
|
#!/usr/bin/bash
|
||||||
|
|
||||||
|
bin/phpunit --testsuite acceptance $@
|
3
app/bin/performance_tests
Executable file
3
app/bin/performance_tests
Executable file
@ -0,0 +1,3 @@
|
|||||||
|
#!/usr/bin/bash
|
||||||
|
|
||||||
|
bin/phpunit --testsuite performance $@
|
3
app/bin/unit_tests
Executable file
3
app/bin/unit_tests
Executable file
@ -0,0 +1,3 @@
|
|||||||
|
#!/usr/bin/bash
|
||||||
|
|
||||||
|
./bin/phpunit --testsuite unit $@
|
@ -1,9 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Incoviba\Common\Alias;
|
namespace Incoviba\Common\Alias;
|
||||||
|
|
||||||
use Illuminate\Events\Dispatcher;
|
|
||||||
use Slim\Views\Blade;
|
use Slim\Views\Blade;
|
||||||
|
|
||||||
class View extends Blade
|
class View extends Blade {}
|
||||||
{
|
|
||||||
}
|
|
||||||
|
@ -8,9 +8,9 @@ interface Provider
|
|||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* @param string $money_symbol
|
* @param string $money_symbol
|
||||||
* @param DateTimeInterface $dateTime
|
* @param ?DateTimeInterface $dateTime = null
|
||||||
* @return float
|
* @return float
|
||||||
* @throws EmptyResponse
|
* @throws EmptyResponse
|
||||||
*/
|
*/
|
||||||
public function get(string $money_symbol, DateTimeInterface $dateTime): float;
|
public function get(string $money_symbol, ?DateTimeInterface $dateTime = null): float;
|
||||||
}
|
}
|
||||||
|
18
app/common/Ideal/LoggerEnabled.php
Normal file
18
app/common/Ideal/LoggerEnabled.php
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
<?php
|
||||||
|
namespace Incoviba\Common\Ideal;
|
||||||
|
|
||||||
|
use Psr\Log\LoggerAwareInterface;
|
||||||
|
use Psr\Log\LoggerInterface;
|
||||||
|
|
||||||
|
abstract class LoggerEnabled implements LoggerAwareInterface
|
||||||
|
{
|
||||||
|
public LoggerInterface $logger;
|
||||||
|
public function setLogger(LoggerInterface $logger): void
|
||||||
|
{
|
||||||
|
$this->logger = $logger;
|
||||||
|
}
|
||||||
|
public function getLogger(): LoggerInterface
|
||||||
|
{
|
||||||
|
return $this->logger;
|
||||||
|
}
|
||||||
|
}
|
@ -24,6 +24,11 @@ abstract class Repository implements Define\Repository
|
|||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getConnection(): Define\Connection
|
||||||
|
{
|
||||||
|
return $this->connection;
|
||||||
|
}
|
||||||
|
|
||||||
public function load(array $data_row): Define\Model
|
public function load(array $data_row): Define\Model
|
||||||
{
|
{
|
||||||
$model = $this->create($data_row);
|
$model = $this->create($data_row);
|
||||||
|
10
app/common/Ideal/Service/Repository.php
Normal file
10
app/common/Ideal/Service/Repository.php
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<?php
|
||||||
|
namespace Incoviba\Common\Ideal\Service;
|
||||||
|
|
||||||
|
use Incoviba\Common\Define;
|
||||||
|
use Incoviba\Common\Ideal;
|
||||||
|
|
||||||
|
abstract class Repository extends Ideal\Service
|
||||||
|
{
|
||||||
|
abstract public function getRepository(): Define\Repository;
|
||||||
|
}
|
@ -64,10 +64,10 @@ class Select extends Ideal\Query implements Define\Query\Select
|
|||||||
public function having(array|string $conditions): Select
|
public function having(array|string $conditions): Select
|
||||||
{
|
{
|
||||||
if (is_string($conditions)) {
|
if (is_string($conditions)) {
|
||||||
return $this->addCondition($conditions);
|
return $this->addHaving($conditions);
|
||||||
}
|
}
|
||||||
foreach ($conditions as $condition) {
|
foreach ($conditions as $condition) {
|
||||||
$this->addCondition($condition);
|
$this->addHaving($condition);
|
||||||
}
|
}
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
13
app/common/Implement/Exception/HttpException.php
Normal file
13
app/common/Implement/Exception/HttpException.php
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
<?php
|
||||||
|
namespace Incoviba\Common\Implement\Exception;
|
||||||
|
|
||||||
|
use Throwable;
|
||||||
|
use Exception;
|
||||||
|
|
||||||
|
class HttpException extends Exception
|
||||||
|
{
|
||||||
|
public function __construct(string $message = "", int $code = 0, ?Throwable $previous = null)
|
||||||
|
{
|
||||||
|
parent::__construct($message, $code, $previous);
|
||||||
|
}
|
||||||
|
}
|
48
app/common/Implement/Log/Formatter/PDO.php
Normal file
48
app/common/Implement/Log/Formatter/PDO.php
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
<?php
|
||||||
|
namespace Incoviba\Common\Implement\Log\Formatter;
|
||||||
|
|
||||||
|
use Throwable;
|
||||||
|
use Monolog\Formatter\JsonFormatter;
|
||||||
|
use Monolog\LogRecord;
|
||||||
|
|
||||||
|
class PDO extends JsonFormatter
|
||||||
|
{
|
||||||
|
public function __construct(int $batchMode = self::BATCH_MODE_JSON, bool $appendNewline = false, bool $ignoreEmptyContextAndExtra = false, bool $includeStacktraces = true)
|
||||||
|
{
|
||||||
|
parent::__construct($batchMode, $appendNewline, $ignoreEmptyContextAndExtra, $includeStacktraces);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function format(LogRecord $record): string
|
||||||
|
{
|
||||||
|
if (is_a($record->message, Throwable::class)) {
|
||||||
|
$exception = $record->message;
|
||||||
|
$message = $this->normalizeException($exception);
|
||||||
|
$context = $record->context;
|
||||||
|
$context['exception'] = $exception;
|
||||||
|
if ($exception->getPrevious()) {
|
||||||
|
$context['previous'] = $this->walkException($exception);
|
||||||
|
}
|
||||||
|
$new_record = new LogRecord(
|
||||||
|
$record->datetime,
|
||||||
|
$record->channel,
|
||||||
|
$record->level,
|
||||||
|
json_encode($message),
|
||||||
|
$context,
|
||||||
|
$record->extra
|
||||||
|
);
|
||||||
|
$record = $new_record;
|
||||||
|
}
|
||||||
|
$normalized = $this->normalize($record, $this->maxNormalizeDepth);
|
||||||
|
return $normalized['message'];
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function walkException(Throwable $exception, int $depth = 0): array
|
||||||
|
{
|
||||||
|
$output = [];
|
||||||
|
$currentDepth = $depth;
|
||||||
|
while ($previous = $exception->getPrevious() and $currentDepth < $this->maxNormalizeDepth) {
|
||||||
|
$output []= $this->normalizeException($previous);
|
||||||
|
}
|
||||||
|
return $output;
|
||||||
|
}
|
||||||
|
}
|
@ -1,13 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Incoviba\Common\Implement\Log;
|
namespace Incoviba\Common\Implement\Log\Handler;
|
||||||
|
|
||||||
use PDOStatement;
|
|
||||||
use Monolog\Handler\AbstractProcessingHandler;
|
|
||||||
use Monolog\LogRecord;
|
|
||||||
use Monolog\Level;
|
|
||||||
use Incoviba\Common\Define\Connection;
|
use Incoviba\Common\Define\Connection;
|
||||||
|
use Monolog\Handler\AbstractProcessingHandler;
|
||||||
|
use Monolog\Level;
|
||||||
|
use Monolog\LogRecord;
|
||||||
|
use PDOStatement;
|
||||||
|
|
||||||
class MySQLHandler extends AbstractProcessingHandler
|
class MySQL extends AbstractProcessingHandler
|
||||||
{
|
{
|
||||||
private bool $initialized = false;
|
private bool $initialized = false;
|
||||||
private PDOStatement $statement;
|
private PDOStatement $statement;
|
||||||
@ -19,9 +19,12 @@ class MySQLHandler extends AbstractProcessingHandler
|
|||||||
public function write(LogRecord $record): void
|
public function write(LogRecord $record): void
|
||||||
{
|
{
|
||||||
if (!$this->initialized) {
|
if (!$this->initialized) {
|
||||||
|
if (!$this->checkTableExists()) {
|
||||||
|
$this->createTable();
|
||||||
|
}
|
||||||
|
$this->cleanup();
|
||||||
$this->initialized();
|
$this->initialized();
|
||||||
}
|
}
|
||||||
$this->cleanup();
|
|
||||||
$this->statement->execute([
|
$this->statement->execute([
|
||||||
'channel' => $record->channel,
|
'channel' => $record->channel,
|
||||||
'level' => $record->level->getName(),
|
'level' => $record->level->getName(),
|
||||||
@ -35,6 +38,21 @@ class MySQLHandler extends AbstractProcessingHandler
|
|||||||
private function initialized(): void
|
private function initialized(): void
|
||||||
{
|
{
|
||||||
$query = <<<QUERY
|
$query = <<<QUERY
|
||||||
|
INSERT INTO monolog (channel, level, message, time, context, extra)
|
||||||
|
VALUES (:channel, :level, :message, :time, :context, :extra)
|
||||||
|
QUERY;
|
||||||
|
$this->statement = $this->connection->getPDO()->prepare($query);
|
||||||
|
$this->initialized = true;
|
||||||
|
}
|
||||||
|
private function checkTableExists(): bool
|
||||||
|
{
|
||||||
|
$query = "SHOW TABLES LIKE 'monolog'";
|
||||||
|
$result = $this->connection->query($query);
|
||||||
|
return $result->rowCount() > 0;
|
||||||
|
}
|
||||||
|
private function createTable(): void
|
||||||
|
{
|
||||||
|
$query = <<<QUERY
|
||||||
CREATE TABLE IF NOT EXISTS monolog (
|
CREATE TABLE IF NOT EXISTS monolog (
|
||||||
channel VARCHAR(255),
|
channel VARCHAR(255),
|
||||||
level VARCHAR(100),
|
level VARCHAR(100),
|
||||||
@ -45,12 +63,6 @@ CREATE TABLE IF NOT EXISTS monolog (
|
|||||||
)
|
)
|
||||||
QUERY;
|
QUERY;
|
||||||
$this->connection->getPDO()->exec($query);
|
$this->connection->getPDO()->exec($query);
|
||||||
$query = <<<QUERY
|
|
||||||
INSERT INTO monolog (channel, level, message, time, context, extra)
|
|
||||||
VALUES (:channel, :level, :message, :time, :context, :extra)
|
|
||||||
QUERY;
|
|
||||||
$this->statement = $this->connection->getPDO()->prepare($query);
|
|
||||||
$this->initialized = true;
|
|
||||||
}
|
}
|
||||||
private function cleanup(): void
|
private function cleanup(): void
|
||||||
{
|
{
|
@ -1,19 +0,0 @@
|
|||||||
<?php
|
|
||||||
namespace Incoviba\Common\Implement\Log;
|
|
||||||
|
|
||||||
use Monolog\Formatter\JsonFormatter;
|
|
||||||
use Monolog\LogRecord;
|
|
||||||
|
|
||||||
class PDOFormatter extends JsonFormatter
|
|
||||||
{
|
|
||||||
public function __construct(int $batchMode = self::BATCH_MODE_JSON, bool $appendNewline = false, bool $ignoreEmptyContextAndExtra = false, bool $includeStacktraces = true)
|
|
||||||
{
|
|
||||||
parent::__construct($batchMode, $appendNewline, $ignoreEmptyContextAndExtra, $includeStacktraces);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function format(LogRecord $record): string
|
|
||||||
{
|
|
||||||
$normalized = $this->normalize($record, $this->maxNormalizeDepth);
|
|
||||||
return $normalized['message'];
|
|
||||||
}
|
|
||||||
}
|
|
139
app/common/Implement/Log/Processor/ArrayBuilder.php
Normal file
139
app/common/Implement/Log/Processor/ArrayBuilder.php
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
<?php
|
||||||
|
namespace Incoviba\Common\Implement\Log\Processor;
|
||||||
|
|
||||||
|
use DateInvalidTimeZoneException;
|
||||||
|
use DateMalformedStringException;
|
||||||
|
use DateTimeImmutable;
|
||||||
|
use DateTimeZone;
|
||||||
|
use Psr\Container\ContainerExceptionInterface;
|
||||||
|
use Psr\Container\ContainerInterface;
|
||||||
|
use Psr\Container\NotFoundExceptionInterface;
|
||||||
|
use Monolog\Formatter;
|
||||||
|
use Monolog\Handler;
|
||||||
|
use Monolog\Level;
|
||||||
|
use Predis;
|
||||||
|
use Incoviba;
|
||||||
|
use Throwable;
|
||||||
|
|
||||||
|
class ArrayBuilder
|
||||||
|
{
|
||||||
|
public function __construct(protected ContainerInterface $container) {}
|
||||||
|
|
||||||
|
public function build(array $data): array
|
||||||
|
{
|
||||||
|
$handlers = [];
|
||||||
|
foreach ($data as $handlerData) {
|
||||||
|
if (in_array($handlerData['handler'], [Handler\StreamHandler::class, Handler\RotatingFileHandler::class,])) {
|
||||||
|
$params = [
|
||||||
|
"/logs/{$handlerData['filename']}",
|
||||||
|
];
|
||||||
|
if ($handlerData['handler'] === Handler\RotatingFileHandler::class) {
|
||||||
|
$params []= 10;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
$formatter = Formatter\LineFormatter::class;
|
||||||
|
if (array_key_exists('formatter', $handlerData)) {
|
||||||
|
$formatter = $handlerData['formatter'];
|
||||||
|
}
|
||||||
|
$handler = new $handlerData['handler'](...$params)
|
||||||
|
->setFormatter($this->container->get($formatter));
|
||||||
|
} catch (NotFoundExceptionInterface | ContainerExceptionInterface $exception) {
|
||||||
|
$this->log($exception, ['handlerData' => $handlerData]);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
} elseif ($handlerData['handler'] === Incoviba\Common\Implement\Log\Handler\MySQL::class) {
|
||||||
|
try {
|
||||||
|
$params = [
|
||||||
|
$this->container->get(Incoviba\Common\Define\Connection::class)
|
||||||
|
];
|
||||||
|
$formatter = Incoviba\Common\Implement\Log\Formatter\PDO::class;
|
||||||
|
if (array_key_exists('formatter', $handlerData)) {
|
||||||
|
$formatter = $handlerData['formatter'];
|
||||||
|
}
|
||||||
|
$handler = new $handlerData['handler'](...$params)
|
||||||
|
->setFormatter($this->container->get($formatter));
|
||||||
|
} catch (NotFoundExceptionInterface | ContainerExceptionInterface $exception) {
|
||||||
|
$this->log($exception, ['handlerData' => $handlerData]);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
} elseif ($handlerData['handler'] === Handler\RedisHandler::class) {
|
||||||
|
try {
|
||||||
|
$params = [
|
||||||
|
$this->container->get(Predis\ClientInterface::class),
|
||||||
|
"logs:{$handlerData['name']}"
|
||||||
|
];
|
||||||
|
} catch (NotFoundExceptionInterface | ContainerExceptionInterface $exception) {
|
||||||
|
$this->log($exception, ['handlerData' => $handlerData]);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$handler = new $handlerData['handler'](...$params);
|
||||||
|
}
|
||||||
|
if (!isset($handler)) {
|
||||||
|
$this->log("Invalid handler", ['handlerData' => $handlerData]);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
$params = [
|
||||||
|
$handler,
|
||||||
|
];
|
||||||
|
if (is_array($handlerData['levels'])) {
|
||||||
|
foreach ($handlerData['levels'] as $level) {
|
||||||
|
$params []= $level;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
$params []= $handlerData['levels'];
|
||||||
|
$params []= Level::Emergency;
|
||||||
|
}
|
||||||
|
$params []= false;
|
||||||
|
$handlers []= new Handler\FilterHandler(...$params);
|
||||||
|
}
|
||||||
|
return $handlers;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected function log(string|Throwable $message, array $context = []): void
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$dateTime = new DateTimeImmutable('now', new DateTimeZone($_ENV['TZ'] ?? 'America/Santiago'));
|
||||||
|
} catch (DateMalformedStringException | DateInvalidTimeZoneException $exception) {
|
||||||
|
$dateTime = new DateTimeImmutable();
|
||||||
|
}
|
||||||
|
if (is_a($message, Throwable::class)) {
|
||||||
|
$exception = $message;
|
||||||
|
$message = $exception->getMessage();
|
||||||
|
}
|
||||||
|
$context = json_encode($context, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
|
||||||
|
if ($context === false) {
|
||||||
|
$context = '[]';
|
||||||
|
}
|
||||||
|
$extra = [];
|
||||||
|
$extra['from'] = __FILE__;
|
||||||
|
if (isset($exception)) {
|
||||||
|
$extra['file'] = $exception->getFile();
|
||||||
|
$extra['line'] = $exception->getLine();
|
||||||
|
$extra['trace'] = $exception->getTrace();
|
||||||
|
}
|
||||||
|
$extra = json_encode($extra, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
|
||||||
|
$code = 0;
|
||||||
|
if (isset($exception)) {
|
||||||
|
$code = $exception->getCode();
|
||||||
|
}
|
||||||
|
if ($extra === false) {
|
||||||
|
$extra = '[]';
|
||||||
|
}
|
||||||
|
$output = "[{$dateTime->format('Y-m-d H:i:s P')}] [{$code}] {$message} {$context} {$extra}";
|
||||||
|
$filename = '/logs/error.json';
|
||||||
|
$fileContents = [];
|
||||||
|
if (file_exists($filename)) {
|
||||||
|
$fileContents = file_get_contents($filename);
|
||||||
|
$fileContents = json_decode($fileContents, true);
|
||||||
|
if ($fileContents === false) {
|
||||||
|
$fileContents = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$fileContents[$dateTime->getTimestamp()] = $output;
|
||||||
|
$fileContents = json_encode($fileContents, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
|
||||||
|
if ($fileContents === false) {
|
||||||
|
$fileContents = '[]';
|
||||||
|
}
|
||||||
|
file_put_contents($filename, $fileContents);
|
||||||
|
}
|
||||||
|
}
|
@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Incoviba\Common\Implement\Log;
|
namespace Incoviba\Common\Implement\Log\Processor;
|
||||||
|
|
||||||
|
use Incoviba\Service;
|
||||||
use Monolog\LogRecord;
|
use Monolog\LogRecord;
|
||||||
use Monolog\Processor\ProcessorInterface;
|
use Monolog\Processor\ProcessorInterface;
|
||||||
use Incoviba\Service;
|
|
||||||
|
|
||||||
class UserProcessor implements ProcessorInterface
|
class User implements ProcessorInterface
|
||||||
{
|
{
|
||||||
public function __construct(protected Service\Login $loginService) {}
|
public function __construct(protected Service\Login $loginService) {}
|
||||||
public function __invoke(LogRecord $record): LogRecord
|
public function __invoke(LogRecord $record): LogRecord
|
@ -4,21 +4,25 @@
|
|||||||
"type": "project",
|
"type": "project",
|
||||||
"require": {
|
"require": {
|
||||||
"ext-curl": "*",
|
"ext-curl": "*",
|
||||||
|
"ext-dom": "*",
|
||||||
"ext-gd": "*",
|
"ext-gd": "*",
|
||||||
"ext-openssl": "*",
|
"ext-openssl": "*",
|
||||||
"ext-pdo": "*",
|
"ext-pdo": "*",
|
||||||
|
"ext-sockets": "*",
|
||||||
"berrnd/slim-blade-view": "^1",
|
"berrnd/slim-blade-view": "^1",
|
||||||
"guzzlehttp/guzzle": "^7",
|
"guzzlehttp/guzzle": "^7",
|
||||||
"monolog/monolog": "^3",
|
"monolog/monolog": "^3",
|
||||||
"nyholm/psr7": "^1",
|
"nyholm/psr7": "^1",
|
||||||
"nyholm/psr7-server": "^1",
|
"nyholm/psr7-server": "^1",
|
||||||
|
"pda/pheanstalk": "^7.0",
|
||||||
"php-di/php-di": "^7",
|
"php-di/php-di": "^7",
|
||||||
"php-di/slim-bridge": "^3",
|
"php-di/slim-bridge": "^3",
|
||||||
"phpoffice/phpspreadsheet": "^3",
|
"phpoffice/phpspreadsheet": "^3",
|
||||||
"predis/predis": "^2",
|
"predis/predis": "^2",
|
||||||
"robmorgan/phinx": "^0.16",
|
"robmorgan/phinx": "^0.16",
|
||||||
"slim/slim": "^4",
|
"slim/slim": "^4",
|
||||||
"symfony/string": "^7.2"
|
"symfony/string": "^7.2",
|
||||||
|
"tedivm/jshrink": "^1.7"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"fakerphp/faker": "^1",
|
"fakerphp/faker": "^1",
|
||||||
|
496
app/fcgi.conf
Normal file
496
app/fcgi.conf
Normal file
@ -0,0 +1,496 @@
|
|||||||
|
; Start a new pool named 'www'.
|
||||||
|
; the variable $pool can be used in any directive and will be replaced by the
|
||||||
|
; pool name ('www' here)
|
||||||
|
[fcgi]
|
||||||
|
|
||||||
|
; Per pool prefix
|
||||||
|
; It only applies on the following directives:
|
||||||
|
; - 'access.log'
|
||||||
|
; - 'slowlog'
|
||||||
|
; - 'listen' (unixsocket)
|
||||||
|
; - 'chroot'
|
||||||
|
; - 'chdir'
|
||||||
|
; - 'php_values'
|
||||||
|
; - 'php_admin_values'
|
||||||
|
; When not set, the global prefix (or NONE) applies instead.
|
||||||
|
; Note: This directive can also be relative to the global prefix.
|
||||||
|
; Default Value: none
|
||||||
|
;prefix = /path/to/pools/$pool
|
||||||
|
|
||||||
|
; Unix user/group of the child processes. This can be used only if the master
|
||||||
|
; process running user is root. It is set after the child process is created.
|
||||||
|
; The user and group can be specified either by their name or by their numeric
|
||||||
|
; IDs.
|
||||||
|
; Note: If the user is root, the executable needs to be started with
|
||||||
|
; --allow-to-run-as-root option to work.
|
||||||
|
; Default Values: The user is set to master process running user by default.
|
||||||
|
; If the group is not set, the user's group is used.
|
||||||
|
user = www-data
|
||||||
|
group = www-data
|
||||||
|
|
||||||
|
; The address on which to accept FastCGI requests.
|
||||||
|
; Valid syntaxes are:
|
||||||
|
; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
|
||||||
|
; a specific port;
|
||||||
|
; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
|
||||||
|
; a specific port;
|
||||||
|
; 'port' - to listen on a TCP socket to all addresses
|
||||||
|
; (IPv6 and IPv4-mapped) on a specific port;
|
||||||
|
; '/path/to/unix/socket' - to listen on a unix socket.
|
||||||
|
; Note: This value is mandatory.
|
||||||
|
;listen = 127.0.0.1:9000
|
||||||
|
listen = 9090
|
||||||
|
|
||||||
|
; Set listen(2) backlog.
|
||||||
|
; Default Value: 511 (-1 on Linux, FreeBSD and OpenBSD)
|
||||||
|
;listen.backlog = 511
|
||||||
|
|
||||||
|
; Set permissions for unix socket, if one is used. In Linux, read/write
|
||||||
|
; permissions must be set in order to allow connections from a web server. Many
|
||||||
|
; BSD-derived systems allow connections regardless of permissions. The owner
|
||||||
|
; and group can be specified either by name or by their numeric IDs.
|
||||||
|
; Default Values: Owner is set to the master process running user. If the group
|
||||||
|
; is not set, the owner's group is used. Mode is set to 0660.
|
||||||
|
;listen.owner = www-data
|
||||||
|
;listen.group = www-data
|
||||||
|
;listen.mode = 0660
|
||||||
|
|
||||||
|
; When POSIX Access Control Lists are supported you can set them using
|
||||||
|
; these options, value is a comma separated list of user/group names.
|
||||||
|
; When set, listen.owner and listen.group are ignored
|
||||||
|
;listen.acl_users =
|
||||||
|
;listen.acl_groups =
|
||||||
|
|
||||||
|
; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
|
||||||
|
; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
|
||||||
|
; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
|
||||||
|
; must be separated by a comma. If this value is left blank, connections will be
|
||||||
|
; accepted from any ip address.
|
||||||
|
; Default Value: any
|
||||||
|
;listen.allowed_clients = 127.0.0.1
|
||||||
|
|
||||||
|
; Set the associated the route table (FIB). FreeBSD only
|
||||||
|
; Default Value: -1
|
||||||
|
;listen.setfib = 1
|
||||||
|
|
||||||
|
; Specify the nice(2) priority to apply to the pool processes (only if set)
|
||||||
|
; The value can vary from -19 (highest priority) to 20 (lower priority)
|
||||||
|
; Note: - It will only work if the FPM master process is launched as root
|
||||||
|
; - The pool processes will inherit the master process priority
|
||||||
|
; unless it specified otherwise
|
||||||
|
; Default Value: no set
|
||||||
|
; process.priority = -19
|
||||||
|
|
||||||
|
; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or
|
||||||
|
; PROC_TRACE_CTL procctl for FreeBSD) even if the process user
|
||||||
|
; or group is different than the master process user. It allows to create process
|
||||||
|
; core dump and ptrace the process for the pool user.
|
||||||
|
; Default Value: no
|
||||||
|
; process.dumpable = yes
|
||||||
|
|
||||||
|
; Choose how the process manager will control the number of child processes.
|
||||||
|
; Possible Values:
|
||||||
|
; static - a fixed number (pm.max_children) of child processes;
|
||||||
|
; dynamic - the number of child processes are set dynamically based on the
|
||||||
|
; following directives. With this process management, there will be
|
||||||
|
; always at least 1 children.
|
||||||
|
; pm.max_children - the maximum number of children that can
|
||||||
|
; be alive at the same time.
|
||||||
|
; pm.start_servers - the number of children created on startup.
|
||||||
|
; pm.min_spare_servers - the minimum number of children in 'idle'
|
||||||
|
; state (waiting to process). If the number
|
||||||
|
; of 'idle' processes is less than this
|
||||||
|
; number then some children will be created.
|
||||||
|
; pm.max_spare_servers - the maximum number of children in 'idle'
|
||||||
|
; state (waiting to process). If the number
|
||||||
|
; of 'idle' processes is greater than this
|
||||||
|
; number then some children will be killed.
|
||||||
|
; pm.max_spawn_rate - the maximum number of rate to spawn child
|
||||||
|
; processes at once.
|
||||||
|
; ondemand - no children are created at startup. Children will be forked when
|
||||||
|
; new requests will connect. The following parameter are used:
|
||||||
|
; pm.max_children - the maximum number of children that
|
||||||
|
; can be alive at the same time.
|
||||||
|
; pm.process_idle_timeout - The number of seconds after which
|
||||||
|
; an idle process will be killed.
|
||||||
|
; Note: This value is mandatory.
|
||||||
|
pm = ondemand
|
||||||
|
|
||||||
|
; The number of child processes to be created when pm is set to 'static' and the
|
||||||
|
; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
|
||||||
|
; This value sets the limit on the number of simultaneous requests that will be
|
||||||
|
; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
|
||||||
|
; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
|
||||||
|
; CGI. The below defaults are based on a server without much resources. Don't
|
||||||
|
; forget to tweak pm.* to fit your needs.
|
||||||
|
; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
|
||||||
|
; Note: This value is mandatory.
|
||||||
|
pm.max_children = 2
|
||||||
|
|
||||||
|
; The number of child processes created on startup.
|
||||||
|
; Note: Used only when pm is set to 'dynamic'
|
||||||
|
; Default Value: (min_spare_servers + max_spare_servers) / 2
|
||||||
|
;pm.start_servers = 2
|
||||||
|
|
||||||
|
; The desired minimum number of idle server processes.
|
||||||
|
; Note: Used only when pm is set to 'dynamic'
|
||||||
|
; Note: Mandatory when pm is set to 'dynamic'
|
||||||
|
;pm.min_spare_servers = 1
|
||||||
|
|
||||||
|
; The desired maximum number of idle server processes.
|
||||||
|
; Note: Used only when pm is set to 'dynamic'
|
||||||
|
; Note: Mandatory when pm is set to 'dynamic'
|
||||||
|
;pm.max_spare_servers = 3
|
||||||
|
|
||||||
|
; The number of rate to spawn child processes at once.
|
||||||
|
; Note: Used only when pm is set to 'dynamic'
|
||||||
|
; Note: Mandatory when pm is set to 'dynamic'
|
||||||
|
; Default Value: 32
|
||||||
|
;pm.max_spawn_rate = 32
|
||||||
|
|
||||||
|
; The number of seconds after which an idle process will be killed.
|
||||||
|
; Note: Used only when pm is set to 'ondemand'
|
||||||
|
; Default Value: 10s
|
||||||
|
;pm.process_idle_timeout = 10s;
|
||||||
|
pm.process_idle_timeout = 10s
|
||||||
|
|
||||||
|
; The number of requests each child process should execute before respawning.
|
||||||
|
; This can be useful to work around memory leaks in 3rd party libraries. For
|
||||||
|
; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
|
||||||
|
; Default Value: 0
|
||||||
|
;pm.max_requests = 500
|
||||||
|
|
||||||
|
; The URI to view the FPM status page. If this value is not set, no URI will be
|
||||||
|
; recognized as a status page. It shows the following information:
|
||||||
|
; pool - the name of the pool;
|
||||||
|
; process manager - static, dynamic or ondemand;
|
||||||
|
; start time - the date and time FPM has started;
|
||||||
|
; start since - number of seconds since FPM has started;
|
||||||
|
; accepted conn - the number of request accepted by the pool;
|
||||||
|
; listen queue - the number of request in the queue of pending
|
||||||
|
; connections (see backlog in listen(2));
|
||||||
|
; max listen queue - the maximum number of requests in the queue
|
||||||
|
; of pending connections since FPM has started;
|
||||||
|
; listen queue len - the size of the socket queue of pending connections;
|
||||||
|
; idle processes - the number of idle processes;
|
||||||
|
; active processes - the number of active processes;
|
||||||
|
; total processes - the number of idle + active processes;
|
||||||
|
; max active processes - the maximum number of active processes since FPM
|
||||||
|
; has started;
|
||||||
|
; max children reached - number of times, the process limit has been reached,
|
||||||
|
; when pm tries to start more children (works only for
|
||||||
|
; pm 'dynamic' and 'ondemand');
|
||||||
|
; Value are updated in real time.
|
||||||
|
; Example output:
|
||||||
|
; pool: www
|
||||||
|
; process manager: static
|
||||||
|
; start time: 01/Jul/2011:17:53:49 +0200
|
||||||
|
; start since: 62636
|
||||||
|
; accepted conn: 190460
|
||||||
|
; listen queue: 0
|
||||||
|
; max listen queue: 1
|
||||||
|
; listen queue len: 42
|
||||||
|
; idle processes: 4
|
||||||
|
; active processes: 11
|
||||||
|
; total processes: 15
|
||||||
|
; max active processes: 12
|
||||||
|
; max children reached: 0
|
||||||
|
;
|
||||||
|
; By default the status page output is formatted as text/plain. Passing either
|
||||||
|
; 'html', 'xml' or 'json' in the query string will return the corresponding
|
||||||
|
; output syntax. Example:
|
||||||
|
; http://www.foo.bar/status
|
||||||
|
; http://www.foo.bar/status?json
|
||||||
|
; http://www.foo.bar/status?html
|
||||||
|
; http://www.foo.bar/status?xml
|
||||||
|
;
|
||||||
|
; By default the status page only outputs short status. Passing 'full' in the
|
||||||
|
; query string will also return status for each pool process.
|
||||||
|
; Example:
|
||||||
|
; http://www.foo.bar/status?full
|
||||||
|
; http://www.foo.bar/status?json&full
|
||||||
|
; http://www.foo.bar/status?html&full
|
||||||
|
; http://www.foo.bar/status?xml&full
|
||||||
|
; The Full status returns for each process:
|
||||||
|
; pid - the PID of the process;
|
||||||
|
; state - the state of the process (Idle, Running, ...);
|
||||||
|
; start time - the date and time the process has started;
|
||||||
|
; start since - the number of seconds since the process has started;
|
||||||
|
; requests - the number of requests the process has served;
|
||||||
|
; request duration - the duration in µs of the requests;
|
||||||
|
; request method - the request method (GET, POST, ...);
|
||||||
|
; request URI - the request URI with the query string;
|
||||||
|
; content length - the content length of the request (only with POST);
|
||||||
|
; user - the user (PHP_AUTH_USER) (or '-' if not set);
|
||||||
|
; script - the main script called (or '-' if not set);
|
||||||
|
; last request cpu - the %cpu the last request consumed
|
||||||
|
; it's always 0 if the process is not in Idle state
|
||||||
|
; because CPU calculation is done when the request
|
||||||
|
; processing has terminated;
|
||||||
|
; last request memory - the max amount of memory the last request consumed
|
||||||
|
; it's always 0 if the process is not in Idle state
|
||||||
|
; because memory calculation is done when the request
|
||||||
|
; processing has terminated;
|
||||||
|
; If the process is in Idle state, then information is related to the
|
||||||
|
; last request the process has served. Otherwise information is related to
|
||||||
|
; the current request being served.
|
||||||
|
; Example output:
|
||||||
|
; ************************
|
||||||
|
; pid: 31330
|
||||||
|
; state: Running
|
||||||
|
; start time: 01/Jul/2011:17:53:49 +0200
|
||||||
|
; start since: 63087
|
||||||
|
; requests: 12808
|
||||||
|
; request duration: 1250261
|
||||||
|
; request method: GET
|
||||||
|
; request URI: /test_mem.php?N=10000
|
||||||
|
; content length: 0
|
||||||
|
; user: -
|
||||||
|
; script: /home/fat/web/docs/php/test_mem.php
|
||||||
|
; last request cpu: 0.00
|
||||||
|
; last request memory: 0
|
||||||
|
;
|
||||||
|
; Note: There is a real-time FPM status monitoring sample web page available
|
||||||
|
; It's available in: /usr/local/share/php/fpm/status.html
|
||||||
|
;
|
||||||
|
; Note: The value must start with a leading slash (/). The value can be
|
||||||
|
; anything, but it may not be a good idea to use the .php extension or it
|
||||||
|
; may conflict with a real PHP file.
|
||||||
|
; Default Value: not set
|
||||||
|
;pm.status_path = /status
|
||||||
|
|
||||||
|
; The address on which to accept FastCGI status request. This creates a new
|
||||||
|
; invisible pool that can handle requests independently. This is useful
|
||||||
|
; if the main pool is busy with long running requests because it is still possible
|
||||||
|
; to get the status before finishing the long running requests.
|
||||||
|
;
|
||||||
|
; Valid syntaxes are:
|
||||||
|
; 'ip.add.re.ss:port' - to listen on a TCP socket to a specific IPv4 address on
|
||||||
|
; a specific port;
|
||||||
|
; '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
|
||||||
|
; a specific port;
|
||||||
|
; 'port' - to listen on a TCP socket to all addresses
|
||||||
|
; (IPv6 and IPv4-mapped) on a specific port;
|
||||||
|
; '/path/to/unix/socket' - to listen on a unix socket.
|
||||||
|
; Default Value: value of the listen option
|
||||||
|
;pm.status_listen = 127.0.0.1:9001
|
||||||
|
|
||||||
|
; The ping URI to call the monitoring page of FPM. If this value is not set, no
|
||||||
|
; URI will be recognized as a ping page. This could be used to test from outside
|
||||||
|
; that FPM is alive and responding, or to
|
||||||
|
; - create a graph of FPM availability (rrd or such);
|
||||||
|
; - remove a server from a group if it is not responding (load balancing);
|
||||||
|
; - trigger alerts for the operating team (24/7).
|
||||||
|
; Note: The value must start with a leading slash (/). The value can be
|
||||||
|
; anything, but it may not be a good idea to use the .php extension or it
|
||||||
|
; may conflict with a real PHP file.
|
||||||
|
; Default Value: not set
|
||||||
|
;ping.path = /ping
|
||||||
|
|
||||||
|
; This directive may be used to customize the response of a ping request. The
|
||||||
|
; response is formatted as text/plain with a 200 response code.
|
||||||
|
; Default Value: pong
|
||||||
|
;ping.response = pong
|
||||||
|
|
||||||
|
; The access log file
|
||||||
|
; Default: not set
|
||||||
|
;access.log = log/$pool.access.log
|
||||||
|
access.log = /proc/self/fd/2
|
||||||
|
|
||||||
|
; The access log format.
|
||||||
|
; The following syntax is allowed
|
||||||
|
; %%: the '%' character
|
||||||
|
; %C: %CPU used by the request
|
||||||
|
; it can accept the following format:
|
||||||
|
; - %{user}C for user CPU only
|
||||||
|
; - %{system}C for system CPU only
|
||||||
|
; - %{total}C for user + system CPU (default)
|
||||||
|
; %d: time taken to serve the request
|
||||||
|
; it can accept the following format:
|
||||||
|
; - %{seconds}d (default)
|
||||||
|
; - %{milliseconds}d
|
||||||
|
; - %{milli}d
|
||||||
|
; - %{microseconds}d
|
||||||
|
; - %{micro}d
|
||||||
|
; %e: an environment variable (same as $_ENV or $_SERVER)
|
||||||
|
; it must be associated with embraces to specify the name of the env
|
||||||
|
; variable. Some examples:
|
||||||
|
; - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
|
||||||
|
; - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
|
||||||
|
; %f: script filename
|
||||||
|
; %l: content-length of the request (for POST request only)
|
||||||
|
; %m: request method
|
||||||
|
; %M: peak of memory allocated by PHP
|
||||||
|
; it can accept the following format:
|
||||||
|
; - %{bytes}M (default)
|
||||||
|
; - %{kilobytes}M
|
||||||
|
; - %{kilo}M
|
||||||
|
; - %{megabytes}M
|
||||||
|
; - %{mega}M
|
||||||
|
; %n: pool name
|
||||||
|
; %o: output header
|
||||||
|
; it must be associated with embraces to specify the name of the header:
|
||||||
|
; - %{Content-Type}o
|
||||||
|
; - %{X-Powered-By}o
|
||||||
|
; - %{Transfert-Encoding}o
|
||||||
|
; - ....
|
||||||
|
; %p: PID of the child that serviced the request
|
||||||
|
; %P: PID of the parent of the child that serviced the request
|
||||||
|
; %q: the query string
|
||||||
|
; %Q: the '?' character if query string exists
|
||||||
|
; %r: the request URI (without the query string, see %q and %Q)
|
||||||
|
; %R: remote IP address
|
||||||
|
; %s: status (response code)
|
||||||
|
; %t: server time the request was received
|
||||||
|
; it can accept a strftime(3) format:
|
||||||
|
; %d/%b/%Y:%H:%M:%S %z (default)
|
||||||
|
; The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
|
||||||
|
; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
|
||||||
|
; %T: time the log has been written (the request has finished)
|
||||||
|
; it can accept a strftime(3) format:
|
||||||
|
; %d/%b/%Y:%H:%M:%S %z (default)
|
||||||
|
; The strftime(3) format must be encapsulated in a %{<strftime_format>}t tag
|
||||||
|
; e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
|
||||||
|
; %u: basic auth user if specified in Authorization header
|
||||||
|
;
|
||||||
|
; Default: "%R - %u %t \"%m %r\" %s"
|
||||||
|
;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{milli}d %{kilo}M %C%%"
|
||||||
|
|
||||||
|
; A list of request_uri values which should be filtered from the access log.
|
||||||
|
;
|
||||||
|
; As a security precaution, this setting will be ignored if:
|
||||||
|
; - the request method is not GET or HEAD; or
|
||||||
|
; - there is a request body; or
|
||||||
|
; - there are query parameters; or
|
||||||
|
; - the response code is outwith the successful range of 200 to 299
|
||||||
|
;
|
||||||
|
; Note: The paths are matched against the output of the access.format tag "%r".
|
||||||
|
; On common configurations, this may look more like SCRIPT_NAME than the
|
||||||
|
; expected pre-rewrite URI.
|
||||||
|
;
|
||||||
|
; Default Value: not set
|
||||||
|
;access.suppress_path[] = /ping
|
||||||
|
;access.suppress_path[] = /health_check.php
|
||||||
|
|
||||||
|
; The log file for slow requests
|
||||||
|
; Default Value: not set
|
||||||
|
; Note: slowlog is mandatory if request_slowlog_timeout is set
|
||||||
|
;slowlog = log/$pool.log.slow
|
||||||
|
|
||||||
|
; The timeout for serving a single request after which a PHP backtrace will be
|
||||||
|
; dumped to the 'slowlog' file. A value of '0s' means 'off'.
|
||||||
|
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
|
||||||
|
; Default Value: 0
|
||||||
|
;request_slowlog_timeout = 0
|
||||||
|
|
||||||
|
; Depth of slow log stack trace.
|
||||||
|
; Default Value: 20
|
||||||
|
;request_slowlog_trace_depth = 20
|
||||||
|
|
||||||
|
; The timeout for serving a single request after which the worker process will
|
||||||
|
; be killed. This option should be used when the 'max_execution_time' ini option
|
||||||
|
; does not stop script execution for some reason. A value of '0' means 'off'.
|
||||||
|
; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
|
||||||
|
; Default Value: 0
|
||||||
|
;request_terminate_timeout = 0
|
||||||
|
|
||||||
|
; The timeout set by 'request_terminate_timeout' ini option is not engaged after
|
||||||
|
; application calls 'fastcgi_finish_request' or when application has finished and
|
||||||
|
; shutdown functions are being called (registered via register_shutdown_function).
|
||||||
|
; This option will enable timeout limit to be applied unconditionally
|
||||||
|
; even in such cases.
|
||||||
|
; Default Value: no
|
||||||
|
;request_terminate_timeout_track_finished = no
|
||||||
|
|
||||||
|
; Set open file descriptor rlimit.
|
||||||
|
; Default Value: system defined value
|
||||||
|
;rlimit_files = 1024
|
||||||
|
|
||||||
|
; Set max core size rlimit.
|
||||||
|
; Possible Values: 'unlimited' or an integer greater or equal to 0
|
||||||
|
; Default Value: system defined value
|
||||||
|
;rlimit_core = 0
|
||||||
|
|
||||||
|
; Chroot to this directory at the start. This value must be defined as an
|
||||||
|
; absolute path. When this value is not set, chroot is not used.
|
||||||
|
; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
|
||||||
|
; of its subdirectories. If the pool prefix is not set, the global prefix
|
||||||
|
; will be used instead.
|
||||||
|
; Note: chrooting is a great security feature and should be used whenever
|
||||||
|
; possible. However, all PHP paths will be relative to the chroot
|
||||||
|
; (error_log, sessions.save_path, ...).
|
||||||
|
; Default Value: not set
|
||||||
|
;chroot =
|
||||||
|
|
||||||
|
; Chdir to this directory at the start.
|
||||||
|
; Note: relative path can be used.
|
||||||
|
; Default Value: current directory or / when chroot
|
||||||
|
;chdir = /var/www
|
||||||
|
|
||||||
|
; Redirect worker stdout and stderr into main error log. If not set, stdout and
|
||||||
|
; stderr will be redirected to /dev/null according to FastCGI specs.
|
||||||
|
; Note: on highloaded environment, this can cause some delay in the page
|
||||||
|
; process time (several ms).
|
||||||
|
; Default Value: no
|
||||||
|
;catch_workers_output = yes
|
||||||
|
catch_workers_output = yes
|
||||||
|
|
||||||
|
; Decorate worker output with prefix and suffix containing information about
|
||||||
|
; the child that writes to the log and if stdout or stderr is used as well as
|
||||||
|
; log level and time. This options is used only if catch_workers_output is yes.
|
||||||
|
; Settings to "no" will output data as written to the stdout or stderr.
|
||||||
|
; Default value: yes
|
||||||
|
;decorate_workers_output = no
|
||||||
|
decorate_workers_output = no
|
||||||
|
|
||||||
|
; Clear environment in FPM workers
|
||||||
|
; Prevents arbitrary environment variables from reaching FPM worker processes
|
||||||
|
; by clearing the environment in workers before env vars specified in this
|
||||||
|
; pool configuration are added.
|
||||||
|
; Setting to "no" will make all environment variables available to PHP code
|
||||||
|
; via getenv(), $_ENV and $_SERVER.
|
||||||
|
; Default Value: yes
|
||||||
|
;clear_env = no
|
||||||
|
clear_env = no
|
||||||
|
|
||||||
|
; Limits the extensions of the main script FPM will allow to parse. This can
|
||||||
|
; prevent configuration mistakes on the web server side. You should only limit
|
||||||
|
; FPM to .php extensions to prevent malicious users to use other extensions to
|
||||||
|
; execute php code.
|
||||||
|
; Note: set an empty value to allow all extensions.
|
||||||
|
; Default Value: .php
|
||||||
|
;security.limit_extensions = .php .php3 .php4 .php5 .php7
|
||||||
|
|
||||||
|
; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
|
||||||
|
; the current environment.
|
||||||
|
; Default Value: clean env
|
||||||
|
;env[HOSTNAME] = $HOSTNAME
|
||||||
|
;env[PATH] = /usr/local/bin:/usr/bin:/bin
|
||||||
|
;env[TMP] = /tmp
|
||||||
|
;env[TMPDIR] = /tmp
|
||||||
|
;env[TEMP] = /tmp
|
||||||
|
|
||||||
|
; Additional php.ini defines, specific to this pool of workers. These settings
|
||||||
|
; overwrite the values previously defined in the php.ini. The directives are the
|
||||||
|
; same as the PHP SAPI:
|
||||||
|
; php_value/php_flag - you can set classic ini defines which can
|
||||||
|
; be overwritten from PHP call 'ini_set'.
|
||||||
|
; php_admin_value/php_admin_flag - these directives won't be overwritten by
|
||||||
|
; PHP call 'ini_set'
|
||||||
|
; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
|
||||||
|
|
||||||
|
; Defining 'extension' will load the corresponding shared extension from
|
||||||
|
; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
|
||||||
|
; overwrite previously defined php.ini values, but will append the new value
|
||||||
|
; instead.
|
||||||
|
|
||||||
|
; Note: path INI options can be relative and will be expanded with the prefix
|
||||||
|
; (pool, global or /usr/local)
|
||||||
|
|
||||||
|
; Default Value: nothing is defined by default except the values in php.ini and
|
||||||
|
; specified at startup with the -d argument
|
||||||
|
;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
|
||||||
|
;php_flag[display_errors] = off
|
||||||
|
;php_admin_value[error_log] = /var/log/fpm-php.www.log
|
||||||
|
;php_admin_flag[log_errors] = on
|
||||||
|
;php_admin_value[memory_limit] = 32M
|
@ -28,16 +28,15 @@
|
|||||||
<directory>common</directory>
|
<directory>common</directory>
|
||||||
</include>
|
</include>
|
||||||
</source>
|
</source>
|
||||||
<coverage pathCoverage="false" ignoreDeprecatedCodeUnits="true" disableCodeCoverageIgnore="true">
|
<!--<coverage pathCoverage="false" ignoreDeprecatedCodeUnits="true" disableCodeCoverageIgnore="true">
|
||||||
<report>
|
<report>
|
||||||
<!--<html outputDirectory="/code/public/coverage/html"/>-->
|
<html outputDirectory="/code/public/coverage/html"/>
|
||||||
<php outputFile="/code/public/coverage/coverage.php"/>
|
|
||||||
</report>
|
</report>
|
||||||
</coverage>
|
</coverage>-->
|
||||||
<logging>
|
<logging>
|
||||||
<junit outputFile="/code/cache/tests/junit.xml"/>
|
<junit outputFile="/code/cache/tests/junit.xml"/>
|
||||||
<teamcity outputFile="/code/cache/tests/teamcity.txt"/>
|
<teamcity outputFile="/code/cache/tests/teamcity.txt"/>
|
||||||
<testdoxHtml outputFile="/code/cache/tests/testdox.html"/>
|
<!--<testdoxHtml outputFile="/code/public/tests/testdox.html"/>-->
|
||||||
<testdoxText outputFile="/code/cache/tests/testdox.txt"/>
|
<testdoxText outputFile="/code/cache/tests/testdox.txt"/>
|
||||||
</logging>
|
</logging>
|
||||||
</phpunit>
|
</phpunit>
|
||||||
|
@ -13,3 +13,12 @@ try {
|
|||||||
$app->getContainer()->get(Psr\Log\LoggerInterface::class)->notice($exception);
|
$app->getContainer()->get(Psr\Log\LoggerInterface::class)->notice($exception);
|
||||||
header('Location: /construccion');
|
header('Location: /construccion');
|
||||||
}
|
}
|
||||||
|
register_shutdown_function(function() {
|
||||||
|
$error = error_get_last();
|
||||||
|
|
||||||
|
$fatal_errors = [E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR];
|
||||||
|
if ($error !== null and in_array($error['type'], $fatal_errors, true)) {
|
||||||
|
error_log(json_encode($error).PHP_EOL,3, '/logs/fatal.log');
|
||||||
|
}
|
||||||
|
error_clear_last();
|
||||||
|
});
|
||||||
|
@ -18,7 +18,7 @@ class CreateAgente extends Phinx\Migration\AbstractMigration
|
|||||||
->addColumn('telefono', 'integer', ['length' => 11, 'default' => null, 'null' => true])
|
->addColumn('telefono', 'integer', ['length' => 11, 'default' => null, 'null' => true])
|
||||||
->addColumn('correo', 'string', ['length' => 50, 'default' => null, 'null' => true])
|
->addColumn('correo', 'string', ['length' => 50, 'default' => null, 'null' => true])
|
||||||
->addColumn('direccion', 'integer', ['length' => 11, 'default' => null, 'null' => true])
|
->addColumn('direccion', 'integer', ['length' => 11, 'default' => null, 'null' => true])
|
||||||
->addColumn('giro', 'mediumtext', ['default' => null, 'null' => true])
|
->addColumn('giro', 'text', ['default' => null, 'null' => true])
|
||||||
->addColumn('abreviacion', 'string', ['length' => 20, 'default' => null, 'null' => true])
|
->addColumn('abreviacion', 'string', ['length' => 20, 'default' => null, 'null' => true])
|
||||||
->create();
|
->create();
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
@ -13,9 +13,9 @@ class CreateCartolas extends Phinx\Migration\AbstractMigration
|
|||||||
$this->table('cartolas')
|
$this->table('cartolas')
|
||||||
->addColumn('cuenta_id', 'integer', ['length' => 10, 'null' => false, 'signed' => false])
|
->addColumn('cuenta_id', 'integer', ['length' => 10, 'null' => false, 'signed' => false])
|
||||||
->addColumn('fecha', 'date', ['null' => false])
|
->addColumn('fecha', 'date', ['null' => false])
|
||||||
->addColumn('cargos', 'bigint', ['length' => 20, 'default' => 0, 'null' => false, 'signed' => false])
|
->addColumn('cargos', 'biginteger', ['length' => 20, 'default' => 0, 'null' => false, 'signed' => false])
|
||||||
->addColumn('abonos', 'bigint', ['length' => 20, 'default' => 0, 'null' => false, 'signed' => false])
|
->addColumn('abonos', 'biginteger', ['length' => 20, 'default' => 0, 'null' => false, 'signed' => false])
|
||||||
->addColumn('saldo', 'bigint', ['length' => 20, 'default' => 0, 'null' => false])
|
->addColumn('saldo', 'biginteger', ['length' => 20, 'default' => 0, 'null' => false])
|
||||||
->addForeignKey('cuenta_id', 'cuenta', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
->addForeignKey('cuenta_id', 'cuenta', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
||||||
->create();
|
->create();
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
@ -15,7 +15,7 @@ class CreateCentrosCostos extends Phinx\Migration\AbstractMigration
|
|||||||
->addColumn('categoria_id', 'integer', ['length' => 10, 'null' => false, 'signed' => false])
|
->addColumn('categoria_id', 'integer', ['length' => 10, 'null' => false, 'signed' => false])
|
||||||
->addColumn('tipo_cuenta_id', 'integer', ['length' => 10, 'default' => null, 'null' => true, 'signed' => false])
|
->addColumn('tipo_cuenta_id', 'integer', ['length' => 10, 'default' => null, 'null' => true, 'signed' => false])
|
||||||
->addColumn('cuenta_contable', 'string', ['length' => 100, 'null' => false])
|
->addColumn('cuenta_contable', 'string', ['length' => 100, 'null' => false])
|
||||||
->addColumn('descripcion', 'mediumtext', ['null' => false])
|
->addColumn('descripcion', 'text', ['null' => false, 'limit' => MysqlAdapter::TEXT_MEDIUM])
|
||||||
->addForeignKey('tipo_centro_id', 'tipos_centros_costos', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
->addForeignKey('tipo_centro_id', 'tipos_centros_costos', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
||||||
->addForeignKey('categoria_id', 'categorias_centros_costos', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
->addForeignKey('categoria_id', 'categorias_centros_costos', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
||||||
->create();
|
->create();
|
||||||
|
@ -19,7 +19,7 @@ class CreateCobro extends Phinx\Migration\AbstractMigration
|
|||||||
->addColumn('iva', 'float', ['default' => 0])
|
->addColumn('iva', 'float', ['default' => 0])
|
||||||
->addColumn('uf', 'float', ['default' => null, 'null' => true])
|
->addColumn('uf', 'float', ['default' => null, 'null' => true])
|
||||||
->addColumn('identificador', 'string', ['length' => 50, 'default' => null, 'null' => true])
|
->addColumn('identificador', 'string', ['length' => 50, 'default' => null, 'null' => true])
|
||||||
->addColumn('glosa', 'mediumtext', ['default' => null, 'null' => true])
|
->addColumn('glosa', 'text', ['default' => null, 'null' => true, 'limit' => MysqlAdapter::TEXT_MEDIUM])
|
||||||
->create();
|
->create();
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,7 @@ class CreateEscritura extends Phinx\Migration\AbstractMigration
|
|||||||
$this->execute("ALTER DATABASE COLLATE='utf8mb4_general_ci';");
|
$this->execute("ALTER DATABASE COLLATE='utf8mb4_general_ci';");
|
||||||
|
|
||||||
$this->table('escritura')
|
$this->table('escritura')
|
||||||
->addColumn('valor', 'bigint', ['length' => 20, 'null' => false])
|
->addColumn('valor', 'biginteger', ['length' => 20, 'null' => false])
|
||||||
->addColumn('fecha', 'date', ['null' => false])
|
->addColumn('fecha', 'date', ['null' => false])
|
||||||
->addColumn('uf', 'float', ['default' => null, 'null' => true])
|
->addColumn('uf', 'float', ['default' => null, 'null' => true])
|
||||||
->addColumn('abonado', 'integer', ['length' => 11, 'default' => 0])
|
->addColumn('abonado', 'integer', ['length' => 11, 'default' => 0])
|
||||||
|
@ -13,7 +13,7 @@ class CreateEstadoProblema extends Phinx\Migration\AbstractMigration
|
|||||||
$this->table('estado_problema')
|
$this->table('estado_problema')
|
||||||
->addColumn('problema', 'integer', ['length' => 11, 'default' => null, 'null' => true])
|
->addColumn('problema', 'integer', ['length' => 11, 'default' => null, 'null' => true])
|
||||||
->addColumn('fecha', 'date', ['default' => null, 'null' => true])
|
->addColumn('fecha', 'date', ['default' => null, 'null' => true])
|
||||||
->addColumn('estado', 'enum', ['length' => 'ingreso','revision','correccion','ok', 'default' => null, 'null' => true])
|
->addColumn('estado', 'enum', ['values' => ['ingreso','revision','correccion','ok'], 'default' => null, 'null' => true])
|
||||||
->create();
|
->create();
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,7 @@ class CreateInmobiliariasNubox extends Phinx\Migration\AbstractMigration
|
|||||||
->addColumn('alias', 'string', ['length' => 100, 'null' => false])
|
->addColumn('alias', 'string', ['length' => 100, 'null' => false])
|
||||||
->addColumn('usuario', 'string', ['length' => 100, 'null' => false])
|
->addColumn('usuario', 'string', ['length' => 100, 'null' => false])
|
||||||
->addColumn('contraseña', 'string', ['length' => 100, 'null' => false])
|
->addColumn('contraseña', 'string', ['length' => 100, 'null' => false])
|
||||||
->addForeignKey('inmobiliaria_rut', 'inmobiliaria', 'rut', ['delete' => 'cascade', 'update' => 'cascade'])
|
#->addForeignKey('inmobiliaria_rut', 'inmobiliaria', 'rut', ['delete' => 'cascade', 'update' => 'cascade'])
|
||||||
->create();
|
->create();
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
}
|
}
|
||||||
|
@ -15,9 +15,9 @@ class CreateMovimientos extends Phinx\Migration\AbstractMigration
|
|||||||
->addColumn('fecha', 'date', ['null' => false])
|
->addColumn('fecha', 'date', ['null' => false])
|
||||||
->addColumn('glosa', 'text', ['null' => false])
|
->addColumn('glosa', 'text', ['null' => false])
|
||||||
->addColumn('documento', 'string', ['length' => 50, 'null' => false])
|
->addColumn('documento', 'string', ['length' => 50, 'null' => false])
|
||||||
->addColumn('cargo', 'bigint', ['length' => 20, 'default' => 0, 'null' => false, 'signed' => false])
|
->addColumn('cargo', 'biginteger', ['length' => 20, 'default' => 0, 'null' => false, 'signed' => false])
|
||||||
->addColumn('abono', 'bigint', ['length' => 20, 'default' => 0, 'null' => false, 'signed' => false])
|
->addColumn('abono', 'biginteger', ['length' => 20, 'default' => 0, 'null' => false, 'signed' => false])
|
||||||
->addColumn('saldo', 'bigint', ['length' => 20, 'default' => 0, 'null' => false])
|
->addColumn('saldo', 'biginteger', ['length' => 20, 'default' => 0, 'null' => false])
|
||||||
->addForeignKey('cuenta_id', 'cuenta', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
->addForeignKey('cuenta_id', 'cuenta', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
||||||
->create();
|
->create();
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
@ -12,7 +12,7 @@ class CreateProblema extends Phinx\Migration\AbstractMigration
|
|||||||
|
|
||||||
$this->table('problema')
|
$this->table('problema')
|
||||||
->addColumn('venta', 'integer', ['length' => 11, 'default' => null, 'null' => true])
|
->addColumn('venta', 'integer', ['length' => 11, 'default' => null, 'null' => true])
|
||||||
->addColumn('descripcion', 'mediumtext', ['default' => null, 'null' => true])
|
->addColumn('descripcion', 'text', ['default' => null, 'null' => true, 'limit' => MysqlAdapter::TEXT_MEDIUM])
|
||||||
->create();
|
->create();
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
}
|
}
|
||||||
|
@ -12,7 +12,7 @@ class CreateProyecto extends Phinx\Migration\AbstractMigration
|
|||||||
|
|
||||||
$this->table('proyecto')
|
$this->table('proyecto')
|
||||||
->addColumn('inmobiliaria', 'integer', ['length' => 10, 'default' => null, 'null' => true, 'signed' => false])
|
->addColumn('inmobiliaria', 'integer', ['length' => 10, 'default' => null, 'null' => true, 'signed' => false])
|
||||||
->addColumn('descripcion', 'mediumtext', ['null' => false])
|
->addColumn('descripcion', 'text', ['null' => false, 'limit' => MysqlAdapter::TEXT_MEDIUM])
|
||||||
->addColumn('direccion', 'integer', ['length' => 10, 'null' => false, 'signed' => false])
|
->addColumn('direccion', 'integer', ['length' => 10, 'null' => false, 'signed' => false])
|
||||||
->addColumn('superficie_terreno', 'float', ['default' => 0, 'null' => false, 'signed' => false])
|
->addColumn('superficie_terreno', 'float', ['default' => 0, 'null' => false, 'signed' => false])
|
||||||
->addColumn('valor_terreno', 'float', ['default' => 0, 'null' => false, 'signed' => false])
|
->addColumn('valor_terreno', 'float', ['default' => 0, 'null' => false, 'signed' => false])
|
||||||
|
@ -18,7 +18,7 @@ class CreateProyectoTipoUnidad extends Phinx\Migration\AbstractMigration
|
|||||||
->addColumn('m2', 'float', ['default' => null, 'null' => true])
|
->addColumn('m2', 'float', ['default' => null, 'null' => true])
|
||||||
->addColumn('logia', 'float', ['default' => 0])
|
->addColumn('logia', 'float', ['default' => 0])
|
||||||
->addColumn('terraza', 'float', ['default' => 0])
|
->addColumn('terraza', 'float', ['default' => 0])
|
||||||
->addColumn('descripcion', 'mediumtext', ['default' => null, 'null' => true])
|
->addColumn('descripcion', 'text', ['default' => null, 'null' => true, 'limit' => MysqlAdapter::TEXT_MEDIUM])
|
||||||
->addForeignKey('proyecto', 'proyecto', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
->addForeignKey('proyecto', 'proyecto', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
||||||
->create();
|
->create();
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
@ -10,7 +10,8 @@ class CreateTipoEstadoPago extends Phinx\Migration\AbstractMigration
|
|||||||
$this->execute("ALTER DATABASE CHARACTER SET 'utf8mb4';");
|
$this->execute("ALTER DATABASE CHARACTER SET 'utf8mb4';");
|
||||||
$this->execute("ALTER DATABASE COLLATE='utf8mb4_general_ci';");
|
$this->execute("ALTER DATABASE COLLATE='utf8mb4_general_ci';");
|
||||||
|
|
||||||
$this->table('tipo_estado_pago')
|
$this->table('tipo_estado_pago', ['id' => false, 'primary_key' => 'id'])
|
||||||
|
->addColumn('id', 'integer', ['signed' => true])
|
||||||
->addColumn('descripcion', 'string', ['length' => 20, 'default' => null, 'null' => true])
|
->addColumn('descripcion', 'string', ['length' => 20, 'default' => null, 'null' => true])
|
||||||
->addColumn('active', 'integer', ['length' => 1, 'default' => 0])
|
->addColumn('active', 'integer', ['length' => 1, 'default' => 0])
|
||||||
->create();
|
->create();
|
||||||
|
@ -33,7 +33,7 @@ class CreateVenta extends Phinx\Migration\AbstractMigration
|
|||||||
->addColumn('resciliacion', 'integer', ['length' => 10, 'default' => null, 'null' => true, 'signed' => false])
|
->addColumn('resciliacion', 'integer', ['length' => 10, 'default' => null, 'null' => true, 'signed' => false])
|
||||||
->addColumn('devolucion', 'integer', ['length' => 10, 'default' => null, 'null' => true, 'signed' => false])
|
->addColumn('devolucion', 'integer', ['length' => 10, 'default' => null, 'null' => true, 'signed' => false])
|
||||||
->addForeignKey('propiedad', 'propiedad', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
->addForeignKey('propiedad', 'propiedad', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
||||||
->addForeignKey('propietario', 'propietario', 'rut', ['delete' => 'cascade', 'update' => 'cascade'])
|
#->addForeignKey('propietario', 'propietario', 'rut', ['delete' => 'cascade', 'update' => 'cascade'])
|
||||||
->create();
|
->create();
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
}
|
}
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
use Phinx\Db\Adapter\MysqlAdapter;
|
|
||||||
|
|
||||||
class CreateVentaAbonoCuotas extends Phinx\Migration\AbstractMigration
|
|
||||||
{
|
|
||||||
public function change(): void
|
|
||||||
{
|
|
||||||
$this->execute('SET unique_checks=0; SET foreign_key_checks=0;');
|
|
||||||
$this->execute("ALTER DATABASE CHARACTER SET 'utf8mb4';");
|
|
||||||
$this->execute("ALTER DATABASE COLLATE='utf8mb4_general_ci';");
|
|
||||||
|
|
||||||
$this->table('venta_abono_cuotas')
|
|
||||||
->addColumn('venta_id', 'integer', ['length' => 11, 'null' => false, 'signed' => false])
|
|
||||||
->addColumn('pago_id', 'integer', ['length' => 11, 'null' => false, 'signed' => false])
|
|
||||||
->addColumn('numero', 'integer', ['length' => 11, 'default' => 1, 'null' => false, 'signed' => false])
|
|
||||||
->addForeignKey('venta_id', 'venta', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
|
||||||
->addForeignKey('pago_id', 'pago', 'id', ['delete' => 'cascade', 'update' => 'cascade'])
|
|
||||||
->create();
|
|
||||||
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
|
||||||
}
|
|
||||||
}
|
|
@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Migration\AbstractMigration;
|
||||||
|
|
||||||
|
final class CreateTokuCustomers extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Change Method.
|
||||||
|
*
|
||||||
|
* Write your reversible migrations using this method.
|
||||||
|
*
|
||||||
|
* More information on writing migrations is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
|
||||||
|
*
|
||||||
|
* Remember to call "create()" or "update()" and NOT "save()" when working
|
||||||
|
* with the Table class.
|
||||||
|
*/
|
||||||
|
public function change(): void
|
||||||
|
{
|
||||||
|
$this->table('toku_customers')
|
||||||
|
->addColumn('rut', 'string', ['length' => 9])
|
||||||
|
->addColumn('toku_id', 'string', ['length' => 255])
|
||||||
|
->addTimestamps()
|
||||||
|
->addIndex(['rut'], ['unique' => true])
|
||||||
|
->create();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Migration\AbstractMigration;
|
||||||
|
|
||||||
|
final class CreateTokuSubscriptions extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Change Method.
|
||||||
|
*
|
||||||
|
* Write your reversible migrations using this method.
|
||||||
|
*
|
||||||
|
* More information on writing migrations is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
|
||||||
|
*
|
||||||
|
* Remember to call "create()" or "update()" and NOT "save()" when working
|
||||||
|
* with the Table class.
|
||||||
|
*/
|
||||||
|
public function change(): void
|
||||||
|
{
|
||||||
|
$this->table('toku_subscriptions')
|
||||||
|
->addColumn('venta_id', 'integer', ['signed' => false])
|
||||||
|
->addColumn('toku_id', 'string', ['length' => 255])
|
||||||
|
->addTimestamps()
|
||||||
|
->addIndex(['venta_id'], ['unique' => true])
|
||||||
|
->create();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Migration\AbstractMigration;
|
||||||
|
|
||||||
|
final class CreateTokuInvoices extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Change Method.
|
||||||
|
*
|
||||||
|
* Write your reversible migrations using this method.
|
||||||
|
*
|
||||||
|
* More information on writing migrations is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
|
||||||
|
*
|
||||||
|
* Remember to call "create()" or "update()" and NOT "save()" when working
|
||||||
|
* with the Table class.
|
||||||
|
*/
|
||||||
|
public function change(): void
|
||||||
|
{
|
||||||
|
$this->table('toku_invoices')
|
||||||
|
->addColumn('cuota_id', 'integer', ['signed' => false])
|
||||||
|
->addColumn('toku_id', 'string', ['length' => 255])
|
||||||
|
->addTimestamps()
|
||||||
|
->addIndex(['cuota_id'], ['unique' => true])
|
||||||
|
->create();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,28 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Migration\AbstractMigration;
|
||||||
|
|
||||||
|
final class CreateJobs extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Change Method.
|
||||||
|
*
|
||||||
|
* Write your reversible migrations using this method.
|
||||||
|
*
|
||||||
|
* More information on writing migrations is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
|
||||||
|
*
|
||||||
|
* Remember to call "create()" or "update()" and NOT "save()" when working
|
||||||
|
* with the Table class.
|
||||||
|
*/
|
||||||
|
public function change(): void
|
||||||
|
{
|
||||||
|
$this->table('jobs')
|
||||||
|
->addColumn('configuration', 'json')
|
||||||
|
->addColumn('executed', 'boolean', ['default' => false])
|
||||||
|
->addTimestamps()
|
||||||
|
->create();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,29 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Migration\AbstractMigration;
|
||||||
|
|
||||||
|
final class CreateTokuWebhooks extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Change Method.
|
||||||
|
*
|
||||||
|
* Write your reversible migrations using this method.
|
||||||
|
*
|
||||||
|
* More information on writing migrations is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
|
||||||
|
*
|
||||||
|
* Remember to call "create()" or "update()" and NOT "save()" when working
|
||||||
|
* with the Table class.
|
||||||
|
*/
|
||||||
|
public function change(): void
|
||||||
|
{
|
||||||
|
$this->table('toku_webhooks')
|
||||||
|
->addColumn('secret', 'string', ['length' => 255])
|
||||||
|
->addColumn('events', 'json')
|
||||||
|
->addColumn('enabled', 'boolean', ['default' => true])
|
||||||
|
->addTimestamps()
|
||||||
|
->create();
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Migration\AbstractMigration;
|
||||||
|
|
||||||
|
final class CreateTokuAccounts extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Change Method.
|
||||||
|
*
|
||||||
|
* Write your reversible migrations using this method.
|
||||||
|
*
|
||||||
|
* More information on writing migrations is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
|
||||||
|
*
|
||||||
|
* Remember to call "create()" or "update()" and NOT "save()" when working
|
||||||
|
* with the Table class.
|
||||||
|
*/
|
||||||
|
public function change(): void
|
||||||
|
{
|
||||||
|
$this->execute('SET unique_checks=0; SET foreign_key_checks=0;');
|
||||||
|
|
||||||
|
$this->table('toku_accounts')
|
||||||
|
->addColumn('sociedad_rut', 'integer', ['limit' => 8, 'signed' => false, 'null' => false])
|
||||||
|
->addColumn('toku_id', 'string', ['length' => 255, 'null' => false])
|
||||||
|
->addColumn('account_key', 'string', ['length' => 255, 'null' => false])
|
||||||
|
->addColumn('enabled', 'boolean', ['default' => true])
|
||||||
|
->addTimestamps()
|
||||||
|
#->addForeignKey('sociedad_rut', 'inmobiliaria', 'rut', ['delete' => 'CASCADE', 'update' => 'CASCADE'])
|
||||||
|
->addIndex(['toku_id'], ['unique' => true])
|
||||||
|
->create();
|
||||||
|
|
||||||
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Migration\AbstractMigration;
|
||||||
|
|
||||||
|
final class ChangeTelefonoSizeInPropietario extends AbstractMigration
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Change Method.
|
||||||
|
*
|
||||||
|
* Write your reversible migrations using this method.
|
||||||
|
*
|
||||||
|
* More information on writing migrations is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/migrations.html#the-change-method
|
||||||
|
*
|
||||||
|
* Remember to call "create()" or "update()" and NOT "save()" when working
|
||||||
|
* with the Table class.
|
||||||
|
*/
|
||||||
|
public function change(): void
|
||||||
|
{
|
||||||
|
$this->table('propietario')
|
||||||
|
->changeColumn('telefono', 'biginteger', ['null' => true, 'signed' => false, 'default' => null])
|
||||||
|
->update();
|
||||||
|
}
|
||||||
|
}
|
52
app/resources/database/seeds/Comuna.php
Normal file
52
app/resources/database/seeds/Comuna.php
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Seed\AbstractSeed;
|
||||||
|
|
||||||
|
class Comuna extends AbstractSeed
|
||||||
|
{
|
||||||
|
public function getDependencies(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'Provincia',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run Method.
|
||||||
|
*
|
||||||
|
* Write your database seeder using this method.
|
||||||
|
*
|
||||||
|
* More information on writing seeders is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/seeding.html
|
||||||
|
*/
|
||||||
|
public function run(): void
|
||||||
|
{
|
||||||
|
$this->execute('SET unique_checks=0; SET foreign_key_checks=0;');
|
||||||
|
|
||||||
|
$table = $this->table('comuna');
|
||||||
|
$table->truncate();
|
||||||
|
|
||||||
|
$filename = implode(DIRECTORY_SEPARATOR, [getcwd(), 'resources', 'database', 'seeds', 'comuna.csv']);
|
||||||
|
$dataRows = explode(PHP_EOL, trim(file_get_contents($filename)));
|
||||||
|
$data = array_map(fn($row) => explode(';', $row), $dataRows);
|
||||||
|
$columns = array_shift($data);
|
||||||
|
$columns = array_map(function($column) {
|
||||||
|
if (str_contains($column, 'id')) {
|
||||||
|
return 'id';
|
||||||
|
}
|
||||||
|
if (str_contains($column, 'provincia')) {
|
||||||
|
return 'provincia';
|
||||||
|
}
|
||||||
|
return $column;
|
||||||
|
}, $columns);
|
||||||
|
$data = array_map(function ($row) use ($columns) {
|
||||||
|
return array_combine($columns, $row);
|
||||||
|
}, $data);
|
||||||
|
|
||||||
|
$table->insert($data)->save();
|
||||||
|
|
||||||
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
}
|
||||||
|
}
|
52
app/resources/database/seeds/Provincia.php
Normal file
52
app/resources/database/seeds/Provincia.php
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Seed\AbstractSeed;
|
||||||
|
|
||||||
|
class Provincia extends AbstractSeed
|
||||||
|
{
|
||||||
|
public function getDependencies(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
'Region',
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run Method.
|
||||||
|
*
|
||||||
|
* Write your database seeder using this method.
|
||||||
|
*
|
||||||
|
* More information on writing seeders is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/seeding.html
|
||||||
|
*/
|
||||||
|
public function run(): void
|
||||||
|
{
|
||||||
|
$this->execute('SET unique_checks=0; SET foreign_key_checks=0;');
|
||||||
|
|
||||||
|
$table = $this->table('provincia');
|
||||||
|
$table->truncate();
|
||||||
|
|
||||||
|
$filename = implode(DIRECTORY_SEPARATOR, [getcwd(), 'resources', 'database', 'seeds', 'provincia.csv']);
|
||||||
|
$dataRows = explode(PHP_EOL, trim(file_get_contents($filename)));
|
||||||
|
$data = array_map(fn($row) => explode(';', $row), $dataRows);
|
||||||
|
$columns = array_shift($data);
|
||||||
|
$columns = array_map(function($column) {
|
||||||
|
if (str_contains($column, 'id')) {
|
||||||
|
return 'id';
|
||||||
|
}
|
||||||
|
if (str_contains($column, 'region')) {
|
||||||
|
return 'region';
|
||||||
|
}
|
||||||
|
return $column;
|
||||||
|
}, $columns);
|
||||||
|
$data = array_map(function ($row) use ($columns) {
|
||||||
|
return array_combine($columns, $row);
|
||||||
|
}, $data);
|
||||||
|
|
||||||
|
$table->insert($data)->save();
|
||||||
|
|
||||||
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
}
|
||||||
|
}
|
45
app/resources/database/seeds/Region.php
Normal file
45
app/resources/database/seeds/Region.php
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Seed\AbstractSeed;
|
||||||
|
|
||||||
|
class Region extends AbstractSeed
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run Method.
|
||||||
|
*
|
||||||
|
* Write your database seeder using this method.
|
||||||
|
*
|
||||||
|
* More information on writing seeders is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/seeding.html
|
||||||
|
*/
|
||||||
|
public function run(): void
|
||||||
|
{
|
||||||
|
$this->execute('SET unique_checks=0; SET foreign_key_checks=0;');
|
||||||
|
|
||||||
|
$table = $this->table('region');
|
||||||
|
$table->truncate();
|
||||||
|
|
||||||
|
$filename = implode(DIRECTORY_SEPARATOR, [getcwd(), 'resources', 'database', 'seeds', 'region.csv']);
|
||||||
|
$dataRows = explode(PHP_EOL, trim(file_get_contents($filename)));
|
||||||
|
$data = array_map(fn($row) => explode(';', $row), $dataRows);
|
||||||
|
$columns = array_shift($data);
|
||||||
|
$columns = array_map(function($column) {
|
||||||
|
if (str_contains($column, 'id')) {
|
||||||
|
return 'id';
|
||||||
|
}
|
||||||
|
if (str_contains($column, 'numeracion')) {
|
||||||
|
return 'numeracion';
|
||||||
|
}
|
||||||
|
return $column;
|
||||||
|
}, $columns);
|
||||||
|
$data = array_map(function ($row) use ($columns) {
|
||||||
|
return array_combine($columns, $row);
|
||||||
|
}, $data);
|
||||||
|
|
||||||
|
$table->insert($data)->save();
|
||||||
|
|
||||||
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
}
|
||||||
|
}
|
36
app/resources/database/seeds/TipoEstadoPago.php
Normal file
36
app/resources/database/seeds/TipoEstadoPago.php
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Seed\AbstractSeed;
|
||||||
|
|
||||||
|
class TipoEstadoPago extends AbstractSeed
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run Method.
|
||||||
|
*
|
||||||
|
* Write your database seeder using this method.
|
||||||
|
*
|
||||||
|
* More information on writing seeders is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/seeding.html
|
||||||
|
*/
|
||||||
|
public function run(): void
|
||||||
|
{
|
||||||
|
$this->execute('SET unique_checks=0; SET foreign_key_checks=0;');
|
||||||
|
|
||||||
|
$table = $this->table('tipo_estado_pago');
|
||||||
|
$table->truncate();
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
['id' => -3, 'descripcion' => 'anulado'],
|
||||||
|
['id' => -2, 'descripcion' => 'reemplazado'],
|
||||||
|
['id' => -1, 'descripcion' => 'devuelto'],
|
||||||
|
['id' => 0, 'descripcion' => 'no pagado', 'active' => 1],
|
||||||
|
['id' => 1, 'descripcion' => 'depositado', 'active' => 1],
|
||||||
|
['id' => 2, 'descripcion' => 'abonado', 'active' => 1],
|
||||||
|
];
|
||||||
|
$table->insert($data)->saveData();
|
||||||
|
|
||||||
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
}
|
||||||
|
}
|
52
app/resources/database/seeds/TipoPago.php
Normal file
52
app/resources/database/seeds/TipoPago.php
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Seed\AbstractSeed;
|
||||||
|
|
||||||
|
class TipoPago extends AbstractSeed
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run Method.
|
||||||
|
*
|
||||||
|
* Write your database seeder using this method.
|
||||||
|
*
|
||||||
|
* More information on writing seeders is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/seeding.html
|
||||||
|
*/
|
||||||
|
public function run(): void
|
||||||
|
{
|
||||||
|
$table = $this->table('tipo_pago');
|
||||||
|
$data = [
|
||||||
|
[
|
||||||
|
'descripcion' => 'cheque',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'carta de resguardo',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'vale vista'
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'deposito',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'efectivo',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'tarjeta de credito',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'transferencia electronica',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'virtual',
|
||||||
|
]
|
||||||
|
];
|
||||||
|
|
||||||
|
$table->truncate();
|
||||||
|
$table
|
||||||
|
->insert($data)
|
||||||
|
->saveData();
|
||||||
|
}
|
||||||
|
}
|
43
app/resources/database/seeds/TipoSociedad.php
Normal file
43
app/resources/database/seeds/TipoSociedad.php
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Seed\AbstractSeed;
|
||||||
|
|
||||||
|
class TipoSociedad extends AbstractSeed
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run Method.
|
||||||
|
*
|
||||||
|
* Write your database seeder using this method.
|
||||||
|
*
|
||||||
|
* More information on writing seeders is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/seeding.html
|
||||||
|
*/
|
||||||
|
public function run(): void
|
||||||
|
{
|
||||||
|
$this->execute('SET unique_checks=0; SET foreign_key_checks=0;');
|
||||||
|
|
||||||
|
$table = $this->table('tipo_sociedad');
|
||||||
|
$table->truncate();
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
[
|
||||||
|
'descripcion' => 'Limitada',
|
||||||
|
'abreviacion' => 'Ltda',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'Sociedad Anónima',
|
||||||
|
'abreviacion' => 'SA',
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'Sociedad por Acciones',
|
||||||
|
'abreviacion' => 'SpA',
|
||||||
|
]
|
||||||
|
];
|
||||||
|
|
||||||
|
$table->insert($data)->saveData();
|
||||||
|
|
||||||
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
}
|
||||||
|
}
|
43
app/resources/database/seeds/TipoUnidad.php
Normal file
43
app/resources/database/seeds/TipoUnidad.php
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
use Phinx\Seed\AbstractSeed;
|
||||||
|
|
||||||
|
class TipoUnidad extends AbstractSeed
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* Run Method.
|
||||||
|
*
|
||||||
|
* Write your database seeder using this method.
|
||||||
|
*
|
||||||
|
* More information on writing seeders is available here:
|
||||||
|
* https://book.cakephp.org/phinx/0/en/seeding.html
|
||||||
|
*/
|
||||||
|
public function run(): void
|
||||||
|
{
|
||||||
|
$this->execute('SET unique_checks=0; SET foreign_key_checks=0;');
|
||||||
|
|
||||||
|
$table = $this->table('tipo_unidad');
|
||||||
|
$table->truncate();
|
||||||
|
|
||||||
|
$data = [
|
||||||
|
[
|
||||||
|
'descripcion' => 'departamento',
|
||||||
|
'orden' => 0,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'estacionamiento',
|
||||||
|
'orden' => 1,
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'descripcion' => 'bodega',
|
||||||
|
'orden' => 2,
|
||||||
|
]
|
||||||
|
];
|
||||||
|
|
||||||
|
$table->insert($data)->saveData();
|
||||||
|
|
||||||
|
$this->execute('SET unique_checks=1; SET foreign_key_checks=1;');
|
||||||
|
}
|
||||||
|
}
|
347
app/resources/database/seeds/comuna.csv
Normal file
347
app/resources/database/seeds/comuna.csv
Normal file
@ -0,0 +1,347 @@
|
|||||||
|
id;descripcion;provincia
|
||||||
|
1101;Iquique;11
|
||||||
|
1107;Alto Hospicio;11
|
||||||
|
1401;Pozo Almonte;14
|
||||||
|
1402;Camiña;14
|
||||||
|
1403;Colchane;14
|
||||||
|
1404;Huara;14
|
||||||
|
1405;Pica;14
|
||||||
|
2101;Antofagasta;21
|
||||||
|
2102;Mejillones;21
|
||||||
|
2103;Sierra Gorda;21
|
||||||
|
2104;Taltal;21
|
||||||
|
2201;Calama;22
|
||||||
|
2202;Ollagüe;22
|
||||||
|
2203;San Pedro de Atacama;22
|
||||||
|
2301;Tocopilla;23
|
||||||
|
2302;María Elena;23
|
||||||
|
3101;Copiapó;31
|
||||||
|
3102;Caldera;31
|
||||||
|
3103;Tierra Amarilla;31
|
||||||
|
3201;Chañaral;32
|
||||||
|
3202;Diego de Almagro;32
|
||||||
|
3301;Vallenar;33
|
||||||
|
3302;Alto del Carmen;33
|
||||||
|
3303;Freirina;33
|
||||||
|
3304;Huasco;33
|
||||||
|
4101;La Serena;41
|
||||||
|
4102;Coquimbo;41
|
||||||
|
4103;Andacollo;41
|
||||||
|
4104;La Higuera;41
|
||||||
|
4105;Paiguano;41
|
||||||
|
4106;Vicuña;41
|
||||||
|
4201;Illapel;42
|
||||||
|
4202;Canela;42
|
||||||
|
4203;Los Vilos;42
|
||||||
|
4204;Salamanca;42
|
||||||
|
4301;Ovalle;43
|
||||||
|
4302;Combarbalá;43
|
||||||
|
4303;Monte Patria;43
|
||||||
|
4304;Punitaqui;43
|
||||||
|
4305;Río Hurtado;43
|
||||||
|
5101;Valparaíso;51
|
||||||
|
5102;Casablanca;51
|
||||||
|
5103;Concón;51
|
||||||
|
5104;Juan Fernández;51
|
||||||
|
5105;Puchuncaví;51
|
||||||
|
5107;Quintero;51
|
||||||
|
5109;Viña del Mar;51
|
||||||
|
5201;Isla de Pascua;52
|
||||||
|
5301;Los Andes;53
|
||||||
|
5302;Calle Larga;53
|
||||||
|
5303;Rinconada;53
|
||||||
|
5304;San Esteban;53
|
||||||
|
5401;La Ligua;54
|
||||||
|
5402;Cabildo;54
|
||||||
|
5403;Papudo;54
|
||||||
|
5404;Petorca;54
|
||||||
|
5405;Zapallar;54
|
||||||
|
5501;Quillota;55
|
||||||
|
5502;Calera;55
|
||||||
|
5503;Hijuelas;55
|
||||||
|
5504;La Cruz;55
|
||||||
|
5506;Nogales;55
|
||||||
|
5601;San Antonio;56
|
||||||
|
5602;Algarrobo;56
|
||||||
|
5603;Cartagena;56
|
||||||
|
5604;El Quisco;56
|
||||||
|
5605;El Tabo;56
|
||||||
|
5606;Santo Domingo;56
|
||||||
|
5701;San Felipe;57
|
||||||
|
5702;Catemu;57
|
||||||
|
5703;Llaillay;57
|
||||||
|
5704;Panquehue;57
|
||||||
|
5705;Putaendo;57
|
||||||
|
5706;Santa María;57
|
||||||
|
5801;Quilpué;58
|
||||||
|
5802;Limache;58
|
||||||
|
5803;Olmué;58
|
||||||
|
5804;Villa Alemana;58
|
||||||
|
6101;Rancagua;61
|
||||||
|
6102;Codegua;61
|
||||||
|
6103;Coinco;61
|
||||||
|
6104;Coltauco;61
|
||||||
|
6105;Doñihue;61
|
||||||
|
6106;Graneros;61
|
||||||
|
6107;Las Cabras;61
|
||||||
|
6108;Machalí;61
|
||||||
|
6109;Malloa;61
|
||||||
|
6110;Mostazal;61
|
||||||
|
6111;Olivar;61
|
||||||
|
6112;Peumo;61
|
||||||
|
6113;Pichidegua;61
|
||||||
|
6114;Quinta de Tilcoco;61
|
||||||
|
6115;Rengo;61
|
||||||
|
6116;Requínoa;61
|
||||||
|
6117;San Vicente;61
|
||||||
|
6201;Pichilemu;62
|
||||||
|
6202;La Estrella;62
|
||||||
|
6203;Litueche;62
|
||||||
|
6204;Marchihue;62
|
||||||
|
6205;Navidad;62
|
||||||
|
6206;Paredones;62
|
||||||
|
6301;San Fernando;63
|
||||||
|
6302;Chépica;63
|
||||||
|
6303;Chimbarongo;63
|
||||||
|
6304;Lolol;63
|
||||||
|
6305;Nancagua;63
|
||||||
|
6306;Palmilla;63
|
||||||
|
6307;Peralillo;63
|
||||||
|
6308;Placilla;63
|
||||||
|
6309;Pumanque;63
|
||||||
|
6310;Santa Cruz;63
|
||||||
|
7101;Talca;71
|
||||||
|
7102;Constitución;71
|
||||||
|
7103;Curepto;71
|
||||||
|
7104;Empedrado;71
|
||||||
|
7105;Maule;71
|
||||||
|
7106;Pelarco;71
|
||||||
|
7107;Pencahue;71
|
||||||
|
7108;Río Claro;71
|
||||||
|
7109;San Clemente;71
|
||||||
|
7110;San Rafael;71
|
||||||
|
7201;Cauquenes;72
|
||||||
|
7202;Chanco;72
|
||||||
|
7203;Pelluhue;72
|
||||||
|
7301;Curicó;73
|
||||||
|
7302;Hualañé;73
|
||||||
|
7303;Licantén;73
|
||||||
|
7304;Molina;73
|
||||||
|
7305;Rauco;73
|
||||||
|
7306;Romeral;73
|
||||||
|
7307;Sagrada Familia;73
|
||||||
|
7308;Teno;73
|
||||||
|
7309;Vichuquén;73
|
||||||
|
7401;Linares;74
|
||||||
|
7402;Colbún;74
|
||||||
|
7403;Longaví;74
|
||||||
|
7404;Parral;74
|
||||||
|
7405;Retiro;74
|
||||||
|
7406;San Javier;74
|
||||||
|
7407;Villa Alegre;74
|
||||||
|
7408;Yerbas Buenas;74
|
||||||
|
8101;Concepción;81
|
||||||
|
8102;Coronel;81
|
||||||
|
8103;Chiguayante;81
|
||||||
|
8104;Florida;81
|
||||||
|
8105;Hualqui;81
|
||||||
|
8106;Lota;81
|
||||||
|
8107;Penco;81
|
||||||
|
8108;San Pedro de la Paz;81
|
||||||
|
8109;Santa Juana;81
|
||||||
|
8110;Talcahuano;81
|
||||||
|
8111;Tomé;81
|
||||||
|
8112;Hualpén;81
|
||||||
|
8201;Lebu;82
|
||||||
|
8202;Arauco;82
|
||||||
|
8203;Cañete;82
|
||||||
|
8204;Contulmo;82
|
||||||
|
8205;Curanilahue;82
|
||||||
|
8206;Los Álamos;82
|
||||||
|
8207;Tirúa;82
|
||||||
|
8301;Los Ángeles;83
|
||||||
|
8302;Antuco;83
|
||||||
|
8303;Cabrero;83
|
||||||
|
8304;Laja;83
|
||||||
|
8305;Mulchén;83
|
||||||
|
8306;Nacimiento;83
|
||||||
|
8307;Negrete;83
|
||||||
|
8308;Quilaco;83
|
||||||
|
8309;Quilleco;83
|
||||||
|
8310;San Rosendo;83
|
||||||
|
8311;Santa Bárbara;83
|
||||||
|
8312;Tucapel;83
|
||||||
|
8313;Yumbel;83
|
||||||
|
8314;Alto Biobío;83
|
||||||
|
8401;Chillán;84
|
||||||
|
8402;Bulnes;84
|
||||||
|
8403;Cobquecura;84
|
||||||
|
8404;Coelemu;84
|
||||||
|
8405;Coihueco;84
|
||||||
|
8406;Chillán Viejo;84
|
||||||
|
8407;El Carmen;84
|
||||||
|
8408;Ninhue;84
|
||||||
|
8409;Ñiquén;84
|
||||||
|
8410;Pemuco;84
|
||||||
|
8411;Pinto;84
|
||||||
|
8412;Portezuelo;84
|
||||||
|
8413;Quillón;84
|
||||||
|
8414;Quirihue;84
|
||||||
|
8415;Ránquil;84
|
||||||
|
8416;San Carlos;84
|
||||||
|
8417;San Fabián;84
|
||||||
|
8418;San Ignacio;84
|
||||||
|
8419;San Nicolás;84
|
||||||
|
8420;Treguaco;84
|
||||||
|
8421;Yungay;84
|
||||||
|
9101;Temuco;91
|
||||||
|
9102;Carahue;91
|
||||||
|
9103;Cunco;91
|
||||||
|
9104;Curarrehue;91
|
||||||
|
9105;Freire;91
|
||||||
|
9106;Galvarino;91
|
||||||
|
9107;Gorbea;91
|
||||||
|
9108;Lautaro;91
|
||||||
|
9109;Loncoche;91
|
||||||
|
9110;Melipeuco;91
|
||||||
|
9111;Nueva Imperial;91
|
||||||
|
9112;Padre las Casas;91
|
||||||
|
9113;Perquenco;91
|
||||||
|
9114;Pitrufquén;91
|
||||||
|
9115;Pucón;91
|
||||||
|
9116;Saavedra;91
|
||||||
|
9117;Teodoro Schmidt;91
|
||||||
|
9118;Toltén;91
|
||||||
|
9119;Vilcún;91
|
||||||
|
9120;Villarrica;91
|
||||||
|
9121;Cholchol;91
|
||||||
|
9201;Angol;92
|
||||||
|
9202;Collipulli;92
|
||||||
|
9203;Curacautín;92
|
||||||
|
9204;Ercilla;92
|
||||||
|
9205;Lonquimay;92
|
||||||
|
9206;Los Sauces;92
|
||||||
|
9207;Lumaco;92
|
||||||
|
9208;Purén;92
|
||||||
|
9209;Renaico;92
|
||||||
|
9210;Traiguén;92
|
||||||
|
9211;Victoria;92
|
||||||
|
10101;Puerto Montt;101
|
||||||
|
10102;Calbuco;101
|
||||||
|
10103;Cochamó;101
|
||||||
|
10104;Fresia;101
|
||||||
|
10105;Frutillar;101
|
||||||
|
10106;Los Muermos;101
|
||||||
|
10107;Llanquihue;101
|
||||||
|
10108;Maullín;101
|
||||||
|
10109;Puerto Varas;101
|
||||||
|
10201;Castro;102
|
||||||
|
10202;Ancud;102
|
||||||
|
10203;Chonchi;102
|
||||||
|
10204;Curaco de Vélez;102
|
||||||
|
10205;Dalcahue;102
|
||||||
|
10206;Puqueldón;102
|
||||||
|
10207;Queilén;102
|
||||||
|
10208;Quellón;102
|
||||||
|
10209;Quemchi;102
|
||||||
|
10210;Quinchao;102
|
||||||
|
10301;Osorno;103
|
||||||
|
10302;Puerto Octay;103
|
||||||
|
10303;Purranque;103
|
||||||
|
10304;Puyehue;103
|
||||||
|
10305;Río Negro;103
|
||||||
|
10306;San Juan de la Costa;103
|
||||||
|
10307;San Pablo;103
|
||||||
|
10401;Chaitén;104
|
||||||
|
10402;Futaleufú;104
|
||||||
|
10403;Hualaihué;104
|
||||||
|
10404;Palena;104
|
||||||
|
11101;Coihaique;111
|
||||||
|
11102;Lago Verde;111
|
||||||
|
11201;Aisén;112
|
||||||
|
11202;Cisnes;112
|
||||||
|
11203;Guaitecas;112
|
||||||
|
11301;Cochrane;113
|
||||||
|
11302;O’Higgins;113
|
||||||
|
11303;Tortel;113
|
||||||
|
11401;Chile Chico;114
|
||||||
|
11402;Río Ibáñez;114
|
||||||
|
12101;Punta Arenas;121
|
||||||
|
12102;Laguna Blanca;121
|
||||||
|
12103;Río Verde;121
|
||||||
|
12104;San Gregorio;121
|
||||||
|
12201;Cabo de Hornos (Ex Navarino);122
|
||||||
|
12202;Antártica;122
|
||||||
|
12301;Porvenir;123
|
||||||
|
12302;Primavera;123
|
||||||
|
12303;Timaukel;123
|
||||||
|
12401;Natales;124
|
||||||
|
12402;Torres del Paine;124
|
||||||
|
13101;Santiago;131
|
||||||
|
13102;Cerrillos;131
|
||||||
|
13103;Cerro Navia;131
|
||||||
|
13104;Conchalí;131
|
||||||
|
13105;El Bosque;131
|
||||||
|
13106;Estación Central;131
|
||||||
|
13107;Huechuraba;131
|
||||||
|
13108;Independencia;131
|
||||||
|
13109;La Cisterna;131
|
||||||
|
13110;La Florida;131
|
||||||
|
13111;La Granja;131
|
||||||
|
13112;La Pintana;131
|
||||||
|
13113;La Reina;131
|
||||||
|
13114;Las Condes;131
|
||||||
|
13115;Lo Barnechea;131
|
||||||
|
13116;Lo Espejo;131
|
||||||
|
13117;Lo Prado;131
|
||||||
|
13118;Macul;131
|
||||||
|
13119;Maipú;131
|
||||||
|
13120;Ñuñoa;131
|
||||||
|
13121;Pedro Aguirre Cerda;131
|
||||||
|
13122;Peñalolén;131
|
||||||
|
13123;Providencia;131
|
||||||
|
13124;Pudahuel;131
|
||||||
|
13125;Quilicura;131
|
||||||
|
13126;Quinta Normal;131
|
||||||
|
13127;Recoleta;131
|
||||||
|
13128;Renca;131
|
||||||
|
13129;San Joaquín;131
|
||||||
|
13130;San Miguel;131
|
||||||
|
13131;San Ramón;131
|
||||||
|
13132;Vitacura;131
|
||||||
|
13201;Puente Alto;132
|
||||||
|
13202;Pirque;132
|
||||||
|
13203;San José de Maipo;132
|
||||||
|
13301;Colina;133
|
||||||
|
13302;Lampa;133
|
||||||
|
13303;Tiltil;133
|
||||||
|
13401;San Bernardo;134
|
||||||
|
13402;Buin;134
|
||||||
|
13403;Calera de Tango;134
|
||||||
|
13404;Paine;134
|
||||||
|
13501;Melipilla;135
|
||||||
|
13502;Alhué;135
|
||||||
|
13503;Curacaví;135
|
||||||
|
13504;María Pinto;135
|
||||||
|
13505;San Pedro;135
|
||||||
|
13601;Talagante;136
|
||||||
|
13602;El Monte;136
|
||||||
|
13603;Isla de Maipo;136
|
||||||
|
13604;Padre Hurtado;136
|
||||||
|
13605;Peñaflor;136
|
||||||
|
14101;Valdivia;141
|
||||||
|
14102;Corral;141
|
||||||
|
14103;Lanco;141
|
||||||
|
14104;Los Lagos;141
|
||||||
|
14105;Máfil;141
|
||||||
|
14106;Mariquina;141
|
||||||
|
14107;Paillaco;141
|
||||||
|
14108;Panguipulli;141
|
||||||
|
14201;La Unión;142
|
||||||
|
14202;Futrono;142
|
||||||
|
14203;Lago Ranco;142
|
||||||
|
14204;Río Bueno;142
|
||||||
|
15101;Arica;151
|
||||||
|
15102;Camarones;151
|
||||||
|
15201;Putre;152
|
||||||
|
15202;General Lagos;152
|
|
55
app/resources/database/seeds/provincia.csv
Normal file
55
app/resources/database/seeds/provincia.csv
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
id;descripcion;region
|
||||||
|
11;Iquique;1
|
||||||
|
14;Tamarugal;1
|
||||||
|
21;Antofagasta;2
|
||||||
|
22;El Loa;2
|
||||||
|
23;Tocopilla;2
|
||||||
|
31;Copiap;3
|
||||||
|
32;Chañaral;3
|
||||||
|
33;Huasco;3
|
||||||
|
41;Elqui;4
|
||||||
|
42;Choapa;4
|
||||||
|
43;Limari;4
|
||||||
|
51;Valparaíso;5
|
||||||
|
52;Isla de Pascua;5
|
||||||
|
53;Los Andes;5
|
||||||
|
54;Petorca;5
|
||||||
|
55;Quillota;5
|
||||||
|
56;San Antonio;5
|
||||||
|
57;San Felipe;5
|
||||||
|
58;Marga Marga;5
|
||||||
|
61;Cachapoal;6
|
||||||
|
62;Cardenal Caro;6
|
||||||
|
63;Colchagua;6
|
||||||
|
71;Talca;7
|
||||||
|
72;Cauquenes;7
|
||||||
|
73;Curico;7
|
||||||
|
74;Linares;7
|
||||||
|
81;Concepci;8
|
||||||
|
82;Arauco;8
|
||||||
|
83;Bío- Bío;8
|
||||||
|
84;Ñuble;8
|
||||||
|
91;Cautín;9
|
||||||
|
92;Malleco;9
|
||||||
|
101;Llanquihue;10
|
||||||
|
102;Chiloe;10
|
||||||
|
103;Osorno;10
|
||||||
|
104;Palena;10
|
||||||
|
111;Coihaique;11
|
||||||
|
112;Aisén;11
|
||||||
|
113;Capitan Prat;11
|
||||||
|
114;General Carrera;11
|
||||||
|
121;Magallanes;12
|
||||||
|
122;Antártica Chilena;12
|
||||||
|
123;Tierra del Fuego;12
|
||||||
|
124;Ultima Esperanza;12
|
||||||
|
131;Santiago;13
|
||||||
|
132;Cordillera;13
|
||||||
|
133;Chacabuco;13
|
||||||
|
134;Maipo;13
|
||||||
|
135;Melipilla;13
|
||||||
|
136;Talagante;13
|
||||||
|
141;Valdivia;14
|
||||||
|
142;Ranco;14
|
||||||
|
151;Arica;15
|
||||||
|
152;Parinacota;15
|
|
16
app/resources/database/seeds/region.csv
Normal file
16
app/resources/database/seeds/region.csv
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
id;descripcion;numeral;numeracion
|
||||||
|
1;Región de Tarapacá;I;1
|
||||||
|
2;Región de Antofagasta;II;2
|
||||||
|
3;Región de Atacama;III;3
|
||||||
|
4;Región de Coquimbo;IV;4
|
||||||
|
5;Región de Valparaíso;V;5
|
||||||
|
6;Región del Libertador Gral. Bernardo O’Higgins;VI;6
|
||||||
|
7;Región del Maule;VII;7
|
||||||
|
8;Región del Biobío;VIII;8
|
||||||
|
9;Región de la Araucanía;IX;9
|
||||||
|
10;Región de Los Lagos;X;10
|
||||||
|
11;Región Aisén del Gral. Carlos Ibáñez del Campo;XI;11
|
||||||
|
12;Región de Magallanes y de la Antártica Chilena;XII;12
|
||||||
|
13;Región Metropolitana de Santiago;RM;13
|
||||||
|
14;Región de Los Ríos;XIV;14
|
||||||
|
15;Región de Arica y Parinacota;XV;15
|
|
@ -7,4 +7,4 @@ $app->group('/contabilidad', function($app) {
|
|||||||
}
|
}
|
||||||
include_once $file->getRealPath();
|
include_once $file->getRealPath();
|
||||||
}
|
}
|
||||||
});
|
})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class));
|
||||||
|
@ -7,4 +7,4 @@ $app->group('/admin', function($app) {
|
|||||||
}
|
}
|
||||||
include_once $file->getRealPath();
|
include_once $file->getRealPath();
|
||||||
}
|
}
|
||||||
});
|
})->add($app->getContainer()->get(Incoviba\Middleware\Authentication::class));
|
||||||
|
@ -2,5 +2,9 @@
|
|||||||
use Incoviba\Controller\API\Admin\Users;
|
use Incoviba\Controller\API\Admin\Users;
|
||||||
|
|
||||||
$app->group('/users', function($app) {
|
$app->group('/users', function($app) {
|
||||||
$app->post('/add[/]', Users::class . ':add');
|
$app->post('/add[/]', [Users::class, 'add']);
|
||||||
|
});
|
||||||
|
$app->group('/user/{user_id}', function($app) {
|
||||||
|
$app->post('/edit[/]', [Users::class, 'edit']);
|
||||||
|
$app->delete('[/]', [Users::class, 'delete']);
|
||||||
});
|
});
|
||||||
|
16
app/resources/routes/api/external.php
Normal file
16
app/resources/routes/api/external.php
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
<?php
|
||||||
|
use Incoviba\Controller\API\External;
|
||||||
|
|
||||||
|
$app->group('/external', function($app) {
|
||||||
|
$files = new FilesystemIterator(implode(DIRECTORY_SEPARATOR, [__DIR__, 'external']));
|
||||||
|
foreach ($files as $file) {
|
||||||
|
if ($file->isDir()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
include_once $file->getRealPath();
|
||||||
|
}
|
||||||
|
$app->group('/services', function($app) {
|
||||||
|
$app->get('/check[/]', [External::class, 'check']);
|
||||||
|
$app->get('/update[/]', [External::class, 'update']);
|
||||||
|
});
|
||||||
|
});
|
11
app/resources/routes/api/external/toku.php
vendored
Normal file
11
app/resources/routes/api/external/toku.php
vendored
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<?php
|
||||||
|
use Incoviba\Controller\API\Ventas\MediosPago\Toku;
|
||||||
|
|
||||||
|
$app->group('/toku', function($app) {
|
||||||
|
$app->post('/cuotas/{venta_id}[/]', [Toku::class, 'cuotas']);
|
||||||
|
$app->post('/success[/]', [Toku::class, 'success']);
|
||||||
|
$app->get('/test[/]', [Toku::class, 'test']);
|
||||||
|
$app->delete('/reset[/]', [Toku::class, 'reset']);
|
||||||
|
$app->post('/enqueue[/]', [Toku::class, 'enqueue']);
|
||||||
|
$app->post('/update[/{type}[/]]', [Toku::class, 'update']);
|
||||||
|
});
|
10
app/resources/routes/api/queue.php
Normal file
10
app/resources/routes/api/queue.php
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
<?php
|
||||||
|
use Incoviba\Controller\API\Queues;
|
||||||
|
|
||||||
|
$app->group('/queue', function($app) {
|
||||||
|
#$app->get('/jobs[/]', [Queues::class, 'jobs']);
|
||||||
|
$app->group('/run', function($app) {
|
||||||
|
#$app->get('/{job_id:[0-9]+}[/]', [Queues::class, 'run']);
|
||||||
|
$app->get('[/]', Queues::class);
|
||||||
|
});
|
||||||
|
});
|
@ -2,6 +2,7 @@
|
|||||||
use Incoviba\Controller\API\Ventas\Precios;
|
use Incoviba\Controller\API\Ventas\Precios;
|
||||||
|
|
||||||
$app->group('/precios', function($app) {
|
$app->group('/precios', function($app) {
|
||||||
|
$app->post('/import[/]', [Precios::class, 'import']);
|
||||||
$app->post('[/]', [Precios::class, 'proyecto']);
|
$app->post('[/]', [Precios::class, 'proyecto']);
|
||||||
});
|
});
|
||||||
$app->group('/precio', function($app) {
|
$app->group('/precio', function($app) {
|
||||||
|
@ -2,5 +2,5 @@
|
|||||||
use Incoviba\Controller\Ventas\Precios;
|
use Incoviba\Controller\Ventas\Precios;
|
||||||
|
|
||||||
$app->group('/precios', function($app) {
|
$app->group('/precios', function($app) {
|
||||||
$app->get('[/]', Precios::class);
|
$app->get('[/{project_id}[/]]', Precios::class);
|
||||||
});
|
});
|
||||||
|
@ -14,15 +14,15 @@
|
|||||||
</th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody id="users">
|
||||||
@foreach($users as $user)
|
@foreach($users as $user)
|
||||||
<tr>
|
<tr data-user="{{ $user->id }}">
|
||||||
<td>{{ $user->name }}</td>
|
<td>{{ $user->name }}</td>
|
||||||
<td class="right aligned">
|
<td class="right aligned">
|
||||||
<button class="ui mini blue icon button">
|
<button class="ui mini blue icon button edit" data-user="{{ $user->id }}">
|
||||||
<i class="edit icon"></i>
|
<i class="edit icon"></i>
|
||||||
</button>
|
</button>
|
||||||
<button class="ui mini red icon button">
|
<button class="ui mini red icon button remove" data-user="{{ $user->id }}">
|
||||||
<i class="trash icon"></i>
|
<i class="trash icon"></i>
|
||||||
</button>
|
</button>
|
||||||
</td>
|
</td>
|
||||||
@ -50,6 +50,10 @@
|
|||||||
<label>Contraseña</label>
|
<label>Contraseña</label>
|
||||||
<input type="password" name="password" placeholder="Contraseña">
|
<input type="password" name="password" placeholder="Contraseña">
|
||||||
</div>
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Confirmar contraseña</label>
|
||||||
|
<input type="password" name="password_confirmation" placeholder="Confirmar contraseña">
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="actions">
|
<div class="actions">
|
||||||
@ -62,6 +66,45 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="ui modal" id="edit-user-modal">
|
||||||
|
<i class="close icon"></i>
|
||||||
|
<div class="header">
|
||||||
|
Editar usuario
|
||||||
|
</div>
|
||||||
|
<div class="content">
|
||||||
|
<form class="ui form">
|
||||||
|
<input type="hidden" name="id" />
|
||||||
|
<div class="field">
|
||||||
|
<label>Contraseña Antigua</label>
|
||||||
|
<input type="password" name="old_password" placeholder="Contraseña Antigua">
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Force Change?</label>
|
||||||
|
<div class="ui checkbox">
|
||||||
|
<input type="checkbox" name="force" >
|
||||||
|
<label>Yes</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Contraseña</label>
|
||||||
|
<input type="password" name="password" placeholder="Contraseña">
|
||||||
|
</div>
|
||||||
|
<div class="field">
|
||||||
|
<label>Confirmar contraseña</label>
|
||||||
|
<input type="password" name="password_confirmation" placeholder="Confirmar contraseña">
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<div class="actions">
|
||||||
|
<div class="ui black deny button">
|
||||||
|
Cancelar
|
||||||
|
</div>
|
||||||
|
<div class="ui positive right labeled icon button">
|
||||||
|
Guardar
|
||||||
|
<i class="checkmark icon"></i>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@include('layout.body.scripts.cryptojs')
|
@include('layout.body.scripts.cryptojs')
|
||||||
@ -74,12 +117,20 @@
|
|||||||
return [passphrase, encrypted.toString()].join('')
|
return [passphrase, encrypted.toString()].join('')
|
||||||
}
|
}
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
$('#create-user-modal').modal({
|
const $createUserModal = $('#create-user-modal')
|
||||||
|
$createUserModal.modal({
|
||||||
onApprove: function() {
|
onApprove: function() {
|
||||||
|
const form = document.querySelector('#create-user-modal form')
|
||||||
|
const password = form.querySelector('[name="password"]').value
|
||||||
|
const password_confirmation = form.querySelector('[name="password_confirmation"]').value
|
||||||
|
if (password !== password_confirmation) {
|
||||||
|
alert('Las contraseñas no coinciden')
|
||||||
|
return
|
||||||
|
}
|
||||||
const url = '{{$urls->api}}/admin/users/add'
|
const url = '{{$urls->api}}/admin/users/add'
|
||||||
const method = 'post'
|
const method = 'post'
|
||||||
const body = new FormData(document.querySelector('#create-user-modal form'))
|
const body = new FormData(form)
|
||||||
body.set('password', encryptPassword(body.get('password')))
|
body.set('password', encryptPassword(password))
|
||||||
fetchAPI(url, {method, body}).then(response => {
|
fetchAPI(url, {method, body}).then(response => {
|
||||||
if (!response) {
|
if (!response) {
|
||||||
return;
|
return;
|
||||||
@ -92,8 +143,64 @@
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
$('#create-user-button').on('click', function () {
|
const $editUserModal = $('#edit-user-modal')
|
||||||
$('#create-user-modal').modal('show')
|
$editUserModal.modal({
|
||||||
|
onApprove: function() {
|
||||||
|
const form = document.querySelector('#edit-user-modal form')
|
||||||
|
const user_id = form.querySelector('[name="id"]').value
|
||||||
|
const old_password = form.querySelector('[name="old_password"]').value
|
||||||
|
const password = form.querySelector('[name="password"]').value
|
||||||
|
const password_confirmation = form.querySelector('[name="password_confirmation"]').value
|
||||||
|
if (password !== password_confirmation) {
|
||||||
|
alert('Las nuevas contraseñas no coinciden')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const url = `{{$urls->api}}/admin/user/${user_id}/edit`
|
||||||
|
const method = 'post'
|
||||||
|
const body = new FormData(form)
|
||||||
|
body.set('old_password', encryptPassword(old_password))
|
||||||
|
body.set('password', encryptPassword(password))
|
||||||
|
if (form.querySelector('[name="force"]').checked) {
|
||||||
|
body.set('force', 'true')
|
||||||
|
}
|
||||||
|
fetchAPI(url, {method, body}).then(response => {
|
||||||
|
if (!response) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
response.json().then(result => {
|
||||||
|
if (result.success) {
|
||||||
|
location.reload()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
})
|
||||||
|
document.getElementById('create-user-modal').addEventListener('submit', event => {
|
||||||
|
$createUserModal.modal('show')
|
||||||
|
})
|
||||||
|
document.querySelectorAll('.button.edit').forEach(button => {
|
||||||
|
button.addEventListener('click', clickEvent => {
|
||||||
|
const user_id = clickEvent.currentTarget.dataset.user
|
||||||
|
$editUserModal.find('input[name="id"]').val(user_id)
|
||||||
|
$editUserModal.modal('show')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
document.querySelectorAll('.button.remove').forEach(button => {
|
||||||
|
button.addEventListener('click', clickEvent => {
|
||||||
|
const user_id = clickEvent.currentTarget.dataset.user
|
||||||
|
const url = `{{$urls->api}}/admin/user/${user_id}`
|
||||||
|
const method = 'delete'
|
||||||
|
fetchAPI(url, {method}).then(response => {
|
||||||
|
if (!response) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
response.json().then(result => {
|
||||||
|
if (result.success) {
|
||||||
|
location.reload()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
const cuotas = {
|
const cuotas = {
|
||||||
get: function() {
|
get: function() {
|
||||||
return {
|
return {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<div class="ui divided list" id="alertas_escrituras"></div>
|
<div class="ui divided list" id="alertas_escrituras"></div>
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
const alertas_escrituras = {
|
const alertas_escrituras = {
|
||||||
id: '#alertas_escrituras',
|
id: '#alertas_escrituras',
|
||||||
data: {
|
data: {
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<div class="ui divided list" id="cierres_vigentes"></div>
|
<div class="ui divided list" id="cierres_vigentes"></div>
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
const cierres_vigentes = {
|
const cierres_vigentes = {
|
||||||
get: function() {
|
get: function() {
|
||||||
const list = $('#cierres_vigentes')
|
const list = $('#cierres_vigentes')
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
<div class="ui divided list" id="cuotas_por_vencer"></div>
|
<div class="ui divided list" id="cuotas_por_vencer"></div>
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
const cuotas_por_vencer = {
|
const cuotas_por_vencer = {
|
||||||
get: function() {
|
get: function() {
|
||||||
const list = $('#cuotas_por_vencer')
|
const list = $('#cuotas_por_vencer')
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
function logout() {
|
function logout() {
|
||||||
return fetch('{{$urls->base}}/logout').then(response => {
|
return fetch('{{$urls->base}}/logout').then(response => {
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
|
@ -1,33 +1,9 @@
|
|||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.0/jquery.min.js" integrity="sha512-3gJwYpMe3QewGELv8k/BX9vcqhryRdzRMxVfq6ngyWXwo03GFEzjsUm8Q7RZcHPHksttq7/GFoxjCVUjkjvPdw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
||||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.9.3/semantic.min.js" integrity="sha512-gnoBksrDbaMnlE0rhhkcx3iwzvgBGz6mOEj4/Y5ZY09n55dYddx6+WYc72A55qEesV8VX2iMomteIwobeGK1BQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
<script src="https://cdnjs.cloudflare.com/ajax/libs/fomantic-ui/2.9.3/semantic.min.js" integrity="sha512-gnoBksrDbaMnlE0rhhkcx3iwzvgBGz6mOEj4/Y5ZY09n55dYddx6+WYc72A55qEesV8VX2iMomteIwobeGK1BQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
|
||||||
|
|
||||||
<script type="text/javascript">
|
@include('layout.body.scripts.api')
|
||||||
class APIClient {
|
|
||||||
static fetch(url, options=null, showErrors=false) {
|
<script>
|
||||||
return fetchAPI(url, options, showErrors)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
function fetchAPI(url, options=null, showErrors=false) {
|
|
||||||
if (options === null) {
|
|
||||||
options = {}
|
|
||||||
}
|
|
||||||
if (!Object.hasOwn(options, 'headers')) {
|
|
||||||
options['headers'] = {}
|
|
||||||
}
|
|
||||||
if (!Object.hasOwn(options['headers'], 'Authorization')) {
|
|
||||||
options['headers']['Authorization'] = 'Bearer {{md5($API_KEY)}}{{($login->isIn()) ? $login->getSeparator() . $login->getToken() : ''}}'
|
|
||||||
}
|
|
||||||
return fetch(url, options).then(response => {
|
|
||||||
if (response.ok) {
|
|
||||||
return response
|
|
||||||
}
|
|
||||||
throw new Error(JSON.stringify({code: response.status, message: response.statusText, url}))
|
|
||||||
}).catch(error => {
|
|
||||||
if (showErrors) {
|
|
||||||
console.error(error)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
const datatables_defaults = {
|
const datatables_defaults = {
|
||||||
language: {
|
language: {
|
||||||
emptyTable: 'No hay datos disponibles',
|
emptyTable: 'No hay datos disponibles',
|
||||||
|
32
app/resources/views/layout/body/scripts/api.blade.php
Normal file
32
app/resources/views/layout/body/scripts/api.blade.php
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
<script>
|
||||||
|
class APIClient {
|
||||||
|
static getApiKey() {
|
||||||
|
return '{{md5($API_KEY)}}{{($login->isIn()) ? $login->getSeparator() . $login->getToken() : ''}}'
|
||||||
|
}
|
||||||
|
|
||||||
|
static fetch(url, options=null, showErrors=false) {
|
||||||
|
if (options === null) {
|
||||||
|
options = {}
|
||||||
|
}
|
||||||
|
if (!Object.hasOwn(options, 'headers')) {
|
||||||
|
options['headers'] = {}
|
||||||
|
}
|
||||||
|
if (!Object.hasOwn(options['headers'], 'Authorization')) {
|
||||||
|
options['headers']['Authorization'] = `Bearer ${APIClient.getApiKey()}`
|
||||||
|
}
|
||||||
|
return fetch(url, options).then(response => {
|
||||||
|
if (response.ok) {
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
throw new Error(JSON.stringify({code: response.status, message: response.statusText, url}))
|
||||||
|
}).catch(error => {
|
||||||
|
if (showErrors) {
|
||||||
|
console.error(error)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
function fetchAPI(url, options=null, showErrors=false) {
|
||||||
|
return APIClient.fetch(url, options, showErrors)
|
||||||
|
}
|
||||||
|
</script>
|
@ -1,4 +1,4 @@
|
|||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript" src="https://cdn.datatables.net/2.0.3/js/dataTables.min.js"></script>
|
<script src="https://cdn.datatables.net/2.0.3/js/dataTables.min.js"></script>
|
||||||
<script src="https://cdn.datatables.net/2.0.3/js/dataTables.semanticui.min.js"></script>
|
<script src="https://cdn.datatables.net/2.0.3/js/dataTables.semanticui.min.js"></script>
|
||||||
@endpush
|
@endpush
|
||||||
|
@ -0,0 +1,45 @@
|
|||||||
|
@push('page_scripts')
|
||||||
|
<script>
|
||||||
|
Intl.NumberFormat.prototype.parse = function(valueString) {
|
||||||
|
const format = new Intl.NumberFormat(this.resolvedOptions().locale);
|
||||||
|
const parts = format.formatToParts(-12345.6);
|
||||||
|
const numerals = Array.from({ length: 10 }).map((_, i) => format.format(i));
|
||||||
|
const index = new Map(numerals.map((d, i) => [d, i]));
|
||||||
|
_minusSign = new RegExp(`[${parts.find(d => d.type === 'minusSign').value}]`);
|
||||||
|
_group = new RegExp(`[${parts.find(d => d.type === 'group').value}]`, 'g');
|
||||||
|
_decimal = new RegExp(`[${parts.find(d => d.type === 'decimal').value}]`);
|
||||||
|
_numeral = new RegExp(`[${numerals.join('')}]`, 'g');
|
||||||
|
_index = d => index.get(d);
|
||||||
|
|
||||||
|
const DIRECTION_MARK = /\u061c|\u200e/g
|
||||||
|
return +(
|
||||||
|
valueString.trim()
|
||||||
|
.replace(DIRECTION_MARK, '')
|
||||||
|
.replace(_group, '')
|
||||||
|
.replace(_decimal, '.')
|
||||||
|
.replace(_numeral, _index)
|
||||||
|
.replace(_minusSign, '-')
|
||||||
|
)
|
||||||
|
}
|
||||||
|
Intl.NumberFormat.prototype.isLocale = function(stringValue) {
|
||||||
|
const format = new Intl.NumberFormat(this.resolvedOptions().locale);
|
||||||
|
const parts = format.formatToParts(-12345.6);
|
||||||
|
const group = parts.find(d => d.type === 'group').value;
|
||||||
|
const decimal = parts.find(d => d.type === 'decimal').value;
|
||||||
|
|
||||||
|
if (stringValue.includes(group)) {
|
||||||
|
if (stringValue.includes(decimal)) {
|
||||||
|
return stringValue.indexOf(group) < stringValue.indexOf(decimal)
|
||||||
|
}
|
||||||
|
if (stringValue.split(group).map(d => d.length).filter(d => d > 3).length > 0) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return stringValue.split(group).length > 2;
|
||||||
|
}
|
||||||
|
if (stringValue.includes(decimal)) {
|
||||||
|
return stringValue.split(decimal).length <= 2;
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
@endpush
|
@ -0,0 +1,76 @@
|
|||||||
|
@push('page_scripts')
|
||||||
|
<script>
|
||||||
|
if (typeof Intl.NumberFormat.isLocale === 'undefined' || typeof Intl.NumberFormat.isLocale !== 'function') {
|
||||||
|
// Load Intl.NumberFormat custom methods
|
||||||
|
@include('layout.body.scripts.number_format')
|
||||||
|
}
|
||||||
|
class NumberInput {
|
||||||
|
input
|
||||||
|
isRational
|
||||||
|
outputLocale
|
||||||
|
currentValue
|
||||||
|
formatters
|
||||||
|
|
||||||
|
constructor({input, isRational, outputLocale}) {
|
||||||
|
this.input = input
|
||||||
|
this.isRational = isRational
|
||||||
|
this.outputLocale = outputLocale || 'es-CL'
|
||||||
|
|
||||||
|
this.formatters = {}
|
||||||
|
const locales = ['es-CL', 'en-US']
|
||||||
|
locales.forEach(locale => {
|
||||||
|
this.formatters[locale] = {
|
||||||
|
rational: new Intl.NumberFormat(locale, {minimumFractionDigits: 2, maximumFractionDigits: 2}),
|
||||||
|
integer: new Intl.NumberFormat(locale)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
if (this.input.value !== '') {
|
||||||
|
this.currentValue = this.process(this.input.value)
|
||||||
|
this.input.value = this.format(this.currentValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
watch() {
|
||||||
|
this.input.addEventListener('change', event => {
|
||||||
|
this.currentValue = this.process(event.currentTarget.value)
|
||||||
|
this.input.value = this.format(this.currentValue)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
process(stringValue) {
|
||||||
|
if (stringValue === '') {
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
if (typeof stringValue !== 'string') {
|
||||||
|
return stringValue
|
||||||
|
}
|
||||||
|
return this.formatters[this.detectLocale(stringValue)][this.isRational ? 'rational' : 'integer'].parse(stringValue)
|
||||||
|
}
|
||||||
|
detectLocale(stringValue) {
|
||||||
|
if (stringValue === '') {
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
if (typeof stringValue !== 'string') {
|
||||||
|
return stringValue
|
||||||
|
}
|
||||||
|
const outputFormat = this.formatters[this.outputLocale][this.isRational ? 'rational' : 'integer'].isLocale(stringValue)
|
||||||
|
const otherFormats = Object.entries(this.formatters).filter(formatter => formatter[0] !== this.outputLocale).map(formatter => {
|
||||||
|
return {
|
||||||
|
locale: formatter[0],
|
||||||
|
value: formatter[1][this.isRational ? 'rational' : 'integer'].isLocale(stringValue)
|
||||||
|
}
|
||||||
|
}).filter(formatter => formatter.value)
|
||||||
|
|
||||||
|
if (outputFormat) {
|
||||||
|
return this.outputLocale
|
||||||
|
}
|
||||||
|
if (otherFormats.length > 0) {
|
||||||
|
return otherFormats[0].locale
|
||||||
|
}
|
||||||
|
return 'en-US'
|
||||||
|
}
|
||||||
|
format(value) {
|
||||||
|
return this.formatters[this.outputLocale][this.isRational ? 'rational' : 'integer'].format(value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
@endpush
|
@ -19,7 +19,7 @@
|
|||||||
@include('layout.body.scripts.cryptojs')
|
@include('layout.body.scripts.cryptojs')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
function encryptPassword(password) {
|
function encryptPassword(password) {
|
||||||
const passphrase = Math.floor(Math.random() * Date.now()).toString()
|
const passphrase = Math.floor(Math.random() * Date.now()).toString()
|
||||||
const encrypted = CryptoJS.AES.encrypt(password, passphrase)
|
const encrypted = CryptoJS.AES.encrypt(password, passphrase)
|
||||||
|
14
app/resources/views/not_allowed.blade.php
Normal file
14
app/resources/views/not_allowed.blade.php
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
@extends('layout.base')
|
||||||
|
|
||||||
|
@section('page_title')
|
||||||
|
405 - Método No Permitido
|
||||||
|
@endsection
|
||||||
|
|
||||||
|
@section('page_content')
|
||||||
|
<div class="ui container">
|
||||||
|
<div class="ui message">
|
||||||
|
<i class="exclamation triangle icon"></i>
|
||||||
|
No se ha encontrado la página solicitada para el método solicitado.
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endsection
|
@ -53,6 +53,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
@include('layout.body.scripts.rut')
|
@include('layout.body.scripts.rut')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script>
|
<script>
|
||||||
class AddModal {
|
class AddModal {
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@include('layout.body.scripts.stats')
|
@include('layout.body.scripts.stats')
|
||||||
|
|
||||||
@prepend('page_scripts')
|
@prepend('page_scripts')
|
||||||
<script>
|
<script>
|
||||||
class TableHandler {
|
class TableHandler {
|
||||||
@ -182,9 +183,9 @@
|
|||||||
|
|
||||||
@section('brokers_content')
|
@section('brokers_content')
|
||||||
<div class="ui statistic">
|
<div class="ui statistic">
|
||||||
<div class="value">{{ $format->percent($contract->commission, 2, true) }}</div>
|
<div class="value">{{ $format->percent($contract->commission ?? 0, 2, true) }}</div>
|
||||||
<div class="label">
|
<div class="label">
|
||||||
Comisión desde {{ $contract->current()->date->format('d/m/Y') }}
|
Comisión desde {{ $contract->current()?->date?->format('d/m/Y') }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
class Proyecto {
|
class Proyecto {
|
||||||
id
|
id
|
||||||
estados
|
estados
|
||||||
|
@ -141,7 +141,7 @@
|
|||||||
@include('layout.body.scripts.chartjs')
|
@include('layout.body.scripts.chartjs')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
const superficies = {
|
const superficies = {
|
||||||
ids: {
|
ids: {
|
||||||
vendible: '',
|
vendible: '',
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
@endpush
|
@endpush
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
class Unidad
|
class Unidad
|
||||||
{
|
{
|
||||||
id
|
id
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
@include('layout.body.scripts.datatables')
|
@include('layout.body.scripts.datatables')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
class Row
|
class Row
|
||||||
{
|
{
|
||||||
proyecto
|
proyecto
|
||||||
|
@ -151,11 +151,12 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@include('layout.body.scripts.rut')
|
@include('layout.body.scripts.rut')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
const regiones = [
|
const regiones = [
|
||||||
@foreach ($regiones as $region)
|
@foreach ($regiones as $region)
|
||||||
'<div class="item" data-value="{{$region->id}}">{{$region->descripcion}}</div>',
|
'<div class="item" data-value="{{$region->id}}">{{$region->numeral}} - {{$region->descripcion}}</div>',
|
||||||
@endforeach
|
@endforeach
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -353,56 +354,65 @@
|
|||||||
const lines = [
|
const lines = [
|
||||||
'<label for="rut">RUT</label>',
|
'<label for="rut">RUT</label>',
|
||||||
'<div class="inline field">',
|
'<div class="inline field">',
|
||||||
'<input type="text" id="rut" name="rut" placeholder="00000000-0" required />',
|
'<input type="text" id="rut" name="rut" placeholder="00000000-0" required />',
|
||||||
'<span class="ui error message" id="alert_rut">',
|
'<span class="ui error message" id="alert_rut">',
|
||||||
'<i class="exclamation triangle icon"></i>',
|
'<i class="exclamation triangle icon"></i>',
|
||||||
'RUT Inválido',
|
'RUT Inválido',
|
||||||
'</span>',
|
'</span>',
|
||||||
'</div>',
|
'</div>',
|
||||||
'<label for="nombres">Nombre</label>',
|
'<label for="nombres">Nombre</label>',
|
||||||
'<div class="inline fields">',
|
'<div class="inline fields">',
|
||||||
'<div class="field">',
|
'<div class="field">',
|
||||||
'<input type="text" name="nombres" id="nombres" placeholder="Nombre(s)" required />',
|
'<input type="text" name="nombres" id="nombres" placeholder="Nombre(s)" required />',
|
||||||
'</div>',
|
'</div>',
|
||||||
'<div class="field">',
|
'<div class="field">',
|
||||||
'<input type="text" name="apellido_paterno" placeholder="Apellido Paterno" required />',
|
'<input type="text" name="apellido_paterno" placeholder="Apellido Paterno" required />',
|
||||||
'</div>',
|
'</div>',
|
||||||
'<div class="field">',
|
'<div class="field">',
|
||||||
'<input type="text" name="apellido_materno" placeholder="Apellido Materno" required />',
|
'<input type="text" name="apellido_materno" placeholder="Apellido Materno" required />',
|
||||||
'</div>',
|
'</div>',
|
||||||
'</div>',
|
'</div>',
|
||||||
'<label for="calle">Dirección</label>',
|
'<label for="calle">Dirección</label>',
|
||||||
'<div class="inline fields">',
|
'<div class="inline fields">',
|
||||||
'<div class="eight wide field">',
|
'<div class="eight wide field">',
|
||||||
'<input type="text" name="calle" id="calle" size="16" placeholder="Calle" required />',
|
'<input type="text" name="calle" id="calle" size="16" placeholder="Calle" required />',
|
||||||
'</div>',
|
'</div>',
|
||||||
'<div class="field">',
|
'<div class="field">',
|
||||||
'<input type="text" name="numero" size="5" placeholder="Número" required />',
|
'<input type="text" name="numero" size="5" placeholder="Número" required />',
|
||||||
'</div>',
|
'</div>',
|
||||||
'<div class="field">',
|
'<div class="field">',
|
||||||
'<input type="text" name="extra" placeholder="Otros Detalles" />',
|
'<input type="text" name="extra" placeholder="Otros Detalles" />',
|
||||||
'</div>',
|
'</div>',
|
||||||
'</div>',
|
'</div>',
|
||||||
'<div class="inline fields">',
|
'<div class="inline fields">',
|
||||||
'<div class="two wide field"></div>',
|
'<div class="two wide field"></div>',
|
||||||
'<div class="four wide field">',
|
'<div class="four wide field">',
|
||||||
'<div class="ui fluid search selection dropdown" id="comuna">',
|
'<div class="ui fluid search selection dropdown" id="comuna">',
|
||||||
'<input type="hidden" name="comuna" />',
|
'<input type="hidden" name="comuna" />',
|
||||||
'<i class="dropdown icon"></i>',
|
'<i class="dropdown icon"></i>',
|
||||||
'<div class="default text">Comuna</div>',
|
'<div class="default text">Comuna</div>',
|
||||||
'<div class="menu"></div>',
|
'<div class="menu"></div>',
|
||||||
'</div>',
|
'</div>',
|
||||||
'</div>',
|
'</div>',
|
||||||
'<div class="six wide field">',
|
'<div class="six wide field">',
|
||||||
'<div class="ui fluid search selection dropdown" id="region">',
|
'<div class="ui fluid search selection dropdown" id="region">',
|
||||||
'<input type="hidden" name="region" />',
|
'<input type="hidden" name="region" />',
|
||||||
'<i class="dropdown icon"></i>',
|
'<i class="dropdown icon"></i>',
|
||||||
'<div class="default text">Región</div>',
|
'<div class="default text">Región</div>',
|
||||||
'<div class="menu">',
|
'<div class="menu">',
|
||||||
...regiones,
|
...regiones,
|
||||||
'</div>',
|
'</div>',
|
||||||
'</div>',
|
'</div>',
|
||||||
|
'</div>',
|
||||||
'</div>',
|
'</div>',
|
||||||
|
'<label>Otros Datos</label>',
|
||||||
|
'<div class="inline fields">',
|
||||||
|
'<div class="four wide field">',
|
||||||
|
'<input type="email" name="email" placeholder="Email" />',
|
||||||
|
'</div>',
|
||||||
|
'<div class="field">',
|
||||||
|
'<input type="text" name="telefono" placeholder="Teléfono" />',
|
||||||
|
'</div>',
|
||||||
'</div>'
|
'</div>'
|
||||||
]
|
]
|
||||||
return lines.join("\n")
|
return lines.join("\n")
|
||||||
@ -466,8 +476,10 @@
|
|||||||
'</div>',
|
'</div>',
|
||||||
'</div>',
|
'</div>',
|
||||||
'<div>Representante Legal</div>',
|
'<div>Representante Legal</div>',
|
||||||
|
'<div class="ui divider"></div>',
|
||||||
|
this.persona.draw()
|
||||||
]
|
]
|
||||||
return [lines.join("\n"), this.persona.draw()].join("\n")
|
return lines.join("\n")
|
||||||
}
|
}
|
||||||
activate() {
|
activate() {
|
||||||
new RutHandler({id: '#rut_sociedad', alert_id: '#alert_rut_sociedad'})
|
new RutHandler({id: '#rut_sociedad', alert_id: '#alert_rut_sociedad'})
|
||||||
@ -485,6 +497,7 @@
|
|||||||
draw() {
|
draw() {
|
||||||
let lines = [
|
let lines = [
|
||||||
this.persona.draw(),
|
this.persona.draw(),
|
||||||
|
'<div class="ui divider"></div>',
|
||||||
'<label for="rut">RUT Otro</label>',
|
'<label for="rut">RUT Otro</label>',
|
||||||
'<div class="inline field">',
|
'<div class="inline field">',
|
||||||
'<input type="text" id="rut_otro" name="rut_otro" required />',
|
'<input type="text" id="rut_otro" name="rut_otro" required />',
|
||||||
@ -537,6 +550,15 @@
|
|||||||
'</div>',
|
'</div>',
|
||||||
'</div>',
|
'</div>',
|
||||||
'</div>',
|
'</div>',
|
||||||
|
'</div>',
|
||||||
|
'<label>Otros Datos para Otro</label>',
|
||||||
|
'<div class="inline fields">',
|
||||||
|
'<div class="four wide field">',
|
||||||
|
'<input type="email" name="email_otro" placeholder="Email" />',
|
||||||
|
'</div>',
|
||||||
|
'<div class="field">',
|
||||||
|
'<input type="text" name="telefono_otro" placeholder="Teléfono" />',
|
||||||
|
'</div>',
|
||||||
'</div>'
|
'</div>'
|
||||||
]
|
]
|
||||||
return lines.join("\n")
|
return lines.join("\n")
|
||||||
@ -606,6 +628,8 @@
|
|||||||
parent.find("[name='extra']").val(data.propietario.direccion.extra)
|
parent.find("[name='extra']").val(data.propietario.direccion.extra)
|
||||||
parent.find('#region').dropdown('set selected', data.propietario.direccion.comuna.provincia.region.id)
|
parent.find('#region').dropdown('set selected', data.propietario.direccion.comuna.provincia.region.id)
|
||||||
parent.find('#comuna').dropdown('set selected', data.propietario.direccion.comuna.id)
|
parent.find('#comuna').dropdown('set selected', data.propietario.direccion.comuna.id)
|
||||||
|
parent.find("[name='email']").val(data.propietario.email)
|
||||||
|
parent.find("[name='telefono']").val(data.propietario.telefono)
|
||||||
|
|
||||||
if (data.propietario.representante !== '') {
|
if (data.propietario.representante !== '') {
|
||||||
document.getElementById(this.ids.tipo).trigger('check')
|
document.getElementById(this.ids.tipo).trigger('check')
|
||||||
@ -784,7 +808,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$(document).ready(() => {
|
$(document).ready(() => {
|
||||||
$('#fecha_venta_calendar').calendar(calendar_date_options)
|
const cdo = structuredClone(calendar_date_options)
|
||||||
|
cdo['maxDate'] = new Date()
|
||||||
|
$('#fecha_venta_calendar').calendar(cdo)
|
||||||
new Propietario({id: '#propietario', id_tipo: 'persona_propietario', id_cantidad: 'cantidad_propietario'})
|
new Propietario({id: '#propietario', id_tipo: 'persona_propietario', id_cantidad: 'cantidad_propietario'})
|
||||||
new Proyecto({unidades_id: '#unidades', proyecto_id: '#proyecto'})
|
new Proyecto({unidades_id: '#unidades', proyecto_id: '#proyecto'})
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
@endpush
|
@endpush
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
class Cierre {
|
class Cierre {
|
||||||
id
|
id
|
||||||
proyecto_id
|
proyecto_id
|
||||||
|
@ -120,7 +120,7 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
function action(action, cierre_id) {
|
function action(action, cierre_id) {
|
||||||
const url = '{{$urls->base}}/api/cierre/' + cierre_id + '/' + action
|
const url = '{{$urls->base}}/api/cierre/' + cierre_id + '/' + action
|
||||||
console.debug(url)
|
console.debug(url)
|
||||||
|
@ -65,7 +65,7 @@
|
|||||||
@include('layout.body.scripts.datatables')
|
@include('layout.body.scripts.datatables')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
$(document).ready(() => {
|
$(document).ready(() => {
|
||||||
const cuotas_tables = new DataTable('#cuotas', {
|
const cuotas_tables = new DataTable('#cuotas', {
|
||||||
language: {
|
language: {
|
||||||
|
@ -66,7 +66,7 @@
|
|||||||
@include('layout.body.scripts.datatables')
|
@include('layout.body.scripts.datatables')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
$(document).ready(() => {
|
$(document).ready(() => {
|
||||||
const cuotas_tables = new DataTable('#cuotas', {
|
const cuotas_tables = new DataTable('#cuotas', {
|
||||||
language: {
|
language: {
|
||||||
|
@ -54,22 +54,23 @@
|
|||||||
}
|
}
|
||||||
$(document).ready(() => {
|
$(document).ready(() => {
|
||||||
const url = '{{$urls->api}}/ventas/pago/{{$venta->resciliacion()->id}}'
|
const url = '{{$urls->api}}/ventas/pago/{{$venta->resciliacion()->id}}'
|
||||||
let old = new Date({{$venta->resciliacion()?->fecha->format('Y') ?? date('Y')}},
|
let old = new Date(Date.parse('{{$venta->resciliacion()?->fecha->format('Y-m-d') ?? $venta->currentEstado()->fecha->format('Y-m-d') ?? $venta->fecha->format('Y-m-d')}}') + 24 * 60 * 60 * 1000)
|
||||||
{{$venta->resciliacion()?->fecha->format('n') ?? date('n')}}-1, {{$venta->resciliacion()?->fecha->format('j') ?? date('j')}})
|
|
||||||
calendar_date_options['initialDate'] = old
|
calendar_date_options['initialDate'] = old
|
||||||
calendar_date_options['onChange'] = function(date, text, mode) {
|
calendar_date_options['onChange'] = function(date, text, mode) {
|
||||||
if (date.getTime() === old.getTime()) {
|
if (date.getTime() === old.getTime()) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const body = new FormData()
|
const body = new FormData()
|
||||||
body.set('fecha', date.toISOString())
|
const fecha = new Date(date.getTime())
|
||||||
|
fecha.setDate(fecha.getDate() - 1)
|
||||||
|
body.set('fecha', fecha.toISOString())
|
||||||
$('#loading-spinner-fecha').show()
|
$('#loading-spinner-fecha').show()
|
||||||
APIClient.fetch(url, {method: 'post', body}).then(response => {
|
APIClient.fetch(url, {method: 'post', body}).then(response => {
|
||||||
$('#loading-spinner-fecha').hide()
|
$('#loading-spinner-fecha').hide()
|
||||||
if (!response) {
|
if (!response) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
old = date
|
old = new Date(date.getTime())
|
||||||
alertResponse('Fecha cambiada correctamente.')
|
alertResponse('Fecha cambiada correctamente.')
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -6,15 +6,26 @@
|
|||||||
|
|
||||||
@section('venta_content')
|
@section('venta_content')
|
||||||
<div class="ui list">
|
<div class="ui list">
|
||||||
<div class="item">
|
@if (isset($venta->formaPago()->pie))
|
||||||
<div class="header">Valor Pagado</div>
|
<div class="item">
|
||||||
<div class="content">
|
<div class="header">Valor Pagado</div>
|
||||||
{{$format->pesos($venta->formaPago()->pie->pagado('pesos'))}}
|
<div class="content">
|
||||||
<div class="ui left pointing small label">
|
{{$format->pesos($venta->formaPago()->pie->pagado('pesos'))}}
|
||||||
{{$format->number($venta->formaPago()->pie->pagado() / $venta->valor * 100)}}% de la venta
|
<div class="ui left pointing small label">
|
||||||
|
{{$format->number($venta->formaPago()->pie->pagado() / $venta->valor * 100)}}% de la venta
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
@else
|
||||||
|
<div class="item">
|
||||||
|
<div class="ui compact warning message">
|
||||||
|
<div class="content">
|
||||||
|
<i class="exclamation triangle icon"></i>
|
||||||
|
No tiene valor pagado
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
<div class="item">
|
<div class="item">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
Multa Estandar
|
Multa Estandar
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
const editVenta = {
|
const editVenta = {
|
||||||
getMonthsList() {
|
getMonthsList() {
|
||||||
const formatter = new Intl.DateTimeFormat('es-CL', {month: 'long'})
|
const formatter = new Intl.DateTimeFormat('es-CL', {month: 'long'})
|
||||||
|
@ -18,6 +18,8 @@
|
|||||||
</div>
|
</div>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
|
@include('layout.body.scripts.rut')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
@include('ventas.facturacion.show.factura')
|
@include('ventas.facturacion.show.factura')
|
||||||
@include('ventas.facturacion.show.propietario')
|
@include('ventas.facturacion.show.propietario')
|
||||||
|
@ -194,7 +194,8 @@
|
|||||||
},
|
},
|
||||||
unidad: ({unidad, no, classes, formatters}) => {
|
unidad: ({unidad, no, classes, formatters}) => {
|
||||||
const descuento = this.props.terreno.valor * unidad.prorrateo * this.props.proporcion
|
const descuento = this.props.terreno.valor * unidad.prorrateo * this.props.proporcion
|
||||||
const bruto = unidad.precio - descuento
|
const precio = unidad.precio * this.props.proporcion
|
||||||
|
const bruto = precio - descuento
|
||||||
const neto = bruto / 1.19
|
const neto = bruto / 1.19
|
||||||
const data = [
|
const data = [
|
||||||
no,
|
no,
|
||||||
@ -256,7 +257,7 @@
|
|||||||
tooltips.neto = ` data-tooltip="No coinciden netos! Promesa: ${formatters.pesos.format(this.props.detalle.neto)} - Unidades: ${formatters.pesos.format(this.props.total.neto)}"`
|
tooltips.neto = ` data-tooltip="No coinciden netos! Promesa: ${formatters.pesos.format(this.props.detalle.neto)} - Unidades: ${formatters.pesos.format(this.props.total.neto)}"`
|
||||||
}
|
}
|
||||||
if (this.props.total.iva !== this.props.detalle.iva) {
|
if (this.props.total.iva !== this.props.detalle.iva) {
|
||||||
tooltips.iva = ` data-tooltip="No coinciden ivas! Promesa: ${formatters.pesos.format(this.props.detalle.iva)} - Unidades: ${formatters.pesos.format(this.props.total.iva)}"`
|
tooltips.iva = ` data-tooltip="No coinciden IVAs! Promesa: ${formatters.pesos.format(this.props.detalle.iva)} - Unidades: ${formatters.pesos.format(this.props.total.iva)}"`
|
||||||
}
|
}
|
||||||
if (this.props.total.total !== this.props.detalle.total) {
|
if (this.props.total.total !== this.props.detalle.total) {
|
||||||
tooltips.total = ` data-tooltip="No coinciden totales! Promesa: ${formatters.pesos.format(this.props.detalle.total)} - Unidades: ${formatters.pesos.format(this.props.total.total)}"`
|
tooltips.total = ` data-tooltip="No coinciden totales! Promesa: ${formatters.pesos.format(this.props.detalle.total)} - Unidades: ${formatters.pesos.format(this.props.total.total)}"`
|
||||||
@ -399,7 +400,7 @@
|
|||||||
},
|
},
|
||||||
total: () => {
|
total: () => {
|
||||||
this.props.total.exento = this.props.detalle.terreno
|
this.props.total.exento = this.props.detalle.terreno
|
||||||
this.props.total.neto = (this.props.unidades.reduce((sum, unidad) => sum + unidad.precio, 0) - this.props.total.exento) / 1.19
|
this.props.total.neto = (this.props.unidades.reduce((sum, unidad) => sum + unidad.precio, 0) * this.props.proporcion - this.props.total.exento) / 1.19
|
||||||
this.props.total.iva = this.props.total.neto * 0.19
|
this.props.total.iva = this.props.total.neto * 0.19
|
||||||
this.props.total.total = this.props.total.neto + this.props.total.iva + this.props.total.exento
|
this.props.total.total = this.props.total.neto + this.props.total.iva + this.props.total.exento
|
||||||
},
|
},
|
||||||
|
@ -28,7 +28,11 @@
|
|||||||
facturas.draw().facturas()
|
facturas.draw().facturas()
|
||||||
},
|
},
|
||||||
rut: rut => {
|
rut: rut => {
|
||||||
this.props.rut = rut
|
rut = rut.replaceAll(/~\d|\.|-/g, '')
|
||||||
|
const digito = rut.slice(-1)
|
||||||
|
rut = rut.slice(0, -1)
|
||||||
|
this.props.rut = Rut.format(rut) + '-' + digito
|
||||||
|
document.getElementById('rut'+this.props.index).value = this.props.rut
|
||||||
facturas.venta.update().facturas()
|
facturas.venta.update().facturas()
|
||||||
facturas.draw().facturas()
|
facturas.draw().facturas()
|
||||||
},
|
},
|
||||||
@ -72,7 +76,7 @@
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
rut: () => {
|
rut: () => {
|
||||||
document.getElementById('rut'+this.props.index).addEventListener('input', inputEvent => {
|
document.getElementById('rut'+this.props.index).addEventListener('change', inputEvent => {
|
||||||
const rut = inputEvent.currentTarget.value
|
const rut = inputEvent.currentTarget.value
|
||||||
if (rut === this.props.rut) {
|
if (rut === this.props.rut) {
|
||||||
return
|
return
|
||||||
@ -81,7 +85,7 @@
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
nombre: () => {
|
nombre: () => {
|
||||||
document.getElementById('propietario'+this.props.index).addEventListener('input', inputEvent => {
|
document.getElementById('propietario'+this.props.index).addEventListener('change', inputEvent => {
|
||||||
const nombre = inputEvent.currentTarget.value
|
const nombre = inputEvent.currentTarget.value
|
||||||
if (nombre === this.props.nombre) {
|
if (nombre === this.props.nombre) {
|
||||||
return
|
return
|
||||||
@ -90,7 +94,7 @@
|
|||||||
})
|
})
|
||||||
},
|
},
|
||||||
direccion: () => {
|
direccion: () => {
|
||||||
document.getElementById('direccion_propietario'+this.props.index).addEventListener('input', inputEvent => {
|
document.getElementById('direccion_propietario'+this.props.index).addEventListener('change', inputEvent => {
|
||||||
const direccion = inputEvent.currentTarget.value
|
const direccion = inputEvent.currentTarget.value
|
||||||
if (direccion === this.props.direccion) {
|
if (direccion === this.props.direccion) {
|
||||||
return
|
return
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
const url = '{{$urls->api}}/ventas/unidad/' + this.props.id + '/prorrateo'
|
const url = '{{$urls->api}}/ventas/unidad/' + this.props.id + '/prorrateo'
|
||||||
const method = 'post'
|
const method = 'post'
|
||||||
const body = new FormData()
|
const body = new FormData()
|
||||||
body.set('prorrateo', newValue)
|
body.set('prorrateo', (parseFloat(newValue) / 100).toFixed(8))
|
||||||
return fetchAPI(url, {method, body}).then(response => {
|
return fetchAPI(url, {method, body}).then(response => {
|
||||||
if (!response) {
|
if (!response) {
|
||||||
return
|
return
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
@include('layout.body.scripts.datatables')
|
@include('layout.body.scripts.datatables')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
class Venta {
|
class Venta {
|
||||||
id
|
id
|
||||||
propiedad
|
propiedad
|
||||||
@ -52,8 +52,12 @@
|
|||||||
draw(formatter, dateFormatter) {
|
draw(formatter, dateFormatter) {
|
||||||
const tipo = this.estado.tipo_estado_venta.descripcion
|
const tipo = this.estado.tipo_estado_venta.descripcion
|
||||||
const date = new Date(this.fecha)
|
const date = new Date(this.fecha)
|
||||||
|
let unidad = this.propiedad.unidades[0]
|
||||||
|
if (this.propiedad.departamentos.length > 0) {
|
||||||
|
unidad = this.propiedad.departamentos[0]
|
||||||
|
}
|
||||||
return $('<tr></tr>').append(
|
return $('<tr></tr>').append(
|
||||||
$('<td></td>').attr('data-order', this.propiedad.departamentos[0].descripcion).append(
|
$('<td></td>').attr('data-order', unidad.descripcion).append(
|
||||||
$('<a></a>').attr('href', '{{$urls->base}}/venta/' + this.id).html(this.propiedad.summary)
|
$('<a></a>').attr('href', '{{$urls->base}}/venta/' + this.id).html(this.propiedad.summary)
|
||||||
)
|
)
|
||||||
).append(
|
).append(
|
||||||
@ -63,9 +67,9 @@
|
|||||||
).append(
|
).append(
|
||||||
$('<td></td>').html(formatter.format(this.valor) + ' UF')
|
$('<td></td>').html(formatter.format(this.valor) + ' UF')
|
||||||
).append(
|
).append(
|
||||||
$('<td></td>').html(this.propiedad.departamentos[0].proyecto_tipo_unidad.abreviacion + ' (' + formatter.format(this.propiedad.departamentos[0].proyecto_tipo_unidad.vendible) + ' m²)')
|
$('<td></td>').html(unidad.proyecto_tipo_unidad.abreviacion + ' (' + formatter.format(unidad.proyecto_tipo_unidad.vendible) + ' m²)')
|
||||||
).append(
|
).append(
|
||||||
$('<td></td>').html(formatter.format(this.valor / this.propiedad.departamentos[0].proyecto_tipo_unidad.vendible) + ' UF/m²')
|
$('<td></td>').html(formatter.format(this.valor / unidad.proyecto_tipo_unidad.vendible) + ' UF/m²')
|
||||||
).append(
|
).append(
|
||||||
$('<td></td>').attr('data-order', this.fecha).html(dateFormatter.format(date))
|
$('<td></td>').attr('data-order', this.fecha).html(dateFormatter.format(date))
|
||||||
).append(
|
).append(
|
||||||
@ -237,7 +241,12 @@
|
|||||||
|
|
||||||
const tbody = $('<tbody></tbody>')
|
const tbody = $('<tbody></tbody>')
|
||||||
this.data.ventas.forEach(venta => {
|
this.data.ventas.forEach(venta => {
|
||||||
tbody.append(venta.draw(this.formatters.number, this.formatters.date))
|
try {
|
||||||
|
tbody.append(venta.draw(this.formatters.number, this.formatters.date))
|
||||||
|
} catch (error) {
|
||||||
|
console.debug(venta)
|
||||||
|
console.error(error)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
table.append(this.draw().header()).append(tbody)
|
table.append(this.draw().header()).append(tbody)
|
||||||
table.show()
|
table.show()
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
@include('layout.body.scripts.datatables')
|
@include('layout.body.scripts.datatables')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
const historicos = {
|
const historicos = {
|
||||||
id: '',
|
id: '',
|
||||||
data: {
|
data: {
|
||||||
|
@ -33,6 +33,8 @@
|
|||||||
</form>
|
</form>
|
||||||
@endsection
|
@endsection
|
||||||
|
|
||||||
|
@include('layout.body.scripts.number_input')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(() => {
|
$(document).ready(() => {
|
||||||
@ -40,13 +42,17 @@
|
|||||||
fecha.calendar(calendar_date_options)
|
fecha.calendar(calendar_date_options)
|
||||||
fecha.calendar('set date', new Date({{$venta->formaPago()->bonoPie->pago->fecha->format('Y, m-1, j')}}))
|
fecha.calendar('set date', new Date({{$venta->formaPago()->bonoPie->pago->fecha->format('Y, m-1, j')}}))
|
||||||
|
|
||||||
|
const numberInput = new NumberInput({input: document.querySelector('input[name="valor"]'), isRational: true})
|
||||||
|
numberInput.watch()
|
||||||
|
|
||||||
$('#add_bono').submit(submitEvent => {
|
$('#add_bono').submit(submitEvent => {
|
||||||
submitEvent.preventDefault()
|
submitEvent.preventDefault()
|
||||||
const url = '{{$urls->api}}/venta/{{$venta->id}}/bono_pie/edit'
|
const url = '{{$urls->api}}/venta/{{$venta->id}}/bono_pie/edit'
|
||||||
const data = new FormData()
|
const method = 'post'
|
||||||
data.set('fecha', $('#fecha').calendar('get date').toISOString())
|
const body = new FormData()
|
||||||
data.set('valor', $('#valor').val())
|
body.set('fecha', $('#fecha').calendar('get date').toISOString())
|
||||||
return APIClient.fetch(url, {method: 'post', body: data}).then(response => {
|
body.set('valor', numberInput.currentValue)
|
||||||
|
return APIClient.fetch(url, {method, body}).then(response => {
|
||||||
if (response.ok) {
|
if (response.ok) {
|
||||||
return response.json()
|
return response.json()
|
||||||
}
|
}
|
||||||
|
@ -61,6 +61,9 @@
|
|||||||
<tbody>@php
|
<tbody>@php
|
||||||
$now = new DateTimeImmutable();
|
$now = new DateTimeImmutable();
|
||||||
$uf_venta = $venta->uf === 0.0 ? $UF->get($venta->currentEstado()->fecha) : $venta->uf;
|
$uf_venta = $venta->uf === 0.0 ? $UF->get($venta->currentEstado()->fecha) : $venta->uf;
|
||||||
|
if ($uf_venta === 0.0) {
|
||||||
|
$uf_venta = $UF->get();
|
||||||
|
}
|
||||||
@endphp
|
@endphp
|
||||||
@foreach ($venta->formaPago()->pie->cuotas() as $cuota)
|
@foreach ($venta->formaPago()->pie->cuotas() as $cuota)
|
||||||
<tr data-pago="{{$cuota->pago->id}}"
|
<tr data-pago="{{$cuota->pago->id}}"
|
||||||
@ -201,7 +204,7 @@
|
|||||||
@include('layout.body.scripts.datatables.buttons')
|
@include('layout.body.scripts.datatables.buttons')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
$(document).ready(() => {
|
$(document).ready(() => {
|
||||||
function updateRow({pago_id, valor, fecha, color, estado, remove_fecha=false, add_reject=false, disable=false}) {
|
function updateRow({pago_id, valor, fecha, color, estado, remove_fecha=false, add_reject=false, disable=false}) {
|
||||||
const tr = $("tr[data-pago='" + pago_id + "']")
|
const tr = $("tr[data-pago='" + pago_id + "']")
|
||||||
|
@ -86,7 +86,7 @@
|
|||||||
@include('layout.body.scripts.dayjs')
|
@include('layout.body.scripts.dayjs')
|
||||||
|
|
||||||
@push('page_scripts')
|
@push('page_scripts')
|
||||||
<script type="text/javascript">
|
<script>
|
||||||
function setDate(index, calendar, date = new Date()) {
|
function setDate(index, calendar, date = new Date()) {
|
||||||
const d = dayjs(date)
|
const d = dayjs(date)
|
||||||
$(calendar).calendar('set date', new Date(d.add(index, 'M').valueOf()))
|
$(calendar).calendar('set date', new Date(d.add(index, 'M').valueOf()))
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user