Skip to content

Commit

Permalink
Merge pull request #2405 from prefeiturasp/feature/120457-alterar-mod…
Browse files Browse the repository at this point in the history
…al-estorno

feat(120457): Altera modal cancelar estorno
  • Loading branch information
mdiori authored May 14, 2024
2 parents c5271d7 + a6928bc commit 0e6461c
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 14 deletions.
40 changes: 29 additions & 11 deletions src/componentes/escolas/Receitas/CancelarModalReceitas.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,35 @@
import React from "react";
import {ModalBootstrap} from "../../Globais/ModalBootstrap";
import { Modal } from 'antd';
import IconeAvisoVermelho from "../../../assets/img/icone-modal-aviso-vermelho.svg"

export const CancelarModalReceitas = (propriedades) =>{
return (
<ModalBootstrap
show={propriedades.show}
onHide={propriedades.handleClose}
titulo={propriedades.titulo}
bodyText=""
primeiroBotaoOnclick={propriedades.onCancelarTrue}
primeiroBotaoTexto="OK"
segundoBotaoOnclick={propriedades.handleClose}
segundoBotaoTexto="Fechar"
/>
<Modal
open={propriedades.show}
onOk={propriedades.onCancelarTrue}
okText="OK"
okButtonProps={{className: "btn-base-vermelho"}}
onCancel={propriedades.handleClose}
cancelText="Fechar"
cancelButtonProps={{className: "btn-base-verde-outline"}}
wrapClassName={'modal-ant-design'}
>
<div className="row">
<div className="col-md-auto col-lg-12">
<div className="text-center">
<img src={IconeAvisoVermelho} alt="" className="img-fluid"/>
</div>
</div>

<div className="col-md-auto col-lg-12 mt-3">
<div className="text-center">
<p className="title-modal-antdesign-aviso">{propriedades.titulo}</p>
</div>
<div className="text-center mt-2">
<p className="body-text-modal-antdesign-aviso">{propriedades.bodyText}</p>
</div>
</div>
</div>
</Modal>
)
};
13 changes: 10 additions & 3 deletions src/componentes/escolas/Receitas/Formularios/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ import {toastCustom} from "../../../Globais/ToastCustom";
import { visoesService } from "../../../../services/visoes.service";
import { getPeriodoPorUuid } from "../../../../services/sme/Parametrizacoes.service";
import { STATUS_CONTA_ASSOCIACAO, STATUS_SOLICITACAO_ENCERRAMENTO_CONTA_ASSOCIACAO } from "../../../../constantes/contaAssociacao";
import { useHistory } from 'react-router-dom';


export const ReceitaForm = () => {

const history = useHistory();
let {origem} = useParams();
let {uuid} = useParams();
const parametros = useLocation();
Expand Down Expand Up @@ -530,9 +531,15 @@ export const ReceitaForm = () => {
setShow(false);
setRedirectTo('');
getPath('');

};

const onCancelarEstornoTrue = () => {
setShow(false);
console.log(despesa.uuid)
const path = `/edicao-de-despesa/${despesa.uuid}`;
history.push(path);
}

const onHandleClose = () => {
setShow(false);
setShowDelete(false);
Expand Down Expand Up @@ -1348,7 +1355,7 @@ export const ReceitaForm = () => {
<CancelarModalReceitas
show={show}
handleClose={onHandleClose}
onCancelarTrue={onCancelarTrue}
onCancelarTrue={onCancelarEstornoTrue}
titulo={tituloModalCancelar}
/>
</section>
Expand Down

0 comments on commit 0e6461c

Please sign in to comment.