From c14ca2578b69b51af9db63ab0cfdec57e85d75dd Mon Sep 17 00:00:00 2001
From: Marcus <marcus@nexverse.com.br>
Date: Fri, 17 Feb 2023 09:53:43 -0300
Subject: [PATCH] CRUD do Cliente

---
 controle/models.py                                           |  8 ++++----
 .../controle/cadastros/cliente/cliente_detalhes.html         | 12 ++++++------
 .../templates/controle/cadastros/cliente/cliente_form.html   |  2 +-
 .../templates/controle/cadastros/cliente/cliente_lista.html  |  4 +++-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/controle/models.py b/controle/models.py
index 4c27599..062a96d 100644
--- a/controle/models.py
+++ b/controle/models.py
@@ -222,18 +222,18 @@ class Cliente(Model):
     carencia = BooleanField(_(u'carência'), default=False)
     periodo_carencia = PositiveIntegerField(
         _(u'período de carência (em meses)'), default=0,
-        validators=[MinValueValidator(0)])
+        validators=[MinValueValidator(0)], blank=True, null=True)
     valor_carencia = DecimalField(
         _('valor da carência'), default=0,
-        max_digits=25, decimal_places=2)
+        max_digits=25, decimal_places=2, blank=True, null=True)
     porcentagem_carencia = DecimalField(
         _('porcentagem da carência'), default=0,
-        max_digits=8, decimal_places=4)
+        max_digits=8, decimal_places=4, blank=True, null=True)
     periodicidade_boletos = CharField(
         _(u'periodicidade dos boletos'), default="30",
         choices=PERIODICIDADE, max_length=3)
     usuarios_bloqueados = BooleanField(
-        _(u"usuários bloqueados?"), default=True)
+        _(u"usuários bloqueados?"), default=False)
 
     criado = DateTimeField(auto_now_add=True, editable=False,
                            verbose_name=_('cadastrado em'), null=True)
diff --git a/controle/templates/controle/cadastros/cliente/cliente_detalhes.html b/controle/templates/controle/cadastros/cliente/cliente_detalhes.html
index 22ec2b7..78eb087 100644
--- a/controle/templates/controle/cadastros/cliente/cliente_detalhes.html
+++ b/controle/templates/controle/cadastros/cliente/cliente_detalhes.html
@@ -56,27 +56,27 @@
                 <div class="row">
                     <div class="form-group col-4">
                         <label for="id_endereco" class="control-label">Endereço matriz</label>
-                        <input type="text" name="endereco" maxlength="255" class="form-control" id="id_endereco" value="{{ object.endereco }}" readonly>
+                        <input type="text" name="endereco" maxlength="255" class="form-control" id="id_endereco" value="{{ object.endereco|default:'' }}" readonly>
                     </div>
                     <div class="form-group col-1">
                         <label for="id_numero" class="control-label">Nº matriz</label>
-                        <input type="text" name="numero" maxlength="255" class="form-control" id="id_numero" value="{{ object.numero }}" readonly>
+                        <input type="text" name="numero" maxlength="255" class="form-control" id="id_numero" value="{{ object.numero|default:'' }}" readonly>
                     </div>
                     <div class="form-group col-2">
                         <label for="id_complemento" class="control-label">Complemento matriz</label>
-                        <input type="text" name="complemento" maxlength="255" class="form-control" id="id_complemento" value="{{ object.complemento }}" readonly>
+                        <input type="text" name="complemento" maxlength="255" class="form-control" id="id_complemento" value="{{ object.complemento|default:'' }}" readonly>
                     </div>
                     <div class="form-group col-3">
                         <label for="id_bairro" class="control-label">Bairro matriz</label>
-                        <input type="text" name="bairro" maxlength="255" class="form-control" id="id_bairro" value="{{ object.bairro }}" readonly>
+                        <input type="text" name="bairro" maxlength="255" class="form-control" id="id_bairro" value="{{ object.bairro|default:'' }}" readonly>
                     </div>
                     <div class="form-group col-1">
                         <label for="id_cep" class="control-label">CEP matriz</label>
-                        <input type="text" name="cep" maxlength="255" class="form-control" id="id_cep" value="{{ object.cep }}" readonly>
+                        <input type="text" name="cep" maxlength="255" class="form-control" id="id_cep" value="{{ object.cep|default:'' }}" readonly>
                     </div>
                     <div class="form-group col-4">
                         <label for="id_cidade" class="control-label">Cidade matriz</label>
-                        <input type="text" name="cidade" maxlength="255" class="form-control" id="id_cidade" value="{{ object.cidade }}" readonly>
+                        <input type="text" name="cidade" maxlength="255" class="form-control" id="id_cidade" value="{{ object.cidade|default:'' }}" readonly>
                     </div>
                 </div> 
             </div>
diff --git a/controle/templates/controle/cadastros/cliente/cliente_form.html b/controle/templates/controle/cadastros/cliente/cliente_form.html
index 05cd9e3..1002721 100644
--- a/controle/templates/controle/cadastros/cliente/cliente_form.html
+++ b/controle/templates/controle/cadastros/cliente/cliente_form.html
@@ -133,7 +133,7 @@
                                 <span class="help-block">{{ error }}</span>
                                 {% endfor %}
                             </div>
-                            <div class="form-group col-1{% if form.cep.errors %} has-error{% endif %}">
+                            <div class="form-group col-2{% if form.cep.errors %} has-error{% endif %}">
                                 <label for="{{ form.cep.id_for_label }}" class="control-label">{{ form.cep.label }}</label>
                                 {% render_field form.cep class="form-control" %}
                                 {% for error in form.cep.errors %}
diff --git a/controle/templates/controle/cadastros/cliente/cliente_lista.html b/controle/templates/controle/cadastros/cliente/cliente_lista.html
index 92075c7..c1e92f7 100644
--- a/controle/templates/controle/cadastros/cliente/cliente_lista.html
+++ b/controle/templates/controle/cadastros/cliente/cliente_lista.html
@@ -45,6 +45,7 @@
                       <tr>
                         <th>Razão Social</th>
                         <th>CNPJ</th>
+                        <th class="text-center">Pagamentos</th>
                         <th class="text-center">Situação</th>
                         <th class="text-center">Usuários Bloqueados?</th>
                         <th class="text-center">Ações</th>
@@ -61,6 +62,7 @@
                           </td>
                           <td>{{ cliente.cnpj }}</td>
                           <td class="text-center"><span class="badge bg-{% if cliente.situacao == 'A' %}warning {% elif cliente.situacao == 'I'%}danger {% else %}success {% endif %}">{{ cliente.get_situacao_display }}</span></td>
+                          <td class="text-center"><span class="badge bg-{% if cliente.ativo %}success {% else %}warning {% endif %}">{% if cliente.ativo %}Ativo{% else %}Inativo{% endif %}</span></td>
                           {% if cliente.usuarios_bloqueados == 1 %}
                           <td class="text-center"><span class="badge bg-danger">Sim</span></td>
                           {% else %}
@@ -90,7 +92,7 @@
                         {% endfor %}
                         {% else %}
                         <tr>
-                            <td colspan="4" class="text-center text-bold">Nenhum Cliente cadastrado</td>                            
+                            <td colspan="6" class="text-center text-bold">Nenhum Cliente cadastrado</td>                            
                           </tr>                                         
                         {% endif %}                                        
                     </tbody>