diff --git a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/ApplePay/HomeViewController.h b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/ApplePay/HomeViewController.h index c2cf849..d98d2d1 100644 --- a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/ApplePay/HomeViewController.h +++ b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/ApplePay/HomeViewController.h @@ -14,7 +14,7 @@ #import "CreditCardViewController.h" -@interface HomeViewController : UIViewController +@interface HomeViewController : UIViewController { } diff --git a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/NonApplePay/CreditCardViewController.h b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/NonApplePay/CreditCardViewController.h index b93b23c..cf4d8cc 100644 --- a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/NonApplePay/CreditCardViewController.h +++ b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/NonApplePay/CreditCardViewController.h @@ -12,7 +12,7 @@ #import -@interface CreditCardViewController : UIViewController +@interface CreditCardViewController : UIViewController { } diff --git a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafeMockPaymentSummaryViewController.xib b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafeMockPaymentSummaryViewController.xib index 14f03f1..cdcb1a9 100755 --- a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafeMockPaymentSummaryViewController.xib +++ b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafeMockPaymentSummaryViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -21,6 +21,7 @@ @@ -30,6 +31,7 @@ + @@ -38,6 +40,7 @@ + + + diff --git a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafePaymentAuthorizationProcess.h b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafePaymentAuthorizationProcess.h index d957e24..3134e34 100644 --- a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafePaymentAuthorizationProcess.h +++ b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafePaymentAuthorizationProcess.h @@ -11,7 +11,7 @@ -@protocol PaysafePaymentAuthorizationProcessDelegate +@protocol PaySafePaymentAuthorizationProcessDelegate @required /* This method will return the Customer vault Payment token @@ -59,7 +59,7 @@ @interface PaySafePaymentAuthorizationProcess : NSObject -@property(nonatomic, assign)idauthDelegate; +@property(nonatomic, assign)idauthDelegate; - (id)initWithMerchantIdentifier:(NSString*)merchantIdentifier withMerchantID:(NSString*)optiMerchantID withMerchantPwd:(NSString*)optiMerchantPwd withMerchantCountry:(NSString*)merchantCountry withMerchantCurrency:(NSString*)merchantCurrency; diff --git a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/iOS_SDK b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/iOS_SDK index 41295d2..fae35e6 100644 Binary files a/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/iOS_SDK and b/Examples/TestMerchAppExample_Obj-C/TestMerchAppExample_Obj-C/SDK/iOS_SDK.framework/Versions/A/iOS_SDK differ diff --git a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/ApplePay/TVViewController.swift b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/ApplePay/TVViewController.swift index 1beaf3e..6061b4e 100644 --- a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/ApplePay/TVViewController.swift +++ b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/ApplePay/TVViewController.swift @@ -10,7 +10,7 @@ import Foundation -class TVViewController: UIViewController , UITextFieldDelegate, AuthorizationProcessDelegate,PaysafePaymentAuthorizationProcessDelegate +class TVViewController: UIViewController , UITextFieldDelegate, AuthorizationProcessDelegate,PaySafePaymentAuthorizationProcessDelegate { @IBOutlet var payNowButton : UIButton? diff --git a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/NonApplePay/SWCreditCardViewController.swift b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/NonApplePay/SWCreditCardViewController.swift index 30f8031..4157b85 100644 --- a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/NonApplePay/SWCreditCardViewController.swift +++ b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/NonApplePay/SWCreditCardViewController.swift @@ -10,7 +10,7 @@ import Foundation import UIKit -class SWCreditCardViewController :UIViewController ,UITextFieldDelegate,PaysafePaymentAuthorizationProcessDelegate +class SWCreditCardViewController :UIViewController ,UITextFieldDelegate,PaySafePaymentAuthorizationProcessDelegate { @IBOutlet var scrollView :UIScrollView! @IBOutlet var txtCardNo:UITextField! diff --git a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafeMockPaymentSummaryViewController.xib b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafeMockPaymentSummaryViewController.xib index 14f03f1..cdcb1a9 100755 --- a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafeMockPaymentSummaryViewController.xib +++ b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafeMockPaymentSummaryViewController.xib @@ -1,8 +1,8 @@ - + - + @@ -21,6 +21,7 @@ @@ -30,6 +31,7 @@ + @@ -38,6 +40,7 @@ + + + diff --git a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafePaymentAuthorizationProcess.h b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafePaymentAuthorizationProcess.h index d957e24..3134e34 100644 --- a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafePaymentAuthorizationProcess.h +++ b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/Headers/PaySafePaymentAuthorizationProcess.h @@ -11,7 +11,7 @@ -@protocol PaysafePaymentAuthorizationProcessDelegate +@protocol PaySafePaymentAuthorizationProcessDelegate @required /* This method will return the Customer vault Payment token @@ -59,7 +59,7 @@ @interface PaySafePaymentAuthorizationProcess : NSObject -@property(nonatomic, assign)idauthDelegate; +@property(nonatomic, assign)idauthDelegate; - (id)initWithMerchantIdentifier:(NSString*)merchantIdentifier withMerchantID:(NSString*)optiMerchantID withMerchantPwd:(NSString*)optiMerchantPwd withMerchantCountry:(NSString*)merchantCountry withMerchantCurrency:(NSString*)merchantCurrency; diff --git a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/iOS_SDK b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/iOS_SDK index 41295d2..fae35e6 100644 Binary files a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/iOS_SDK and b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/SDK/iOS_SDK.framework/Versions/A/iOS_SDK differ diff --git a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/TestMerchAppExample_Swift.entitlements b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/TestMerchAppExample_Swift.entitlements index 2066fbe..2d80b58 100644 --- a/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/TestMerchAppExample_Swift.entitlements +++ b/Examples/TestMerchAppExample_Swift/TestMerchAppExample_Swift/TestMerchAppExample_Swift.entitlements @@ -4,7 +4,7 @@ com.apple.developer.in-app-payments - merchant.com.optimalpayments.test.example02 + merchant.com.paysafe.test.example01 diff --git a/Paysafe.podspec b/Paysafe.podspec index bc74cb9..3758ab3 100644 --- a/Paysafe.podspec +++ b/Paysafe.podspec @@ -1,42 +1,14 @@ -# -# Be sure to run `pod lib lint Paysafe.podspec' to ensure this is a -# valid spec before submitting. -# -# Any lines starting with a # are optional, but their use is encouraged -# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html -# - Pod::Spec.new do |s| s.name = 'Paysafe' s.version = '1.0.0' s.summary = 'A Paysafe apple pay SDK.' - -# This description is used to generate tags and improve search results. -# * Think: What does it do? Why did you write it? What is the focus? -# * Try to keep it short, snappy and to the point. -# * Write the description between the DESC delimiters below. -# * Finally, don't worry about the indent, CocoaPods strips it! - - s.description = <<-DESC -TODO: Add long description of the pod here. - DESC - s.homepage = 'https://github.com/paysafegroup/paysafe_sdk_ios.git' - # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = 'MIT' s.author = { 'Paysafe' => 'DeveloperCentre@OptimalPayments.com' } s.source = { :git => 'https://github.com/paysafegroup/paysafe_sdk_ios.git', :tag => '1.0.0' } - # s.social_media_url = 'https://twitter.com/' - - - + s.platform = :ios + s.requires_arc = true s.source_files = 'iOS_SDK/PaymentKit/*.{h,m}','iOS_SDK/MockPassKItLib/*.{h,m}' s.resource = 'iOS_SDK/MockPassKItLib/PaySafeMockPaymentSummaryViewController.xib' - # s.resource_bundles = { - # 'Paysafe' => ['Paysafe/Assets/*.png'] - # } - # s.public_header_files = 'Pod/Classes/**/*.h' - # s.frameworks = 'UIKit', 'MapKit' - # s.dependency 'AFNetworking', '~> 2.3' end diff --git a/iOS_SDK.xcodeproj/project.pbxproj b/iOS_SDK.xcodeproj/project.pbxproj index 892c366..86c7d63 100644 --- a/iOS_SDK.xcodeproj/project.pbxproj +++ b/iOS_SDK.xcodeproj/project.pbxproj @@ -113,6 +113,7 @@ 635B49291D7FE3E000F53F17 /* PaySafeMockShippingManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PaySafeMockShippingManager.m; path = MockPassKItLib/PaySafeMockShippingManager.m; sourceTree = ""; }; 635B492A1D7FE3E000F53F17 /* PaySafeMockShippingMethodStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PaySafeMockShippingMethodStore.h; path = MockPassKItLib/PaySafeMockShippingMethodStore.h; sourceTree = ""; }; 635B492B1D7FE3E000F53F17 /* PaySafeMockShippingMethodStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PaySafeMockShippingMethodStore.m; path = MockPassKItLib/PaySafeMockShippingMethodStore.m; sourceTree = ""; }; + 63E12A0C1DBA0D1300EB2ADA /* Paysafe.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; fileEncoding = 4; path = Paysafe.podspec; sourceTree = ""; }; ADD9C1931BC7972900981AB7 /* libiOS_SDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libiOS_SDK.a; sourceTree = BUILT_PRODUCTS_DIR; }; ADD9C2151BC79E1300981AB7 /* PKPayment+OPAYMockKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "PKPayment+OPAYMockKeys.h"; path = "MockPassKItLib/PKPayment+OPAYMockKeys.h"; sourceTree = ""; }; ADD9C2161BC79E1300981AB7 /* PKPayment+OPAYMockKeys.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "PKPayment+OPAYMockKeys.m"; path = "MockPassKItLib/PKPayment+OPAYMockKeys.m"; sourceTree = ""; }; @@ -132,6 +133,7 @@ ADD9C18A1BC7972900981AB7 = { isa = PBXGroup; children = ( + 63E12A0C1DBA0D1300EB2ADA /* Paysafe.podspec */, ADD9C1951BC7972900981AB7 /* iOS_SDK */, ADD9C1941BC7972900981AB7 /* Products */, ); diff --git a/iOS_SDK.xcworkspace/xcuserdata/Jaydeep.xcuserdatad/UserInterfaceState.xcuserstate b/iOS_SDK.xcworkspace/xcuserdata/Jaydeep.xcuserdatad/UserInterfaceState.xcuserstate index 8c9a255..19ec234 100644 Binary files a/iOS_SDK.xcworkspace/xcuserdata/Jaydeep.xcuserdatad/UserInterfaceState.xcuserstate and b/iOS_SDK.xcworkspace/xcuserdata/Jaydeep.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/iOS_SDK/MockPassKItLib/PaySafeMockPayment.h b/iOS_SDK/MockPassKItLib/PaySafeMockPayment.h index 31929b4..d35cb47 100644 --- a/iOS_SDK/MockPassKItLib/PaySafeMockPayment.h +++ b/iOS_SDK/MockPassKItLib/PaySafeMockPayment.h @@ -1,5 +1,5 @@ // -// OPAYMockPayment.h +// PaySafeMockPayment.h // // Created by sachin on 26/02/15. // Copyright (c) 2015 PaySafe. All rights reserved. diff --git a/iOS_SDK/MockPassKItLib/PaySafeMockPayment.m b/iOS_SDK/MockPassKItLib/PaySafeMockPayment.m index f693dfd..820d4ae 100644 --- a/iOS_SDK/MockPassKItLib/PaySafeMockPayment.m +++ b/iOS_SDK/MockPassKItLib/PaySafeMockPayment.m @@ -7,6 +7,7 @@ #import "PaySafeMockPayment.h" #import "PaySafeMockApplePayDef.h" +#import @implementation PaySafeMockPayment diff --git a/iOS_SDK/PaymentKit/PaySafePaymentAuthorizationProcess.m b/iOS_SDK/PaymentKit/PaySafePaymentAuthorizationProcess.m index 3f83e75..031a732 100644 --- a/iOS_SDK/PaymentKit/PaySafePaymentAuthorizationProcess.m +++ b/iOS_SDK/PaymentKit/PaySafePaymentAuthorizationProcess.m @@ -1,5 +1,5 @@ // -// OPAYPaymentAuthorizationProcess.m +// PaySafePaymentAuthorizationProcess.m // iOS_SDK // // Created by Sachin Barage on 09/10/15.