From bc4927f4abd6ff22c757794370fed6aa8a6ba4b9 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 2 Sep 2021 15:08:41 +0300 Subject: [PATCH 1/3] fixed connector service --- .../app/hmg-common/services/connector/connector.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index ddd23f6d..b0b0e53c 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 120 * 1000; - public static host = 'https://uat.hmgwebservices.com/'; - // public static host = 'https://hmgwebservices.com/'; + // public static host = 'https://uat.hmgwebservices.com/'; + public static host = 'https://hmgwebservices.com/'; constructor(public httpClient: HttpClient, public cs: CommonService, From 464bca6a7a39257d74eb7c4d21a74f283b08151d Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 2 Sep 2021 17:51:24 +0300 Subject: [PATCH 2/3] added params according to backend team --- .../app/authentication/forgot/forgot.component.ts | 13 +++++++++---- .../app/authentication/sms-page/sms-page.page.ts | 1 + .../authentication/authentication.service.ts | 2 +- .../authentication/models/smscheck.response.ts | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Mohem/src/app/authentication/forgot/forgot.component.ts b/Mohem/src/app/authentication/forgot/forgot.component.ts index 95c8789f..8e76d97a 100644 --- a/Mohem/src/app/authentication/forgot/forgot.component.ts +++ b/Mohem/src/app/authentication/forgot/forgot.component.ts @@ -35,8 +35,7 @@ export class ForgotComponent implements OnInit { ) { } - ngOnInit() { - } + ngOnInit() {} public onForgot() { this.sendSMSForForgotPassword(); @@ -59,12 +58,18 @@ export class ForgotComponent implements OnInit { public forgotpassword(){ 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; - let request:ForgetPassword = new ForgetPassword(); + let request: any = {}; request.P_Confirm_NEW_PASSWORD=this.P_NEW_PASSWORD; request.P_NEW_PASSWORD=this.P_Confirm_NEW_PASSWORD; request.P_USER_NAME = data.P_USER_NAME; - + request.ForgetPasswordTokenID = forgetPasswordTokenID; + this.authService.submitForgetPassword( request, () => { diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index 69778fb6..1be921ed 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -252,6 +252,7 @@ export class SmsPageComponent implements OnInit { request.P_USER_NAME = data.P_USER_NAME; this.authService.checkForgetSMS(request, () => {}, this.translate.trPK('general', 'ok')).subscribe((result: SMSCheckResponse) => { if (this.common.validResponse(result)) { + this.sharedData.setSharedData(result, 'checkSMSResponse'); if (this.isForgetPwd) { this.common.openForgotPassword(); } diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index 09c1e993..9952d38e 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -142,7 +142,7 @@ export class AuthenticationService { } else { mobileType = 'android'; } - request.VersionID = 2.9; + request.VersionID = 3.0; request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.MobileType = mobileType; diff --git a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts index 73d27b74..c6332dba 100644 --- a/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts +++ b/Mohem/src/app/hmg-common/services/authentication/models/smscheck.response.ts @@ -21,5 +21,5 @@ export class SMSCheckResponse extends Response { public EMPLOYEE_NAME:string; public Mohemm_Wifi_SSID:string; public Mohemm_Wifi_Password:string; - + public ForgetPasswordTokenID: string; } From 112269a5e447bdc06136588a7cc65db3782d7032 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 5 Sep 2021 16:16:43 +0300 Subject: [PATCH 3/3] fixed image sharing issue --- Mohem/config.xml | 3 +++ .../ui/services-button/services-button.component.scss | 2 +- .../offer-details/offer-details.component.ts | 8 +++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Mohem/config.xml b/Mohem/config.xml index f23adff8..f1bfd97d 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -50,6 +50,9 @@ + + + diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss index ac71c624..7be7a63d 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss @@ -26,7 +26,7 @@ } .pClass { - font-size: 10px; + font-size: 9px; text-align: center; margin-top: 10px; color: black; diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts index 781d2472..5021dc79 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.ts @@ -35,7 +35,13 @@ export class OfferDetailsComponent implements OnInit { return temporalDivElement.textContent || temporalDivElement.innerText || ""; } 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); }) }