2372, 23508 - redirect to direct pay, API and UI updates #282
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kialj876
approved these changes
Oct 30, 2024
| @@ -126,7 +126,8 @@ def json(self): | |||
| 'submissionDate': self.submission_date.isoformat(), | |||
| 'expiryDate': self.expiry_date.isoformat() if self.expiry_date else None, | |||
| 'outputFileKey': self._output_file_key, | |||
| 'submitter': self.submitter.display_name if self.submitter else None | |||
| 'submitter': self.submitter.display_name if self.submitter else None, | |||
| 'paymentToken': self.payment_token | |||
There was a problem hiding this comment.
can you just add a comment here that this is the 'invoice id' from the pay db
| @pytest.mark.parametrize('test_name,mock_response,is_payment_completion_date_expected', [ | ||
| ('test_pad_invoice', {'id': 123, 'paymentMethod': 'PAD'}, True), | ||
| ('test_pad_invoice', {'id': 123, 'paymentMethod': 'DIRECT_PAY'}, False)]) | ||
| def test_create_invoice(client, session, jwt, mocker, test_name, mock_response, is_payment_completion_date_expected): |
seeker25
approved these changes
Oct 30, 2024
seeker25
reviewed
Oct 30, 2024
| @@ -70,18 +70,22 @@ def create_invoice(document_access_request: DocumentAccessRequest, user_jwt: Jwt | |||
| header, business_json) | |||
|
|
|||
| if payment_response.status_code in (HTTPStatus.OK, HTTPStatus.CREATED): | |||
| payment_completion_date = datetime.utcnow() | |||
| is_pad = payment_response.json().get('paymentMethod') == 'PAD' | |||
| today_utc = datetime.utcnow() | |||
There was a problem hiding this comment.
datetime.now(tz=timezone.utc)
datetime.utcnow() = depreciated
There was a problem hiding this comment.
Yeah, pycharm shows the same !
I wasn't sure about updating it in just one place, but you are right. When changing the code, update it in place I changed if it does not break everything else :D
seeker25
reviewed
Oct 30, 2024
| @@ -37,10 +37,6 @@ def validate_document_access_request(document_access_request_json: dict, account | |||
| if not account_org: | |||
| validation_errors.append({'error': 'Invalid Account'}) | |||
|
|
|||
| if account_org.get('orgType') != 'PREMIUM': | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #:2372 /bcgov/entity#2372
Issue #:23508 /bcgov/entity#23508
Description of changes:
API updates:
UI updates:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of the PPR license (Apache 2.0).