Skip to content

Commit

Permalink
fix: access to menu configuration change password
Browse files Browse the repository at this point in the history 
- preparation to put in production release V2.1
  • Loading branch information
@elfiservice
elfiservice committed Jul 25, 2017
1 parent 3e7d616 commit 20180e9
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 40 deletions.
63 changes: 33 additions & 30 deletions js/menus/menucontents.js
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@


var anylinkmenu3={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''} //Third menu variable. Same precaution.
anylinkmenu3.cols={divclass:'column', inlinestyle:''} //menu.cols if defined creates columns of menu links segmented by keyword "efc"
var anylinkmenu3={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''}; //Third menu variable. Same precaution.
anylinkmenu3.cols={divclass:'column', inlinestyle:''}; //menu.cols if defined creates columns of menu links segmented by keyword "efc"
anylinkmenu3.items=[
["Cliente", "financeiro.php?id_menu=cliente"],
["Fornecedor", "financeiro.php?id_menu=fornecedor"],
["Funcionário", "financeiro.php?id_menu=funcionario"] //no comma following last entry!
]
];

var anylinkmenu_financeiro={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''} //Third menu variable. Same precaution.
anylinkmenu_financeiro.cols={divclass:'column', inlinestyle:''} //menu.cols if defined creates columns of menu links segmented by keyword "efc"
var anylinkmenu_financeiro={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''}; //Third menu variable. Same precaution.
anylinkmenu_financeiro.cols={divclass:'column', inlinestyle:''}; //menu.cols if defined creates columns of menu links segmented by keyword "efc"
anylinkmenu_financeiro.items=[
["Contas Receber/Pagar", "financeiro.php?id_menu=receber_pagar"],
["Baixa de Contas", "financeiro.php?id_menu=baixa_contas"],
Expand All @@ -18,64 +18,67 @@ anylinkmenu_financeiro.items=[
["Plano de Contas", "financeiro.php?id_menu=plano_contas"],
["Fluxo de Caixa", "financeiro.php?id_menu=fluxo_caixa"]

]
];


var anylinkmenu_relatorio={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''} //Third menu variable. Same precaution.
anylinkmenu_relatorio.cols={divclass:'column', inlinestyle:''} //menu.cols if defined creates columns of menu links segmented by keyword "efc"
var anylinkmenu_relatorio={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''}; //Third menu variable. Same precaution.
anylinkmenu_relatorio.cols={divclass:'column', inlinestyle:''}; //menu.cols if defined creates columns of menu links segmented by keyword "efc"
anylinkmenu_relatorio.items=[
["Caixas / Bancos", "financeiro.php?id_menu=caixas_bancos"],
["Demonstrativo Resultado do Exercício", "financeiro.php?id_menu=demo_resultado_exercicio"]


]
];


/*Pagina CONFIGURAÇÃO*/
/*
* Pagina CONFIGURAÇÃO
* */

var cadastro_configuracao={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''} //Third menu variable. Same precaution.
cadastro_configuracao.cols={divclass:'column', inlinestyle:''} //menu.cols if defined creates columns of menu links segmented by keyword "efc"
var cadastro_configuracao={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''}; //Third menu variable. Same precaution.
cadastro_configuracao.cols={divclass:'column', inlinestyle:''}; //menu.cols if defined creates columns of menu links segmented by keyword "efc"
cadastro_configuracao.items=[
["Controle Tipo de Conta", "../../configuracao.php?id_menu=controle_tipo_conta"],
["Cadastrar Novo", "../../configuracao.php?id_menu=cadastro_usuario"],
["Alterar Senha", "../../configuracao.php?id_menu=trocar_senha"]
["Controle Tipo de Conta", "configuracao.php?id_menu=controle_tipo_conta"],
["Cadastrar Novo", "configuracao.php?id_menu=cadastro_usuario"],
["Alterar Senha", "configuracao.php?id_menu=trocar_senha"]

]
];

