Changeset 638b547 for remit/vouchers

Timestamp:

Jul 7, 2014, 10:31:19 PM (11 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master

Children:

922e0e5

Parents:

56c7337

git-author:

Alex Dehnert <adehnert@…> (07/07/14 22:31:19)

git-committer:

Alex Dehnert <adehnert@…> (07/07/14 22:31:19)

Message:

Generate RFPs, not vouchers, and show better messages

File:

• remit/vouchers/views.py (modified) (2 diffs)

remit/vouchers/views.py

@@ -262 +262 @@
         and request_obj.approval_status == vouchers.models.APPROVAL_STATE_PENDING)
     post_approve = (http_request.method == 'POST' and 'approve' in http_request.REQUEST)
+    approve_message = ''
+    approve_level = ''
     if show_approve:
-        # Voucherize form
-        # Prefill from certs / config
-        initial = {}
-        initial['name'] = '%s %s' % (http_request.user.first_name, http_request.user.last_name, )
-        if settings.SIGNATORY_EMAIL:
-            initial['email'] = settings.SIGNATORY_EMAIL
-        else:
-            initial['email'] = http_request.user.email
-
-        approve_message = ''
-        if post_approve:
-            approve_form = VoucherizeForm(http_request.POST)
-            if approve_form.is_valid():
-                request_obj.approve(
-                    approver=http_request.user,
-                    signatory_name=approve_form.cleaned_data['name'],
-                    signatory_email=approve_form.cleaned_data['email'],
-                )
-                approve_message = 'Created new voucher from request'
-        else:
-            approve_form = VoucherizeForm(initial=initial)
+        if not request_obj.documentation:
+            approve_message = "Documentation must be uploaded (above) before approving RFPs."
+            approve_level = 'warn'
+        elif post_approve:
+            request_obj.approve_as_rfp(approver=http_request.user)
+            approve_message = 'Queued RFP from request.'
+            approve_level = 'info'
+    elif post_approve:
+        approve_message = "You attempted to approve a reimbursement request that you could not approve. Most likely, either the voucher has already been approved, or you do not have adequate permissions."
+        approve_level = 'error'
 
     context = {
@@ -290 +281 @@
         'new': new,
         'doc_form': doc_upload_form,
+        'show_approve': show_approve,
+        'approve_message': approve_message,
+        'approve_level': approve_level,
     }
-    if show_approve:
-        context['approve_form'] = approve_form
-        context['approve_message'] = approve_message
-    elif post_approve:
-        context['approve_error'] = "You attempted to approve a reimbursement request that you could not approve. Most likely, either the voucher has already been approved, or you do not have adequate permissions."
     if show_email:
         context['email_options'] = email_options