Skip to content
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

Jump to bottom

feat: Payments and upgrade execution for the course #1

Merged
merged 16 commits into from
Jul 10, 2024
Merged

feat: Payments and upgrade execution for the course #1

merged 16 commits into from
Jul 10, 2024

Conversation

farhan-arshad-dev
Copy link
Member

@farhan-arshad-dev farhan-arshad-dev commented Jun 24, 2024 •
edited
Loading

Payments and upgrade execution for the course

  • Learners can purchase a course and unlock the gated content
  • Loading course price on upgrade buttons successfully
  • Calling necessary APIs on interaction with the upgrade button
  • Processing the course upgrade

fixes: LEARNER-9956

Config:

Feature Flag

ECOMMERCE_URL: 'https://ecommerce.example.com' // e-commerce base URL for the course upgrade application

The feature is configurable via server config.

{
  "iap_config": {
    "enabled": true | false,
    "productPrefix": "exmaple.usd100"
    "android_disabled_versions": "[]"
  },
  "value_prop_enabled": true | false // to hide/show upgrade information messages.
}

IAP Flow Example

My Courses Course Home Tab Settings
Course_dashboard.IAP.Flow.webm
My.Courses.IAP.Flow.webm
Profile.webm

@farhan-arshad-dev farhan-arshad-dev changed the base branch from develop to 2U/develop June 24, 2024 06:10
k1rill
k1rill requested changes Jun 26, 2024
View reviewed changes
Copy link
Collaborator

@k1rill k1rill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code review done, some little changes requested
Pending review from QA

app/build.gradle Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/domain/model/AppConfig.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/ui/theme/Shape.kt Outdated Show resolved Hide resolved
course/src/main/java/org/openedx/course/presentation/container/CourseContainerFragment.kt Outdated Show resolved Hide resolved
dashboard/src/main/java/org/openedx/dashboard/presentation/DashboardListFragment.kt Outdated Show resolved Hide resolved
profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt Outdated Show resolved Hide resolved
profile/src/main/java/org/openedx/profile/presentation/settings/SettingsScreenUI.kt Outdated Show resolved Hide resolved
@farhan-arshad-dev
Copy link
Member Author

@k1rill PR is ready for another pass.

HamzaIsrar12
HamzaIsrar12 requested changes Jul 5, 2024
View reviewed changes
Copy link

@HamzaIsrar12 HamzaIsrar12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewing the edge cases now.

core/src/main/java/org/openedx/core/config/Config.kt Show resolved Hide resolved
core/src/main/java/org/openedx/core/domain/model/CourseStructure.kt Show resolved Hide resolved
core/src/main/java/org/openedx/core/domain/model/EnrolledCourse.kt Show resolved Hide resolved
core/src/main/java/org/openedx/core/domain/model/EnrolledCourse.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/domain/model/EnrollmentMode.kt Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/dialog/IAPDialogFragment.kt Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/dialog/IAPDialogFragment.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/ui/IAPUI.kt Show resolved Hide resolved
core/src/main/java/org/openedx/core/ui/IAPUI.kt Outdated Show resolved Hide resolved
core/src/main/java/org/openedx/core/presentation/dialog/IAPDialogFragment.kt Outdated Show resolved Hide resolved
@k1rill k1rill self-requested a review July 8, 2024 12:35
@farhan-arshad-dev farhan-arshad-dev force-pushed the farhan_ar/LEARNER-9956 branch from 548b673 to 1fc7be2 Compare July 8, 2024 16:18
k1rill
k1rill approved these changes Jul 9, 2024
View reviewed changes
Copy link
Collaborator

@k1rill k1rill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one nit

core/src/main/java/org/openedx/core/data/model/CourseStructureModel.kt Outdated Show resolved Hide resolved
farhan-arshad-dev and others added 16 commits July 10, 2024 12:21
@farhan-arshad-dev
feat: Payments and upgrade execution for the course
500743e 
- Learners can purchase a course and unlock the gated content from the main dashboard
- Loading course price on upgrade buttons successfully
- Calling necessary APIs on interaction with the upgrade button
- Processing the course upgrade
- IAP Analytics
fixes: LEARNER-9956
@farhan-arshad-dev
feat: IAP for course dashboard
087c3b4 
- Fix unit test cases
@k1rill @farhan-arshad-dev
feat: added IAP UI views
97b1e83
@farhan-arshad-dev
feat: Add success message after upgrade
753bd2d 
- Issues after rebase
- Moved upgrade button to course dashboard container
- Address PR comments and code/structure improvement
- Code improvements & fixes
@farhan-arshad-dev
feat: handle UnfulfilledPurchase
1cf35b4 
- In this case, the app relaunch must rerun the course upgrade flow with the available course upgrade data.

fixes: LEARNER-9917
@farhan-arshad-dev
feat: restore purchases from settings screen
6387df5 
fixes: LEARNER-9915
@farhan-arshad-dev
refactor: code improvements
480c054
@farhan-arshad-dev
refactor: Error Alert Action Analytics Handling
63334c0 
- fix IAP Analytics issues
- Code improvements

fixes: LEARNER-10042
@farhan-arshad-dev
feat: update rocket icon for full screen loader
26312fa 
- Full screen loader whille course is upgarding
@farhan-arshad-dev
fix: address PR comments
47c38cc 
- Code improvements
@farhan-arshad-dev
fix: Address PR comments by hamza
af38555
@farhan-arshad-dev
fix: unit test cases
f7af46e
@farhan-arshad-dev
fix: code improvements
0b904e8
@farhan-arshad-dev
fix: IAP error dialog improvements
bb151e6
@farhan-arshad-dev
fix: Address PR comments by Hamza-2
0e4a849
@farhan-arshad-dev
fix: address PR comment by k1rill
d44384b
@farhan-arshad-dev farhan-arshad-dev merged commit 8b5722f into edx:2U/develop Jul 10, 2024
4 checks passed
@farhan-arshad-dev farhan-arshad-dev deleted the farhan_ar/LEARNER-9956 branch July 10, 2024 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@HamzaIsrar12 HamzaIsrar12 HamzaIsrar12 approved these changes

@k1rill k1rill k1rill approved these changes

@omerhabib26 omerhabib26 Awaiting requested review from omerhabib26

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@farhan-arshad-dev @k1rill @HamzaIsrar12