diff --git a/api/common/Service/TiposCambios.php b/api/common/Service/TiposCambios.php index 7319c30..4628652 100644 --- a/api/common/Service/TiposCambios.php +++ b/api/common/Service/TiposCambios.php @@ -69,6 +69,9 @@ class TiposCambios { return $cambio->valor; } $valor = $this->getValor($fecha, $moneda->codigo); + if ($valor === null) { + return 1; + } $data = [ 'fecha' => $fecha->format('Y-m-d H:i:s'), 'desde_id' => $moneda->id, diff --git a/api/nginx.conf b/api/nginx.conf index 069343f..c946d40 100644 --- a/api/nginx.conf +++ b/api/nginx.conf @@ -12,11 +12,12 @@ server { } location ~ \.php$ { + if ($request_method = 'OPTIONS') { - add_header 'Access-Control-Max-Age' 1728000; add_header 'Access-Control-Allow-Origin' '*'; add_header 'Access-Control-Allow-Headers' 'Authorization,Accept,Origin,DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range'; add_header 'Access-Control-Allow-Methods' 'GET,POST,OPTIONS,PUT,DELETE,PATCH'; + add_header 'Access-Control-Max-Age' 1728000; add_header 'Content-Type' 'application/json'; add_header 'Content-Length' 0; return 204; diff --git a/api/src/Cuenta.php b/api/src/Cuenta.php index 4caa29b..3709a84 100644 --- a/api/src/Cuenta.php +++ b/api/src/Cuenta.php @@ -56,6 +56,7 @@ class Cuenta extends Model { public function transacciones($limit = null, $start = 0) { if ($this->transacciones === null) { $transacciones = Model::factory(Transaccion::class) + ->select('transacciones.*') ->join('cuentas', 'cuentas.id = transacciones.debito_id OR cuentas.id = transacciones.credito_id') ->whereEqual('cuentas.id', $this->id) ->orderByAsc('transacciones.fecha');