Browse Source

Japanese Language Keys Addittion, Registration Manual Validation, Terms and Condition Padding

pull/23/head
Mac 3 years ago
parent
commit
5a8a4c70cf
  1. 4
      GME Remit.xcodeproj/project.pbxproj
  2. 4
      GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift
  3. 40
      GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKyc.storyboard
  4. 8
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift
  5. 3
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
  6. 10
      GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegister.storyboard
  7. 2
      GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift
  8. 11
      GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift
  9. 4
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/View/SendMoneyParent.storyboard
  10. 2
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift
  11. 16
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard
  12. 1
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
  13. 4
      GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndCondition.storyboard
  14. 9
      GME Remit/MultiLanguages/bn.lproj/Localizable.strings
  15. 14
      GME Remit/MultiLanguages/en.lproj/Localizable.strings
  16. 29
      GME Remit/MultiLanguages/ja.lproj/Localizable.strings
  17. 9
      GME Remit/MultiLanguages/ne.lproj/Localizable.strings
  18. 10
      GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings

4
GME Remit.xcodeproj/project.pbxproj

@ -7568,7 +7568,7 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO;
@ -7609,7 +7609,7 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 30;
CURRENT_PROJECT_VERSION = 31;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO;

4
GME Remit/Modules/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift

