GuzhavinAleksey/Vmeda.Online
1
0
Fork 0
forked from CIT/Vmeda.Online
Code Pull Requests Activity

Merge pull request #3107 from dpalou/MOBILE-3974

Browse Source 
MOBILE-3974 paypal: Open paypal enrol in browser
This commit is contained in:
Noel De Martin 2022-02-14 09:46:25 +01:00 committed by GitHub
commit 69d36803fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 52 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/langindex.json
View File

@ -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",

7
src/core/features/course/pages/preview/preview.html
View File

@ -100,10 +100,9 @@
</ion-item>
<ion-item class="ion-text-wrap" *ngIf="paypalEnabled">
<ion-label>
<p class="item-heading">{{ 'core.courses.paypalaccepted' | translate }}</p>
<p *ngIf="isMobile">{{ 'core.paymentinstant' | translate }}</p>
<ion-button *ngIf="isMobile" expand="block" class="ion-margin-top" (click)="paypalEnrol()">
{{ 'core.courses.sendpaymentbutton' | translate }}
<p class="item-heading">{{ 'core.courses.otherenrolments' | translate }}</p>
<ion-button expand="block" class="ion-margin-top" (click)="browserEnrol()">
{{ 'core.courses.completeenrolmentbrowser' | translate }}
</ion-button>
</ion-label>
</ion-item>

92
src/core/features/course/pages/preview/preview.page.ts
View File

@ -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<void> {
// We cannot control browser in browser.
if (!this.isMobile || !CoreSites.getCurrentSite()) {
async browserEnrol(): Promise<void> {
// 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();
}
}

2
src/core/features/courses/components/course-list-item/course-list-item.ts
View File

@ -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',
});
}

5
src/core/features/courses/lang.json
View File

@ -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",

1
src/core/lang.json
View File

@ -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}}",

4
src/core/services/utils/dom.ts
View File

@ -1225,10 +1225,10 @@ export class CoreDomUtilsProvider {
if (options.buttons) {
// Execute dismiss function if any.
const cancelButton = <AlertButton> options.buttons.find(
const cancelButton = <AlertButton | undefined> options.buttons.find(
(button) => typeof button != 'string' && button.handler !== undefined && button.role == 'cancel',
);
cancelButton.handler?.(null);
cancelButton?.handler?.(null);
}
}, autocloseTime);
}