Merge branch 'MOHEMM-Q2-DEV' into enad-Q1

enad-Q1
umasoodch 4 years ago
commit e5f2e4aaa8

@ -50,6 +50,9 @@
<splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" /> <splash density="port-xhdpi" src="resources/android/splash/drawable-port-xhdpi-screen.png" />
<splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" /> <splash density="port-xxhdpi" src="resources/android/splash/drawable-port-xxhdpi-screen.png" />
<splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" /> <splash density="port-xxxhdpi" src="resources/android/splash/drawable-port-xxxhdpi-screen.png" />
<feature name="SocialSharing">
<param name="android-package" value="nl.xservices.plugins.SocialSharing" />
</feature>
</platform> </platform>
<platform name="ios"> <platform name="ios">
<allow-intent href="itms:*" /> <allow-intent href="itms:*" />

@ -35,8 +35,7 @@ export class ForgotComponent implements OnInit {
) { ) {
} }
ngOnInit() { ngOnInit() {}
}
public onForgot() { public onForgot() {
this.sendSMSForForgotPassword(); this.sendSMSForForgotPassword();
@ -59,11 +58,17 @@ export class ForgotComponent implements OnInit {
public forgotpassword(){ public forgotpassword(){
const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); const data = this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false);
const forgetPasswordTokenResult = this.sharedData.getSharedData('checkSMSResponse', false);
let forgetPasswordTokenID = '';
if (forgetPasswordTokenResult.ForgetPasswordTokenID) {
forgetPasswordTokenID = forgetPasswordTokenResult.ForgetPasswordTokenID;
}
this.loginData.P_USER_NAME = this.P_USER_NAME; this.loginData.P_USER_NAME = this.P_USER_NAME;
let request:ForgetPassword = new ForgetPassword(); let request: any = {};
request.P_Confirm_NEW_PASSWORD=this.P_NEW_PASSWORD; request.P_Confirm_NEW_PASSWORD=this.P_NEW_PASSWORD;
request.P_NEW_PASSWORD=this.P_Confirm_NEW_PASSWORD; request.P_NEW_PASSWORD=this.P_Confirm_NEW_PASSWORD;
request.P_USER_NAME = data.P_USER_NAME; request.P_USER_NAME = data.P_USER_NAME;
request.ForgetPasswordTokenID = forgetPasswordTokenID;
this.authService.submitForgetPassword( this.authService.submitForgetPassword(
request, request,

@ -252,6 +252,7 @@ export class SmsPageComponent implements OnInit {
request.P_USER_NAME = data.P_USER_NAME; request.P_USER_NAME = data.P_USER_NAME;
this.authService.checkForgetSMS(request, () => {}, this.translate.trPK('general', 'ok')).subscribe((result: SMSCheckResponse) => { this.authService.checkForgetSMS(request, () => {}, this.translate.trPK('general', 'ok')).subscribe((result: SMSCheckResponse) => {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
this.sharedData.setSharedData(result, 'checkSMSResponse');
if (this.isForgetPwd) { if (this.isForgetPwd) {
this.common.openForgotPassword(); this.common.openForgotPassword();
} }

@ -142,7 +142,7 @@ export class AuthenticationService {
} else { } else {
mobileType = 'android'; mobileType = 'android';
} }
request.VersionID = 2.9; request.VersionID = 3.0;
request.Channel = 31; request.Channel = 31;
request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.LanguageID = TranslatorService.getCurrentLanguageCode();
request.MobileType = mobileType; request.MobileType = mobileType;

@ -21,5 +21,5 @@ export class SMSCheckResponse extends Response {
public EMPLOYEE_NAME:string; public EMPLOYEE_NAME:string;
public Mohemm_Wifi_SSID:string; public Mohemm_Wifi_SSID:string;
public Mohemm_Wifi_Password:string; public Mohemm_Wifi_Password:string;
public ForgetPasswordTokenID: string;
} }

@ -27,8 +27,8 @@ export class ConnectorService {
public static retryTimes = 0; public static retryTimes = 0;
public static timeOut = 120 * 1000; public static timeOut = 120 * 1000;
public static host = 'https://uat.hmgwebservices.com/'; // public static host = 'https://uat.hmgwebservices.com/';
// public static host = 'https://hmgwebservices.com/'; public static host = 'https://hmgwebservices.com/';
constructor(public httpClient: HttpClient, constructor(public httpClient: HttpClient,
public cs: CommonService, public cs: CommonService,

@ -26,7 +26,7 @@
} }
.pClass { .pClass {
font-size: 10px; font-size: 9px;
text-align: center; text-align: center;
margin-top: 10px; margin-top: 10px;
color: black; color: black;

@ -35,7 +35,13 @@ export class OfferDetailsComponent implements OnInit {
return temporalDivElement.textContent || temporalDivElement.innerText || ""; return temporalDivElement.textContent || temporalDivElement.innerText || "";
} }
share() { share() {
this.socialSharing.share(this.stripHtml(this.details.Description), this.stripHtml(this.details.Title), this.details.Banner_Image).then((result) => { console.log(this.details);
const options = {
message: this.stripHtml(this.details.Description),
// subject: this.stripHtml(this.details.Title),
files: ['https://www.geo.tv/assets/uploads/updates/2021-09-05/368882_8709303_updates.jpg']
}
this.socialSharing.shareWithOptions(options).then((result) => {
console.log(result); console.log(result);
}) })
} }

Loading…
Cancel
Save