Browse Source

Merge branch 'resend-bugs' into developer

pull/1/head
Swift Technology 6 years ago
parent
commit
847a08a60c
  1. 2
      GMERemittance/Library/CountryInfo.swift
  2. 2
      GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift
  3. 39
      GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard
  4. 8
      GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
  5. 11
      GMERemittance/Recipient/RecipientListViewController.swift
  6. 45
      GMERemittance/SideMenu/AboutGMEViewController.swift

2
GMERemittance/Library/CountryInfo.swift

@ -275,7 +275,7 @@ class CountryInfo {
"bd" : "100000", // Bangladesh
"by" : "1000", // Belarus
"ge" : "1000", // Georgia
"id" : "15000000", // indonesia
"id" : "1000000", // indonesia
"kz" : "1000", // Kazakhstan
"kg" : "1000", // Kyrgyzstan
"my" : "10000", // Malaysia

2
GMERemittance/Module/Resend/User Interface/View/ResendViewController.swift

@ -171,7 +171,7 @@ class ResendViewController: UIViewController {
}
func selectedAcunt(acunt: Account) {
guard let index = self.selectedIndex, let transaction = self.transactions.elementAt(index: index), let requestModel = self.requestModel, let transactionId = self.filteredTransaction.elementAt(index: index)?.transactionId else {return}
guard let index = self.selectedIndex, let transaction = self.filteredTransaction.elementAt(index: index), let requestModel = self.requestModel, let transactionId = self.filteredTransaction.elementAt(index: index)?.transactionId else {return}
requestModel.autoDebitAccount = acunt
requestModel.transaction = transaction

39
GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
@ -392,6 +392,38 @@
</view>
</subviews>
</stackView>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="E7Y-bp-5jS" userLabel="AccountNumber">
<rect key="frame" x="0.0" y="125" width="345" height="0.0"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oh1-5w-hCd">
<rect key="frame" x="0.0" y="0.0" width="345" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bank A/C No" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OeN-Lk-OE6">
<rect key="frame" x="0.0" y="0.0" width="120" height="0.0"/>
<constraints>
<constraint firstAttribute="width" constant="120" id="7BM-W3-WXz"/>
</constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" white="0.033649553569999997" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=": Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Eyf-de-vJI">
<rect key="frame" x="120" y="0.0" width="225" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="13"/>
<color key="textColor" white="0.033649553569999997" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q1T-PQ-wod">
<rect key="frame" x="0.0" y="0.0" width="345" height="0.5"/>
<color key="backgroundColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="9aa-p2-Fbb"/>
</constraints>
</view>
</subviews>
</stackView>
</subviews>
<constraints>
<constraint firstItem="udF-KR-HFx" firstAttribute="width" secondItem="gjw-a5-RqE" secondAttribute="width" id="0Ag-n8-iCu"/>
@ -494,6 +526,9 @@
</connections>
</tableView>
<connections>
<outlet property="accountNoLabel" destination="Eyf-de-vJI" id="x1J-pM-5Nm"/>
<outlet property="accountNumTitlelabel" destination="OeN-Lk-OE6" id="oCD-93-8jn"/>
<outlet property="accountNumberStackView" destination="E7Y-bp-5jS" id="SDb-ID-9XP"/>
<outlet property="addressLabel" destination="dnn-3y-Ufq" id="d1u-dz-rVd"/>
<outlet property="addressTitleLabel" destination="NCN-8W-JTM" id="fMF-wD-HPW"/>
<outlet property="agreeAndSendButton" destination="aK1-qf-WzM" id="5qv-xw-xJd"/>

8
GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift

@ -38,6 +38,7 @@ class SendMoneyVerificationViewController: UITableViewController {
@IBOutlet weak var exchangeRateLabel: UILabel!
@IBOutlet weak var serviceChargeLabel: UILabel!
@IBOutlet weak var payoutAgentBankLabel: UILabel!
@IBOutlet weak var accountNoLabel: UILabel!
@IBOutlet weak var payoutCountryTitleLabel: UILabel!
@IBOutlet weak var payoutModeTitleLabel: UILabel!
@ -45,6 +46,7 @@ class SendMoneyVerificationViewController: UITableViewController {
@IBOutlet weak var exchangeRateTitleLabel: UILabel!
@IBOutlet weak var serviceChargeTitleLabel: UILabel!
@IBOutlet weak var payoutAgentBankTitleLabel: UILabel!
@IBOutlet weak var accountNumTitlelabel: UILabel!
// title labels
@IBOutlet weak var recieverDetailsLabel: UILabel!
@ -54,6 +56,8 @@ class SendMoneyVerificationViewController: UITableViewController {
@IBOutlet weak var agreeAndSendButton: UIButton!
@IBOutlet weak var bankNameStackView: UIStackView!
@IBOutlet weak var accountNumberStackView: UIStackView!
var url: String?
@ -120,6 +124,9 @@ class SendMoneyVerificationViewController: UITableViewController {
mQwertyTransKeyView?.delegate = self
mNumberTransKeyView?.delegate = self
self.bankNameStackView.isHidden = (self.requestModel?.bank?.name ?? "").isEmpty
self.accountNumberStackView.isHidden = (self.requestModel?.paymemtMode?.accountNumber ?? "").isEmpty
}
override func viewDidDisappear(_ animated: Bool) {
@ -221,6 +228,7 @@ class SendMoneyVerificationViewController: UITableViewController {
self.exchangeRateLabel.text = self.requestModel?.exchangeRateDetail?.exchangeRate
self.serviceChargeLabel.text = self.requestModel?.exchangeRateDetail?.transferFee
self.payoutAgentBankLabel.text = self.requestModel?.bank?.name
self.accountNoLabel.text = self.requestModel?.paymemtMode?.accountNumber
}
func askPassword() {

11
GMERemittance/Recipient/RecipientListViewController.swift

@ -145,17 +145,6 @@ extension RecipientListViewController: UITableViewDelegate,UITableViewDataSource
self.showMethodSelection(for: index)
// remove this
// if let navigation = self.navigationController {
// if let reciepient = self.reciepients?.elementAt(index: index) {
// let wireframe = SendMoneyParentWireframe()
// let acunt = Account()
// acunt.type = "wallet"
// wireframe.open(for: reciepient, with: acunt, in: navigation)
// }
// }
}
func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {

45
GMERemittance/SideMenu/AboutGMEViewController.swift

@ -32,6 +32,30 @@ class AboutGMEViewController: UIViewController {
let URLLinkedInApp: String = "linkedin://company/gmeremit/"
let URLLinkedInBrowser: String = "https://www.linkedin.com/company/gmeremit/"
// var defaultCountries = ["Nepal", "Cambodia", "Philipinnes", "Sri Lanka", "Vietnam", "India", "Pakistan", "azerbaijan", "Bangladesh", "Belarus", "Georgia", "Indonesia", "Kazakhstan", "Kyrgyzstan", "Malaysia", "Moldova", "Mongolia", "Myanmar", "Russian Federation", "Singapore", "Tajikistan", "Thailand", "Uzbekistan"]
// var defaultCountryCodes = ["np", "kh", "ph", "lk", "vn", "in", "pk", "az", "bd", "by", "ge", "id", "kz", "kg", "my", "md", "mn", "mm", "ru", "sg", "tj", "th", "uz", "en"]
let FacebookUrls: [String: String] = [
"np" : "https://www.facebook.com/gmenepal/",
"kh" : "https://www.facebook.com/gmecambodia/",
"lk" : "https://www.facebook.com/gmeremitsrilanka/",
"vn" : "https://www.facebook.com/gmevietnam/",
"ph" : "https://www.facebook.com/gmephilippines/",
"bd" : "https://www.facebook.com/gmebangladesh/",
"id" : "https://www.facebook.com/gmeindonesia/",
"th" : "https://www.facebook.com/gmethailand/",
"mn" : "https://www.facebook.com/gmemongolia/",
"uz" : "https://www.facebook.com/gmeuzbekistan/",
"in" : "https://www.facebook.com/GMEindia/",
"pk" : "https://www.facebook.com/gmepakistan/",
"mm" : "https://www.facebook.com/gmemyanmar/"
]
override func viewDidLoad() {
super.viewDidLoad()
self.versionLabel.text = Utility.getAppVersion()
@ -58,29 +82,27 @@ class AboutGMEViewController: UIViewController {
}
@IBAction func checkForUpdate(_ sender: Any) {
//
}
@IBAction func openLinkedIn(_ sender: Any) {
UIApplication.tryURL(urls: [self.URLLinkedInApp,
self.URLLinkedInBrowser
])
// UIApplication.tryURL(urls: [self.URLLinkedInApp,
// self.URLLinkedInBrowser
// ])
}
@IBAction func openFacebook(_ sender: Any) {
UIApplication.tryURL(urls: [self.URLFacebookApp,
self.URLFacebookApp2,
self.URLFacebookBrowser
])
guard let nativeCountry = UserDefaults.standard.string(forKey: UserKeys.countryCode) else {return}
UIApplication.tryURL(url: self.FacebookUrls[nativeCountry.lowercased()] ?? "")
}
}
extension UIApplication {
class func tryURL(urls: [String]) {
class func tryURL(url: String) {
let application = UIApplication.shared
for url in urls {
if application.canOpenURL(URL(string: url)!) {
if let _url = URL(string: url), application.canOpenURL(_url) {
if #available(iOS 10.0, *) {
application.open(URL(string: url)!, options: [:], completionHandler: nil)
} else {
@ -89,5 +111,4 @@ extension UIApplication {
return
}
}
}
}
Loading…
Cancel
Save