@jimrising/easymerchantsdk-react-native 2.7.7 → 2.7.8
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
CHANGED
|
@@ -94,7 +94,7 @@ dependencies {
|
|
|
94
94
|
implementation 'com.google.android.material:material:1.13.0'
|
|
95
95
|
|
|
96
96
|
// Third-party libs
|
|
97
|
-
implementation 'com.app:paysdk:
|
|
97
|
+
implementation 'com.app:paysdk:2.0.0'
|
|
98
98
|
implementation 'com.hbb20:ccp:2.7.3'
|
|
99
99
|
implementation 'com.github.bumptech.glide:glide:5.0.4'
|
|
100
100
|
implementation 'com.github.androidmads:QRGenerator:1.0.5'
|
|
@@ -2559,73 +2559,26 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
|
|
|
2559
2559
|
}
|
|
2560
2560
|
|
|
2561
2561
|
private func updateShowSavedCardsVisibility() {
|
|
2562
|
-
|
|
2562
|
+
// Show the "Show saved cards/accounts" button whenever the OTP view is not visible,
|
|
2563
|
+
// so the user can always re-open saved options after closing OTP or email views.
|
|
2564
|
+
let shouldShow = OTPView.isHidden
|
|
2563
2565
|
viewBtnShowSavedCards.isHidden = !shouldShow
|
|
2564
2566
|
viewBtnShowSavedCardHeight.constant = shouldShow ? 50 : 0
|
|
2565
2567
|
viewBtnShowSavedCardTopCon.constant = shouldShow ? 16 : 0
|
|
2566
2568
|
}
|
|
2567
2569
|
|
|
2568
|
-
// @IBAction func actionBtnShowSavedCards(_ sender: UIButton) {
|
|
2569
|
-
// if UserStoreSingleton.shared.customerToken == nil {
|
|
2570
|
-
// emailView.isHidden = false
|
|
2571
|
-
// OTPView.isHidden = true
|
|
2572
|
-
// updateShowSavedCardsVisibility()
|
|
2573
|
-
// }
|
|
2574
|
-
// else {
|
|
2575
|
-
// // UserStoreSingleton.shared.isLoggedIn = true
|
|
2576
|
-
//
|
|
2577
|
-
// emailView.isHidden = true
|
|
2578
|
-
// OTPView.isHidden = true
|
|
2579
|
-
//
|
|
2580
|
-
// if self.selectedPaymentMethod == "Card" {
|
|
2581
|
-
// if UserStoreSingleton.shared.customerId == nil {
|
|
2582
|
-
// self.OTPView.isHidden = true
|
|
2583
|
-
// self.viewCardFields.isHidden = false
|
|
2584
|
-
// self.viewSingleSavedCard.isHidden = true
|
|
2585
|
-
// self.viewBtnShowSavedCards.isHidden = true
|
|
2586
|
-
// self.viewBtnShowSavedCardHeight.constant = 0
|
|
2587
|
-
// self.viewBtnShowSavedCardTopCon.constant = 0
|
|
2588
|
-
// self.viewChangeCard.isHidden = true
|
|
2589
|
-
// self.viewUpdateCard.isHidden = true
|
|
2590
|
-
// self.viewAddNewCard.isHidden = true
|
|
2591
|
-
// } else {
|
|
2592
|
-
// self.getShowCardsApi()
|
|
2593
|
-
// self.OTPView.isHidden = true
|
|
2594
|
-
// self.viewCardFields.isHidden = true
|
|
2595
|
-
// self.viewSingleSavedCard.isHidden = false
|
|
2596
|
-
// self.viewBtnShowSavedCards.isHidden = true
|
|
2597
|
-
// self.viewBtnShowSavedCardHeight.constant = 0
|
|
2598
|
-
// self.viewBtnShowSavedCardTopCon.constant = 0
|
|
2599
|
-
// self.viewChangeCard.isHidden = true
|
|
2600
|
-
// self.viewUpdateCard.isHidden = true
|
|
2601
|
-
// self.viewAddNewCard.isHidden = true
|
|
2602
|
-
//
|
|
2603
|
-
// self.viewTxtFieldCVVSingleCard.isHidden = true
|
|
2604
|
-
// self.btnPayNowSingleCard.isHidden = true
|
|
2605
|
-
// self.btnNext.isHidden = true
|
|
2606
|
-
// self.btnNextHeight.constant = 0
|
|
2607
|
-
// self.btnNextTopCon.constant = 8
|
|
2608
|
-
// }
|
|
2609
|
-
//
|
|
2610
|
-
// self.txtFieldSelectPlanSingleSavedCard.isHidden = true
|
|
2611
|
-
// self.txtFieldSelectDateSingleSavedCard.isHidden = true
|
|
2612
|
-
//
|
|
2613
|
-
// self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
|
|
2614
|
-
// self.txtFieldSelectDateSingleSavedBankView.isHidden = true
|
|
2615
|
-
// } else if self.selectedPaymentMethod == "Bank" {
|
|
2616
|
-
// self.getShowBankAccountsApi()
|
|
2617
|
-
// }
|
|
2618
|
-
// }
|
|
2619
|
-
// }
|
|
2620
|
-
|
|
2621
|
-
|
|
2622
2570
|
@IBAction func actionBtnShowSavedCards(_ sender: UIButton) {
|
|
2623
|
-
|
|
2571
|
+
// Mirror MobileCheckout iOS: require both customerToken and customerId to treat as a verified saved customer.
|
|
2572
|
+
if UserStoreSingleton.shared.customerToken == nil || UserStoreSingleton.shared.customerId == nil {
|
|
2573
|
+
// No verified saved customer yet – show email view so user can request OTP
|
|
2574
|
+
isSavedViewVisible = false
|
|
2624
2575
|
emailView.isHidden = false
|
|
2625
2576
|
OTPView.isHidden = true
|
|
2577
|
+
viewSingleSavedCard.isHidden = true
|
|
2578
|
+
viewSingleSavedAccount.isHidden = true
|
|
2626
2579
|
updateShowSavedCardsVisibility()
|
|
2627
|
-
}
|
|
2628
|
-
|
|
2580
|
+
} else {
|
|
2581
|
+
// Verified saved customer exists – show saved cards/accounts UI
|
|
2629
2582
|
isSavedViewVisible = true
|
|
2630
2583
|
|
|
2631
2584
|
emailView.isHidden = true
|
|
@@ -2636,21 +2589,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
|
|
|
2636
2589
|
self.OTPView.isHidden = true
|
|
2637
2590
|
self.viewCardFields.isHidden = false
|
|
2638
2591
|
self.viewSingleSavedCard.isHidden = true
|
|
2639
|
-
// self.viewBtnShowSavedCards.isHidden = true
|
|
2640
|
-
// self.viewBtnShowSavedCardHeight.constant = 0
|
|
2641
|
-
// self.viewBtnShowSavedCardTopCon.constant = 0
|
|
2642
2592
|
self.viewChangeCard.isHidden = true
|
|
2643
2593
|
self.viewUpdateCard.isHidden = true
|
|
2644
2594
|
self.viewAddNewCard.isHidden = true
|
|
2645
2595
|
} else {
|
|
2646
|
-
//
|
|
2596
|
+
// Only show saved cards when button tapped
|
|
2647
2597
|
self.getShowCardsApi()
|
|
2648
2598
|
self.OTPView.isHidden = true
|
|
2649
2599
|
self.viewCardFields.isHidden = true
|
|
2650
2600
|
self.viewSingleSavedCard.isHidden = false
|
|
2651
|
-
// self.viewBtnShowSavedCards.isHidden = true
|
|
2652
|
-
// self.viewBtnShowSavedCardHeight.constant = 0
|
|
2653
|
-
// self.viewBtnShowSavedCardTopCon.constant = 0
|
|
2654
2601
|
self.viewChangeCard.isHidden = true
|
|
2655
2602
|
self.viewUpdateCard.isHidden = true
|
|
2656
2603
|
self.viewAddNewCard.isHidden = true
|
|
@@ -2668,7 +2615,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
|
|
|
2668
2615
|
self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
|
|
2669
2616
|
self.txtFieldSelectDateSingleSavedBankView.isHidden = true
|
|
2670
2617
|
} else if self.selectedPaymentMethod == "Bank" {
|
|
2671
|
-
//
|
|
2618
|
+
// Only show saved banks when button tapped
|
|
2672
2619
|
self.getShowBankAccountsApi()
|
|
2673
2620
|
self.viewBankFields.isHidden = true
|
|
2674
2621
|
self.viewSingleSavedAccount.isHidden = false
|