cambio

app/Resources/views/backend/research/includes/cuadroInformacionUsuario.html.twig

@@ -30,8 +30,8 @@
                 <table class="table table-bordered">
                     <tbody>
                         <tr><td>Servicio</td><td><b>{{usuario.getTipoServicio()}}</b></td></tr>
-                        <tr><td>Rut</td><td>{%if usuario.getUmcMovistarRut() is not null %}<span id="rutTabla" data-value="{{usuario.getUmcMovistarRut()}}">{{usuario.getUmcMovistarRut()}}-{{usuario.getDv()}}</span>{% else %}<span id="rutTabla" data-value=""><b>No tiene</b></span>{% endif %}</td></tr>
-                        <tr><td>Email</td><td>{%if usuario.getUmcMovistarEmail is not null%} <span id="emailTabla" data-value="{{usuario.getUmcMovistarEmail()}}">{{usuario.getUmcMovistarEmail()}}</span>{%else%}<span id="emailTabla" data-value=""><b>No tiene</b></span>{% endif %}</td></tr>
+                        <tr><td>Rut</td><td>{%if usuario.getUmcMovistarRut() is not null %}<span id="rutTabla" data-value="{{usuario.getUmcMovistarRut()}}">{{usuario.getUmcMovistarRut()}}-{{usuario.getDv(usuario.getUmcMovistarRut())}}</span>{% else %}<span id="rutTabla" data-value=""><b>No tiene</b></span>{% endif %}</td></tr>
+                        <tr><td>Email</td><td>{%if usuario.getUmcMovistarEmail() is not null%} <span id="emailTabla" data-value="{{usuario.getUmcMovistarEmail()}}">{{usuario.getUmcMovistarEmail()}}</span>{%else%}<span id="emailTabla" data-value=""><b>No tiene</b></span>{% endif %}</td></tr>
                         <tr><td>Teléfono</td><td>{%if usuario.getUmcMovil() is null %}<span id="movilTabla" data-value=""><b>No tiene</b></span>{% else %}<span id="movilTabla" data-value="{{usuario.getUmcMovil()}}" >{{usuario.getUmcMovil()}}</span>{% endif %}</td></tr>    
                         <tr><td>ANY</td><td><span id="anyTabla" data-value="{{usuario.getUmcMovistarAny()}}" >{{usuario.getUmcMovistarAny()}}</span></td></tr>
                         

app/propel/generated-schemas/default_reversed_schema.xml

@@ -176,6 +176,23 @@
       <parameter name="Engine" value="InnoDB"/>
     </vendor>
   </table>
+  <table name="mcafee_ultimo_proceso_creacion" phpName="McafeeUltimoProcesoCreacion" idMethod="native">
+    <column name="muc_id" phpName="MucId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
+    <column name="ultimo_umn_id" phpName="UltimoUmnId" type="INTEGER" required="false"/>
+    <column name="muc_cantidad_procesados" phpName="MucCantidadProcesados" type="INTEGER" required="false"/>
+    <column name="muc_cantidad_pendientes" phpName="MucCantidadPendientes" type="INTEGER" required="false"/>
+    <column name="created_at" phpName="CreatedAt" type="TIMESTAMP" required="false"/>
+    <column name="updated_at" phpName="UpdatedAt" type="TIMESTAMP" required="false"/>
+    <foreign-key foreignTable="usuarios_mcafee_movistar_nuevos" name="fk_idx_usuario_movistar_nuevo" onDelete="RESTRICT" onUpdate="RESTRICT">
+      <reference local="ultimo_umn_id" foreign="id"/>
+    </foreign-key>
+    <index name="fk_idx_usuario_movistar_nuevo_idx">
+      <index-column name="ultimo_umn_id"/>
+    </index>
+    <vendor type="mysql">
+      <parameter name="Engine" value="InnoDB"/>
+    </vendor>
+  </table>
   <table name="mcafee_ultimo_proceso_migracion" phpName="McafeeUltimoProcesoMigracion" idMethod="native">
     <column name="mup_id" phpName="MupId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
     <column name="ultimo_umc_id" phpName="UltimoUmcId" type="INTEGER" required="true"/>
@@ -328,6 +345,12 @@
     <index name="indice_umc_movistar_any">
       <index-column name="umc_movistar_any"/>
     </index>
+    <index name="indice_fecha_creacion">
+      <index-column name="created_at"/>
+    </index>
+    <index name="indice_mcafee_mail">
+      <index-column name="umc_mcafee_email"/>
+    </index>
     <vendor type="mysql">
       <parameter name="Engine" value="InnoDB"/>
     </vendor>
@@ -369,6 +392,35 @@
     <index name="ccid">
       <index-column name="Ccid"/>
     </index>
+    <index name="correo">
+      <index-column name="Email_Address"/>
+    </index>
+    <index name="activty">
+      <index-column name="License_Activity"/>
+    </index>
+    <index name="tipo">
+      <index-column name="Device_Type"/>
+    </index>
+    <vendor type="mysql">
+      <parameter name="Engine" value="InnoDB"/>
+    </vendor>
+  </table>
+  <table name="usuarios_mcafee_movistar_nuevos" phpName="UsuariosMcafeeMovistarNuevos" idMethod="native">
+    <column name="id" phpName="Id" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
+    <column name="id_mov" phpName="IdMov" type="INTEGER" required="true" defaultValue="0"/>
+    <column name="area_tel" phpName="AreaTel" type="INTEGER" required="false"/>
+    <column name="rut" phpName="Rut" type="INTEGER" required="false"/>
+    <column name="nombres" phpName="Nombres" type="VARCHAR" size="45" required="false"/>
+    <column name="correo" phpName="Correo" type="VARCHAR" size="64" required="false"/>
+    <column name="fono_contacto_fijo_1" phpName="FonoContactoFijo1" type="INTEGER" required="false"/>
+    <column name="fono_contacto_fijo_2" phpName="FonoContactoFijo2" type="INTEGER" required="false"/>
+    <column name="fono_contacto_movil_1" phpName="FonoContactoMovil1" type="INTEGER" required="false"/>
+    <column name="fono_contacto_movil_2" phpName="FonoContactoMovil2" type="INTEGER" required="false"/>
+    <column name="ps_6094" phpName="Ps6094" type="INTEGER" required="false"/>
+    <column name="ps_5679" phpName="Ps5679" type="INTEGER" required="false"/>
+    <column name="ps_2989" phpName="Ps2989" type="INTEGER" required="false"/>
+    <column name="ps_6753" phpName="Ps6753" type="INTEGER" required="false"/>
+    <column name="ps_6759" phpName="Ps6759" type="INTEGER" required="false"/>
     <vendor type="mysql">
       <parameter name="Engine" value="InnoDB"/>
     </vendor>

src/AppBundle/Controller/DefaultController.php

@@ -17,5 +17,9 @@ class DefaultController extends Controller
         return $this->render('default/index.html.twig', array(
             'base_dir' => realpath($this->container->getParameter('kernel.root_dir').'/..').DIRECTORY_SEPARATOR,
         ));
+        
+        
     }
+    
+   
 }

src/AppBundle/Model/McafeeTransaccion.php

@@ -11,6 +11,7 @@ class McafeeTransaccion extends BaseMcafeeTransaccion
     const TIPO_CANCELAR_SUS= 3;
     const TIPO_ACTUALIZA_PERF= 4;
     const TIPO_DESCONTAR_LICS= 5;
+    const TIPO_USUARIO_NUEVO_LICENCIA_MOVISTAR = 6; 
     
     const ESTADO_NO_ENVIADA=0;
     const ESTADO_SUCCESS=1;

src/AppBundle/Model/McafeeTransaccionPendiente.php

@@ -13,6 +13,7 @@ class McafeeTransaccionPendiente extends BaseMcafeeTransaccionPendiente
     const TIPO_CANCELAR_SUS= 3;
     const TIPO_ACTUALIZA_PERF= 4;
     const TIPO_DESCONTAR_LICS= 5;
+    const TIPO_USUARIO_NUEVO_LICENCIA_MOVISTAR = 6;
     
     const ESTADO_PENDIENTE=0;//Transaccion pendiente que buscara la tarea.
     const ESTADO_DESECHADA=1;//Transaccion que despues de ciertos intentos se desecho.

src/AppBundle/Model/McafeeUltimoProcesoCreacion.php

+<?php
+
+namespace AppBundle\Model;
+
+use AppBundle\Model\om\BaseMcafeeUltimoProcesoCreacion;
+
+class McafeeUltimoProcesoCreacion extends BaseMcafeeUltimoProcesoCreacion
+{
+}

src/AppBundle/Model/McafeeUltimoProcesoCreacionPeer.php

+<?php
+
+namespace AppBundle\Model;
+
+use AppBundle\Model\om\BaseMcafeeUltimoProcesoCreacionPeer;
+
+class McafeeUltimoProcesoCreacionPeer extends BaseMcafeeUltimoProcesoCreacionPeer
+{
+}

src/AppBundle/Model/McafeeUltimoProcesoCreacionQuery.php

+<?php
+
+namespace AppBundle\Model;
+
+use AppBundle\Model\om\BaseMcafeeUltimoProcesoCreacionQuery;
+
+class McafeeUltimoProcesoCreacionQuery extends BaseMcafeeUltimoProcesoCreacionQuery
+{
+}

src/AppBundle/Model/Sms.php

@@ -28,6 +28,10 @@ class Sms extends BaseSms
         //$FROM_EMAIL = 'no-reply@seguridadtotalmcafee.cl';
         //$FROM_EMAIL = 'fcastro@gearlabs.cl';
         $envioEmail = null;
