Skip to content

Commit

Permalink
Revert "Fix/ADM-Cliente-Layout (#2296)"
Browse files Browse the repository at this point in the history 
This reverts commit 018247b.
  • Loading branch information
@Pr3d4dor
Pr3d4dor authored Dec 12, 2023
1 parent 018247b commit d49c487
Show file tree
Hide file tree
Showing 14 changed files with 537 additions and 962 deletions.
3 changes: 1 addition & 2 deletions application/controllers/Mine.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ public function os()
$data['output'] = 'conecte/os';
$this->load->view('conecte/template', $data);
}

public function visualizarOs($id = null)
{
if (!session_id() || !$this->session->userdata('conectado')) {
Expand All @@ -504,7 +504,6 @@ public function visualizarOs($id = null)
$data['result'] = $this->os_model->getById($this->uri->segment(3));
$data['produtos'] = $this->os_model->getProdutos($this->uri->segment(3));
$data['servicos'] = $this->os_model->getServicos($this->uri->segment(3));
$data['anexos'] = $this->os_model->getAnexos($this->uri->segment(3));
$data['emitente'] = $this->mapos_model->getEmitente();

if ($data['result']->idClientes != $this->session->userdata('cliente_id')) {
Expand Down
7 changes: 1 addition & 6 deletions application/controllers/Os.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,11 +391,6 @@ public function imprimirTermica()
$this->data['produtos'] = $this->os_model->getProdutos($this->uri->segment(3));
$this->data['servicos'] = $this->os_model->getServicos($this->uri->segment(3));
$this->data['emitente'] = $this->mapos_model->getEmitente();
$this->data['qrCode'] = $this->os_model->getQrCode(
$this->uri->segment(3),
$this->data['configuration']['pix_key'],
$this->data['emitente']
);

$this->load->view('os/imprimirOsTermica', $this->data);
}
Expand Down Expand Up @@ -1052,7 +1047,7 @@ public function adicionarAnotacao()
echo json_encode(validation_errors());
} else {
$data = [
'anotacao' => '[' . $this->session->userdata('nome_admin') . '] ' . $this->input->post('anotacao'),
'anotacao' => $this->input->post('anotacao'),
'data_hora' => date('Y-m-d H:i:s'),
'os_id' => $this->input->post('os_id'),
];
Expand Down
2 changes: 1 addition & 1 deletion application/models/Conecte_model.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public function getOs($table, $fields, $where = '', $perpage = 0, $start = 0, $o

public function getById($id)
{
$this->db->select('os.*, clientes.*, clientes.celular as celular_cliente, garantias.refGarantia, garantias.textoGarantia, usuarios.telefone as telefone_usuario, usuarios.email as email_usuario, usuarios.nome');
$this->db->select('os.*, clientes.*, clientes.celular as celular_cliente, garantias.refGarantia, usuarios.telefone as telefone_usuario, usuarios.email as email_usuario, usuarios.nome');
$this->db->from('os');
$this->db->join('clientes', 'clientes.idClientes = os.clientes_id');
$this->db->join('usuarios', 'usuarios.idUsuarios = os.usuarios_id');
Expand Down
4 changes: 2 additions & 2 deletions application/models/Os_model.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function getOs($table, $fields, $where = [], $perpage = 0, $start = 0, $o

public function getById($id)
{
$this->db->select('os.*, clientes.*, clientes.celular as celular_cliente, clientes.telefone as telefone_cliente, clientes.contato as contato_cliente, garantias.refGarantia, garantias.textoGarantia, usuarios.telefone as telefone_usuario, usuarios.email as email_usuario, usuarios.nome');
$this->db->select('os.*, clientes.*, clientes.celular as celular_cliente, clientes.telefone as telefone_cliente, clientes.contato as contato_cliente, garantias.refGarantia, usuarios.telefone as telefone_usuario, usuarios.email as email_usuario, usuarios.nome');
$this->db->from('os');
$this->db->join('clientes', 'clientes.idClientes = os.clientes_id');
$this->db->join('usuarios', 'usuarios.idUsuarios = os.usuarios_id');
Expand All @@ -106,7 +106,7 @@ public function getById($id)

public function getByIdCobrancas($id)
{
$this->db->select('os.*, clientes.*, clientes.celular as celular_cliente, garantias.refGarantia, garantias.textoGarantia, usuarios.telefone as telefone_usuario, usuarios.email as email_usuario, usuarios.nome,cobrancas.os_id,cobrancas.idCobranca,cobrancas.status');
$this->db->select('os.*, clientes.*, clientes.celular as celular_cliente, garantias.refGarantia, usuarios.telefone as telefone_usuario, usuarios.email as email_usuario, usuarios.nome,cobrancas.os_id,cobrancas.idCobranca,cobrancas.status');
$this->db->from('os');
$this->db->join('clientes', 'clientes.idClientes = os.clientes_id');
$this->db->join('usuarios', 'usuarios.idUsuarios = os.usuarios_id');
Expand Down
16 changes: 9 additions & 7 deletions application/views/conecte/detalhes_os.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@
} ?>

<div class="span12" id="divAnexos" style="margin-left: 0">
<?php foreach ($anexos as $a) {
<?php
foreach ($anexos as $a) {
if ($a->thumb == null) {
$thumb = base_url() . 'assets/img/icon-file.png';
$link = base_url() . 'assets/img/icon-file.png';
Expand All @@ -209,12 +210,13 @@
$link = $a->url . '/' . $a->anexo;
}
echo '<div class="span3" style="min-height: 150px; margin-left: 0">
<a style="min-height: 150px;" href="#modal-anexo" imagem="' . $a->idAnexos . '" link="' . $link . '" role="button" class="btn anexo span12" data-toggle="modal">
<img src="' . $thumb . '" alt="">
</a>
<span>' . $a->anexo . '</span>
</div>';
}?>
<a style="min-height: 150px;" href="#modal-anexo" imagem="' . $a->idAnexos . '" link="' . $link . '" role="button" class="btn anexo span12" data-toggle="modal">
<img src="' . $thumb . '" alt="">
</a>
<span>' . $a->anexo . '</span>
</div>';
}
?>
</div>

</div>
Expand Down
Loading

0 comments on commit d49c487

Please sign in to comment.