From 2005d7491b7b6b0109ca7f7e1ba2788882cef92c Mon Sep 17 00:00:00 2001
From: Barreto <barretoinfope@gmail.com>
Date: Thu, 18 Jan 2024 13:44:27 -0300
Subject: [PATCH] Update

Update
---
 application/models/Conecte_model.php    | 2 +-
 application/views/clientes/clientes.php | 4 ++++
 application/views/os/imprimirOs.php     | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/application/models/Conecte_model.php b/application/models/Conecte_model.php
index 981436dbb..3d4603b3e 100644
--- a/application/models/Conecte_model.php
+++ b/application/models/Conecte_model.php
@@ -72,7 +72,7 @@ public function getCobrancas($table, $fields, $where = '', $perpage = 0, $start
         $this->db->join('clientes', 'cobrancas.clientes_id = clientes.idClientes', 'left');
         $this->db->where('clientes_id', $cliente);
         $this->db->limit($perpage, $start);
-        $this->db->order_by('idCobrancas', 'desc');
+        $this->db->order_by('idCobranca', 'desc');
         if ($where) {
             $this->db->where($where);
         }
diff --git a/application/views/clientes/clientes.php b/application/views/clientes/clientes.php
index 8f8dd0356..35b409d82 100644
--- a/application/views/clientes/clientes.php
+++ b/application/views/clientes/clientes.php
@@ -26,8 +26,10 @@
                     <tr>
                         <th>Cod.</th>
                         <th>Nome</th>
+                        <th>Contato</th>
                         <th>CPF/CNPJ</th>
                         <th>Telefone</th>
+                        <th>Celular</th>
                         <th>Email</th>
                         <th>Ações</th>
                     </tr>
@@ -44,8 +46,10 @@
                         echo '<tr>';
                         echo '<td>' . $r->idClientes . '</td>';
                         echo '<td><a href="' . base_url() . 'index.php/clientes/visualizar/' . $r->idClientes . '" style="margin-right: 1%">' . $r->nomeCliente . '</a></td>';
+                        echo '<td>' . $r->contato . '</td>';
                         echo '<td>' . $r->documento . '</td>';
                         echo '<td>' . $r->telefone . '</td>';
+                        echo '<td>' . $r->celular . '</td>';
                         echo '<td>' . $r->email . '</td>';
                         echo '<td>';
                         if ($this->permission->checkPermission($this->session->userdata('permissao'), 'vCliente')) {
diff --git a/application/views/os/imprimirOs.php b/application/views/os/imprimirOs.php
index 1c416dfa4..9f03862a5 100644
--- a/application/views/os/imprimirOs.php
+++ b/application/views/os/imprimirOs.php
@@ -102,7 +102,7 @@
                                     <table class="table table-condensend">
                                         <tbody>
                                             <tr>
-                                                <td style="width: 85%; padding-left: 0">
+                                                <td style="width: 75%; padding-left: 0">
                                                     <ul>
                                                         <li>
                                                             <span>
@@ -134,7 +134,7 @@
                                                 </td>
                                                 <?php if ($result->status == 'Finalizado' || $result->status == 'Aprovado') { ?>
                                                     <?php if ($qrCode) : ?>
-                                                        <td style="width: 15%; padding: 0;text-align:center;">
+                                                        <td style="width: 25%; padding: 0;text-align:center;">
                                                             <img style="margin:12px 0px 0px 0px" src="<?php echo base_url(); ?>assets/img/logo_pix.png" width="64px" alt="QR Code de Pagamento" /></br>
                                                             <img style="margin:5px 0px 0px 0px" width="94px" src="<?= $qrCode ?>" alt="QR Code de Pagamento" /></br>
                                                             <?php echo '<span style="margin:0px;font-size: 80%;text-align:center;">Chave PIX: ' . $chaveFormatada . '</span>' ;?>
@@ -335,7 +335,7 @@
                                     <table class="table table-condensend">
                                         <tbody>
                                             <tr>
-                                                <td style="width: 85%; padding-left: 0">
+                                                <td style="width: 75%; padding-left: 0">
                                                     <ul>
                                                         <li>
                                                             <span>
@@ -367,7 +367,7 @@
                                                 </td>
                                                 <?php if ($result->status == 'Finalizado' || $result->status == 'Aprovado') { ?>
                                                     <?php if ($qrCode) : ?>
-                                                        <td style="width: 15%; padding: 0;text-align:center;">
+                                                        <td style="width: 25%; padding: 0;text-align:center;">
                                                             <img style="margin:12px 0px 0px 0px" src="<?php echo base_url(); ?>assets/img/logo_pix.png" width="64px" alt="QR Code de Pagamento" /></br>
                                                             <img style="margin:5px 0px 0px 0px" width="94px" src="<?= $qrCode ?>" alt="QR Code de Pagamento" /></br>
                                                             <?php echo '<span style="margin:0px;font-size: 80%;text-align:center;">Chave PIX: ' . $chaveFormatada . '</span>' ;?>