WrenchBoard/WrenchBoardIonic2023
2
0
Fork 0
Code Issues Pull Requests Releases Activity

redeem page

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-11-14 21:19:32 -05:00
parent 9dddfb02d3
commit 0909bfb7fb
8 changed files with 112 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/accounts/addbank/addbank.page.html
+12 -12
View File
@@ -10,7 +10,7 @@
<!-- <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
<!-- </ion-button>-->
</ion-buttons>
<ion-title>{{currency_description}} Add New {{currency_code}} Account</ion-title>
<ion-title>Add New {{currency_description}} Account</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
@@ -23,16 +23,16 @@
<div class="about">
<div>
<ion-card>
<ion-card-header>
<ion-card-title>Add New {{currency_code}} Account</ion-card-title>
<!-- <ion-card-subtitle>Redeem from {{currency_code}} Wallet</ion-card-subtitle>-->
</ion-card-header>
<!-- <ion-card-header>-->
<!-- <ion-card-title>Add New {{currency_code}} Account</ion-card-title>-->
<!-- &lt;!&ndash; <ion-card-subtitle>Redeem from {{currency_code}} Wallet</ion-card-subtitle>&ndash;&gt;-->
<!-- </ion-card-header>-->
<ion-card-content>
<ion-grid class="send-grid">
<ion-row>
<ion-col>Bank Name</ion-col>
<ion-col class="intrl">Bank Name</ion-col>
</ion-row>
<ion-row>
<ion-col>
@@ -45,7 +45,7 @@
</ion-row>
<ion-row>
<ion-col>Account Type</ion-col>
<ion-col class="intrl">Account Type</ion-col>
</ion-row>
<ion-row>
<ion-col>
@@ -58,30 +58,30 @@
</ion-row>
<ion-row>
<ion-col class="intr">Account No </ion-col>
<ion-col class="intr">Account No :</ion-col>
<ion-col>
<ion-input (ionChange)="refreshAccNo()" type="text" label="Amount(ggg)" placeholder="Enter Account No" [(ngModel)]='account_no'></ion-input>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="intr">Confirm Acc </ion-col>
<ion-col class="intr">Confirm Account No : </ion-col>
<ion-col>
<ion-input (ionChange)="refreshAccNo()" type="text" label="Amount(ggg)" placeholder="Confirm No" [(ngModel)]='confirm_account_no'></ion-input>
</ion-col>
</ion-row>
<ion-row>
<ion-col><hr /></ion-col>
<ion-col><hr style="color: red; height: 3px;" /></ion-col>
</ion-row>
<ion-row>
<ion-col class="intr">City </ion-col>
<ion-col class="intr">City :</ion-col>
<ion-col>
<ion-input (ionChange)="refreshAccNo()" type="text" label="City" placeholder="Enter City" value="{{account_city}}" [(ngModel)]='account_city'></ion-input>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="intr">State </ion-col>
<ion-col class="intr">State :</ion-col>
<ion-col>
<ion-input (ionChange)="refreshAccNo()" type="text" label="State" placeholder="State" value="{{account_state}}" [(ngModel)]='account_state'></ion-input>
</ion-col>
src/app/accounts/addbank/addbank.page.scss
+24 -16
View File
@@ -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;
src/app/accounts/addbank/addbank.page.ts
+13 -3
View File
@@ -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() {
src/app/pages/redeem/redeem.page.html
+8 -8
View File
@@ -22,9 +22,9 @@
<div class="ion-padding">
<div class="boxed_contents">
<div class="flex">
<ion-label class="bold_text">{{currency_description}} Wallet</ion-label>
</div>
<!-- <div class="flex">-->
<!-- <ion-label class="bold_text">{{currency_description}} Wallet</ion-label>-->
<!-- </div>-->
<ion-label class="color_text">Balance: {{curr_balance| number : '1.2-2'}} {{currency_description}}</ion-label>
<div class="items">
@@ -57,29 +57,29 @@
<ion-grid class="send-grid">
<ion-row>
<ion-col class="intr">Amount({{currency_code}})</ion-col>
<ion-col class="intr">Amount ({{currency_description}}) :</ion-col>
<ion-col>
<ion-input (ionChange)="refreshFee()" type="number" label="Amount(ggg)" placeholder="Enter Amount" [(ngModel)]='amount'></ion-input>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="intr">Fee</ion-col>
<ion-col class="intr">Fee :</ion-col>
<ion-col>
<ion-input label="Fee" type="number" placeholder="0" [(ngModel)]='fee_display' [readonly]="true"></ion-input>
</ion-col>
</ion-row>
<ion-row>
<ion-col class="intr">Total</ion-col>
<ion-col class="intr">Total ({{currency_description}}) :</ion-col>
<ion-col>
<ion-input label="Total" type="number" placeholder="0" [(ngModel)]='total_display' [readonly]="true"></ion-input>
</ion-col>
</ion-row>
<ion-row>
<ion-col>Recipient</ion-col>
<ion-col class="intrl">Sending to (recipient) :</ion-col>
</ion-row>
<ion-row>
<ion-col size="9" >
<ion-select (ionChange)="checkSelectVal()" placeholder="Select Recipient" [(ngModel)]='recipient' size="block">
<ion-select (ionChange)= "checkSelectVal()" placeholder="Select Recipient" [(ngModel)]='recipient' size="block">
<!-- <ion-select-option value="" >Select Recipient</ion-select-option>-->
<ion-select-option value="{{item.recipient_uid}}" *ngFor="let item of myRecipientsData">{{item.recipient}}</ion-select-option>
<!-- <ion-select-option value="ADD_NEW_RECIP" >Add Recipient</ion-select-option>-->
src/app/pages/redeem/redeem.page.scss
+16 -16
View File
@@ -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;
src/app/pages/redeem/redeem.page.ts
+3 -8
View File
@@ -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
}
src/app/store/user-wallet.service.ts
+11 -3
View File
@@ -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);
src/global.scss
+25
View File
@@ -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;
}
}