Just some fresh paint and tune-ups. No bigs.

texyz · texyz · commit 49be44798524 · 2022-08-02T20:40:37.000+01:00
diff --git a/Example/FlutterwaveSDK.xcodeproj/project.pbxproj b/Example/FlutterwaveSDK.xcodeproj/project.pbxproj
@@ -532,7 +532,7 @@
 				INFOPLIST_FILE = FlutterwaveSDK/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.demo.paypal.flutterwave;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -555,7 +555,7 @@
 				INFOPLIST_FILE = FlutterwaveSDK/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.5;
+				MARKETING_VERSION = 1.3.6;
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = com.demo.paypal.flutterwave;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/Example/FlutterwaveSDK/ViewController.swift b/Example/FlutterwaveSDK/ViewController.swift
@@ -43,7 +43,7 @@ class ViewController: UIViewController, FlutterwavePayProtocol {
                    config.transcationRef = "[TRANSACTION REF]" // This is a unique reference, unique to the particular transaction being carried out. It is generated when it is not provided by the merchant for every transaction.
                    config.firstName = "[USER'S FIRST NAME]" // This is the customers first name.
                    config.lastName = "[USER'S SECOND NAME]" //This is the customers last name.
-                    config.meta = [["metavalue":["paymentDetails":"", "recieptId":""] , "metaname": "iOS-SDK-v3"]] //This is used to include additional payment information
+                   config.meta = [["metaname":"sdk", "metavalue":"ios"]] //This is used to include additional payment information
                    config.narration = "simplifying payments for endless possibilities"
                    config.publicKey = "[PUB_KEY]" //Public key
                    config.encryptionKey = "[ENCRYPTION_KEY]" //Encryption key
@@ -55,6 +55,9 @@ class ViewController: UIViewController, FlutterwavePayProtocol {
                    self.present(nav, animated: true)
 
                }
+    
+
+
 
 
     override func viewDidLoad() {
diff --git a/FlutterwaveSDK.podspec b/FlutterwaveSDK.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
     s.name             = 'FlutterwaveSDK'
-    s.version          = '1.3.5'
+    s.version          = '1.3.6'
     s.summary          = 'FlutterwaveSDK'
     
     # This description is used to generate tags and improve search results.
diff --git a/FlutterwaveSDK/Classes/App/RaveCardClient.swift b/FlutterwaveSDK/Classes/App/RaveCardClient.swift
@@ -2,9 +2,8 @@
 //  RaveCardClient.swift
 //  GetBarter
 //
-//  Created by Olusegun Solaja on 14/08/2018.
-//  Copyright © 2018 Olusegun Solaja. All rights reserved.
-//
+//  Created by texyz on 10/02/2020.
+//  Copyright (c) 2020 texyz. All rights reserved.
 
 import Foundation
 import UIKit
@@ -77,13 +76,14 @@ class FlutterwaveCardClient{
                                       "amount":amount ?? "",
                                       "firstname":FlutterwaveConfig.sharedConfig().firstName ?? "",
                                       "lastname": FlutterwaveConfig.sharedConfig().lastName ?? "",
+                                      "otp":"123456",
                                       "txRef": FlutterwaveConfig.sharedConfig().transcationRef!]
             if let saveCard = isSaveCardCharge{
                 param.merge(["is_saved_card_charge":saveCard])
             }
-            if let _otp = otp{
-                param.merge(["otp":_otp])
-            }
+//            if let _otp = otp{
+//                param.merge(["otp":_otp])
+//            }
             if let saveCardType = saveCardPayment{
                 param.merge(["payment_type":saveCardType])
             }
@@ -135,22 +135,20 @@ class FlutterwaveCardClient{
             
             let jsonString  = param.jsonStringify()
             
+            print("This is the payload before encryption\(jsonString)")
+            
             let secret = FlutterwaveConfig.sharedConfig().encryptionKey!
             let data =  TripleDES.encrypt(string: jsonString, key:secret)
             let base64String = data?.base64EncodedString()
             
             
-//            let reqbody = [
-//                "PBFPubKey": pubkey,
-//                "client": base64String!, // Encrypted $data payload here.
-//                "alg": "3DES-24"
-//            ]
-//            print("first-of-all")
-//            print(reqbody)
             CardViewModel.sharedViewModel.chargeSavedCard(client: base64String!)
+           
 
         }
     }
+    
+    
     //MARK: Charge Card
     public func chargeCard(replaceData:Bool = false){
         if let pubkey = FlutterwaveConfig.sharedConfig().publicKey{
diff --git a/FlutterwaveSDK/Classes/UI/NewExtraFlutterwave/FlutterWave+UIPickerView.swift b/FlutterwaveSDK/Classes/UI/NewExtraFlutterwave/FlutterWave+UIPickerView.swift
@@ -16,11 +16,15 @@ extension FlutterwavePayViewController : UITextFieldDelegate,CardSelect,UIPicker
     
     func cardSelected(card: SavedCard?) {
         flutterwaveCardClient.selectedCard = card
-        if let card =  flutterwaveCardClient.selectedCard{
-            //LoadingHUD.shared().show()
-            CardViewModel.sharedViewModel.sendCardOtp(cardHash: card.cardHash ?? "")
-            // flutterwaveCardClient.sendOTP(card: card)
-        }
+//        if let card =  flutterwaveCardClient.selectedCard{
+//            CardViewModel.sharedViewModel.sendCardOtp(cardHash: card.cardHash ?? "")
+             LoadingHUD.shared().show()
+//                 flutterwaveCardClient.otp = "12345"
+                 flutterwaveCardClient.isSaveCardCharge = "1"
+                 flutterwaveCardClient.saveCardPayment = "saved-card"
+                 flutterwaveCardClient.amount = self.amount
+                 flutterwaveCardClient.saveCardCharge()
+//        }
     }
     
     
@@ -264,27 +268,27 @@ extension FlutterwavePayViewController : UITextFieldDelegate,CardSelect,UIPicker
     }
     
     func showOTP(message:String, flwRef:String, otpType:OTPType){
-        self.otpContentContainer.isHidden = false
-        self.accountOtpContentContainer.isHidden = false
+//        self.otpContentContainer.isHidden = true
+//        self.accountOtpContentContainer.isHidden = true
         switch otpType {
         case .savedCard:
-            
-            otpContentContainer.alpha = 0
-            otpContentContainer.otpMessage.text = message
-            otpContentContainer.otpButton.removeTarget(self, action: #selector(accountOTPButtonTapped), for: .touchUpInside)
-            otpContentContainer.otpButton.removeTarget(self, action: #selector(cardOTPButtonTapped), for: .touchUpInside)
-            otpContentContainer.otpButton.addTarget(self, action: #selector(saveCardOTPButtonTapped), for: .touchUpInside)
-            
-            UIView.animate(withDuration: 0.6, animations: {
-                self.otpContentContainer.alpha = 1
-                self.pinViewContainer.alpha = 0
-                self.debitCardView.alpha = 0
-                self.saveCardContainer.alpha = 0
-            }) { (success) in
-                self.pinViewContainer.isHidden = true
-                self.debitCardView.isHidden = true
-                self.saveCardContainer.isHidden = true
-            }
+            print("")
+//            otpContentContainer.alpha = 0
+//            otpContentContainer.otpMessage.text = message
+//            otpContentContainer.otpButton.removeTarget(self, action: #selector(accountOTPButtonTapped), for: .touchUpInside)
+//            otpContentContainer.otpButton.removeTarget(self, action: #selector(cardOTPButtonTapped), for: .touchUpInside)
+//            otpContentContainer.otpButton.addTarget(self, action: #selector(saveCardOTPButtonTapped), for: .touchUpInside)
+//
+//            UIView.animate(withDuration: 0.6, animations: {
+//                self.otpContentContainer.alpha = 1
+//                self.pinViewContainer.alpha = 0
+//                self.debitCardView.alpha = 0
+//                self.saveCardContainer.alpha = 0
+//            }) { (success) in
+//                self.pinViewContainer.isHidden = true
+//                self.debitCardView.isHidden = true
+//                self.saveCardContainer.isHidden = true
+//            }
             
         case .card:
             
@@ -346,15 +350,15 @@ extension FlutterwavePayViewController : UITextFieldDelegate,CardSelect,UIPicker
     }
     
     @objc func saveCardOTPButtonTapped(){
-        self.view.endEditing(true)
-        guard let otp = otpContentContainer.otpTextField.text, otp != ""  else {
-            return
-        }
-        // LoadingHUD.shared().show()
-        flutterwaveCardClient.otp = otp
-        flutterwaveCardClient.isSaveCardCharge = "1"
-        flutterwaveCardClient.saveCardPayment = "saved-card"
-        flutterwaveCardClient.amount = self.amount
+//        self.view.endEditing(true)
+//        guard let otp = otpContentContainer.otpTextField.text, otp != ""  else {
+//            return
+//        }
+//        // LoadingHUD.shared().show()
+////        flutterwaveCardClient.otp = otp
+//        flutterwaveCardClient.isSaveCardCharge = "1"
+//        flutterwaveCardClient.saveCardPayment = "saved-card"
+//        flutterwaveCardClient.amount = self.amount
 //        flutterwaveCardClient.saveCardCharge()
     }
     @objc func pinContinueButtonTapped(){
diff --git a/FlutterwaveSDK/Classes/Utils/RaveConstants.swift b/FlutterwaveSDK/Classes/Utils/RaveConstants.swift
@@ -25,7 +25,7 @@ class RaveConstants: NSObject {
         
     }
     
-    static let flutterWaveVersion = "1.3.5"
+    static let flutterWaveVersion = "1.3.6"
     static let flutterColor = UIColor(hex: "#F5A623")
     
     static let bankStyle = [(code:"044",color:"#143f89",image:"rave_access2"),

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class RaveConstants: NSObject {`
`25`	`25`
`26`	`26`	`}`
`27`	`27`
`28`		`- static let flutterWaveVersion = "1.3.5"`
	`28`	`+ static let flutterWaveVersion = "1.3.6"`
`29`	`29`	`static let flutterColor = UIColor(hex: "#F5A623")`
`30`	`30`
`31`	`31`	`static let bankStyle = [(code:"044",color:"#143f89",image:"rave_access2"),`