Skip to content

GitLab

S
smsManager
Commit f4565104 authored by Ana's avatar Ana
Browse files
Options

corregir conflictos

parent 18d8efbe
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 1290 deletions
app/propel/generated-schemas/default_reversed_schema.xml
View file @ f4565104
...@@ -176,23 +176,6 @@ ...@@ -176,23 +176,6 @@
<parameter name="Engine" value="InnoDB"/> <parameter name="Engine" value="InnoDB"/>
</vendor> </vendor>
</table> </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"> <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="mup_id" phpName="MupId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="ultimo_umc_id" phpName="UltimoUmcId" type="INTEGER" required="true"/> <column name="ultimo_umc_id" phpName="UltimoUmcId" type="INTEGER" required="true"/>
...@@ -345,12 +328,6 @@ ...@@ -345,12 +328,6 @@
<index name="indice_umc_movistar_any"> <index name="indice_umc_movistar_any">
<index-column name="umc_movistar_any"/> <index-column name="umc_movistar_any"/>
</index> </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"> <vendor type="mysql">
<parameter name="Engine" value="InnoDB"/> <parameter name="Engine" value="InnoDB"/>
</vendor> </vendor>
...@@ -392,35 +369,6 @@ ...@@ -392,35 +369,6 @@
<index name="ccid"> <index name="ccid">
<index-column name="Ccid"/> <index-column name="Ccid"/>
</index> </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"> <vendor type="mysql">
<parameter name="Engine" value="InnoDB"/> <parameter name="Engine" value="InnoDB"/>
</vendor> </vendor>
......
src/AppBundle/Model/Sms.php
View file @ f4565104
...@@ -9,7 +9,7 @@ use AppBundle\Lib\Utiles; ...@@ -9,7 +9,7 @@ use AppBundle\Lib\Utiles;
class Sms extends BaseSms class Sms extends BaseSms
{ {
const ELIMINADO_TRUE=TRUE; const ELIMINADO_TRUE=TRUE;
const ELIMINADO_FALSE=FALSE; const ELIMINADO_FALSE=FALSE;
const ESTADO_PREENVIO=0; const ESTADO_PREENVIO=0;
...@@ -23,15 +23,12 @@ class Sms extends BaseSms ...@@ -23,15 +23,12 @@ class Sms extends BaseSms
const TIPO_UNITARIO = 2; const TIPO_UNITARIO = 2;
public static function enviarSms($url, $movil, UsuarioMcafee $usuarioMcafee, Batchsms $batchsms=null, $campana=0, $mensaje, $tipoSms, $transIdCliente=null, Logger $log, Container $container) { public static function enviarSms($url, $movil, UsuarioMcafee $usuarioMcafee, Batchsms $batchsms=null, $campana=0, $mensaje, $tipoSms, $transIdCliente=null, Logger $log, Container $container) {
//$FROM_EMAIL = 'no-reply@seguridadtotalmcafee.cl'; //$FROM_EMAIL = 'no-reply@seguridadtotalmcafee.cl';
//$FROM_EMAIL = 'fcastro@gearlabs.cl'; //$FROM_EMAIL = 'fcastro@gearlabs.cl';
$envioEmail = null; $envioEmail = null;
<<<<<<< HEAD
=======
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
$tag = '[enviarSms]'; $tag = '[enviarSms]';
$log->debug($tag."entrando... tipoSms:$tipoSms | campana:$campana | movil:$movil | umcId:".$usuarioMcafee->getUmcId()); $log->debug($tag."entrando... tipoSms:$tipoSms | campana:$campana | movil:$movil | umcId:".$usuarioMcafee->getUmcId());
try{ try{
...@@ -40,7 +37,7 @@ class Sms extends BaseSms ...@@ -40,7 +37,7 @@ class Sms extends BaseSms
$log->debug($tag.'generando sms...'); $log->debug($tag.'generando sms...');
$sms = new Sms(); $sms = new Sms();
if($sms != null) if($sms != null)
$sms->setBatchsmsId($batchsms->getBatchsmsId()); $sms->setBatchsmsId($batchsms->getBatchsmsId());
$sms->setSmsTipo($tipoSms); $sms->setSmsTipo($tipoSms);
$sms->setUsuarioMcafee($usuarioMcafee); $sms->setUsuarioMcafee($usuarioMcafee);
$sms->setSmsEstado(EnvioEmail::ESTADO_PREENVIO); $sms->setSmsEstado(EnvioEmail::ESTADO_PREENVIO);
...@@ -52,43 +49,22 @@ class Sms extends BaseSms ...@@ -52,43 +49,22 @@ class Sms extends BaseSms
$sms->setSmsTransIdCliente ($transIdCliente); $sms->setSmsTransIdCliente ($transIdCliente);
$sms->setSmsEliminado(EnvioEmail::ELIMINADO_FALSE); $sms->setSmsEliminado(EnvioEmail::ELIMINADO_FALSE);
$sms->save(); $sms->save();
<<<<<<< HEAD
$urlDescarga = Sms::acortarUrl($url); //$urlDescarga = Sms::acortarUrl($url);
$urlDescarga = $url;
// $urlDescarga = Sms::acortar_url($url);
//$urlDescarga = $url;
$mensaje=$mensaje . $urlDescarga; $mensaje=$mensaje . $urlDescarga;
$post['to'] = array($movil); $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; $mensaje=$mensaje . $urlDescarga;
$post['to'] = array($movil); /* $post['to'] = array($movil);
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
$post['text'] = $mensaje; $post['text'] = $mensaje;
$post['from'] = 'McAfee'; $post['from'] = 'McAfee';
$user ='GearLabs'; $user ='GearLabs';
...@@ -109,57 +85,41 @@ class Sms extends BaseSms ...@@ -109,57 +85,41 @@ class Sms extends BaseSms
print_r($result); print_r($result);
//print_r($result['error']['code']); //print_r($result['error']['code']);
$log->debug($tag.'enviando mensaje...'. $urlDescarga); $log->debug($tag.'enviando mensaje...'. $urlDescarga);*/
<<<<<<< HEAD
/***************************************/
/* $request = '{
=======
/***************************************/ /***************************************/
/* $request = '{ $request = '{
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8 "api_key":"9df2cfda7cc871680ede6ec24b4a479d",
"api_key":"9df2cfda7cc871680ede6ec24b4a479d", "report_url":"http://servidoctor.com/callback/script",
"report_url":"http://servidoctor.com/callback/script", "concat":1,
"concat":1, "messages":[
"messages":[ {
{ "from":"McAfee",
"from":"McAfee", "to":"584165388803",
"to":"584165388803", "text": "Descarga y participa por un SMART TV DE 50 pulgadas: https://cutt.ly/0i41nK",
<<<<<<< HEAD "send_at":"2018-02-18 17:30:00"
"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" $headers = array('Content-Type: application/json');
}
] $ch = curl_init('https://api.gateway360.com/api/3.0/sms/send');
}'; curl_setopt($ch, CURLOPT_POST, 1);
<<<<<<< HEAD curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
======= curl_setopt($ch, CURLOPT_POSTFIELDS, $request);
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8 curl_setopt($ch,CURLOPT_SSL_VERIFYPEER, false);
$headers = array('Content-Type: application/json'); $result = curl_exec($ch);
$ch = curl_init('https://api.gateway360.com/api/3.0/sms/send'); print_r('RESULTADO2 '.$result);
curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); if (curl_errno($ch) != 0 ){
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); die("curl error: ".curl_errno($ch));
curl_setopt($ch, CURLOPT_POSTFIELDS, $request); }
curl_setopt($ch,CURLOPT_SSL_VERIFYPEER, false);
$result = curl_exec($ch);
print_r('RESULTADO2 '.$result);
if (curl_errno($ch) != 0 ){
die("curl error: ".curl_errno($ch));
} */
/***************************************/ /***************************************/
if($result['error']['code']==0){ if($result['error']['code']==0){
...@@ -194,20 +154,13 @@ class Sms extends BaseSms ...@@ -194,20 +154,13 @@ class Sms extends BaseSms
} }
<<<<<<< HEAD
/* public static function acortar_url($url) { /* public static function acortar_url($url) {
=======
public static function acortar_url($url) {
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
$usuario = "gearlabs"; $usuario = "gearlabs";
$apikey = "R_8bf0031b8f644fec93997b7b23568b76"; $apikey = "R_8bf0031b8f644fec93997b7b23568b76";
$temp = "http://api.bit.ly/v3/shorten?login=".$usuario."&apiKey=".$apikey."&uri=".$url."&format=txt"; $temp = "http://api.bit.ly/v3/shorten?login=".$usuario."&apiKey=".$apikey."&uri=".$url."&format=txt";
return file_get_contents($temp); return file_get_contents($temp);
<<<<<<< HEAD
}*/ }*/
=======
}
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
public static function acortarUrl($data){ public static function acortarUrl($data){
$url = "http://url.gearlabs.cl/acortar"; $url = "http://url.gearlabs.cl/acortar";
......
src/AppBundle/Model/map/BatchsmsTableMap.php
View file @ f4565104
...@@ -71,24 +71,4 @@ class BatchsmsTableMap extends TableMap ...@@ -71,24 +71,4 @@ class BatchsmsTableMap extends TableMap
$this->addRelation('Sms', 'AppBundle\\Model\\Sms', RelationMap::ONE_TO_MANY, array('batchsms_id' => 'batchsms_id', ), null, null, 'Smss'); $this->addRelation('Sms', 'AppBundle\\Model\\Sms', RelationMap::ONE_TO_MANY, array('batchsms_id' => 'batchsms_id', ), null, null, 'Smss');
} // buildRelations() } // 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 } // BatchsmsTableMap
src/AppBundle/Model/map/SmsTableMap.php
View file @ f4565104
...@@ -69,24 +69,4 @@ class SmsTableMap extends TableMap ...@@ -69,24 +69,4 @@ class SmsTableMap extends TableMap
$this->addRelation('UsuarioMcafee', 'AppBundle\\Model\\UsuarioMcafee', RelationMap::MANY_TO_ONE, array('umc_id' => 'umc_id', ), null, null); $this->addRelation('UsuarioMcafee', 'AppBundle\\Model\\UsuarioMcafee', RelationMap::MANY_TO_ONE, array('umc_id' => 'umc_id', ), null, null);
} // buildRelations() } // 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 } // SmsTableMap
src/AppBundle/Model/map/UsuarioMcafeeTableMap.php
View file @ f4565104
...@@ -74,10 +74,6 @@ class UsuarioMcafeeTableMap extends TableMap ...@@ -74,10 +74,6 @@ class UsuarioMcafeeTableMap extends TableMap
$this->addRelation('EnvioEmail', 'AppBundle\\Model\\EnvioEmail', RelationMap::ONE_TO_MANY, array('umc_id' => 'umc_id', ), null, null, 'EnvioEmails'); $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('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'); $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('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'); $this->addRelation('Tracking', 'AppBundle\\Model\\Tracking', RelationMap::ONE_TO_MANY, array('umc_id' => 'umc_id', ), null, null, 'Trackings');
} // buildRelations() } // buildRelations()
......
src/AppBundle/Model/om/BaseBatchsms.php
View file @ f4565104
...@@ -1023,24 +1023,8 @@ abstract class BaseBatchsms extends BaseObject implements Persistent ...@@ -1023,24 +1023,8 @@ abstract class BaseBatchsms extends BaseObject implements Persistent
$ret = $this->preSave($con); $ret = $this->preSave($con);
if ($isInsert) { if ($isInsert) {
$ret = $ret && $this->preInsert($con); $ret = $ret && $this->preInsert($con);
<<<<<<< HEAD
} else { } else {
$ret = $ret && $this->preUpdate($con); $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) { if ($ret) {
$affectedRows = $this->doSave($con); $affectedRows = $this->doSave($con);
...@@ -2156,21 +2140,4 @@ abstract class BaseBatchsms extends BaseObject implements Persistent ...@@ -2156,21 +2140,4 @@ abstract class BaseBatchsms extends BaseObject implements Persistent
return $this->alreadyInSave; 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
View file @ f4565104
...@@ -1130,72 +1130,4 @@ abstract class BaseBatchsmsQuery extends ModelCriteria ...@@ -1130,72 +1130,4 @@ abstract class BaseBatchsmsQuery extends ModelCriteria
return $this; 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
View file @ f4565104
...@@ -980,24 +980,8 @@ abstract class BaseSms extends BaseObject implements Persistent ...@@ -980,24 +980,8 @@ abstract class BaseSms extends BaseObject implements Persistent
$ret = $this->preSave($con); $ret = $this->preSave($con);
if ($isInsert) { if ($isInsert) {
$ret = $ret && $this->preInsert($con); $ret = $ret && $this->preInsert($con);
<<<<<<< HEAD
} else { } else {
$ret = $ret && $this->preUpdate($con); $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) { if ($ret) {
$affectedRows = $this->doSave($con); $affectedRows = $this->doSave($con);
...@@ -1907,21 +1891,4 @@ abstract class BaseSms extends BaseObject implements Persistent ...@@ -1907,21 +1891,4 @@ abstract class BaseSms extends BaseObject implements Persistent
return $this->alreadyInSave; 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
View file @ f4565104
...@@ -1016,72 +1016,4 @@ abstract class BaseSmsQuery extends ModelCriteria ...@@ -1016,72 +1016,4 @@ abstract class BaseSmsQuery extends ModelCriteria
return $this; 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/BaseUsuarioMcafee.php
View file @ f4565104
...@@ -21,11 +21,6 @@ use AppBundle\Model\McafeeTransaccion; ...@@ -21,11 +21,6 @@ use AppBundle\Model\McafeeTransaccion;
use AppBundle\Model\McafeeTransaccionPendiente; use AppBundle\Model\McafeeTransaccionPendiente;
use AppBundle\Model\McafeeTransaccionPendienteQuery; use AppBundle\Model\McafeeTransaccionPendienteQuery;
use AppBundle\Model\McafeeTransaccionQuery; use AppBundle\Model\McafeeTransaccionQuery;
<<<<<<< HEAD
=======
use AppBundle\Model\McafeeUltimoProcesoNormalizacion;
use AppBundle\Model\McafeeUltimoProcesoNormalizacionQuery;
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
use AppBundle\Model\Sms; use AppBundle\Model\Sms;
use AppBundle\Model\SmsQuery; use AppBundle\Model\SmsQuery;
use AppBundle\Model\Tracking; use AppBundle\Model\Tracking;
...@@ -207,12 +202,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -207,12 +202,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
protected $collSmss; protected $collSmss;
protected $collSmssPartial; protected $collSmssPartial;
/**
* @var PropelObjectCollection|Sms[] Collection to store aggregation of Sms objects.
*/
protected $collSmss;
protected $collSmssPartial;
/** /**
* @var PropelObjectCollection|Tracking[] Collection to store aggregation of Tracking objects. * @var PropelObjectCollection|Tracking[] Collection to store aggregation of Tracking objects.
*/ */
...@@ -263,12 +252,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -263,12 +252,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
*/ */
protected $smssScheduledForDeletion = null; protected $smssScheduledForDeletion = null;
/**
* An array of objects scheduled for deletion.
* @var PropelObjectCollection
*/
protected $smssScheduledForDeletion = null;
/** /**
* An array of objects scheduled for deletion. * An array of objects scheduled for deletion.
* @var PropelObjectCollection * @var PropelObjectCollection
...@@ -535,17 +518,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -535,17 +518,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
return $this->umc_permite_sms; return $this->umc_permite_sms;
} }
/**
* Get the [umc_permite_sms] column value.
*
* @return boolean
*/
public function getUmcPermiteSms()
{
return $this->umc_permite_sms;
}
/** /**
* Get the [optionally formatted] temporal [created_at] column value. * Get the [optionally formatted] temporal [created_at] column value.
* *
...@@ -1059,35 +1031,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -1059,35 +1031,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
return $this; return $this;
} // setUmcPermiteSms() } // setUmcPermiteSms()
/**
* Sets the value of the [umc_permite_sms] column.
* Non-boolean arguments are converted using the following rules:
* * 1, '1', 'true', 'on', and 'yes' are converted to boolean true
* * 0, '0', 'false', 'off', and 'no' are converted to boolean false
* Check on string values is case insensitive (so 'FaLsE' is seen as 'false').
*
* @param boolean|integer|string $v The new value
* @return UsuarioMcafee The current object (for fluent API support)
*/
public function setUmcPermiteSms($v)
{
if ($v !== null) {
if (is_string($v)) {
$v = in_array(strtolower($v), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true;
} else {
$v = (boolean) $v;
}
}
if ($this->umc_permite_sms !== $v) {
$this->umc_permite_sms = $v;
$this->modifiedColumns[] = UsuarioMcafeePeer::UMC_PERMITE_SMS;
}
return $this;
} // setUmcPermiteSms()
/** /**
* Sets the value of [created_at] column to a normalized version of the date/time value specified. * Sets the value of [created_at] column to a normalized version of the date/time value specified.
* *
...@@ -1190,20 +1133,11 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -1190,20 +1133,11 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
$this->umc_permite_email = ($row[$startcol + 13] !== null) ? (boolean) $row[$startcol + 13] : null; $this->umc_permite_email = ($row[$startcol + 13] !== null) ? (boolean) $row[$startcol + 13] : null;
$this->umc_fecha_desuscripcion_email = ($row[$startcol + 14] !== null) ? (string) $row[$startcol + 14] : null; $this->umc_fecha_desuscripcion_email = ($row[$startcol + 14] !== null) ? (string) $row[$startcol + 14] : null;
$this->umc_movil = ($row[$startcol + 15] !== null) ? (string) $row[$startcol + 15] : null; $this->umc_movil = ($row[$startcol + 15] !== null) ? (string) $row[$startcol + 15] : null;
<<<<<<< HEAD
$this->umc_customer_id = ($row[$startcol + 16] !== null) ? (string) $row[$startcol + 16] : null; $this->umc_customer_id = ($row[$startcol + 16] !== null) ? (string) $row[$startcol + 16] : null;
$this->umc_eliminado = ($row[$startcol + 17] !== null) ? (boolean) $row[$startcol + 17] : null; $this->umc_eliminado = ($row[$startcol + 17] !== null) ? (boolean) $row[$startcol + 17] : null;
$this->umc_permite_sms = ($row[$startcol + 18] !== null) ? (boolean) $row[$startcol + 18] : null; $this->umc_permite_sms = ($row[$startcol + 18] !== null) ? (boolean) $row[$startcol + 18] : null;
$this->created_at = ($row[$startcol + 19] !== null) ? (string) $row[$startcol + 19] : null; $this->created_at = ($row[$startcol + 19] !== null) ? (string) $row[$startcol + 19] : null;
$this->updated_at = ($row[$startcol + 20] !== null) ? (string) $row[$startcol + 20] : null; $this->updated_at = ($row[$startcol + 20] !== null) ? (string) $row[$startcol + 20] : null;
=======
$this->umc_fijo = ($row[$startcol + 16] !== null) ? (string) $row[$startcol + 16] : null;
$this->umc_customer_id = ($row[$startcol + 17] !== null) ? (string) $row[$startcol + 17] : null;
$this->umc_eliminado = ($row[$startcol + 18] !== null) ? (boolean) $row[$startcol + 18] : null;
$this->umc_permite_sms = ($row[$startcol + 19] !== null) ? (boolean) $row[$startcol + 19] : null;
$this->created_at = ($row[$startcol + 20] !== null) ? (string) $row[$startcol + 20] : null;
$this->updated_at = ($row[$startcol + 21] !== null) ? (string) $row[$startcol + 21] : null;
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
$this->resetModified(); $this->resetModified();
$this->setNew(false); $this->setNew(false);
...@@ -1213,7 +1147,7 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -1213,7 +1147,7 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
} }
$this->postHydrate($row, $startcol, $rehydrate); $this->postHydrate($row, $startcol, $rehydrate);
return $startcol + 22; // 22 = UsuarioMcafeePeer::NUM_HYDRATE_COLUMNS. return $startcol + 21; // 21 = UsuarioMcafeePeer::NUM_HYDRATE_COLUMNS.
} catch (Exception $e) { } catch (Exception $e) {
throw new PropelException("Error populating UsuarioMcafee object", $e); throw new PropelException("Error populating UsuarioMcafee object", $e);
...@@ -1283,8 +1217,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -1283,8 +1217,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
$this->collSmss = null; $this->collSmss = null;
$this->collSmss = null;
$this->collTrackings = null; $this->collTrackings = null;
} // if (deep) } // if (deep)
...@@ -1483,24 +1415,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -1483,24 +1415,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
} }
} }
if ($this->smssScheduledForDeletion !== null) {
if (!$this->smssScheduledForDeletion->isEmpty()) {
foreach ($this->smssScheduledForDeletion as $sms) {
// need to save related object because we set the relation to null
$sms->save($con);
}
$this->smssScheduledForDeletion = null;
}
}
if ($this->collSmss !== null) {
foreach ($this->collSmss as $referrerFK) {
if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
$affectedRows += $referrerFK->save($con);
}
}
}
if ($this->trackingsScheduledForDeletion !== null) { if ($this->trackingsScheduledForDeletion !== null) {
if (!$this->trackingsScheduledForDeletion->isEmpty()) { if (!$this->trackingsScheduledForDeletion->isEmpty()) {
foreach ($this->trackingsScheduledForDeletion as $tracking) { foreach ($this->trackingsScheduledForDeletion as $tracking) {
...@@ -1813,14 +1727,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -1813,14 +1727,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
} }
} }
if ($this->collSmss !== null) {
foreach ($this->collSmss as $referrerFK) {
if (!$referrerFK->validate($columns)) {
$failureMap = array_merge($failureMap, $referrerFK->getValidationFailures());
}
}
}
if ($this->collTrackings !== null) { if ($this->collTrackings !== null) {
foreach ($this->collTrackings as $referrerFK) { foreach ($this->collTrackings as $referrerFK) {
if (!$referrerFK->validate($columns)) { if (!$referrerFK->validate($columns)) {
...@@ -1922,12 +1828,9 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -1922,12 +1828,9 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
return $this->getUmcPermiteSms(); return $this->getUmcPermiteSms();
break; break;
case 19: case 19:
return $this->getUmcPermiteSms();
break;
case 20:
return $this->getCreatedAt(); return $this->getCreatedAt();
break; break;
case 21: case 20:
return $this->getUpdatedAt(); return $this->getUpdatedAt();
break; break;
default: default:
...@@ -1975,20 +1878,11 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -1975,20 +1878,11 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
$keys[13] => $this->getUmcPermiteEmail(), $keys[13] => $this->getUmcPermiteEmail(),
$keys[14] => $this->getUmcFechaDesuscripcionEmail(), $keys[14] => $this->getUmcFechaDesuscripcionEmail(),
$keys[15] => $this->getUmcMovil(), $keys[15] => $this->getUmcMovil(),
<<<<<<< HEAD
$keys[16] => $this->getUmcCustomerId(), $keys[16] => $this->getUmcCustomerId(),
$keys[17] => $this->getUmcEliminado(), $keys[17] => $this->getUmcEliminado(),
$keys[18] => $this->getUmcPermiteSms(), $keys[18] => $this->getUmcPermiteSms(),
$keys[19] => $this->getCreatedAt(), $keys[19] => $this->getCreatedAt(),
$keys[20] => $this->getUpdatedAt(), $keys[20] => $this->getUpdatedAt(),
=======
$keys[16] => $this->getUmcFijo(),
$keys[17] => $this->getUmcCustomerId(),
$keys[18] => $this->getUmcEliminado(),
$keys[19] => $this->getUmcPermiteSms(),
$keys[20] => $this->getCreatedAt(),
$keys[21] => $this->getUpdatedAt(),
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
); );
$virtualColumns = $this->virtualColumns; $virtualColumns = $this->virtualColumns;
foreach ($virtualColumns as $key => $virtualColumn) { foreach ($virtualColumns as $key => $virtualColumn) {
...@@ -2008,9 +1902,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -2008,9 +1902,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
if (null !== $this->collSmss) { if (null !== $this->collSmss) {
$result['Smss'] = $this->collSmss->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); $result['Smss'] = $this->collSmss->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
} }
if (null !== $this->collSmss) {
$result['Smss'] = $this->collSmss->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
}
if (null !== $this->collTrackings) { if (null !== $this->collTrackings) {
$result['Trackings'] = $this->collTrackings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); $result['Trackings'] = $this->collTrackings->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
} }
...@@ -2106,12 +1997,9 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -2106,12 +1997,9 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
$this->setUmcPermiteSms($value); $this->setUmcPermiteSms($value);
break; break;
case 19: case 19:
$this->setUmcPermiteSms($value);
break;
case 20:
$this->setCreatedAt($value); $this->setCreatedAt($value);
break; break;
case 21: case 20:
$this->setUpdatedAt($value); $this->setUpdatedAt($value);
break; break;
} // switch() } // switch()
...@@ -2154,20 +2042,11 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -2154,20 +2042,11 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
if (array_key_exists($keys[13], $arr)) $this->setUmcPermiteEmail($arr[$keys[13]]); if (array_key_exists($keys[13], $arr)) $this->setUmcPermiteEmail($arr[$keys[13]]);
if (array_key_exists($keys[14], $arr)) $this->setUmcFechaDesuscripcionEmail($arr[$keys[14]]); if (array_key_exists($keys[14], $arr)) $this->setUmcFechaDesuscripcionEmail($arr[$keys[14]]);
if (array_key_exists($keys[15], $arr)) $this->setUmcMovil($arr[$keys[15]]); if (array_key_exists($keys[15], $arr)) $this->setUmcMovil($arr[$keys[15]]);
<<<<<<< HEAD
if (array_key_exists($keys[16], $arr)) $this->setUmcCustomerId($arr[$keys[16]]); if (array_key_exists($keys[16], $arr)) $this->setUmcCustomerId($arr[$keys[16]]);
if (array_key_exists($keys[17], $arr)) $this->setUmcEliminado($arr[$keys[17]]); if (array_key_exists($keys[17], $arr)) $this->setUmcEliminado($arr[$keys[17]]);
if (array_key_exists($keys[18], $arr)) $this->setUmcPermiteSms($arr[$keys[18]]); if (array_key_exists($keys[18], $arr)) $this->setUmcPermiteSms($arr[$keys[18]]);
if (array_key_exists($keys[19], $arr)) $this->setCreatedAt($arr[$keys[19]]); if (array_key_exists($keys[19], $arr)) $this->setCreatedAt($arr[$keys[19]]);
if (array_key_exists($keys[20], $arr)) $this->setUpdatedAt($arr[$keys[20]]); if (array_key_exists($keys[20], $arr)) $this->setUpdatedAt($arr[$keys[20]]);
=======
if (array_key_exists($keys[16], $arr)) $this->setUmcFijo($arr[$keys[16]]);
if (array_key_exists($keys[17], $arr)) $this->setUmcCustomerId($arr[$keys[17]]);
if (array_key_exists($keys[18], $arr)) $this->setUmcEliminado($arr[$keys[18]]);
if (array_key_exists($keys[19], $arr)) $this->setUmcPermiteSms($arr[$keys[19]]);
if (array_key_exists($keys[20], $arr)) $this->setCreatedAt($arr[$keys[20]]);
if (array_key_exists($keys[21], $arr)) $this->setUpdatedAt($arr[$keys[21]]);
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
} }
/** /**
...@@ -2315,12 +2194,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -2315,12 +2194,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
} }
} }
foreach ($this->getSmss() as $relObj) {
if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
$copyObj->addSms($relObj->copy($deepCopy));
}
}
foreach ($this->getTrackings() as $relObj) { foreach ($this->getTrackings() as $relObj) {
if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves
$copyObj->addTracking($relObj->copy($deepCopy)); $copyObj->addTracking($relObj->copy($deepCopy));
...@@ -2400,9 +2273,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -2400,9 +2273,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
if ('Sms' == $relationName) { if ('Sms' == $relationName) {
$this->initSmss(); $this->initSmss();
} }
if ('Sms' == $relationName) {
$this->initSmss();
}
if ('Tracking' == $relationName) { if ('Tracking' == $relationName) {
$this->initTrackings(); $this->initTrackings();
} }
...@@ -3334,256 +3204,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -3334,256 +3204,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
} }
/**
* If this collection has already been initialized with
* an identical criteria, it returns the collection.
* Otherwise if this UsuarioMcafee is new, it will return
* an empty collection; or if this UsuarioMcafee has previously
* been saved, it will retrieve related Smss from storage.
*
* This method is protected by default in order to keep the public
* api reasonable. You can provide public methods for those you
* actually need in UsuarioMcafee.
*
* @param Criteria $criteria optional Criteria object to narrow the query
* @param PropelPDO $con optional connection object
* @param string $join_behavior optional join type to use (defaults to Criteria::LEFT_JOIN)
* @return PropelObjectCollection|Sms[] List of Sms objects
*/
public function getSmssJoinBatchsms($criteria = null, $con = null, $join_behavior = Criteria::LEFT_JOIN)
{
$query = SmsQuery::create(null, $criteria);
$query->joinWith('Batchsms', $join_behavior);
return $this->getSmss($query, $con);
}
/**
* Clears out the collSmss collection
*
* This does not modify the database; however, it will remove any associated objects, causing
* them to be refetched by subsequent calls to accessor method.
*
* @return UsuarioMcafee The current object (for fluent API support)
* @see addSmss()
*/
public function clearSmss()
{
$this->collSmss = null; // important to set this to null since that means it is uninitialized
$this->collSmssPartial = null;
return $this;
}
/**
* reset is the collSmss collection loaded partially
*
* @return void
*/
public function resetPartialSmss($v = true)
{
$this->collSmssPartial = $v;
}
/**
* Initializes the collSmss collection.
*
* By default this just sets the collSmss collection to an empty array (like clearcollSmss());
* however, you may wish to override this method in your stub class to provide setting appropriate
* to your application -- for example, setting the initial array to the values stored in database.
*
* @param boolean $overrideExisting If set to true, the method call initializes
* the collection even if it is not empty
*
* @return void
*/
public function initSmss($overrideExisting = true)
{
if (null !== $this->collSmss && !$overrideExisting) {
return;
}
$this->collSmss = new PropelObjectCollection();
$this->collSmss->setModel('Sms');
}
/**
* Gets an array of Sms objects which contain a foreign key that references this object.
*
* If the $criteria is not null, it is used to always fetch the results from the database.
* Otherwise the results are fetched from the database the first time, then cached.
* Next time the same method is called without $criteria, the cached collection is returned.
* If this UsuarioMcafee is new, it will return
* an empty collection or the current collection; the criteria is ignored on a new object.
*
* @param Criteria $criteria optional Criteria object to narrow the query
* @param PropelPDO $con optional connection object
* @return PropelObjectCollection|Sms[] List of Sms objects
* @throws PropelException
*/
public function getSmss($criteria = null, PropelPDO $con = null)
{
$partial = $this->collSmssPartial && !$this->isNew();
if (null === $this->collSmss || null !== $criteria || $partial) {
if ($this->isNew() && null === $this->collSmss) {
// return empty collection
$this->initSmss();
} else {
$collSmss = SmsQuery::create(null, $criteria)
->filterByUsuarioMcafee($this)
->find($con);
if (null !== $criteria) {
if (false !== $this->collSmssPartial && count($collSmss)) {
$this->initSmss(false);
foreach ($collSmss as $obj) {
if (false == $this->collSmss->contains($obj)) {
$this->collSmss->append($obj);
}
}
$this->collSmssPartial = true;
}
$collSmss->getInternalIterator()->rewind();
return $collSmss;
}
if ($partial && $this->collSmss) {
foreach ($this->collSmss as $obj) {
if ($obj->isNew()) {
$collSmss[] = $obj;
}
}
}
$this->collSmss = $collSmss;
$this->collSmssPartial = false;
}
}
return $this->collSmss;
}
/**
* Sets a collection of Sms objects related by a one-to-many relationship
* to the current object.
* It will also schedule objects for deletion based on a diff between old objects (aka persisted)
* and new objects from the given Propel collection.
*
* @param PropelCollection $smss A Propel collection.
* @param PropelPDO $con Optional connection object
* @return UsuarioMcafee The current object (for fluent API support)
*/
public function setSmss(PropelCollection $smss, PropelPDO $con = null)
{
$smssToDelete = $this->getSmss(new Criteria(), $con)->diff($smss);
$this->smssScheduledForDeletion = $smssToDelete;
foreach ($smssToDelete as $smsRemoved) {
$smsRemoved->setUsuarioMcafee(null);
}
$this->collSmss = null;
foreach ($smss as $sms) {
$this->addSms($sms);
}
$this->collSmss = $smss;
$this->collSmssPartial = false;
return $this;
}
/**
* Returns the number of related Sms objects.
*
* @param Criteria $criteria
* @param boolean $distinct
* @param PropelPDO $con
* @return int Count of related Sms objects.
* @throws PropelException
*/
public function countSmss(Criteria $criteria = null, $distinct = false, PropelPDO $con = null)
{
$partial = $this->collSmssPartial && !$this->isNew();
if (null === $this->collSmss || null !== $criteria || $partial) {
if ($this->isNew() && null === $this->collSmss) {
return 0;
}
if ($partial && !$criteria) {
return count($this->getSmss());
}
$query = SmsQuery::create(null, $criteria);
if ($distinct) {
$query->distinct();
}
return $query
->filterByUsuarioMcafee($this)
->count($con);
}
return count($this->collSmss);
}
/**
* Method called to associate a Sms object to this object
* through the Sms foreign key attribute.
*
* @param Sms $l Sms
* @return UsuarioMcafee The current object (for fluent API support)
*/
public function addSms(Sms $l)
{
if ($this->collSmss === null) {
$this->initSmss();
$this->collSmssPartial = true;
}
if (!in_array($l, $this->collSmss->getArrayCopy(), true)) { // only add it if the **same** object is not already associated
$this->doAddSms($l);
if ($this->smssScheduledForDeletion and $this->smssScheduledForDeletion->contains($l)) {
$this->smssScheduledForDeletion->remove($this->smssScheduledForDeletion->search($l));
}
}
return $this;
}
/**
* @param Sms $sms The sms object to add.
*/
protected function doAddSms($sms)
{
$this->collSmss[]= $sms;
$sms->setUsuarioMcafee($this);
}
/**
* @param Sms $sms The sms object to remove.
* @return UsuarioMcafee The current object (for fluent API support)
*/
public function removeSms($sms)
{
if ($this->getSmss()->contains($sms)) {
$this->collSmss->remove($this->collSmss->search($sms));
if (null === $this->smssScheduledForDeletion) {
$this->smssScheduledForDeletion = clone $this->collSmss;
$this->smssScheduledForDeletion->clear();
}
$this->smssScheduledForDeletion[]= $sms;
$sms->setUsuarioMcafee(null);
}
return $this;
}
/** /**
* If this collection has already been initialized with * If this collection has already been initialized with
* an identical criteria, it returns the collection. * an identical criteria, it returns the collection.
...@@ -3927,11 +3547,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -3927,11 +3547,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
$o->clearAllReferences($deep); $o->clearAllReferences($deep);
} }
} }
if ($this->collSmss) {
foreach ($this->collSmss as $o) {
$o->clearAllReferences($deep);
}
}
if ($this->collTrackings) { if ($this->collTrackings) {
foreach ($this->collTrackings as $o) { foreach ($this->collTrackings as $o) {
$o->clearAllReferences($deep); $o->clearAllReferences($deep);
...@@ -3956,13 +3571,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent ...@@ -3956,13 +3571,6 @@ abstract class BaseUsuarioMcafee extends BaseObject implements Persistent
if ($this->collSmss instanceof PropelCollection) { if ($this->collSmss instanceof PropelCollection) {
$this->collSmss->clearIterator(); $this->collSmss->clearIterator();
} }
<<<<<<< HEAD
=======
$this->collMcafeeUltimoProcesoNormalizacions = null;
if ($this->collSmss instanceof PropelCollection) {
$this->collSmss->clearIterator();
}
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
$this->collSmss = null; $this->collSmss = null;
if ($this->collTrackings instanceof PropelCollection) { if ($this->collTrackings instanceof PropelCollection) {
$this->collTrackings->clearIterator(); $this->collTrackings->clearIterator();
......
src/AppBundle/Model/om/BaseUsuarioMcafeePeer.php
View file @ f4565104
...@@ -29,13 +29,13 @@ abstract class BaseUsuarioMcafeePeer ...@@ -29,13 +29,13 @@ abstract class BaseUsuarioMcafeePeer
const TM_CLASS = 'AppBundle\\Model\\map\\UsuarioMcafeeTableMap'; const TM_CLASS = 'AppBundle\\Model\\map\\UsuarioMcafeeTableMap';
/** The total number of columns. */ /** The total number of columns. */
const NUM_COLUMNS = 22; const NUM_COLUMNS = 21;
/** The number of lazy-loaded columns. */ /** The number of lazy-loaded columns. */
const NUM_LAZY_LOAD_COLUMNS = 0; const NUM_LAZY_LOAD_COLUMNS = 0;
/** The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */ /** The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS) */
const NUM_HYDRATE_COLUMNS = 22; const NUM_HYDRATE_COLUMNS = 21;
/** the column name for the umc_id field */ /** the column name for the umc_id field */
const UMC_ID = 'usuario_mcafee.umc_id'; const UMC_ID = 'usuario_mcafee.umc_id';
...@@ -119,21 +119,12 @@ abstract class BaseUsuarioMcafeePeer ...@@ -119,21 +119,12 @@ abstract class BaseUsuarioMcafeePeer
* e.g. UsuarioMcafeePeer::$fieldNames[UsuarioMcafeePeer::TYPE_PHPNAME][0] = 'Id' * e.g. UsuarioMcafeePeer::$fieldNames[UsuarioMcafeePeer::TYPE_PHPNAME][0] = 'Id'
*/ */
protected static $fieldNames = array ( protected static $fieldNames = array (
<<<<<<< HEAD
BasePeer::TYPE_PHPNAME => array ('UmcId', 'UmcMcafeeTipoProducto', 'UmcMcafeeAffid', 'UmcMcafeeCcid', 'UmcMcafeeEmail', 'UmcMcafeeSku', 'UmcMcafeeKeycard', 'UmcMcafeeStatus', 'UmcMovistarActivo', 'UmcMovistarAny', 'UmcMovistarEmail', 'UmcMovistarRut', 'UmcParametroEncriptado', 'UmcPermiteEmail', 'UmcFechaDesuscripcionEmail', 'UmcMovil', 'UmcCustomerId', 'UmcEliminado', 'UmcPermiteSms', 'CreatedAt', 'UpdatedAt', ), BasePeer::TYPE_PHPNAME => array ('UmcId', 'UmcMcafeeTipoProducto', 'UmcMcafeeAffid', 'UmcMcafeeCcid', 'UmcMcafeeEmail', 'UmcMcafeeSku', 'UmcMcafeeKeycard', 'UmcMcafeeStatus', 'UmcMovistarActivo', 'UmcMovistarAny', 'UmcMovistarEmail', 'UmcMovistarRut', 'UmcParametroEncriptado', 'UmcPermiteEmail', 'UmcFechaDesuscripcionEmail', 'UmcMovil', 'UmcCustomerId', 'UmcEliminado', 'UmcPermiteSms', 'CreatedAt', 'UpdatedAt', ),
BasePeer::TYPE_STUDLYPHPNAME => array ('umcId', 'umcMcafeeTipoProducto', 'umcMcafeeAffid', 'umcMcafeeCcid', 'umcMcafeeEmail', 'umcMcafeeSku', 'umcMcafeeKeycard', 'umcMcafeeStatus', 'umcMovistarActivo', 'umcMovistarAny', 'umcMovistarEmail', 'umcMovistarRut', 'umcParametroEncriptado', 'umcPermiteEmail', 'umcFechaDesuscripcionEmail', 'umcMovil', 'umcCustomerId', 'umcEliminado', 'umcPermiteSms', 'createdAt', 'updatedAt', ), BasePeer::TYPE_STUDLYPHPNAME => array ('umcId', 'umcMcafeeTipoProducto', 'umcMcafeeAffid', 'umcMcafeeCcid', 'umcMcafeeEmail', 'umcMcafeeSku', 'umcMcafeeKeycard', 'umcMcafeeStatus', 'umcMovistarActivo', 'umcMovistarAny', 'umcMovistarEmail', 'umcMovistarRut', 'umcParametroEncriptado', 'umcPermiteEmail', 'umcFechaDesuscripcionEmail', 'umcMovil', 'umcCustomerId', 'umcEliminado', 'umcPermiteSms', 'createdAt', 'updatedAt', ),
BasePeer::TYPE_COLNAME => array (UsuarioMcafeePeer::UMC_ID, UsuarioMcafeePeer::UMC_MCAFEE_TIPO_PRODUCTO, UsuarioMcafeePeer::UMC_MCAFEE_AFFID, UsuarioMcafeePeer::UMC_MCAFEE_CCID, UsuarioMcafeePeer::UMC_MCAFEE_EMAIL, UsuarioMcafeePeer::UMC_MCAFEE_SKU, UsuarioMcafeePeer::UMC_MCAFEE_KEYCARD, UsuarioMcafeePeer::UMC_MCAFEE_STATUS, UsuarioMcafeePeer::UMC_MOVISTAR_ACTIVO, UsuarioMcafeePeer::UMC_MOVISTAR_ANY, UsuarioMcafeePeer::UMC_MOVISTAR_EMAIL, UsuarioMcafeePeer::UMC_MOVISTAR_RUT, UsuarioMcafeePeer::UMC_PARAMETRO_ENCRIPTADO, UsuarioMcafeePeer::UMC_PERMITE_EMAIL, UsuarioMcafeePeer::UMC_FECHA_DESUSCRIPCION_EMAIL, UsuarioMcafeePeer::UMC_MOVIL, UsuarioMcafeePeer::UMC_CUSTOMER_ID, UsuarioMcafeePeer::UMC_ELIMINADO, UsuarioMcafeePeer::UMC_PERMITE_SMS, UsuarioMcafeePeer::CREATED_AT, UsuarioMcafeePeer::UPDATED_AT, ), BasePeer::TYPE_COLNAME => array (UsuarioMcafeePeer::UMC_ID, UsuarioMcafeePeer::UMC_MCAFEE_TIPO_PRODUCTO, UsuarioMcafeePeer::UMC_MCAFEE_AFFID, UsuarioMcafeePeer::UMC_MCAFEE_CCID, UsuarioMcafeePeer::UMC_MCAFEE_EMAIL, UsuarioMcafeePeer::UMC_MCAFEE_SKU, UsuarioMcafeePeer::UMC_MCAFEE_KEYCARD, UsuarioMcafeePeer::UMC_MCAFEE_STATUS, UsuarioMcafeePeer::UMC_MOVISTAR_ACTIVO, UsuarioMcafeePeer::UMC_MOVISTAR_ANY, UsuarioMcafeePeer::UMC_MOVISTAR_EMAIL, UsuarioMcafeePeer::UMC_MOVISTAR_RUT, UsuarioMcafeePeer::UMC_PARAMETRO_ENCRIPTADO, UsuarioMcafeePeer::UMC_PERMITE_EMAIL, UsuarioMcafeePeer::UMC_FECHA_DESUSCRIPCION_EMAIL, UsuarioMcafeePeer::UMC_MOVIL, UsuarioMcafeePeer::UMC_CUSTOMER_ID, UsuarioMcafeePeer::UMC_ELIMINADO, UsuarioMcafeePeer::UMC_PERMITE_SMS, UsuarioMcafeePeer::CREATED_AT, UsuarioMcafeePeer::UPDATED_AT, ),
BasePeer::TYPE_RAW_COLNAME => array ('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', ), BasePeer::TYPE_RAW_COLNAME => array ('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', ),
BasePeer::TYPE_FIELDNAME => array ('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', ), BasePeer::TYPE_FIELDNAME => array ('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', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
=======
BasePeer::TYPE_PHPNAME => array ('UmcId', 'UmcMcafeeTipoProducto', 'UmcMcafeeAffid', 'UmcMcafeeCcid', 'UmcMcafeeEmail', 'UmcMcafeeSku', 'UmcMcafeeKeycard', 'UmcMcafeeStatus', 'UmcMovistarActivo', 'UmcMovistarAny', 'UmcMovistarEmail', 'UmcMovistarRut', 'UmcParametroEncriptado', 'UmcPermiteEmail', 'UmcFechaDesuscripcionEmail', 'UmcMovil', 'UmcFijo', 'UmcCustomerId', 'UmcEliminado', 'UmcPermiteSms', 'CreatedAt', 'UpdatedAt', ),
BasePeer::TYPE_STUDLYPHPNAME => array ('umcId', 'umcMcafeeTipoProducto', 'umcMcafeeAffid', 'umcMcafeeCcid', 'umcMcafeeEmail', 'umcMcafeeSku', 'umcMcafeeKeycard', 'umcMcafeeStatus', 'umcMovistarActivo', 'umcMovistarAny', 'umcMovistarEmail', 'umcMovistarRut', 'umcParametroEncriptado', 'umcPermiteEmail', 'umcFechaDesuscripcionEmail', 'umcMovil', 'umcFijo', 'umcCustomerId', 'umcEliminado', 'umcPermiteSms', 'createdAt', 'updatedAt', ),
BasePeer::TYPE_COLNAME => array (UsuarioMcafeePeer::UMC_ID, UsuarioMcafeePeer::UMC_MCAFEE_TIPO_PRODUCTO, UsuarioMcafeePeer::UMC_MCAFEE_AFFID, UsuarioMcafeePeer::UMC_MCAFEE_CCID, UsuarioMcafeePeer::UMC_MCAFEE_EMAIL, UsuarioMcafeePeer::UMC_MCAFEE_SKU, UsuarioMcafeePeer::UMC_MCAFEE_KEYCARD, UsuarioMcafeePeer::UMC_MCAFEE_STATUS, UsuarioMcafeePeer::UMC_MOVISTAR_ACTIVO, UsuarioMcafeePeer::UMC_MOVISTAR_ANY, UsuarioMcafeePeer::UMC_MOVISTAR_EMAIL, UsuarioMcafeePeer::UMC_MOVISTAR_RUT, UsuarioMcafeePeer::UMC_PARAMETRO_ENCRIPTADO, UsuarioMcafeePeer::UMC_PERMITE_EMAIL, UsuarioMcafeePeer::UMC_FECHA_DESUSCRIPCION_EMAIL, UsuarioMcafeePeer::UMC_MOVIL, UsuarioMcafeePeer::UMC_FIJO, UsuarioMcafeePeer::UMC_CUSTOMER_ID, UsuarioMcafeePeer::UMC_ELIMINADO, UsuarioMcafeePeer::UMC_PERMITE_SMS, UsuarioMcafeePeer::CREATED_AT, UsuarioMcafeePeer::UPDATED_AT, ),
BasePeer::TYPE_RAW_COLNAME => array ('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', ),
BasePeer::TYPE_FIELDNAME => array ('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', ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, )
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
); );
/** /**
...@@ -143,21 +134,12 @@ abstract class BaseUsuarioMcafeePeer ...@@ -143,21 +134,12 @@ abstract class BaseUsuarioMcafeePeer
* e.g. UsuarioMcafeePeer::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 * e.g. UsuarioMcafeePeer::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
*/ */
protected static $fieldKeys = array ( protected static $fieldKeys = array (
<<<<<<< HEAD
BasePeer::TYPE_PHPNAME => array ('UmcId' => 0, 'UmcMcafeeTipoProducto' => 1, 'UmcMcafeeAffid' => 2, 'UmcMcafeeCcid' => 3, 'UmcMcafeeEmail' => 4, 'UmcMcafeeSku' => 5, 'UmcMcafeeKeycard' => 6, 'UmcMcafeeStatus' => 7, 'UmcMovistarActivo' => 8, 'UmcMovistarAny' => 9, 'UmcMovistarEmail' => 10, 'UmcMovistarRut' => 11, 'UmcParametroEncriptado' => 12, 'UmcPermiteEmail' => 13, 'UmcFechaDesuscripcionEmail' => 14, 'UmcMovil' => 15, 'UmcCustomerId' => 16, 'UmcEliminado' => 17, 'UmcPermiteSms' => 18, 'CreatedAt' => 19, 'UpdatedAt' => 20, ), BasePeer::TYPE_PHPNAME => array ('UmcId' => 0, 'UmcMcafeeTipoProducto' => 1, 'UmcMcafeeAffid' => 2, 'UmcMcafeeCcid' => 3, 'UmcMcafeeEmail' => 4, 'UmcMcafeeSku' => 5, 'UmcMcafeeKeycard' => 6, 'UmcMcafeeStatus' => 7, 'UmcMovistarActivo' => 8, 'UmcMovistarAny' => 9, 'UmcMovistarEmail' => 10, 'UmcMovistarRut' => 11, 'UmcParametroEncriptado' => 12, 'UmcPermiteEmail' => 13, 'UmcFechaDesuscripcionEmail' => 14, 'UmcMovil' => 15, 'UmcCustomerId' => 16, 'UmcEliminado' => 17, 'UmcPermiteSms' => 18, 'CreatedAt' => 19, 'UpdatedAt' => 20, ),
BasePeer::TYPE_STUDLYPHPNAME => array ('umcId' => 0, 'umcMcafeeTipoProducto' => 1, 'umcMcafeeAffid' => 2, 'umcMcafeeCcid' => 3, 'umcMcafeeEmail' => 4, 'umcMcafeeSku' => 5, 'umcMcafeeKeycard' => 6, 'umcMcafeeStatus' => 7, 'umcMovistarActivo' => 8, 'umcMovistarAny' => 9, 'umcMovistarEmail' => 10, 'umcMovistarRut' => 11, 'umcParametroEncriptado' => 12, 'umcPermiteEmail' => 13, 'umcFechaDesuscripcionEmail' => 14, 'umcMovil' => 15, 'umcCustomerId' => 16, 'umcEliminado' => 17, 'umcPermiteSms' => 18, 'createdAt' => 19, 'updatedAt' => 20, ), BasePeer::TYPE_STUDLYPHPNAME => array ('umcId' => 0, 'umcMcafeeTipoProducto' => 1, 'umcMcafeeAffid' => 2, 'umcMcafeeCcid' => 3, 'umcMcafeeEmail' => 4, 'umcMcafeeSku' => 5, 'umcMcafeeKeycard' => 6, 'umcMcafeeStatus' => 7, 'umcMovistarActivo' => 8, 'umcMovistarAny' => 9, 'umcMovistarEmail' => 10, 'umcMovistarRut' => 11, 'umcParametroEncriptado' => 12, 'umcPermiteEmail' => 13, 'umcFechaDesuscripcionEmail' => 14, 'umcMovil' => 15, 'umcCustomerId' => 16, 'umcEliminado' => 17, 'umcPermiteSms' => 18, 'createdAt' => 19, 'updatedAt' => 20, ),
BasePeer::TYPE_COLNAME => array (UsuarioMcafeePeer::UMC_ID => 0, UsuarioMcafeePeer::UMC_MCAFEE_TIPO_PRODUCTO => 1, UsuarioMcafeePeer::UMC_MCAFEE_AFFID => 2, UsuarioMcafeePeer::UMC_MCAFEE_CCID => 3, UsuarioMcafeePeer::UMC_MCAFEE_EMAIL => 4, UsuarioMcafeePeer::UMC_MCAFEE_SKU => 5, UsuarioMcafeePeer::UMC_MCAFEE_KEYCARD => 6, UsuarioMcafeePeer::UMC_MCAFEE_STATUS => 7, UsuarioMcafeePeer::UMC_MOVISTAR_ACTIVO => 8, UsuarioMcafeePeer::UMC_MOVISTAR_ANY => 9, UsuarioMcafeePeer::UMC_MOVISTAR_EMAIL => 10, UsuarioMcafeePeer::UMC_MOVISTAR_RUT => 11, UsuarioMcafeePeer::UMC_PARAMETRO_ENCRIPTADO => 12, UsuarioMcafeePeer::UMC_PERMITE_EMAIL => 13, UsuarioMcafeePeer::UMC_FECHA_DESUSCRIPCION_EMAIL => 14, UsuarioMcafeePeer::UMC_MOVIL => 15, UsuarioMcafeePeer::UMC_CUSTOMER_ID => 16, UsuarioMcafeePeer::UMC_ELIMINADO => 17, UsuarioMcafeePeer::UMC_PERMITE_SMS => 18, UsuarioMcafeePeer::CREATED_AT => 19, UsuarioMcafeePeer::UPDATED_AT => 20, ), BasePeer::TYPE_COLNAME => array (UsuarioMcafeePeer::UMC_ID => 0, UsuarioMcafeePeer::UMC_MCAFEE_TIPO_PRODUCTO => 1, UsuarioMcafeePeer::UMC_MCAFEE_AFFID => 2, UsuarioMcafeePeer::UMC_MCAFEE_CCID => 3, UsuarioMcafeePeer::UMC_MCAFEE_EMAIL => 4, UsuarioMcafeePeer::UMC_MCAFEE_SKU => 5, UsuarioMcafeePeer::UMC_MCAFEE_KEYCARD => 6, UsuarioMcafeePeer::UMC_MCAFEE_STATUS => 7, UsuarioMcafeePeer::UMC_MOVISTAR_ACTIVO => 8, UsuarioMcafeePeer::UMC_MOVISTAR_ANY => 9, UsuarioMcafeePeer::UMC_MOVISTAR_EMAIL => 10, UsuarioMcafeePeer::UMC_MOVISTAR_RUT => 11, UsuarioMcafeePeer::UMC_PARAMETRO_ENCRIPTADO => 12, UsuarioMcafeePeer::UMC_PERMITE_EMAIL => 13, UsuarioMcafeePeer::UMC_FECHA_DESUSCRIPCION_EMAIL => 14, UsuarioMcafeePeer::UMC_MOVIL => 15, UsuarioMcafeePeer::UMC_CUSTOMER_ID => 16, UsuarioMcafeePeer::UMC_ELIMINADO => 17, UsuarioMcafeePeer::UMC_PERMITE_SMS => 18, UsuarioMcafeePeer::CREATED_AT => 19, UsuarioMcafeePeer::UPDATED_AT => 20, ),
BasePeer::TYPE_RAW_COLNAME => array ('UMC_ID' => 0, 'UMC_MCAFEE_TIPO_PRODUCTO' => 1, 'UMC_MCAFEE_AFFID' => 2, 'UMC_MCAFEE_CCID' => 3, 'UMC_MCAFEE_EMAIL' => 4, 'UMC_MCAFEE_SKU' => 5, 'UMC_MCAFEE_KEYCARD' => 6, 'UMC_MCAFEE_STATUS' => 7, 'UMC_MOVISTAR_ACTIVO' => 8, 'UMC_MOVISTAR_ANY' => 9, 'UMC_MOVISTAR_EMAIL' => 10, 'UMC_MOVISTAR_RUT' => 11, 'UMC_PARAMETRO_ENCRIPTADO' => 12, 'UMC_PERMITE_EMAIL' => 13, 'UMC_FECHA_DESUSCRIPCION_EMAIL' => 14, 'UMC_MOVIL' => 15, 'UMC_CUSTOMER_ID' => 16, 'UMC_ELIMINADO' => 17, 'UMC_PERMITE_SMS' => 18, 'CREATED_AT' => 19, 'UPDATED_AT' => 20, ), BasePeer::TYPE_RAW_COLNAME => array ('UMC_ID' => 0, 'UMC_MCAFEE_TIPO_PRODUCTO' => 1, 'UMC_MCAFEE_AFFID' => 2, 'UMC_MCAFEE_CCID' => 3, 'UMC_MCAFEE_EMAIL' => 4, 'UMC_MCAFEE_SKU' => 5, 'UMC_MCAFEE_KEYCARD' => 6, 'UMC_MCAFEE_STATUS' => 7, 'UMC_MOVISTAR_ACTIVO' => 8, 'UMC_MOVISTAR_ANY' => 9, 'UMC_MOVISTAR_EMAIL' => 10, 'UMC_MOVISTAR_RUT' => 11, 'UMC_PARAMETRO_ENCRIPTADO' => 12, 'UMC_PERMITE_EMAIL' => 13, 'UMC_FECHA_DESUSCRIPCION_EMAIL' => 14, 'UMC_MOVIL' => 15, 'UMC_CUSTOMER_ID' => 16, 'UMC_ELIMINADO' => 17, 'UMC_PERMITE_SMS' => 18, 'CREATED_AT' => 19, 'UPDATED_AT' => 20, ),
BasePeer::TYPE_FIELDNAME => array ('umc_id' => 0, 'umc_mcafee_tipo_producto' => 1, 'umc_mcafee_affid' => 2, 'umc_mcafee_ccid' => 3, 'umc_mcafee_email' => 4, 'umc_mcafee_sku' => 5, 'umc_mcafee_keycard' => 6, 'umc_mcafee_status' => 7, 'umc_movistar_activo' => 8, 'umc_movistar_any' => 9, 'umc_movistar_email' => 10, 'umc_movistar_rut' => 11, 'umc_parametro_encriptado' => 12, 'umc_permite_email' => 13, 'umc_fecha_desuscripcion_email' => 14, 'umc_movil' => 15, 'umc_customer_id' => 16, 'umc_eliminado' => 17, 'umc_permite_sms' => 18, 'created_at' => 19, 'updated_at' => 20, ), BasePeer::TYPE_FIELDNAME => array ('umc_id' => 0, 'umc_mcafee_tipo_producto' => 1, 'umc_mcafee_affid' => 2, 'umc_mcafee_ccid' => 3, 'umc_mcafee_email' => 4, 'umc_mcafee_sku' => 5, 'umc_mcafee_keycard' => 6, 'umc_mcafee_status' => 7, 'umc_movistar_activo' => 8, 'umc_movistar_any' => 9, 'umc_movistar_email' => 10, 'umc_movistar_rut' => 11, 'umc_parametro_encriptado' => 12, 'umc_permite_email' => 13, 'umc_fecha_desuscripcion_email' => 14, 'umc_movil' => 15, 'umc_customer_id' => 16, 'umc_eliminado' => 17, 'umc_permite_sms' => 18, 'created_at' => 19, 'updated_at' => 20, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, ) BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, )
=======
BasePeer::TYPE_PHPNAME => array ('UmcId' => 0, 'UmcMcafeeTipoProducto' => 1, 'UmcMcafeeAffid' => 2, 'UmcMcafeeCcid' => 3, 'UmcMcafeeEmail' => 4, 'UmcMcafeeSku' => 5, 'UmcMcafeeKeycard' => 6, 'UmcMcafeeStatus' => 7, 'UmcMovistarActivo' => 8, 'UmcMovistarAny' => 9, 'UmcMovistarEmail' => 10, 'UmcMovistarRut' => 11, 'UmcParametroEncriptado' => 12, 'UmcPermiteEmail' => 13, 'UmcFechaDesuscripcionEmail' => 14, 'UmcMovil' => 15, 'UmcFijo' => 16, 'UmcCustomerId' => 17, 'UmcEliminado' => 18, 'UmcPermiteSms' => 19, 'CreatedAt' => 20, 'UpdatedAt' => 21, ),
BasePeer::TYPE_STUDLYPHPNAME => array ('umcId' => 0, 'umcMcafeeTipoProducto' => 1, 'umcMcafeeAffid' => 2, 'umcMcafeeCcid' => 3, 'umcMcafeeEmail' => 4, 'umcMcafeeSku' => 5, 'umcMcafeeKeycard' => 6, 'umcMcafeeStatus' => 7, 'umcMovistarActivo' => 8, 'umcMovistarAny' => 9, 'umcMovistarEmail' => 10, 'umcMovistarRut' => 11, 'umcParametroEncriptado' => 12, 'umcPermiteEmail' => 13, 'umcFechaDesuscripcionEmail' => 14, 'umcMovil' => 15, 'umcFijo' => 16, 'umcCustomerId' => 17, 'umcEliminado' => 18, 'umcPermiteSms' => 19, 'createdAt' => 20, 'updatedAt' => 21, ),
BasePeer::TYPE_COLNAME => array (UsuarioMcafeePeer::UMC_ID => 0, UsuarioMcafeePeer::UMC_MCAFEE_TIPO_PRODUCTO => 1, UsuarioMcafeePeer::UMC_MCAFEE_AFFID => 2, UsuarioMcafeePeer::UMC_MCAFEE_CCID => 3, UsuarioMcafeePeer::UMC_MCAFEE_EMAIL => 4, UsuarioMcafeePeer::UMC_MCAFEE_SKU => 5, UsuarioMcafeePeer::UMC_MCAFEE_KEYCARD => 6, UsuarioMcafeePeer::UMC_MCAFEE_STATUS => 7, UsuarioMcafeePeer::UMC_MOVISTAR_ACTIVO => 8, UsuarioMcafeePeer::UMC_MOVISTAR_ANY => 9, UsuarioMcafeePeer::UMC_MOVISTAR_EMAIL => 10, UsuarioMcafeePeer::UMC_MOVISTAR_RUT => 11, UsuarioMcafeePeer::UMC_PARAMETRO_ENCRIPTADO => 12, UsuarioMcafeePeer::UMC_PERMITE_EMAIL => 13, UsuarioMcafeePeer::UMC_FECHA_DESUSCRIPCION_EMAIL => 14, UsuarioMcafeePeer::UMC_MOVIL => 15, UsuarioMcafeePeer::UMC_FIJO => 16, UsuarioMcafeePeer::UMC_CUSTOMER_ID => 17, UsuarioMcafeePeer::UMC_ELIMINADO => 18, UsuarioMcafeePeer::UMC_PERMITE_SMS => 19, UsuarioMcafeePeer::CREATED_AT => 20, UsuarioMcafeePeer::UPDATED_AT => 21, ),
BasePeer::TYPE_RAW_COLNAME => array ('UMC_ID' => 0, 'UMC_MCAFEE_TIPO_PRODUCTO' => 1, 'UMC_MCAFEE_AFFID' => 2, 'UMC_MCAFEE_CCID' => 3, 'UMC_MCAFEE_EMAIL' => 4, 'UMC_MCAFEE_SKU' => 5, 'UMC_MCAFEE_KEYCARD' => 6, 'UMC_MCAFEE_STATUS' => 7, 'UMC_MOVISTAR_ACTIVO' => 8, 'UMC_MOVISTAR_ANY' => 9, 'UMC_MOVISTAR_EMAIL' => 10, 'UMC_MOVISTAR_RUT' => 11, 'UMC_PARAMETRO_ENCRIPTADO' => 12, 'UMC_PERMITE_EMAIL' => 13, 'UMC_FECHA_DESUSCRIPCION_EMAIL' => 14, 'UMC_MOVIL' => 15, 'UMC_FIJO' => 16, 'UMC_CUSTOMER_ID' => 17, 'UMC_ELIMINADO' => 18, 'UMC_PERMITE_SMS' => 19, 'CREATED_AT' => 20, 'UPDATED_AT' => 21, ),
BasePeer::TYPE_FIELDNAME => array ('umc_id' => 0, 'umc_mcafee_tipo_producto' => 1, 'umc_mcafee_affid' => 2, 'umc_mcafee_ccid' => 3, 'umc_mcafee_email' => 4, 'umc_mcafee_sku' => 5, 'umc_mcafee_keycard' => 6, 'umc_mcafee_status' => 7, 'umc_movistar_activo' => 8, 'umc_movistar_any' => 9, 'umc_movistar_email' => 10, 'umc_movistar_rut' => 11, 'umc_parametro_encriptado' => 12, 'umc_permite_email' => 13, 'umc_fecha_desuscripcion_email' => 14, 'umc_movil' => 15, 'umc_fijo' => 16, 'umc_customer_id' => 17, 'umc_eliminado' => 18, 'umc_permite_sms' => 19, 'created_at' => 20, 'updated_at' => 21, ),
BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, )
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
); );
/** /**
......
src/AppBundle/Model/om/BaseUsuarioMcafeeQuery.php
View file @ f4565104
...@@ -15,10 +15,6 @@ use \PropelPDO; ...@@ -15,10 +15,6 @@ use \PropelPDO;
use AppBundle\Model\EnvioEmail; use AppBundle\Model\EnvioEmail;
use AppBundle\Model\McafeeTransaccion; use AppBundle\Model\McafeeTransaccion;
use AppBundle\Model\McafeeTransaccionPendiente; use AppBundle\Model\McafeeTransaccionPendiente;
<<<<<<< HEAD
=======
use AppBundle\Model\McafeeUltimoProcesoNormalizacion;
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
use AppBundle\Model\Sms; use AppBundle\Model\Sms;
use AppBundle\Model\Tracking; use AppBundle\Model\Tracking;
use AppBundle\Model\UsuarioMcafee; use AppBundle\Model\UsuarioMcafee;
...@@ -90,10 +86,6 @@ use AppBundle\Model\UsuarioMcafeeQuery; ...@@ -90,10 +86,6 @@ use AppBundle\Model\UsuarioMcafeeQuery;
* @method UsuarioMcafeeQuery rightJoinSms($relationAlias = null) Adds a RIGHT 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 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 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 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 * @method UsuarioMcafeeQuery innerJoinTracking($relationAlias = null) Adds a INNER JOIN clause to the query using the Tracking relation
...@@ -248,11 +240,7 @@ abstract class BaseUsuarioMcafeeQuery extends ModelCriteria ...@@ -248,11 +240,7 @@ abstract class BaseUsuarioMcafeeQuery extends ModelCriteria
*/ */
protected function findPkSimple($key, $con) 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_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 { try {
$stmt = $con->prepare($sql); $stmt = $con->prepare($sql);
$stmt->bindValue(':p0', $key, PDO::PARAM_INT); $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
...@@ -1319,80 +1307,6 @@ abstract class BaseUsuarioMcafeeQuery extends ModelCriteria ...@@ -1319,80 +1307,6 @@ abstract class BaseUsuarioMcafeeQuery extends ModelCriteria
->useQuery($relationAlias ? $relationAlias : 'Sms', '\AppBundle\Model\SmsQuery'); ->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 * Filter the query by a related Tracking object
* *
......
src/AppBundle/Resources/config/default_reversed_schema.xml
View file @ f4565104
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<!--Autogenerated by PropelSchemaReverseTask class.--> <!--Autogenerated by PropelSchemaReverseTask class.-->
<database name="default" defaultIdMethod="native" namespace="AppBundle\Model"> <database name="default" defaultIdMethod="native" namespace="AppBundle\Model">
<<<<<<< HEAD
<table name="agente_webcall" phpName="AgenteWebcall" idMethod="native"> <table name="agente_webcall" phpName="AgenteWebcall" idMethod="native">
<column name="awe_id" phpName="AweId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/> <column name="awe_id" phpName="AweId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="awe_nombres" phpName="AweNombres" type="VARCHAR" size="200" required="false"/> <column name="awe_nombres" phpName="AweNombres" type="VARCHAR" size="200" required="false"/>
...@@ -57,30 +56,6 @@ ...@@ -57,30 +56,6 @@
</vendor> </vendor>
</table> </table>
<table name="batchsms" phpName="Batchsms" idMethod="native"> <table name="batchsms" phpName="Batchsms" idMethod="native">
=======
<table name="backend_rol" phpName="BackendRol" idMethod="native">
<column name="bro_id" phpName="BroId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="bro_rol" phpName="BroRol" type="VARCHAR" size="30" required="true"/>
<column name="bro_nombre" phpName="BroNombre" type="VARCHAR" size="100" required="false"/>
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="backend_usuario" phpName="BackendUsuario" idMethod="native">
<column name="bus_id" phpName="BusId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="bus_email" phpName="BusEmail" type="VARCHAR" size="60" required="false"/>
<column name="bus_clave" phpName="BusClave" type="VARCHAR" size="200" required="false"/>
<column name="bus_nombres" phpName="BusNombres" type="VARCHAR" size="100" required="false"/>
<column name="bus_estado" phpName="BusEstado" type="SMALLINT" required="false"/>
<column name="bus_eliminado" phpName="BusEliminado" type="BOOLEAN" size="1" required="false" defaultValue="false"/>
<behavior name="timestampable" />
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="batchsms" phpName="Batchsms" idMethod="native">
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
<column name="batchsms_id" phpName="BatchsmsId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/> <column name="batchsms_id" phpName="BatchsmsId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="batchsms_total" phpName="BatchsmsTotal" type="INTEGER" required="false"/> <column name="batchsms_total" phpName="BatchsmsTotal" type="INTEGER" required="false"/>
<column name="batchsms_procesado_ok" phpName="BatchsmsProcesadoOk" type="INTEGER" required="false"/> <column name="batchsms_procesado_ok" phpName="BatchsmsProcesadoOk" type="INTEGER" required="false"/>
...@@ -97,7 +72,6 @@ ...@@ -97,7 +72,6 @@
<column name="batchsms_bounce" phpName="BatchsmsBounce" type="INTEGER" required="false"/> <column name="batchsms_bounce" phpName="BatchsmsBounce" type="INTEGER" required="false"/>
<column name="batchsms_complaint" phpName="BatchsmsComplaint" type="INTEGER" required="false"/> <column name="batchsms_complaint" phpName="BatchsmsComplaint" type="INTEGER" required="false"/>
<column name="batchsms_eliminado" phpName="BatchsmsEliminado" type="BOOLEAN" size="1" required="false"/> <column name="batchsms_eliminado" phpName="BatchsmsEliminado" type="BOOLEAN" size="1" required="false"/>
<<<<<<< HEAD
<column name="created_at" phpName="CreatedAt" type="TIMESTAMP" required="false"/> <column name="created_at" phpName="CreatedAt" type="TIMESTAMP" required="false"/>
<column name="updated_at" phpName="UpdatedAt" type="TIMESTAMP" required="false"/> <column name="updated_at" phpName="UpdatedAt" type="TIMESTAMP" required="false"/>
<vendor type="mysql"> <vendor type="mysql">
...@@ -180,14 +154,10 @@ ...@@ -180,14 +154,10 @@
<index name="fk_suscripcion_mcafeetransaccion"> <index name="fk_suscripcion_mcafeetransaccion">
<index-column name="umc_id"/> <index-column name="umc_id"/>
</index> </index>
=======
<behavior name="timestampable" />
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
<vendor type="mysql"> <vendor type="mysql">
<parameter name="Engine" value="InnoDB"/> <parameter name="Engine" value="InnoDB"/>
</vendor> </vendor>
</table> </table>
<<<<<<< HEAD
<table name="mcafee_transaccion_pendiente" phpName="McafeeTransaccionPendiente" idMethod="native"> <table name="mcafee_transaccion_pendiente" phpName="McafeeTransaccionPendiente" idMethod="native">
<column name="mtp_id" phpName="MtpId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/> <column name="mtp_id" phpName="MtpId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/> <column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/>
...@@ -201,139 +171,11 @@ ...@@ -201,139 +171,11 @@
</foreign-key> </foreign-key>
<index name="fk_suscripcion_mcafeetransaccionpendiente"> <index name="fk_suscripcion_mcafeetransaccionpendiente">
<index-column name="umc_id"/> <index-column name="umc_id"/>
=======
<table name="backendusuario_backendrol" phpName="BackendusuarioBackendrol" idMethod="native">
<column name="bro_id" phpName="BroId" type="INTEGER" primaryKey="true" required="true"/>
<column name="bus_id" phpName="BusId" type="INTEGER" primaryKey="true" required="true"/>
<behavior name="timestampable" />
<foreign-key foreignTable="backend_usuario" name="fk_backendusuario_backendrol2" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="bus_id" foreign="bus_id"/>
</foreign-key>
<foreign-key foreignTable="backend_rol" name="fk_backendusuario_backendrol" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="bro_id" foreign="bro_id"/>
</foreign-key>
<index name="fk_backendusuario_backendrol2">
<index-column name="bus_id"/>
</index>
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="emailing" phpName="Emailing" idMethod="native">
<column name="ema_id" phpName="EmaId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="ema_total" phpName="EmaTotal" type="INTEGER" required="false"/>
<column name="ema_procesado_ok" phpName="EmaProcesadoOk" type="INTEGER" required="false"/>
<column name="ema_procesado_no_ok" phpName="EmaProcesadoNoOk" type="INTEGER" required="false"/>
<column name="ema_enviado_ok" phpName="EmaEnviadoOk" type="INTEGER" required="false"/>
<column name="ema_enviado_no_ok" phpName="EmaEnviadoNoOk" type="INTEGER" required="false"/>
<column name="ema_ya_descargo" phpName="EmaYaDescargo" type="INTEGER" required="false"/>
<column name="ema_sin_email" phpName="EmaSinEmail" type="INTEGER" required="false"/>
<column name="ema_descencriptado_ok" phpName="EmaDescencriptadoOk" type="INTEGER" required="false"/>
<column name="ema_descencriptado_no_ok" phpName="EmaDescencriptadoNoOk" type="INTEGER" required="false"/>
<column name="ema_permitido" phpName="EmaPermitido" type="INTEGER" required="false"/>
<column name="ema_no_permitido" phpName="EmaNoPermitido" type="INTEGER" required="false"/>
<column name="ema_delivery" phpName="EmaDelivery" type="INTEGER" required="false"/>
<column name="ema_bounce" phpName="EmaBounce" type="INTEGER" required="false"/>
<column name="ema_complaint" phpName="EmaComplaint" type="INTEGER" required="false"/>
<column name="ema_eliminado" phpName="EmaEliminado" type="BOOLEAN" size="1" required="false"/>
<behavior name="timestampable" />
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="envio_email" phpName="EnvioEmail" idMethod="native">
<column name="eem_id" phpName="EemId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/>
<column name="ema_id" phpName="EmaId" type="INTEGER" required="false"/>
<column name="eem_tipo" phpName="EemTipo" type="SMALLINT" required="false"/>
<column name="eem_email" phpName="EemEmail" type="VARCHAR" size="60" required="false"/>
<column name="eem_campana" phpName="EemCampana" type="VARCHAR" size="20" required="false"/>
<column name="eem_fecha_envio" phpName="EemFechaEnvio" type="TIMESTAMP" required="false"/>
<column name="eem_fecha_notificacion" phpName="EemFechaNotificacion" type="TIMESTAMP" required="false"/>
<column name="eem_trans_id_cliente" phpName="EemTransIdCliente" type="VARCHAR" size="200" required="false"/>
<column name="eem_from_email" phpName="EemFromEmail" type="VARCHAR" size="60" required="false"/>
<column name="eem_from_nombre_email" phpName="EemFromNombreEmail" type="VARCHAR" size="50" required="false"/>
<column name="eem_from_asunto" phpName="EemFromAsunto" type="VARCHAR" size="50" required="false"/>
<column name="eem_estado" phpName="EemEstado" type="SMALLINT" required="false"/>
<column name="eem_eliminado" phpName="EemEliminado" type="BOOLEAN" size="1" required="false"/>
<behavior name="timestampable" />
<foreign-key foreignTable="emailing" name="fk_emailing_envioemail" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="ema_id" foreign="ema_id"/>
</foreign-key>
<foreign-key foreignTable="usuario_mcafee" name="fk_usuariomcafee_envioemail" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="umc_id" foreign="umc_id"/>
</foreign-key>
<index name="fk_usuariomcafee_envioemail">
<index-column name="umc_id"/>
</index>
<index name="fk_emailing_envioemail">
<index-column name="ema_id"/>
</index>
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="mcafee_transaccion" phpName="McafeeTransaccion" idMethod="native">
<column name="mtr_id" phpName="MtrId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/>
<column name="mtr_tipo" phpName="MtrTipo" type="SMALLINT" required="false"/>
<column name="mtr_referencia" phpName="MtrReferencia" type="VARCHAR" size="50" required="false"/>
<column name="mtr_referencia_mcafee" phpName="MtrReferenciaMcafee" type="VARCHAR" size="50" required="false"/>
<column name="mtr_xml_envio" phpName="MtrXmlEnvio" type="LONGVARCHAR" required="false"/>
<column name="mtr_codigo_retorno" phpName="MtrCodigoRetorno" type="VARCHAR" size="20" required="false"/>
<column name="mtr_xml_respuesta" phpName="MtrXmlRespuesta" type="LONGVARCHAR" required="false"/>
<column name="mtr_estado" phpName="MtrEstado" type="SMALLINT" required="false"/>
<column name="mtr_productdownloadurl" phpName="MtrProductdownloadurl" type="VARCHAR" size="250" required="false"/>
<column name="mtr_short_productdownloadurl" phpName="MtrShortProductdownloadurl" type="VARCHAR" size="40" required="false"/>
<behavior name="timestampable" />
<foreign-key foreignTable="usuario_mcafee" name="fk_usuario_mcafeetransaccion" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="umc_id" foreign="umc_id"/>
</foreign-key>
<index name="fk_suscripcion_mcafeetransaccion">
<index-column name="umc_id"/>
</index>
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="mcafee_transaccion_pendiente" phpName="McafeeTransaccionPendiente" idMethod="native">
<column name="mtp_id" phpName="MtpId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/>
<column name="mtp_tipo" phpName="MtpTipo" type="SMALLINT" required="false"/>
<column name="mtp_estado" phpName="MtpEstado" type="SMALLINT" required="false"/>
<column name="mtp_intento" phpName="MtpIntento" type="SMALLINT" required="false"/>
<behavior name="timestampable" />
<foreign-key foreignTable="usuario_mcafee" name="fk_suscripcion_mcafeetransaccionpendiente" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="umc_id" foreign="umc_id"/>
</foreign-key>
<index name="fk_suscripcion_mcafeetransaccionpendiente">
<index-column name="umc_id"/>
</index>
<vendor type="mysql">
<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"/>
<behavior name="timestampable" />
<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"/>
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
</index> </index>
<vendor type="mysql"> <vendor type="mysql">
<parameter name="Engine" value="InnoDB"/> <parameter name="Engine" value="InnoDB"/>
</vendor> </vendor>
</table> </table>
<<<<<<< HEAD
<table name="mcafee_ultimo_proceso_migracion" phpName="McafeeUltimoProcesoMigracion" idMethod="native"> <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="mup_id" phpName="MupId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="ultimo_umc_id" phpName="UltimoUmcId" type="INTEGER" required="true"/> <column name="ultimo_umc_id" phpName="UltimoUmcId" type="INTEGER" required="true"/>
...@@ -395,84 +237,6 @@ ...@@ -395,84 +237,6 @@
</vendor> </vendor>
</table> </table>
<table name="sms" phpName="Sms" idMethod="native"> <table name="sms" phpName="Sms" idMethod="native">
=======
<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"/>
<column name="mup_cantidad_procesados" phpName="MupCantidadProcesados" type="INTEGER" required="false"/>
<column name="mup_cantidad_pendientes" phpName="MupCantidadPendientes" type="INTEGER" required="false"/>
<behavior name="timestampable" />
<foreign-key foreignTable="usuarios_mcafee_movistar_migrar" name="idx_fk_mcafee_ultimo_usuario" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="ultimo_umc_id" foreign="id"/>
</foreign-key>
<index name="idx_fk_mcafee_ultimo_usuario_idx">
<index-column name="ultimo_umc_id"/>
</index>
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="mcafee_ultimo_proceso_normalizacion" phpName="McafeeUltimoProcesoNormalizacion" idMethod="native">
<column name="mun_id" phpName="MunId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="ultimo_umc_id" phpName="UltimoUmcId" type="INTEGER" required="false"/>
<column name="mun_cantidad_procesados" phpName="MunCantidadProcesados" type="INTEGER" required="false"/>
<column name="mun_cantidad_pendientes" phpName="MunCantidadPendientes" type="INTEGER" required="false"/>
<behavior name="timestampable" />
<foreign-key foreignTable="usuario_mcafee" name="fk_ultimo_umc_id_normla" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="ultimo_umc_id" foreign="umc_id"/>
</foreign-key>
<index name="fk_ultimo_umc_id_normla_idx">
<index-column name="ultimo_umc_id"/>
</index>
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="notificacion_email" phpName="NotificacionEmail" idMethod="native">
<column name="nem_id" phpName="NemId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="eem_id" phpName="EemId" type="INTEGER" required="false"/>
<column name="nem_tipo" phpName="NemTipo" type="SMALLINT" required="false"/>
<column name="nem_mail_source" phpName="NemMailSource" type="VARCHAR" size="60" required="false"/>
<column name="nem_mail_destination" phpName="NemMailDestination" type="VARCHAR" size="60" required="false"/>
<column name="nem_mail_message_id" phpName="NemMailMessageId" type="VARCHAR" size="60" required="false"/>
<column name="nem_mail_timestamp" phpName="NemMailTimestamp" type="TIMESTAMP" required="false"/>
<column name="nem_bounce_type" phpName="NemBounceType" type="VARCHAR" size="20" required="false"/>
<column name="nem_bounce_sub_type" phpName="NemBounceSubType" type="VARCHAR" size="20" required="false"/>
<column name="nem_bounce_recipient_email_address" phpName="NemBounceRecipientEmailAddress" type="VARCHAR" size="60" required="false"/>
<column name="nem_bounce_recipient_action" phpName="NemBounceRecipientAction" type="VARCHAR" size="20" required="false"/>
<column name="nem_bounce_recipient_status" phpName="NemBounceRecipientStatus" type="VARCHAR" size="20" required="false"/>
<column name="nem_bounce_recipient_diagnostic_code" phpName="NemBounceRecipientDiagnosticCode" type="VARCHAR" size="1000" required="false"/>
<column name="nem_bounce_timestamp" phpName="NemBounceTimestamp" type="TIMESTAMP" required="false"/>
<column name="nem_complaint_user_agent" phpName="NemComplaintUserAgent" type="VARCHAR" size="1000" required="false"/>
<column name="nem_complaint_recipient_email_address" phpName="NemComplaintRecipientEmailAddress" type="VARCHAR" size="60" required="false"/>
<column name="nem_complaint_feedback_type" phpName="NemComplaintFeedbackType" type="VARCHAR" size="60" required="false"/>
<column name="nem_complaint_arrival_date" phpName="NemComplaintArrivalDate" type="TIMESTAMP" required="false"/>
<column name="nem_complaint_timestamp" phpName="NemComplaintTimestamp" type="TIMESTAMP" required="false"/>
<column name="nem_eliminado" phpName="NemEliminado" type="BOOLEAN" size="1" required="false"/>
<column name="nem_notificacion" phpName="NemNotificacion" type="LONGVARCHAR" required="false"/>
<behavior name="timestampable" />
<foreign-key foreignTable="envio_email" name="fk_envioemail_notificationemail" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="eem_id" foreign="eem_id"/>
</foreign-key>
<index name="fk_envioemail_notificationemail">
<index-column name="eem_id"/>
</index>
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="parametro_configuracion" phpName="ParametroConfiguracion" idMethod="native">
<column name="pco_id" phpName="PcoId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="pco_nombre" phpName="PcoNombre" type="VARCHAR" size="100" required="false"/>
<column name="pco_valor" phpName="PcoValor" type="VARCHAR" size="1000" required="false"/>
<column name="pco_descripcion" phpName="PcoDescripcion" type="VARCHAR" size="1000" required="false"/>
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="sms" phpName="Sms" idMethod="native">
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
<column name="sms_id" phpName="SmsId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/> <column name="sms_id" phpName="SmsId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/> <column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/>
<column name="batchsms_id" phpName="BatchsmsId" type="INTEGER" required="false"/> <column name="batchsms_id" phpName="BatchsmsId" type="INTEGER" required="false"/>
...@@ -486,12 +250,8 @@ ...@@ -486,12 +250,8 @@
<column name="sms_from_mensaje" phpName="SmsFromMensaje" type="VARCHAR" size="160" required="false"/> <column name="sms_from_mensaje" phpName="SmsFromMensaje" type="VARCHAR" size="160" required="false"/>
<column name="sms_estado" phpName="SmsEstado" type="SMALLINT" required="false"/> <column name="sms_estado" phpName="SmsEstado" type="SMALLINT" required="false"/>
<column name="sms_eliminado" phpName="SmsEliminado" type="BOOLEAN" size="1" required="false"/> <column name="sms_eliminado" phpName="SmsEliminado" type="BOOLEAN" size="1" required="false"/>
<<<<<<< HEAD
<column name="created_at" phpName="CreatedAt" type="TIMESTAMP" required="false"/> <column name="created_at" phpName="CreatedAt" type="TIMESTAMP" required="false"/>
<column name="updated_at" phpName="UpdatedAt" type="TIMESTAMP" required="false"/> <column name="updated_at" phpName="UpdatedAt" type="TIMESTAMP" required="false"/>
=======
<behavior name="timestampable" />
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
<foreign-key foreignTable="batchsms" name="fk_batchsms" onDelete="RESTRICT" onUpdate="RESTRICT"> <foreign-key foreignTable="batchsms" name="fk_batchsms" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="batchsms_id" foreign="batchsms_id"/> <reference local="batchsms_id" foreign="batchsms_id"/>
</foreign-key> </foreign-key>
...@@ -508,7 +268,6 @@ ...@@ -508,7 +268,6 @@
<parameter name="Engine" value="InnoDB"/> <parameter name="Engine" value="InnoDB"/>
</vendor> </vendor>
</table> </table>
<<<<<<< HEAD
<table name="tracking" phpName="Tracking" idMethod="native"> <table name="tracking" phpName="Tracking" idMethod="native">
<column name="tra_id" phpName="TraId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/> <column name="tra_id" phpName="TraId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/> <column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/>
...@@ -614,143 +373,4 @@ ...@@ -614,143 +373,4 @@
<parameter name="Engine" value="InnoDB"/> <parameter name="Engine" value="InnoDB"/>
</vendor> </vendor>
</table> </table>
=======
<table name="tracking" phpName="Tracking" idMethod="native">
<column name="tra_id" phpName="TraId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="umc_id" phpName="UmcId" type="INTEGER" required="false"/>
<column name="eem_id" phpName="EemId" type="INTEGER" required="false"/>
<column name="tra_tipo" phpName="TraTipo" type="SMALLINT" required="false"/>
<column name="tra_ip" phpName="TraIp" type="VARCHAR" size="20" required="false"/>
<column name="tra_url" phpName="TraUrl" type="VARCHAR" size="1000" required="false"/>
<column name="tra_referer" phpName="TraReferer" type="VARCHAR" size="1000" required="false"/>
<column name="tra_host" phpName="TraHost" type="VARCHAR" size="1000" required="false"/>
<column name="tra_procedencia" phpName="TraProcedencia" type="VARCHAR" size="50" required="false"/>
<column name="tra_user_agent" phpName="TraUserAgent" type="VARCHAR" size="1000" required="false"/>
<column name="tra_campana" phpName="TraCampana" type="VARCHAR" size="20" required="false"/>
<column name="tra_eliminado" phpName="TraEliminado" type="BOOLEAN" size="1" required="false"/>
<column name="tra_tipo_dispositivo" phpName="TraTipoDispositivo" type="SMALLINT" required="false"/>
<behavior name="timestampable" />
<foreign-key foreignTable="envio_email" name="fk_envioemail_tracking" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="eem_id" foreign="eem_id"/>
</foreign-key>
<foreign-key foreignTable="usuario_mcafee" name="fk_usuariomcafee_traking" onDelete="RESTRICT" onUpdate="RESTRICT">
<reference local="umc_id" foreign="umc_id"/>
</foreign-key>
<index name="fk_envioemail_tracking">
<index-column name="eem_id"/>
</index>
<index name="fk_usuariomcafee_traking">
<index-column name="umc_id"/>
</index>
<vendor type="mysql">
<parameter name="Engine" value="InnoDB"/>
</vendor>
</table>
<table name="usuario_mcafee" phpName="UsuarioMcafee" idMethod="native">
<column name="umc_id" phpName="UmcId" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="umc_mcafee_tipo_producto" phpName="UmcMcafeeTipoProducto" type="SMALLINT" required="false"/>
<column name="umc_mcafee_affid" phpName="UmcMcafeeAffid" type="VARCHAR" size="10" required="false"/>
<column name="umc_mcafee_ccid" phpName="UmcMcafeeCcid" type="VARCHAR" size="20" required="false"/>
<column name="umc_mcafee_email" phpName="UmcMcafeeEmail" type="VARCHAR" size="100" required="false"/>
<column name="umc_mcafee_sku" phpName="UmcMcafeeSku" type="VARCHAR" size="20" required="false"/>
<column name="umc_mcafee_keycard" phpName="UmcMcafeeKeycard" type="VARCHAR" size="1000" required="false"/>
<column name="umc_mcafee_status" phpName="UmcMcafeeStatus" type="SMALLINT" required="false"/>
<column name="umc_movistar_activo" phpName="UmcMovistarActivo" type="BOOLEAN" size="1" required="false"/>
<column name="umc_movistar_any" phpName="UmcMovistarAny" type="VARCHAR" size="20" required="false"/>
<column name="umc_movistar_email" phpName="UmcMovistarEmail" type="VARCHAR" size="100" required="false"/>
<column name="umc_movistar_rut" phpName="UmcMovistarRut" type="VARCHAR" size="20" required="false"/>
<column name="umc_parametro_encriptado" phpName="UmcParametroEncriptado" type="VARCHAR" size="300" required="false"/>
<column name="umc_permite_email" phpName="UmcPermiteEmail" type="BOOLEAN" size="1" required="false" defaultValue="true"/>
<column name="umc_fecha_desuscripcion_email" phpName="UmcFechaDesuscripcionEmail" type="TIMESTAMP" required="false"/>
<column name="umc_movil" phpName="UmcMovil" type="VARCHAR" size="200" required="false"/>
<column name="umc_fijo" phpName="UmcFijo" type="VARCHAR" size="200" required="false"/>
<column name="umc_customer_id" phpName="UmcCustomerId" type="VARCHAR" size="250" required="false"/>
<column name="umc_eliminado" phpName="UmcEliminado" type="BOOLEAN" size="1" required="false"/>
<column name="umc_permite_sms" phpName="UmcPermiteSms" type="BOOLEAN" size="1" required="true" defaultValue="true"/>
<behavior name="timestampable" />
<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>
</table>
<table name="usuarios_mcafee_movistar_migrar" phpName="UsuariosMcafeeMovistarMigrar" idMethod="native">
<column name="id" phpName="Id" type="INTEGER" primaryKey="true" autoIncrement="true" required="true"/>
<column name="id_mov" phpName="IdMov" type="INTEGER" required="false" 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"/>
<column name="id_mc" phpName="IdMc" type="INTEGER" required="true" defaultValue="0"/>
<column name="Ccid" phpName="Ccid" type="VARCHAR" size="25" required="false"/>
<column name="Email_Address" phpName="EmailAddress" type="VARCHAR" size="60" required="false"/>
<column name="New_Registration_Date" phpName="NewRegistrationDate" type="DATE" required="false"/>
<column name="Last_Login_Date" phpName="LastLoginDate" type="DATE" required="false"/>
<column name="Installation_Date" phpName="InstallationDate" type="DATE" required="false"/>
<column name="Last_Update_Date" phpName="LastUpdateDate" type="DATE" required="false"/>
<column name="License_Activity" phpName="LicenseActivity" type="VARCHAR" size="20" required="false"/>
<column name="License_Activity_Qty" phpName="LicenseActivityQty" type="INTEGER" required="false"/>
<column name="Total_Activated_Devices_PC" phpName="TotalActivatedDevicesPc" type="INTEGER" required="false"/>
<column name="Total_Activated_Devices_MAC" phpName="TotalActivatedDevicesMac" type="INTEGER" required="false"/>
<column name="Total_Activated_Devices_Mobile" phpName="TotalActivatedDevicesMobile" type="INTEGER" required="false"/>
<column name="Active_Devices_PC" phpName="ActiveDevicesPc" type="INTEGER" required="false"/>
<column name="Active_Devices_MAC" phpName="ActiveDevicesMac" type="INTEGER" required="false"/>
<column name="Active_Devices_Mobile" phpName="ActiveDevicesMobile" type="INTEGER" required="false"/>
<column name="Device_Type" phpName="DeviceType" type="VARCHAR" size="20" required="false"/>
<column name="Numero_Mcafee" phpName="NumeroMcafee" type="INTEGER" size="20" required="false"/>
<column name="sku" phpName="Sku" type="VARCHAR" size="20" required="false"/>
<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>
</table>
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
</database> </database>
src/BackendBundle/Command/McafeeEnviarSmsCommand.php
View file @ f4565104
...@@ -36,29 +36,15 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand ...@@ -36,29 +36,15 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand
$log->debug('************************Iniciando McafeeEnviarSmsCommand ************************'); $log->debug('************************Iniciando McafeeEnviarSmsCommand ************************');
$tt = new TiempoTranscurrido(); $tt = new TiempoTranscurrido();
<<<<<<< HEAD //$fp = fopen("/opt/sdp/intelsecuritymovistar/etc/sms/3_36460.csv", "r");
//$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"); $fp = fopen("C:\ana3\movistarChile\prueba.csv", "r");
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
if (!$fp) { if (!$fp) {
$log->warning('Error al intentar abrir el archivo'); $log->warning('Error al intentar abrir el archivo');
$output->writeln('Error al intentar abrir el archivo.'); $output->writeln('Error al intentar abrir el archivo.');
return; return;
} }
$urlBase = 'https://www.seguridadtotalmcafee.cl';
<<<<<<< HEAD
//$urlDescarga = $urlBase.'/#ROUTING/#CAMPANA/#STRUSUARIO/#PROCEDENCIA/#SMSID';
=======
$urlDescarga = $urlBase.'/#ROUTING/#CAMPANA/#STRUSUARIO/#PROCEDENCIA/#SMSID';
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
$tDesOK = 0; $tDesOK = 0;
$tDesNOOK = 0; $tDesNOOK = 0;
...@@ -73,7 +59,9 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand ...@@ -73,7 +59,9 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand
$count = 1; $count = 1;
$TOTAL = 0; $TOTAL = 0;
$batchsms = new Batchsms(); $batchsms = new Batchsms();
$batchsms->setBatchsmsEliminado(Batchsms::ELIMINADO_FALSE); $batchsms->setBatchsmsEliminado(Batchsms::ELIMINADO_FALSE);
$batchsms->save(); $batchsms->save();
...@@ -133,16 +121,10 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand ...@@ -133,16 +121,10 @@ class McafeeEnviarSmsCommand extends ContainerAwareCommand
$mensaje="Descarga y participa por un SMART TV DE 50: "; $mensaje="Descarga y participa por un SMART TV DE 50: ";
<<<<<<< HEAD
$urlDescarga = $usuarioMcafee->getUmcMcafeeKeycard(); $urlDescarga = $usuarioMcafee->getUmcMcafeeKeycard();
=======
>>>>>>> 1631fbd75af5098b86e14ff858d86fbf3506daf8
$sms = Sms::enviarSms($urlDescarga, $movil, $usuarioMcafee, $batchsms, $campana, $mensaje, Sms::TIPO_MASIVO,null,$log, $this->getContainer()); $sms = Sms::enviarSms($urlDescarga, $movil, $usuarioMcafee, $batchsms, $campana, $mensaje, Sms::TIPO_MASIVO,null,$log, $this->getContainer());
if($sms){ if($sms){
$tEnviadoOK++; $tEnviadoOK++;
$cont = $cont+1; $cont = $cont+1;
......
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