diff --git a/src/app/accounts/addbank/addbank.page.html b/src/app/accounts/addbank/addbank.page.html index 72a02fb..19ad721 100644 --- a/src/app/accounts/addbank/addbank.page.html +++ b/src/app/accounts/addbank/addbank.page.html @@ -1,8 +1,22 @@ - + + + + + + + + + + + + + {{currency_description}} Add New {{currency_code}} Account + +
- +
diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html index a331050..419b1f2 100644 --- a/src/app/pages/family/family.page.html +++ b/src/app/pages/family/family.page.html @@ -1,4 +1,18 @@ - + + + + + + + + + + + + + Family Account + +
@@ -206,10 +220,10 @@ - - -
- Return -
- - + + + + + + + diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html index 8892654..99d24df 100644 --- a/src/app/pages/familymember/familymember.page.html +++ b/src/app/pages/familymember/familymember.page.html @@ -1,9 +1,23 @@ - + + + + + + + + + + + + + {{member_firstname}} {{member_lastname}} + +
-
+
@@ -204,10 +218,10 @@
- - -
- Return -
- - + + + + + + + diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts index d05ec0d..5daddd5 100644 --- a/src/app/pages/familymember/familymember.page.ts +++ b/src/app/pages/familymember/familymember.page.ts @@ -23,7 +23,9 @@ export class FamilymemberPage implements OnInit { member_pin:string=''; family_uid:string=''; jobManagerActiveData:any; - + session_image_server:string=''; + curr_session:string=''; + // family_member_uid:string=''; member_qr_string ='0000000'; constructor( @@ -41,6 +43,8 @@ export class FamilymemberPage implements OnInit { } ngOnInit() { + this.session_image_server = this.sessionDataProviderService.session_image_server; + this.curr_session=this.sessionDataProviderService.session; this.getThisFamilyAccount(); this.getFamilyWalletsData(); } diff --git a/src/app/pages/marketdetail/marketdetail.page.html b/src/app/pages/marketdetail/marketdetail.page.html index 1f7302f..312f884 100644 --- a/src/app/pages/marketdetail/marketdetail.page.html +++ b/src/app/pages/marketdetail/marketdetail.page.html @@ -1,6 +1,20 @@ - + + + + + + + + + + + + + {{jobData.title}} + + -
+
@@ -52,7 +66,7 @@
-
+
Expires {{jobData.expire}} @@ -205,11 +219,11 @@
- - -
- Return -
- - + + + + + + + diff --git a/src/app/pages/marketdetail/marketdetail.page.ts b/src/app/pages/marketdetail/marketdetail.page.ts index 4eb2ef0..bde2176 100644 --- a/src/app/pages/marketdetail/marketdetail.page.ts +++ b/src/app/pages/marketdetail/marketdetail.page.ts @@ -13,6 +13,8 @@ import {SessionDataProviderService} from "../../store/session-data-provider.serv export class MarketdetailPage implements OnInit { @ViewChild('yourmessage') yourmessage; tabs = 'about'; + session_image_server:string=''; + curr_session:string=''; jobData: any; constructor( @@ -30,8 +32,11 @@ export class MarketdetailPage implements OnInit { ngOnInit() { + this.session_image_server = this.sessionDataProviderService.session_image_server; + this.curr_session=this.sessionDataProviderService.session; } + onBack() { this.navctr.back(); } diff --git a/src/app/pages/mycoupons/mycoupons.page.html b/src/app/pages/mycoupons/mycoupons.page.html index 7835b5f..8ca377e 100644 --- a/src/app/pages/mycoupons/mycoupons.page.html +++ b/src/app/pages/mycoupons/mycoupons.page.html @@ -1,10 +1,24 @@ - + + + + + + + + + + + + + Coupons + + -
-
- -
-
+ + + + +
diff --git a/src/app/pages/myfiles/myfiles.page.html b/src/app/pages/myfiles/myfiles.page.html index d7a0c59..5a5c5db 100644 --- a/src/app/pages/myfiles/myfiles.page.html +++ b/src/app/pages/myfiles/myfiles.page.html @@ -1,8 +1,22 @@ - + + + + + + + + + + + + + My Files + +
- +
diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html index f08ac70..8fef811 100644 --- a/src/app/pages/redeem/redeem.page.html +++ b/src/app/pages/redeem/redeem.page.html @@ -1,7 +1,22 @@ + + + + + + + + + + + + + {{currency_description}} Wallet + +
- +
diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts index 37e034f..076e54b 100644 --- a/src/app/store/session-data-provider.service.ts +++ b/src/app/store/session-data-provider.service.ts @@ -77,7 +77,7 @@ export class SessionDataProviderService { promo:number=0; active_job_count:number =0; tracking:number = 0; - + session_image_server: string=''; session_contructed:boolean = false; @@ -111,6 +111,8 @@ export class SessionDataProviderService { this.promo=loginResult.promo; this.active_job_count = loginResult.active_job_count; this.tracking = loginResult.tracking; + this.session_image_server = loginResult.session_image_server; + //this.pushNotificationProvider.tagUser(this.session); this.session_contructed = true;