From 718dc51f8f07dd51f91a5ea739ebae901d009115 Mon Sep 17 00:00:00 2001
From: Matheo Bonucia <matheo.bonucia@simplesip.com.br>
Date: Tue, 20 Aug 2024 20:21:37 +0000
Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20para=20multiempresas=20nos?=
 =?UTF-8?q?=20hor=C3=A1rios=20e=20cadastro=20de=20hor=C3=A1rios?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/cadHorarios.php | 8 +++++---
 admin/horarios.php    | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/cadHorarios.php b/admin/cadHorarios.php
index 5d3673ba..b54aa6d2 100644
--- a/admin/cadHorarios.php
+++ b/admin/cadHorarios.php
@@ -232,11 +232,13 @@ function GetHorarios($dbcon, $id, $acaoH)
     $opcao_nao = $row["opcao_nao"] ? $row["opcao_nao"] : '-';
     $acao_nao = $row["acao_nao"] ? $row["acao_nao"] : '-';
 
+
+    // PBX_opcoes não deve ser buscado com org_id, pois é uma VIEW padrão e fixa para todas as empresas
     $query = "select * from ( select a.id, a.id_horario, a.horario_inicio,  a.horario_fim, a.todos_dias_semana, a.semana,
                           a.semana_fim, a.todos_dias_mes, a.dias_mes,  a.dias_mes_fim,  a.todos_mes,  a.mes,
                           a.mes_fim, b.name as opcao, a.acao as acao, case when(feriado = 'A')then 0 else 1 end as feriado
                      from pbx_horarios_itens a
-		     left outer join pbx_opcoes b on b.value = a.opcao and b.org_id = a.org_id
+		     left outer join pbx_opcoes b on b.value = a.opcao
 		     left outer join pbx_opcao_acao c on  c.opcao = a.opcao and c.id = a.acao and c.org_id = a.org_id
 		     where id_horario = $id and a.org_id = $org_id) as itens  order by feriado asc, id";
 
@@ -347,12 +349,12 @@ function GetHorarios($dbcon, $id, $acaoH)
             }
 
             if (m >= 60) {
-                m = 00;
+                m = "00";
                 h = h + 1;
             }
 
             if (h >= 24) {
-                h = 00;
+                h = "00";
             } else {
                 s = s + 1;
             }
diff --git a/admin/horarios.php b/admin/horarios.php
index 096a512e..3d4106da 100644
--- a/admin/horarios.php
+++ b/admin/horarios.php
@@ -51,7 +51,7 @@ if ($acao == "deleta") {
                 if (isset($_GET['pesquisa']) && $_GET['pesquisa']) {
                     $compl = "and (a.nome ilike '%$filtro%' or a.discar ilike '%$filtro%')";
                 }
-
+                $compl .= " and a.org_id = $org_id";
                 $query = "select id, nome, discar, opcao_ok, acao_ok, opcao_nao, acao_nao, 
                             case when((select count(*) from pbx_horarios_itens where id_horario = a.id) = 0)then 0 else status end as status 
                         from pbx_horarios a where 1=1 $compl order by nome";