Browse Source

language fixex

pull/1/head
gme_2 6 years ago
parent
commit
fac3913d48
  1. 2
      GMERemittance/AppDelegate.swift
  2. 17
      GMERemittance/Module/AddReciepient/User Interface/View/AddReciepient.storyboard
  3. 18
      GMERemittance/Module/AddReciepient/User Interface/View/AddReciepientViewController.swift
  4. 2
      GMERemittance/Module/AutoDebit/Application Logic/Service/AutoDebitService.swift
  5. 4
      GMERemittance/Module/AutoDebit/User Interface/View/AutoDebitViewController.swift

2
GMERemittance/AppDelegate.swift

@ -19,7 +19,7 @@ import AlamofireNetworkActivityLogger
import IQKeyboardManagerSwift import IQKeyboardManagerSwift
import LGSideMenuController import LGSideMenuController
let server: Server = .uat
let server: Server = .stagging
@UIApplicationMain @UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate, MessagingDelegate { class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterDelegate, MessagingDelegate {

17
GMERemittance/Module/AddReciepient/User Interface/View/AddReciepient.storyboard

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<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">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/> <adaptation id="fullscreen"/>
</device> </device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
@ -21,7 +21,7 @@
<!--Add Reciepient View Controller--> <!--Add Reciepient View Controller-->
<scene sceneID="ZG4-BZ-Fvd"> <scene sceneID="ZG4-BZ-Fvd">
<objects> <objects>
<viewController storyboardIdentifier="AddReciepientViewController" id="qUw-b7-h89" customClass="AddReciepientViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="AddReciepientViewController" id="qUw-b7-h89" customClass="AddReciepientViewController" customModule="GME_Remit" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="c8w-qG-Ce8"> <view key="view" contentMode="scaleToFill" id="c8w-qG-Ce8">
<rect key="frame" x="0.0" y="0.0" width="375" height="1000"/> <rect key="frame" x="0.0" y="0.0" width="375" height="1000"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -350,19 +350,30 @@
<size key="freeformSize" width="375" height="1000"/> <size key="freeformSize" width="375" height="1000"/>
<connections> <connections>
<outlet property="addressTextField" destination="R9T-Lf-bM4" id="BLz-cZ-WDi"/> <outlet property="addressTextField" destination="R9T-Lf-bM4" id="BLz-cZ-WDi"/>
<outlet property="addressTitleLabel" destination="Y1V-LP-rwg" id="nI3-Z7-OcO"/>
<outlet property="countryNameTitleLabel" destination="gnB-aR-bJE" id="SgA-g3-1cr"/>
<outlet property="countryTextField" destination="rTf-lL-eJb" id="Y3T-Mm-ixS"/> <outlet property="countryTextField" destination="rTf-lL-eJb" id="Y3T-Mm-ixS"/>
<outlet property="districtStackView" destination="EtN-9R-GQt" id="Usa-Zf-0eQ"/> <outlet property="districtStackView" destination="EtN-9R-GQt" id="Usa-Zf-0eQ"/>
<outlet property="districtTextField" destination="6qj-la-Mgu" id="utY-Qw-TW7"/> <outlet property="districtTextField" destination="6qj-la-Mgu" id="utY-Qw-TW7"/>
<outlet property="districtTitleLabel" destination="QCa-CZ-ElQ" id="9hB-yU-EZQ"/>
<outlet property="emailTextField" destination="ipS-s7-o8E" id="Wq1-Uf-JZ6"/> <outlet property="emailTextField" destination="ipS-s7-o8E" id="Wq1-Uf-JZ6"/>
<outlet property="firstNameTextField" destination="ydp-IU-Ddb" id="e3J-N4-YFB"/> <outlet property="firstNameTextField" destination="ydp-IU-Ddb" id="e3J-N4-YFB"/>
<outlet property="firstNameTitleLabel" destination="RPh-p3-dap" id="44g-gl-VAn"/>
<outlet property="headerTItleLabel" destination="5JE-5D-wSW" id="WeN-0w-VRr"/>
<outlet property="lastNameTextField" destination="xvn-Xq-Poa" id="N7h-0x-nDv"/> <outlet property="lastNameTextField" destination="xvn-Xq-Poa" id="N7h-0x-nDv"/>
<outlet property="lastNametitleLabel" destination="aos-AF-iaO" id="cHA-Hj-l7c"/>
<outlet property="middleNameTextField" destination="Bgi-hL-Wf6" id="TkH-5j-dq6"/> <outlet property="middleNameTextField" destination="Bgi-hL-Wf6" id="TkH-5j-dq6"/>
<outlet property="middleNameTitleLabel" destination="Lwa-xS-Mou" id="l4m-Vv-q2P"/>
<outlet property="mobileTextField" destination="vAR-h8-elx" id="MjH-nq-c98"/> <outlet property="mobileTextField" destination="vAR-h8-elx" id="MjH-nq-c98"/>
<outlet property="mobileTitleLabel" destination="s2u-oR-Os8" id="JIR-vw-QzN"/>
<outlet property="provienceStackView" destination="Uwb-JF-Lu9" id="xOP-ad-oDa"/> <outlet property="provienceStackView" destination="Uwb-JF-Lu9" id="xOP-ad-oDa"/>
<outlet property="relationTextField" destination="vZS-DH-n7I" id="L6v-QI-VNp"/> <outlet property="relationTextField" destination="vZS-DH-n7I" id="L6v-QI-VNp"/>
<outlet property="relationTitleLabel" destination="aVB-K7-liY" id="O6y-4R-eTd"/>
<outlet property="saveButton" destination="BKY-7W-R56" id="L0d-XR-kgw"/> <outlet property="saveButton" destination="BKY-7W-R56" id="L0d-XR-kgw"/>
<outlet property="stateProvinceTextField" destination="SpT-9V-3C8" id="eV6-zF-NWg"/> <outlet property="stateProvinceTextField" destination="SpT-9V-3C8" id="eV6-zF-NWg"/>
<outlet property="stateTitleLabel" destination="hX8-qF-mLG" id="In4-Zh-xLw"/>
<outlet property="transferReasonTextField" destination="LWI-ug-ZGq" id="2wH-pT-rE9"/> <outlet property="transferReasonTextField" destination="LWI-ug-ZGq" id="2wH-pT-rE9"/>
<outlet property="transferTitleLabel" destination="F7d-NL-98o" id="Lz2-UX-ubs"/>
</connections> </connections>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Xhm-p5-X8Q" userLabel="First Responder" sceneMemberID="firstResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="Xhm-p5-X8Q" userLabel="First Responder" sceneMemberID="firstResponder"/>

18
GMERemittance/Module/AddReciepient/User Interface/View/AddReciepientViewController.swift

@ -10,6 +10,10 @@ import UIKit
class AddReciepientViewController: UIViewController { class AddReciepientViewController: UIViewController {
struct StringConstants {
}
// MARK: IBOutlets // MARK: IBOutlets
@IBOutlet weak var firstNameTextField: UITextField! @IBOutlet weak var firstNameTextField: UITextField!
@IBOutlet weak var middleNameTextField: UITextField! @IBOutlet weak var middleNameTextField: UITextField!
@ -26,6 +30,20 @@ class AddReciepientViewController: UIViewController {
@IBOutlet weak var provienceStackView: UIStackView! @IBOutlet weak var provienceStackView: UIStackView!
@IBOutlet weak var districtStackView: UIStackView! @IBOutlet weak var districtStackView: UIStackView!
// titles
@IBOutlet weak var headerTItleLabel: UILabel!
@IBOutlet weak var firstNameTitleLabel: UILabel!
@IBOutlet weak var middleNameTitleLabel: UILabel!
@IBOutlet weak var lastNametitleLabel: UILabel!
@IBOutlet weak var countryNameTitleLabel: UILabel!
@IBOutlet weak var stateTitleLabel: UILabel!
@IBOutlet weak var districtTitleLabel: UILabel!
@IBOutlet weak var addressTitleLabel: UILabel!
@IBOutlet weak var relationTitleLabel: UILabel!
@IBOutlet weak var mobileTitleLabel: UILabel!
@IBOutlet weak var transferTitleLabel: UILabel!
// MARK: Properties // MARK: Properties
var presenter: AddReciepientModuleInterface? var presenter: AddReciepientModuleInterface?
var countries: [SendMoneyCountryViewModel]? var countries: [SendMoneyCountryViewModel]?

2
GMERemittance/Module/AutoDebit/Application Logic/Service/AutoDebitService.swift

@ -28,7 +28,7 @@ protocol FetchAccountList: ApiServiceType {
extension FetchAccountList { extension FetchAccountList {
func fetchAccountList(username: String, success: @escaping (KFTCModel?) -> (), failure: @escaping (Error) -> ()) { func fetchAccountList(username: String, success: @escaping (KFTCModel?) -> (), failure: @escaping (Error) -> ()) {
let url = "http://gmeuat.gmeremit.com:5012/api/v2/" + "kftc/GetKftcParameters/" + username
let url = "http://gmeuat.gmeremit.com:5022/api/v2/" + "kftc/GetKftcParameters/" + username
auth.request(method: .get, url: url, params: nil, encoding: URLEncoding.default, success: { (response: KftcAccountContainer) in auth.request(method: .get, url: url, params: nil, encoding: URLEncoding.default, success: { (response: KftcAccountContainer) in
if (response.errorCode ?? "") == "1" { if (response.errorCode ?? "") == "1" {

4
GMERemittance/Module/AutoDebit/User Interface/View/AutoDebitViewController.swift

@ -185,9 +185,9 @@ extension AutoDebitViewController: UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? { func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
let delete = UITableViewRowAction(style: .destructive, title: StringConstants.deleteTitleText) { (action, indexPath) in
let delete = UITableViewRowAction(style: .destructive, title: StringConstants.deleteText) { (action, indexPath) in
self.alertWithOkCancel(message: StringConstants.deleteTitleText, title: StringConstants.confirmationText, okTitle: StringConstants.deleteTitleText ,OkStyle: UIAlertActionStyle.destructive, okAction: {
self.alertWithOkCancel(message: StringConstants.deleteTitleText, title: StringConstants.confirmationText, okTitle: StringConstants.deleteText ,OkStyle: UIAlertActionStyle.destructive, okAction: {
let defaults = UserDefaults.standard let defaults = UserDefaults.standard
let myUsername = defaults.string(forKey: "com.gmeremit.username") ?? "" let myUsername = defaults.string(forKey: "com.gmeremit.username") ?? ""

Loading…
Cancel
Save