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

Jump to bottom

Test/integracao #16

Merged
merged 15 commits into from
Sep 18, 2021
Merged

Test/integracao #16

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0c50348
Merge remote-tracking branch 'origin/develop' into test/integracao
gabrielcs23 Sep 12, 2021
9576c29
removendo menções ao junit 4
gabrielcs23 Sep 12, 2021
696e3b1
configurações básicas para um teste de integração
gabrielcs23 Sep 12, 2021
9eff4b2
geração de banco de dados para testes de integração
gabrielcs23 Sep 12, 2021
59bd956
Merge branch 'develop' of https://github.com/ddszb/pdv into test/inte…
gabrielcs23 Sep 14, 2021
864d6fd
Corrigindo nomes de variávies de codigo
ddszb Sep 15, 2021
a80e34b
corrige verificação de abertura de caixa
gabrielcs23 Sep 15, 2021
7b3ef57
testes de integração para CaixaController
gabrielcs23 Sep 15, 2021
cd136cd
corrige teste de cadastro de caixa
gabrielcs23 Sep 15, 2021
ec96c28
corrige teste de cadastro de caixa
gabrielcs23 Sep 16, 2021
53b5fdb
Testes de integração de Venda
ddszb Sep 17, 2021
9e29b4e
correções ao fechar uma venda
gabrielcs23 Sep 17, 2021
6cda15f
refatorando utilitário de JSON para os testes de integração de contro…
gabrielcs23 Sep 17, 2021
e1ea1bc
corrige abordagem de testes de integração de Caixa
gabrielcs23 Sep 17, 2021
7a63c14
testes de fechamento de caixa
gabrielcs23 Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Prev Previous commit
Next Next commit
Corrigindo nomes de variávies de codigo
  • Loading branch information
@ddszb
ddszb committed Sep 15, 2021
commit 864d6fd7f1197403baae6ac3125a388213a433df
10 changes: 5 additions & 5 deletions src/main/resources/templates/caixa/form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ <h2 class="titulo-h1">Caixa</h2>
<div class="row">
<div class="form-group col-md-2">
<label for="valorAbertura">Valor Abertura</label> <input
id="valorAbertura" name="valor_abertura" type="text"
id="valorAbertura" name="valorAbertura" type="text"
class="form-control js-mascara" th:field="*{valorAbertura}" />
</div>
</div>
Expand All @@ -73,27 +73,27 @@ <h2 class="titulo-h1">Caixa</h2>
<div class="row">
<div class="form-group col-md-2">
<label for="valorTotal">Valor Total</label> <input
id="valorTotal" name="valor_total" type="text"
id="valorTotal" name="valorTotal" type="text"
class="form-control js-mascara" th:field="*{valorTotal}" />
</div>

<div class="form-group col-md-3 col-md-offset-5">
<label for="dataCadastro">Data Abertura</label> <input
id="dataCadastro" name="data_cadastro" type="text"
id="dataCadastro" name="dataCadastro" type="text"
class="form-control" th:field="*{dataCadastro}" />
</div>
</div>

<div class="row">
<div class="form-group col-md-2">
<label for="valorFechamento">Valor Fechamento</label> <input
id="valorFechamento" name="valor_fechamento" type="text"
id="valorFechamento" name="valorFechamento" type="text"
class="form-control js-mascara" th:field="*{valorFechamento}" />
</div>

<div class="form-group col-md-3 col-md-offset-5">
<label for="dataFechamento">Data Fechamento</label> <input
id="dataFechamento" name="data_fechamento" type="text"
id="dataFechamento" name="dataFechamento" type="text"
class="form-control" th:field="*{dataFechamento}" />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/caixa/gerenciar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<div class="row">
<div class="form-group col-md-2 col-md-offset-10">
<label for="dataAbertura" class="txt-01">Data Abertura</label> <input
id="dataAbertura" name="data_cadastro" type="text"
id="dataAbertura" name="dataCadastro" type="text"
class="form-control" th:value="*{{dataCadastro}}"
disabled="disabled" />
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/caixa/lancamentos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
th:text="${lancamento.observacao}"></td>
<td class="col-xs-2" th:text="|R$ ${{lancamento.valor}}|"></td>
<td class="col-xs-2" th:text="${lancamento.estilo}"></td>
<td class="col-xs-2" th:text="${{lancamento.data_cadastro}}"></td>
<td class="col-xs-2" th:text="${{lancamento.dataCadastro}}"></td>
</tr>
</tbody>
</table>
Expand Down