Add support for invitation_id

LiveHelperChat · Jul 26, 2018 · 9ad938f · 9ad938f
1 parent 902e506
commit 9ad938f
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 1 deletion.
diff --git a/classes/erlhcoreclassmodeleschat.php b/classes/erlhcoreclassmodeleschat.php
@@ -73,6 +73,7 @@ public function getState()
             'msg_system' => $this->msg_system,
             'pnd_time' => $this->pnd_time,
             'cls_time' => $this->cls_time,
+            'invitation_id' => $this->invitation_id,
         );
 
         erLhcoreClassChatEventDispatcher::getInstance()->dispatch('elasticsearch.getstate', array(
@@ -187,4 +188,5 @@ public function __get($var)
     public $msg_system = null;
     public $pnd_time = null;
     public $cls_time = null;
+    public $invitation_id = null;
 }
diff --git a/classes/filter/chat_list.php b/classes/filter/chat_list.php
@@ -62,6 +62,18 @@
         )
 );
 
+$fieldsSearch['invitation_id'] = array (
+    'type' => 'text',
+    'trans' => 'Invitation',
+    'required' => false,
+    'valid_if_filled' => false,
+    'filter_type' => 'filter',
+    'filter_table_field' => 'invitation_id',
+    'validation_definition' => new ezcInputFormDefinitionElement(
+        ezcInputFormDefinitionElement::OPTIONAL, 'int', array( 'min_range' => 1)
+        )
+);
+
 $fieldsSearch['department_group_id'] = array (
     'type' => 'text',
     'trans' => 'Department group',

diff --git a/classes/lhelasticsearchindex.php b/classes/lhelasticsearchindex.php
@@ -106,6 +106,7 @@ public static function indexChats($params)
             $esChat->usaccept = $item->usaccept;
             $esChat->lsync = $item->lsync;
             $esChat->auto_responder_id = $item->auto_responder_id;
+            $esChat->invitation_id = $item->invitation_id;
 
             // Extensions can append custom value
             erLhcoreClassChatEventDispatcher::getInstance()->dispatch('elasticsearch.indexchat', array(

diff --git a/design/elasticsearchtheme/tpl/elasticsearch/parts/filter.tpl.php b/design/elasticsearchtheme/tpl/elasticsearch/parts/filter.tpl.php
@@ -38,6 +38,19 @@
 		  </div>
 		</div>
 
+        <div class="col-md-2">
+            <div class="form-group">
+                <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/lists/search_panel','Invitation');?></label>
+                <?php echo erLhcoreClassRenderHelper::renderCombobox( array (
+                    'input_name'     => 'invitation_id',
+                    'optional_field' => erTranslationClassLhTranslation::getInstance()->getTranslation('chat/lists/search_panel','Choose proactive invitation'),
+                    'selected_id'    => $input->invitation_id,
+                    'css_class'      => 'form-control',
+                    'list_function'  => 'erLhAbstractModelProactiveChatInvitation::getList'
+                )); ?>
+            </div>
+        </div>
+
         <div class="col-md-3">
             <div class="form-group">
                 <label><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('chat/lists/search_panel','Department group');?></label>

diff --git a/doc/structure_elastic.json b/doc/structure_elastic.json
@@ -70,6 +70,9 @@
 			"chat_duration": {
 			    "type": "integer"
 			},
+			"invitation_id": {
+			    "type": "integer"
+			},
 			"transfer_timeout_ts": {
 			    "type": "integer"
 			},

diff --git a/modules/lhelasticsearch/list.php b/modules/lhelasticsearch/list.php
@@ -72,6 +72,10 @@
         $sparams['body']['query']['bool']['must'][]['term']['dep_id'] = (int)trim($filterParams['input_form']->department_id);
     }
 
+    if (trim($filterParams['input_form']->invitation_id) != '') {
+        $sparams['body']['query']['bool']['must'][]['term']['invitation_id'] = (int)trim($filterParams['input_form']->invitation_id);
+    }
+
     if (trim($filterParams['input_form']->department_group_id) != '') {
         $db = ezcDbInstance::get();
         $stmt = $db->prepare('SELECT dep_id FROM lh_departament_group_member WHERE dep_group_id = :group_id');

diff --git a/modules/lhelasticsearch/module.php b/modules/lhelasticsearch/module.php
@@ -13,7 +13,7 @@
 
 $ViewList['list'] = array(
     'params' => array(),
-    'uparams' => array('attr_int_1','attr_int_2','attr_int_3','attr_int_4','attr_int_5','attr_int_6','attr_int_7','attr_int_8','attr_int_9','search_in','sort_chat','keyword','tab','chat_id','message_text','nick','sort_msg','email','user_id','department_id','timefrom','timefrom_minutes','timefrom_hours','timeto','timeto_minutes','timeto_hours','department_group_id','group_id'),
+    'uparams' => array('invitation_id','attr_int_1','attr_int_2','attr_int_3','attr_int_4','attr_int_5','attr_int_6','attr_int_7','attr_int_8','attr_int_9','search_in','sort_chat','keyword','tab','chat_id','message_text','nick','sort_msg','email','user_id','department_id','timefrom','timefrom_minutes','timefrom_hours','timeto','timeto_minutes','timeto_hours','department_group_id','group_id'),
     'multiple_arguments' => array('search_in'),
     'functions' => array('configure')
 );