diff --git a/scripts/langindex.json b/scripts/langindex.json index f70a5b11c..0b8edb055 100644 --- a/scripts/langindex.json +++ b/scripts/langindex.json @@ -1582,8 +1582,10 @@ "core.courses.aria:courseprogress": "block_myoverview", "core.courses.aria:favourite": "course", "core.courses.availablecourses": "moodle", + "core.courses.browserenrolinstructions": "local_moodlemobileapp", "core.courses.cannotretrievemorecategories": "local_moodlemobileapp", "core.courses.categories": "moodle", + "core.courses.completeenrolmentbrowser": "local_moodlemobileapp", "core.courses.confirmselfenrol": "local_moodlemobileapp", "core.courses.courses": "moodle", "core.courses.downloadcourses": "local_moodlemobileapp", @@ -1605,9 +1607,9 @@ "core.courses.nosearchresults": "wiki", "core.courses.notenroled": "completion", "core.courses.notenrollable": "local_moodlemobileapp", + "core.courses.otherenrolments": "local_moodlemobileapp", "core.courses.password": "local_moodlemobileapp", "core.courses.paymentrequired": "moodle", - "core.courses.paypalaccepted": "enrol_paypal", "core.courses.refreshcourses": "local_moodlemobileapp", "core.courses.reload": "moodle", "core.courses.removefromfavourites": "block_myoverview", @@ -1615,7 +1617,6 @@ "core.courses.searchcourses": "moodle", "core.courses.searchcoursesadvice": "local_moodlemobileapp", "core.courses.selfenrolment": "local_moodlemobileapp", - "core.courses.sendpaymentbutton": "enrol_paypal", "core.courses.show": "block_myoverview", "core.courses.showonlyenrolled": "local_moodlemobileapp", "core.courses.therearecourses": "moodle", @@ -2076,7 +2077,6 @@ "core.othergroups": "group", "core.pagea": "moodle", "core.parentlanguage": "langconfig", - "core.paymentinstant": "moodle", "core.percentagenumber": "local_moodlemobileapp", "core.phone": "moodle", "core.pictureof": "moodle", diff --git a/src/core/features/course/pages/preview/preview.html b/src/core/features/course/pages/preview/preview.html index 476c38c92..7aeaeda68 100644 --- a/src/core/features/course/pages/preview/preview.html +++ b/src/core/features/course/pages/preview/preview.html @@ -100,10 +100,9 @@ -

{{ 'core.courses.paypalaccepted' | translate }}

-

{{ 'core.paymentinstant' | translate }}

- - {{ 'core.courses.sendpaymentbutton' | translate }} +

{{ 'core.courses.otherenrolments' | translate }}

+ + {{ 'core.courses.completeenrolmentbrowser' | translate }} diff --git a/src/core/features/course/pages/preview/preview.page.ts b/src/core/features/course/pages/preview/preview.page.ts index 8c1f9b9ce..425bf962b 100644 --- a/src/core/features/course/pages/preview/preview.page.ts +++ b/src/core/features/course/pages/preview/preview.page.ts @@ -12,9 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, OnDestroy, NgZone, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; import { IonRefresher } from '@ionic/angular'; -import { CoreApp } from '@services/app'; import { CoreEventObserver, CoreEvents } from '@singletons/events'; import { CoreSites } from '@services/sites'; import { CoreDomUtils } from '@services/utils/dom'; @@ -30,12 +29,13 @@ import { import { CoreCourseOptionsDelegate } from '@features/course/services/course-options-delegate'; import { CoreCourse, CoreCourseProvider } from '@features/course/services/course'; import { CoreCourseHelper, CorePrefetchStatusInfo } from '@features/course/services/course-helper'; -import { Translate } from '@singletons'; +import { NgZone, Platform, Translate } from '@singletons'; import { CoreConstants } from '@/core/constants'; import { CoreCoursesSelfEnrolPasswordComponent } from '../../../courses/components/self-enrol-password/self-enrol-password'; import { CoreNavigator } from '@services/navigator'; import { CoreUtils } from '@services/utils/utils'; import { CoreCourseWithImageAndColor } from '@features/courses/services/courses-helper'; +import { Subscription } from 'rxjs'; /** * Page that allows "previewing" a course and enrolling in it if enabled and not enrolled. @@ -66,7 +66,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy { downloadCourseEnabled: boolean; courseUrl = ''; courseImageUrl?: string; - isMobile: boolean; progress?: number; protected isGuestEnabled = false; @@ -75,15 +74,13 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy { protected enrolmentMethods: CoreCourseEnrolmentMethod[] = []; protected waitStart = 0; protected enrolUrl = ''; - protected paypalReturnUrl = ''; protected pageDestroyed = false; protected courseStatusObserver?: CoreEventObserver; protected courseId!: number; + protected appResumeSubscription: Subscription; + protected waitingForBrowserEnrol = false; - constructor( - protected zone: NgZone, - ) { - this.isMobile = CoreApp.isMobile(); + constructor() { this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite(); if (this.downloadCourseEnabled) { @@ -94,6 +91,20 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy { } }, CoreSites.getCurrentSiteId()); } + + // Refresh the view when the app is resumed. + this.appResumeSubscription = Platform.resume.subscribe(() => { + if (!this.waitingForBrowserEnrol || !this.dataLoaded) { + return; + } + + NgZone.run(async () => { + this.waitingForBrowserEnrol = false; + this.dataLoaded = false; + + await this.refreshData(); + }); + }); } /** @@ -115,7 +126,6 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy { const currentSiteUrl = CoreSites.getRequiredCurrentSite().getURL(); this.enrolUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'enrol/index.php?id=' + this.courseId); this.courseUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'course/view.php?id=' + this.courseId); - this.paypalReturnUrl = CoreTextUtils.concatenatePaths(currentSiteUrl, 'enrol/paypal/return.php'); try { await this.getCourse(); @@ -269,53 +279,30 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy { } /** - * Enrol using PayPal. + * Enrol in browser. */ - async paypalEnrol(): Promise { - // We cannot control browser in browser. - if (!this.isMobile || !CoreSites.getCurrentSite()) { + async browserEnrol(): Promise { + // Send user to browser to enrol. Warn the user first. + try { + await CoreDomUtils.showConfirm( + Translate.instant('core.courses.browserenrolinstructions'), + undefined, + Translate.instant('core.openinbrowser'), + ); + } catch { + // User canceled. return; } - let hasReturnedFromPaypal = false; + this.waitingForBrowserEnrol = true; - const urlLoaded = (event: InAppBrowserEvent): void => { - if (event.url.indexOf(this.paypalReturnUrl) != -1) { - hasReturnedFromPaypal = true; - } else if (event.url.indexOf(this.courseUrl) != -1 && hasReturnedFromPaypal) { - // User reached the course index page after returning from PayPal, close the InAppBrowser. - inAppClosed(); - window.close(); - } - }; - const inAppClosed = (): void => { - // InAppBrowser closed, refresh data. - unsubscribeAll(); - - if (!this.dataLoaded) { - return; - } - this.dataLoaded = false; - this.refreshData(); - }; - const unsubscribeAll = (): void => { - inAppLoadSubscription?.unsubscribe(); - inAppExitSubscription?.unsubscribe(); - }; - - // Open the enrolment page in InAppBrowser. - const window = await CoreSites.getRequiredCurrentSite().openInAppWithAutoLogin(this.enrolUrl); - - // Observe loaded pages in the InAppBrowser to check if the enrol process has ended. - const inAppLoadSubscription = window.on('loadstart').subscribe((event) => { - // Execute the callback in the Angular zone, so change detection doesn't stop working. - this.zone.run(() => urlLoaded(event)); - }); - // Observe window closed. - const inAppExitSubscription = window.on('exit').subscribe(() => { - // Execute the callback in the Angular zone, so change detection doesn't stop working. - this.zone.run(inAppClosed); - }); + await CoreSites.getRequiredCurrentSite().openInBrowserWithAutoLogin( + this.enrolUrl, + undefined, + { + showBrowserWarning: false, + }, + ); } /** @@ -486,6 +473,7 @@ export class CoreCoursePreviewPage implements OnInit, OnDestroy { ngOnDestroy(): void { this.pageDestroyed = true; this.courseStatusObserver?.off(); + this.appResumeSubscription.unsubscribe(); } } diff --git a/src/core/features/courses/components/course-list-item/course-list-item.ts b/src/core/features/courses/components/course-list-item/course-list-item.ts index 3568f83d4..c44645ed9 100644 --- a/src/core/features/courses/components/course-list-item/course-list-item.ts +++ b/src/core/features/courses/components/course-list-item/course-list-item.ts @@ -113,7 +113,7 @@ export class CoreCoursesCourseListItemComponent implements OnInit, OnDestroy, On }); } else if (instance === 'paypal') { this.enrolmentIcons.push({ - label: 'core.courses.paypalaccepted', + label: 'core.courses.otherenrolments', icon: 'fab-paypal', }); } diff --git a/src/core/features/courses/lang.json b/src/core/features/courses/lang.json index 9887f8853..933eb9aff 100644 --- a/src/core/features/courses/lang.json +++ b/src/core/features/courses/lang.json @@ -6,8 +6,10 @@ "aria:courseprogress": "Course progress:", "aria:favourite": "Course is starred", "availablecourses": "Available courses", + "browserenrolinstructions": "We will take you to your device's browser. Once you have completed your enrolment, please come back to this app.", "cannotretrievemorecategories": "Categories deeper than level {{$a}} cannot be retrieved.", "categories": "Course categories", + "completeenrolmentbrowser": "Complete enrolment in browser", "confirmselfenrol": "Are you sure you want to enrol yourself in this course?", "courses": "Courses", "downloadcourses": "Download courses", @@ -29,9 +31,9 @@ "nosearchresults": "No results", "notenroled": "You are not enrolled in this course", "notenrollable": "You cannot enrol yourself in this course.", + "otherenrolments": "Other enrolments", "password": "Enrolment key", "paymentrequired": "This course requires a payment for entry.", - "paypalaccepted": "PayPal payments accepted", "refreshcourses": "Refresh courses", "reload": "Reload", "removefromfavourites": "Unstar this course", @@ -39,7 +41,6 @@ "searchcourses": "Search courses", "searchcoursesadvice": "You can use the search courses button to find courses to access as a guest or enrol yourself in courses that allow it.", "selfenrolment": "Self enrolment", - "sendpaymentbutton": "Send payment via PayPal", "show": "Unarchive", "showonlyenrolled": "Show only my courses", "therearecourses": "There are {{$a}} courses", diff --git a/src/core/lang.json b/src/core/lang.json index 982c01ba1..651d5fd54 100644 --- a/src/core/lang.json +++ b/src/core/lang.json @@ -228,7 +228,6 @@ "othergroups": "Other groups", "pagea": "Page {{$a}}", "parentlanguage": "", - "paymentinstant": "Use the button below to pay and be enrolled within minutes!", "percentagenumber": "{{$a}}%", "phone": "Phone", "pictureof": "Picture of {{$a}}", diff --git a/src/core/services/utils/dom.ts b/src/core/services/utils/dom.ts index 9d2076256..47c013e9c 100644 --- a/src/core/services/utils/dom.ts +++ b/src/core/services/utils/dom.ts @@ -1225,10 +1225,10 @@ export class CoreDomUtilsProvider { if (options.buttons) { // Execute dismiss function if any. - const cancelButton = options.buttons.find( + const cancelButton = options.buttons.find( (button) => typeof button != 'string' && button.handler !== undefined && button.role == 'cancel', ); - cancelButton.handler?.(null); + cancelButton?.handler?.(null); } }, autocloseTime); }