Changeset 143

Timestamp:

19/07/08 07:17:20 (4 years ago)

Author:

nigel.sim

Message:

• Added payment history
  • Added editing capibilities

Location:

django/domainmanager/trunk

Files:

• manager/views.py (modified) (4 diffs)
• templates/domains/domain.html (modified) (2 diffs)

django/domainmanager/trunk/manager/views.py

@@ -1 @@
-from django.http import HttpResponse
+from django.http import HttpResponse, HttpResponseRedirect
 from django.contrib.simpletemplate.public import get_template
 from django.template import Context, loader
@@ -6 +6 @@
 from forms import DomainForm, ChargesForm
 from django.conf import settings
-from django import newforms as forms
+from django import forms
 
 from domains.manager.models import Domain, Client, Charge
@@ -22 +22 @@
         domainForm = DomainForm
         clientForm = forms.form_for_model(Client)
-
+        
         if request.method == 'POST':
                 addDomainForm = domainForm(request.POST, prefix='domain')
@@ -68 +68 @@
         domain = get_object_or_404(Domain, id=domain_id)
         updateDomainForm = DomainForm
-        
-        addPaymentForm = ChargesForm
-        if request.method == 'POST':
-                return
+
+        # Add charges form
+        addChargesForm = ChargesForm
+        if request.method == 'GET' and request.GET.has_key('edit_charge'):
+                charge = get_object_or_404(Charge, id=request.GET.get('edit_charge'))
+                chargesForm = addChargesForm(initial=forms.model_to_dict(charge), prefix='charge')
+        elif request.method == 'POST' and request.POST.get('action') == 'addCharge':
+                print "B"
+                chargesForm = addChargesForm(request.POST, prefix='charge')
+                if chargesForm.is_valid():
+                        charge = Charge()
+                        charge.amount = chargesForm.cleaned_data['amount']
+                        charge.description = chargesForm.cleaned_data['description']
+                        charge.invoice_date = chargesForm.cleaned_data['invoice_date']
+                        charge.paid_date = chargesForm.cleaned_data['paid_date']
+                        charge.id = chargesForm.cleaned_data['id']
+                        charge.domain = domain
+                        charge.save()
+                        return HttpResponseRedirect(request.path)
+                else:
+                        # Let this fall through to be caught by the form again
+                        pass
+        else:
+                chargesForm = addChargesForm(prefix='charge')
+                
+        chargeHistory = Charge.objects.filter(domain=domain)
 
         return render_to_response('domains/domain.html',
                                                           {'domainList':domain_list,
                                                            'settings': settings,
-                                                           'updateDomainForm':updateDomainForm(forms.model_to_dict(domain)).as_table(),
-                                                           'addPaymentForm': addPaymentForm().as_table(),
-                                                           'paymentHistory': None,
+                                                           'updateDomainForm':updateDomainForm(initial=forms.model_to_dict(domain)).as_table(),
+                                                           'addPaymentForm': chargesForm.as_table(),
+                                                           'paymentHistory': chargeHistory,
                                                            })

django/domainmanager/trunk/templates/domains/domain.html

@@ -15 +15 @@
 </form>
 
-<h2>Add payment</h2>
+<h2>Add charge</h2>
 <form action='{{ request.path }}' method='POST'>
-<input type='hidden' name='edit_id' value='{{ edit_id }}'>
+<input type='hidden' name='action' value='addCharge'>
 <table>
 {{ addPaymentForm }}
 <tr>
   <td colspan=2 align=right>
-    <input type=submit name='submitAction' value='save'>
+    <input type=submit name='submitAction' value='add'>
   </td>
 </tr>
@@ -30 +30 @@
 <h2>History of charges</h2>
 <table>
-{{ paymentHistory }}
+<tr><th>Description</th><th>Amount</th><th>Invoice date</th><th>Payment date</th></tr>
+{% for charge in paymentHistory %}
+        <tr>
+                <td><a href="?edit_charge={{charge.id}}">{{charge.description}}</a></td>
+                <td>{{charge.amount}}</td>
+                <td>{{charge.invoice_date}}</td>
+                <td>{{charge.payment_date}}</td>
+        </tr>
+{% endfor %}
 </table>