Skip to content

GitLab

M
musica_listas_umusic
Commit af0b0205 authored by Ana's avatar Ana
Browse files
Options

cambios

parent 63f30cee
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1028 additions and 42 deletions
config/routes.yaml
View file @ af0b0205
###FRONTEND###
front_index:
path: /
controller: App\FrontendBundle\Controller\IndexController::presentacion
controller: App\FrontendBundle\Controller\IndexController::solicitarNumero
methods: [GET,POST]
front_validar_msisdn:
path: app/musica/validar/msisdn
......
public/frontend/css/style.css 0 → 100644
View file @ af0b0205
This diff is collapsed.
public/frontend/img/umusic-logo.svg 0 → 100644
View file @ af0b0205
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 23.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" baseProfile="tiny" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
x="0px" y="0px" viewBox="0 0 100 100" xml:space="preserve">
<g>
<g>
<path fill="#099DCA" d="M17.14,62.21L17.14,62.21c-1.04,0-1.89-0.85-1.89-1.89V10.2c0-1.04,0.85-1.89,1.89-1.89h0
c1.04,0,1.89,0.85,1.89,1.89v50.12C19.03,61.36,18.18,62.21,17.14,62.21z"/>
<path fill="#099DCA" d="M27.26,62.21L27.26,62.21c-1.04,0-1.89-0.85-1.89-1.89V10.2c0-1.04,0.85-1.89,1.89-1.89h0
c1.04,0,1.89,0.85,1.89,1.89v50.12C29.15,61.36,28.3,62.21,27.26,62.21z"/>
<path fill="#099DCA" d="M37.38,42.93L37.38,42.93c-1.04,0-1.89-0.85-1.89-1.89V17.98c0-1.04,0.85-1.89,1.89-1.89h0
c1.04,0,1.89,0.85,1.89,1.89v23.06C39.27,42.08,38.42,42.93,37.38,42.93z"/>
<path fill="#099DCA" d="M47.51,38.75L47.51,38.75c-1.04,0-1.89-0.85-1.89-1.89v-14.7c0-1.04,0.85-1.89,1.89-1.89h0
c1.04,0,1.89,0.85,1.89,1.89v14.7C49.39,37.9,48.54,38.75,47.51,38.75z"/>
<path fill="#099DCA" d="M57.63,38.75L57.63,38.75c-1.04,0-1.89-0.85-1.89-1.89v-14.7c0-1.04,0.85-1.89,1.89-1.89h0
c1.04,0,1.89,0.85,1.89,1.89v14.7C59.52,37.9,58.67,38.75,57.63,38.75z"/>
<path fill="#099DCA" d="M67.75,42.93L67.75,42.93c-1.04,0-1.89-0.85-1.89-1.89V17.98c0-1.04,0.85-1.89,1.89-1.89h0
c1.04,0,1.89,0.85,1.89,1.89v23.06C69.64,42.08,68.79,42.93,67.75,42.93z"/>
<path fill="#099DCA" d="M77.87,62.21L77.87,62.21c-1.04,0-1.89-0.85-1.89-1.89V10.2c0-1.04,0.85-1.89,1.89-1.89l0,0
c1.04,0,1.89,0.85,1.89,1.89v50.12C79.76,61.36,78.91,62.21,77.87,62.21z"/>
<path fill="#099DCA" d="M88,62.21L88,62.21c-1.04,0-1.89-0.85-1.89-1.89V10.2c0-1.04,0.85-1.89,1.89-1.89h0
c1.04,0,1.89,0.85,1.89,1.89v50.12C89.88,61.36,89.03,62.21,88,62.21z"/>
</g>
<g>
<path fill="#099DCA" d="M5.06,74.03v13.45c0,1.27,0.59,1.69,1.52,1.69c0.94,0,1.53-0.42,1.53-1.69V74.03h2.78V87.3
c0,2.82-1.5,4.38-4.39,4.38c-2.89,0-4.39-1.57-4.39-4.38V74.03H5.06z"/>
<path fill="#099DCA" d="M33.98,86.41l2.01-12.38h4.09v17.44h-2.78V78.96l-2.03,12.51h-2.78l-2.19-12.33v12.33h-2.57V74.03h4.09
L33.98,86.41z"/>
<path fill="#099DCA" d="M50.37,74.03v13.45c0,1.27,0.59,1.69,1.52,1.69c0.94,0,1.53-0.42,1.53-1.69V74.03h2.78V87.3
c0,2.82-1.5,4.38-4.39,4.38c-2.89,0-4.39-1.57-4.39-4.38V74.03H50.37z"/>
<path fill="#099DCA" d="M67.52,73.83c2.89,0,4.33,1.57,4.33,4.39v0.55h-2.78v-0.72c0-1.27-0.54-1.72-1.47-1.72
s-1.47,0.45-1.47,1.72c0,1.2,0.64,2.07,1.5,2.87c0.43,0.42,0.88,0.82,1.39,1.22c0.96,0.82,1.87,1.77,2.43,2.99
c0.29,0.62,0.43,1.35,0.43,2.17c0,2.82-1.5,4.38-4.39,4.38c-2.89,0-4.39-1.57-4.39-4.38v-1.07h2.78v1.25
c0,1.27,0.59,1.69,1.53,1.69c0.94,0,1.52-0.42,1.52-1.69c0-1.2-0.64-2.07-1.5-2.89c-0.43-0.4-0.88-0.8-1.36-1.22
c-0.99-0.8-1.9-1.74-2.46-2.96c-0.29-0.62-0.43-1.35-0.43-2.17C63.19,75.4,64.63,73.83,67.52,73.83z"/>
<path fill="#099DCA" d="M78.92,74.03h2.94v17.44h-2.94V74.03z"/>
<path fill="#099DCA" d="M97.88,84.96v2.32c0,2.82-1.5,4.38-4.39,4.38c-2.89,0-4.39-1.57-4.39-4.38v-9.07
c0-2.82,1.5-4.39,4.39-4.39c2.89,0,4.39,1.57,4.39,4.39v1.69H95.1v-1.87c0-1.27-0.59-1.72-1.52-1.72c-0.94,0-1.53,0.45-1.53,1.72
v9.42c0,1.27,0.59,1.69,1.53,1.69c0.94,0,1.52-0.42,1.52-1.69v-2.49H97.88z"/>
</g>
</g>
</svg>
src/FrontendBundle/Controller/IndexController.php
View file @ af0b0205
......@@ -19,11 +19,20 @@ use App\Entity\PluAccesosUsuarioMovil;
class IndexController extends AbstractController {
public function solicitarNumero (Request $request){
return $this->render('frontend/paginas/ingresar_numero.html.twig');
}
public function fake (Request $request) : Response{
$log = Utiles::setLog('App\FrontendBundle\Controller::IndexController::fake', 'app/frontend/fake');
$msisdn = $request->get("msisdn");
$session = $this->get("session");
//$session->clear();//prueba
$session->clear();
$msisdn = "974867425";
$session->set('msisdn', $msisdn);
// $session->set("msisdn", $msisdn);
if($session){
$log->debug("obteniendo msisdn de la sesion...");
$session->set("msisdn", $msisdn);
......@@ -89,6 +98,7 @@ class IndexController extends AbstractController {
'url_retorno' => "$host/app/musica" //el msisdn se le agrega al final de la url como get, en el otro servidor(ej: ?msisdn=999999)
));
$statusCode = 302;
//$url="localhost";
return new RedirectResponse($url, $statusCode);
}
......@@ -193,7 +203,6 @@ class IndexController extends AbstractController {
$msisdnEntrante = $request->get("msisdn");
$log->debug("entrando...HOST : $host |IP : $ip |MSISDN ENTRANTE: $msisdnEntrante| MSISDN SESION : $msisdnSesion");
if ($msisdnEntrante != $msisdnSesion || !Utiles::isMsisdn($msisdnEntrante)) {
$log->debug("el msisdn entrante no cumple con el formato o es distinto al obtenido de la sesion...");
$url = $this->generateUrl('front_index', array('msisdn' => $msisdnSesion, 'm' => 0));
......@@ -271,9 +280,12 @@ class IndexController extends AbstractController {
if (!Utiles::formatMsisdnSpecial($msisdn)) {
$log->debug("Numero Invalido $msisdn...");
$json->setStatusCode(JsonResponse::HTTP_BAD_REQUEST, 'Numero Inválido.');
$json->setData(array('errors' => 'El número ingresado no es válido.'));
return $json;
//$json->setStatusCode(JsonResponse::HTTP_BAD_REQUEST, 'Numero Inválido.');
//$json->setData(array('errors' => 'El número ingresado no es válido.'));
$error = "El número ingresado no es válido";
return $this->render('frontend/paginas/ingresar_numero.html.twig', ["error"=>$error]);
//return $json;
}
$codigoPin = new PluCodigoPin();
......@@ -288,9 +300,11 @@ class IndexController extends AbstractController {
if ($codigoPin->getCpiEstado() == PluCodigoPin::ESTADO_ENVIADO_OK) {
$log->debug('Hemos enviado un sms con el c&oacute;digo de validaci&oacute;n');
$json->setStatusCode(JsonResponse::HTTP_OK, 'Hemos enviado un sms con el c&oacute;digo de validaci&oacute;n');
$json->setData(array('msg' => 'Hemos enviado un sms con el c&oacute;digo de validaci&oacute;n'));
return $json;
// $json->setStatusCode(JsonResponse::HTTP_OK, 'Hemos enviado un sms con el c&oacute;digo de validaci&oacute;n');
//$json->setData(array('msg' => 'Hemos enviado un sms con el c&oacute;digo de validaci&oacute;n'));
$msj = "Hemos enviado un sms con el c&oacute;digo de validaci&oacute;n";
return $this->render('frontend/paginas/validar_pin.html.twig', ["msj"=>$msj, "msisdn"=>$msisdn]);
//return $json;
} else {
$log->debug('Ocurrio un problema al intentar enviar el sms, intenta de nuevo m&aacute;s tarde por favor.');
$json->setStatusCode(JsonResponse::HTTP_BAD_REQUEST, 'Ocurrio un problema al intentar enviar el sms, intenta de nuevo m&aacute;s tarde por favor.');
......@@ -310,19 +324,24 @@ class IndexController extends AbstractController {
if (!Utiles::isMsisdn($msisdn)) {
$log->debug("Numero $msisdn invalido...");
$json->setStatusCode(JsonResponse::HTTP_BAD_REQUEST, 'Estimado cliente, en estos momentos no podemos atenderlo.');
$json->setData(array('errors' => "Numero $msisdn invalido."));
return $json;
// $json->setStatusCode(JsonResponse::HTTP_BAD_REQUEST, 'Estimado cliente, en estos momentos no podemos atenderlo.');
// $json->setData(array('errors' => "Numero $msisdn invalido."));
//return $json;
$error = "Numero $msisdn inválido.";
return $this->render('frontend/paginas/validar_pin.html.twig', ["error"=>$error, "msisdn"=>$msisdn]);
}
if (!$pin || !is_numeric($pin)) {
$log->debug("PIN $pin invalido...");
$json->setStatusCode(JsonResponse::HTTP_BAD_REQUEST, 'Estimado cliente, el c&oacute;digo es inv&aacute;lido.');
$json->setData(array('errors' => 'Codigo pin invalido.'));
return $json;
//$json->setStatusCode(JsonResponse::HTTP_BAD_REQUEST, 'Estimado cliente, el c&oacute;digo es inv&aacute;lido.');
//$json->setData(array('errors' => 'Codigo pin invalido.'));
//return $json;
$error='Codigo pin invalido.';
return $this->render('frontend/paginas/validar_pin.html.twig', ["error"=>$error, "msisdn"=>$msisdn]);
}
$codigoPin = $em->getRepository(PluCodigoPin::class)->getPin($pin, $msisdn);
$codigoPin = $em->getRepository(PluCodigoPin::class)->getPin($pin, $msisdn);
if ($codigoPin) {
$codigoPin->setCpiEstado(PluCodigoPin::ESTADO_VALIDADO);
......@@ -336,9 +355,11 @@ class IndexController extends AbstractController {
return $json;
} else {
$log->debug('Estimado cliente, el c&oacute;digo es inv&aacute;lido.');
$json->setStatusCode(JsonResponse::HTTP_NOT_ACCEPTABLE, 'Estimado cliente, el c&oacute;digo es inv&aacute;lido.');
$json->setData(array('errors' => 'Estimado cliente, el c&oacute;digo es inv&aacute;lido.'));
return $json;
// $json->setStatusCode(JsonResponse::HTTP_NOT_ACCEPTABLE, 'Estimado cliente, el c&oacute;digo es inv&aacute;lido.');
// $json->setData(array('errors' => 'Estimado cliente, el c&oacute;digo es inv&aacute;lido.'));
// return $json;
$error='Estimado cliente, el código es inválido.';
return $this->render('frontend/paginas/validar_pin.html.twig', ["error"=>$error, "msisdn"=>$msisdn]);
}
}
......
src/FrontendBundle/Repository/PluCodigoPinRepository.php
View file @ af0b0205
......@@ -34,7 +34,13 @@ class PluCodigoPinRepository extends ServiceEntityRepository {
->andWhere('p.cpiEliminado = :eliminado')
->setParameters($parameters);
$query = $qb->getQuery();
return $query->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT)[0];
if (isset($query->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT)[0]))
return $query->getResult(\Doctrine\ORM\Query::HYDRATE_OBJECT)[0];
else
return null;
}
// /**
......
templates/frontend/base.html.twig
View file @ af0b0205
......@@ -20,6 +20,8 @@
<!-- Custom styles for this template -->
<link href="{{asset('frontend/css/one-page-wonder.min.css')}}" rel="stylesheet">
<link href="{{asset('frontend/css/style.css')}}" rel="stylesheet">
{% block stylesheets %}{% endblock %}
</head>
......@@ -30,7 +32,7 @@
<!-- Footer -->
<footer class="py-5 bg-black">
<div class="container">
<p class="m-0 text-center text-white small">Copyright &copy; Gearlabs {{ "now"|date('Y') }}</p>
<p class="m-0 text-center text-white small">Copyright &copy; Universal Music Entertaiment Todos los derechos reservados Gearlabs {{ "now"|date('Y') }}</p>
</div>
<!-- /.container -->
</footer>
......
templates/frontend/includes/navbar.html.twig
View file @ af0b0205
<!-- Navigation -->
<nav class="navbar navbar-expand-lg navbar-dark navbar-custom fixed-top">
<div class="container">
<a class="navbar-brand" href="#">
<span>Bienvenido {{ app.session.get('msisdn') }}! <i class="fas fa-music"></i></span>
</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarResponsive">
<ul class="navbar-nav ml-auto">
{#falta agregar ir a inicio#}
<li class="nav-item">
<a class="nav-link" href="{{path('front_index', {msisdn: app.session.get('msisdn'), m: 0})}}">Inicio</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{path('front_mi_cuenta', {msisdn: app.session.get('msisdn')})}}">Mi cuenta</a>
</li>
</ul>
<nav class="navbar navbar-expand-lg navbar-dark navbar-custom justify-content-between">
<div class="container-fluid">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".dual-nav" onclick="openNav()">
<span class="navbar-toggler-icon"></span>
</button>
<!-- <div class="navbar-collapse collapse dual-nav w-50 order-1 order-md-0">
<ul class="navbar-nav">
<li class="nav-item active">
<a class="nav-link pl-0" href="#">Home <span class="sr-only">Home</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Link</a>
</li>
</ul>
</div> -->
<a href="{{path('front_index')}}" class="navbar-brand mx-auto d-block text-center order-0 order-md-1 w-25"><img src="{{asset('frontend/img/umusic-logo.svg')}}" height="110" class="img-fluid"/></a>
</div>
</div>
</nav>
\ No newline at end of file
</nav>
templates/frontend/paginas/ingresar_numero.html.twig 0 → 100644
View file @ af0b0205
{% extends 'frontend/base.html.twig' %}
{% block stylesheets %}
<link href="{{asset('frontend/style.css')}}" rel="stylesheet">
{% endblock %}
{% block body %}
<header class="masthead-ingreso text-center text-white">
<div class="ingresa-numero-container container mt-4 mb-4">
{% if error is defined %}
<font color="red"> {{ error }} </font>
{% endif %}
<p>Ingresa tu número de teléfono</p>
<form action="{{ path('front_validar_msisdn') }}" method="post" }}>
<div class="form-row align-items-center">
<div class="col-2">
<label for="staticEmail2" class="sr-only"><p>+56</p></label>
<input type="text" readonly class="codigo-ciudad form-control-plaintext" id="staticEmail2" value="+56">
</div>
<div class="col-7">
<label class="sr-only" for="inlineFormInputGroup">Ingrésalo aquí</label>
<div class="input-group mb-2">
<input type="text" id="msisdn" name="msisdn" class="form-control campo-numero txt-campo-ingreso" id="inlineFormInputGroup" placeholder="Ingresalo aquí">
</div>
</div>
<div class="col-3">
<button type="submit" class="btn btn-codigo-suscripcion mb-2">Siguiente</button>
</div>
</div>
</form>
</div>
<!-- header con mensaje -->
<div class="container subheader-info">
<div class="row">
<div class="col-4">
<p class="txt-top">
Entra a alguna de las categorías y suscríbete
</p>
</div>
<div class="col-4">
<p class="numero-top">
$500
</p>
</div>
<div class="col-4">
<p class="txt-top">
descarga una canción a la semana
</p>
</div>
</div>
</div>
<!-- cierre con mensaje -->
</header>
<!-- Bootstrap core JavaScript -->
<script src="vendor/jquery/jquery.min.js"></script>
<script src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
<!-- nuevo codigo menu navegacion -->
<script>
function openNav() {
document.getElementById("myNav").style.height = "100%";
}
function closeNav() {
document.getElementById("myNav").style.height = "0%";
}
</script>
<!-- código para filas clickeables -->
<script>
$('*[data-href]').on("click",function(){
window.location = $(this).data('href');
return false;
});
$("td > a").on("click",function(e){
e.stopPropagation();
});
</script>
{% endblock %}
\ No newline at end of file
templates/frontend/paginas/validar_pin.html.twig 0 → 100644
View file @ af0b0205
{% extends 'frontend/base.html.twig' %}
{% block stylesheets %}
<link href="{{asset('frontend/style.css')}}" rel="stylesheet">
{% endblock %}
{% block body %}
<header class="masthead-ingreso text-center text-white">
<div class="ingresa-numero-container container mt-4 mb-4">
{% if msj is defined %}
<p> {{ msj }} </p>
{% endif %}
{% if error is defined %}
<font color="red"> {{ error }} </font>
{% endif %}
<form action="{{ path('front_validar_pin') }}" method="post" }}>
<div class="form-row align-items-center">
<div class="col-2">
<label for="staticEmail2" class="sr-only"><p>+56</p></label>
<input type="text" readonly class="codigo-ciudad form-control-plaintext" id="staticEmail2" value="+56">
</div>
<div class="col-7">
<label class="sr-only" for="inlineFormInputGroup">Ingrésalo aquí</label>
<div class="input-group mb-2">
<input type="hidden" id="msisdn" name="msisdn" value={{ msisdn }}>
<input id="pin" name="pin" type="text" class="form-control campo-numero txt-campo-ingreso" id="inlineFormInputGroup" placeholder="Ingresalo aquí">
</div>
</div>
<div class="col-3">
<button type="submit" class="btn btn-codigo-suscripcion mb-2">Siguiente</button>
</div>
</div>
</form>
</div>
<!-- header con mensaje -->
<div class="container subheader-info">
<div class="row">
<div class="col-4">
<p class="txt-top">
Entra a alguna de las categorías y suscríbete
</p>
</div>
<div class="col-4">
<p class="numero-top">
$500
</p>
</div>
<div class="col-4">
<p class="txt-top">
descarga una canción a la semana
</p>
</div>
</div>
</div>
<!-- cierre con mensaje -->
</header>
{% endblock %}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment