From fe7a213c9684a996912e9bdbead9b44d32b15372 Mon Sep 17 00:00:00 2001 From: Gianluca Bine Date: Sat, 22 May 2021 16:43:06 -0300 Subject: [PATCH] =?UTF-8?q?Adicionado=20op=C3=A7=C3=A3o=20de=20status=20Ap?= =?UTF-8?q?rovado=20em=20OS=20(#1394)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0125173740_add_aprovado_to_status_list.php | 30 +++++++++++++++++++ application/views/mapos/configurar.php | 3 +- application/views/mapos/painel.php | 1 + application/views/os/adicionarOs.php | 1 + application/views/os/editarOs.php | 4 +++ application/views/os/os.php | 4 +++ banco.sql | 4 +-- updates/update_4.32.1_to_4.33.0.sql | 1 + 8 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 application/database/migrations/20210125173740_add_aprovado_to_status_list.php create mode 100644 updates/update_4.32.1_to_4.33.0.sql diff --git a/application/database/migrations/20210125173740_add_aprovado_to_status_list.php b/application/database/migrations/20210125173740_add_aprovado_to_status_list.php new file mode 100644 index 000000000..4ba21ab15 --- /dev/null +++ b/application/database/migrations/20210125173740_add_aprovado_to_status_list.php @@ -0,0 +1,30 @@ +db->query($configurationSql)->row(); + + $osStatus = json_decode($result->valor, true); + if (empty($osStatus)) { + $osStatus = ["Aberto","Faturado","Negociação","Em Andamento","Orçamento","Finalizado","Cancelado","Aguardando Peças", "Aprovado"]; + } else { + $osStatus[] = 'Aprovado'; + } + + $sql = "UPDATE `configuracoes` SET valor = ? WHERE idConfig = 12"; + $this->db->query($sql, [json_encode($osStatus)]); + } + + public function down() + { + $this->db->query("UPDATE `configuracoes` SET valor = '[\"Aberto\",\"Faturado\",\"Negocia\\u00e7\\u00e3o\",\"Em Andamento\",\"Or\\u00e7amento\",\"Finalizado\",\"Cancelado\",\"Aguardando Pe\\u00e7as\"]' WHERE idConfig = 12"); + } +} diff --git a/application/views/mapos/configurar.php b/application/views/mapos/configurar.php index c4736476a..cdba45638 100644 --- a/application/views/mapos/configurar.php +++ b/application/views/mapos/configurar.php @@ -201,7 +201,8 @@ - + +
diff --git a/application/views/mapos/painel.php b/application/views/mapos/painel.php index 1d3ba8c06..c9fe377e3 100644 --- a/application/views/mapos/painel.php +++ b/application/views/mapos/painel.php @@ -87,6 +87,7 @@ + diff --git a/application/views/os/adicionarOs.php b/application/views/os/adicionarOs.php index d9e24e652..a3f1318d8 100644 --- a/application/views/os/adicionarOs.php +++ b/application/views/os/adicionarOs.php @@ -62,6 +62,7 @@ +
diff --git a/application/views/os/editarOs.php b/application/views/os/editarOs.php index a8b0bf3f3..c73d9202d 100644 --- a/application/views/os/editarOs.php +++ b/application/views/os/editarOs.php @@ -121,6 +121,10 @@ echo 'selected'; } ?> value="Aguardando Peças">Aguardando Peças +
diff --git a/application/views/os/os.php b/application/views/os/os.php index 5ae712ffe..2a3286e99 100644 --- a/application/views/os/os.php +++ b/application/views/os/os.php @@ -26,6 +26,7 @@ +
@@ -112,6 +113,9 @@ case 'Aguardando Peças': $cor = '#FF7F00'; break; + case 'Aprovado': + $cor = '#808080'; + break; default: $cor = '#E0E4CC'; break; diff --git a/banco.sql b/banco.sql index 0f4b46071..7e99dee41 100644 --- a/banco.sql +++ b/banco.sql @@ -608,7 +608,7 @@ INSERT INTO `configuracoes` (`idConfig`, `config`, `valor`) VALUES (9, 'control_editos', '1'), (10, 'control_datatable', '1'), (11, 'pix_key', ''), -(12, 'os_status_list', '[\"Aberto\",\"Faturado\",\"Negocia\\u00e7\\u00e3o\",\"Em Andamento\",\"Or\\u00e7amento\",\"Finalizado\",\"Cancelado\",\"Aguardando Pe\\u00e7as\"]'); +(12, 'os_status_list', '[\"Aberto\",\"Faturado\",\"Negocia\\u00e7\\u00e3o\",\"Em Andamento\",\"Or\\u00e7amento\",\"Finalizado\",\"Cancelado\",\"Aguardando Pe\\u00e7as\"]',\"Aprovado\"); INSERT INTO `permissoes` (`idPermissao`, `nome`, `permissoes`, `situacao`, `data`) VALUES (1, 'Administrador', 'a:53:{s:8:"aCliente";s:1:"1";s:8:"eCliente";s:1:"1";s:8:"dCliente";s:1:"1";s:8:"vCliente";s:1:"1";s:8:"aProduto";s:1:"1";s:8:"eProduto";s:1:"1";s:8:"dProduto";s:1:"1";s:8:"vProduto";s:1:"1";s:8:"aServico";s:1:"1";s:8:"eServico";s:1:"1";s:8:"dServico";s:1:"1";s:8:"vServico";s:1:"1";s:3:"aOs";s:1:"1";s:3:"eOs";s:1:"1";s:3:"dOs";s:1:"1";s:3:"vOs";s:1:"1";s:6:"aVenda";s:1:"1";s:6:"eVenda";s:1:"1";s:6:"dVenda";s:1:"1";s:6:"vVenda";s:1:"1";s:9:"aGarantia";s:1:"1";s:9:"eGarantia";s:1:"1";s:9:"dGarantia";s:1:"1";s:9:"vGarantia";s:1:"1";s:8:"aArquivo";s:1:"1";s:8:"eArquivo";s:1:"1";s:8:"dArquivo";s:1:"1";s:8:"vArquivo";s:1:"1";s:10:"aPagamento";N;s:10:"ePagamento";N;s:10:"dPagamento";N;s:10:"vPagamento";N;s:11:"aLancamento";s:1:"1";s:11:"eLancamento";s:1:"1";s:11:"dLancamento";s:1:"1";s:11:"vLancamento";s:1:"1";s:8:"cUsuario";s:1:"1";s:9:"cEmitente";s:1:"1";s:10:"cPermissao";s:1:"1";s:7:"cBackup";s:1:"1";s:10:"cAuditoria";s:1:"1";s:6:"cEmail";s:1:"1";s:8:"cSistema";s:1:"1";s:8:"rCliente";s:1:"1";s:8:"rProduto";s:1:"1";s:8:"rServico";s:1:"1";s:3:"rOs";s:1:"1";s:6:"rVenda";s:1:"1";s:11:"rFinanceiro";s:1:"1";s:9:"aCobranca";s:1:"1";s:9:"eCobranca";s:1:"1";s:9:"dCobranca";s:1:"1";s:9:"vCobranca";s:1:"1";}', 1, 'admin_created_at'); @@ -616,7 +616,7 @@ INSERT INTO `permissoes` (`idPermissao`, `nome`, `permissoes`, `situacao`, `data INSERT INTO `usuarios` (`idUsuarios`, `nome`, `rg`, `cpf`, `cep`, `rua`, `numero`, `bairro`, `cidade`, `estado`, `email`, `senha`, `telefone`, `celular`, `situacao`, `dataCadastro`, `permissoes_id`,`dataExpiracao`) VALUES (1, 'admin_name', 'MG-25.502.560', '600.021.520-87', '70005-115', 'Rua Acima', '12', 'Alvorada', 'Teste', 'MG', 'admin_email', 'admin_password', '000000-0000', '', 1, 'admin_created_at', 1, '3000-01-01'); -INSERT INTO `migrations`(`version`) VALUES ('20210114151944'); +INSERT INTO `migrations`(`version`) VALUES ('20210125173740'); SET SQL_MODE=@OLD_SQL_MODE; SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; diff --git a/updates/update_4.32.1_to_4.33.0.sql b/updates/update_4.32.1_to_4.33.0.sql new file mode 100644 index 000000000..c424f9e8e --- /dev/null +++ b/updates/update_4.32.1_to_4.33.0.sql @@ -0,0 +1 @@ +UPDATE `configuracoes` SET valor = '[\"Aberto\",\"Faturado\",\"Negocia\\u00e7\\u00e3o\",\"Em Andamento\",\"Or\\u00e7amento\",\"Finalizado\",\"Cancelado\",\"Aguardando Pe\\u00e7as\",\"Aprovado\"]' WHERE idConfig = 12;