From 0cae97bf140d317c47e31e0db100466bb3081fbd Mon Sep 17 00:00:00 2001 From: bruno Date: Wed, 2 Oct 2024 15:30:54 -0400 Subject: [PATCH] =?UTF-8?q?Relat=C3=B3rio=20separado=20por=20org=5Fid=20-?= =?UTF-8?q?=20Relatorio->PBX->Geral?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- asterisk/etc_asterisk/extensions_padrao.conf | 1 + relatorios/pbx/geral/relChamRamalRamal.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/asterisk/etc_asterisk/extensions_padrao.conf b/asterisk/etc_asterisk/extensions_padrao.conf index f2d73109..c9f6ea8e 100644 --- a/asterisk/etc_asterisk/extensions_padrao.conf +++ b/asterisk/etc_asterisk/extensions_padrao.conf @@ -1465,6 +1465,7 @@ exten => s,n,Goto(s,semrota) exten => s,n,Return() exten => s,n(conta-senha),Read(CONTASENHA,appsounds/conta-e-senha,n,,20) exten => s,n,ResetCDR() +exten => s,n,Set(CDR(org_id)=${ORG_ID}) exten => s,n,Noop(CONTASENHA: ${CONTASENHA}) ;exten => s,n,AGI(conta_senha.php,${CONTASENHA},${MACRO_EXTEN}) exten => s,n,AGI(conta_senha.php,${CONTASENHA},${ARG2}) diff --git a/relatorios/pbx/geral/relChamRamalRamal.php b/relatorios/pbx/geral/relChamRamalRamal.php index af4f61cf..41436b3a 100644 --- a/relatorios/pbx/geral/relChamRamalRamal.php +++ b/relatorios/pbx/geral/relChamRamalRamal.php @@ -115,6 +115,7 @@ $ramal = $this->___ramal; $destino = $this->___destino; $duracao = $this->___tempoDuracao; + $org_id = parent::GetOrgId(); $query = "SELECT a.src, CASE WHEN (SUBSTRING(a.dst,1,1) = 'a')THEN 'anuncio' @@ -125,7 +126,8 @@ WHERE a.calldate::TIMESTAMP >= '$dataIni' AND a.calldate::TIMESTAMP <= '$dataFim' AND tplg_tipo = 1 - AND id_bilhetes = (SELECT MAX(id_bilhetes) FROM pbx_bilhetes WHERE uniqueid = a.uniqueid) "; + AND a.org_id = {$org_id} + AND id_bilhetes = (SELECT MAX(id_bilhetes) FROM pbx_bilhetes WHERE uniqueid = a.uniqueid AND org_id = {$org_id}) "; $query .= $ramal ? " AND a.src = '$ramal'" : " AND a.src <> ''"; $query .= $destino ? " AND a.dst = '$destino'" : " AND a.dst <> ''";