Merge pull request #24 from payfort/Release-feature

Release feature

SampleApp/Podfile

@@ -16,3 +16,13 @@ target 'SampleApp' do
   end
 
 end
+
+post_install do |installer|
+      installer.pods_project.targets.each do |target|
+        if ['PayFortSDK'].include? target.name
+          target.build_configurations.each do |config|
+              config.build_settings['BUILD_LIBRARY_FOR_DISTRIBUTION'] = 'YES'
+          end
+        end
+      end
+    end

SampleApp/Podfile.lock

@@ -0,0 +1,27 @@
+PODS:
+  - IQKeyboardManagerSwift (6.5.16)
+  - MBProgressHUD (1.2.0)
+  - PayFortSDK (3.2.0)
+
+DEPENDENCIES:
+  - IQKeyboardManagerSwift
+  - MBProgressHUD
+  - PayFortSDK (from `/Users/cetozgen/gitprivaterepos/fort-ios-sdk-localtest/`)
+
+SPEC REPOS:
+  trunk:
+    - IQKeyboardManagerSwift
+    - MBProgressHUD
+
+EXTERNAL SOURCES:
+  PayFortSDK:
+    :path: "/Users/cetozgen/gitprivaterepos/fort-ios-sdk-localtest/"
+
+SPEC CHECKSUMS:
+  IQKeyboardManagerSwift: 12d89768845bb77b55cc092ecc2b1f9370f06b76
+  MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
+  PayFortSDK: 92d7df56734bd520241250ebc9b93987782b33b9
+
+PODFILE CHECKSUM: 8037295a3735c99e78f5a1b1d37cac6edcee2814
+
+COCOAPODS: 1.14.3

SampleApp/SampleApp.xcodeproj/xcshareddata/xcschemes/SampleApp.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1220"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

SampleApp/SampleApp.xcodeproj/xcuserdata/cetozgen.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>SampleApp.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>3</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

SampleApp/SampleApp/AppDelegate.swift

@@ -16,8 +16,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
-        IQKeyboardManager.shared.enable = true
         GlobalClass.setDefualtValueToUserDefaults()
+        IQKeyboardManager.shared.enable = true
 
         return true
     }

SampleApp/SampleApp/Common/GlobalClass.swift

@@ -18,7 +18,6 @@ enum UserDefaultsKeys: String, CaseIterable {
     case countryCode
     case grandTotal
     case currencyCode
-
 }
 
 class GlobalClass: NSObject {
@@ -61,8 +60,7 @@ class GlobalClass: NSObject {
             GlobalClass.setUserDefaults(key: UserDefaultsKeys.currencyCode.rawValue, value: "USD")
         }
     }
