Browse Source
Merge branch 'refreshKFTC'
Merge branch 'refreshKFTC'
Conflicts: GME Remit.xcodeproj/project.pbxproj GMERemittance/Module/Home/User Interface/View/HomeViewController.swiftpull/1/head
InKwon James Kim
5 years ago
45 changed files with 1153 additions and 689 deletions
-
8GME Remit.xcodeproj/project.pbxproj
-
10GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme
-
6GMERemittance/Assets.xcassets/addAccount/Contents.json
-
21GMERemittance/Assets.xcassets/addAccount/addAccount.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount.imageset/addAccount.png
-
21GMERemittance/Assets.xcassets/addAccount/addAccount10.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount10.imageset/addAccount10.png
-
21GMERemittance/Assets.xcassets/addAccount/addAccount2.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount2.imageset/addAccount2.png
-
21GMERemittance/Assets.xcassets/addAccount/addAccount3.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount3.imageset/addAccount3.png
-
21GMERemittance/Assets.xcassets/addAccount/addAccount4.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount4.imageset/addAccount4.png
-
21GMERemittance/Assets.xcassets/addAccount/addAccount5.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount5.imageset/addAccount5.png
-
21GMERemittance/Assets.xcassets/addAccount/addAccount6.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount6.imageset/addAccount6.png
-
21GMERemittance/Assets.xcassets/addAccount/addAccount7.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount7.imageset/addAccount7.png
-
21GMERemittance/Assets.xcassets/addAccount/addAccount8.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount8.imageset/addAccount8.png
-
21GMERemittance/Assets.xcassets/addAccount/addAccount9.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/addAccount9.imageset/addAccount9.png
-
21GMERemittance/Assets.xcassets/addAccount/renewal.imageset/Contents.json
-
BINGMERemittance/Assets.xcassets/addAccount/renewal.imageset/renewal.png
-
7GMERemittance/Library/WebLinks/WkWebView/WkWebViewController.swift
-
7GMERemittance/Model/User.swift
-
102GMERemittance/Module/AutoDebitModules/AutoDebit/User Interface/View/AutoDebit.storyboard
-
11GMERemittance/Module/AutoDebitModules/AutoDebit/User Interface/View/AutoDebitTableViewCell.swift
-
71GMERemittance/Module/AutoDebitModules/AutoDebit/User Interface/View/AutoDebitViewController.swift
-
8GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRates.storyboard
-
4GMERemittance/Module/ExchangeRates/User Interface/View/ExchangeRatesViewController.swift
-
2GMERemittance/Module/Home/Application Logic/Service/HomeServiceType.swift
-
34GMERemittance/Module/Home/User Interface/View/HomeViewController.swift
-
12GMERemittance/Module/SendMoneyModules/ResendExchange/User Interface/View/ResendExchange.storyboard
-
8GMERemittance/Module/SendMoneyModules/ResendExchange/User Interface/View/ResendExchangeViewController.swift
-
26GMERemittance/Module/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRate.storyboard
-
8GMERemittance/Module/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
-
11GMERemittance/Module/SideMenu/Auto refund/AutoRefundsViewController.swift
-
6GMERemittance/Module/SideMenu/Auto refund/autoRefund.storyboard
-
34GMERemittance/Utility/AppConstants.swift
-
22GMERemittance/Utility/GMEAlert/GMEAlertViewController.xib
-
36GMERemittance/Utility/GMENumberTextField.swift
-
22GMERemittanceTests/FunctionTest.swift
-
8en.lproj/Localizable.strings
@ -0,0 +1,6 @@ |
|||
{ |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 1.2 KiB |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount10.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 1.4 KiB |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount2.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 343 B |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount3.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 1.0 KiB |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount4.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 252 B |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount5.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 332 B |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount6.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 1.4 KiB |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount7.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 1.4 KiB |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount8.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 1.4 KiB |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "addAccount9.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 48 | Height: 48 | Size: 1.4 KiB |
@ -0,0 +1,21 @@ |
|||
{ |
|||
"images" : [ |
|||
{ |
|||
"idiom" : "universal", |
|||
"filename" : "renewal.png", |
|||
"scale" : "1x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "2x" |
|||
}, |
|||
{ |
|||
"idiom" : "universal", |
|||
"scale" : "3x" |
|||
} |
|||
], |
|||
"info" : { |
|||
"version" : 1, |
|||
"author" : "xcode" |
|||
} |
|||
} |
|||
|
After Width: 64 | Height: 64 | Size: 2.6 KiB |
@ -0,0 +1,36 @@ |
|||
// |
|||
// GMETextField.swift |
|||
// GME Remit |
|||
// |
|||
// Created by InKwon Devik Kim on 08/07/2019. |
|||
// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. |
|||
// |
|||
|
|||
import UIKit |
|||
|
|||
class GMENumberTextField: UITextField { |
|||
private var customerNativeCountry: String? |
|||
var receiverNativeCountry: String = "" { |
|||
didSet { |
|||
selectKeyboardType() |
|||
} |
|||
} |
|||
|
|||
required init?(coder aDecoder: NSCoder) { |
|||
super.init(coder: aDecoder) |
|||
|
|||
keyboardType = .numberPad |
|||
|
|||
customerNativeCountry = UserDefaults.standard.string(forKey: UserKeys.countryCode) |
|||
selectKeyboardType() |
|||
} |
|||
|
|||
private func selectKeyboardType() { |
|||
guard let customerNativeCountry = customerNativeCountry else { return } |
|||
if customerNativeCountry == "KH" || receiverNativeCountry == "KH" { |
|||
keyboardType = .asciiCapable |
|||
} else { |
|||
keyboardType = .numberPad |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,22 @@ |
|||
// |
|||
// FunctionTest.swift |
|||
// GMERemittanceTests |
|||
// |
|||
// Created by InKwon Devik Kim on 09/07/2019. |
|||
// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. |
|||
// |
|||
|
|||
import XCTest |
|||
@testable import GME_Remit |
|||
|
|||
class FunctionTest: XCTestCase { |
|||
func testExpireDate() { |
|||
guard let remindDay = Utility.calculateDDay(registDate: "7/8/2019 4:19:37 PM") |
|||
else { |
|||
XCTAssert(false) |
|||
return |
|||
} |
|||
XCTAssert(remindDay == "365") |
|||
|
|||
} |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue