This commit is contained in:
Laurent Destailleur 2016-05-06 21:28:06 +02:00
parent 91d300289f
commit bf09e4a0b9
3 changed files with 61 additions and 24 deletions

View File

@ -17,15 +17,14 @@
*/ */
/** /**
* \file class/advtargetemailing.class.php * \file comm/mailing/class/advtargetemailing.class.php
* \ingroup advtargetemailing * \ingroup mailing
* \brief This file is an example CRUD class file (Create/Read/Update/Delete) * \brief This file is an example CRUD class file (Create/Read/Update/Delete)
*/ */
/** /**
* Put your class' description here * Class to manage advanced emailing target selector
*/ */
class AdvanceTargetingMailing extends CommonObject class AdvanceTargetingMailing extends CommonObject
{ {
@ -293,7 +292,7 @@ class AdvanceTargetingMailing extends CommonObject
* @param int $notrigger 0=launch triggers after, 1=disable triggers * @param int $notrigger 0=launch triggers after, 1=disable triggers
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
function update($user=0, $notrigger=0) function update($user, $notrigger=0)
{ {
global $conf, $langs; global $conf, $langs;
$error=0; $error=0;
@ -737,9 +736,9 @@ class AdvanceTargetingMailing extends CommonObject
* *
* @param string $column_to_test column to test * @param string $column_to_test column to test
* @param string $criteria Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, * @param string $criteria Use %% as magic caracters. For exemple to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value,
* and use ! for except this value. * and use ! for except this value.
* For exemple jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima * For exemple jean;joe;jim%%;!jimo;!jima%> will target all jean, joe, start with jim but not jimo and not everythnig taht start by jima
* @return int <0 if KO, >0 if OK * @return string Sql to use for the where condition
*/ */
public function transformToSQL($column_to_test,$criteria) { public function transformToSQL($column_to_test,$criteria) {
$return_sql_criteria = '('; $return_sql_criteria = '(';

View File

@ -17,8 +17,9 @@
*/ */
/** /**
* \file advtargetemailing/class/html.formadvtragetemaling.class.php * \file comm/mailing/class/html.formadvtragetemaling.class.php
* \brief Fichier de la classe des fonctions predefinie de composants html advtargetemaling * \ingroup mailing
* \brief Fichier de la classe des fonctions predefinie de composants html advtargetemaling
*/ */
/** /**

View File

@ -54,16 +54,37 @@ class Website extends CommonObject
public $lines = array(); public $lines = array();
/** /**
* @var int
*/ */
public $entity; public $entity;
/**
* @var string
*/
public $ref; public $ref;
/**
* @var string
*/
public $description; public $description;
/**
* @var int
*/
public $status; public $status;
public $date_creation = ''; /**
public $date_modification = ''; * @var mixed
*/
public $date_creation;
/**
* @var mixed
*/
public $date_modification;
/**
* @var mixed
*/
public $tms = ''; public $tms = '';
public $fk_default_home; /**
* @var integer
*/
public $fk_default_home;
public $records; public $records;
/** /**
@ -625,20 +646,36 @@ class WebsiteLine
*/ */
public $id; public $id;
/** /**
* @var mixed Sample line property 1 * @var int
*/ */
public $entity; public $entity;
public $ref;
public $description;
public $status;
public $fk_default_home;
public $date_creation = '';
public $date_modification = '';
public $tms = '';
/** /**
* @var mixed Sample line property 2 * @var string
*/ */
public $ref;
/**
* @var string
*/
public $description;
/**
* @var int
*/
public $status;
/**
* @var int
*/
public $fk_default_home;
/**
* @var mixed
*/
public $date_creation;
/**
* @var mixed
*/
public $date_modification;
/**
* @var mixed
*/
public $tms = '';
} }