From c24b47de226c078a23c99f72e44fdac1221cc0eb Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sat, 14 Oct 2023 16:16:00 -0400
Subject: [PATCH] redeem

---
 src/app/pages/redeem/redeem.page.html | 180 ++++++++++++++++++++------
 src/app/pages/redeem/redeem.page.ts   |   2 +
 2 files changed, 141 insertions(+), 41 deletions(-)

diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html
index c023a9b..1b246a5 100644
--- a/src/app/pages/redeem/redeem.page.html
+++ b/src/app/pages/redeem/redeem.page.html
@@ -133,31 +133,85 @@
 
                 <ion-card-content>
 
-                    <ion-list>
-                        <ion-item>
-                            <ion-label>Amount({{currency_code}})</ion-label>
-                            <ion-input label="Fee"    type="number" placeholder="0"  value="{{amount}}" [readonly]="true"></ion-input>
-                        </ion-item>
+<!--                    <ion-list>-->
+<!--                        <ion-item>-->
+<!--                            <ion-label>Amount({{currency_code}})</ion-label>-->
+<!--                            <ion-input label="Fee"    type="number" placeholder="0"  value="{{amount}}" [readonly]="true"></ion-input>-->
+<!--                        </ion-item>-->
 
-                        <ion-item>
-                            <ion-label >Fee</ion-label>
-                            <ion-input label="Fee"    type="number" placeholder="0"  [(ngModel)]='fee' [readonly]="true"></ion-input>
-                        </ion-item>
+<!--                        <ion-item>-->
+<!--                            <ion-label >Fee</ion-label>-->
+<!--                            <ion-input label="Fee"    type="number" placeholder="0"  [(ngModel)]='fee' [readonly]="true"></ion-input>-->
+<!--                        </ion-item>-->
 
-                        <ion-item>
-                            <ion-label>Total</ion-label>
-                            <ion-input label="Total"    type="number" placeholder="0"  [(ngModel)]='total' [readonly]="true"></ion-input>
-                        </ion-item>
+<!--                        <ion-item>-->
+<!--                            <ion-label>Total</ion-label>-->
+<!--                            <ion-input label="Total"    type="number" placeholder="0"  [(ngModel)]='total' [readonly]="true"></ion-input>-->
+<!--                        </ion-item>-->
 
-                        <ion-item>
-                            <ion-label>To:</ion-label>
-                            <ion-label>{{recipient_name}}</ion-label>
-                        </ion-item>
-                    </ion-list>
+<!--                        <ion-item>-->
+<!--                            <ion-label>To:</ion-label>-->
+<!--                            <ion-label>{{recipient_name}}</ion-label>-->
+<!--                        </ion-item>-->
+<!--                    </ion-list>-->
 
-                    <ion-button expand="block"  color="secondary" (click)="confirmRedeem()">Confirm</ion-button>
+<!--                    <ion-button expand="block"  color="secondary" (click)="confirmRedeem()">Confirm</ion-button>-->
+
+                    <ion-grid class="send-grid">
+                        <ion-row>
+                            <ion-col class="intr">Amount({{currency_code}})</ion-col>
+                            <ion-col>
+                                <ion-input label="Fee"    type="number" placeholder="0"  value="{{amount}}" [readonly]="true"></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">-->
+<!--                                    &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>-->
+<!--                                &lt;!&ndash;                                <ion-label>{{recipient_name}}</ion-label>&ndash;&gt;-->
+<!--                            </ion-col>-->
+<!--                        </ion-row>-->
+                        <ion-row>
+                            <ion-col>
+                                {{recipient_name}}
+                            </ion-col>
+                        </ion-row>
+
+                        <ion-row>
+                            <ion-col>
+                                <ion-button expand="block"
+                                            shape="round"
+                                            color="secondary"
+                                            (click)="confirmRedeem()"
+                                            [disabled]="isDisabled"
+                                >Confirm</ion-button>
+                            </ion-col>
+                        </ion-row>
+
+                    </ion-grid>
                 </ion-card-content>
             </ion-card>
+
+
+
+
         </div>
 
 
@@ -169,33 +223,77 @@
             </ion-card-header>
 
             <ion-card-content>
+                <ion-grid class="send-grid">
+                    <ion-row>
+                        <ion-col class="intr">Amount({{currency_code}})</ion-col>
+                        <ion-col>
+                            <ion-input label="Fee"    type="number" placeholder="0"  value="{{amount}}" [readonly]="true"></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-list>
-                    <ion-item>
-                        <ion-label>Amount({{currency_code}})</ion-label>
-                        <ion-input label="Amount"    type="number" placeholder="0"  value="{{amount| number : '1.2-2'}}" [readonly]="true"></ion-input>
-                    </ion-item>
+                    <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 class="intr">Confirmation</ion-col>
+                        <ion-col>
+                            {{confirmation}}
+                        </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-row>
+                        <ion-col>
+                            Estimated delivery time is 2 to 4 Hours.
+                        </ion-col>
+                    </ion-row>
 
-                    <ion-item>
-                        <ion-label>Recipient</ion-label>
-                        <ion-label>{{recipient_name}}</ion-label>
-                    </ion-item>
+                </ion-grid>
 
-                    <ion-item>
-                        <ion-label>Confirmation</ion-label>
-                        <ion-label>{{confirmation}}</ion-label>
-                    </ion-item>
-                </ion-list>
+
+<!--                <ion-list>-->
+<!--                    <ion-item>-->
+<!--                        <ion-label>Amount({{currency_code}})</ion-label>-->
+<!--                        <ion-input label="Amount"    type="number" placeholder="0"  value="{{amount| number : '1.2-2'}}" [readonly]="true"></ion-input>-->
+<!--                    </ion-item>-->
+
+<!--                    <ion-item>-->
+<!--                        <ion-label >Fee</ion-label>-->
+<!--                        <ion-input label="Fee"    type="number" placeholder="0"  [(ngModel)]='fee' [readonly]="true"></ion-input>-->
+<!--                    </ion-item>-->
+
+<!--                    <ion-item>-->
+<!--                        <ion-label>Total</ion-label>-->
+<!--                        <ion-input label="Total"    type="number" placeholder="0"  [(ngModel)]='total' [readonly]="true"></ion-input>-->
+<!--                    </ion-item>-->
+
+<!--                    <ion-item>-->
+<!--                        <ion-label>Recipient</ion-label>-->
+<!--                        <ion-label>{{recipient_name}}</ion-label>-->
+<!--                    </ion-item>-->
+
+<!--                    <ion-item>-->
+<!--                        <ion-label>Confirmation</ion-label>-->
+<!--                        <ion-label>{{confirmation}}</ion-label>-->
+<!--                    </ion-item>-->
+<!--                </ion-list>-->
 
             </ion-card-content>
         </ion-card>
diff --git a/src/app/pages/redeem/redeem.page.ts b/src/app/pages/redeem/redeem.page.ts
index b9e980f..925a321 100644
--- a/src/app/pages/redeem/redeem.page.ts
+++ b/src/app/pages/redeem/redeem.page.ts
@@ -48,6 +48,7 @@ wallet_uid
   currency_description : string='';
   currency_code:string='';
   wallet_uid:string='';
+  isDisabled:boolean=false;
 
   constructor(
       private navctr: NavController,
@@ -242,6 +243,7 @@ this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_
   sendMoneyResult:any;
   confirmation:string ='';
   confirmRedeem(){
+    this.isDisabled = true;
     this.sendMoneyData = {
       action:33020,
           member_id: this.sessionDataProviderService.member_id,