From: www-data <www-data@mail.holoscopio.com>
Date: Thu, 27 Sep 2007 01:10:29 +0000 (-0300)
Subject: Merge git://hammerboy.no-ip.org/eventmanager
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Feventmanager.git;a=commitdiff_plain;h=a69f4d65cc2d7401123fbf321e370f011f3635fb;hp=221f9b712a6b693ac9593b7997fa63263d3e3ae9

Merge git://hammerboy.no-ip.org/eventmanager
---

diff --git a/eventos/models.py b/eventos/models.py
index ffc4ebc..e698eab 100644
--- a/eventos/models.py
+++ b/eventos/models.py
@@ -98,6 +98,7 @@ class Participante(models.Model):
     cep = models.CharField(maxlength=8)
     usuario = models.ForeignKey(User)
 
+    comercial = models.BooleanField(default=False)
     refbanco = models.IntegerField()
 
     class Admin:
diff --git a/settings.py b/settings.py
index baff74b..9e97dce 100644
--- a/settings.py
+++ b/settings.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8; -*-
 # Django settings for eventmanager project.
 import os
 
diff --git a/views.py b/views.py
index 36ddaca..4208dfa 100644
--- a/views.py
+++ b/views.py
@@ -146,7 +146,6 @@ def inscricao_individual(request):
     ok = False
     if request.POST and form.is_valid():
         cd = form.cleaned_data
-
         group = Group.objects.get_or_create(name='participantes')[0]
 
         user = User(username=cd['nome_usuario'], email=cd['email'])
@@ -168,6 +167,7 @@ def inscricao_individual(request):
         p.refbanco = 0
         p.telefone = cd['telefone']
         p.home_page = cd['home_page']
+        p.comercial = cd['inscricao_comercial']
         p.save()
 
         u = authenticate(username=cd['nome_usuario'], password=cd['senha'])
@@ -208,6 +208,7 @@ def inscricao_caravana(request):
         p.refbanco = 0
         p.telefone = cd['telefone']
         p.home_page = cd['home_page']
+        p.comercial = False # yeah, always false!
         p.save()
 
         c = Caravana()
@@ -238,7 +239,7 @@ def inscricao_boleto(request):
     initial = {}
 
     if p.refbanco == 0:
-        # o número refran deve ser gerado a cada novo boleto e deve ser único,
+        # o número refTran deve ser gerado a cada novo boleto e deve ser único,
         # mesmo para os testes
         refs = [x.refbanco for x in Participante.objects.all()]
         new_ref = len(refs)
@@ -253,8 +254,11 @@ def inscricao_boleto(request):
 
     initial['refTran'] = '1458197%s' % str(new_ref).zfill(10)
     if today < first_date:
-        initial['valor'] = '3500'
         initial['dtVenc'] = '12102007'
+        if not p.comercial:
+            initial['valor'] = '3500'
+        else:
+            initial['valor'] = '8000'
 
         # caso seja uma caravana...
         if ca and len(ca.parsed_participantes()) >= 10: