Skip to content

feat: update payment status from admin panel #8102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 20, 2021
Merged

feat: update payment status from admin panel #8102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d60148e
adding resolved
maze-runnar Jul 14, 2021
2ae2f52
updating nvoices
maze-runnar Jul 14, 2021
b975247
Merge branch 'development' into payment-status
MeghalBisht Jul 17, 2021
86489b7
test-fix
ranjitkshah Jul 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/api/event_invoices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def before_get_object(self, view_kwargs):
raise ForbiddenError({'source': ''}, 'Admin access is required')

methods = [
'GET',
'GET','PATCH'
]
decorators = (jwt_required,)
schema = EventInvoiceSchema
Expand Down
4 changes: 2 additions & 2 deletions app/api/schema/event_invoices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Meta:
created_at = fields.DateTime(allow_none=True)
issued_at = fields.DateTime(dump_only=True)
due_at = fields.DateTime(dump_only=True)
completed_at = fields.DateTime(default=None)
completed_at = fields.DateTime(default=None, allow_none=True)
transaction_id = fields.Str(allow_none=True)
paid_via = fields.Str(
validate=validate.OneOf(
Expand All @@ -42,7 +42,7 @@ class Meta:
paypal_token = fields.Str(allow_none=True)
status = fields.Str(
validate=validate.OneOf(
choices=["paid", "due", "refunding", "refunded", "failed"]
choices=["paid", "due", "refunding", "refunded", "failed", "resolved"]
),
allow_none=True,
)
Expand Down
4 changes: 2 additions & 2 deletions tests/all/integration/api/event_invoices/test_event_invoices_access.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def test_invoice_patch_admin_error(db, client, admin_jwt, user):
data=data,
)

assert response.status_code == 405
assert response.status_code == 200


def test_invoice_patch_user_error(db, client, jwt, user):
Expand All @@ -182,7 +182,7 @@ def test_invoice_patch_user_error(db, client, jwt, user):
data=data,
)

assert response.status_code == 405
assert response.status_code == 200


def test_invoice_delete_admin_error(db, client, admin_jwt, user):
Expand Down