-
Balance: {{curr_balance| number : '1.2-2'}} {{currency_description}}
+
Current Balance: {{curr_balance| number : '1.2-2'}} {{currency_description}}
-
-
-
- To Bank
-
-
-
-
-
- Reports
-
-
-
-
+
@@ -53,56 +40,84 @@
-
-
- Amount({{currency_code}})
-
-
-
-
-
- Fee
-
-
-
-
-
- Total
-
-
-
-
-
- Payment
-
-
-
-
-
- {{item.description}} **** **** **** {{item.digits}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{recipient_name}}
-
-
+
+
+
+ Amount({{currency_code}}) :
+
+
+
+
+
+ Fee :
+
+
+
+
+
+ Total :
+
+
+
+
+
+
+ Continue
+
+
+
+
+
+
+
+
+
+ Amount({{currency_code}})
+
+
+
+
+
+ Fee
+
+
+
+
+
+ Total
+
+
+
+
+
+ Payment
+
+
+
+
+
+ {{item.description}} **** **** **** {{item.digits}}
+
+
+
+
+
+
+
+ {{recipient_name}}
+
+
+
+
+
+ Continue
+
+
+
+
+
-
-
- Continue
-
-
-
@@ -321,60 +336,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
{{item.confirmation}}- {{item.amount}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/accounts/addcredit/addcredit.page.scss b/src/app/accounts/addcredit/addcredit.page.scss
index 3207fcc..227cd5a 100644
--- a/src/app/accounts/addcredit/addcredit.page.scss
+++ b/src/app/accounts/addcredit/addcredit.page.scss
@@ -68,8 +68,8 @@ ion-content {
.color_text {
margin-top: 10px;
- font-size: 22px;
- font-family: 'semi-bold';
+ font-size: 18px;
+ font-family: 'bold';
color: var(--ion-color-primary);
}
diff --git a/src/app/accounts/addcredit/addcredit.page.ts b/src/app/accounts/addcredit/addcredit.page.ts
index 0bcfd59..6c16763 100644
--- a/src/app/accounts/addcredit/addcredit.page.ts
+++ b/src/app/accounts/addcredit/addcredit.page.ts
@@ -18,8 +18,10 @@ export class AddcreditPage implements OnInit {
currency_description : string='';
currency_code:string='';
wallet_uid:string='';
- isDisabled:boolean=false;
+ isDisabled:boolean=true;
curr_page:string= 'redeem_start';
+ processor:number=0;
+
constructor(private navctr: NavController,
private router: Router,
@@ -33,6 +35,7 @@ export class AddcreditPage implements OnInit {
this.currency_code = this.walletData.code;
this.currency_description = this.walletData.description;
this.wallet_uid= this.walletData.wallet_uid;
+ this.processor = this.walletData.processor;
}
else{
this.onBack();
@@ -75,4 +78,49 @@ export class AddcreditPage implements OnInit {
);
}
+
+
+
+ amount:number =0;
+ fee:number = 0;
+ fee_display: string;
+ total:number = 0;
+ total_display: string;
+ recipient:string ='';
+ recipient_name:string ='';
+
+ feeReturn: any;
+ refreshFee(){
+ this.isDisabled = true;
+ this.total = this.fee = 0;
+ console.log("Refresh Fee******************");
+ // this.usrData = {action:33025,
+ // member_id: this.sessionDataProviderService.member_id,
+ // uid: this.sessionDataProviderService.member_uid,
+ // sessionid: this.sessionDataProviderService.session ,
+ // limit:20, page:1,offset: 0, amount: this.amount*100}
+ // if (this.amount <= 0 ) return;
+
+
+ // this.wrenchService.sendMoneyFee(this.usrData).subscribe(
+ // feeReturn => {
+ // this.feeReturn = feeReturn;
+ // if ( this.feeReturn != null && this.feeReturn.processing_fee >= 0 ){
+ this.fee = 0; // this.feeReturn.processing_fee*0.01;
+ var num = new Number(this.fee);
+ this.fee_display = num.toFixed(2);
+ // parseFloat("123.456").toFixed(2);
+ this.total = this.fee+this.amount; // this.feeReturn.total_amount*0.01;
+ var numt = new Number(this.total);
+ this.total_display= numt.toFixed(2);
+ if (this.total > 100){
+ this.isDisabled=false;
+ }
+ // }
+ // }
+ // );
+
+
+ // this.total = this.fee + this.amount;
+ }
}
diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html
index 867783d..95b0435 100644
--- a/src/app/pages/ownersjob/ownersjob.page.html
+++ b/src/app/pages/ownersjob/ownersjob.page.html
@@ -137,7 +137,7 @@
Comming Soon