var usuarios_nao_admin={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''} //Third menu variable. Same precaution.
usuarios_nao_admin.cols={divclass:'column', inlinestyle:''} //menu.cols if defined creates columns of menu links segmented by keyword "efc"
var usuarios_nao_admin={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''};//Third menu variable. Same precaution.
usuarios_nao_admin.cols={divclass:'column', inlinestyle:''}; //menu.cols if defined creates columns of menu links segmented by keyword "efc"
usuarios_nao_admin.items=[
["Alterar Senha", "configuracao.php?id_menu=trocar_senha"]

]
];


/*Pagina TECNICO*/
/*
* Pagina TECNICO
* */

var tecnico_cadastro={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''} //Third menu variable. Same precaution.
tecnico_cadastro.cols={divclass:'column', inlinestyle:''} //menu.cols if defined creates columns of menu links segmented by keyword "efc"
var tecnico_cadastro={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''}; //Third menu variable. Same precaution.
tecnico_cadastro.cols={divclass:'column', inlinestyle:''}; //menu.cols if defined creates columns of menu links segmented by keyword "efc"
tecnico_cadastro.items=[
["Cliente", "financeiro.php?id_menu=cliente"],
["Fornecedor", "financeiro.php?id_menu=fornecedor"]

]
];

var tecnico_cliente={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''} //Third menu variable. Same precaution.
tecnico_cliente.cols={divclass:'column', inlinestyle:''} //menu.cols if defined creates columns of menu links segmented by keyword "efc"
var tecnico_cliente={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''}; //Third menu variable. Same precaution.
tecnico_cliente.cols={divclass:'column', inlinestyle:''}; //menu.cols if defined creates columns of menu links segmented by keyword "efc"
tecnico_cliente.items=[
["Novo", "tecnico.php?id_menu=novo_cliente"],
["Editar", "tecnico.php?id_menu=editar_cliente"]

]
];

var tecnico_orcamento={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''} //Third menu variable. Same precaution.
tecnico_orcamento.cols={divclass:'column', inlinestyle:''} //menu.cols if defined creates columns of menu links segmented by keyword "efc"
var tecnico_orcamento={divclass:'anylinkmenucols', inlinestyle:'', linktarget:''}; //Third menu variable. Same precaution.
tecnico_orcamento.cols={divclass:'column', inlinestyle:''}; //menu.cols if defined creates columns of menu links segmented by keyword "efc"
tecnico_orcamento.items=[
["Novo", "tecnico.php?id_menu=orcamento"],
["Editar", "tecnico.php?id_menu=editar_orcamento"],
["Não Aprovados", "tecnico.php?id_menu=acompanhar_orc"],
["Aprovados", "acompanhamento/acompanhar_orcamentos.php"]


]

];
8 changes: 4 additions & 4 deletions modulos/tecnico/orcamento/aprovados/editar_orc_aprovado.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@

