added campaign override for QM callstatus option

git-svn-id: svn://192.168.202.10@1402 3d104415-ff17-0410-8863-d5cf3c621b8a

extras/MySQL_AST_CREATE_tables.sql

@@ -729,7 +729,8 @@ xferconf_c_number VARCHAR(50) default '',
 xferconf_d_number VARCHAR(50) default '',
 xferconf_e_number VARCHAR(50) default '',
 use_custom_cid ENUM('Y','N') default 'N',
-scheduled_callbacks_alert ENUM('NONE','BLINK','RED','BLINK_RED') default 'NONE'
+scheduled_callbacks_alert ENUM('NONE','BLINK','RED','BLINK_RED') default 'NONE',
+queuemetrics_callstatus_override ENUM('DISABLED','NO','YES') default 'DISABLED'
 );
 
 CREATE TABLE vicidial_lists (
@@ -2176,7 +2177,7 @@ ALTER TABLE vicidial_agent_log_archive MODIFY agent_log_id INT(9) UNSIGNED NOT N
 
 CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log;
 
-UPDATE system_settings SET db_schema_version='1211',db_schema_update_date=NOW();
+UPDATE system_settings SET db_schema_version='1212',db_schema_update_date=NOW();
 
 GRANT RELOAD ON *.* TO cron@'%';
 GRANT RELOAD ON *.* TO cron@localhost;

extras/upgrade_2.4.sql

@@ -221,3 +221,7 @@ UPDATE system_settings SET db_schema_version='1210',db_schema_update_date=NOW();
 ALTER TABLE system_settings ADD queuemetrics_callstatus ENUM('0','1') default '1';
 
 UPDATE system_settings SET db_schema_version='1211',db_schema_update_date=NOW();
+
+ALTER TABLE vicidial_campaigns ADD queuemetrics_callstatus_override ENUM('DISABLED','NO','YES') default 'DISABLED';
+
+UPDATE system_settings SET db_schema_version='1212',db_schema_update_date=NOW();

translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt

@@ -90,6 +90,8 @@ This option if set to 1 allows the user to choose if the agent has their campaig
 Click here to see a log of the uploads to the audio store||
 QueueMetrics CallStatus||
 This option if set to 0 will not put in the CALLSTATUS entry into queue_log when an agent dispositions a call. Default is 1 for enabled||
+QM CallStatus Override||
+If QueueMetrics integration is enabled in the system settings then this setting allow the overriding of the System Settings setting for CallStatus queue_log entries. Default is DISABLED which will use the system setting||
 
 
 AST_VICIDIAL_ingrouplist.php

www/agc/vdc_db_query.php

@@ -4943,7 +4943,7 @@ if ($ACTION == 'updateDISPO')
 		}
 	else
 		{
-		$stmt = "SELECT dispo_call_url from vicidial_campaigns where campaign_id='$campaign';";
+		$stmt = "SELECT dispo_call_url,queuemetrics_callstatus_override from vicidial_campaigns vc,vicidial_live_agents vla where vla.campaign_id=vc.campaign_id and vla.user='$user';";
 		if ($DB) {echo "$stmt\n";}
 		$rslt=mysql_query($stmt, $link);
 			if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00284',$user,$server_ip,$session_name,$one_mysql_log);}
@@ -4951,7 +4951,8 @@ if ($ACTION == 'updateDISPO')
 		if ($VC_dcu_ct > 0)
 			{
 			$row=mysql_fetch_row($rslt);
-			$dispo_call_url	=$row[0];
+			$dispo_call_url =						$row[0];
+			$queuemetrics_callstatus_override =		$row[1];
 			}
 
 		### reset the API fields in vicidial_live_agents record
@@ -5805,7 +5806,7 @@ if ($ACTION == 'updateDISPO')
 		}
 	##### END QUEUEMETRICS LOGGING LOOKUP #####
 	###########################################
-	if ( ($enable_queuemetrics_logging > 0) and ($queuemetrics_callstatus > 0) )
+	if ( ($enable_queuemetrics_logging > 0) and ( ( ($queuemetrics_callstatus > 0) or ($queuemetrics_callstatus_override=='YES') ) and ($queuemetrics_callstatus_override!='NO') ) )
 		{
 		$linkB=mysql_connect("$queuemetrics_server_ip", "$queuemetrics_login", "$queuemetrics_pass");
 		mysql_select_db("$queuemetrics_dbname", $linkB);