+<<<<<<< HEAD
+=======
+        
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
         $tag = '[enviarSms]';
         $log->debug($tag."entrando... tipoSms:$tipoSms | campana:$campana  | movil:$movil  | umcId:".$usuarioMcafee->getUmcId());
         try{
@@ -48,6 +52,7 @@ class Sms extends BaseSms
                 $sms->setSmsTransIdCliente ($transIdCliente);
             $sms->setSmsEliminado(EnvioEmail::ELIMINADO_FALSE);
             $sms->save();
+<<<<<<< HEAD
            
 
            $urlDescarga = Sms::acortarUrl($url);
@@ -61,6 +66,29 @@ class Sms extends BaseSms
                 
                 
               $post['to'] = array($movil);
+=======
+
+
+            $url = str_replace('#CAMPANA', $campana,$url);
+            $url = str_replace('#STRUSUARIO', $usuarioMcafee->getUmcParametroEncriptado(),$url);
+            $url = str_replace('#SMSID', $sms->getSmsId(),$url);
+            
+            
+            $url = str_replace('#PROCEDENCIA', Tracking::PROCEDENCIA_SMS,$url);
+            
+            
+            $urlAperturaTrack = str_replace('#ROUTING', 'SMStrack',$url);
+            $urlAperturaWeb = str_replace('#ROUTING', 'SMStracktemplate',$url);
+            $urlDescarga = str_replace('#ROUTING', 'descargar',$url);
+
+            //$urlDescarga = Sms::acortarUrl($urlDescarga);
+            $urlDescarga = Sms::acortar_url($urlDescarga);
+
+            $mensaje=$mensaje . $urlDescarga;
+                
+                
+                $post['to'] = array($movil);
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
                 $post['text'] = $mensaje;
                 $post['from'] = 'McAfee';
                 $user ='GearLabs';
@@ -84,9 +112,17 @@ class Sms extends BaseSms
             $log->debug($tag.'enviando mensaje...'. $urlDescarga);
 
 
+<<<<<<< HEAD
             /***************************************/
 
         /*    $request = '{
+=======
+
+
+
+            /***************************************/
+      /*      $request = '{
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 			    "api_key":"9df2cfda7cc871680ede6ec24b4a479d",
 			    "report_url":"http://servidoctor.com/callback/script",
 			    "concat":1,
@@ -94,12 +130,19 @@ class Sms extends BaseSms
 			        {
 			            "from":"McAfee",
 			            "to":"584165388803",
+<<<<<<< HEAD
 			            "text": "Descarga y participa por un SMART TV DE 50 pulgadas: https://cutt.ly/0i41nK",
+=======
+			            "text": "Descarga y participa por un SMART TV DE 50 pulgadas: http://bit.ly/2wHyOwK",
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 			            "send_at":"2018-02-18 17:30:00"
 			        }
 			    ]
 			}';
+<<<<<<< HEAD
             
+=======
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 			        	
 			$headers = array('Content-Type: application/json');        	
 
@@ -151,12 +194,20 @@ class Sms extends BaseSms
     }
 
 
+<<<<<<< HEAD
   /*  public static function acortar_url($url) {
+=======
+    public static function acortar_url($url) {
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
         $usuario = "gearlabs";
         $apikey = "R_8bf0031b8f644fec93997b7b23568b76";
         $temp = "http://api.bit.ly/v3/shorten?login=".$usuario."&apiKey=".$apikey."&uri=".$url."&format=txt";
         return file_get_contents($temp);
+<<<<<<< HEAD
     }*/
+=======
+    }
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 
     public static function acortarUrl($data){
         $url = "http://url.gearlabs.cl/acortar";

src/AppBundle/Model/UsuarioMcafee.php

@@ -24,6 +24,14 @@ class UsuarioMcafee extends BaseUsuarioMcafee {
         return Utiles::base64url_encode($crypt->AES_Encode($strAencriptar));
     }
     
+    /**
+     * Genera el identificador del perfil de usuario que es enviado a McAfee
+     */
+    public function generarCostumerId() {
+        $cId = 'GL_'.$this->getUmcId() . '_' . $this->getUmcFijo();
+        return $cId;
+    }
+
     public function getTipoServicio() {
         if ($this->getUmcMcafeeTipoProducto() == self::TIPO_MULTIDEVICE) {
             return "Servicio Multi-Dispositivo";
@@ -104,29 +112,11 @@ class UsuarioMcafee extends BaseUsuarioMcafee {
         }
     }
 
-    public function getDv() {
-        $x = 2;
-        $sumatorio = 0;
-        for ($i = strlen($rut) - 1; $i > 0; $i--) {
-            if ($x > 7) {
-                $x = 2;
-            }
-            $sumatorio = $sumatorio + ($rut[$i] * $x);
-            $x++;
-        }
-        $digito = bcmod($sumatorio, 11);
-        $digito = 11 - $digito;
-
-        switch ($digito) {
-            case 10:
-                $digito = "K";
-                break;
-            case 11:
-                $digito = "0";
-                break;
-        }
-
-        return $digito;
+    public function getDv($r) {
+        $s = 1;
+        for ($m = 0; $r != 0; $r /= 10)
+            $s = ($s + $r % 10 * (9 - $m++ % 6)) % 11;
+        return chr($s ? $s + 47 : 75);
     }
 
 }

src/AppBundle/Model/UsuariosMcafeeMovistarNuevos.php

+<?php
+
+namespace AppBundle\Model;
+
+use AppBundle\Model\om\BaseUsuariosMcafeeMovistarNuevos;
+
+class UsuariosMcafeeMovistarNuevos extends BaseUsuariosMcafeeMovistarNuevos
+{
+}

src/AppBundle/Model/UsuariosMcafeeMovistarNuevosPeer.php

+<?php
+
+namespace AppBundle\Model;
+
+use AppBundle\Model\om\BaseUsuariosMcafeeMovistarNuevosPeer;
+
+class UsuariosMcafeeMovistarNuevosPeer extends BaseUsuariosMcafeeMovistarNuevosPeer
+{
+}

src/AppBundle/Model/UsuariosMcafeeMovistarNuevosQuery.php

+<?php
+
+namespace AppBundle\Model;
+
+use AppBundle\Model\om\BaseUsuariosMcafeeMovistarNuevosQuery;
+
+class UsuariosMcafeeMovistarNuevosQuery extends BaseUsuariosMcafeeMovistarNuevosQuery
+{
+}

src/AppBundle/Model/map/BatchsmsTableMap.php

@@ -71,4 +71,24 @@ class BatchsmsTableMap extends TableMap
         $this->addRelation('Sms', 'AppBundle\\Model\\Sms', RelationMap::ONE_TO_MANY, array('batchsms_id' => 'batchsms_id', ), null, null, 'Smss');
     } // buildRelations()
 
+<<<<<<< HEAD
+=======
+    /**
+     *
+     * Gets the list of behaviors registered for this table
+     *
+     * @return array Associative array (name => parameters) of behaviors
+     */
+    public function getBehaviors()
+    {
+        return array(
+            'timestampable' =>  array (
+  'create_column' => 'created_at',
+  'update_column' => 'updated_at',
+  'disable_updated_at' => 'false',
+),
+        );
+    } // getBehaviors()
+
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 } // BatchsmsTableMap

src/AppBundle/Model/map/McafeeUltimoProcesoCreacionTableMap.php

+<?php
+
+namespace AppBundle\Model\map;
+
+use \RelationMap;
+use \TableMap;
+
+
+/**
+ * This class defines the structure of the 'mcafee_ultimo_proceso_creacion' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ * @package    propel.generator.src.AppBundle.Model.map
+ */
+class McafeeUltimoProcesoCreacionTableMap extends TableMap
+{
+
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'src.AppBundle.Model.map.McafeeUltimoProcesoCreacionTableMap';
+
+    /**
+     * Initialize the table attributes, columns and validators
+     * Relations are not initialized by this method since they are lazy loaded
+     *
+     * @return void
+     * @throws PropelException
+     */
+    public function initialize()
+    {
+        // attributes
+        $this->setName('mcafee_ultimo_proceso_creacion');
+        $this->setPhpName('McafeeUltimoProcesoCreacion');
+        $this->setClassname('AppBundle\\Model\\McafeeUltimoProcesoCreacion');
+        $this->setPackage('src.AppBundle.Model');
+        $this->setUseIdGenerator(true);
+        // columns
+        $this->addPrimaryKey('muc_id', 'MucId', 'INTEGER', true, null, null);
+        $this->addForeignKey('ultimo_umn_id', 'UltimoUmnId', 'INTEGER', 'usuarios_mcafee_movistar_nuevos', 'id', false, null, null);
+        $this->addColumn('muc_cantidad_procesados', 'MucCantidadProcesados', 'INTEGER', false, null, null);
+        $this->addColumn('muc_cantidad_pendientes', 'MucCantidadPendientes', 'INTEGER', false, null, null);
+        $this->addColumn('created_at', 'CreatedAt', 'TIMESTAMP', false, null, null);
+        $this->addColumn('updated_at', 'UpdatedAt', 'TIMESTAMP', false, null, null);
+        // validators
+    } // initialize()
+
+    /**
+     * Build the RelationMap objects for this table relationships
+     */
+    public function buildRelations()
+    {
+        $this->addRelation('UsuariosMcafeeMovistarNuevos', 'AppBundle\\Model\\UsuariosMcafeeMovistarNuevos', RelationMap::MANY_TO_ONE, array('ultimo_umn_id' => 'id', ), null, null);
+    } // buildRelations()
+
+    /**
+     *
+     * Gets the list of behaviors registered for this table
+     *
+     * @return array Associative array (name => parameters) of behaviors
+     */
+    public function getBehaviors()
+    {
+        return array(
+            'timestampable' =>  array (
+  'create_column' => 'created_at',
+  'update_column' => 'updated_at',
+  'disable_updated_at' => 'false',
+),
+        );
+    } // getBehaviors()
+
+} // McafeeUltimoProcesoCreacionTableMap

