Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolvendo [#213] #594

Merged
merged 14 commits into from
Jun 19, 2024
Merged

Resolvendo [#213] #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
402e9fa
Resolvendo [#213]
nicolly015 Jun 6, 2024
8287c2d
Resolvendo [#212]
nicolly015 Jun 7, 2024
1adef9e
Resolvendo [#211]
nicolly015 Jun 12, 2024
2546841
Resolvendo [#210]
nicolly015 Jun 12, 2024
317a1da
Resolvendo [#209]
nicolly015 Jun 12, 2024
2cc3034
Resolvendo [#208]
nicolly015 Jun 12, 2024
ace575f
Resolvendo [#206]
nicolly015 Jun 13, 2024
65567e0
Resolvendo [#204]
nicolly015 Jun 13, 2024
4f2faa0
Resolvendo [#203]
nicolly015 Jun 13, 2024
7785db9
Resolvendo [#202]
nicolly015 Jun 14, 2024
81e2c62
Resolvendo conflito entre as branchs
nicolly015 Jun 19, 2024
b511425
Resolvendo conflito entre as branchs
nicolly015 Jun 19, 2024
85b7285
Resolvendo conflito entre as branchs
nicolly015 Jun 19, 2024
3e0a75e
Merge branch 'pre-release' into nicolly2024
nicolly015 Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions html/socio/sistema/controller/deletar_socios.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
<?php
require("../../conexao.php");

$resultado = false;
if(isset($_REQUEST['chave'])){
$chave = $_REQUEST['chave'];
if($chave === "h)8^#w4T<HaN-GSc&BM3[<?mvG[R?b"){
$chave_correta = "h)8^#w4T<HaN-GSc&BM3[<?mvG[R?b";

if(isset($_GET['chave'])){
$chave = $_GET['chave'];

$chave_hash = hash('sha256', $chave);
$chave_correta_hash = hash('sha256', $chave_correta);

if($chave_hash === $chave_correta_hash){
$tabelas = array("endereco","pessoafisica","pessoajuridica","socio");
$i = 0;
mysqli_query($conexao,"SET FOREIGN_KEY_CHECKS=0");
foreach ($tabelas as $n => $tabela) {
$r_query = mysqli_query($conexao, "TRUNCATE TABLE $tabela");
$verif_tabela = mysqli_real_escape_string($conexao, $tabela);

$r_query = mysqli_query($conexao, "TRUNCATE TABLE $verif_tabela");
if(mysqli_affected_rows($conexao)) $i++;

if (!$r_query) {
$resultado = false;
mysqli_query($conexao, "SET FOREIGN_KEY_CHECKS=1");
die(json_encode($resultado));
}
}
$resultado = true;
mysqli_query($conexao,"SET FOREIGN_KEY_CHECKS=1");
Expand Down
37 changes: 22 additions & 15 deletions html/socio/sistema/controller/editar_boletofacil.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
<?php
require("../../conexao.php");
if(!isset($_POST) or empty($_POST)){
if(!isset($_POST) or empty($_POST)){
$data = file_get_contents( "php://input" );
$data = json_decode( $data, true );
$data = json_decode( $data, true );
$_POST = $data;
}else if(is_string($_POST)){
$_POST = json_decode($_POST, true);
}
// var_dump($_POST);
$res = false;
$api = $_POST['url'];
$token = $_POST['token'];
$val_min_boleto_uni = $_POST['val_min_boleto_uni'];
$max_dias_pos_venc = $_POST['max_dias_pos_venc'];
$val_min_parcela= $_POST['val_min_parcela'];
$val_max_parcela = $_POST['val_max_parcela'];
$juros = $_POST['juros'];
$multa = $_POST['multa'];
$agradecimento = $_POST['agradecimento'];
if(mysqli_query($conexao, "UPDATE `infoboletofacil` SET `api`='$api',`token_api`='$token',`val_min_boleto_uni`=$val_min_boleto_uni,`max_dias_pos_venc`= $max_dias_pos_venc ,`juros(%)`=$juros,`multa(%)`=$multa,`val_max_parcela`=$val_max_parcela,`val_min_parcela`=$val_min_parcela,`agradecimento`='$agradecimento' WHERE 1")){
$res = true;
try {
// var_dump($_POST);
$res = false;
$api = (isset($_POST['url']) && $_POST['url'] != null) ? $_POST['url'] : "";
$token = (isset($_POST['token']) && $_POST['token'] != null) ? htmlspecialchars($_POST['token'], ENT_QUOTES, 'UTF-8') : "";
$val_min_boleto_uni = (isset($_POST['val_min_boleto_uni']) && $_POST['val_min_boleto_uni'] != null) ? floatval($_POST['val_min_boleto_uni']) : "";
$max_dias_pos_venc = (isset($_POST['max_dias_pos_venc']) && $_POST['max_dias_pos_venc'] != null) ? intval($_POST['max_dias_pos_venc']) : "";
$val_min_parcela= (isset($_POST['val_min_parcela']) && $_POST['val_min_parcela'] != null) ? floatval($_POST['val_min_parcela']) : "";
$val_max_parcela = (isset($_POST['val_max_parcela']) && $_POST['val_max_parcela'] != null) ? floatval($_POST['val_max_parcela']) : "";
$juros = (isset($_POST['juros']) && $_POST['juros'] != null) ? floatval($_POST['juros']) : "";
$multa = (isset($_POST['multa']) && $_POST['multa'] != null) ? floatval($_POST['multa']) : "";
$agradecimento = (isset($_POST['agradecimento']) && $_POST['agradecimento'] != null) ? htmlspecialchars($_POST['agradecimento'], ENT_QUOTES, 'UTF-8') : "";
if(mysqli_query($conexao, "UPDATE `infoboletofacil` SET `api`='$api',`token_api`='$token',`val_min_boleto_uni`=$val_min_boleto_uni,`max_dias_pos_venc`= $max_dias_pos_venc ,`juros(%)`=$juros,`multa(%)`=$multa,`val_max_parcela`=$val_max_parcela,`val_min_parcela`=$val_min_parcela,`agradecimento`='$agradecimento' WHERE 1")){
$res = true;
}
} catch (Exception $e) {

error_log($e->getMessage());
$res = false;
}

echo json_encode($res);
?>
8 changes: 3 additions & 5 deletions html/socio/sistema/controller/import_conteudo_cobrancas.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<?php
$locale = ( isset($_COOKIE['locale']) ) ?
$_COOKIE['locale'] :
$_SERVER['HTTP_ACCEPT_LANGUAGE'];
$locale = (isset($_COOKIE['locale'])) ? filter_var($_COOKIE['locale'], FILTER_SANITIZE_STRING) : filter_var($_SERVER['HTTP_ACCEPT_LANGUAGE'], FILTER_SANITIZE_STRING);
setlocale(LC_ALL, $locale);
?>

Expand Down Expand Up @@ -53,12 +51,12 @@
<div class="box-body box_tabela_cobranca">
<?php
if(isset($_GET['msg_c'])){
$msg = $_GET['msg_c'];
$msg = htmlspecialchars($_GET['msg_c']);
echo('<div class="alert alert-success" role="alert">
'. $msg .'
</div>');
}else if(isset($_GET['msg_e'])){
$msg = $_GET['msg_e'];
$msg = htmlspecialchars($_GET['msg_e']);
echo('<div class="alert alert-danger" role="alert">
'. $msg .'
</div>');
Expand Down
10 changes: 8 additions & 2 deletions html/socio/sistema/controller/import_conteudo_gerarcontribuicao.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,14 @@
?>
<input type="hidden" id="id_socio" name="id_socio" value="<?php echo($id_socio); ?>">
<?php
$resultado = mysqli_query($conexao, "SELECT *, s.id_socio as socioid FROM socio AS s LEFT JOIN pessoa AS p ON s.id_pessoa = p.id_pessoa LEFT JOIN socio_tipo AS st ON s.id_sociotipo = st.id_sociotipo LEFT JOIN (SELECT id_socio, MAX(data) AS ultima_data_doacao FROM log_contribuicao GROUP BY id_socio) AS lc ON lc.id_socio = s.id_socio WHERE s.id_socio = $id_socio");
$registro = mysqli_fetch_assoc($resultado);
$id_socio = mysqli_real_escape_string($conexao, $id_socio);

$stmt = $conexao->prepare("SELECT *, s.id_socio as socioid FROM socio AS s LEFT JOIN pessoa AS p ON s.id_pessoa = p.id_pessoa LEFT JOIN socio_tipo AS st ON s.id_sociotipo = st.id_sociotipo LEFT JOIN (SELECT id_socio, MAX(data) AS ultima_data_doacao FROM log_contribuicao GROUP BY id_socio) AS lc ON lc.id_socio = s.id_socio WHERE s.id_socio = ?");
$stmt->bind_param("i", $id_socio);
$stmt->execute();
$resultado = $stmt->get_result();
$registro = $resultado->fetch_assoc();

$nome_socio = $registro['nome'];
$email = $registro['email'];
$telefone = $registro['telefone'];
Expand Down
62 changes: 39 additions & 23 deletions html/socio/sistema/controller/import_conteudo_graficos.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
</thead>
<tbody>
<?php
try {
$fisica = 0;
$juridica = 0;
$socios_atrasados = 0;
Expand Down Expand Up @@ -96,13 +97,13 @@
$class = "bg-danger";
}
}
$id = $resultado['socioid'];
$cpf_cnpj = $resultado['cpf'];
$nome_s = $resultado['nome'];
$email = $resultado['email'];
$telefone = $resultado['telefone'];
$tipo_socio = $resultado['tipo'];
$endereco = $resultado['logradouro']." ".$resultado['numero_endereco'].", ".$resultado['bairro'].", ".$resultado['cidade']." - ".$resultado['estado'];
$id = htmlspecialchars($resultado['socioid']);
$cpf_cnpj = htmlspecialchars($resultado['cpf']);
$nome_s = htmlspecialchars($resultado['nome']);
$email = htmlspecialchars($resultado['email']);
$telefone = htmlspecialchars($resultado['telefone']);
$tipo_socio = htmlspecialchars($resultado['tipo']);
$endereco = htmlspecialchars($resultado['logradouro']." ".$resultado['numero_endereco'].", ".$resultado['bairro'].", ".$resultado['cidade']." - ".$resultado['estado']);
if(strlen($telefone) == 14){
$tel_url = preg_replace("/[^0-9]/", "", $telefone);
$telefone = "<a target='_blank' href='http://wa.me/55$tel_url'>$telefone</a>";
Expand All @@ -118,6 +119,9 @@
$del_json = json_encode(array("id"=>$id,"nome"=>$nome_s,"pessoa"=>$pessoa));
echo("<tr><td >$id</td><td onclick='detalhar_socio($id);' style='cursor: pointer' class='$class'>$nome_s</td><td><a href='mailto:$email'>$email</a></td><td>$telefone</td><td>$endereco</td><td>$cpf_cnpj</td><td>$tipo_socio</td><td><a href='editar_socio.php?socio=$id'><button type='button' class='btn btn-default btn-flat'><i class='fa fa-edit'></i></button></a></td><td><button onclick='deletar_socio_modal($del_json)' type='button' class='btn btn-default btn-flat'><i class='fa fa-remove text-red'></i></button></td></tr>");
}
} catch(Exception $e) {
throw new Exception("Erro genérico: " . $e->getMessage(), 2);
}
?>
</tbody>
<tfoot>
Expand Down Expand Up @@ -170,6 +174,7 @@
</body>
<script>
function gerarCargo(){
try {
url = '../../dao/exibir_cargo.php';
$.ajax({
data: '',
Expand All @@ -185,29 +190,37 @@ function gerarCargo(){
},
dataType: 'json'
});
} catch(Exception $e) {
throw new Exception("Erro genérico: " . $e->getMessage(), 2);
}
}

function adicionar_cargo(){
url = '../../dao/adicionar_cargo.php';
var cargo = window.prompt("Cadastre um Novo Cargo:");
if(!cargo){return}
situacao = cargo.trim();
if(cargo == ''){return}
try{
url = '../../dao/adicionar_cargo.php';
var cargo = window.prompt("Cadastre um Novo Cargo:");
if(!cargo){return}
situacao = cargo.trim();
if(cargo == ''){return}

data = 'cargo=' +cargo;
console.log(data);
$.ajax({
type: "POST",
url: url,
data: data,
success: function(response){
gerarCargo();
},
dataType: 'text'
})
data = 'cargo=' +cargo;
console.log(data);
$.ajax({
type: "POST",
url: url,
data: data,
success: function(response){
gerarCargo();
},
dataType: 'text'
})
} catch(Exception $e) {
throw new Exception("Erro genérico: " . $e->getMessage(), 2);
}
}

function verificar_recursos_cargo(cargo_id){
try{
url = '../../dao/verificar_recursos_cargo.php';
data = 'cargo=' +cargo_id;
console.log(data);
Expand All @@ -225,6 +238,9 @@ function verificar_recursos_cargo(cargo_id){
},
dataType: 'text'
})
} catch(Exception $e) {
throw new Exception("Erro genérico: " . $e->getMessage(), 2);
}
}

$(document).ready(function(){
Expand Down
104 changes: 52 additions & 52 deletions html/socio/sistema/controller/import_conteudo_index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
<!-- Content Wrapper. Contains page content -->
<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
<!-- Content Header (Page header) -->
<section class="content-header">
<h1>
<small>Sistema SaGA</small>
</h1>
<ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Ínicio</a></li>
<li class="active">Painel</li>
</ol>
<h1>
<small>Sistema SaGA</small>
</h1>
<ol class="breadcrumb">
<li><a href="#"><i class="fa fa-dashboard"></i> Ínicio</a></li>
<li class="active">Painel</li>
</ol>
</section>

<!-- Main content -->
<section class="content">

<div data-toggle="modal" data-target="#configModal" href="#" class="col-md-3 col-sm-6 col-xs-12" style="cursor: pointer">
<div class="info-box">
<span class="info-box-icon bg-aqua"><i class="ion ion-ios-gear-outline"></i></span>

<div class="info-box-content">
<span class="info-box-text"><b>Configurações</b></span>
<small>Acesse as configurações de administrador</small>
<div data-toggle="modal" data-target="#configModal" class="col-md-3 col-sm-6 col-xs-12 clickable-box">
<div class="info-box">
<span class="info-box-icon bg-aqua"><i class="ion ion-ios-gear-outline"></i></span>

<div class="info-box-content">
<span class="info-box-text"><b>Configurações</b></span>
<small>Acesse as configurações de administrador</small>
</div>
</div>
</div>
</div>

<a href="socios.php" style="text-decoration: none; color: black"><div data-toggle="modal" class="col-md-3 col-sm-6 col-xs-12" style="cursor: pointer">
<div class="info-box">
<span class="info-box-icon bg-yellow"><i class="fa fa-users"></i></span>
<?php $num_socios = mysqli_num_rows(mysqli_query($conexao,"select * from socio")); ?>
<div class="info-box-content">
<span class="info-box-text"><b>SÓCIOS</b></span>
<small>Ir para a página de administração de sócios</small>
<a href="socios.php" class="col-md-3 col-sm-6 col-xs-12 clickable-box">
<div data-toggle="modal" class="info-box bg-yellow">
<span class="info-box-icon"><i class="fa fa-users"></i></span>
<?php $num_socios = htmlspecialchars($num_socios); ?>
<div class="info-box-content">
<span class="info-box-text"><b>SÓCIOS</b></span>
<small>Ir para a página de administração de sócios</small>
</div>
</div>
</div>
</div></a>
</a>

<a href="integracao.php" style="text-decoration: none; color: black"><div data-toggle="modal" class="col-md-3 col-sm-6 col-xs-12" style="cursor: pointer">
<div class="info-box">
<span class="info-box-icon bg-green"><i class="fa fa-money"></i></span>
<div class="info-box-content">
<span class="info-box-text"><b>INTEGRAÇÃO</b></span>
<small>Configure e integre sistemas de pagamento</small>
</div>
</div>
</div></a>

<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<h3 class="box-title">Administração</h3>
<a href="../integracao.php" class="col-md-3 col-sm-6 col-xs-12 clickable-box">
<div data-toggle="modal" class="info-box bg-green">
<span class="info-box-icon"><i class="fa fa-money"></i></span>
<div class="info-box-content">
<span class="info-box-text"><b>INTEGRAÇÃO</b></span>
<small>Configure e integre sistemas de pagamento</small>
</div>
</div>
<div class="box-body">
<p>Opções de controle de associados.</p>
<a id="btn_socios" class="btn btn-app">
<span class="badge bg-purple"><span id="qtd_socios"><?php echo($num_socios); ?></span></span>
<i class="fa fa-users"></i> Associados
</a>
<a id="btn_bd" class="btn btn-app">
<i class="fa fa-database"></i> Banco de dados
</a>
</a>

<div class="row">
<div class="col-xs-12">
<div class="box">
<div class="box-header">
<h3 class="box-title">Administração</h3>
</div>
<div class="box-body">
<p>Opções de controle de associados.</p>
<a id="btn_socios" class="btn btn-app">
<span class="badge bg-purple"><span id="qtd_socios"><?php echo $num_socios; ?></span></span>
<i class="fa fa-users"></i> Associados
</a>
<a id="btn_bd" class="btn btn-app">
<i class="fa fa-database"></i> Banco de dados
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
</div>
12 changes: 9 additions & 3 deletions html/socio/sistema/controller/import_conteudo_processacontribuicao.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,14 @@
<!-- start: page -->
<div class="row">
<?php
$resultado = mysqli_query($conexao,"SELECT * FROM doacao_boleto_info AS bi JOIN sistema_pagamento AS sp ON (bi.id_sistema = sp.id) JOIN doacao_boleto_regras AS br ON (br.id = bi.id_regras) WHERE nome_sistema = 'BOLETOFACIL'");
$dados_sistema = mysqli_fetch_assoc($resultado);

$nome_sistema = "BOLETOFACIL";
$stmt = $conexao->prepare("SELECT * FROM doacao_boleto_info AS bi JOIN sistema_pagamento AS sp ON (bi.id_sistema = sp.id) JOIN doacao_boleto_regras AS br ON (br.id = bi.id_regras) WHERE nome_sistema = ?");
$stmt->bind_param("s", $nome_sistema);
$stmt->execute();
$resultado = $stmt->get_result();
$dados_sistema = $resultado->fetch_assoc();

$token_api = $dados_sistema['token_api'];
extract($dados_sistema);
extract(json_decode($_REQUEST ['dados_contrib'], 1));
Expand All @@ -53,7 +59,7 @@
}
?>
<form id="frm_editar_socio" action="processa_contribuicao.php" method="POST">
<input type="hidden" id="id_socio" name="id_socio" value="<?php echo($_GET['socio']); ?>">
<input type="hidden" id="id_socio" name="id_socio" value="<?php echo(filter_input(INPUT_GET, 'socio', FILTER_SANITIZE_STRING)); ?>">

<div class="box box-info resultado">

Expand Down
Loading