diff --git a/REMEMBER.txt b/REMEMBER.txt index b6eb61a..c525d9b 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -19,3 +19,4 @@ ionic generate page jobactive ionic generate component taskactivities +npm install angularx-qrcode@14.0.0 --save diff --git a/package.json b/package.json index 0c6c4cf..439eec7 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,7 @@ "@capacitor/preferences": "^5.0.6", "@capacitor/status-bar": "^5.0.0", "@ionic/angular": "^6.1.9", + "angularx-qrcode": "^14.0.0", "onesignal-cordova-plugin": "^5.0.0-beta-02", "rxjs": "~6.6.0", "tslib": "^2.2.0", diff --git a/src/app/pages/familymember/familymember.module.ts b/src/app/pages/familymember/familymember.module.ts index 7663ea0..20d7496 100644 --- a/src/app/pages/familymember/familymember.module.ts +++ b/src/app/pages/familymember/familymember.module.ts @@ -7,13 +7,14 @@ import { IonicModule } from '@ionic/angular'; import { FamilymemberPageRoutingModule } from './familymember-routing.module'; import { FamilymemberPage } from './familymember.page'; - +import { QRCodeModule } from 'angularx-qrcode'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - FamilymemberPageRoutingModule + FamilymemberPageRoutingModule, + QRCodeModule ], declarations: [FamilymemberPage] }) diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html index 41ecf6b..ad1ba8a 100644 --- a/src/app/pages/familymember/familymember.page.html +++ b/src/app/pages/familymember/familymember.page.html @@ -44,7 +44,7 @@ Account - + Profile @@ -98,7 +98,27 @@ -
+
+ +
+
+ Username + {{member_username}} +
+
+ PIN + {{member_pin}} +
+
+ + + +
+ +
diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts index c2971f0..187f137 100644 --- a/src/app/pages/familymember/familymember.page.ts +++ b/src/app/pages/familymember/familymember.page.ts @@ -1,6 +1,8 @@ import { Component, OnInit } from '@angular/core'; import {NavController} from "@ionic/angular"; import {Router} from "@angular/router"; +import {SessionDataProviderService} from "../../store/session-data-provider.service"; +import {WrenchService} from "../../services/wrench.service"; @Component({ selector: 'app-familymember', @@ -11,20 +13,29 @@ export class FamilymemberPage implements OnInit { familyMemberData: any; tabs = 'about'; -member_firstname:string=''; -member_lastname:string=''; + member_firstname:string=''; + member_lastname:string=''; + + member_username:string=''; + member_pin:string=''; + family_uid:string=''; + + member_qr_string ='0000000'; + constructor( private navctr: NavController, - private router: Router + private router: Router, + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService, ) { this.familyMemberData = this.router.getCurrentNavigation().extras.state; - //debugger; this.member_firstname= this.familyMemberData.firstname; this.member_lastname = this.familyMemberData.lastname; - + this.family_uid = this.familyMemberData.family_uid; } ngOnInit() { + this.getThisFamilyAccount(); } onBack() { @@ -39,5 +50,34 @@ member_lastname:string=''; this.router.navigate(['enroll']); } + postData: { + action:number, + member_id: number, + uid: string, + sessionid: string, + family_uid:string + }; + + familyMemberResult:any; + familySuggestData:any; + getThisFamilyAccount(){ + this.postData = { + action:22025, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session, + family_uid: this.family_uid + }; + this.wrenchService.familyManage(this.postData).subscribe( + familyMemberResult => { + this.familyMemberResult = familyMemberResult; + console.log("familyMemberResult RETURN->", this.familyMemberResult); + this.member_username = this.familyMemberResult.username; + this.member_pin = this.familyMemberResult.pin; + this.member_qr_string = this.sessionDataProviderService.member_uid+"@"+this.member_username+"@"+this.member_pin; //member_uid@family_username@family_pin + + } + ); + } } diff --git a/src/app/pages/receipt/receipt.page.scss b/src/app/pages/receipt/receipt.page.scss index 384daf5..d091e3e 100644 --- a/src/app/pages/receipt/receipt.page.scss +++ b/src/app/pages/receipt/receipt.page.scss @@ -1,11 +1,3 @@ -/* - Authors : initappz (Rahul Jograna) - Website : https://initappz.com/ - App Name : E-Learning App Template - This App Template Source code is licensed as per the - terms found in the Website https://initappz.com/license - Copyright and Good Faith Purchasers © 2021-present initappz. -*/ ion-header { ion-toolbar { --background: var(--ion-color-primary); diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html index 0fd02b5..2b3a0ce 100644 --- a/src/app/pages/redeem/redeem.page.html +++ b/src/app/pages/redeem/redeem.page.html @@ -242,18 +242,18 @@
-
+
-
+
{{item.confirmation}}- {{item.amount}}
- +
@@ -270,10 +270,10 @@
- - -
- Return -
- - + + + + + + + diff --git a/src/app/pages/transaction/transaction.page.html b/src/app/pages/transaction/transaction.page.html index e10883d..1a5168d 100644 --- a/src/app/pages/transaction/transaction.page.html +++ b/src/app/pages/transaction/transaction.page.html @@ -42,8 +42,8 @@
-
- +
+ {{item.confirmation}}- {{item.amount}}
@@ -56,3 +56,20 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 2ab60dd..19a1818 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -205,6 +205,10 @@ export class WrenchService { }; return this.getPostData("/activetaskstatus", postData); } + + familyManage(postData){ + return this.getPostData("/familymanage", postData); + } /* diff --git a/src/global.scss b/src/global.scss index 471a23e..6943001 100644 --- a/src/global.scss +++ b/src/global.scss @@ -201,4 +201,29 @@ ion-modal.custom_modal_bottom { color: grey; } } +} + +.bg_white { + margin-top: 20px; + background-color: white; + padding: 20px 15px 15px 15px; + box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1); + border-radius: 10px; + + .flex { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 5px; + + .grey_text { + color: grey; + font-size: 14px; + } + + .dark_text { + font-family: 'semi-bold'; + font-size: 15px; + } + } } \ No newline at end of file