-
-
+
     static func returnParamsArray() -> [ExtraParam] {
         var arr : [ExtraParam] = []
 

SampleApp/SampleApp/Common/TableViewDataSource.swift

@@ -32,7 +32,7 @@ class TableViewDataSource<CellType, Model>: NSObject, UITableViewDataSource wher
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         guard let cell = tableView.dequeueReusableCell(withIdentifier: self.cellIdenitfier, for: indexPath) as? CellType else {
-            fatalError("cell not found")
+            fatalError("weather cell not found")
         }
 
         let vm = items[indexPath.row]

SampleApp/SampleApp/Controllers/Main/CustomCardViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 import PayFortSDK
-import MBProgressHUD
+//import MBProgressHUD
 
 class CustomCardViewController: UIViewController {
 
@@ -37,7 +37,7 @@ class CustomCardViewController: UIViewController {
         let builder = PayComponents(cardNumberView: cardNumberView, expiryDateView: expiryDateView, cvcNumberView: cvcNumberView, holderNameView: holderNameView, rememberMe: saveCardSwitch.isOn, language: "ar")
 
         payButton.setup(with: request, enviroment: enviroment, payButtonBuilder: builder, viewController: self) {
-            MBProgressHUD.showAdded(to: self.view, animated: true)
+            //MBProgressHUD.showAdded(to: self.view, animated: true)
         } success: { (requestDic, responeDic) in
             print("--success--")
             print("--requestDic--\(requestDic)")
@@ -58,7 +58,7 @@ class CustomCardViewController: UIViewController {
     }
 
     func hide(response: [String:String]) {
-            MBProgressHUD.hide(for: self.view, animated: true)
+            //MBProgressHUD.hide(for: self.view, animated: true)
             GlobalClass.openResponseViewController(from: self, response: response)
     }
 }

SampleApp/SampleApp/Controllers/Main/DirectPayViewController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 import PayFortSDK
-import MBProgressHUD
+//import MBProgressHUD
 
 class DirectPayViewController: UIViewController {
 
@@ -26,7 +26,7 @@ class DirectPayViewController: UIViewController {
         super.viewDidLoad()
 
         directPayButton.setup(with: request, enviroment: enviroment, viewController: self) {
-            MBProgressHUD.showAdded(to: self.view, animated: true)
+            //MBProgressHUD.showAdded(to: self.view, animated: true)
         } success: { (requestDic, responeDic) in
             print("--success--")
             print("--requestDic--\(requestDic)")
@@ -43,9 +43,30 @@ class DirectPayViewController: UIViewController {
 
 
     func hide(response: [String:String]) {
-            MBProgressHUD.hide(for: self.view, animated: true)
+            //MBProgressHUD.hide(for: self.view, animated: true)
             GlobalClass.openResponseViewController(from: self, response: response)
     }
 
+    @IBAction func validateButtonTapped(_ sender: Any) {
+
+        payFortController.callValidateAPI(with: request) {
+            print("--ShowLoader--")
+            //MBProgressHUD.showAdded(to: self.view, animated: true)
+
+        } success: { (requestDic) in
+            print("--success--")
+            print("--requestDic--\(requestDic)")
+            self.hide(response: ["status":"success"])
+
+        } faild: { (requestDic, responeDic, message) in
+            print("--Faild--")
+            print("--requestDic--\(requestDic)")
+            print("--responeDic--\(responeDic)")
+            print("--message--\(message)")
+            self.hide(response: responeDic)
+
+        }
+
+    }
 
 }

SampleApp/SampleApp/Controllers/Main/HalfCardViewController.swift

@@ -9,7 +9,7 @@
 import UIKit
 
 import PayFortSDK
-import MBProgressHUD
+//import MBProgressHUD
 
 class HalfCardViewController: UIViewController {
 
@@ -35,8 +35,8 @@ class HalfCardViewController: UIViewController {
         expiryDateView.errorLabel = expiryDateErrorLabel
 
         let property = Property()
-        property.textColor = .blue
-        property.backgroundColor = .white
+        property.textColor = .yellow
+        property.backgroundColor = .green
         property.errorTextColor = .green
         property.titleTextColor = .black
 
@@ -45,7 +45,7 @@ class HalfCardViewController: UIViewController {
         let builder = PayComponents(cardNumberView: cardNumberView, expiryDateView: expiryDateView, cvcNumberView: cvcNumberView, holderNameView: holderNameView, rememberMe: saveCardSwitch.isOn, language: "en")
 
         payButton.setup(with: request, enviroment: enviroment, payButtonBuilder: builder, viewController: self) {
-            MBProgressHUD.showAdded(to: self.view, animated: true)
+            //MBProgressHUD.showAdded(to: self.view, animated: true)
         } success: { (requestDic, responeDic) in
             print("--success--")
             print("--requestDic--\(requestDic)")
@@ -70,7 +70,7 @@ class HalfCardViewController: UIViewController {
         dismiss(animated: true, completion: nil)
     }
     func hide(response: [String:String]) {
-            MBProgressHUD.hide(for: self.view, animated: true)
+            //MBProgressHUD.hide(for: self.view, animated: true)
         let vc = (self.storyboard?.instantiateViewController(identifier: "ResponsePageViewController"))! as ResponsePageViewController
         vc.request = response
         vc.isFromPresent = true

SampleApp/SampleApp/Controllers/Main/MainViewController.swift

@@ -15,12 +15,12 @@ class MainViewController: UIViewController {
     @IBOutlet weak private var tableView: UITableView!
 
     var payFortController = PayFortController.init(enviroment: .sandBox)
-
+    var stcController = STCPayViewController.init(enviroment: .sandBox)
+
     // MARK: - Properties
 
     var enviroment = PayFortEnviroment.sandBox
     var paramsArr = GlobalClass.returnParamsArray()
-
     var fruadParam = GlobalClass.shared.showFraudExtraParam
 
     private var extraParamDataSource: TableViewDataSource<ExtraParamCell, ExtraParam>!
@@ -40,10 +40,6 @@ class MainViewController: UIViewController {
         }
     }
 
-    @IBAction func copyUUID(_ sender: Any) {
-        UIPasteboard.general.string = payFortController.getUDID()
-    }
-
     private func setupTableView() {
 
 
@@ -59,6 +55,12 @@ class MainViewController: UIViewController {
 
     }
 
+    @IBAction private func createTokenAction(_ sender: Any) {
+
+        UIPasteboard.general.string = payFortController.getUDID()
+        print(payFortController.getUDID())
+
+    }
 
     @IBAction func enviromentValueChanged(_ sender: UISegmentedControl) {
 
@@ -74,6 +76,7 @@ class MainViewController: UIViewController {
         }
 
         payFortController = PayFortController.init(enviroment: enviroment)
+        stcController = STCPayViewController.init(enviroment: enviroment)
     }
 
     @IBAction func commandValueChanged(_ sender: UISegmentedControl) {
@@ -102,6 +105,8 @@ class MainViewController: UIViewController {
         }else {
             payFortController.setPayFortCustomViewNib("")
         }
+        print(extractExtraParam())
+        return
         payFortController.callPayFort(withRequest: extractExtraParam(),
                                                  currentViewController: self) { (requestDic, responeDic) in
             print("--success--")
@@ -123,15 +128,6 @@ class MainViewController: UIViewController {
             GlobalClass.openResponseViewController(from: self, response: responeDic)
 
         }
-
-//        payFortController.callPayFortWithRequest(extractExtraParam(), currentViewController: self) { result in
-//            switch result {
-//            case .failure(let error):
-//                print("--error-->\(error.errorDescription)")
-//            case .success: break
-//
-//            }
-//        }
 
     }
 

SampleApp/SampleApp/Controllers/Main/STCPay.swift

@@ -0,0 +1,33 @@
+//
+//  STCPay.swift
+//  SampleApp
+//
+//  Created by Cetinkaya, Ozgen on 3/14/23.
+//  Copyright © 2023 PayFort. All rights reserved.
+//
+
+import Foundation
+import PayFortSDK
+
+let vc = STCPayViewController.init(enviroment: .sandBox)
+
+extension MainViewController {
+    @IBAction func STCPayAction(_ sender: Any) {
+
+        let params = extractExtraParam()
+
+        vc.openPaymentPage(with: params,
+                                      currentViewController: self) { requestDic, responeDic in
+            print(requestDic)
+            print(responeDic)
+            GlobalClass.openResponseViewController(from: self, response: responeDic)
+        } faild: { requestDic, responeDic, message in
+            print("request failed")
+            print(requestDic)
+            print(responeDic)
+            GlobalClass.openResponseViewController(from: self, response: responeDic)
+        } canceled: { requestDic, responeDic in
+            print("request cancelled")
+        }
+    }
+}

SampleApp/SampleApp/Controllers/Settings/SdkTokenSettingViewController.swift

@@ -10,24 +10,15 @@ import UIKit
 
 class SdkTokenSettingViewController: UIViewController {
 
-    @IBOutlet weak var merchantIdentifierTextField: UITextField!
-    @IBOutlet weak var accessCodeTextField: UITextField!
     @IBOutlet weak var languageTextField: UITextField!
-    @IBOutlet weak var passphraseText: UITextField!
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        merchantIdentifierTextField.text = GlobalClass.returnUserDefaultsValue(key: UserDefaultsKeys.merchantIdentifier.rawValue)
-        accessCodeTextField.text = GlobalClass.returnUserDefaultsValue(key: UserDefaultsKeys.accessCode.rawValue)
         languageTextField.text = GlobalClass.returnUserDefaultsValue(key: UserDefaultsKeys.sdkLanguage.rawValue)
-        passphraseText.text = GlobalClass.returnUserDefaultsValue(key: UserDefaultsKeys.passphrase.rawValue)
     }
 
     @IBAction func saveAction(_ sender: Any) {
-        GlobalClass.setUserDefaults(key: UserDefaultsKeys.merchantIdentifier.rawValue, value: merchantIdentifierTextField.text!)
-        GlobalClass.setUserDefaults(key: UserDefaultsKeys.accessCode.rawValue, value: accessCodeTextField.text!)
         GlobalClass.setUserDefaults(key: UserDefaultsKeys.sdkLanguage.rawValue, value: languageTextField.text!)
-        GlobalClass.setUserDefaults(key: UserDefaultsKeys.passphrase.rawValue, value: passphraseText.text!)
         navigationController?.popViewController(animated: true)
     }