diff --git a/src/app/accounts/addbank/addbank.page.html b/src/app/accounts/addbank/addbank.page.html index 19ad721..d4cc99b 100644 --- a/src/app/accounts/addbank/addbank.page.html +++ b/src/app/accounts/addbank/addbank.page.html @@ -10,7 +10,7 @@ - {{currency_description}} Add New {{currency_code}} Account + Add New {{currency_description}} Account @@ -23,16 +23,16 @@
- - Add New {{currency_code}} Account - - + + + + - Bank Name + Bank Name @@ -45,7 +45,7 @@ - Account Type + Account Type @@ -58,30 +58,30 @@ - Account No + Account No : - Confirm Acc + Confirm Account No : -
+
- City + City : - State + State : diff --git a/src/app/accounts/addbank/addbank.page.scss b/src/app/accounts/addbank/addbank.page.scss index 3207fcc..ad555b6 100644 --- a/src/app/accounts/addbank/addbank.page.scss +++ b/src/app/accounts/addbank/addbank.page.scss @@ -16,22 +16,30 @@ ion-content { } } - .send-grid{ - background-color: #eff2f4; - border-radius: 10px; - font-size: 14px; - font-weight: bolder; - ion-select, ion-input{ - border-radius: 10px; - border-color: #383a3e; - background-color: white; - text-align: right; - } - .intr{ - text-align: right; - margin-top: 10px; - } - } + //.send-grid{ + // background-color: #eff2f4; + // border-radius: 10px; + // font-size: 14px; + // font-weight: bolder; + // ion-select, ion-input{ + // border-radius: 10px; + // border-color: #383a3e; + // background-color: white; + // text-align: right; + // } + // .intrl{ + // //text-align: right; + // //margin-top: 10px; + // color: #8b198e; + // font-weight: bolder; + // } + // .intr{ + // text-align: right; + // margin-top: 10px; + // color: #8b198e; + // font-weight: bolder; + // } + //} .flex { display: flex; justify-content: space-between; diff --git a/src/app/accounts/addbank/addbank.page.ts b/src/app/accounts/addbank/addbank.page.ts index f4d1384..38b8a0d 100644 --- a/src/app/accounts/addbank/addbank.page.ts +++ b/src/app/accounts/addbank/addbank.page.ts @@ -18,9 +18,13 @@ export class AddbankPage implements OnInit { @ViewChild('confirm_account_no') confirm_account_no; @ViewChild('account_city') account_city; @ViewChild('account_state') account_state; - + currency_code:string=''; + currency_description : string=''; isDisabled:boolean = true; - constructor( private navctr: NavController, + walletData:any; + wallet_uid:string=''; + constructor( + private navctr: NavController, private router: Router, public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, @@ -29,7 +33,13 @@ export class AddbankPage implements OnInit { public recipientsService: RecipientsService ) { - + this.walletData = this.router.getCurrentNavigation().extras.state; + if ( this.walletData == undefined){ + this.onBack(); + } + this.currency_code = this.walletData.code; + this.currency_description = this.walletData.description; + this.wallet_uid= this.walletData.wallet_uid; } ngOnInit() { diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html index c152224..cf62fb9 100644 --- a/src/app/pages/redeem/redeem.page.html +++ b/src/app/pages/redeem/redeem.page.html @@ -22,9 +22,9 @@
-
- {{currency_description}} Wallet -
+ + + Balance: {{curr_balance| number : '1.2-2'}} {{currency_description}}
@@ -57,29 +57,29 @@ - Amount({{currency_code}}) + Amount ({{currency_description}}) : - Fee + Fee : - Total + Total ({{currency_description}}) : - Recipient + Sending to (recipient) : - + {{item.recipient}} diff --git a/src/app/pages/redeem/redeem.page.scss b/src/app/pages/redeem/redeem.page.scss index 3207fcc..1e1d7a9 100644 --- a/src/app/pages/redeem/redeem.page.scss +++ b/src/app/pages/redeem/redeem.page.scss @@ -16,22 +16,22 @@ ion-content { } } - .send-grid{ - background-color: #eff2f4; - border-radius: 10px; - font-size: 14px; - font-weight: bolder; - ion-select, ion-input{ - border-radius: 10px; - border-color: #383a3e; - background-color: white; - text-align: right; - } - .intr{ - text-align: right; - margin-top: 10px; - } - } + //.send-grid{ + // background-color: #eff2f4; + // border-radius: 10px; + // font-size: 14px; + // font-weight: bolder; + // ion-select, ion-input{ + // border-radius: 10px; + // border-color: #383a3e; + // background-color: white; + // text-align: right; + // } + // .intr{ + // text-align: right; + // margin-top: 10px; + // } + //} .flex { display: flex; justify-content: space-between; diff --git a/src/app/pages/redeem/redeem.page.ts b/src/app/pages/redeem/redeem.page.ts index 4cef53c..ab44db6 100644 --- a/src/app/pages/redeem/redeem.page.ts +++ b/src/app/pages/redeem/redeem.page.ts @@ -275,12 +275,9 @@ this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_ this.curr_page ='redeem_result'; } ); - - } myRecipientsTotalData:any; - getMyRecipientsData(){ this.usrData = {action:11175, member_id: this.sessionDataProviderService.member_id, @@ -298,12 +295,10 @@ this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_ console.log("myRecipientsData RETURN DATA->", this.myRecipientsData); } ); - } + addNewBank(){ - this.router.navigate(['addbank']); + // debugger; + this.router.navigate(['addbank'],{state: this.walletData}); } - //recipientAccount - - } diff --git a/src/app/store/user-wallet.service.ts b/src/app/store/user-wallet.service.ts index f1805fa..d749dc8 100644 --- a/src/app/store/user-wallet.service.ts +++ b/src/app/store/user-wallet.service.ts @@ -8,7 +8,7 @@ import { SessionDataProviderService} from "./session-data-provider.service"; export class UserWalletService { mainWalletBalance:number = 0; - mainWalletCurrency:string = 'Naira'; + mainWalletCurrency:string = ''; constructor(public wrenchService: WrenchService, public sessionDataProviderService: SessionDataProviderService @@ -34,8 +34,16 @@ export class UserWalletService { action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1 }; getWalletData(){ - this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session, limit:20, page:1 } - this.wrenchService.getUserWallets(this.usrData).subscribe( + this.walletData = []; // clean the data + this.usrData = { + action:11200, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session, + limit:20, + page:1 }; + + this.wrenchService.getUserWallets(this.usrData).subscribe( walletResult => { this.walletResult = walletResult; console.log("WALLET RETURN->", this.walletResult); diff --git a/src/global.scss b/src/global.scss index c765372..3aa5d69 100644 --- a/src/global.scss +++ b/src/global.scss @@ -262,3 +262,28 @@ ion-content{ color: #030728; } } + +.send-grid{ + background-color: #eff2f4; + border-radius: 10px; + font-size: 14px; + font-weight: bolder; + ion-select, ion-input{ + border-radius: 10px; + border-color: #383a3e; + background-color: white; + text-align: right; + } + .intrl{ + //text-align: right; + //margin-top: 10px; + color: #8b198e; + font-weight: bolder; + } + .intr{ + text-align: right; + margin-top: 10px; + color: #8b198e; + font-weight: bolder; + } +} \ No newline at end of file