if ($data_inicio != "0000-00-00" && $data_conclusao == "0000-00-00") {
$dataInicioBr = Formatar::formatarDataSemHora($data_inicio);
//$listaEmailCliente = array($orcObj->getEmailContrat(),$orcObj->getEmailObra());
$listaEmailCliente = array("junior@elfiservice.com.br");
$listaEmailCliente = array($orcObj->getEmailContrat(),$orcObj->getEmailObra());
//$listaEmailCliente = array("junior@elfiservice.com.br");
$textoCorpoDataInicio = "Olá, <b>{$orcObj->getRazaoSocialContrat()}</b> a proposta de Nº <b>{$orcObj->getNOrc()}.{$orcObj->getAnoOrc()}</b> foi alterada:<br> <p> Data de inicio agendada para: <b>{$dataInicioBr}</b> </p><br>Em breve entraremos em contato para acertar os detalhes. ";
$email = new EmailGenerico($listaEmailCliente, "Proposta com Data programada", $textoCorpoDataInicio, array(), $listaEmails);
if ($email->enviarEmailSMTP()) {
Expand All @@ -101,8 +101,8 @@
$dataInicioBr = Formatar::formatarDataSemHora($data_inicio);
$dataConcluidoBr = Formatar::formatarDataSemHora($data_conclusao);
//WWW/orcamento/aprovados/pesquisa_pos_venda.php?ido=2&idc=23
//$listaEmailClienteConcluido = array($orcObj->getEmailContrat(),$orcObj->getEmailObra());
$listaEmailClienteConcluido = array("junior@elfiservice.com.br");
$listaEmailClienteConcluido = array($orcObj->getEmailContrat(),$orcObj->getEmailObra());
//$listaEmailClienteConcluido = array("junior@elfiservice.com.br");
$textoCorpo = "Olá, <b>{$orcObj->getRazaoSocialContrat()}</b> a proposta de Nº <b>{$orcObj->getNOrc()}.{$orcObj->getAnoOrc()}</b> foi alterada:<br>"
. "<p> Ela foi marcada como <b>\"Concluída\"</b>, tendo seu inicio em <b>{$dataInicioBr}</b> e seu término em <b>{$dataConcluidoBr}</b> </p><br>"
. "Por favor, nos dê seu parecer sobre nosso atendimento, será de grande ajuda para o desenvolvimento de nossa parceria.<br><br>"
Expand Down
8 changes: 4 additions & 4 deletions modulos/tecnico/orcamento/aprovados/pesquisa_pos_venda.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@
$orcamentoObj = new Orcamento($id_orc, "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "s", "", "", "", "", "", "");
$orcamentoCtrl->atualizarOrcamento($orcamentoObj);
//enviar Email confirmando o Envio da Pesquisa e agradecendo o Cliente.
// $listaEmailTo = array($orcObj->getEmailContrat(), $orcObj->getEmailObra());
$listaEmailTo = array("elfiservice@hotmail.com");
$email = new EmailGenerico($listaEmailTo, "Recebemos sua pesquisa", "Olá, <b>{$orcObj->getRazaoSocialContrat()}</b> a proposta de Nº <b>{$orcObj->getNOrc()}.{$orcObj->getAnoOrc()}</b> recebemos a sua pesquisa. ", array(), array());
$listaEmailTo = array($orcObj->getEmailContrat(), $orcObj->getEmailObra());
//$listaEmailTo = array("junior@elfiservice.com.br");

$email = new EmailGenerico($listaEmailTo, "Recebemos sua pesquisa", "Olá, <b>{$orcObj->getRazaoSocialContrat()}</b> a proposta de Nº <b>{$orcObj->getNOrc()}.{$orcObj->getAnoOrc()}</b> recebemos a sua pesquisa. ", array(), array("junior@elfiservice.com.br"));
if($email->enviarEmailSMTP()){
//WSErro("Enviado email informando Alteração para {$orcObj->getEmailContrat()}, informando a Data de Inicio!", WS_ALERT);
} else{
Expand Down
4 changes: 2 additions & 2 deletions modulos/tecnico/orcamento/editar_orcamento.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@
}

$dataHj = date('d/m/Y');
//$listaEmailClienteSituacaoOrc = array($orcObj->getEmailContrat(),$orcObj->getEmailObra());
$listaEmailClienteSituacaoOrc = array("junior@elfiservice.com.br");
$listaEmailClienteSituacaoOrc = array($orcObj->getEmailContrat(),$orcObj->getEmailObra());
//$listaEmailClienteSituacaoOrc = array("junior@elfiservice.com.br");
$assuntoEmail = "Alteração Situação do Orçamento";
$textoCorpo = "<p>Olá, <b>{$OrcBd['razao_social_contr']}</b> a proposta de Nº <b>{$OrcBd['n_orc']}.{$OrcBd['ano_orc']}</b> foi alterada:</p> <p> A situação dela agora esta como: <b>\"{$situacao_orc}\"</b> em <b>{$dataHj }</b>. </p> ";
$email = new EmailGenerico($listaEmailClienteSituacaoOrc, $assuntoEmail, $textoCorpo, array(), $listaEmails);
Expand Down

0 comments on commit 20180e9

Please sign in to comment.