src/AppBundle/Model/map/SmsTableMap.php

@@ -69,4 +69,24 @@ class SmsTableMap extends TableMap
         $this->addRelation('UsuarioMcafee', 'AppBundle\\Model\\UsuarioMcafee', RelationMap::MANY_TO_ONE, array('umc_id' => 'umc_id', ), null, null);
     } // buildRelations()
 
+<<<<<<< HEAD
+=======
+    /**
+     *
+     * Gets the list of behaviors registered for this table
+     *
+     * @return array Associative array (name => parameters) of behaviors
+     */
+    public function getBehaviors()
+    {
+        return array(
+            'timestampable' =>  array (
+  'create_column' => 'created_at',
+  'update_column' => 'updated_at',
+  'disable_updated_at' => 'false',
+),
+        );
+    } // getBehaviors()
+
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 } // SmsTableMap

src/AppBundle/Model/map/UsuarioMcafeeTableMap.php

@@ -74,6 +74,10 @@ class UsuarioMcafeeTableMap extends TableMap
         $this->addRelation('EnvioEmail', 'AppBundle\\Model\\EnvioEmail', RelationMap::ONE_TO_MANY, array('umc_id' => 'umc_id', ), null, null, 'EnvioEmails');
         $this->addRelation('McafeeTransaccion', 'AppBundle\\Model\\McafeeTransaccion', RelationMap::ONE_TO_MANY, array('umc_id' => 'umc_id', ), null, null, 'McafeeTransaccions');
         $this->addRelation('McafeeTransaccionPendiente', 'AppBundle\\Model\\McafeeTransaccionPendiente', RelationMap::ONE_TO_MANY, array('umc_id' => 'umc_id', ), null, null, 'McafeeTransaccionPendientes');
+<<<<<<< HEAD
+=======
+        $this->addRelation('McafeeUltimoProcesoNormalizacion', 'AppBundle\\Model\\McafeeUltimoProcesoNormalizacion', RelationMap::ONE_TO_MANY, array('umc_id' => 'ultimo_umc_id', ), null, null, 'McafeeUltimoProcesoNormalizacions');
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
         $this->addRelation('Sms', 'AppBundle\\Model\\Sms', RelationMap::ONE_TO_MANY, array('umc_id' => 'umc_id', ), null, null, 'Smss');
         $this->addRelation('Tracking', 'AppBundle\\Model\\Tracking', RelationMap::ONE_TO_MANY, array('umc_id' => 'umc_id', ), null, null, 'Trackings');
     } // buildRelations()

src/AppBundle/Model/map/UsuariosMcafeeMovistarNuevosTableMap.php

+<?php
+
+namespace AppBundle\Model\map;
+
+use \RelationMap;
+use \TableMap;
+
+
+/**
+ * This class defines the structure of the 'usuarios_mcafee_movistar_nuevos' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ * @package    propel.generator.src.AppBundle.Model.map
+ */
+class UsuariosMcafeeMovistarNuevosTableMap extends TableMap
+{
+
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = 'src.AppBundle.Model.map.UsuariosMcafeeMovistarNuevosTableMap';
+
+    /**
+     * Initialize the table attributes, columns and validators
+     * Relations are not initialized by this method since they are lazy loaded
+     *
+     * @return void
+     * @throws PropelException
+     */
+    public function initialize()
+    {
+        // attributes
+        $this->setName('usuarios_mcafee_movistar_nuevos');
+        $this->setPhpName('UsuariosMcafeeMovistarNuevos');
+        $this->setClassname('AppBundle\\Model\\UsuariosMcafeeMovistarNuevos');
+        $this->setPackage('src.AppBundle.Model');
+        $this->setUseIdGenerator(true);
+        // columns
+        $this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
+        $this->addColumn('id_mov', 'IdMov', 'INTEGER', true, null, 0);
+        $this->addColumn('area_tel', 'AreaTel', 'INTEGER', false, null, null);
+        $this->addColumn('rut', 'Rut', 'INTEGER', false, null, null);
+        $this->addColumn('nombres', 'Nombres', 'VARCHAR', false, 45, null);
+        $this->addColumn('correo', 'Correo', 'VARCHAR', false, 64, null);
+        $this->addColumn('fono_contacto_fijo_1', 'FonoContactoFijo1', 'INTEGER', false, null, null);
+        $this->addColumn('fono_contacto_fijo_2', 'FonoContactoFijo2', 'INTEGER', false, null, null);
+        $this->addColumn('fono_contacto_movil_1', 'FonoContactoMovil1', 'INTEGER', false, null, null);
+        $this->addColumn('fono_contacto_movil_2', 'FonoContactoMovil2', 'INTEGER', false, null, null);
+        $this->addColumn('ps_6094', 'Ps6094', 'INTEGER', false, null, null);
+        $this->addColumn('ps_5679', 'Ps5679', 'INTEGER', false, null, null);
+        $this->addColumn('ps_2989', 'Ps2989', 'INTEGER', false, null, null);
+        $this->addColumn('ps_6753', 'Ps6753', 'INTEGER', false, null, null);
+        $this->addColumn('ps_6759', 'Ps6759', 'INTEGER', false, null, null);
+        // validators
+    } // initialize()
+
+    /**
+     * Build the RelationMap objects for this table relationships
+     */
+    public function buildRelations()
+    {
+        $this->addRelation('McafeeUltimoProcesoCreacion', 'AppBundle\\Model\\McafeeUltimoProcesoCreacion', RelationMap::ONE_TO_MANY, array('id' => 'ultimo_umn_id', ), null, null, 'McafeeUltimoProcesoCreacions');
+    } // buildRelations()
+
+} // UsuariosMcafeeMovistarNuevosTableMap

