diff --git a/ledger/payments/api.py b/ledger/payments/api.py index b461b9249a..539b8f6fc6 100644 --- a/ledger/payments/api.py +++ b/ledger/payments/api.py @@ -557,6 +557,7 @@ class Meta: fields = ( 'id', 'owner', + 'voided', 'order_number', 'num_items', 'amount', diff --git a/ledger/payments/static/payments/js/payment.js b/ledger/payments/static/payments/js/payment.js index 430009a50e..53cf890e21 100644 --- a/ledger/payments/static/payments/js/payment.js +++ b/ledger/payments/static/payments/js/payment.js @@ -258,7 +258,7 @@ $(function(){ receivedPaymentsTable.ajax.reload(); } function showRecordPayment(){ - if (invoice_obj.payment_status != 'paid' && invoice_obj.payment_status != 'over_paid'){ + if (invoice_obj.payment_status != 'paid' && invoice_obj.payment_status != 'over_paid' && !invoice_obj.voided){ if ($other_form.hasClass('hide')){ $other_form.removeClass('hide'); } diff --git a/ledger/payments/templates/dpaw_payments/invoice/payment.html b/ledger/payments/templates/dpaw_payments/invoice/payment.html index d57decc545..6b2ec64936 100644 --- a/ledger/payments/templates/dpaw_payments/invoice/payment.html +++ b/ledger/payments/templates/dpaw_payments/invoice/payment.html @@ -212,7 +212,7 @@
-
+

Record Payment