From 63bb56b4c1891219af07e2feb8a6029860c97ce4 Mon Sep 17 00:00:00 2001 From: Rahul Kantesaria Date: Fri, 5 Apr 2019 14:15:18 -0400 Subject: [PATCH 01/10] Created PaymentOptions interface and controller for selecting payment type. Fetching bank account info and populating table with it. Updated getbankacctinfo request to grab the bank name and last 4 digits of bank account. --- .../BankAcctCell.swift | 9 ++++++ .../PaymentOptionsInterfaceController.swift | 30 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 SynchronyFinancial/SynchronyFinancial WatchKit Extension/BankAcctCell.swift create mode 100644 SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/BankAcctCell.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/BankAcctCell.swift new file mode 100644 index 0000000..d434d68 --- /dev/null +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/BankAcctCell.swift @@ -0,0 +1,9 @@ +// +// BankAcctCell.swift +// SynchronyFinancial WatchKit Extension +// +// Created by Rahul Kantesaria on 4/5/19. +// Copyright © 2019 Alan Maynard. All rights reserved. +// + +import Foundation diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift new file mode 100644 index 0000000..88836b1 --- /dev/null +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift @@ -0,0 +1,30 @@ +// +// BankSelectionInterfaceController.swift +// SynchronyFinancial WatchKit Extension +// +// Created by Rahul Kantesaria on 4/5/19. +// Copyright © 2019 Alan Maynard. All rights reserved. +// + +import WatchKit +import Foundation + +class BankSelectionInterfaceController: WKInterfaceController { + + + override func awake(withContext context: Any?) { + + } + + override func willActivate() { + // This method is called when watch view controller is about to be visible to user + super.willActivate() + } + + override func didDeactivate() { + // This method is called when watch view controller is no longer visible + super.didDeactivate() + } + + +} From 6ffbf6456ca0715548b40cb81826f650e6077328 Mon Sep 17 00:00:00 2001 From: Rahul Kantesaria Date: Fri, 5 Apr 2019 14:17:02 -0400 Subject: [PATCH 02/10] reated PaymentOptions interface and controller for selecting payment type. Fetching bank account info and populating table with it. Updated getbankacctinfo request to grab the bank name and last 4 digits of bank account. --- .../Base.lproj/Interface.storyboard | 40 +++++++++++++++++-- .../BankAcctCell.swift | 7 ++++ .../FetchData.swift | 8 ++-- .../PaymentDetailInterfaceController.swift | 14 +++++++ .../PaymentOptionsInterfaceController.swift | 27 ++++++++++--- .../project.pbxproj | 10 ++++- .../SynchronyFinancial/BankAcct.swift | 6 ++- 7 files changed, 96 insertions(+), 16 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard index 037b541..6683c36 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard +++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard @@ -1,12 +1,12 @@ - + - - + + @@ -202,8 +202,11 @@ - - + + diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/BankAcctCell.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/BankAcctCell.swift index 3f6f92d..cedf8bb 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/BankAcctCell.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/BankAcctCell.swift @@ -10,6 +10,6 @@ import Foundation import WatchKit class BankAcctCell: NSObject { - @IBOutlet weak var BankNameLabel: WKInterfaceLabel! - @IBOutlet weak var Last4Label: WKInterfaceLabel! + @IBOutlet weak var bankNameLabel: WKInterfaceLabel! + @IBOutlet weak var last4Label: WKInterfaceLabel! } diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift index c683c6f..2b3d33b 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift @@ -16,6 +16,7 @@ class PaymentDetailInterfaceController: WKInterfaceController { var paymentButtonArmed: Bool = false var paymentAmount: Double = 0.0 var dictForBankAcct: [String: [BankAcct]] = [:] + var bankID: String = "" @IBOutlet weak var activityIndicator: WKInterfaceImage! @IBOutlet weak var activityIndicatorLabel: WKInterfaceLabel! @IBOutlet weak var contentGroup: WKInterfaceGroup! @@ -24,25 +25,17 @@ class PaymentDetailInterfaceController: WKInterfaceController { @IBOutlet weak var paymentButton: WKInterfaceButton! @IBOutlet weak var payFrom: WKInterfaceLabel! @IBOutlet weak var separate: WKInterfaceSeparator! + override func awake(withContext context: Any?) { - configureInterfaceObjects(true) - activityIndicator.configureForActivityIndicator() super.awake(withContext: context) + guard let data = context as? [String: Any], let acct = data["acct"] as? Account, let amount = data["payment_amount"] as? Double else { NSLog("Error getting account object and payment amount") return } - FetchData.getBankInfo { accts, error in guard error == nil else { - NSLog("Error retrieving payment methods for account in paymentDetailInterfaceController.") - return - } - self.dictForBankAcct.updateValue(accts, forKey: "paymentOptions") - self.configureInterfaceObjects(false) - //self.detailButton.setTitle("Hello") - self.activityIndicator.stopAnimatingAsIndicator() - } + self.paymentAmount = amount self.selectedAccount = acct @@ -61,7 +54,11 @@ class PaymentDetailInterfaceController: WKInterfaceController { let type: PaymentType = self.paymentAmount == self.selectedAccount?.curBalance ? .currentBal : .minimumDue // process this payment using default bank account (9999) until ability to change account is implemented - FetchData.submitPayment(for: alias, type: type, amount: self.paymentAmount, bankID: "9999") { confirmationNum, paymentID, error in + if let bankacct = UserDefaults.standard.dictionary(forKey: "default_bank_acct") as? [String: String] { + self.bankID = bankacct["bankID"] ?? "9999" + } + + FetchData.submitPayment(for: alias, type: type, amount: self.paymentAmount, bankID: self.bankID) { confirmationNum, paymentID, error in guard error == nil else { let dismiss = WKAlertAction(title: "Dismiss", style: .cancel, handler: {}) self.presentAlert(withTitle: "Error", message: "We were unable to process your payment at this time. Please try again later.", preferredStyle: .alert, actions: [dismiss]) @@ -87,7 +84,19 @@ class PaymentDetailInterfaceController: WKInterfaceController { } @IBAction func bankAccountsTapped() { - self.pushController(withName: "PaymentOptions", context: self.dictForBankAcct) + configureInterfaceObjects(true) + activityIndicator.configureForActivityIndicator() + FetchData.getBankInfo { accts, error in guard error == nil else { + NSLog("Error retrieving payment methods for account in paymentDetailInterfaceController.") + return + } + self.dictForBankAcct.updateValue(accts, forKey: "paymentOptions") + self.configureInterfaceObjects(false) + //self.detailButton.setTitle("Hello") + self.activityIndicator.stopAnimatingAsIndicator() + self.pushController(withName: "PaymentOptions", context: self.dictForBankAcct) + } + } override func willActivate() { @@ -109,14 +118,8 @@ class PaymentDetailInterfaceController: WKInterfaceController { paymentButton.setHidden(hide) payFrom.setHidden(hide) separate.setHidden(hide) - contentGroup.setHidden(hide) - /*if(!hide){ - if let p1 = self.dictForBankAcct["paymentOptions"] { - let x = p1[0] - UserDefaults.standard.set(x, forKey: "default_bank_acct") - print("yes") - detailButton.setTitle(p1[0].bankName) - } - }*/ + contentGroup.setHidden(hide) + activityIndicatorLabel.setVerticalAlignment(.center) + activityIndicatorLabel.setHidden(!hide) } } diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift index c2b99eb..ee6af02 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift @@ -36,19 +36,19 @@ class PaymentOptionsInterfaceController: WKInterfaceController { bankAcctTable.setNumberOfRows(bankAccts.count, withRowType: "bankAcctCell") for index in 0.. BankAcct? { - if let bank = UserDefaults.standard.value(forKey: "default_bank_acct") as? BankAcct { - return bank - } - - return nil - } -} diff --git a/SynchronyFinancial/SynchronyFinancial/UserDefaults+Extensions.swift b/SynchronyFinancial/SynchronyFinancial/UserDefaults+Extensions.swift new file mode 100644 index 0000000..6e63dcf --- /dev/null +++ b/SynchronyFinancial/SynchronyFinancial/UserDefaults+Extensions.swift @@ -0,0 +1,22 @@ +// +// UserDefaults+Extensions.swift +// SynchronyFinancial +// +// Created by Rahul Kantesaria on 4/8/19. +// Copyright © 2019 Alan Maynard. All rights reserved. +// + +import Foundation + +extension UserDefaults { + func setDefaultBankAccount(_ acct: BankAcct) { + UserDefaults.standard.set(acct, forKey: "default_bank_acct") + } + + func getDefaultBankAccount() -> BankAcct? { + if let bank = UserDefaults.standard.value(forKey: "default_bank_acct") as? BankAcct { + return bank + } + return nil + } +} From cc16cdfc3216c3380a283ab61fb308b81ffed5f8 Mon Sep 17 00:00:00 2001 From: Rahul Kantesaria Date: Mon, 8 Apr 2019 14:11:50 -0400 Subject: [PATCH 07/10] hotfix for passing default bank acct id --- .../PaymentDetailInterfaceController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift index 2b3d33b..fafb04f 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift @@ -55,7 +55,7 @@ class PaymentDetailInterfaceController: WKInterfaceController { // process this payment using default bank account (9999) until ability to change account is implemented if let bankacct = UserDefaults.standard.dictionary(forKey: "default_bank_acct") as? [String: String] { - self.bankID = bankacct["bankID"] ?? "9999" + self.bankID = bankacct["bankAcctId"] ?? "9999" } FetchData.submitPayment(for: alias, type: type, amount: self.paymentAmount, bankID: self.bankID) { confirmationNum, paymentID, error in From 3594b682beae50e74873218fb79e9f0720322f36 Mon Sep 17 00:00:00 2001 From: Rahul Kantesaria Date: Tue, 9 Apr 2019 13:38:24 -0400 Subject: [PATCH 08/10] SWE-13 PR Requested changes --- .../FetchData.swift | 3 +-- .../PaymentDetailInterfaceController.swift | 20 +++++++++---------- .../PaymentOptionsInterfaceController.swift | 12 ++++++----- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/FetchData.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/FetchData.swift index 6d0016b..b7cf020 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/FetchData.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/FetchData.swift @@ -132,8 +132,7 @@ class FetchData { if let bankId = $0["bank_account_id"].string, let bankName = $0["bank_name"].string, let last4Acct = $0["last4_bank_acct_number"].string, - let accttype: AccountType = $0["bank_account_type"].stringValue == - "C" ? .checkings : .savings { + let accttype: AccountType = AccountType(rawValue: $0["bank_account_type"].stringValue) { bankIds.append(BankAcct(bankAcctId: bankId, acctType: accttype, bankName: bankName, last4Acct: last4Acct)) } } diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift index fafb04f..216b508 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift @@ -16,7 +16,7 @@ class PaymentDetailInterfaceController: WKInterfaceController { var paymentButtonArmed: Bool = false var paymentAmount: Double = 0.0 var dictForBankAcct: [String: [BankAcct]] = [:] - var bankID: String = "" + //var bankID: String = "" @IBOutlet weak var activityIndicator: WKInterfaceImage! @IBOutlet weak var activityIndicatorLabel: WKInterfaceLabel! @IBOutlet weak var contentGroup: WKInterfaceGroup! @@ -35,8 +35,6 @@ class PaymentDetailInterfaceController: WKInterfaceController { return } - - self.paymentAmount = amount self.selectedAccount = acct paymentButton.setTitle(String(format: "Pay $%.2f", amount)) @@ -54,16 +52,17 @@ class PaymentDetailInterfaceController: WKInterfaceController { let type: PaymentType = self.paymentAmount == self.selectedAccount?.curBalance ? .currentBal : .minimumDue // process this payment using default bank account (9999) until ability to change account is implemented - if let bankacct = UserDefaults.standard.dictionary(forKey: "default_bank_acct") as? [String: String] { - self.bankID = bankacct["bankAcctId"] ?? "9999" + guard let bankacct = UserDefaults.standard.dictionary(forKey: "default_bank_acct") as? [String: String], let bankID = bankacct["bankAcctId"] else{ + NSLog("Error retrieving Payment Option") + return } - - FetchData.submitPayment(for: alias, type: type, amount: self.paymentAmount, bankID: self.bankID) { confirmationNum, paymentID, error in + FetchData.submitPayment(for: alias, type: type, amount: self.paymentAmount, bankID: bankID) { confirmationNum, paymentID, error in guard error == nil else { let dismiss = WKAlertAction(title: "Dismiss", style: .cancel, handler: {}) self.presentAlert(withTitle: "Error", message: "We were unable to process your payment at this time. Please try again later.", preferredStyle: .alert, actions: [dismiss]) return } + self.dictForPayment.updateValue(confirmationNum, forKey: "payment_confirmation_number") self.dictForPayment.updateValue(paymentID, forKey: "payment_id") self.activityIndicator.stopAnimatingAsIndicator() @@ -86,9 +85,10 @@ class PaymentDetailInterfaceController: WKInterfaceController { @IBAction func bankAccountsTapped() { configureInterfaceObjects(true) activityIndicator.configureForActivityIndicator() - FetchData.getBankInfo { accts, error in guard error == nil else { - NSLog("Error retrieving payment methods for account in paymentDetailInterfaceController.") - return + FetchData.getBankInfo { accts, error in + guard error == nil else { + NSLog("Error retrieving payment methods for account in paymentDetailInterfaceController.") + return } self.dictForBankAcct.updateValue(accts, forKey: "paymentOptions") self.configureInterfaceObjects(false) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift index ee6af02..87ec47b 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift @@ -10,7 +10,6 @@ import WatchKit import Foundation class PaymentOptionsInterfaceController: WKInterfaceController { - @IBOutlet weak var bankAcctTable: WKInterfaceTable! var bankAccts: [BankAcct] = [] var dictForDefault: [String: String] = [:] @@ -24,14 +23,17 @@ class PaymentOptionsInterfaceController: WKInterfaceController { bankAccts = accts configureRows() } + override func willActivate() { // This method is called when watch view controller is about to be visible to user super.willActivate() } + override func didDeactivate() { // This method is called when watch view controller is no longer visible super.didDeactivate() } + private func configureRows() { bankAcctTable.setNumberOfRows(bankAccts.count, withRowType: "bankAcctCell") for index in 0.. Date: Tue, 9 Apr 2019 15:53:03 -0400 Subject: [PATCH 09/10] SWE-13 [swiftlint] resolve swiftlint warnings --- .../PaymentDetailInterfaceController.swift | 17 ++++++++--------- .../PaymentOptionsInterfaceController.swift | 8 ++++---- .../TransactionsInterfaceController.swift | 2 +- .../SynchronyFinancial/BankAcct.swift | 1 - .../UserDefaults+Extensions.swift | 2 +- 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift index 216b508..a429c0f 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift @@ -25,11 +25,10 @@ class PaymentDetailInterfaceController: WKInterfaceController { @IBOutlet weak var paymentButton: WKInterfaceButton! @IBOutlet weak var payFrom: WKInterfaceLabel! @IBOutlet weak var separate: WKInterfaceSeparator! - override func awake(withContext context: Any?) { super.awake(withContext: context) - + guard let data = context as? [String: Any], let acct = data["acct"] as? Account, let amount = data["payment_amount"] as? Double else { NSLog("Error getting account object and payment amount") return @@ -52,9 +51,10 @@ class PaymentDetailInterfaceController: WKInterfaceController { let type: PaymentType = self.paymentAmount == self.selectedAccount?.curBalance ? .currentBal : .minimumDue // process this payment using default bank account (9999) until ability to change account is implemented - guard let bankacct = UserDefaults.standard.dictionary(forKey: "default_bank_acct") as? [String: String], let bankID = bankacct["bankAcctId"] else{ - NSLog("Error retrieving Payment Option") - return + guard let bankacct = UserDefaults.standard.dictionary(forKey: "default_bank_acct") as? [String: String], + let bankID = bankacct["bankAcctId"] else { + NSLog("Error retrieving Payment Option") + return } FetchData.submitPayment(for: alias, type: type, amount: self.paymentAmount, bankID: bankID) { confirmationNum, paymentID, error in guard error == nil else { @@ -62,7 +62,7 @@ class PaymentDetailInterfaceController: WKInterfaceController { self.presentAlert(withTitle: "Error", message: "We were unable to process your payment at this time. Please try again later.", preferredStyle: .alert, actions: [dismiss]) return } - + self.dictForPayment.updateValue(confirmationNum, forKey: "payment_confirmation_number") self.dictForPayment.updateValue(paymentID, forKey: "payment_id") self.activityIndicator.stopAnimatingAsIndicator() @@ -81,7 +81,7 @@ class PaymentDetailInterfaceController: WKInterfaceController { } } } - + @IBAction func bankAccountsTapped() { configureInterfaceObjects(true) activityIndicator.configureForActivityIndicator() @@ -96,7 +96,6 @@ class PaymentDetailInterfaceController: WKInterfaceController { self.activityIndicator.stopAnimatingAsIndicator() self.pushController(withName: "PaymentOptions", context: self.dictForBankAcct) } - } override func willActivate() { @@ -111,7 +110,7 @@ class PaymentDetailInterfaceController: WKInterfaceController { // This method is called when watch view controller is no longer visible super.didDeactivate() } - + private func configureInterfaceObjects(_ hide: Bool) { detailButton.setHidden(hide) amount.setHidden(hide) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift index 87ec47b..5f74e48 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentOptionsInterfaceController.swift @@ -23,17 +23,17 @@ class PaymentOptionsInterfaceController: WKInterfaceController { bankAccts = accts configureRows() } - + override func willActivate() { // This method is called when watch view controller is about to be visible to user super.willActivate() } - + override func didDeactivate() { // This method is called when watch view controller is no longer visible super.didDeactivate() } - + private func configureRows() { bankAcctTable.setNumberOfRows(bankAccts.count, withRowType: "bankAcctCell") for index in 0.. BankAcct? { if let bank = UserDefaults.standard.value(forKey: "default_bank_acct") as? BankAcct { return bank From d60bd62a24c3ffccd38ffd971695aa909ccc1c33 Mon Sep 17 00:00:00 2001 From: Rahul Kantesaria Date: Wed, 10 Apr 2019 14:11:31 -0400 Subject: [PATCH 10/10] SWE-13 Integration of UserDefaults+Extension as the getter for bankAcctInfo from UserDefaults in updating the selected bank account label as well as passing bankId in submit payment --- .../Base.lproj/Interface.storyboard | 10 +++++----- .../PaymentDetailInterfaceController.swift | 17 +++++++++++------ .../project.pbxproj | 4 ++-- .../UserDefaults+Extensions.swift | 9 +++++++-- 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard index c076878..59e3649 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard +++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard @@ -267,7 +267,7 @@ - + @@ -287,7 +287,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -356,7 +356,7 @@ - + @@ -375,7 +375,7 @@ - + diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift index a429c0f..8d4c9be 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/PaymentDetailInterfaceController.swift @@ -51,12 +51,11 @@ class PaymentDetailInterfaceController: WKInterfaceController { let type: PaymentType = self.paymentAmount == self.selectedAccount?.curBalance ? .currentBal : .minimumDue // process this payment using default bank account (9999) until ability to change account is implemented - guard let bankacct = UserDefaults.standard.dictionary(forKey: "default_bank_acct") as? [String: String], - let bankID = bankacct["bankAcctId"] else { - NSLog("Error retrieving Payment Option") - return + guard let bankacct = UserDefaults.standard.getDefaultBankAccount() else { + NSLog("Error retrieving Payment Option") + return } - FetchData.submitPayment(for: alias, type: type, amount: self.paymentAmount, bankID: bankID) { confirmationNum, paymentID, error in + FetchData.submitPayment(for: alias, type: type, amount: self.paymentAmount, bankID: bankacct.bankAcctId) { confirmationNum, paymentID, error in guard error == nil else { let dismiss = WKAlertAction(title: "Dismiss", style: .cancel, handler: {}) self.presentAlert(withTitle: "Error", message: "We were unable to process your payment at this time. Please try again later.", preferredStyle: .alert, actions: [dismiss]) @@ -101,9 +100,15 @@ class PaymentDetailInterfaceController: WKInterfaceController { override func willActivate() { // This method is called when watch view controller is about to be visible to user super.willActivate() - if let bankacct = UserDefaults.standard.dictionary(forKey: "default_bank_acct") as? [String: String] { + /*if let bankacct = UserDefaults.standard.dictionary(forKey: "default_bank_acct") as? [String: String] { detailButton.setTitle(bankacct["bankName"]) + }*/ + //let userDefaults = UserDefaults.standard + guard let bankacct = UserDefaults.standard.getDefaultBankAccount() else { + NSLog("Error recieving default bank account in Payment Details Controller") + return } + detailButton.setTitle(bankacct.bankName) } override func didDeactivate() { diff --git a/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj b/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj index 76e8ade..d8888b9 100644 --- a/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj +++ b/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj @@ -222,6 +222,7 @@ 67293CF022542F15009E0E7A /* TransactionDetailsInterfaceController.swift */, 674BD1522239A39D0076AFD6 /* PayBillInterfaceController.swift */, 481864A7224802BB0059CF7A /* PaymentDetailInterfaceController.swift */, + 112969412257B8920082AAC5 /* PaymentOptionsInterfaceController.swift */, 676392B322429DC800740A8C /* TransactionsInterfaceController.swift */, 673F396C21A644460051469E /* MainMenuInterfaceController.swift */, 67228CD7224D6E2700CA29E4 /* WKInterfaceImage+Extensions.swift */, @@ -231,10 +232,9 @@ 67BAC291219E254900713FEF /* Assets.xcassets */, 48DA0057221D12E70081A500 /* AccountCell.swift */, 676392B52242A3F800740A8C /* TransactionCell.swift */, + 112B56502257C3D9003E9C78 /* BankAcctCell.swift */, 67BAC293219E254900713FEF /* Info.plist */, 1123372D223ABD6400B70925 /* FetchData.swift */, - 112969412257B8920082AAC5 /* PaymentOptionsInterfaceController.swift */, - 112B56502257C3D9003E9C78 /* BankAcctCell.swift */, ); path = "SynchronyFinancial WatchKit Extension"; sourceTree = ""; diff --git a/SynchronyFinancial/SynchronyFinancial/UserDefaults+Extensions.swift b/SynchronyFinancial/SynchronyFinancial/UserDefaults+Extensions.swift index 1442999..5bd14ae 100644 --- a/SynchronyFinancial/SynchronyFinancial/UserDefaults+Extensions.swift +++ b/SynchronyFinancial/SynchronyFinancial/UserDefaults+Extensions.swift @@ -14,8 +14,13 @@ extension UserDefaults { } func getDefaultBankAccount() -> BankAcct? { - if let bank = UserDefaults.standard.value(forKey: "default_bank_acct") as? BankAcct { - return bank + if let bankDict = UserDefaults.standard.value(forKey: "default_bank_acct") as? [String: String], + let bankAcctId = bankDict["bankAcctId"], + let acctTypeRaw: String = bankDict["acctType"], + let bankName = bankDict["bankName"], + let last4Acct = bankDict["last4Acct"], + let acctType: AccountType = AccountType(rawValue: acctTypeRaw) { + return BankAcct(bankAcctId: bankAcctId, acctType: acctType, bankName: bankName, last4Acct: last4Acct) } return nil }