src/AppBundle/Model/om/BaseBatchsms.php

@@ -1023,8 +1023,24 @@ abstract class BaseBatchsms extends BaseObject implements Persistent
             $ret = $this->preSave($con);
             if ($isInsert) {
                 $ret = $ret && $this->preInsert($con);
+<<<<<<< HEAD
             } else {
                 $ret = $ret && $this->preUpdate($con);
+=======
+                // timestampable behavior
+                if (!$this->isColumnModified(BatchsmsPeer::CREATED_AT)) {
+                    $this->setCreatedAt(time());
+                }
+                if (!$this->isColumnModified(BatchsmsPeer::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+            } else {
+                $ret = $ret && $this->preUpdate($con);
+                // timestampable behavior
+                if ($this->isModified() && !$this->isColumnModified(BatchsmsPeer::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
             }
             if ($ret) {
                 $affectedRows = $this->doSave($con);
@@ -2140,4 +2156,21 @@ abstract class BaseBatchsms extends BaseObject implements Persistent
         return $this->alreadyInSave;
     }
 
+<<<<<<< HEAD
+=======
+    // timestampable behavior
+
+    /**
+     * Mark the current object so that the update date doesn't get updated during next save
+     *
+     * @return     Batchsms The current object (for fluent API support)
+     */
+    public function keepUpdateDateUnchanged()
+    {
+        $this->modifiedColumns[] = BatchsmsPeer::UPDATED_AT;
+
+        return $this;
+    }
+
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 }

src/AppBundle/Model/om/BaseBatchsmsQuery.php

@@ -1130,4 +1130,72 @@ abstract class BaseBatchsmsQuery extends ModelCriteria
         return $this;
     }
 
+<<<<<<< HEAD
+=======
+    // timestampable behavior
+
+    /**
+     * Filter by the latest updated
+     *
+     * @param      int $nbDays Maximum age of the latest update in days
+     *
+     * @return     BatchsmsQuery The current query, for fluid interface
+     */
+    public function recentlyUpdated($nbDays = 7)
+    {
+        return $this->addUsingAlias(BatchsmsPeer::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by update date desc
+     *
+     * @return     BatchsmsQuery The current query, for fluid interface
+     */
+    public function lastUpdatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(BatchsmsPeer::UPDATED_AT);
+    }
+
+    /**
+     * Order by update date asc
+     *
+     * @return     BatchsmsQuery The current query, for fluid interface
+     */
+    public function firstUpdatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(BatchsmsPeer::UPDATED_AT);
+    }
+
+    /**
+     * Filter by the latest created
+     *
+     * @param      int $nbDays Maximum age of in days
+     *
+     * @return     BatchsmsQuery The current query, for fluid interface
+     */
+    public function recentlyCreated($nbDays = 7)
+    {
+        return $this->addUsingAlias(BatchsmsPeer::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by create date desc
+     *
+     * @return     BatchsmsQuery The current query, for fluid interface
+     */
+    public function lastCreatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(BatchsmsPeer::CREATED_AT);
+    }
+
+    /**
+     * Order by create date asc
+     *
+     * @return     BatchsmsQuery The current query, for fluid interface
+     */
+    public function firstCreatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(BatchsmsPeer::CREATED_AT);
+    }
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 }

src/AppBundle/Model/om/BaseSms.php

@@ -980,8 +980,24 @@ abstract class BaseSms extends BaseObject implements Persistent
             $ret = $this->preSave($con);
             if ($isInsert) {
                 $ret = $ret && $this->preInsert($con);
+<<<<<<< HEAD
             } else {
                 $ret = $ret && $this->preUpdate($con);
+=======
+                // timestampable behavior
+                if (!$this->isColumnModified(SmsPeer::CREATED_AT)) {
+                    $this->setCreatedAt(time());
+                }
+                if (!$this->isColumnModified(SmsPeer::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+            } else {
+                $ret = $ret && $this->preUpdate($con);
+                // timestampable behavior
+                if ($this->isModified() && !$this->isColumnModified(SmsPeer::UPDATED_AT)) {
+                    $this->setUpdatedAt(time());
+                }
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
             }
             if ($ret) {
                 $affectedRows = $this->doSave($con);
@@ -1891,4 +1907,21 @@ abstract class BaseSms extends BaseObject implements Persistent
         return $this->alreadyInSave;
     }
 
+<<<<<<< HEAD
+=======
+    // timestampable behavior
+
+    /**
+     * Mark the current object so that the update date doesn't get updated during next save
+     *
+     * @return     Sms The current object (for fluent API support)
+     */
+    public function keepUpdateDateUnchanged()
+    {
+        $this->modifiedColumns[] = SmsPeer::UPDATED_AT;
+
+        return $this;
+    }
+
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 }

src/AppBundle/Model/om/BaseSmsQuery.php

@@ -1016,4 +1016,72 @@ abstract class BaseSmsQuery extends ModelCriteria
         return $this;
     }
 
+<<<<<<< HEAD
+=======
+    // timestampable behavior
+
+    /**
+     * Filter by the latest updated
+     *
+     * @param      int $nbDays Maximum age of the latest update in days
+     *
+     * @return     SmsQuery The current query, for fluid interface
+     */
+    public function recentlyUpdated($nbDays = 7)
+    {
+        return $this->addUsingAlias(SmsPeer::UPDATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by update date desc
+     *
+     * @return     SmsQuery The current query, for fluid interface
+     */
+    public function lastUpdatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(SmsPeer::UPDATED_AT);
+    }
+
+    /**
+     * Order by update date asc
+     *
+     * @return     SmsQuery The current query, for fluid interface
+     */
+    public function firstUpdatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(SmsPeer::UPDATED_AT);
+    }
+
+    /**
+     * Filter by the latest created
+     *
+     * @param      int $nbDays Maximum age of in days
+     *
+     * @return     SmsQuery The current query, for fluid interface
+     */
+    public function recentlyCreated($nbDays = 7)
+    {
+        return $this->addUsingAlias(SmsPeer::CREATED_AT, time() - $nbDays * 24 * 60 * 60, Criteria::GREATER_EQUAL);
+    }
+
+    /**
+     * Order by create date desc
+     *
+     * @return     SmsQuery The current query, for fluid interface
+     */
+    public function lastCreatedFirst()
+    {
+        return $this->addDescendingOrderByColumn(SmsPeer::CREATED_AT);
+    }
+
+    /**
+     * Order by create date asc
+     *
+     * @return     SmsQuery The current query, for fluid interface
+     */
+    public function firstCreatedFirst()
+    {
+        return $this->addAscendingOrderByColumn(SmsPeer::CREATED_AT);
+    }
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 }

