Skip to content

update SDK function and parameter names #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ramazanoz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

update SDK function and parameter names #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8093dce
update SDK function and parameter names
ramazanoz Jul 21, 2022
4a37e37
resolve an issue while sending stored parameters to the services
ramazanoz Jul 28, 2022
8a33c79
resolve payment issue
ramazanoz Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions FrameworkTest/FrameworkTest.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
564C3B8B25BAE97600196325 /* Test-Configs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 564C3B8A25BAE97600196325 /* Test-Configs.plist */; };
564C3B9125BB290800196325 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 564C3B9025BB290700196325 /* String+Extension.swift */; };
564C3BEB25BEEF8500196325 /* Dev-Configs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 564C3BEA25BEEF8500196325 /* Dev-Configs.plist */; };
564C3BEE25BEEF8E00196325 /* Pilot-Configs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 564C3BED25BEEF8E00196325 /* Pilot-Configs.plist */; };
564C3BF025BEEF9300196325 /* Prod-Configs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 564C3BEF25BEEF9300196325 /* Prod-Configs.plist */; };
Expand Down Expand Up @@ -54,7 +53,6 @@
563DC67E2506323F00E77893 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Main.strings; sourceTree = "<group>"; };
563DC67F2506323F00E77893 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
564C3B8A25BAE97600196325 /* Test-Configs.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Test-Configs.plist"; sourceTree = "<group>"; };
564C3B9025BB290700196325 /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
564C3BEA25BEEF8500196325 /* Dev-Configs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Dev-Configs.plist"; sourceTree = "<group>"; };
564C3BED25BEEF8E00196325 /* Pilot-Configs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Pilot-Configs.plist"; sourceTree = "<group>"; };
564C3BEF25BEEF9300196325 /* Prod-Configs.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Prod-Configs.plist"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -148,7 +146,6 @@
564C3B8A25BAE97600196325 /* Test-Configs.plist */,
564C3BED25BEEF8E00196325 /* Pilot-Configs.plist */,
564C3BEF25BEEF9300196325 /* Prod-Configs.plist */,
564C3B9025BB290700196325 /* String+Extension.swift */,
5665CD3225F0FD5100491280 /* PlistManager.swift */,
);
path = FrameworkTest;
Expand Down Expand Up @@ -359,7 +356,6 @@
files = (
5665CD0B25F0CA6500491280 /* SelectEnvironmentViewController.swift in Sources */,
5690662B2500CDCC00BB5604 /* ViewController.swift in Sources */,
564C3B9125BB290800196325 /* String+Extension.swift in Sources */,
5665CD3325F0FD5100491280 /* PlistManager.swift in Sources */,
564C3C0525C0054700196325 /* ConfigViewController.swift in Sources */,
564C3C1A25C0390100196325 /* ConfigCommonViewController.swift in Sources */,
Expand Down
153 changes: 85 additions & 68 deletions FrameworkTest/FrameworkTest/Base.lproj/Main.storyboard
View file
Open in desktop

Large diffs are not rendered by default.

27 changes: 16 additions & 11 deletions FrameworkTest/FrameworkTest/ConfigCommonViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ class ConfigCommonViewController: UIViewController {
@IBOutlet weak var authTokenTxtField: UITextField!
@IBOutlet weak var walletTokenTxtField: UITextField!
@IBOutlet weak var referenceNumberTxtField: UITextField!
@IBOutlet weak var appTokenTxtField: UITextField!

var lastSelectedApiType:APIType?{
@IBOutlet weak var walletAppTokenTxtField: UITextField!
@IBOutlet weak var obfuscationKeyTxtField: UITextField!

var lastSelectedApiType:Environment?{
get{
let apiType = userDefaults.object(forKey: "lastSelectedApiType") as? Int
return APIType(rawValue: apiType ?? 3)
let environment = userDefaults.object(forKey: "lastSelectedApiType") as? Int
return Environment(rawValue: environment ?? 3)
}
set{
userDefaults.set(newValue?.rawValue, forKey: "lastSelectedApiType")
Expand All @@ -29,7 +30,7 @@ class ConfigCommonViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()

let tempDict = getConfirmPaymentDict(apiType: self.lastSelectedApiType!)
let tempDict = getConfirmPaymentDict(environment: self.lastSelectedApiType!)

if let dict = tempDict{

Expand All @@ -39,7 +40,9 @@ class ConfigCommonViewController: UIViewController {

self.referenceNumberTxtField.text = dict["referenceNumber"] as? String

self.appTokenTxtField.text = dict["appToken"] as? String
self.walletAppTokenTxtField.text = dict["walletAppToken"] as? String

self.obfuscationKeyTxtField.text = dict["obfuscationKey"] as? String

}
}
Expand All @@ -59,9 +62,9 @@ class ConfigCommonViewController: UIViewController {

extension ConfigCommonViewController{

func getConfirmPaymentDict(apiType:APIType) -> [String:AnyObject]?{
func getConfirmPaymentDict(environment:Environment) -> [String:AnyObject]?{

if let plistDict = getPlist(apiType: apiType){
if let plistDict = getPlist(environment: environment){

let paymentConfirmDict = plistDict

Expand Down Expand Up @@ -89,8 +92,10 @@ extension ConfigCommonViewController{

tempDict["referenceNumber"] = referenceNumberTxtField.text

tempDict["appToken"] = appTokenTxtField.text

tempDict["walletAppToken"] = walletAppTokenTxtField.text

tempDict["obfuscationKey"] = obfuscationKeyTxtField.text

tempDict.write(toFile: returnValues.url.path, atomically: true)

}
Expand Down
62 changes: 31 additions & 31 deletions FrameworkTest/FrameworkTest/ConfigViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ import Multipay
class ConfigViewController: UIViewController {

@IBOutlet weak var requestIdTxtField: UITextField!
@IBOutlet weak var saltKeyTxtField: UITextField!
@IBOutlet weak var productIdTxtField: UITextField!
@IBOutlet weak var amountTxtField: UITextField!
@IBOutlet weak var transferRefNumTxtField: UITextField!
@IBOutlet weak var terminalRefNumTxtField: UITextField!
@IBOutlet weak var merchantRefNumTxtField: UITextField!
@IBOutlet weak var paymentAppTokenTxtField: UITextField!

var lastSelectedApiType:APIType?{
@IBOutlet weak var paymentwalletAppTokenTxtField: UITextField!
@IBOutlet weak var signTxtField: UITextField!

var lastSelectedApiType:Environment?{
get{
let apiType = userDefaults.object(forKey: "lastSelectedApiType") as? Int
return APIType(rawValue: apiType ?? 3)
let environment = userDefaults.object(forKey: "lastSelectedApiType") as? Int
return Environment(rawValue: environment ?? 3)
}
set{
userDefaults.set(newValue?.rawValue, forKey: "lastSelectedApiType")
Expand All @@ -33,13 +33,11 @@ class ConfigViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()

let confirmPayDict = getConfirmPaymentDict(apiType: self.lastSelectedApiType!)
let confirmPayDict = getConfirmPaymentDict(environment: self.lastSelectedApiType!)

if let dict = confirmPayDict{

self.saltKeyTxtField.text = dict["saltKeyTest"] as? String

self.paymentAppTokenTxtField.text = dict["paymentAppTokenTest"] as? String

self.paymentwalletAppTokenTxtField.text = dict["paymentAppTokenTest"] as? String

self.merchantRefNumTxtField.text = dict["merchantReferenceNumberTest"] as? String

Expand All @@ -52,6 +50,8 @@ class ConfigViewController: UIViewController {
self.amountTxtField.text = dict["amount"] as? String ?? "100TRY"

self.requestIdTxtField.text = dict["requestId"] as? String

self.signTxtField.text = dict["sign"] as? String
}

// Do any additional setup after loading the view.
Expand All @@ -77,9 +77,9 @@ class ConfigViewController: UIViewController {

extension ConfigViewController{

func getConfirmPaymentDict(apiType:APIType) -> [String:AnyObject]?{
func getConfirmPaymentDict(environment:Environment) -> [String:AnyObject]?{

if let plistDict = getPlist(apiType: apiType){
if let plistDict = getPlist(environment: environment){

let paymentConfirmDict = plistDict["ConfirmPayment"]

Expand All @@ -100,24 +100,24 @@ extension ConfigViewController{
let plistDict = tempDict?["ConfirmPayment"] as? NSMutableDictionary

if let plistDict = plistDict{
plistDict["saltKeyTest"] = saltKeyTxtField.text
plistDict["productIdTest"] = productIdTxtField.text
plistDict["transferReferenceNumberTest"] = transferRefNumTxtField.text
plistDict["terminalReferenceNumberTest"] = terminalRefNumTxtField.text
plistDict["merchantReferenceNumberTest"] = merchantRefNumTxtField.text
plistDict["paymentAppTokenTest"] = paymentAppTokenTxtField.text
plistDict["amount"] = amountTxtField.text
plistDict["requestId"] = self.requestIdTxtField.text
tempDict?["ConfirmPayment"] = plistDict

plistDict["productIdTest"] = productIdTxtField.text

plistDict["transferReferenceNumberTest"] = transferRefNumTxtField.text

plistDict["terminalReferenceNumberTest"] = terminalRefNumTxtField.text

plistDict["merchantReferenceNumberTest"] = merchantRefNumTxtField.text

plistDict["paymentAppTokenTest"] = paymentwalletAppTokenTxtField.text

plistDict["amount"] = amountTxtField.text

plistDict["requestId"] = self.requestIdTxtField.text

plistDict["sign"] = self.signTxtField.text

tempDict?["ConfirmPayment"] = plistDict
}

tempDict?.write(toFile: returnValues.url.path, atomically: true)
Expand Down
14 changes: 7 additions & 7 deletions FrameworkTest/FrameworkTest/PlistManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
import Foundation
import Multipay

func getPlist(apiType:APIType) -> [String:AnyObject]?
func getPlist(environment:Environment) -> [String:AnyObject]?
{

var apiFileNameStart = ""

switch apiType {
switch environment {
case .dev:
apiFileNameStart = "Dev"
break
Expand All @@ -24,7 +24,7 @@ func getPlist(apiType:APIType) -> [String:AnyObject]?
case .pilot:
apiFileNameStart = "Pilot"
break
case .prod:
case .production:
apiFileNameStart = "Prod"
break
}
Expand Down Expand Up @@ -53,14 +53,14 @@ func getPlist(apiType:APIType) -> [String:AnyObject]?
return nil
}

func getMutableDictionaryFromPlist(lastSelectedApiType:APIType) -> (mutDict: NSMutableDictionary?, url: URL)
func getMutableDictionaryFromPlist(lastSelectedApiType:Environment) -> (mutDict: NSMutableDictionary?, url: URL)
{

let apiType:APIType = lastSelectedApiType
let environment:Environment = lastSelectedApiType

var apiFileNameStart = ""

switch apiType {
switch environment {
case .dev:
apiFileNameStart = "Dev"
break
Expand All @@ -70,7 +70,7 @@ func getMutableDictionaryFromPlist(lastSelectedApiType:APIType) -> (mutDict: NSM
case .pilot:
apiFileNameStart = "Pilot"
break
case .prod:
case .production:
apiFileNameStart = "Prod"
break
}
Expand Down
35 changes: 17 additions & 18 deletions FrameworkTest/FrameworkTest/ReversalViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ import Multipay
class ReversalConfigViewController: UIViewController {

@IBOutlet weak var requestIdTxtField: UITextField!

@IBOutlet weak var saltKeyTxtField: UITextField!


@IBOutlet weak var terminalRefNumTxtField: UITextField!

@IBOutlet weak var merchantRefNumTxtField: UITextField!

@IBOutlet weak var paymentAppTokenTxtField: UITextField!
@IBOutlet weak var paymentwalletAppTokenTxtField: UITextField!

var lastSelectedApiType:APIType?{
@IBOutlet weak var signTxtField: UITextField!

var lastSelectedApiType:Environment?{
get{
let apiType = userDefaults.object(forKey: "lastSelectedApiType") as? Int
return APIType(rawValue: apiType ?? 3)
let environment = userDefaults.object(forKey: "lastSelectedApiType") as? Int
return Environment(rawValue: environment ?? 3)
}
set{
userDefaults.set(newValue?.rawValue, forKey: "lastSelectedApiType")
Expand All @@ -34,20 +34,19 @@ class ReversalConfigViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()

let confirmPayDict = getRollbackPaymentDict(apiType: self.lastSelectedApiType!)
let confirmPayDict = getRollbackPaymentDict(environment: self.lastSelectedApiType!)

if let dict = confirmPayDict{

self.paymentAppTokenTxtField.text = dict["paymentAppTokenTest"] as? String
self.paymentwalletAppTokenTxtField.text = dict["paymentAppTokenTest"] as? String

self.requestIdTxtField.text = dict["requestId"] as? String

self.saltKeyTxtField.text = dict["saltKeyTest"] as? String


self.merchantRefNumTxtField.text = dict["merchantReferenceNumberTest"] as? String

self.terminalRefNumTxtField.text = dict["terminalReferenceNumberTest"] as? String

self.signTxtField.text = dict["sign"] as? String
}
// Do any additional setup after loading the view.
}
Expand All @@ -67,9 +66,9 @@ class ReversalConfigViewController: UIViewController {

extension ReversalConfigViewController{

func getRollbackPaymentDict(apiType:APIType) -> [String:AnyObject]?{
func getRollbackPaymentDict(environment:Environment) -> [String:AnyObject]?{

if let plistDict = getPlist(apiType: apiType){
if let plistDict = getPlist(environment: environment){

let paymentConfirmDict = plistDict["RollbackPayment"]

Expand All @@ -90,17 +89,17 @@ extension ReversalConfigViewController{
let plistDict = tempDict?["RollbackPayment"] as? NSMutableDictionary

if let plistDict = plistDict{

plistDict["saltKeyTest"] = saltKeyTxtField.text


plistDict["terminalReferenceNumberTest"] = terminalRefNumTxtField.text

plistDict["merchantReferenceNumberTest"] = merchantRefNumTxtField.text

plistDict["paymentAppTokenTest"] = paymentAppTokenTxtField.text
plistDict["paymentAppTokenTest"] = paymentwalletAppTokenTxtField.text

plistDict["requestId"] = self.requestIdTxtField.text

plistDict["sign"] = self.signTxtField.text

tempDict?["RollbackPayment"] = plistDict
}

Expand Down
12 changes: 6 additions & 6 deletions FrameworkTest/FrameworkTest/SelectEnvironment/SelectEnvironmentViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,28 @@ class SelectEnvironmentViewController: UIViewController {
// Do any additional setup after loading the view.
}

func openOtherScreen(apiType:APIType){
func openOtherScreen(environment:Environment){

let storyboard = UIStoryboard(name: "Main", bundle: nil)

let vc = storyboard.instantiateViewController(withIdentifier: "MainTestViewController") as! ViewController

vc.lastSelectedApiType = apiType
vc.lastSelectedApiType = environment

self.navigationController?.pushViewController(vc, animated: true)
}

@IBAction func useDevEnvironmentClicked(_ sender: Any) {
openOtherScreen(apiType: .dev)
openOtherScreen(environment: .dev)
}
@IBAction func useTestEnvironmentClicked(_ sender: Any) {
openOtherScreen(apiType: .test)
openOtherScreen(environment: .test)
}
@IBAction func usePilotEnvClicked(_ sender: Any) {
openOtherScreen(apiType: .pilot)
openOtherScreen(environment: .pilot)
}
@IBAction func useProdEnvClicked(_ sender: Any) {
openOtherScreen(apiType: .prod)
openOtherScreen(environment: .production)
}

}
24 changes: 0 additions & 24 deletions FrameworkTest/FrameworkTest/String+Extension.swift
View file
Open in desktop

This file was deleted.

Loading