Merge branch 'MOHEMM-Q3-DEV-LATEST' into sultan-q3

sultan-q3
umasoodch 4 years ago
commit 6f4ba1741e

@ -32,6 +32,6 @@
</ion-content>
<ion-footer>
<div class="centerDiv">
<ion-button [ngClass]="{'disable-button-opacity': isValidForm()}" class="button-login" ion-button (click)=" userCheck()" [disabled]="isValidForm()">{{ts.trPK('login','changepassword')}}</ion-button>
<ion-button [ngClass]="{'disable-button-opacity': isValidForm()}" class="button-login" ion-button (click)=" sendSMSForForgotPassword()" [disabled]="isValidForm()">{{ts.trPK('login','changepassword')}}</ion-button>
</div>
</ion-footer>

@ -46,22 +46,17 @@ export class CheckUserComponent implements OnInit {
return true;
}
public userCheck()
{
public userCheck() {
this.cs.startLoading();
const request = new CheckUserAuthenticationRequest();
request.P_USER_NAME = this.P_USER_NAME;
this.authService.checkUserAuthentication(
request,
() => {
/* Write code for error */
}, this.ts.trPK('general', 'ok')).subscribe((result: CheckUserAuthenticationResponse) => {
if (this.cs.validResponse(result)) {
this.checkUserResult = result;
this.cs.stopLoading();
this.sendSMSForForgotPassword();
}
});
this.authService.checkUserAuthentication(request, () => {}, this.ts.trPK('general', 'ok')).subscribe((result: CheckUserAuthenticationResponse) => {
if (this.cs.validResponse(result)) {
this.checkUserResult = result;
this.cs.stopLoading();
this.sendSMSForForgotPassword();
}
});
}
private checkUserResult: CheckUserAuthenticationResponse;
@ -69,9 +64,9 @@ export class CheckUserComponent implements OnInit {
private sendSMSForForgotPassword() {
this.cs.startLoading();
let changePwdObj= new LoginRequest();
changePwdObj.MobileNumber= this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER;
// changePwdObj.MobileNumber= this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER;
changePwdObj.P_USER_NAME=this.P_USER_NAME;
changePwdObj.P_MOBILE_NUMBER=this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER;
// changePwdObj.P_MOBILE_NUMBER=this.checkUserResult.BasicMemberInformation.P_MOBILE_NUMBER;
this.authService.sendPublicSMS(
changePwdObj,

Loading…
Cancel
Save