src/AppBundle/Model/om/BaseUsuarioMcafeeQuery.php

@@ -15,6 +15,10 @@ use \PropelPDO;
 use AppBundle\Model\EnvioEmail;
 use AppBundle\Model\McafeeTransaccion;
 use AppBundle\Model\McafeeTransaccionPendiente;
+<<<<<<< HEAD
+=======
+use AppBundle\Model\McafeeUltimoProcesoNormalizacion;
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 use AppBundle\Model\Sms;
 use AppBundle\Model\Tracking;
 use AppBundle\Model\UsuarioMcafee;
@@ -86,6 +90,10 @@ use AppBundle\Model\UsuarioMcafeeQuery;
  * @method UsuarioMcafeeQuery rightJoinSms($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Sms relation
  * @method UsuarioMcafeeQuery innerJoinSms($relationAlias = null) Adds a INNER JOIN clause to the query using the Sms relation
  *
+ * @method UsuarioMcafeeQuery leftJoinSms($relationAlias = null) Adds a LEFT JOIN clause to the query using the Sms relation
+ * @method UsuarioMcafeeQuery rightJoinSms($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Sms relation
+ * @method UsuarioMcafeeQuery innerJoinSms($relationAlias = null) Adds a INNER JOIN clause to the query using the Sms relation
+ *
  * @method UsuarioMcafeeQuery leftJoinTracking($relationAlias = null) Adds a LEFT JOIN clause to the query using the Tracking relation
  * @method UsuarioMcafeeQuery rightJoinTracking($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Tracking relation
  * @method UsuarioMcafeeQuery innerJoinTracking($relationAlias = null) Adds a INNER JOIN clause to the query using the Tracking relation
@@ -240,7 +248,11 @@ abstract class BaseUsuarioMcafeeQuery extends ModelCriteria
      */
     protected function findPkSimple($key, $con)
     {
+<<<<<<< HEAD
         $sql = 'SELECT `umc_id`, `umc_mcafee_tipo_producto`, `umc_mcafee_affid`, `umc_mcafee_ccid`, `umc_mcafee_email`, `umc_mcafee_sku`, `umc_mcafee_keycard`, `umc_mcafee_status`, `umc_movistar_activo`, `umc_movistar_any`, `umc_movistar_email`, `umc_movistar_rut`, `umc_parametro_encriptado`, `umc_permite_email`, `umc_fecha_desuscripcion_email`, `umc_movil`, `umc_customer_id`, `umc_eliminado`, `umc_permite_sms`, `created_at`, `updated_at` FROM `usuario_mcafee` WHERE `umc_id` = :p0';
+=======
+        $sql = 'SELECT `umc_id`, `umc_mcafee_tipo_producto`, `umc_mcafee_affid`, `umc_mcafee_ccid`, `umc_mcafee_email`, `umc_mcafee_sku`, `umc_mcafee_keycard`, `umc_mcafee_status`, `umc_movistar_activo`, `umc_movistar_any`, `umc_movistar_email`, `umc_movistar_rut`, `umc_parametro_encriptado`, `umc_permite_email`, `umc_fecha_desuscripcion_email`, `umc_movil`, `umc_fijo`, `umc_customer_id`, `umc_eliminado`, `umc_permite_sms`, `created_at`, `updated_at` FROM `usuario_mcafee` WHERE `umc_id` = :p0';
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -1307,6 +1319,80 @@ abstract class BaseUsuarioMcafeeQuery extends ModelCriteria
             ->useQuery($relationAlias ? $relationAlias : 'Sms', '\AppBundle\Model\SmsQuery');
     }
 
+    /**
+     * Filter the query by a related Sms object
+     *
+     * @param   Sms|PropelObjectCollection $sms  the related object to use as filter
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return                 UsuarioMcafeeQuery The current query, for fluid interface
+     * @throws PropelException - if the provided filter is invalid.
+     */
+    public function filterBySms($sms, $comparison = null)
+    {
+        if ($sms instanceof Sms) {
+            return $this
+                ->addUsingAlias(UsuarioMcafeePeer::UMC_ID, $sms->getUmcId(), $comparison);
+        } elseif ($sms instanceof PropelObjectCollection) {
+            return $this
+                ->useSmsQuery()
+                ->filterByPrimaryKeys($sms->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterBySms() only accepts arguments of type Sms or PropelCollection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the Sms relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return UsuarioMcafeeQuery The current query, for fluid interface
+     */
+    public function joinSms($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('Sms');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'Sms');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the Sms relation Sms object
+     *
+     * @see       useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return   \AppBundle\Model\SmsQuery A secondary query class using the current class as primary query
+     */
+    public function useSmsQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinSms($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'Sms', '\AppBundle\Model\SmsQuery');
+    }
+
     /**
      * Filter the query by a related Tracking object
      *

src/BackendBundle/Command/McafeeEnviarSmsCommand.php

@@ -36,9 +36,13 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand
         $log->debug('************************Iniciando McafeeEnviarSmsCommand ************************');
         $tt = new TiempoTranscurrido();
 
+<<<<<<< HEAD
         //$fp = fopen("C:\ana3\movistarChile\prueba.csv", "r");
         $fp = fopen("/opt/sdp/intelsecuritymovistar/etc/sms/3_36460.csv", "r");
         
+=======
+        $fp = fopen("C:\ana3\movistarChile\prueba.csv", "r");
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 
         if (!$fp) {
             $log->warning('Error al intentar abrir el archivo');
@@ -49,7 +53,11 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand
 
         $urlBase  = 'https://www.seguridadtotalmcafee.cl';
 
+<<<<<<< HEAD
         //$urlDescarga = $urlBase.'/#ROUTING/#CAMPANA/#STRUSUARIO/#PROCEDENCIA/#SMSID';
+=======
+        $urlDescarga = $urlBase.'/#ROUTING/#CAMPANA/#STRUSUARIO/#PROCEDENCIA/#SMSID';
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
 
         
         $tDesOK = 0;
@@ -125,7 +133,11 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand
                 
                                 
                 $mensaje="Descarga y participa por un SMART TV DE 50: ";
+<<<<<<< HEAD
                 $urlDescarga = $usuarioMcafee->getUmcMcafeeKeycard();
+=======
+                
+>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
                 
                 $sms = Sms::enviarSms($urlDescarga, $movil, $usuarioMcafee, $batchsms, $campana, $mensaje, Sms::TIPO_MASIVO,null,$log, $this->getContainer());
 

src/BackendBundle/Command/McafeeMigrarPendientesCommand.php

@@ -13,6 +13,8 @@ use AppBundle\Model\McafeeTransaccion;
 use AppBundle\Model\McafeeTransaccionQuery;
 use AppBundle\Model\McafeeTransaccionPendiente;
 use AppBundle\Model\McafeeTransaccionPendienteQuery;
+use AppBundle\Model\UsuariosMcafeeMovistarMigrar;
+use AppBundle\Model\UsuariosMcafeeMovistarMigrarQuery;
 use AppBundle\Lib\Utiles;
 
 class McafeeMigrarPendientesCommand extends ContainerAwareCommand {
@@ -36,7 +38,9 @@ class McafeeMigrarPendientesCommand extends ContainerAwareCommand {
         $mcAfeePartnerId = Utiles::getParametroConfiguracion('mcafee_partner_id');
         $numero_usuarios_pendientes = Utiles::getParametroConfiguracion("numero_usuarios_pendientes");
         $usuariosPendientes = McafeeTransaccionPendienteQuery::create()
+                ->filterByMtpTipo(McafeeTransaccionPendiente::TIPO_ALTA)
                 ->filterByMtpEstado(McafeeTransaccionPendiente::ESTADO_PENDIENTE)
+                ->where("mcafee_transaccion_pendiente.mtp_intento <= 4")
                 ->limit($numero_usuarios_pendientes)
                 ->find();
         
@@ -54,6 +58,13 @@ class McafeeMigrarPendientesCommand extends ContainerAwareCommand {
             } else {
                 $log->debug("Transaccion a procesar :" .$mcAfeeTx->getMtrId());
                 $usuario = $usuarioPendiente->getUsuarioMcafee();
+                $usuarioMcafeeMigrar = UsuariosMcafeeMovistarMigrarQuery::create()->filterByEmailAddress($usuario->getUmcMcafeeEmail())->findOne();
+                
+                if($usuarioMcafeeMigrar->getDeviceType() == "MultiDevice") {
+                    $log->debug("registro no apto para migrar en pendientes...es multidevice el usuario ".$usuario->getUmcId());
+                    continue;
+                }
+                
                 $mcAfeeTx->generarNroReferencia();
                 $mcAfeeTx->save();
                 $xmlPartnerContext = '<PARTNERCONTEXT>
@@ -66,7 +77,7 @@ class McafeeMigrarPendientesCommand extends ContainerAwareCommand {
                          <ORDER PARTNERREF="' . $mcAfeeTx->getMtrReferencia() . '" REF="">
                          <ITEMS>
                          <ITEM SKU="' . self::SKU_DESTINY . '" QTY="1" ACTION="TU">
-                         <SOURCESKU>' . $usuario->getUmcMcafeeSku() . '</SOURCESKU></ITEM>
+                         <SOURCESKU>' . $usuarioMcafeeMigrar->getSku() . '</SOURCESKU></ITEM>
                          </ITEMS>
                          </ORDER>
                          </CUSTOMERCONTEXT>
@@ -127,6 +138,7 @@ class McafeeMigrarPendientesCommand extends ContainerAwareCommand {
                                     $mcAfeeTx->setUpdatedAt(new \DateTime());
                                     $usuario->setUmcMcafeeKeycard($arrayRespuesta['mcAfeeProductDownloadUrl']);
                                     $usuario->setUmcMcafeeStatus($arrayRespuesta['mcAfeeReturnCode']);
+                                    $usuario->setUmcMcafeeSku(self::SKU_DESTINY);
                                     $contadorIntento = $usuarioPendiente->getMtpIntento() + 1;
                                     $usuarioPendiente->setMtpEstado(McafeeTransaccionPendiente::ESTADO_EXITOSA);
                                     $usuarioPendiente->setMtpIntento($contadorIntento);

src/BackendBundle/Command/McafeeMigrarUsuariosCommand.php

@@ -48,10 +48,10 @@ class McafeeMigrarUsuariosCommand extends ContainerAwareCommand {
                 ->orderByMupId("DESC")
                 ->findOne();
         if ($ultimoIndiceUsuarioProcesado == null)
-            $condicion = "usuarios_mcafee_movistar_migrar.id > 0";
+            $condicion = "usuarios_mcafee_movistar_migrar.id > 0 and usuarios_mcafee_movistar_migrar.Device_Type != 'MultiDevice'";
         //else $condicion = "usuarios_mcafee_movistar_migrar.id > ".$ultimoIndiceUsuarioProcesado->getUltimoUmcId();
-        else $condicion = "usuarios_mcafee_movistar_migrar.id >= $limiteAuxUsuarios and usuarios_mcafee_movistar_migrar.id > ".$ultimoIndiceUsuarioProcesado->getUltimoUmcId();
-        $log->debug("condicion a analizar ".$condicion);
+        else $condicion = "usuarios_mcafee_movistar_migrar.id >= $limiteAuxUsuarios and usuarios_mcafee_movistar_migrar.id > ".$ultimoIndiceUsuarioProcesado->getUltimoUmcId()." and usuarios_mcafee_movistar_migrar.Device_Type != 'MultiDevice'";
+        $log->debug("condicion a analizar(todos menos multi-device) ".$condicion);
         $log->debug("obteniendo usuarios candidatos a migrar...");
         
         $usuariosAMigrar = UsuariosMcafeeMovistarMigrarQuery::create()
@@ -79,6 +79,13 @@ class McafeeMigrarUsuariosCommand extends ContainerAwareCommand {
             $nuevoUsuario->setUmcMcafeeEmail($usuarioMigrar->getEmailAddress());
             $nuevoUsuario->setUmcMovistarEmail($usuarioMigrar->getCorreo());
             $nuevoUsuario->setUmcMovistarRut($usuarioMigrar->getRut());
+            if($usuarioMigrar->getFonoContactoMovil1() != 0){
+                $telMovil = $usuarioMigrar->getFonoContactoMovil1();
+            }else {
+                $telMovil = $usuarioMigrar->getFonoContactoMovil2();
+            }
+            $nuevoUsuario->setUmcMovil($telMovil);
+            $nuevoUsuario->setUmcFijo($usuarioMigrar->getAreaTel());
             $nuevoUsuario->setUmcMovistarAny(explode("@", $usuarioMigrar->getEmailAddress())[0]);
             $nuevoUsuario->setUmcMovistarActivo(UsuarioMcafee::ACTIVO_MOVISTAR_TRUE);
             $nuevoUsuario->setUmcParametroEncriptado($nuevoUsuario->generarUsuarioEncriptadoParaMovistar());
@@ -163,6 +170,7 @@ class McafeeMigrarUsuariosCommand extends ContainerAwareCommand {
                                 $mcAfeeTx->setMtrReferenciaMcafee($arrayRespuesta['mcAfeeOrderRef']);
                                 $mcAfeeTx->setMtrEstado(McafeeTransaccion::ESTADO_SUCCESS);
                                 $mcAfeeTx->setMtrProductdownloadurl($arrayRespuesta['mcAfeeProductDownloadUrl']);
+                                $nuevoUsuario->setUmcMcafeeSku(self::SKU_DESTINY);
                                 $nuevoUsuario->setUmcMcafeeKeycard($arrayRespuesta['mcAfeeProductDownloadUrl']);
                                 $nuevoUsuario->setUmcMcafeeStatus($arrayRespuesta['mcAfeeReturnCode']);
                                 $nuevoUsuario->save();

src/BackendBundle/Command/McafeeNormalizacionUsuariosMigracionCommand.php

@@ -18,6 +18,8 @@ use AppBundle\Lib\Utiles;
 
 class McafeeNormalizacionUsuariosMigracionCommand extends ContainerAwareCommand
 {
+    const SKU_DESTINY = "419-92860-1usermds";
+    
     protected function configure()
     {
         $this
@@ -41,9 +43,9 @@ class McafeeNormalizacionUsuariosMigracionCommand extends ContainerAwareCommand
                 ->findOne();
         
         if ($ultimoIndiceUsuarioProcesado == null){
-            $condicion = "usuario_mcafee.umc_id > 0";
+            $condicion = "usuario_mcafee.umc_id > 0 and created_at >= '2019-05-19'";
         //else $condicion = "usuarios_mcafee_movistar_migrar.id > ".$ultimoIndiceUsuarioProcesado->getUltimoUmcId();
-        }else $condicion = "usuario_mcafee.umc_id >= 0 and usuario_mcafee.umc_id > ".$ultimoIndiceUsuarioProcesado->getUltimoUmcId();
+        }else $condicion = "usuario_mcafee.umc_id >= 0 and usuario_mcafee.umc_id > ".$ultimoIndiceUsuarioProcesado->getUltimoUmcId()." and created_at >= '2019-05-19'";
         $log->debug("condicion a analizar ".$condicion);
         $log->debug("obteniendo usuarios candidatos a migrar...");
         
@@ -68,6 +70,11 @@ class McafeeNormalizacionUsuariosMigracionCommand extends ContainerAwareCommand
                 $telMovil = $usuarioTablaMigracion->getFonoContactoMovil2();
             }
             
+            /*
+            if($usuarioTablaMigracion->getCreatedAt()->format('Y-m-d') >= '2019-05-22'){
+                $usuario->setUmcMcafeeSku(self::SKU_DESTINY);
+            }*/
+            
             $usuario->setUmcMovil($telMovil);
             $usuario->setUmcFijo($usuarioTablaMigracion->getAreaTel());
             $usuario->setUmcParametroEncriptado(Utiles::base64url_encode($strAencriptar));

src/BackendBundle/Controller/ResearchController.php

@@ -34,7 +34,10 @@ class ResearchController extends Controller {
         } else if ($tipo == "mail") {
             $usuario = UsuarioMcafeeQuery::create()->filterByUmcMovistarEmail($valorBusqueda)->filterByUmcPermiteEmail(1)->filterByUmcEliminado(UsuarioMcafee::ELIMINADO_FALSE)->findOne();
         } else if ($tipo == "rut") {
-            $usuario = UsuarioMcafeeQuery::create()->filterByUmcMovistarRut(explode($valorBusqueda, "-")[0])->filterByUmcPermiteEmail(1)->filterByUmcEliminado(UsuarioMcafee::ELIMINADO_FALSE)->findOne();
+            $log->debug("rut entrante ".$valorBusqueda);
+            $rut = explode("-",$valorBusqueda)[0];
+            $log->debug("rut a buscar...".$rut);
+            $usuario = UsuarioMcafeeQuery::create()->filterByUmcMovistarRut($rut)->filterByUmcPermiteEmail(1)->filterByUmcEliminado(UsuarioMcafee::ELIMINADO_FALSE)->findOne();
         } else if ($tipo == "any") {
             $usuario = UsuarioMcafeeQuery::create()->filterByUmcMovistarAny($valorBusqueda)->filterByUmcPermiteEmail(1)->filterByUmcEliminado(UsuarioMcafee::ELIMINADO_FALSE)->findOne();
         }