diff --git a/sstreasury/views.py b/sstreasury/views.py index 24d49a2..7badcb5 100644 --- a/sstreasury/views.py +++ b/sstreasury/views.py @@ -675,7 +675,8 @@ def claim_processing(request): if request.method == 'POST': if request.POST['action'] == 'Export': - claims = models.ReimbursementClaim.objects.filter(state=models.ClaimState.APPROVED.value).all() + #claims = models.ReimbursementClaim.objects.filter(state=models.ClaimState.APPROVED.value).all() + claims = models.ReimbursementClaim.objects.all() claims = [c for c in claims if request.POST.get('claim_{}'.format(c.id), False)] claims.sort(key=lambda c: '{}/{}{}/{}'.format(c.payee_name.strip(), c.payee_bsb.strip()[:3], c.payee_bsb.strip()[-3:], c.payee_account.strip())) @@ -708,7 +709,8 @@ def claim_processing(request): return response if request.POST['action'] == 'ExportXero': - claims = models.ReimbursementClaim.objects.filter(state=models.ClaimState.APPROVED.value).all() + #claims = models.ReimbursementClaim.objects.filter(state=models.ClaimState.APPROVED.value).all() + claims = models.ReimbursementClaim.objects.all() claims = [c for c in claims if request.POST.get('claim_{}'.format(c.id), False)] # Export CSV @@ -742,7 +744,10 @@ def claim_processing(request): emailer = Emailer() emailer.send_mail([claim.author.email], 'Claim paid: {} (RE-{})'.format(claim.purpose, claim.id), 'sstreasury/email/claim_paid.md', {'claim': claim}) - claims = models.ReimbursementClaim.objects.filter(state=models.ClaimState.APPROVED.value).all() + if request.GET.get('view', '') == 'all': + claims = models.ReimbursementClaim.objects.all() + else: + claims = models.ReimbursementClaim.objects.filter(state=models.ClaimState.APPROVED.value).all() return render(request, 'sstreasury/claim_processing.html', { 'claims': claims