douglas.strappasson
/
pabx-app
forked from SimplesIP/pabx-app
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Retirar a classe CalcDataHora para manipular datas em cadPreRamal.php cadPrePagoConta.php

ajuste_divisao
bruno 1 year ago
parent
f0cc627a9e
commit
c76c3fe59a
2 changed files with 8 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      cadastros/tarifacao/cadPrePagoConta.php
  2. 13
      cadastros/tarifacao/cadPrePagoRamal.php

14
cadastros/tarifacao/cadPrePagoConta.php
Unescape View File

@ -77,7 +77,6 @@ if (IsPostBack() || $estorno) {
if ($result) if ($result)
$result = pg_query($dbcon, $queryRamal); $result = pg_query($dbcon, $queryRamal);
// echo $queryRamal;
//$queryRamal = sprintf("update pbx_cs_usuarios set saldo_prepago = (saldo_prepago + %s) where matricula = '%s'", $valor, $numConta); //$queryRamal = sprintf("update pbx_cs_usuarios set saldo_prepago = (saldo_prepago + %s) where matricula = '%s'", $valor, $numConta);
//if($result) $result = pg_query($dbcon, $queryRamal); //if($result) $result = pg_query($dbcon, $queryRamal);
if ($result) if ($result)
@ -114,7 +113,6 @@ if (IsPostBack() || $estorno) {
values('$numConta', '1', '0', '0', '0', '0', '$valor', now()::date, now(), 'E', 'Estorno lancamento: $idEst', '$usuario')"; values('$numConta', '1', '0', '0', '0', '0', '$valor', now()::date, now(), 'E', 'Estorno lancamento: $idEst', '$usuario')";
if ($result) if ($result)
$result = pg_query($dbcon, $queryRamal); $result = pg_query($dbcon, $queryRamal);
// echo $queryRamal;
// $queryRamal = sprintf("update pbx_cs_usuarios set saldo_prepago = (saldo_prepago + (%s)) where matricula = '%s'", $valor, $numConta); // $queryRamal = sprintf("update pbx_cs_usuarios set saldo_prepago = (saldo_prepago + (%s)) where matricula = '%s'", $valor, $numConta);
// if($result) $result = pg_query($dbcon, $queryRamal); // if($result) $result = pg_query($dbcon, $queryRamal);
if ($result) if ($result)
@ -131,12 +129,8 @@ if (IsPostBack() || $estorno) {
} }
} }
} else { } else {
$data = new CalcDataHora(); $dataFimP = date( "d/m/Y" );
$dataFimP = trim($data->getData()); $dataIniP = date( "d/m/Y", strtotime( "-1 month" ) );
$data->somaDia(-30);
$dataIniP = trim($data->getData());
$data = null;
//echo "\n\nData Final: $dataFimP \n\n Data Format: " . FormatDtMssql($dataFimP) . "\n\n";
$dataIni = FormatDtMssql($dataIniP); $dataIni = FormatDtMssql($dataIniP);
$dataFim = FormatDtMssql($dataFimP); $dataFim = FormatDtMssql($dataFimP);
} }
@ -147,7 +141,7 @@ if ($dataIni && $dataFim) {
where prm_conta_senha = 1 where prm_conta_senha = 1
and prm_ramal_conta = '$conta' and prm_data < '$dataIni' \n"; and prm_ramal_conta = '$conta' and prm_data < '$dataIni' \n";
$result = pg_query($dbcon, $query); $result = pg_query($dbcon, $query);
//echo $query;
if (pg_num_rows($result)) { if (pg_num_rows($result)) {
$dados = pg_fetch_array($result); $dados = pg_fetch_array($result);
$saldoAnterior = $dados['saldo_anterior']; $saldoAnterior = $dados['saldo_anterior'];
@ -177,7 +171,7 @@ $query = "select prm_id, prm_ramal_conta, prm_conta_senha, trr_id,
if ($dataIni && $dataFim) if ($dataIni && $dataFim)
$query .= "and prm_data >= '$dataIni' and prm_data <= '$dataFim' "; $query .= "and prm_data >= '$dataIni' and prm_data <= '$dataFim' ";
$query .= " order by prm_data_lanc desc \n"; $query .= " order by prm_data_lanc desc \n";
//echo $query;
$result = pg_query($dbcon, $query); $result = pg_query($dbcon, $query);
$linhas = sprintf('<tr><td align="center">%s</td><td align="center">-</td><td align="center">-</td><td align="left">Saldo Anterior</td><td align="center">-</td><td align="right">%s</td><td align="center">%s</td></tr>', $dataIniP, FormataValor($saldoAnterior), $imgLancNormal); $linhas = sprintf('<tr><td align="center">%s</td><td align="center">-</td><td align="center">-</td><td align="left">Saldo Anterior</td><td align="center">-</td><td align="right">%s</td><td align="center">%s</td></tr>', $dataIniP, FormataValor($saldoAnterior), $imgLancNormal);

13
cadastros/tarifacao/cadPrePagoRamal.php
Unescape View File

@ -126,7 +126,6 @@ if (IsPostBack() || $estorno) {
if ($result) if ($result)
$saldo += $valor; $saldo += $valor;
//echo $queryRamal;
if ($result) { if ($result) {
$queryRamal = 'commit'; $queryRamal = 'commit';
@pg_query($dbcon, $queryRamal); @pg_query($dbcon, $queryRamal);
@ -138,12 +137,8 @@ if (IsPostBack() || $estorno) {
} }
} }
} else { } else {
$data = new CalcDataHora(); $dataFimP = date( "d/m/Y" );
$dataFimP = trim($data->getData()); $dataIniP = date( "d/m/Y", strtotime( "-1 month" ) );
$data->somaDia(-30);
$dataIniP = trim($data->getData());
$data = null;
//echo "\n\nData Final: $dataFimP \n\n Data Format: " . FormatDtMssql($dataFimP) . "\n\n";
$dataIni = FormatDtMssql($dataIniP); $dataIni = FormatDtMssql($dataIniP);
$dataFim = FormatDtMssql($dataFimP); $dataFim = FormatDtMssql($dataFimP);
} }
@ -154,7 +149,7 @@ if ($dataIni && $dataFim) {
where prm_conta_senha = 0 where prm_conta_senha = 0
and prm_ramal_conta = '$ramal' and prm_data < '$dataIni' \n"; and prm_ramal_conta = '$ramal' and prm_data < '$dataIni' \n";
$result = pg_query($dbcon, $query); $result = pg_query($dbcon, $query);
//echo $query;
if (pg_num_rows($result)) { if (pg_num_rows($result)) {
$dados = pg_fetch_array($result); $dados = pg_fetch_array($result);
$saldoAnterior = $dados['saldo_anterior']; $saldoAnterior = $dados['saldo_anterior'];
@ -186,7 +181,7 @@ $query = "select prm_id, prm_ramal_conta, prm_conta_senha, trr_id,
if ($dataIni && $dataFim) if ($dataIni && $dataFim)
$query .= "and prm_data >= '$dataIni' and prm_data <= '$dataFim' "; $query .= "and prm_data >= '$dataIni' and prm_data <= '$dataFim' ";
$query .= " order by prm_data_lanc desc \n"; $query .= " order by prm_data_lanc desc \n";
//echo $query;
$result = pg_query($dbcon, $query); $result = pg_query($dbcon, $query);
$linhas = sprintf('<tr><td align="center">%s</td><td align="center">-</td><td align="center">-</td><td align="left">Saldo Anterior</td><td align="center">-</td><td align="right">%s</td><td align="center">%s</td></tr>', $dataIniP, FormataValor($saldoAnterior), $imgLancNormal); $linhas = sprintf('<tr><td align="center">%s</td><td align="center">-</td><td align="center">-</td><td align="left">Saldo Anterior</td><td align="center">-</td><td align="right">%s</td><td align="center">%s</td></tr>', $dataIniP, FormataValor($saldoAnterior), $imgLancNormal);

Write Preview
Loading…
Cancel
Save