From 8d2c5485a2a801714959c6c0359f3b0be6664ad2 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 7 Jan 2024 20:40:14 -0500 Subject: [PATCH] redeem page --- REMEMBER.txt | 2 +- src/app/pages/redeem/redeem.page.html | 63 +++++++++++++++------------ src/app/pages/redeem/redeem.page.scss | 19 ++++++++ src/app/pages/redeem/redeem.page.ts | 30 ++++++++++--- src/theme/variables.scss | 14 +----- 5 files changed, 82 insertions(+), 46 deletions(-) diff --git a/REMEMBER.txt b/REMEMBER.txt index ae6a46d..6963285 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -76,7 +76,7 @@ pendingoffers ionic generate page addcredit ionic generate page ownersjob - +ionic generate page history ionic generate component latest-market ionic generate service tasks-data diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html index cf62fb9..fa5c511 100644 --- a/src/app/pages/redeem/redeem.page.html +++ b/src/app/pages/redeem/redeem.page.html @@ -184,38 +184,44 @@ Amount({{currency_code}}) - +
{{amount}}
+ Fee - +
{{fee_display}}
+ Total - +
{{total_display}}
+ - Recipient - - - - - - - - - - - + Recipient - {{recipient_name}} +
{{recipient_name}}
 + + + + + + + + + + + + + + @@ -250,44 +256,47 @@ Amount({{currency_code}}) - +
{{amount}}
 Fee - +
{{fee_display}}
+ Total - +
{{total_display}}
+ - Recipient - - - + Recipient - {{recipient_name}} +
{{recipient_name}}
 Confirmation - {{confirmation}} +
{{confirmation}}
 - + Estimated delivery time is 2 to 4 Hours. - + + + Return + + diff --git a/src/app/pages/redeem/redeem.page.scss b/src/app/pages/redeem/redeem.page.scss index 1e1d7a9..6891042 100644 --- a/src/app/pages/redeem/redeem.page.scss +++ b/src/app/pages/redeem/redeem.page.scss @@ -16,6 +16,25 @@ ion-content { } } + .result-recipient{ + width: 160px; + text-align: right; + background-color: white; + color: black; + height: 75px; + padding: 5px; + border-radius: 10px; + } + + .result-amount{ + width: 160px; + text-align: right; + background-color: white; + color: black; + height: 35px; + padding: 5px; + border-radius: 10px; + } //.send-grid{ // background-color: #eff2f4; // border-radius: 10px; diff --git a/src/app/pages/redeem/redeem.page.ts b/src/app/pages/redeem/redeem.page.ts index ca39b1d..835f2e8 100644 --- a/src/app/pages/redeem/redeem.page.ts +++ b/src/app/pages/redeem/redeem.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import {AlertController, NavController} from "@ionic/angular"; +import {AlertController, LoadingController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; @@ -26,6 +26,7 @@ export class RedeemPage implements OnInit { public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, private alertController: AlertController, + private loadingCtrl: LoadingController, public recipientsService: RecipientsService ) { this.walletData = this.router.getCurrentNavigation().extras.state; @@ -235,7 +236,14 @@ this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_ sendMoneyResult:any; confirmation:string =''; - confirmRedeem(){ + async confirmRedeem(){ + + const loading = await this.loadingCtrl.create({ + message: 'Sending...', + duration: 8500, + }); + + this.isDisabled = true; this.sendMoneyData = { action:33020, @@ -249,12 +257,24 @@ this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_ mode: 100, }; + loading.present(); this.wrenchService.sendMoneyAction(this.sendMoneyData).subscribe( sendMoneyResult => { + loading.dismiss(); this.sendMoneyResult = sendMoneyResult; - console.log("sendMoneyResult RETURN->", this.sendMoneyResult); - this.confirmation = this.sendMoneyResult.confirmation; - this.curr_page ='redeem_result'; + // + // "status_message": "tranfer_amount_limit_error", + // "internal_return": -1, + // + if ( this.sendMoneyResult!.internal_return != null && this.sendMoneyResult.internal_return > 0 ){ + console.log("sendMoneyResult RETURN->", this.sendMoneyResult); + this.confirmation = this.sendMoneyResult.confirmation; + } + else{ + this.confirmation = "Unable to Process."; + this.showAlert("Error",this.sendMoneyResult.status_message); + } + this.curr_page ='redeem_result'; } ); } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 75086e0..3496f0c 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -1,18 +1,6 @@ -/* - 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. -*/ -// Ionic Variables and Theming. For more info, please see: -// http://ionicframework.com/docs/theming/ - -/** Ionic CSS Variables **/ :root { /** primary **/ - --ion-color-primary: #4687ba; + --ion-color-primary: #498ec3; //] #4687ba; --ion-color-primary-rgb: 56, 128, 255; --ion-color-primary-contrast: #ffffff; --ion-color-primary-contrast-rgb: 255, 255, 255;