-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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.
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
Enable setting created and merchant fields for new requests #25449
Merged
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit
Hold shift + click to select a range
92ecc77
Add getMerchant method
mountiny 4fc0e51
Set up money request merchant routes
mountiny 86c2be1
Add the MoneyRequestMerchantPage pagge
mountiny ce56753
Enable the merchant field
mountiny 2c5f13e
Create MoneyRequestCreatedPage and relevant routes
mountiny b76949a
Implementing the ability to set date for new request
mountiny c61a43f
Make sure the created is also reset
mountiny 3912e51
Merge branch 'main' into vit-addMerchantToRequestMoney
mountiny 0bb81e1
Remove unused prop
mountiny 74bbf44
Add mechant and created to the build optimistic transaction call
mountiny 6ed654c
Pass the merchant and created to the api
mountiny 8f7b3a3
Merge branch 'main' into vit-addMerchantToRequestMoney
mountiny f8d6cab
Update tests
mountiny 3105cf5
Fix the lint
mountiny ae5ab8d
Add the merchant to transaction header
mountiny 44b2dc6
Merge branch 'main' into vit-addMerchantToRequestMoney
mountiny 3661a9c
Merge branch 'main' into vit-addMerchantToRequestMoney
mountiny 6a057be
Refactoring the MoneyRequestDescriptionPage to functional component
mountiny 9128ab7
Remove use of withLocalize
mountiny 0e06cc5
Add missing property to the iou key
mountiny 9e897df
Refactor the MoneyRequestCreatedPage to functional component
mountiny ee0f400
Fix style
mountiny efd74c8
Change to Date instead of Created in component names
mountiny 0b18306
Migrate MoneyRequestMerchantPage to function component
mountiny ede0be7
Props clean up
mountiny e5755b4
Merge branch 'main' into vit-addMerchantToRequestMoney
mountiny 8ad0fc4
Disable changing date and merchant when creating split bills
mountiny 6b13565
Merge main to resolve merge conflicts
mountiny File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
getDBTime() returns time in milisecs. And created is of format
YYYY-MM-DD
.This won't work, right?
I think the server is expecting time in one format. i.e. YYYY-MM-DD
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The server does not mind, it can be both, now its passing
DateUtils.getDBTime()
and it should work fine