-
Notifications
You must be signed in to change notification settings - Fork 48
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
[2/2] Affiliate program Integration v1 #564
Merged
Merged
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit
Hold shift + click to select a range
48bbbac
auth: Allow for corporate registrations
sashko9807 e1c0be3
auth: Don't create new corporate profile if company exists
sashko9807 310e19c
Affiliate Program: Initial changes
sashko9807 254cca6
Run prisma migrate
sashko9807 5002426
schema.prisma: Add donation relation to Affiliate model
sashko9807 a0e658d
schema.prisma: Add guaranteed status for donations
sashko9807 d00ff81
Add affiliateId to testing and seeding scripts
sashko9807 f8e7252
validation: Set exposeDefaultValues to true globally
sashko9807 fc847c3
src/affiliate: Implement endpoints for creating/cancelling donations
sashko9807 7c7ea94
src/campaign: Include guaranteedAmount in campaign's summary
sashko9807 8782e23
tasks/bank-import: Handle affiliate donations
sashko9807 a8337a3
bank-transactions: Add endpoint to simulate IRIS transactions.
sashko9807 39b7f7a
src/affiliate: Change affiliateCode structure
sashko9807 ed56cfc
affiliate: Make affiliateCode available only for active affiliates
sashko9807 3f48f56
jest: Fix test breakage
sashko9807 764731d
src/donations: Include guaranteed donations in listPublic
sashko9807 b187047
eslint: Address errors and warnings
sashko9807 76c8129
src/donations: Include companyName in listPublic endpoint
sashko9807 1dc7243
corporateUser: Add space between first and last name for legalpersonname
sashko9807 505a210
src/affiliate: Generate new code whenever affiliate is set to active
sashko9807 9afc6e9
Run nx format
sashko9807 fc1907c
src/donations:c Add affiliateId to donation mock
sashko9807 4ac27a3
src/affiliates: Add tests
sashko9807 f8a8bce
bank-transaction: Return unprocessed if no guaranteed donations are …
sashko9807 b51522d
tasks/bank-import: Set transaction to importFailed if no guaranteed d…
sashko9807 ca85225
tasks/bank-import: Include test for affiliate donations
sashko9807 b4f0824
src/affiliate: Fix redundant space on ForbiddenException
sashko9807 df7d3ed
affiliate.controller.spec: Rename test to AffiliateController
sashko9807 1571039
schema.prisma: Add companyId to person model
sashko9807 e5f1065
auth.service: Add companyId in createPerson method
sashko9807 9c5f796
src/register.controller: Use single endpoint for registration
sashko9807 fa1a0c1
Consider bank transaction as successfull if no guaranteed donations a…
sashko9807 7cbe6f7
affiliate: Rename endpoints
sashko9807 80711dd
bank-transaction: Update bankDonationStatus on duplicate record
sashko9807 4de21df
affiliate: Create endpoint to get donations with pagination
sashko9807 480524a
schema.prisma:Affiliate: Make companyId not null
sashko9807 7245c78
affiliateCodeGenerator: Get the first 8 characters
sashko9807 1c09553
eslint: Address error and warnings
sashko9807 b7c2716
tasks/bank-import: Change bankstatus only if donation is affiliate
sashko9807 8d389a5
jest: Fix tests
sashko9807 4295987
swagger: Provide schema for iris-transaction-test endpoint
sashko9807 724ac2d
bank-import: Initialize variable with affiliate code prefix
sashko9807 d79c1dd
donation: Add metadata field to donation Model
sashko9807 00b31d1
schema.prisma: Map DonationMetadata model
sashko9807 7055e1d
src/affiliate: Include metadata in affiliateDonationDto in jest
sashko9807 52d67ee
src/auth: Allow for corporate fields to be either string or undefined
sashko9807 734963f
src/affiliate: Improve semantics
sashko9807 4daeba8
src/affiliate: Fix test
sashko9807 50238df
src/affiliate: Include JWT_SECRET_KEY when generating affiliate code
sashko9807 7ce8939
src/affiliate: Create new endpoint to refresh affiliate code
sashko9807 a7d1df3
src/donations: Fix error handling if no vault has been found
sashko9807 12ceefe
src/affiliate: Check whether campaign accepts more donations before m…
sashko9807 2aacb5d
src/donations: Bring back count query to listPublic service endpoint
sashko9807 a5e4e0b
src/donations: Handle corporate donations
sashko9807 ca25104
src/donations: Don't update updatedAt property on imported donation
sashko9807 3acf963
src/donation-wish: Extend selector to include companyName and donatio…
sashko9807 d5754e8
src/affiliate: Include donation wish in query
sashko9807 87df4e2
updateAffiliateBankPayment: Use value of donation's updatedAt field
sashko9807 aea9be9
getUserDonationById: Include companyName inside the query
sashko9807 82eb4a4
userDonationById(): Get first and last name from keycloak token
sashko9807 c143e6b
src/affiliate: Add new endpoint to get affiliate's data by userid
sashko9807 4929a4f
src/affiliate: cleanup console.log
sashko9807 ec25464
schema.prisma: Add profileEnabled to person table
sashko9807 e112223
src/account: Make endpoint for manual activation/deactivation of profile
sashko9807 7cd1a24
src/person: Fix ordering by profile type not working
sashko9807 62cfe03
src/auth: Prevent deactivation of profile if it is in podkrepi-admin …
sashko9807 f2be94f
src/affiliate: Solve ts errors on controller.spec
sashko9807 4227d25
src/affiliate: Add new endpoint to list all affiliates
sashko9807 6fa38f0
src/affiliate: Include person's email in findAll query result
sashko9807 c42e7b3
src/auth: Fix test breakage
sashko9807 5a68fc4
schema.prisma: Add createdAt and updatedAt fields to Affiliate model
sashko9807 26837ce
src/donations: Improve validation of metadata fields if not undefined
sashko9807 bd4a86a
src/donations: Fix ts errors
sashko9807 b34c67a
bank-transaction: iris-simulation should be done only by admin
sashko9807 e113148
dto/donation-metadata: Fix extraData field being empty on valid Objec…
sashko9807 8079147
src/auth: Change admin roles lookup
sashko9807 753d220
Merge branch 'master' into affiliate-program2
sashko9807 92044eb
events/stripe: Resolve errors after merge of master
sashko9807 421df97
ESLint: Remove unused imports
sashko9807 94b97bc
auth.service.spec: Bring back issueToken testcase
sashko9807 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
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.
not a big problem, but still the user names should be already available in the session on the frontend