@jimrising/easymerchantsdk-react-native 2.5.2 → 2.5.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/android/build.gradle +1 -1
- package/ios/ApiManager/APIHeaders.swift +0 -6
- package/ios/ApiManager/APIRequest.swift +3 -8
- package/ios/Classes/EasyMerchantSdk.m +2 -2
- package/ios/Classes/EasyMerchantSdk.swift +25 -13
- package/ios/Helper/GrailPayHelper.swift +1 -0
- package/ios/Models/Request.swift +3 -3
- package/ios/Pods/Storyboard/EasyPaySdk.storyboard +83 -83
- package/ios/Pods/ViewControllers/AdditionalInfoVC.swift +26 -3
- package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift +10 -10
- package/ios/Pods/ViewControllers/GrailPayVC.swift +260 -268
- package/ios/Pods/ViewControllers/OTPVerificationVC.swift +74 -13
- package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift +266 -131
- package/ios/Pods/ViewControllers/PaymentInformation/RecurringTVC.swift +3 -0
- package/ios/Pods/ViewControllers/PaymentStatusWebViewVC.swift +1 -32
- package/ios/Pods/ViewControllers/ThreeDSecurePaymentDoneVC.swift +10 -6
- package/ios/easymerchantsdk.podspec +1 -1
- package/package.json +1 -1
- package/ACH_CHARGE_ENDPOINT_TRACE.md +0 -69
|
@@ -265,7 +265,7 @@ class AdditionalInfoVC: BaseVC {
|
|
|
265
265
|
}
|
|
266
266
|
|
|
267
267
|
@IBAction func actionBtnSelectCountryCode(_ sender: UIButton) {
|
|
268
|
-
let vc =
|
|
268
|
+
let vc = easymerchantsdk.instantiateViewController(withIdentifier: "CountryListVC") as! CountryListVC
|
|
269
269
|
vc.delegate = self
|
|
270
270
|
self.navigationController?.pushViewController(vc, animated: true)
|
|
271
271
|
}
|
|
@@ -334,6 +334,7 @@ class AdditionalInfoVC: BaseVC {
|
|
|
334
334
|
grailPayAccountChargeApi(customerId: UserStoreSingleton.shared.customerId)
|
|
335
335
|
|
|
336
336
|
default:
|
|
337
|
+
break
|
|
337
338
|
}
|
|
338
339
|
return
|
|
339
340
|
}
|
|
@@ -390,6 +391,30 @@ class AdditionalInfoVC: BaseVC {
|
|
|
390
391
|
}
|
|
391
392
|
else if isSavedNewCard {
|
|
392
393
|
if isFrom == "AddNewCard" {
|
|
394
|
+
// Save card checked but user not logged in → verify email/OTP first (same as save account for bank)
|
|
395
|
+
if UserStoreSingleton.shared.isLoggedIn != true {
|
|
396
|
+
if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
|
|
397
|
+
emailVerificationVC.billingInfoData = billingInfoData
|
|
398
|
+
emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
|
|
399
|
+
emailVerificationVC.easyPayDelegate = easyPayDelegate
|
|
400
|
+
emailVerificationVC.request = request
|
|
401
|
+
emailVerificationVC.chosenPlan = chosenPlan
|
|
402
|
+
emailVerificationVC.startDate = startDate
|
|
403
|
+
emailVerificationVC.userEmail = userEmail
|
|
404
|
+
emailVerificationVC.billingInfo = fieldSection?.billing
|
|
405
|
+
emailVerificationVC.additionalInfo = fieldSection?.additional
|
|
406
|
+
emailVerificationVC.visibility = fieldSection?.visibility
|
|
407
|
+
emailVerificationVC.amount = amount
|
|
408
|
+
emailVerificationVC.email = userEmail
|
|
409
|
+
emailVerificationVC.cardNumber = cardNumber
|
|
410
|
+
emailVerificationVC.expiryDate = expiryDate
|
|
411
|
+
emailVerificationVC.cvv = cvv
|
|
412
|
+
emailVerificationVC.nameOnCard = nameOnCard
|
|
413
|
+
emailVerificationVC.isSavedForFuture = true
|
|
414
|
+
navigationController?.pushViewController(emailVerificationVC, animated: true)
|
|
415
|
+
}
|
|
416
|
+
return
|
|
417
|
+
}
|
|
393
418
|
if request.secureAuthentication == true {
|
|
394
419
|
threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
|
|
395
420
|
} else {
|
|
@@ -680,7 +705,6 @@ class AdditionalInfoVC: BaseVC {
|
|
|
680
705
|
//MARK: - Credit Card Charge Api from Saved cards
|
|
681
706
|
func paymentIntentFromShowCardApi() {
|
|
682
707
|
|
|
683
|
-
Thread.callStackSymbols.forEach { print($0) }
|
|
684
708
|
|
|
685
709
|
showLoadingIndicator()
|
|
686
710
|
|
|
@@ -1184,7 +1208,6 @@ class AdditionalInfoVC: BaseVC {
|
|
|
1184
1208
|
//MARK: - Banking Account Charge Api
|
|
1185
1209
|
func accountChargeApi() {
|
|
1186
1210
|
|
|
1187
|
-
Thread.callStackSymbols.forEach { print($0) }
|
|
1188
1211
|
|
|
1189
1212
|
showLoadingIndicator()
|
|
1190
1213
|
|
|
@@ -724,7 +724,7 @@ class BillingInfoVC: BaseVC {
|
|
|
724
724
|
|
|
725
725
|
if isAdditionalVisible {
|
|
726
726
|
// ✅ Go to AdditionalInfoVC
|
|
727
|
-
let vc =
|
|
727
|
+
let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
|
|
728
728
|
vc.cardNumber = cardNumber
|
|
729
729
|
vc.expiryDate = expiryDate
|
|
730
730
|
vc.cvv = cvv
|
|
@@ -760,8 +760,8 @@ class BillingInfoVC: BaseVC {
|
|
|
760
760
|
paymentIntentApi()
|
|
761
761
|
}
|
|
762
762
|
} else {
|
|
763
|
-
// let vc =
|
|
764
|
-
let vc =
|
|
763
|
+
// let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
|
|
764
|
+
let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
|
|
765
765
|
vc.cardNumber = cardNumber
|
|
766
766
|
vc.expiryDate = expiryDate
|
|
767
767
|
vc.cvv = cvv
|
|
@@ -807,7 +807,7 @@ class BillingInfoVC: BaseVC {
|
|
|
807
807
|
else if selectedPaymentMethod == "Bank" {
|
|
808
808
|
if isAdditionalVisible {
|
|
809
809
|
// ✅ Go to AdditionalInfoVC
|
|
810
|
-
let vc =
|
|
810
|
+
let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
|
|
811
811
|
vc.userEmail = userEmail
|
|
812
812
|
vc.billingInfoData = updatedBillingData
|
|
813
813
|
vc.fieldSection = updatedFieldSection
|
|
@@ -837,8 +837,8 @@ class BillingInfoVC: BaseVC {
|
|
|
837
837
|
if UserStoreSingleton.shared.isLoggedIn == true {
|
|
838
838
|
accountChargeWithSaveApi(customerId: UserStoreSingleton.shared.customerId)
|
|
839
839
|
} else {
|
|
840
|
-
// let vc =
|
|
841
|
-
let vc =
|
|
840
|
+
// let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
|
|
841
|
+
let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
|
|
842
842
|
vc.accountName = accountName
|
|
843
843
|
vc.routingNumber = routingNumber
|
|
844
844
|
vc.accountType = accountType
|
|
@@ -880,7 +880,7 @@ class BillingInfoVC: BaseVC {
|
|
|
880
880
|
else if selectedPaymentMethod == "GrailPay" {
|
|
881
881
|
if isAdditionalVisible {
|
|
882
882
|
// ✅ Go to AdditionalInfoVC
|
|
883
|
-
let vc =
|
|
883
|
+
let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
|
|
884
884
|
vc.billingInfoData = updatedBillingData
|
|
885
885
|
vc.fieldSection = updatedFieldSection
|
|
886
886
|
vc.billingInfo = updatedFieldSection.billing
|
|
@@ -904,8 +904,8 @@ class BillingInfoVC: BaseVC {
|
|
|
904
904
|
if UserStoreSingleton.shared.isLoggedIn == true {
|
|
905
905
|
grailPayAccountChargeApi()
|
|
906
906
|
} else {
|
|
907
|
-
// let vc =
|
|
908
|
-
let vc =
|
|
907
|
+
// let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
|
|
908
|
+
let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
|
|
909
909
|
vc.billingInfoData = updatedBillingData
|
|
910
910
|
vc.fieldSection = updatedFieldSection
|
|
911
911
|
vc.billingInfo = updatedFieldSection.billing
|
|
@@ -938,7 +938,7 @@ class BillingInfoVC: BaseVC {
|
|
|
938
938
|
else if selectedPaymentMethod == "NewGrailPayAccount" {
|
|
939
939
|
if isAdditionalVisible {
|
|
940
940
|
// ✅ Go to AdditionalInfoVC
|
|
941
|
-
let vc =
|
|
941
|
+
let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
|
|
942
942
|
vc.billingInfoData = updatedBillingData
|
|
943
943
|
vc.fieldSection = updatedFieldSection
|
|
944
944
|
vc.billingInfo = updatedFieldSection.billing
|