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

send page

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2023-10-14 15:37:03 -04:00
parent 63d18407e1
commit 77cf17ffad
5 changed files with 129 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/redeem/redeem.page.html
+74 -28
View File
@@ -38,42 +38,88 @@
<ion-card-content>
<ion-list>
<ion-item>
<ion-label>Amount({{currency_code}})</ion-label>
<ion-input (ionChange)="refreshFee()" type="number" label="Amount(ggg)" placeholder="Enter Amount" [(ngModel)]='amount'></ion-input>
</ion-item>
<ion-grid class="send-grid">
<ion-row>
<ion-col class="intr">Amount({{currency_code}})</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>
<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>
<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-row>
<ion-row>
<ion-col>
<ion-select 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>
<!-- <ion-label>{{recipient_name}}</ion-label>-->
</ion-col>
</ion-row>
<ion-row>
<ion-col>
{{recipient_name}}
</ion-col>
</ion-row>
<ion-item>
<ion-label >Fee</ion-label>
<ion-input label="Fee" type="number" placeholder="0" [(ngModel)]='fee' [readonly]="true"></ion-input>
</ion-item>
<ion-row>
<ion-col>
<ion-button expand="block" shape="round" color="secondary" (click)="contineRedeem()">Continue</ion-button>
</ion-col>
</ion-row>
<ion-item>
<ion-label>Total</ion-label>
<ion-input label="Total" type="number" placeholder="0" [(ngModel)]='total' [readonly]="true"></ion-input>
</ion-item>
</ion-grid>
<!-- <ion-list>-->
<!-- <ion-item>-->
<!-- <ion-select-option value="" >Select Recipient</ion-select-option>-->
<!--&lt;!&ndash; <ion-select placeholder="Select Recipient" [(ngModel)]='recipient' size="block">&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <ion-select-option value="" >Select Recipient</ion-select-option>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash; <ion-select-option value="{{item.recipient_uid}}" *ngFor="let item of myRecipientsData">{{item.recipient}}</ion-select-option>&ndash;&gt;-->
<!--&lt;!&ndash; </ion-select>&ndash;&gt;-->
<!--&lt;!&ndash; <ion-label>{{recipient_name}}</ion-label>&ndash;&gt;-->
<!-- <ion-label>Amount({{currency_code}})</ion-label>-->
<!-- <ion-input (ionChange)="refreshFee()" type="number" label="Amount(ggg)" placeholder="Enter Amount" [(ngModel)]='amount'></ion-input>-->
<!-- </ion-item>-->
<div>
<ion-select 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>
<ion-label>{{recipient_name}}</ion-label>
</div>
<!-- <ion-item>-->
<!-- <ion-label >Fee</ion-label>-->
<!-- <ion-input label="Fee" type="number" placeholder="0" [(ngModel)]='fee_display' [readonly]="true"></ion-input>-->
<!-- </ion-item>-->
<!-- <ion-item>-->
<!-- <ion-label>Total</ion-label>-->
<!-- <ion-input label="Total" type="number" placeholder="0" [(ngModel)]='total_display' [readonly]="true"></ion-input>-->
<!-- </ion-item>-->
<!--&lt;!&ndash; <ion-item>&ndash;&gt;-->
<!--&lt;!&ndash; <ion-select-option value="" >Select Recipient</ion-select-option>&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <ion-select placeholder="Select Recipient" [(ngModel)]='recipient' size="block">&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash;&lt;!&ndash; <ion-select-option value="" >Select Recipient</ion-select-option>&ndash;&gt;&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <ion-select-option value="{{item.recipient_uid}}" *ngFor="let item of myRecipientsData">{{item.recipient}}</ion-select-option>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; </ion-select>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash;&lt;!&ndash; <ion-label>{{recipient_name}}</ion-label>&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash; </ion-item>&ndash;&gt;-->
<!-- <div>-->
<!-- <ion-select placeholder="Select Recipient" [(ngModel)]='recipient' size="block">-->
<!-- &lt;!&ndash; <ion-select-option value="" >Select Recipient</ion-select-option>&ndash;&gt;-->
<!-- <ion-select-option value="{{item.recipient_uid}}" *ngFor="let item of myRecipientsData">{{item.recipient}}</ion-select-option>-->
<!-- </ion-select>-->
<!-- <ion-label>{{recipient_name}}</ion-label>-->
<!-- </div>-->
<!-- </ion-list>-->
</ion-list>
<ion-button expand="block" color="secondary" (click)="contineRedeem()">Continue</ion-button>
</ion-card-content>
</ion-card>
</div>
src/app/pages/redeem/redeem.page.scss
+16
View File
@@ -16,6 +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;
}
}
.flex {
display: flex;
justify-content: space-between;
src/app/pages/redeem/redeem.page.ts
+15 -7
View File
@@ -56,13 +56,15 @@ wallet_uid
private wrenchService: WrenchService
) {
this.walletData = this.router.getCurrentNavigation().extras.state;
this.curr_balance =this.walletData.amount*0.01;
this.currency_code = this.walletData.code;
this.currency_description = this.walletData.description;
this.wallet_uid= this.walletData.wallet_uid;
// debugger;
if ( this.walletData != undefined ){
this.curr_balance = this.walletData.amount*0.01;
this.currency_code = this.walletData.code;
this.currency_description = this.walletData.description;
this.wallet_uid= this.walletData.wallet_uid;
}
else{
this.onBack();
}
}
ngOnInit() {
@@ -118,7 +120,9 @@ array (size=4)
amount:number =0;
fee:number = 0;
fee_display: string;
total:number = 0;
total_display: string;
recipient:string ='';
recipient_name:string ='';
@@ -139,8 +143,12 @@ array (size=4)
this.feeReturn = feeReturn;
if ( this.feeReturn != null && this.feeReturn.processing_fee >= 0 ){
this.fee = this.feeReturn.processing_fee*0.01;
var num = new Number(this.fee);
this.fee_display = num.toFixed(2); //outputs 14
// parseFloat("123.456").toFixed(2);
this.total = this.feeReturn.total_amount*0.01;
var numt = new Number(this.total);
this.total_display= numt.toFixed(2); //outputs 14
}
}
);
src/app/pages/transaction/transaction.page.html
+11 -10
View File
@@ -45,10 +45,11 @@
<!-- <ion-label class="bold">Wallet(s)</ion-label>-->
<!-- &lt;!&ndash; <ion-label class="color">.</ion-label>&ndash;&gt;-->
<!-- </div>-->
<div class="video wallets" *ngFor="let item of walletData" color="secondary">
<div class="video wallets" *ngFor="let item of walletData">
<div class="left">
<!-- <div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/money-cycle.svg)'"></div>-->
<div class="bg_image men_image" [style.backgroundImage]="'url(assets/images/money-cycle.svg)'"></div>
</div>
<div class="text">
<ion-label class="bold_text">{{item.description}}</ion-label>
<ion-label class="grey_text"><span class="balance_line">Balance {{item.amount*0.01 | number : '1.2-2'}} </span></ion-label>
@@ -56,22 +57,22 @@
<ion-row>
<ion-col></ion-col>
<ion-col>
<div *ngIf="item.action_type == 'AC_AD_WR_FUND' " >
<ion-button color="success" size="small" expand="block" (click)="startRedeem(item)">Redeem</ion-button>
</div>
<!-- <ion-button size="small" expand="block">Add Credit</ion-button>-->
</ion-col>
<ion-col>
<!-- <ion-button size="small" expand="block">Add Credit</ion-button>-->
<div *ngIf="item.action_type == 'AC_AD_WR_FUND' " >
<ion-button color="success" shape="round" size="small" expand="block" (click)="startRedeem(item)">Redeem</ion-button>
</div>
</ion-col>
</ion-row>
</ion-grid>
</div>
</div>
<!-- <div class="right">-->
<!-- <ion-icon name="chevron-forward-outline" color="medium"></ion-icon>-->
<!-- </div>-->
</div>
</div>
<div class="lesson">
src/app/pages/transaction/transaction.page.scss
+13 -1
View File
@@ -13,15 +13,27 @@ ion-header {
}
}
ion-content {
.wallets{
background-color: #c8d5e0;
background-color: #dddae1;
width: 100%;
min-height: 110px;
padding: 0px;
.text{
width: 100%;
}
ion-row{
margin: 0px;
background-color: #ffffff; // #ddcfef;
min-height:40px;
padding: 2px;
border-radius: 15px;
}
//.men_image{
// height: 200px;
// width: auto;
//}
}
.wallet_panel{
background-color: aliceblue;