IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

bug fies

v0.17
stepie.ub 1 year ago
parent
ee7447d5dd
commit
1b34631e81
15 changed files with 75 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      GME Remit.xcodeproj/project.pbxproj
  2. 30
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
  3. 25
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryTableViewCell.swift
  4. 7
      GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/Recipient.swift
  5. 1
      GME Remit/Modules/RecipientModules/Recipients/User Interface/Wireframe/RecipientsWireframe.swift
  6. 2
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
  7. 5
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift
  8. 3
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift
  9. 2
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
  10. 1
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
  11. 2
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/Wireframe/SendMoneyReceiptWireframe.swift
  12. 6
      GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift
  13. 1
      GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift
  14. 7
      GME Remit/Supported Files/Info.plist

8
GME Remit.xcodeproj/project.pbxproj
View File

@ -8916,7 +8916,7 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 12;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO;
@ -8926,6 +8926,7 @@
"$(PROJECT_DIR)",
);
INFOPLIST_FILE = "GME Remit/Supported Files/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "JME Remit";
IPHONEOS_DEPLOYMENT_TARGET = 13.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@ -8961,10 +8962,12 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit/GME RemitRelease.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 11;
CURRENT_PROJECT_VERSION = 12;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO;
EXCLUDED_ARCHS = "";
"EXCLUDED_ARCHS[sdk=*]" = arm64;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
@ -8972,6 +8975,7 @@
);
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = "GME Remit/Supported Files/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "JME Remit";
IPHONEOS_DEPLOYMENT_TARGET = 13.6;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",

30
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
View File

@ -22,7 +22,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="700"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Msg-ak-twI">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Msg-ak-twI">
<rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
@ -53,36 +53,36 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDM-LN-544">
<rect key="frame" x="0.0" y="0.0" width="309" height="195"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="DHQ-Um-OF3">
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="DHQ-Um-OF3">
<rect key="frame" x="16" y="16" width="293" height="163"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bank_deposit" translatesAutoresizingMaskIntoConstraints="NO" id="hqc-cx-rzh">
<rect key="frame" x="0.0" y="61.5" width="40" height="40"/>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_koreaBank" translatesAutoresizingMaskIntoConstraints="NO" id="hqc-cx-rzh">
<rect key="frame" x="0.0" y="67.5" width="28" height="28"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="2AX-wg-DHd"/>
<constraint firstAttribute="width" constant="40" id="jBV-OA-jx3"/>
<constraint firstAttribute="height" constant="28" id="2AX-wg-DHd"/>
<constraint firstAttribute="width" constant="28" id="jBV-OA-jx3"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Cnn-41-XDg">
<rect key="frame" x="48" y="52.5" width="205" height="58"/>
<rect key="frame" x="40" y="52.5" width="209" height="58"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="IME Pay Mobile Wallet" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ae7-L0-gY3">
<rect key="frame" x="0.0" y="0.0" width="205" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="209" height="17"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Lh7-U6-fWO">
<rect key="frame" x="0.0" y="25" width="205" height="33"/>
<rect key="frame" x="0.0" y="25" width="209" height="33"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9uL-wQ-mZd">
<rect key="frame" x="0.0" y="0.0" width="205" height="14.5"/>
<rect key="frame" x="0.0" y="0.0" width="209" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jsp-NN-jLM">
<rect key="frame" x="0.0" y="18.5" width="205" height="14.5"/>
<rect key="frame" x="0.0" y="18.5" width="209" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
@ -92,10 +92,10 @@
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sb6-dg-9Kc">
<rect key="frame" x="261" y="65.5" width="32" height="32"/>
<rect key="frame" x="261" y="61.5" width="32" height="40"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="gJS-vx-kSM"/>
<constraint firstAttribute="height" constant="32" id="wDK-0a-BFM"/>
<constraint firstAttribute="height" constant="40" id="wDK-0a-BFM"/>
</constraints>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" image="ic_delete3"/>
@ -130,6 +130,7 @@
<outlet property="AcBranchLabel" destination="jsp-NN-jLM" id="xDJ-Y2-c78"/>
<outlet property="AcNumberLabel" destination="9uL-wQ-mZd" id="Pks-mP-OJX"/>
<outlet property="deleteButtonOutlet" destination="sb6-dg-9Kc" id="eib-yA-E3c"/>
<outlet property="iconImageView" destination="hqc-cx-rzh" id="0Fp-qj-lDg"/>
<outlet property="indicatorButton" destination="g1X-nk-DT1" id="4vj-vA-Y9D"/>
<outlet property="localizedNameLabel" destination="Ae7-L0-gY3" id="Ksl-Xn-apk"/>
<outlet property="walletInfoView" destination="ZDM-LN-544" id="QlL-Ah-8f5"/>
@ -184,6 +185,7 @@
<constraint firstItem="93B-7y-U8z" firstAttribute="trailing" secondItem="nhb-o1-ekZ" secondAttribute="trailing" id="QOl-bd-eHQ"/>
<constraint firstItem="93B-7y-U8z" firstAttribute="bottom" secondItem="ezs-Qx-vNy" secondAttribute="bottom" constant="16" id="UeP-W0-z47"/>
<constraint firstItem="Msg-ak-twI" firstAttribute="trailing" secondItem="93B-7y-U8z" secondAttribute="trailing" id="baj-pm-Nbw"/>
<constraint firstAttribute="bottom" secondItem="Msg-ak-twI" secondAttribute="bottom" constant="644" id="i0X-2r-DjU"/>
<constraint firstItem="93B-7y-U8z" firstAttribute="trailing" secondItem="ezs-Qx-vNy" secondAttribute="trailing" constant="16" id="jRp-Ch-od6"/>
<constraint firstItem="nhb-o1-ekZ" firstAttribute="leading" secondItem="93B-7y-U8z" secondAttribute="leading" id="o9y-fh-flB"/>
<constraint firstItem="ezs-Qx-vNy" firstAttribute="leading" secondItem="93B-7y-U8z" secondAttribute="leading" constant="16" id="qPG-ua-QWk"/>
@ -204,9 +206,9 @@
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<resources>
<image name="arrow.forward" catalog="system" width="128" height="95"/>
<image name="bank_deposit" width="54" height="54"/>
<image name="circle" catalog="system" width="128" height="123"/>
<image name="ic_delete3" width="24" height="24"/>
<image name="ic_koreaBank" width="50" height="33"/>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>

