From f7df2e56b6061a8819fcad5d7159ff312d6f2d88 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 29 Oct 2023 17:27:35 -0400 Subject: [PATCH 1/3] add recip --- src/app/accounts/addbank/addbank.page.html | 4 ++-- src/app/pages/logout/logout.page.html | 2 +- src/app/pages/logout/logout.page.scss | 4 +++- src/app/pages/redeem/redeem.page.html | 10 ++++++++-- src/app/pages/redeem/redeem.page.ts | 6 ++++++ 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/app/accounts/addbank/addbank.page.html b/src/app/accounts/addbank/addbank.page.html index 288be96..140ebd9 100644 --- a/src/app/accounts/addbank/addbank.page.html +++ b/src/app/accounts/addbank/addbank.page.html @@ -1,6 +1,6 @@ -
+
@@ -23,7 +23,7 @@ - + {{item.name}} - ({{item.code}}) diff --git a/src/app/pages/logout/logout.page.html b/src/app/pages/logout/logout.page.html index 5e35b54..1f624f4 100644 --- a/src/app/pages/logout/logout.page.html +++ b/src/app/pages/logout/logout.page.html @@ -3,7 +3,7 @@ - WrenchBoard + WrenchBoard Thanks for visiting diff --git a/src/app/pages/logout/logout.page.scss b/src/app/pages/logout/logout.page.scss index 19294b5..a90692a 100644 --- a/src/app/pages/logout/logout.page.scss +++ b/src/app/pages/logout/logout.page.scss @@ -6,7 +6,9 @@ ion-content{ margin: 0px; } } - +//.card-top{ +// box-shadow:0px 0px 100px 100px blue; +//} ion-footer { --background: white; diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html index 30f5060..d39d0a2 100644 --- a/src/app/pages/redeem/redeem.page.html +++ b/src/app/pages/redeem/redeem.page.html @@ -62,12 +62,18 @@ - - + + {{item.recipient}} + + + + + + diff --git a/src/app/pages/redeem/redeem.page.ts b/src/app/pages/redeem/redeem.page.ts index dc956c3..a4dcd3f 100644 --- a/src/app/pages/redeem/redeem.page.ts +++ b/src/app/pages/redeem/redeem.page.ts @@ -189,6 +189,12 @@ array (size=4) } } + checkSelectVal(){ + if (this.recipient == 'ADD_NEW_RECIP'){ + this.addNewBank(); + this.recipient=''; + } + } async showAlert(mtitle: string, amessage: string) { const alert = await this.alertController.create({ header: 'WrenchBoard', From 30d8004349ceb412744e639afcfaec36549168a8 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 29 Oct 2023 17:53:54 -0400 Subject: [PATCH 2/3] add account align --- src/app/pages/redeem/redeem.page.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/redeem/redeem.page.html b/src/app/pages/redeem/redeem.page.html index d39d0a2..3bb25f6 100644 --- a/src/app/pages/redeem/redeem.page.html +++ b/src/app/pages/redeem/redeem.page.html @@ -61,7 +61,7 @@ Recipient - + {{item.recipient}} @@ -69,8 +69,8 @@ - - + + From f82dad34eb2573ac386d20b9e388738d0640a6c4 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 29 Oct 2023 18:22:23 -0400 Subject: [PATCH 3/3] Recipient --- REMEMBER.txt | 4 ++- src/app/accounts/addbank/addbank.page.ts | 5 ++- src/app/pages/redeem/redeem.page.ts | 11 ++++-- src/app/store/recipients.service.spec.ts | 16 +++++++++ src/app/store/recipients.service.ts | 44 ++++++++++++++++++++++++ 5 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 src/app/store/recipients.service.spec.ts create mode 100644 src/app/store/recipients.service.ts diff --git a/REMEMBER.txt b/REMEMBER.txt index ef318de..21779fe 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -68,4 +68,6 @@ $ ionic generate component contact/form $ ionic generate component login-form --change-detection=OnPush $ ionic generate directive ripple --skip-import $ ionic generate service user-wallet -ionic generate service loc-trc \ No newline at end of file +ionic generate service loc-trc + +ionic generate service recipients \ No newline at end of file diff --git a/src/app/accounts/addbank/addbank.page.ts b/src/app/accounts/addbank/addbank.page.ts index ccd5104..17a1f94 100644 --- a/src/app/accounts/addbank/addbank.page.ts +++ b/src/app/accounts/addbank/addbank.page.ts @@ -3,6 +3,7 @@ import {AlertController, NavController, ToastController} from "@ionic/angular"; import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; +import {RecipientsService} from "../../store/recipients.service"; @Component({ selector: 'app-addbank', @@ -24,7 +25,8 @@ export class AddbankPage implements OnInit { public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, private alertController: AlertController, - private toastController: ToastController + private toastController: ToastController, + public recipientsService: RecipientsService ) { @@ -141,6 +143,7 @@ export class AddbankPage implements OnInit { if ( this.accountAddResult.internal_return != undefined && this.accountAddResult.internal_return > 0 ){ this.presentToast("Recipient Accound Added",'middle'); setTimeout(() => { + this.recipientsService.getMyRecipientsData(); this.onBack(); }, 3000); } diff --git a/src/app/pages/redeem/redeem.page.ts b/src/app/pages/redeem/redeem.page.ts index a4dcd3f..4cef53c 100644 --- a/src/app/pages/redeem/redeem.page.ts +++ b/src/app/pages/redeem/redeem.page.ts @@ -3,6 +3,7 @@ import {AlertController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; +import {RecipientsService} from "../../store/recipients.service"; @Component({ selector: 'app-redeem', @@ -55,7 +56,8 @@ wallet_uid private router: Router, public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, - private alertController: AlertController + private alertController: AlertController, + public recipientsService: RecipientsService ) { this.walletData = this.router.getCurrentNavigation().extras.state; if ( this.walletData != undefined ){ @@ -69,9 +71,12 @@ wallet_uid } } + myRecipientsData:any; ngOnInit() { - this.getMyRecipientsData(); + this.myRecipientsData = this.recipientsService.getMyRecipientsData(); this.getPaymentHxData(); + //this.getMyRecipientsData(); + this.myRecipientsData = this.recipientsService.myRecipientsData; } onBack() { @@ -275,7 +280,7 @@ this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_ } myRecipientsTotalData:any; - myRecipientsData:any; + getMyRecipientsData(){ this.usrData = {action:11175, member_id: this.sessionDataProviderService.member_id, diff --git a/src/app/store/recipients.service.spec.ts b/src/app/store/recipients.service.spec.ts new file mode 100644 index 0000000..3bbfed0 --- /dev/null +++ b/src/app/store/recipients.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { RecipientsService } from './recipients.service'; + +describe('RecipientsService', () => { + let service: RecipientsService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(RecipientsService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/recipients.service.ts b/src/app/store/recipients.service.ts new file mode 100644 index 0000000..6209211 --- /dev/null +++ b/src/app/store/recipients.service.ts @@ -0,0 +1,44 @@ +import { Injectable } from '@angular/core'; +import {SessionDataProviderService} from "./session-data-provider.service"; +import {WrenchService} from "../services/wrench.service"; + +@Injectable({ + providedIn: 'root' +}) +export class RecipientsService { + + constructor( + public sessionDataProviderService: SessionDataProviderService, + private wrenchService: WrenchService) { } + + usrData: { + action:number, member_id: number, + uid: string, + sessionid: string, + limit:20, page:1, + offset: 0, + amount: number + }; + + myRecipientsTotalData:any; + myRecipientsData:any; + async getMyRecipientsData(){ + this.usrData = {action:11175, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + limit:20, page:1, + offset: 0, amount: 0} + + this.wrenchService.recipientAccount(this.usrData).subscribe( + myRecipientsTotalData => { + this.myRecipientsTotalData = myRecipientsTotalData; + console.log("myRecipientsTotalData RETURN->", this.myRecipientsTotalData); + this.myRecipientsData = this.myRecipientsTotalData.result_list; + console.log("myRecipientsData RETURN DATA->", this.myRecipientsData); + return this.myRecipientsData; + } + ); + } + +}