diff --git a/asterisk/etc_asterisk/extensions_padrao.conf b/asterisk/etc_asterisk/extensions_padrao.conf index 5766838e..8f0a395d 100644 --- a/asterisk/etc_asterisk/extensions_padrao.conf +++ b/asterisk/etc_asterisk/extensions_padrao.conf @@ -1011,10 +1011,9 @@ exten => s,n,ExecIf($["${ISNULL(${SIPPEER(${ARG1},callerid_num)})}" = "0"]?SIPAd ;exten => s,n,Set(INICIO_DIAL=${IF($[ "X${INICIO_DIAL}" = "X" ]?${EPOCH}:${INICIO_DIAL})}) exten => s,n,Set(CHANNEL(musicclass)=${IF($["X${CHANNEL(musicclass)}" = "X"]?default:${DB(MUSICA-ESPERA/${ARG1})})}) - -exten => s,n,Set(parkinglot=${channel(peername)} -exten => s,n,Set(__PARKINGDYNPOS=${channel(peername)}1-${channel(peername)}2) -exten => s,n,Set(__PARKINGDYNEXTEN=${channel(peername)}) +exten => s,n,Set(CHANNEL(parkinglot)=${CHANNEL(peername)}) +exten => s,n,Set(__PARKINGDYNPOS=${CHANNEL(peername)}1-${channel(peername)}2) +exten => s,n,Set(__PARKINGDYNEXTEN=${CHANNEL(peername)}) ;exten => s,n,Dial(${DB(DIAL/${ARG1})},${RING},TtKkg${OPCOESDIAL}rM(eventos-conecta-agente,${FILA-ORIGEM},${IDORIGEM},${MATRICULA-ORIGEM},${INICIO_DIAL},${IF($["${ISNULL(${DB(DIAL/${CALLERID(NUM)})})}" = "0"]?${CALLERID(NUM)})})) diff --git a/asterisk/var_lib_asterisk/agi-bin/pbx_complemento.php b/asterisk/var_lib_asterisk/agi-bin/pbx_complemento.php index 3948d5bb..93d70d8c 100755 --- a/asterisk/var_lib_asterisk/agi-bin/pbx_complemento.php +++ b/asterisk/var_lib_asterisk/agi-bin/pbx_complemento.php @@ -264,7 +264,7 @@ if (strtolower($contexto) == 'ext-transferencia') { } else if (strtolower($contexto) == 'ext-ramais') { mostra_parametro("EXT_RAMAIS"); - write("Database GET ORG_RAMAL". $agi['extensions']); + write("Database GET ORG_RAMAL ". $agi['extension']); $destino = substr(strrchr(read(), "("), 1, -1); $origem = $agi['callerid']; $canal = $agi['channel']; @@ -319,6 +319,7 @@ if (strtolower($contexto) == 'ext-transferencia') { read(); } + //Se houver agente logado if ($resultado) { switch (strtoupper($status)) { @@ -328,19 +329,16 @@ if (strtolower($contexto) == 'ext-transferencia') { exit; break; case 'LIVRE': - /* * Trata classificao * Verifica se a classificao esta ativa * Verifica se e exigida a classificao */ VerificaClassificacao($conexao, $fila, $matricula, $destino, $uniqueid, $classifica, "ENTRANTE", $org_id); - /* * Função retorna numero de Protocolo de Atendimento para o agente */ $protocolo = GeraProtocolo($conexao, $uniqueid); - $query = "UPDATE pbx_supervisor_agentes SET protocolo = '$protocolo', canal = '$canal', origem_destino = '$origem',status = 'CHAMANDO',duracao = 'now()',tipo_ligacao = 'E',uniqueid = '$uniqueid',uniqueid2 = '$uniqueid',tipo_discagem = 'MANUAL' where ramal = '$destino' and org_id = $org_id"; $result = pg_query($conexao, $query); diff --git a/include/util/util.php b/include/util/util.php index bc0e37f3..a92f3dfb 100755 --- a/include/util/util.php +++ b/include/util/util.php @@ -1941,11 +1941,10 @@ function VerificaClassificacao($db, $fila, $matricula, $ramal, $uniqueid, $class $query = "select a.prm_agente_classifica, b.exige_classificacao from pbx_parametros a, pbx_queues_grupos b where b.nome = '$fila' - and a.id = 1 and $org_id and a.org_id = b.org_Id"; + and a.id = 1 and a.org_id = $org_id and a.org_id = b.org_Id"; $result = pg_query($db, $query); $dados = pg_fetch_row($result); if ($dados[0] && $dados[1]) { - if ($classifica == 0) { if ($tipochamada == 'ENTRANTE') {