25
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryTableViewCell.swift
View File

@ -4,7 +4,7 @@ import UIKit
class BeneficiaryTableViewCell: UITableViewCell {
var info: PaymentMethodModel?
// var info: PaymentMethodModel?
@IBOutlet weak var indicatorButton: UIButton!
@IBOutlet weak var walletInfoView: UIView!
@ -13,6 +13,7 @@ class BeneficiaryTableViewCell: UITableViewCell {
@IBOutlet weak var localizedNameLabel: UILabel!
@IBOutlet weak var deleteButtonOutlet: UIButton!
@IBOutlet weak var iconImageView: UIImageView!
static var identifier: String {
return String(describing: self)
}
@ -30,6 +31,25 @@ class BeneficiaryTableViewCell: UITableViewCell {
deleteButtonOutlet.setTitle("", for: .normal)
walletInfoView.set(cornerRadius: 10)
walletInfoView.backgroundColor = .lightBlueColor
}
func setIconImageView(info: PaymentMethodModel?) {
switch (info?.id ?? "1") {
case "1":
iconImageView.image = UIImage(named: "cash_payment")?.tint(with: UIColor.themeText)
case "2":
iconImageView.image = UIImage(named: "bank_deposit")?.tint(with: UIColor.themeText)
case "12":
iconImageView.image = #imageLiteral(resourceName: "ic_homeDelivery")
case "13":
iconImageView.image = UIImage(named: "jme_wallet")?.tint(with: UIColor.themeText)
case "14":
iconImageView.image = UIImage(named: "ic_card_payment")?.tint(with: UIColor.themeText)
default: iconImageView.image = UIImage(named: "bank_deposit")?.tint(with: UIColor.themeText)
}
}
override func setSelected(_ selected: Bool, animated: Bool) {
@ -42,6 +62,9 @@ class BeneficiaryTableViewCell: UITableViewCell {
}
func commonSetup(_ info: PaymentMethodModel?) {
setIconImageView(info: info)
localizedNameLabel.text = info?.agent?.localizedName
if let accountNo = info?.agent?.accountNumber {

7
GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/Recipient.swift
View File

@ -84,7 +84,10 @@ struct Recipient: Mappable {
city: String?,
email: String?,
mobile: String?,
idNumber: String?
idNumber: String?,
payoutPartner: String?,
agent: AgentModel?
) {
self.firstName = firstName
self.middleName = middleName
@ -102,6 +105,8 @@ struct Recipient: Mappable {
self.email = email
self.mobile = mobile
self.idNumber = idNumber
self.payoutPartner = payoutPartner
self.agent = agent
}
mutating func mapping(map: Map) {

1
GME Remit/Modules/RecipientModules/Recipients/User Interface/Wireframe/RecipientsWireframe.swift
View File

@ -90,7 +90,6 @@ extension RecipientsWireframe: RecipientsWireframeInput {
func open(on viewController: UIViewController?) {
let vc = getMainView()
let naviVC = UINavigationController(rootViewController: vc)
viewController?.present(naviVC, animated: true)
}

2
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift
View File

@ -583,7 +583,7 @@ extension SetupRecipientViewController {
output.selectedNativeCountry.drive(onNext: { [weak self] in guard let `self` = self else { return }
guard let country = $0 else { return }
if self.receiver?.nativeCountry == "" || self.receiver?.nativeCountry == nil {
if self.receiver?.paymentMethod?.nativeCountry == "" || self.receiver?.paymentMethod?.nativeCountry == nil {
if self.setnativeCountryFirst == true {
self.setnativeCountryFirst = false
} else {

5
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift
View File

@ -204,6 +204,8 @@ class SetupRecipientViewModel: ViewModelType {
recipient.countryID = selectedCountry?.countryId
recipient.countryCode = selectedCountry?.countryCode
recipient.payoutPartner = self.payoutPartner ?? ""
recipient.paymentMethod?.id = selectedPaymentMode?.id
recipient.paymentMethod?.name = selectedPaymentMode?.type
recipient.paymentMethod?.localizedName = selectedPaymentMode?.subtitle
@ -213,6 +215,7 @@ class SetupRecipientViewModel: ViewModelType {
recipient.agent = selectedBank?.toAgentModel()
}
recipient.agent?.accountNumber = $0.agent?.accountNumber
recipient.agent?.branch = selectedBranch?.toBranchModel()
@ -343,7 +346,7 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface {
let selectedDistrict = selectedStateProvince?.districts?.filter({$0.id == recipient.districtID}).first
// let selectedRelation = model.relations?.filter({$0.title == recipient.relationshipID}).first
// let selectedReason = model.transferReasons?.filter({$0.title == recipient.purposeOfRemitID}).first
let selectedNativeCountry = nativeCountires.filter({$0.text == recipient.nativeCountry}).first
let selectedNativeCountry = nativeCountires.filter({$0.text == recipient.paymentMethod?.nativeCountry}).first
let selbank = recipient.paymentMethod?.agent
let toBranch = SendMoneyBankBranch(id: selbank?.branch?.id ?? "", name: selbank?.branch?.name ?? "", code: selbank?.branch?.code ?? "", localizedName: selbank?.branch?.localizedName ?? "")

3
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/Wireframe/SetupRecipientWireframe.swift
View File

@ -78,7 +78,10 @@ extension SetupRecipientWireframe: SetupRecipientWireframeInput {
)
navigationController.hero.isEnabled = true
navigationController.modalPresentationStyle = .overFullScreen
// base.navigationController.push(getMainView(), animated: true)
base.present(navigationController, animated: true)
}

2
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
View File

@ -720,7 +720,7 @@ notices to get JME Number for this transfer.</string>
<placeholder placeholderIdentifier="IBFirstResponder" id="b3B-PU-UlH" userLabel="First Responder" sceneMemberID="firstResponder"/>
<tapGestureRecognizer id="Nbz-kB-4Hj"/>
</objects>
<point key="canvasLocation" x="-1201" y="256"/>
<point key="canvasLocation" x="-1202.1739130434783" y="255.97826086956525"/>
</scene>
</scenes>
<color key="tintColor" red="0.78177064659999995" green="0.55228364470000002" blue="0.018981300289999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

1
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
View File

@ -182,6 +182,7 @@ class SendMoneyReceiptViewController: UIViewController {
// MARK: IBActions
@IBAction func done(_ sender: UIButton) {
NotificationCenter.default.post(name: Notification.Name("RefreshTransactionData"), object: nil)
if self.receiptParent == .report {
self.navigationController?.popViewController(animated: true)
} else {

2
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/Wireframe/SendMoneyReceiptWireframe.swift
View File

@ -47,7 +47,7 @@ extension SendMoneyReceiptWireframe: SendMoneyReceiptWireframeInput {
func openReciept(
type: ReceiptType = ReceiptType.overseas,
parent: ReceiptParent = ReceiptParent.report,
parent: ReceiptParent = ReceiptParent.sendMoney,
transactionId: String,
source: UINavigationController
) {

6
GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift
View File

@ -108,7 +108,7 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput {
let senderId = GMEDB.shared.user.string(.senderId)
var receiverID = ""
if fromBeneficiaryDetail {
receiverID = paymentModel?.receiverId ?? ""
receiverID = paymentModel?.receiverId ?? reciepient.receiverID ?? ""
} else {
receiverID = reciepient.receiverID ?? ""
}
@ -120,7 +120,7 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput {
"ReceiverId": receiverID,
"DeliveryMethodId": paymentModel?.id ?? "",
"PBranch": model.branch?.id ?? "",
"PAgent": paymentModel?.agent?.id ?? "",
"PAgent": paymentModel?.agent?.id ?? reciepient.agent?.id ?? "",
"PaymentType": "wallet",
"PCurr": paymentModel?.currency?.first ?? "",
"CollCurr": "JPY",
@ -146,7 +146,7 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput {
"RLocation": "",
"TpExRate": "",
"TpPCurr": "",
"PayOutPartner": reciepient.payoutPartner ?? "",
"PayOutPartner": reciepient.payoutPartner ?? reciepient.paymentMethod?.payoutPartner ?? "",
"IsAgreed": "TRUE",
"TxnPassword": model.transactionPassword ?? "",
"ReceiverAccountNo": paymentModel?.agent?.accountNumber ?? "",

1
GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift
View File

@ -244,6 +244,7 @@ extension TermsAndConditionViewController: TermsAndConditionViewInterface {
okTitle: "OK"
) {
if let id = model?.id {
self.presenter?.openReciept(transactionId: id)
} else {
self.alert(type: .error, message: "No Transaction received.")

7
GME Remit/Supported Files/Info.plist
View File

@ -133,6 +133,13 @@ Turning on location service allows us to show you nearby JME's branches.</string
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
<key>UIViewControllerBasedStatusBarAppearance</key>

Write Preview
Loading…
Cancel
Save