@jimrising/easymerchantsdk-react-native 1.4.2 → 1.4.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.
Files changed (27) hide show
  1. package/README.md +1 -1
  2. package/android/build/.transforms/20e1216b87bd06eaab3c9e5c68d4267a/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/reactlibrary/RNEasymerchantsdkModule$1.dex +0 -0
  3. package/android/build/.transforms/20e1216b87bd06eaab3c9e5c68d4267a/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/reactlibrary/RNEasymerchantsdkModule$2.dex +0 -0
  4. package/android/build/.transforms/20e1216b87bd06eaab3c9e5c68d4267a/transformed/bundleLibRuntimeToDirDebug/bundleLibRuntimeToDirDebug_dex/com/reactlibrary/RNEasymerchantsdkModule.dex +0 -0
  5. package/android/build/.transforms/e9a664a11ce12edf79cd87b1e07aa243/transformed/classes/classes_dex/classes.dex +0 -0
  6. package/android/build/intermediates/compile_library_classes_jar/debug/bundleLibCompileToJarDebug/classes.jar +0 -0
  7. package/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/reactlibrary/RNEasymerchantsdkModule$1.class +0 -0
  8. package/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/reactlibrary/RNEasymerchantsdkModule$2.class +0 -0
  9. package/android/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes/com/reactlibrary/RNEasymerchantsdkModule.class +0 -0
  10. package/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/reactlibrary/RNEasymerchantsdkModule$1.class +0 -0
  11. package/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/reactlibrary/RNEasymerchantsdkModule$2.class +0 -0
  12. package/android/build/intermediates/runtime_library_classes_dir/debug/bundleLibRuntimeToDirDebug/com/reactlibrary/RNEasymerchantsdkModule.class +0 -0
  13. package/android/build/intermediates/runtime_library_classes_jar/debug/bundleLibRuntimeToJarDebug/classes.jar +0 -0
  14. package/android/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/RNEasymerchantsdkModule$1.class.uniqueId2 +0 -0
  15. package/android/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/RNEasymerchantsdkModule$2.class.uniqueId0 +0 -0
  16. package/android/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/RNEasymerchantsdkModule.class.uniqueId3 +0 -0
  17. package/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin +0 -0
  18. package/android/build.gradle +1 -1
  19. package/android/src/main/java/com/reactlibrary/RNEasymerchantsdkModule.java +0 -1
  20. package/ios/Pods/ViewControllers/AdditionalInfoVC.swift +49 -52
  21. package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift +74 -45
  22. package/ios/Pods/ViewControllers/OTPVerificationVC.swift +109 -33
  23. package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift +1036 -146
  24. package/ios/Pods/ViewControllers/ThreeDSecurePaymentDoneVC.swift +0 -248
  25. package/ios/easymerchantsdk.podspec +1 -1
  26. package/ios/easymerchantsdk.storyboard +291 -92
  27. package/package.json +1 -1
package/README.md CHANGED
@@ -7,7 +7,7 @@ To add the path of sdk in your project. Open your `package.json` file and inside
7
7
 
8
8
  ```json
9
9
  "dependencies": {
10
- "@jimrising/easymerchantsdk-react-native": "^1.4.2"
10
+ "@jimrising/easymerchantsdk-react-native": "^1.4.3"
11
11
  },
12
12
  ```
13
13
 
package/android/build.gradle CHANGED
@@ -39,7 +39,7 @@ repositories {
39
39
  }
40
40
 
41
41
  dependencies {
42
- implementation 'com.app:paysdk:1.2.2'
42
+ implementation 'com.app:paysdk:1.2.3'
43
43
  implementation 'com.hbb20:ccp:2.7.3'
44
44
  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
45
45
  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
package/android/src/main/java/com/reactlibrary/RNEasymerchantsdkModule.java CHANGED
@@ -102,7 +102,6 @@ public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
102
102
  recurringInfo.put("intervals", intervals);
103
103
  recurringInfo.put("recurringStartType", recurringDataMap.getString("recurringStartType"));
104
104
  hashMap.put("recurringData", recurringInfo);
105
-
106
105
  hashMap.put("authenticateBank", hashMapConfig.getBoolean("authenticateBank"));
107
106
 
108
107
  // Handle GrailPayParams
package/ios/Pods/ViewControllers/AdditionalInfoVC.swift CHANGED
@@ -201,10 +201,6 @@ class AdditionalInfoVC: BaseVC {
201
201
  if let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
202
202
  let placeholderColor = UIColor(hex: secondaryFontColor) {
203
203
  lblEasyMerchant.textColor = placeholderColor
204
- // viewAdditionalInfo.layer.borderColor = placeholderColor.cgColor
205
- }
206
- else {
207
- // viewAdditionalInfo.layer.borderColor = UIColor.systemGray.cgColor
208
204
  }
209
205
 
210
206
  if let borderRadiusString = UserStoreSingleton.shared.border_radious,
@@ -212,17 +208,12 @@ class AdditionalInfoVC: BaseVC {
212
208
  btnPayNow.layer.cornerRadius = CGFloat(borderRadius) // Set corner radius
213
209
  btnPrevious.layer.cornerRadius = CGFloat(borderRadius)
214
210
  btnPrevious.layer.borderWidth = 1
215
- // viewAdditionalInfo.layer.cornerRadius = CGFloat(borderRadius)
216
- // viewAdditionalInfo.layer.borderWidth = 1
217
211
  } else {
218
212
  btnPayNow.layer.cornerRadius = 8 // Default value
219
213
  btnPrevious.layer.cornerRadius = 8
220
- // viewAdditionalInfo.layer.borderWidth = 1
221
- // viewAdditionalInfo.layer.cornerRadius = 8
222
214
  }
223
215
  btnPayNow.layer.masksToBounds = true // Ensure the corners are clipped properly
224
216
  btnPrevious.layer.masksToBounds = true
225
- // viewAdditionalInfo.layer.masksToBounds = true
226
217
 
227
218
  if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
228
219
  let uiColor = UIColor(hex: primaryFontColor) {
@@ -340,6 +331,7 @@ class AdditionalInfoVC: BaseVC {
340
331
  emailVerificationVC.billingInfo = fieldSection?.billing
341
332
  emailVerificationVC.additionalInfo = fieldSection?.additional
342
333
  emailVerificationVC.visibility = fieldSection?.visibility
334
+ emailVerificationVC.amount = amount
343
335
 
344
336
  // Extra fields per payment method
345
337
  if selectedPaymentMethod == "Card" {
@@ -555,14 +547,14 @@ class AdditionalInfoVC: BaseVC {
555
547
  // Conditionally pass raw FieldItem array
556
548
  paymentDoneVC.visibility = self.visibility
557
549
 
558
- if self.visibility?.billing == true {
550
+ // if self.visibility?.billing == true {
559
551
  paymentDoneVC.billingInfoData = self.billingInfo
560
552
  var billingDict: [String: Any] = [:]
561
553
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
562
554
  paymentDoneVC.billingInfo = billingDict
563
- }
555
+ // }
564
556
 
565
- if self.visibility?.additional == true {
557
+ // if self.visibility?.additional == true {
566
558
  // Update additionalInfo values before sending
567
559
  if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
568
560
  self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
@@ -576,7 +568,7 @@ class AdditionalInfoVC: BaseVC {
576
568
  var additionalDict: [String: Any] = [:]
577
569
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
578
570
  paymentDoneVC.additionalInfo = additionalDict
579
- }
571
+ // }
580
572
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
581
573
  }
582
574
  }
@@ -760,14 +752,14 @@ class AdditionalInfoVC: BaseVC {
760
752
  // Conditionally pass raw FieldItem array
761
753
  paymentDoneVC.visibility = self.visibility
762
754
 
763
- if self.visibility?.billing == true {
755
+ // if self.visibility?.billing == true {
764
756
  paymentDoneVC.billingInfoData = self.billingInfo
765
757
  var billingDict: [String: Any] = [:]
766
758
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
767
759
  paymentDoneVC.billingInfo = billingDict
768
- }
760
+ // }
769
761
 
770
- if self.visibility?.additional == true {
762
+ // if self.visibility?.additional == true {
771
763
  // Update additionalInfo values before sending
772
764
  if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
773
765
  self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
@@ -781,7 +773,7 @@ class AdditionalInfoVC: BaseVC {
781
773
  var additionalDict: [String: Any] = [:]
782
774
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
783
775
  paymentDoneVC.additionalInfo = additionalDict
784
- }
776
+ // }
785
777
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
786
778
  }
787
779
  }
@@ -956,14 +948,14 @@ class AdditionalInfoVC: BaseVC {
956
948
  // Conditionally pass raw FieldItem array
957
949
  paymentDoneVC.visibility = self.visibility
958
950
 
959
- if self.visibility?.billing == true {
951
+ // if self.visibility?.billing == true {
960
952
  paymentDoneVC.billingInfoData = self.billingInfo
961
953
  var billingDict: [String: Any] = [:]
962
954
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
963
955
  paymentDoneVC.billingInfo = billingDict
964
- }
956
+ // }
965
957
 
966
- if self.visibility?.additional == true {
958
+ // if self.visibility?.additional == true {
967
959
  // Update additionalInfo values before sending
968
960
  if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
969
961
  self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
@@ -977,7 +969,7 @@ class AdditionalInfoVC: BaseVC {
977
969
  var additionalDict: [String: Any] = [:]
978
970
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
979
971
  paymentDoneVC.additionalInfo = additionalDict
980
- }
972
+ // }
981
973
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
982
974
  }
983
975
  }
@@ -1138,14 +1130,14 @@ class AdditionalInfoVC: BaseVC {
1138
1130
  // Conditionally pass raw FieldItem array
1139
1131
  paymentDoneVC.visibility = self.visibility
1140
1132
 
1141
- if self.visibility?.billing == true {
1133
+ // if self.visibility?.billing == true {
1142
1134
  paymentDoneVC.billingInfoData = self.billingInfo
1143
1135
  var billingDict: [String: Any] = [:]
1144
1136
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1145
1137
  paymentDoneVC.billingInfo = billingDict
1146
- }
1138
+ // }
1147
1139
 
1148
- if self.visibility?.additional == true {
1140
+ // if self.visibility?.additional == true {
1149
1141
  // Update additionalInfo values before sending
1150
1142
  if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
1151
1143
  self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
@@ -1159,7 +1151,7 @@ class AdditionalInfoVC: BaseVC {
1159
1151
  var additionalDict: [String: Any] = [:]
1160
1152
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1161
1153
  paymentDoneVC.additionalInfo = additionalDict
1162
- }
1154
+ // }
1163
1155
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1164
1156
  }
1165
1157
  }
@@ -1315,14 +1307,14 @@ class AdditionalInfoVC: BaseVC {
1315
1307
  // Conditionally pass raw FieldItem array
1316
1308
  paymentDoneVC.visibility = self.visibility
1317
1309
 
1318
- if self.visibility?.billing == true {
1310
+ // if self.visibility?.billing == true {
1319
1311
  paymentDoneVC.billingInfoData = self.billingInfo
1320
1312
  var billingDict: [String: Any] = [:]
1321
1313
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1322
1314
  paymentDoneVC.billingInfo = billingDict
1323
- }
1315
+ // }
1324
1316
 
1325
- if self.visibility?.additional == true {
1317
+ // if self.visibility?.additional == true {
1326
1318
  // Update additionalInfo values before sending
1327
1319
  if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
1328
1320
  self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
@@ -1336,7 +1328,7 @@ class AdditionalInfoVC: BaseVC {
1336
1328
  var additionalDict: [String: Any] = [:]
1337
1329
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1338
1330
  paymentDoneVC.additionalInfo = additionalDict
1339
- }
1331
+ // }
1340
1332
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1341
1333
  }
1342
1334
  }
@@ -1511,14 +1503,14 @@ class AdditionalInfoVC: BaseVC {
1511
1503
  // Conditionally pass raw FieldItem array
1512
1504
  paymentDoneVC.visibility = self.visibility
1513
1505
 
1514
- if self.visibility?.billing == true {
1506
+ // if self.visibility?.billing == true {
1515
1507
  paymentDoneVC.billingInfoData = self.billingInfo
1516
1508
  var billingDict: [String: Any] = [:]
1517
1509
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1518
1510
  paymentDoneVC.billingInfo = billingDict
1519
- }
1511
+ // }
1520
1512
 
1521
- if self.visibility?.additional == true {
1513
+ // if self.visibility?.additional == true {
1522
1514
  // Update additionalInfo values before sending
1523
1515
  if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
1524
1516
  self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
@@ -1532,7 +1524,7 @@ class AdditionalInfoVC: BaseVC {
1532
1524
  var additionalDict: [String: Any] = [:]
1533
1525
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1534
1526
  paymentDoneVC.additionalInfo = additionalDict
1535
- }
1527
+ // }
1536
1528
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1537
1529
  }
1538
1530
  }
@@ -1703,14 +1695,14 @@ class AdditionalInfoVC: BaseVC {
1703
1695
  paymentDoneVC.visibility = self.visibility
1704
1696
  paymentDoneVC.amount = self.amount
1705
1697
 
1706
- if self.visibility?.billing == true {
1698
+ // if self.visibility?.billing == true {
1707
1699
  paymentDoneVC.billingInfoData = self.billingInfo
1708
1700
  var billingDict: [String: Any] = [:]
1709
1701
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1710
1702
  paymentDoneVC.billingInfo = billingDict
1711
- }
1703
+ // }
1712
1704
 
1713
- if self.visibility?.additional == true {
1705
+ // if self.visibility?.additional == true {
1714
1706
  // Update additionalInfo values before sending
1715
1707
  if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
1716
1708
  self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
@@ -1724,7 +1716,7 @@ class AdditionalInfoVC: BaseVC {
1724
1716
  var additionalDict: [String: Any] = [:]
1725
1717
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1726
1718
  paymentDoneVC.additionalInfo = additionalDict
1727
- }
1719
+ // }
1728
1720
 
1729
1721
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1730
1722
  }
@@ -1900,14 +1892,14 @@ class AdditionalInfoVC: BaseVC {
1900
1892
  paymentDoneVC.visibility = self.visibility
1901
1893
  paymentDoneVC.amount = self.amount
1902
1894
 
1903
- if self.visibility?.billing == true {
1895
+ // if self.visibility?.billing == true {
1904
1896
  paymentDoneVC.billingInfoData = self.billingInfo
1905
1897
  var billingDict: [String: Any] = [:]
1906
1898
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1907
1899
  paymentDoneVC.billingInfo = billingDict
1908
- }
1900
+ // }
1909
1901
 
1910
- if self.visibility?.additional == true {
1902
+ // if self.visibility?.additional == true {
1911
1903
  // Update additionalInfo values before sending
1912
1904
  if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
1913
1905
  self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
@@ -1921,7 +1913,7 @@ class AdditionalInfoVC: BaseVC {
1921
1913
  var additionalDict: [String: Any] = [:]
1922
1914
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1923
1915
  paymentDoneVC.additionalInfo = additionalDict
1924
- }
1916
+ // }
1925
1917
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1926
1918
  }
1927
1919
  }
@@ -1983,7 +1975,7 @@ class AdditionalInfoVC: BaseVC {
1983
1975
  "account_type": self.selectedGrailPayAccountType ?? "",
1984
1976
  "name": self.selectedGrailPayAccountName ?? "",
1985
1977
  "description": "payment checkout",
1986
- "email": UserStoreSingleton.shared.merchantEmail ?? ""
1978
+ "email": userEmail ?? ""
1987
1979
  ]
1988
1980
 
1989
1981
  // Conditionally add billing info
@@ -2002,18 +1994,23 @@ class AdditionalInfoVC: BaseVC {
2002
1994
  params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
2003
1995
  }
2004
1996
 
2005
- // Conditionally add additional info
1997
+ // Additional Info or default description
1998
+ var descriptionValue: String = "Hosted payment checkout" // default
2006
1999
  if let visibility = visibility, visibility.additional == true,
2007
2000
  let additional = additionalInfo, !additional.isEmpty {
2008
2001
 
2009
- var additionalInfoDict: [String: Any] = [:]
2010
- for item in additional {
2011
- additionalInfoDict[item.name] = item.value
2002
+ var additionalDict: [String: Any] = [:]
2003
+ additional.forEach { additionalDict[$0.name] = $0.value }
2004
+
2005
+ if let desc = additionalDict["description"] as? String, !desc.isEmpty {
2006
+ descriptionValue = desc
2012
2007
  }
2013
2008
 
2014
- params["description"] = txtFieldDescription.text ?? ""
2015
- params["phone_number"] = localPhone
2009
+ if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
2010
+ params["phone_number"] = phone
2011
+ }
2016
2012
  }
2013
+ params["description"] = descriptionValue
2017
2014
 
2018
2015
  // Add these if recurring is enabled
2019
2016
  if let req = request, req.is_recurring == true {
@@ -2089,14 +2086,14 @@ class AdditionalInfoVC: BaseVC {
2089
2086
  // Conditionally pass raw FieldItem array
2090
2087
  paymentDoneVC.visibility = self.visibility
2091
2088
 
2092
- if self.visibility?.billing == true {
2089
+ // if self.visibility?.billing == true {
2093
2090
  paymentDoneVC.billingInfoData = self.billingInfo
2094
2091
  var billingDict: [String: Any] = [:]
2095
2092
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
2096
2093
  paymentDoneVC.billingInfo = billingDict
2097
- }
2094
+ // }
2098
2095
 
2099
- if self.visibility?.additional == true {
2096
+ // if self.visibility?.additional == true {
2100
2097
  // Update additionalInfo values before sending
2101
2098
  if let index = self.additionalInfo?.firstIndex(where: { $0.name == "description" }) {
2102
2099
  self.additionalInfo?[index].value = self.txtFieldDescription.text ?? ""
@@ -2110,7 +2107,7 @@ class AdditionalInfoVC: BaseVC {
2110
2107
  var additionalDict: [String: Any] = [:]
2111
2108
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
2112
2109
  paymentDoneVC.additionalInfo = additionalDict
2113
- }
2110
+ // }
2114
2111
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
2115
2112
  }
2116
2113
  }
package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift CHANGED
@@ -811,6 +811,7 @@ class BillingInfoVC: BaseVC {
811
811
  vc.grailPayAccountID = grailPayAccountID
812
812
  vc.selectedGrailPayAccountType = selectedGrailPayAccountType
813
813
  vc.selectedGrailPayAccountName = selectedGrailPayAccountName
814
+ vc.userEmail = userEmail
814
815
  navigationController?.pushViewController(vc, animated: true)
815
816
  }
816
817
  else if !isAdditionalVisible && isSavedForFuture {
@@ -831,6 +832,7 @@ class BillingInfoVC: BaseVC {
831
832
  vc.grailPayAccountID = grailPayAccountID
832
833
  vc.selectedGrailPayAccountType = selectedGrailPayAccountType
833
834
  vc.selectedGrailPayAccountName = selectedGrailPayAccountName
835
+ vc.userEmail = userEmail
834
836
  navigationController?.pushViewController(vc, animated: true)
835
837
  }
836
838
  else {
@@ -1008,19 +1010,19 @@ class BillingInfoVC: BaseVC {
1008
1010
  // Conditionally pass raw FieldItem array
1009
1011
  paymentDoneVC.visibility = self.visibility
1010
1012
 
1011
- if self.visibility?.billing == true {
1013
+ // if self.visibility?.billing == true {
1012
1014
  paymentDoneVC.billingInfoData = self.billingInfo
1013
1015
  var billingDict: [String: Any] = [:]
1014
1016
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1015
1017
  paymentDoneVC.billingInfo = billingDict
1016
- }
1018
+ // }
1017
1019
 
1018
- if self.visibility?.additional == true {
1020
+ // if self.visibility?.additional == true {
1019
1021
  paymentDoneVC.additionalInfoData = self.additionalInfo
1020
1022
  var additionalDict: [String: Any] = [:]
1021
1023
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1022
1024
  paymentDoneVC.additionalInfo = additionalDict
1023
- }
1025
+ // }
1024
1026
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1025
1027
  }
1026
1028
  }
@@ -1195,19 +1197,19 @@ class BillingInfoVC: BaseVC {
1195
1197
  paymentDoneVC.visibility = self.visibility
1196
1198
  paymentDoneVC.amount = self.amount
1197
1199
 
1198
- if self.visibility?.billing == true {
1200
+ // if self.visibility?.billing == true {
1199
1201
  paymentDoneVC.billingInfoData = self.billingInfo
1200
1202
  var billingDict: [String: Any] = [:]
1201
1203
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1202
1204
  paymentDoneVC.billingInfo = billingDict
1203
- }
1205
+ // }
1204
1206
 
1205
- if self.visibility?.additional == true {
1207
+ // if self.visibility?.additional == true {
1206
1208
  paymentDoneVC.additionalInfoData = self.additionalInfo
1207
1209
  var additionalDict: [String: Any] = [:]
1208
1210
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1209
1211
  paymentDoneVC.additionalInfo = additionalDict
1210
- }
1212
+ // }
1211
1213
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1212
1214
  }
1213
1215
  }
@@ -1372,19 +1374,19 @@ class BillingInfoVC: BaseVC {
1372
1374
  paymentDoneVC.visibility = self.visibility
1373
1375
  paymentDoneVC.amount = self.amount
1374
1376
 
1375
- if self.visibility?.billing == true {
1377
+ // if self.visibility?.billing == true {
1376
1378
  paymentDoneVC.billingInfoData = self.billingInfo
1377
1379
  var billingDict: [String: Any] = [:]
1378
1380
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1379
1381
  paymentDoneVC.billingInfo = billingDict
1380
- }
1382
+ // }
1381
1383
 
1382
- if self.visibility?.additional == true {
1384
+ // if self.visibility?.additional == true {
1383
1385
  paymentDoneVC.additionalInfoData = self.additionalInfo
1384
1386
  var additionalDict: [String: Any] = [:]
1385
1387
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1386
1388
  paymentDoneVC.additionalInfo = additionalDict
1387
- }
1389
+ // }
1388
1390
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1389
1391
  }
1390
1392
  }
@@ -1554,19 +1556,19 @@ class BillingInfoVC: BaseVC {
1554
1556
  // Conditionally pass raw FieldItem array
1555
1557
  paymentDoneVC.visibility = self.visibility
1556
1558
 
1557
- if self.visibility?.billing == true {
1559
+ // if self.visibility?.billing == true {
1558
1560
  paymentDoneVC.billingInfoData = self.billingInfo
1559
1561
  var billingDict: [String: Any] = [:]
1560
1562
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1561
1563
  paymentDoneVC.billingInfo = billingDict
1562
- }
1564
+ // }
1563
1565
 
1564
- if self.visibility?.additional == true {
1566
+ // if self.visibility?.additional == true {
1565
1567
  paymentDoneVC.additionalInfoData = self.additionalInfo
1566
1568
  var additionalDict: [String: Any] = [:]
1567
1569
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1568
1570
  paymentDoneVC.additionalInfo = additionalDict
1569
- }
1571
+ // }
1570
1572
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1571
1573
  }
1572
1574
  }
@@ -1732,19 +1734,19 @@ class BillingInfoVC: BaseVC {
1732
1734
  // Conditionally pass raw FieldItem array
1733
1735
  paymentDoneVC.visibility = self.visibility
1734
1736
 
1735
- if self.visibility?.billing == true {
1737
+ // if self.visibility?.billing == true {
1736
1738
  paymentDoneVC.billingInfoData = self.billingInfo
1737
1739
  var billingDict: [String: Any] = [:]
1738
1740
  self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1739
1741
  paymentDoneVC.billingInfo = billingDict
1740
- }
1742
+ // }
1741
1743
 
1742
- if self.visibility?.additional == true {
1744
+ // if self.visibility?.additional == true {
1743
1745
  paymentDoneVC.additionalInfoData = self.additionalInfo
1744
1746
  var additionalDict: [String: Any] = [:]
1745
1747
  self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1746
1748
  paymentDoneVC.additionalInfo = additionalDict
1747
- }
1749
+ // }
1748
1750
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1749
1751
  }
1750
1752
  }
@@ -1895,13 +1897,19 @@ class BillingInfoVC: BaseVC {
1895
1897
  // Conditionally pass raw FieldItem array
1896
1898
  paymentDoneVC.visibility = self.visibility
1897
1899
 
1898
- if self.visibility?.billing == true {
1899
- paymentDoneVC.billingInfoData = self.billingInfo
1900
- var billingDict: [String: Any] = [:]
1901
- self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1902
- paymentDoneVC.billingInfo = billingDict
1903
- }
1904
-
1900
+ // if self.visibility?.billing == true {
1901
+ paymentDoneVC.billingInfoData = self.billingInfo
1902
+ var billingDict: [String: Any] = [:]
1903
+ self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
1904
+ paymentDoneVC.billingInfo = billingDict
1905
+ // }
1906
+
1907
+ // if self.visibility?.additional == true {
1908
+ paymentDoneVC.additionalInfoData = self.additionalInfo
1909
+ var additionalDict: [String: Any] = [:]
1910
+ self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
1911
+ paymentDoneVC.additionalInfo = additionalDict
1912
+ // }
1905
1913
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
1906
1914
  }
1907
1915
  }
@@ -2056,12 +2064,19 @@ class BillingInfoVC: BaseVC {
2056
2064
  // Conditionally pass raw FieldItem array
2057
2065
  paymentDoneVC.visibility = self.visibility
2058
2066
 
2059
- if self.visibility?.billing == true {
2060
- paymentDoneVC.billingInfoData = self.billingInfo
2061
- var billingDict: [String: Any] = [:]
2062
- self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
2063
- paymentDoneVC.billingInfo = billingDict
2064
- }
2067
+ // if self.visibility?.billing == true {
2068
+ paymentDoneVC.billingInfoData = self.billingInfo
2069
+ var billingDict: [String: Any] = [:]
2070
+ self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
2071
+ paymentDoneVC.billingInfo = billingDict
2072
+ // }
2073
+
2074
+ // if self.visibility?.additional == true {
2075
+ paymentDoneVC.additionalInfoData = self.additionalInfo
2076
+ var additionalDict: [String: Any] = [:]
2077
+ self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
2078
+ paymentDoneVC.additionalInfo = additionalDict
2079
+ // }
2065
2080
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
2066
2081
  }
2067
2082
  }
@@ -2225,12 +2240,19 @@ class BillingInfoVC: BaseVC {
2225
2240
  // Conditionally pass raw FieldItem array
2226
2241
  paymentDoneVC.visibility = self.visibility
2227
2242
 
2228
- if self.visibility?.billing == true {
2229
- paymentDoneVC.billingInfoData = self.billingInfo
2230
- var billingDict: [String: Any] = [:]
2231
- self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
2232
- paymentDoneVC.billingInfo = billingDict
2233
- }
2243
+ // if self.visibility?.billing == true {
2244
+ paymentDoneVC.billingInfoData = self.billingInfo
2245
+ var billingDict: [String: Any] = [:]
2246
+ self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
2247
+ paymentDoneVC.billingInfo = billingDict
2248
+ // }
2249
+
2250
+ // if self.visibility?.additional == true {
2251
+ paymentDoneVC.additionalInfoData = self.additionalInfo
2252
+ var additionalDict: [String: Any] = [:]
2253
+ self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
2254
+ paymentDoneVC.additionalInfo = additionalDict
2255
+ // }
2234
2256
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
2235
2257
  }
2236
2258
  }
@@ -2387,12 +2409,19 @@ class BillingInfoVC: BaseVC {
2387
2409
  // Conditionally pass raw FieldItem array
2388
2410
  paymentDoneVC.visibility = self.visibility
2389
2411
 
2390
- if self.visibility?.billing == true {
2391
- paymentDoneVC.billingInfoData = self.billingInfo
2392
- var billingDict: [String: Any] = [:]
2393
- self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
2394
- paymentDoneVC.billingInfo = billingDict
2395
- }
2412
+ // if self.visibility?.billing == true {
2413
+ paymentDoneVC.billingInfoData = self.billingInfo
2414
+ var billingDict: [String: Any] = [:]
2415
+ self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
2416
+ paymentDoneVC.billingInfo = billingDict
2417
+ // }
2418
+
2419
+ // if self.visibility?.additional == true {
2420
+ paymentDoneVC.additionalInfoData = self.additionalInfo
2421
+ var additionalDict: [String: Any] = [:]
2422
+ self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
2423
+ paymentDoneVC.additionalInfo = additionalDict
2424
+ // }
2396
2425
  self.navigationController?.pushViewController(paymentDoneVC, animated: true)
2397
2426
  }
2398
2427
  }