@ -56,8 +56,8 @@ class HomeRemainingLimitTableViewCell: UITableViewCell {
}
private func configureText() {
walletBankCodeLabel.text = "JME Membership ID"
balaceTitleLabel.text = "Balance with JME"
walletBankCodeLabel.text = "jme_membership_id_text".localized()
balaceTitleLabel.text = "balance_with_jme_text".localized()
}
@objc private func getYearlyLimitNotificationName() -> Notification.Name {

40
GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKyc.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -393,13 +393,13 @@
<rect key="frame" x="110" y="8" width="203" height="116"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Front ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wP4-uJ-zT1">
<rect key="frame" x="51" y="5" width="51.5" height="18"/>
<rect key="frame" x="49.5" y="5" width="54" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Jpj-a0-JRM">
<rect key="frame" x="138" y="86" width="55" height="24"/>
<rect key="frame" x="135" y="86" width="58" height="24"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
<state key="normal" title="View Sample">
<color key="titleColor" name="ThemeBlue"/>
@ -478,13 +478,13 @@
<rect key="frame" x="110" y="8" width="203" height="116"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Back ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ctu-95-Rc0">
<rect key="frame" x="52.5" y="5" width="48.5" height="18"/>
<rect key="frame" x="50" y="5" width="53" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U0s-mL-64k">
<rect key="frame" x="138" y="86" width="55" height="24"/>
<rect key="frame" x="135" y="86" width="58" height="24"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
<state key="normal" title="View Sample">
<color key="titleColor" name="ThemeBlue"/>
@ -563,16 +563,16 @@
<rect key="frame" x="110" y="8" width="203" height="92"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="top" spacing="11" translatesAutoresizingMaskIntoConstraints="NO" id="29w-jx-D6N">
<rect key="frame" x="0.0" y="19.5" width="203" height="53"/>
<rect key="frame" x="0.0" y="20" width="203" height="52.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Side ID" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YT8-le-Q7t">
<rect key="frame" x="0.0" y="0.0" width="45.5" height="18"/>
<rect key="frame" x="0.0" y="0.0" width="49" height="17.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="15"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WTJ-BS-43g">
<rect key="frame" x="0.0" y="29" width="55" height="24"/>
<rect key="frame" x="0.0" y="28.5" width="58" height="24"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="10"/>
<state key="normal" title="View Sample">
<color key="titleColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@ -791,37 +791,37 @@
</scenes>
<designables>
<designable name="0Lm-Yp-fcs">
<size key="intrinsicContentSize" width="120" height="34"/>
<size key="intrinsicContentSize" width="124.5" height="34"/>
</designable>
<designable name="4Ht-H7-uZe">
<size key="intrinsicContentSize" width="181.5" height="34"/>
<size key="intrinsicContentSize" width="188.5" height="34"/>
</designable>
<designable name="IsM-vf-1HP">
<size key="intrinsicContentSize" width="113.5" height="34"/>
<size key="intrinsicContentSize" width="118" height="34"/>
</designable>
<designable name="JfT-uS-a2a">
<size key="intrinsicContentSize" width="134" height="34"/>
<size key="intrinsicContentSize" width="140" height="34"/>
</designable>
<designable name="SVD-OG-9os">
<size key="intrinsicContentSize" width="160.5" height="34"/>
<size key="intrinsicContentSize" width="170" height="34"/>
</designable>
<designable name="g6b-c1-elD">
<size key="intrinsicContentSize" width="77.5" height="34"/>
<size key="intrinsicContentSize" width="80" height="34"/>
</designable>
<designable name="hEr-Pf-Iwt">
<size key="intrinsicContentSize" width="70" height="34"/>
<size key="intrinsicContentSize" width="73.5" height="34"/>
</designable>
<designable name="hX6-tX-ygh">
<size key="intrinsicContentSize" width="177.5" height="34"/>
<size key="intrinsicContentSize" width="185" height="34"/>
</designable>
<designable name="kXC-Oc-efk">
<size key="intrinsicContentSize" width="124.5" height="34"/>
<size key="intrinsicContentSize" width="129" height="34"/>
</designable>
<designable name="pay-02-uVZ">
<size key="intrinsicContentSize" width="138" height="34"/>
<size key="intrinsicContentSize" width="144" height="34"/>
</designable>
<designable name="qzT-Cz-Kp8">
<size key="intrinsicContentSize" width="134" height="34"/>
<size key="intrinsicContentSize" width="140" height="34"/>
</designable>
</designables>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

8
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift

@ -19,7 +19,7 @@ class KYCVerifyStep1Presenter: ViewModelType {
var interactor: KYCVerifyStep1InteractorInput?
var wireframe: KYCVerifyStep1WireframeInput?
var addittionalBackIDRequired: Bool = false
struct Input {
let viewWillAppear: Driver<Bool>
let sendLocation: Driver<CLLocation>
@ -244,7 +244,7 @@ class KYCVerifyStep1Presenter: ViewModelType {
viewController?.alert(message: "Please Select Additional ID Type")
}
else if (viewController?.occupationTxtField.text != nil || viewController?.occupationTxtField.text != "") && (viewController?.additionalIDTextField.text != nil || viewController?.additionalIDTextField.text != "") && (viewController?.puroposeOfRegisterField.text != nil || viewController?.puroposeOfRegisterField.text != "") && (viewController?.idTypeTextField.text != nil || viewController?.idTypeTextField.text != "") && (viewController?.businessTypeTextField.text != nil || viewController?.businessTypeTextField.text != "") && (viewController?.monthlyIncomeTextField.text != nil || viewController?.monthlyIncomeTextField.text != "") && (viewController?.mobileNumberTextField.text != nil || viewController?.mobileNumberTextField.text != "") && (viewController?.addressTextField.text != nil || viewController?.addressTextField.text != "") {
else if (viewController?.occupationTxtField.text != "") && (viewController?.monthlyIncomeTextField.text != "") && (viewController?.mobileNumberTextField.text != "") && (viewController?.addressTextField.text != "") && (viewController?.businessTypeTextField.text != "") && (viewController?.puroposeOfRegisterField.text != "") && (viewController?.idTypeTextField.text != "") && (viewController?.additionalIDTextField.text != "") {
let saveModel = KYCSaveInformation(
type: Step.innerStep1.rawValue,
personalInformation: $0,
@ -271,11 +271,11 @@ class KYCVerifyStep1Presenter: ViewModelType {
viewController?.alert(message: "Please Select Another ID Front Image")
}
if $0?.isBackIDRequired == true {
if self?.addittionalBackIDRequired == true && viewController?.anotherIDBackImageButton.currentImage == defaultImage {
viewController?.alert(message: "Please Select Another ID Back Image")
}
else if (viewController?.frontIDImageButton != defaultImage) && (viewController?.backIDImageButton != defaultImage) && (viewController?.anotherIDImageButton != defaultImage) && ($0?.isBackIDRequired != true) {
else if (viewController?.frontIDImageButton.currentImage != defaultImage) && (viewController?.backIDImageButton.currentImage != defaultImage) && (viewController?.anotherIDImageButton.currentImage != defaultImage) && (self?.addittionalBackIDRequired != true){
let saveModel = KYCSaveInformation(
type: Step.innerStep2.rawValue,
personalInformation: $0,

3
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift

@ -487,6 +487,7 @@ extension KYCVerifyStep1ViewController {
self?.anotherIDBackImageButton.addBlur()
self?.hideBorder(view: self?.additionalIDContainer)
self?.anotherIdBackImageBase64.onNext(imageData)
self?.presenter.addittionalBackIDRequired = false
}
} else if let url = URL(string: imageData) {
DispatchQueue.main.async {
@ -496,6 +497,7 @@ extension KYCVerifyStep1ViewController {
switch result {
case .success(let value):
self?.anotherIdBackImageBase64.onNext(value.image.toBase64())
self?.presenter.addittionalBackIDRequired = false
case .failure(let error):
print("Job failed: \(error.localizedDescription)")
}
@ -779,6 +781,7 @@ extension KYCVerifyStep1ViewController {
output.model.drive(onNext: {[weak self] model in
guard let personalInformation = model.personalInformation else { return }
if let isBackIDRequired = model.additionalIdType?.filter({$0.id == model.personalInformation?.additionalIdType}).first?.isRequired{
self?.presenter.addittionalBackIDRequired = isBackIDRequired
self?.anotherIdBackImageBase64.onNext(isBackIDRequired ? nil : "dummy")
self?.additionalIDBackContainer.isHidden = !isBackIDRequired
}else{

10
GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegister.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Icx-Ri-Xne">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Icx-Ri-Xne">
<device id="retina4_0" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -113,19 +113,19 @@
</constraints>
</stackView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Your Information" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="8f2-5L-Ga0">
<rect key="frame" x="10" y="60" width="95" height="14.5"/>
<rect key="frame" x="10" y="60" width="95" height="14"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Documents" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="seW-FC-zhm">
<rect key="frame" x="112.5" y="60" width="95" height="14.5"/>
<rect key="frame" x="112.5" y="60" width="95" height="14"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Terms &amp; Condition" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="QiB-KO-tBu">
<rect key="frame" x="215" y="60" width="95" height="14.5"/>
<rect key="frame" x="215" y="60" width="95" height="28"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>

2
GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/View/NewRegisterViewController.swift

@ -188,6 +188,6 @@ extension NewRegisterViewController {
func setMultilanguages() {
step1TitleLabel.text = "step1_sub_title_text".localized()
step2TitleLabel.text = "documents_text".localized()
step3TitleLabel.text = "Terms & Condition"
step3TitleLabel.text = "terms_and_condition_title_text1".localized()
}
}

11
GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift

@ -40,6 +40,11 @@ class CDDIViewControllerViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
self.setup()
purposeOfRemit.placeholder = "select_transfer_reason_text".localized()
sourceOfFund.placeholder = "source_of_fund_placeholder_text".localized()
goodsOrigin.placeholder = "goods_origin_text".localized()
goodsType.placeholder = "goods_type_text".localized()
portofShipment.placeholder = "port_of_shipment_text".localized()
self.importsGoodsView.isHidden = true
}
@ -76,15 +81,15 @@ class CDDIViewControllerViewController: UIViewController {
func checkImportGoodsView() -> Bool {
if self.importsGoodsView.isHidden != true {
if goodsType.text == "" || goodsType.text?.isEmpty ?? true {
self.alert(message: "Please Enter Goods Type.")
self.alert(message: "Please \("goods_type_text".localized())")
return true
}
if goodsOrigin.text == "" || goodsOrigin.text?.isEmpty ?? true {
self.alert(message: "Please Enter Goods Origin.")
self.alert(message: "Please \("goods_origin_text".localized())")
return true
}
if portofShipment.text == "" || portofShipment.text?.isEmpty ?? true {
self.alert(message: "Please Enter Port Of Shipment")
self.alert(message: "Please \("port_of_shipment_text".localized())")
return true
} else {
return false

4
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/View/SendMoneyParent.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

2
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift

@ -55,6 +55,7 @@ class SendMoneyParentViewController: UIViewController {
let payoutModeText = "payout_mode_text".localized()
let amountDetailText = "amount_detail_text".localized()
let verificationDetailText = "verification_detail_text".localized()
let termsAndConditionLabel = "terms_and_condition_title_text1".localized()
}
// MARK: IBOutlets
@ -167,6 +168,7 @@ class SendMoneyParentViewController: UIViewController {
private func configureLanguage() {
self.exchangeRateLabel.text = StringConstants().amountDetailText
self.verificationLabel.text = StringConstants().verificationDetailText
self.termsLabel.text = StringConstants().termsAndConditionLabel
}
private func setTitle(title: String) {

16
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerification.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -32,7 +32,7 @@
<tableViewSection id="IBa-r0-InR">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="513" id="UJn-lj-WAX">
<rect key="frame" x="0.0" y="24.5" width="375" height="513"/>
<rect key="frame" x="0.0" y="28" width="375" height="513"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="UJn-lj-WAX" id="Dfu-ja-ADO">
<rect key="frame" x="0.0" y="0.0" width="375" height="513"/>
@ -511,23 +511,23 @@
<tableViewSection id="3tZ-3i-DAK">
<cells>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="180" id="sRi-FJ-7pN">
<rect key="frame" x="0.0" y="586.50000034679067" width="375" height="180"/>
<rect key="frame" x="0.0" y="597" width="375" height="180"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="sRi-FJ-7pN" id="vkR-wb-kWF">
<rect key="frame" x="0.0" y="0.0" width="375" height="180"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<stackView hidden="YES" opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" alignment="center" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="EKe-yy-ssz">
<rect key="frame" x="108.5" y="15" width="158" height="150"/>
<rect key="frame" x="104" y="15" width="167" height="150"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="I have read and agreed to " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oTZ-6l-8sY">
<rect key="frame" x="1" y="0.0" width="156.5" height="39.5"/>
<rect key="frame" x="1.5" y="0.0" width="164" height="39.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OAm-ac-A36">
<rect key="frame" x="10.5" y="55.5" width="137" height="39"/>
<rect key="frame" x="11" y="55.5" width="145" height="39"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<state key="normal" title="1. JMEUser Agreement">
<color key="titleColor" name="ThemeBlue"/>
@ -537,7 +537,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="9KS-c1-I0l">
<rect key="frame" x="0.0" y="110.5" width="158" height="39.5"/>
<rect key="frame" x="0.0" y="110.5" width="167" height="39.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="14"/>
<state key="normal" title="2. SendMN Fraud Warning">
<color key="titleColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

1
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift

@ -174,6 +174,7 @@ class SendMoneyVerificationViewController: UITableViewController {
self.exchangeRateTitleLabel.text = "exchange_rate_text".localized()
self.serviceChargeTitleLabel.text = "service_charge_text".localized()
self.payoutAgentBankTitleLabel.text = "payout_agent_text".localized()
self.accountNumTitlelabel.text = "account_text".localized()
self.recieverDetailsLabel.text = StringConstants().recieverDetails
self.transactionDetailsLabel.text = StringConstants().transactionDetails
self.readAndAgreeTextLabel.text = StringConstants().readNAgreeText

4
GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndCondition.storyboard

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19162" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19144"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>

9
GME Remit/MultiLanguages/bn.lproj/Localizable.strings

@ -904,7 +904,7 @@
"kyc_fill_text"="আপনার অ্যাকাউন্ট যাচাই করুন";
"kyc_verify_pending_text"="প্রক্রিয়া যাচাইকরণ";
"change_txn_pin"="ট্রানসাকশান পিন পরিবর্তন";
"change_txn_pin_detail"="আমরা আপনার ঠিকানায় একটি লেনদেনের পিন সহ একটি চিঠি পাঠাচ্ছি। আপনি এটি পাওয়ার পরে আপনার লেনদেনের পিনটি পরিবর্তন করতে এখানে ক্লিক করুন";
"change_txn_pin_detail"="ট্রানজেকশন পিন নম্বর পরিবর্তনের জন্য দয়া করে এখানে ক্লিক করুন";
"change_txn_pin_n_pass"="পাসওয়ার্ড এবং ট্রানসাকশান পিন পরিবর্তন";
"change_txn_pin_n_pass_detail"="আপনার লগইন পাসওয়ার্ড এবং লেনদেনের পিন পরিবর্তন করতে দয়া করে এখানে ক্লিক করুন";
@ -1333,3 +1333,10 @@
"requestedAmt_text"="পরিমান অনুরোধে";
"confirmSendingAmt_text"="নিশ্চিত প্রেরণের পরিমান";
//new addittion
"jme_membership_id_text" = "JME মেম্বার আইডি";
"balance_with_jme_text" = "JME এর সাথে ব্যালেন্স করুন";
"terms_and_condition_title_text1" = "শর্তাবলী";
"goods_origin_text" = "পন্যের উৎপত্তিস্থান প্রবেশ করান";
"goods_type_text" = "পন্যের ধরন প্রবেশ করান";
"port_of_shipment_text" = "কোন বন্দর থেকে শিপমেন্ট করা হয়েছে প্রবেশ করান";

14
GME Remit/MultiLanguages/en.lproj/Localizable.strings

@ -64,7 +64,7 @@
"kyc_fill_text" = "Verify your Account";
"kyc_verify_pending_text" = "Verification in Process";
"change_txn_pin" = "Change Transaction Pin";
"change_txn_pin_detail" = "Please click here to change your Transaction PIN.";
"change_txn_pin_detail" = "Please click here to change transaction Pin.";
"penny_test_pending_text" = "Continue the registration process";
"complete_your_registration_text" = "Kindly complete your registration process with us to start using Japan Money Express services.";
"verification_in_aproval_process_text" = "Your registration request is in approval process. You will soon be able to use Japan Money Express services.";
@ -368,7 +368,7 @@
"search_relation_text" = "Search Relation";
"no_relation_found_text" = "No relation found";
"select_transfer_reason_text" = "Select Purpose of Remit";
"search_transfer_reason_text" = "Select Purpose of Remit";
"search_transfer_reason_text" = "Search Purpose of Remit";
"no_transfer_reason_found_text" = "No transfer reason found";
"select_occupation_text" = "Select Occupation";
"search_occupation_text" = "Search Occupation";
@ -621,7 +621,7 @@
"payment_mode_text" = "Select Payment Mode";
"bank_text" = "Select Bank";
"branch_text" = "Branch";
"account_text" = "Bank Account";
"account_text" = "Bank Account Number";
"first_name_text" = "Enter First Name";
"middle_name_text" = "Enter Middle Name(Optional)";
"last_name_text" = "Enter Last Name";
@ -931,3 +931,11 @@
"saveButtonInfo_text" = "Name, Nationality, Address and Sex are stated in the personal identification document submitted here.";
"biometric_setup" = "Login Biometric Setup";
"invalidMonthlyIncome_text" = "Invalid Monthly Income";
//new addittion
"jme_membership_id_text" = "JME Membership ID";
"balance_with_jme_text" = "Balance with JME";
"terms_and_condition_title_text1" = "Terms & Condition";
"goods_origin_text" = "Enter Goods Origin";
"goods_type_text" = "Enter Goods Type";
"port_of_shipment_text" = "Enter Port of Shipment";

29
GME Remit/MultiLanguages/ja.lproj/Localizable.strings

@ -64,7 +64,7 @@
"kyc_fill_text" = "お客様のアカウントの確認";
"kyc_verify_pending_text" = "検証作業中";
"change_txn_pin" = "取引PINの変更";
"change_txn_pin_detail" = "お客様のご住所に取引PINを記載した手紙をお送りしていますので、受け取り後、こちらをクリックして、取引暗証番号を変更してください。";
"change_txn_pin_detail" = "PINを変更するためにこちらをクリックしてください。";
"penny_test_pending_text" = "Continue the registration process";
"complete_your_registration_text" = "JMEサービスのご利用を開始するために、当社への登録手続きを行ってください。";
"verification_in_aproval_process_text" = "あなたの登録申請は承認手続き中です。すぐにJMEのサービスを利用することができます。";
@ -164,7 +164,7 @@
"full_name_text" = "氏名";
"mobile_text" = "携帯電話番号";
"transaction_detail_text" = "取引内容";
"payout_country_text" = "決済国";
"payout_country_text" = "受取国";
"paying_amount_text" = "お支払い金額";
"exchange_rate_text" = "為替レート";
"service_charge_text" = "サービス料";
@ -623,10 +623,10 @@
"bank_text" = "銀行を選択";
"branch_text" = "支店";
"account_text" = "銀行口座番号";
"first_name_text" = "Enter First Name";
"middle_name_text" = "Enter Middle Name(Optional)";
"last_name_text" = "Enter Last Name";
"full_name_text" = "Full Name";
"first_name_text" = "あなたの言語で名前を入力してください。";
"middle_name_text" = "ミドルネームを入力してください。";
"last_name_text" = "あなたの言語で苗字を入力してください。";
"full_name_text" = "氏名";
"first_name_local_text" = "あなたの言語で名前を入力してください。";
"middle_name_local_text" = "あなたの言語でミドルネームを入力してください。";
"last_name_local_text" = "あなたの言語で苗字を入力してください。";
@ -647,18 +647,18 @@
"payment_mode_placeholder_text" = "支払い方法の選択";
"bank_placeholder_text" = "銀行を選択";
"branch_placeholder_text" = "支店を選択";
"account_placeholder_text" = "Enter Bank Account";
"first_name_placeholder_text" = "Enter First Name";
"account_placeholder_text" = "銀行口座番号";
"first_name_placeholder_text" = "あなたの言語で名前を入力してください。";
"middle_name_placeholder_text" = "ミドルネームを入力してください。";
"last_name_placeholder_text" = "Enter Last Name";
"full_name_placeholder_text" = "Enter Full Name";
"last_name_placeholder_text" = "あなたの言語で苗字を入力してください。";
"full_name_placeholder_text" = "あなたの言語でフルネームを入力してください。";
"first_name_local_placeholder_text" = "あなたの言語で名前を入力してください。";
"middle_name_local_placeholder_text" = "あなたの言語でミドルネームを入力してください。";
"last_name_local_placeholder_text" = "あなたの言語で苗字を入力してください。";
"full_name_local_placeholder_text" = "あなたの言語でフルネームを入力してください。";
"id_type_placeholder_text" = "IDタイプを選択";
"id_number_placeholder_text" = "ID番号を入力してください。";
"mobile_placeholder_text" = "Enter Mobile No.";
"mobile_placeholder_text" = "携帯電話番号";
"email_placeholder_text" = "Emailアドレスを入力";
"stateProvince_placeholder_text" = "県の検索";
"district_placeholder_text" = "県を選択";
@ -932,3 +932,10 @@
"saveButtonInfo_text" = "氏名、国籍、住所、性別は、ここで提出する本人確認書類に記載されています。";
"biometric_setup" = "ログインのための生体認証設定";
"invalidMonthlyIncome_text" = "無効な月収";
//new addittion
"jme_membership_id_text" = "JMEメンバーID";
"balance_with_jme_text" = "JMEとのバランス";
"terms_and_condition_title_text1" = "利用規約";
"goods_origin_text" = "原産地";
"goods_type_text" = "商品。";
"port_of_shipment_text" = "船積地。";

9
GME Remit/MultiLanguages/ne.lproj/Localizable.strings

@ -914,7 +914,7 @@
"kyc_fill_text"="तपाईको खाता प्रमाणित गर्नुहोस्";
"kyc_verify_pending_text"="प्रक्रिया प्रमाणिकरण";
"change_txn_pin"="लेनदेन पिन परिवर्तन गर्नुहोस्";
"change_txn_pin_detail"="कृपया यहाँ क्लिक गर्नुहोस् तपाईंको लेनदेन पिन परिवर्तन गर्न।";
"change_txn_pin_detail"="लेनदेन पिन परिवर्तन गर्न कृपया यहाँ क्लिक गर्नुहोस्";
"change_txn_pin_n_pass"="पासवर्ड र लेनदेन पिन परिवर्तन गर्नुहोस्";
"change_txn_pin_n_pass_detail"="तपाईंको लगईन पासवर्ड र लेनदेन पिन परिवर्तन गर्न कृपया यहाँ क्लिक गर्नुहोस्";
@ -1354,3 +1354,10 @@
"biometric_setup" = "लगइन बायोमेट्रिक सेटअप गर्नुहोस्";
"invalidMonthlyIncome_text" = "उल्लेख गरिएको मासिक आय मिलेन";
//new addittion
"jme_membership_id_text" = "JME सदस्यता आईडी";
"balance_with_jme_text" = "JME संग ब्यालेन्स";
"terms_and_condition_title_text1" = "नियम र सर्तहरु";
"goods_origin_text" = "सामानको उत्पत्ति प्रविष्ट गर्नुहोस्";
"goods_type_text" = "सामानको प्रकार प्रविष्ट गर्नुहोस्";
"port_of_shipment_text" = "ढुवानी पोर्ट प्रविष्ट गर्नुहोस्";

10
GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings

@ -907,7 +907,7 @@ Chúng tôi đang xác minh thông tin của bạn.";
"kyc_fill_text"="Xác minh tài khoản của bạn";
"kyc_verify_pending_text"="Đang xác minh";
"change_txn_pin"="Thay đổi mã PIN giao dịch";
"change_txn_pin_detail"="Chúng tôi đang gửi thư ghi thông tin mã PIN giao dịch tới địa chỉ bạn đã đăng ký. Sau khi nhận được thư, bạn vui lòng bấm vào đây để thay đổi mã PIN giao dịch";
"change_txn_pin_detail"="VUI LÒNG NHẤP VÀO ĐÂY ĐỂ THAY ĐỔI MÃ PIN GIAO DỊCH";
"change_txn_pin_n_pass"="Thay đổi mật khẩu và mã PIN giao dịch";
"change_txn_pin_n_pass_detail"="Vui lòng bấm vào đây để thay đổi Mật khẩu đăng nhập và mã PIN giao dịch";
@ -1339,3 +1339,11 @@ Chúng tôi đang xác minh thông tin của bạn.";
"agree_and_submit_text" = "Đồng ý và nộp";
"invalidMonthlyIncome_text" = "Thu nhập hàng tháng không hợp lệ";
//new addittion
"jme_membership_id_text" = "ID thành viên JME";
"balance_with_jme_text" = "Số dư tại JME";
"terms_and_condition_title_text1" = "Điều khoản & Điều kiện";
"goods_origin_text" = "NHẬP XUẤT XỨ HÀNG HÓA";
"goods_type_text" = "NHẬP LOẠI HÀNG HÓA";
"port_of_shipment_text" = "NHẬP CẢNG GỬI HÀNG";
Loading…
Cancel
Save