Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
musica_listas_backend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Cristian Mauricio Diaz Canales
musica_listas_backend
Commits
09801433
Commit
09801433
authored
Dec 30, 2019
by
Cristian Mauricio Diaz Canales
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Mejora alerta pagina externa
parent
e701966b
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
200 additions
and
33 deletions
+200
-33
public/backend/css/style.css
public/backend/css/style.css
+46
-1
public/frontend/alert/alerta-icon.svg
public/frontend/alert/alerta-icon.svg
+44
-0
public/frontend/alert/payment-icon.svg
public/frontend/alert/payment-icon.svg
+22
-0
templates/external/confirm.html.twig
templates/external/confirm.html.twig
+27
-3
templates/external/pago.html.twig
templates/external/pago.html.twig
+26
-6
templates/external/process.html.twig
templates/external/process.html.twig
+35
-23
No files found.
public/backend/css/style.css
View file @
09801433
...
...
@@ -47,4 +47,49 @@ and open the template in the editor.
font-weight
:
300
;
color
:
whitesmoke
;
padding
:
10px
10px
10px
10px
;
}
\ No newline at end of file
}
/*alertas*/
header
.masthead-kushki
{
position
:
relative
;
overflow
:
hidden
;
padding-bottom
:
0
;
background
:
-webkit-gradient
(
linear
,
left
bottom
,
left
top
,
from
(
#ff6a00
),
to
(
#ee0979
));
background
:
white
;
}
/* Mensaje de alertas */
.alert-ok
{
font-family
:
'Roboto Condensed'
,
sans-serif
;
font-size
:
1.1em
;
border-radius
:
5px
;
padding
:
20px
;
overflow
:
hidden
;
box-shadow
:
0
3px
6px
rgba
(
0
,
0
,
0
,
0.16
),
0
3px
6px
rgba
(
0
,
0
,
0
,
0.23
);
/* background-color:#8dc081; /* Verde */
color
:
red
;
margin-bottom
:
15px
;
}
/* Botón cerrar */
.closebtn-ok
{
color
:
#333333
;
font-weight
:
bold
;
font-size
:
32px
;
line-height
:
20px
;
cursor
:
pointer
;
transition
:
0.3s
;
}
.closebtn-ok
:hover
{
color
:
#777777
;
}
.icon-one
{
color
:
red
;
font-weight
:
bold
;
font-size
:
22px
;
line-height
:
20px
;
cursor
:
pointer
;
transition
:
0.3s
;
}
.txt-alerta
{
color
:
#444444
;
}
public/frontend/alert/alerta-icon.svg
0 → 100644
View file @
09801433
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
version=
"1.1"
id=
"Layer_1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
x=
"0px"
y=
"0px"
viewBox=
"0 0 286.054 286.054"
style=
"enable-background:new 0 0 286.054 286.054;"
xml:space=
"preserve"
>
<g>
<path
style=
"fill:#E2574C;"
d=
"M143.027,0C64.04,0,0,64.04,0,143.027c0,78.996,64.04,143.027,143.027,143.027
c78.996,0,143.027-64.022,143.027-143.027C286.054,64.04,222.022,0,143.027,0z M143.027,259.236
c-64.183,0-116.209-52.026-116.209-116.209S78.844,26.818,143.027,26.818s116.209,52.026,116.209,116.209
S207.21,259.236,143.027,259.236z M143.036,62.726c-10.244,0-17.995,5.346-17.995,13.981v79.201c0,8.644,7.75,13.972,17.995,13.972
c9.994,0,17.995-5.551,17.995-13.972V76.707C161.03,68.277,153.03,62.726,143.036,62.726z M143.036,187.723
c-9.842,0-17.852,8.01-17.852,17.86c0,9.833,8.01,17.843,17.852,17.843s17.843-8.01,17.843-17.843
C160.878,195.732,152.878,187.723,143.036,187.723z"
/>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
public/frontend/alert/payment-icon.svg
0 → 100644
View file @
09801433
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 24.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
version=
"1.1"
id=
"Layer_1"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
x=
"0px"
y=
"0px"
viewBox=
"0 0 286.1 286.1"
style=
"enable-background:new 0 0 286.1 286.1;"
xml:space=
"preserve"
>
<style
type=
"text/css"
>
.st0{fill:none;stroke:#26BC53;stroke-width:15.6815;stroke-miterlimit:10;}
</style>
<g>
<path
class=
"st0"
d=
"M225.3,110.7V34.3c0-6.5-5.3-11.8-11.8-11.8h-194c-6.5,0-11.8,5.3-11.8,11.8v83.8v33.7
c0,6.5,5.3,11.8,11.8,11.8H49"
/>
<line
class=
"st0"
x1=
"225.3"
y1=
"51.9"
x2=
"7.9"
y2=
"51.9"
/>
<line
class=
"st0"
x1=
"225.3"
y1=
"87.2"
x2=
"7.9"
y2=
"87.2"
/>
<path
class=
"st0"
d=
"M72.5,122.5c-6.5,0-11.8,5.3-11.8,11.8v117.6c0,6.5,5.3,11.8,11.8,11.8h194c6.5,0,11.8-5.3,11.8-11.8V134.2
c0-6.5-5.3-11.8-11.8-11.8H72.5z"
/>
<line
class=
"st0"
x1=
"84.3"
y1=
"222.4"
x2=
"113.7"
y2=
"222.4"
/>
<line
class=
"st0"
x1=
"131.3"
y1=
"222.4"
x2=
"160.7"
y2=
"222.4"
/>
<line
class=
"st0"
x1=
"178.3"
y1=
"222.4"
x2=
"207.7"
y2=
"222.4"
/>
<line
class=
"st0"
x1=
"225.3"
y1=
"222.4"
x2=
"254.7"
y2=
"222.4"
/>
<path
class=
"st0"
d=
"M248.9,172.4c0,11.4-9.2,20.6-20.6,20.6h-5.9c-11.4,0-20.6-9.2-20.6-20.6l0,0c0-11.4,9.2-20.6,20.6-20.6h5.9
C239.6,151.9,248.9,161.1,248.9,172.4L248.9,172.4z"
/>
</g>
</svg>
templates/external/confirm.html.twig
View file @
09801433
...
...
@@ -17,16 +17,40 @@
<br>
<br>
{%
if
error
is
defined
and
error
==
1
%}
<div
align=
"center"
>
<div
class=
"alert alert-danger"
role=
"alert"
>
{{
message
}}
</div>
<!-- alertas -->
<div
class=
"alert"
>
<div
class=
"row"
>
<div
class=
"col-2"
>
<img
class=
"icon-one"
width=
"40"
src=
"
{{
asset
(
'frontend/alert/alerta-icon.svg'
)
}}
"
alt=
""
/>
</div>
<div
class=
"col-8"
>
<p
class=
"txt-alerta"
>
{{
message
}}
</p>
</div>
<div
class=
"col-1"
>
{#<span class="closebtn-ok" onclick="this.parentElement.parentElement.style.display = 'none';">×</span>#}
</div>
</div>
</div>
<br>
{%
endif
%}
{%
if
message
is
defined
and
error
==
0
%}
<br>
<br>
<div
class=
"alert-ok"
>
<div
class=
"row"
>
<div
class=
"col-2"
>
<img
class=
"icon-one"
width=
"40"
src=
"
{{
asset
(
'frontend/alert/payment-icon.svg'
)
}}
"
alt=
""
/>
</div>
<div
class=
"col-8"
>
<p
class=
"txt-alerta"
>
La suscripción se ha realizado con exito!
</p>
</div>
<div
class=
"col-1"
>
{#<span class="closebtn-ok" onclick="this.parentElement.parentElement.style.display = 'none';">×</span>#}
</div>
</div>
</div>
<div
align=
"center"
>
<div
class=
"alert alert-success"
role=
"alert"
>
La suscripción se ha realizado con exito!
</div>
<button
type=
"submit"
class=
"btn btn-codigo-suscripcion col-11 mt-4 mb-5"
>
Ir a U-Music ahora
</button>
</div>
{%
endif
%}
...
...
templates/external/pago.html.twig
View file @
09801433
...
...
@@ -12,11 +12,19 @@
</p>
</div>
{%
if
error
==
0
%}
<div
class=
"col-12"
>
<div
align=
"center"
>
<div
class=
"alert alert-info"
role=
"info"
>
Debe utilizar el método de pago que se encuentra en la parte inferior, para poder completar la suscripción.
</div>
<div
class=
"alert-ok"
>
<div
class=
"row"
>
<div
class=
"col-2"
>
<img
class=
"icon-one"
width=
"40"
src=
"
{{
asset
(
'frontend/alert/payment-icon.svg'
)
}}
"
alt=
""
/>
</div>
<div
class=
"col-8"
>
<p
class=
"txt-alerta"
>
Debe utilizar el método de pago que se encuentra en la parte inferior, para poder completar la suscripción.
</p>
</div>
<div
class=
"col-1"
>
{#<span class="closebtn-ok" onclick="this.parentElement.parentElement.style.display = 'none';">×</span>#}
</div>
</div>
</div>
</div>
<div
class=
"col-12"
>
<form
id=
"kushki-pay-form"
action=
"confirm"
method=
"post"
>
<input
type=
"hidden"
name=
"userIdentifier"
value=
"
{{
msisdn
}}
"
>
...
...
@@ -29,9 +37,21 @@
</div>
{%
else
%}
<div
class=
"col-12"
>
<div
align=
"center"
>
<div
class=
"alert alert-success"
role=
"alert"
>
{{
message
}}
</div>
<!-- alertas -->
<div
class=
"alert"
>
<div
class=
"row"
>
<div
class=
"col-2"
>
<img
class=
"icon-one"
width=
"40"
src=
"
{{
asset
(
'frontend/alert/alerta-icon.svg'
)
}}
"
alt=
""
/>
</div>
<div
class=
"col-8"
>
<p
class=
"txt-alerta"
>
{{
message
}}
</p>
</div>
<div
class=
"col-1"
>
{#<span class="closebtn-ok" onclick="this.parentElement.parentElement.style.display = 'none';">×</span>#}
</div>
</div>
</div>
<br>
</div>
{%
endif
%}
</div>
...
...
templates/external/process.html.twig
View file @
09801433
...
...
@@ -4,28 +4,40 @@
<header
class=
"masthead-sc text-white"
>
<div
class=
"masthead-content"
>
<div
class=
"container subheader-info col-10 offset-1 mt-4 mb-3"
>
<div
class=
"row"
>
<div
class=
"col-12"
>
<p
class=
"numero-top text-left"
>
{{
lista.getLisNombre
()
}}
</p>
</div>
<div
class=
"col-12"
>
<div
align=
"center"
>
<div
class=
"alert alert-info"
role=
"alert"
>
Procesando metodo de pago para la lista
{{
lista.getLisNombre
()
}}
para el teléfono
{{
msisdn
}}
</div>
<div
class=
"container subheader-info col-10 offset-1 mt-4 mb-3"
>
<div
class=
"row"
>
<div
class=
"col-12"
>
<p
class=
"numero-top text-left"
>
{{
lista.getLisNombre
()
}}
</p>
</div>
<div
class=
"col-xs-12"
>
<!-- alertas -->
<div
class=
"alert-ok"
>
<div
class=
"row"
>
<div
class=
"col-2"
>
<img
class=
"icon-one"
width=
"40"
src=
"
{{
asset
(
'frontend/alert/payment-icon.svg'
)
}}
"
alt=
""
/>
</div>
<div
class=
"col-8"
>
<p
class=
"txt-alerta"
>
Entrando a pago de suscripción
{{
lista.getLisNombre
()
}}
</p>
</div>
<div
class=
"col-1"
>
{#<span class="closebtn-ok" onclick="this.parentElement.parentElement.style.display = 'none';">×</span>#}
</div>
</div>
</div>
<div
class=
"col-12"
>
<form
id=
"kushki-pre-pay-form"
action=
"
{{
path
(
'app_link_registracion_externo'
)
}}
"
action=
"confirm"
method=
"post"
>
<input
type=
"hidden"
name=
"userIdentifier"
value=
"
{{
msisdn
}}
"
>
<input
type=
"hidden"
name=
"idRegistro"
value=
"
{{
idRegistro
}}
"
>
<input
type=
"hidden"
name=
"productId"
value=
"
{{
productId
}}
"
>
<input
type=
"hidden"
name=
"susId"
value=
"
{{
susId
}}
"
>
</form>
</div>
<br>
</div>
<div
class=
"col-12"
>
<form
id=
"kushki-pre-pay-form"
action=
"
{{
path
(
'app_link_registracion_externo'
)
}}
"
action=
"confirm"
method=
"post"
>
<input
type=
"hidden"
name=
"userIdentifier"
value=
"
{{
msisdn
}}
"
>
<input
type=
"hidden"
name=
"idRegistro"
value=
"
{{
idRegistro
}}
"
>
<input
type=
"hidden"
name=
"productId"
value=
"
{{
productId
}}
"
>
<input
type=
"hidden"
name=
"susId"
value=
"
{{
susId
}}
"
>
</form>
</div>
</div>
</div>
<div
class=
"container"
>
<div
class=
"row"
>
<div
class=
"col-11"
>
...
...
@@ -41,9 +53,9 @@
{%
endblock
%}
{%
block
javascripts
%}
<script>
window
.
onload
=
function
()
{
document
.
forms
[
'
kushki-pre-pay-form
'
].
submit
();
}
</script>
<script>
window
.
onload
=
function
()
{
document
.
forms
[
'
kushki-pre-pay-form
'
].
submit
();
}
</script>
{%
endblock
%}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment