Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smsManager
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
smsManager
Commits
429891f5
Commit
429891f5
authored
May 31, 2019
by
Cristian Mauricio Diaz Canales
💬
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avance implementacion correo, falta hacer script para normalizar
encriptacion del usuario
parent
5bc01160
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
275 additions
and
98 deletions
+275
-98
app/Resources/views/backend/research/busqueda.html.twig
app/Resources/views/backend/research/busqueda.html.twig
+33
-3
src/AppBundle/Model/EnvioEmail.php
src/AppBundle/Model/EnvioEmail.php
+104
-1
src/BackendBundle/Controller/ResearchController.php
src/BackendBundle/Controller/ResearchController.php
+138
-94
No files found.
app/Resources/views/backend/research/busqueda.html.twig
View file @
429891f5
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
<select
class=
"form-control"
id=
"opciones"
name=
"opciones"
>
<select
class=
"form-control"
id=
"opciones"
name=
"opciones"
>
<option
value=
"tel"
>
Teléfono
</option>
<option
value=
"tel"
>
Teléfono
</option>
<option
value=
"mail"
>
Correo
</option>
<option
value=
"mail"
>
Correo
</option>
<option
value=
"rut"
>
Rut
</option>
<option
value=
"any"
>
ANY
</option>
</select>
</select>
<form
id=
"fmBuscar"
class=
"form-inline"
action=
"/"
method=
"POST"
>
<form
id=
"fmBuscar"
class=
"form-inline"
action=
"/"
method=
"POST"
>
<input
type=
"hidden"
id=
"selectedOption"
name=
"selectedOption"
value=
"tel"
>
<input
type=
"hidden"
id=
"selectedOption"
name=
"selectedOption"
value=
"tel"
>
...
@@ -37,6 +39,16 @@
...
@@ -37,6 +39,16 @@
<input
type=
"text"
id=
"mail"
name=
"mail"
class=
"form-control"
placeholder=
"abc@mail.cl"
maxlength=
"255"
value=
""
>
<input
type=
"text"
id=
"mail"
name=
"mail"
class=
"form-control"
placeholder=
"abc@mail.cl"
maxlength=
"255"
value=
""
>
</div>
</div>
</div>
</div>
<div
id=
"busquedaRut"
style=
"display:none"
>
<div
class=
"input-group"
>
<input
type=
"text"
id=
"rut"
name=
"rut"
title=
"sin puntos"
class=
"form-control"
placeholder=
"ej: 17356704-9"
maxlength=
"10"
value=
""
>
</div>
</div>
<div
id=
"busquedaAny"
style=
"display:none"
>
<div
class=
"input-group"
>
<input
type=
"text"
id=
"any"
name=
"any"
title=
""
class=
"form-control"
placeholder=
"ingrese el numero identificador"
maxlength=
""
value=
""
>
</div>
</div>
<button
id=
"searchButton"
name=
"searchButton"
type=
"button"
class=
"btn btn-primary"
onclick=
"buscar(event)"
data-loading-text=
"<i class='fa fa-circle-o-notch fa-spin'></i> Cargando resultados..."
><i
class=
"fa fa-search"
></i>
Buscar
</button>
<button
id=
"searchButton"
name=
"searchButton"
type=
"button"
class=
"btn btn-primary"
onclick=
"buscar(event)"
data-loading-text=
"<i class='fa fa-circle-o-notch fa-spin'></i> Cargando resultados..."
><i
class=
"fa fa-search"
></i>
Buscar
</button>
</form>
</form>
</div>
</div>
...
@@ -73,6 +85,10 @@
...
@@ -73,6 +85,10 @@
formData
.
append
(
"
valorBusqueda
"
,
$
(
"
#msisdn
"
).
val
());
formData
.
append
(
"
valorBusqueda
"
,
$
(
"
#msisdn
"
).
val
());
}
else
if
(
option
===
"
mail
"
){
}
else
if
(
option
===
"
mail
"
){
formData
.
append
(
"
valorBusqueda
"
,
$
(
"
#mail
"
).
val
());
formData
.
append
(
"
valorBusqueda
"
,
$
(
"
#mail
"
).
val
());
}
else
if
(
option
===
"
rut
"
){
formData
.
append
(
"
valorBusqueda
"
,
$
(
"
#rut
"
).
val
());
}
else
if
(
option
===
"
any
"
){
formData
.
append
(
"
valorBusqueda
"
,
$
(
"
#any
"
).
val
());
}
}
$
(
"
#searchButton
"
).
prop
(
"
disabled
"
,
true
);
$
(
"
#searchButton
"
).
prop
(
"
disabled
"
,
true
);
...
@@ -201,7 +217,7 @@
...
@@ -201,7 +217,7 @@
},
},
});
});
}
else
if
(
tipoSeteado
==
"
sms
"
){
}
else
if
(
tipoSeteado
==
"
sms
"
){
//TODO
}
else
if
(
tipoSeteado
==
null
){
}
else
if
(
tipoSeteado
==
null
){
errorMessage
(
"
Debe seleccionar un tipo de envio.
"
,
"
#message-container-busqueda
"
);
errorMessage
(
"
Debe seleccionar un tipo de envio.
"
,
"
#message-container-busqueda
"
);
}
}
...
@@ -213,9 +229,23 @@
...
@@ -213,9 +229,23 @@
if
(
$
(
"
#selectedOption
"
).
val
()
===
"
tel
"
){
if
(
$
(
"
#selectedOption
"
).
val
()
===
"
tel
"
){
$
(
"
#busquedaMsisdn
"
).
show
();
$
(
"
#busquedaMsisdn
"
).
show
();
$
(
"
#busquedaMail
"
).
hide
();
$
(
"
#busquedaMail
"
).
hide
();
}
else
{
$
(
"
#busquedaRut
"
).
hide
();
$
(
"
#busquedaAny
"
).
hide
();
}
else
if
(
$
(
"
#selectedOption
"
).
val
()
===
"
mail
"
){
$
(
"
#busquedaMail
"
).
show
();
$
(
"
#busquedaMsisdn
"
).
hide
();
$
(
"
#busquedaRut
"
).
hide
();
$
(
"
#busquedaAny
"
).
hide
();
}
else
if
(
$
(
"
#selectedOption
"
).
val
()
===
"
rut
"
){
$
(
"
#busquedaRut
"
).
show
();
$
(
"
#busquedaMsisdn
"
).
hide
();
$
(
"
#busquedaMail
"
).
hide
();
$
(
"
#busquedaAny
"
).
hide
();
}
else
if
(
$
(
"
#selectedOption
"
).
val
()
===
"
any
"
){
$
(
"
#busquedaAny
"
).
show
();
$
(
"
#busquedaRut
"
).
hide
();
$
(
"
#busquedaMsisdn
"
).
hide
();
$
(
"
#busquedaMsisdn
"
).
hide
();
$
(
"
#busquedaMail
"
).
show
();
$
(
"
#busquedaMail
"
).
hide
();
}
}
});
});
...
...
src/AppBundle/Model/EnvioEmail.php
View file @
429891f5
...
@@ -135,5 +135,108 @@ class EnvioEmail extends BaseEnvioEmail
...
@@ -135,5 +135,108 @@ class EnvioEmail extends BaseEnvioEmail
return
$envioEmail
;
return
$envioEmail
;
}
}
public
static
function
enviarEmailV2
(
$url
,
$urlDesuscripcion
,
$email
,
UsuarioMcafee
$usuarioMcafee
,
Emailing
$emailing
=
null
,
$campana
=
0
,
$asunto
,
$fromEmail
,
$fromNombreEmail
,
$tipoEmail
,
$transIdCliente
=
null
,
Logger
$log
,
Container
$container
)
{
$envioEmail
=
null
;
$tag
=
'[enviarEmail]'
;
$log
->
debug
(
$tag
.
"entrando... tipoEmail:
$tipoEmail
| campana:
$campana
| email:
$email
| umcId:"
.
$usuarioMcafee
->
getUmcId
());
try
{
$template
=
""
;
$auxTemplate
=
$campana
;
if
(
$tipoEmail
==
EnvioEmail
::
TIPO_UNITARIO
)
$auxTemplate
=
'webCall'
;
switch
(
$usuarioMcafee
->
getUmcMcafeeTipoProducto
())
:
case
UsuarioMcafee
::
TIPO_MULTIDEVICE
:
$template
=
"emailing/multidevice/
$auxTemplate
.html.twig"
;
break
;
case
UsuarioMcafee
::
TIPO_ANTIVIRUS
:
$template
=
"emailing/antivirus/
$auxTemplate
.html.twig"
;
break
;
endswitch
;
$log
->
debug
(
$tag
.
'template:'
.
$template
);
$log
->
debug
(
$tag
.
'generando objeto EnvioEmail...'
);
$envioEmail
=
new
EnvioEmail
();
if
(
$emailing
!=
null
)
$envioEmail
->
setEmailing
(
$emailing
);
$envioEmail
->
setEemTipo
(
$tipoEmail
);
$envioEmail
->
setUsuarioMcafee
(
$usuarioMcafee
);
$envioEmail
->
setEemEstado
(
EnvioEmail
::
ESTADO_PREENVIO
);
if
(
$campana
!=
null
)
$envioEmail
->
setEemCampana
(
$campana
);
$envioEmail
->
setEemEmail
(
$email
);
$envioEmail
->
setEemFechaEnvio
(
new
\DateTime
());
$envioEmail
->
setEemFromEmail
(
$fromEmail
);
$envioEmail
->
setEemFromNombreEmail
(
$fromNombreEmail
);
$envioEmail
->
setEemFromAsunto
(
$asunto
);
if
(
$transIdCliente
!=
null
)
$envioEmail
->
setEemTransIdCliente
(
$transIdCliente
);
$envioEmail
->
setEemEliminado
(
EnvioEmail
::
ELIMINADO_FALSE
);
$envioEmail
->
save
();
$url
=
str_replace
(
'#CAMPANA'
,
$campana
,
$url
);
$url
=
str_replace
(
'#STRUSUARIO'
,
$usuarioMcafee
->
getUmcParametroEncriptado
(),
$url
);
$url
=
str_replace
(
'#EMAILID'
,
$envioEmail
->
getEemId
(),
$url
);
if
(
$tipoEmail
==
EnvioEmail
::
TIPO_MASIVO
)
$url
=
str_replace
(
'#PROCEDENCIA'
,
Tracking
::
PROCEDENCIA_EMAILING
,
$url
);
else
$url
=
str_replace
(
'#PROCEDENCIA'
,
Tracking
::
PROCEDENCIA_EMAILWEBCALL
,
$url
);
$urlAperturaTrack
=
str_replace
(
'#ROUTING'
,
'emailtrack'
,
$url
);
$urlAperturaWeb
=
str_replace
(
'#ROUTING'
,
'emailtracktemplate'
,
$url
);
$urlDescarga
=
str_replace
(
'#ROUTING'
,
'descargar'
,
$url
);
$urlDesuscripcion
=
str_replace
(
'#STRUSUARIO'
,
$usuarioMcafee
->
getUmcParametroEncriptado
(),
$urlDesuscripcion
);
$message
=
\Swift_Message
::
newInstance
()
->
setSubject
(
$asunto
)
->
setFrom
(
array
(
$fromEmail
=>
$fromNombreEmail
))
->
setTo
(
$email
)
->
setBody
(
$container
->
get
(
'templating'
)
->
render
(
$template
,
array
(
'urlDescarga'
=>
$urlDescarga
,
'urlAperturaTrack'
=>
$urlAperturaTrack
,
'urlAperturaWeb'
=>
$urlAperturaWeb
,
'urlDesuscripcion'
=>
$urlDesuscripcion
)
),
'text/html'
);
$log
->
debug
(
$tag
.
'enviando email...'
);
if
(
$container
->
get
(
'mailer'
)
->
send
(
$message
)){
$log
->
debug
(
$tag
.
'email enviado OK a '
.
$email
);
$envioEmail
->
setEemEstado
(
EnvioEmail
::
ESTADO_ENVIADO
);
$envioEmail
->
save
();
}
else
{
$envioEmail
->
setEemEstado
(
EnvioEmail
::
ESTADO_ENVIADO_NO_OK
);
$envioEmail
->
save
();
$logError
=
Utiles
::
setLog
(
'AppBundle/Model/EnvioEmail'
,
'error/enviarEmail'
);
$logError
->
err
(
$tag
.
'error enviar email... email'
.
$email
.
' | '
.
print_r
(
array
(
)));
$log
->
err
(
$tag
.
'Se produjo un error al intentar enviar el E-mail'
);
}
}
catch
(
\Exception
$e
){
$log
->
err
(
$tag
.
"Execption:
$e
| campana:
$campana
email:
$email
| umcId:"
.
$usuarioMcafee
->
getUmcId
());
$logError
=
Utiles
::
setLog
(
'AppBundle/Model/EnvioEmail'
,
'error/enviarEmail'
);
$logError
->
err
(
$tag
.
"usuarioMcafee no encontrado... campana:
$campana
| email:
$email
| umcId:"
.
$usuarioMcafee
->
getUmcId
());
return
null
;
}
return
$envioEmail
;
}
}
}
src/BackendBundle/Controller/ResearchController.php
View file @
429891f5
This diff is collapsed.
Click to expand it.
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