react-native-payengine 2.0.5 → 2.0.8

package/README.md

@@ -156,6 +156,7 @@ import {
   PEPaymentRequest,
   PayEngineNative,
   PayEngineUtils,
+  RNPEContactField
 } from 'react-native-payengine';
 import axios from 'axios';
 
@@ -178,16 +179,20 @@ const ApplePayScreen = () => {
     checkSupport();
   }, []);
 
-  const paymentRequest = new PEPaymentRequest(<MERCHANT_ID>, 120.5, 'USD', [
-    {
-      amount: 100.0,
-      label: 'Full Back Lounge Chair',
-    },
-    {
-      amount: 20.5,
-      label: 'Glass Top Oval Center Table',
-    },
-  ]);
+  const paymentRequest: PEPaymentRequest = {
+    merchantId: MERCHANT_ID,
+    paymentAmount: 10.5,
+    paymentItems: [
+      {
+        amount: 100,
+        label: 'Test Item',
+      },
+    ],
+    platformOptions: {
+      requiredBillingContactFields: [RNPEContactField.postalAddress],
+      requiredShippingContactFields: []
+    }
+  }
 
   const purchaseWithToken = async (token) => {
     // send the token to your server to make a purchase
@@ -264,7 +269,17 @@ const GooglePayScreen = () => {
     checkSupport();
   }, []);
 
-  const paymentRequest = new PEPaymentRequest(<MERCHANT_ID>, 15.5);
+  const paymentRequest = {
+    paymentAmount: amount,
+    merchantId: MERCHANT_ID,
+    platformOptions: {
+      billingAddressRequired: true,
+      billingAddressParameters: {
+        format: 'FULL'
+      },
+      shippingAddressRequired: false
+    }
+  };
 
   const purchaseWithToken = async (token) => {
     // send the token to your server to make a purchase

package/android/build.gradle

@@ -164,8 +164,8 @@ dependencies {
 
   implementation files("./securefields-1.7.2-debug.aar")
 
-  debugImplementation files("./payment-sdk-debug-1.0.2.aar")
-  releaseImplementation files("./payment-sdk-debug-1.0.2.aar")
+  debugImplementation files("./payment-sdk-debug-1.0.3.aar")
+  releaseImplementation files("./payment-sdk-debug-1.0.3.aar")
 
   api 'com.github.Kount:kount-android-sdk:v4.3.2'
   implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'

package/android/src/main/java/com/reactnativepayengine/v2/features/googlepay/RNPEGooglePayButton.kt

@@ -7,6 +7,7 @@ import android.widget.LinearLayout
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter
 import com.facebook.react.uimanager.ThemedReactContext
+import com.google.gson.Gson
 import com.payengine.paymentsdk.features.googlepay.PEGooglePayDelegate
 import com.payengine.paymentsdk.features.googlepay.PEGooglePayStatus
 import com.payengine.paymentsdk.features.googlepay.nmi.GooglePayPaymentRequest
@@ -16,8 +17,8 @@ import com.reactnativepayengine.v2.securefields.RNPEEvents
 class RNPEGooglePayButton(private val context: ThemedReactContext, private val activity: Activity?): LinearLayout(context),
   PEGooglePayDelegate {
 
-  private var amount: Double? = null
   private var merchantId: String? = null
+  private var paymentRequest: GooglePayPaymentRequest? = null
 
   init {
     this.orientation = VERTICAL
@@ -28,18 +29,40 @@ class RNPEGooglePayButton(private val context: ThemedReactContext, private val a
     this.layoutParams = layoutParams
   }
 
-  fun setAmount(amount: Double) {
-    this.amount = amount
-    this.setupView()
-  }
+//  fun setAmount(amount: Double) {
+//    this.amount = amount
+//    this.setupView()
+//  }
+//
+//  fun setMerchantId(merchantId: String) {
+//    this.merchantId = merchantId
+//    this.setupView()
+//  }
+
+  fun setPaymentRequest(text: String) {
+    Log.d("TEST", "Received pm request $text")
+    val rnPaymentRequest = Gson().fromJson(text, RNPEPaymentRequest::class.java)
+    val paymentRequest = GooglePayPaymentRequest(
+      paymentAmount = rnPaymentRequest.paymentAmount,
+      billingAddressRequired = rnPaymentRequest.billingAddressRequired,
+      billingAddressParameters = rnPaymentRequest.billingAddressParameters,
+      shippingAddressRequired = rnPaymentRequest.shippingAddressRequired,
+      shippingAddressParameters = rnPaymentRequest.shippingAddressParameters
+    )
+    Log.d("TEST", "Decoded ${Gson().toJson(paymentRequest)}")
+    this.paymentRequest = paymentRequest
+    this.merchantId = rnPaymentRequest.merchantId
 
-  fun setMerchantId(merchantId: String) {
-    this.merchantId = merchantId
     this.setupView()
   }
 
-  private fun setupView() {
-    if (amount == null || merchantId == null) return
+  internal fun setupView() {
+    Log.d("TEST", "setupView is called")
+//    if (amount == null || merchantId == null) return
+    if (paymentRequest == null) {
+      Log.d("TEST", "setupView is called but stopped here")
+      return
+    }
 
     this.activity?.let {
       RNPayEngineNative.instance?.createGooglePay(it, this.merchantId!!) {
@@ -48,7 +71,7 @@ class RNPEGooglePayButton(private val context: ThemedReactContext, private val a
           RNPayEngineNative.googlePay = googlepay
 
           googlepay.delegate = this
-          googlepay.setupGooglePayButton(GooglePayPaymentRequest(amount!!)) {
+          googlepay.setupGooglePayButton(this.paymentRequest!!) {
             if (it != null) {
               this.addView(it)
             } else {

package/android/src/main/java/com/reactnativepayengine/v2/features/googlepay/RNPEGooglePayButtonManager.kt

@@ -13,14 +13,19 @@ import com.reactnativepayengine.v2.RNPayEngineNative
 class RNPEGooglePayButtonManager: SimpleViewManager<RNPEGooglePayButton> {
   private var context: ReactApplicationContext
 
-  @ReactProp(name = "amount")
-  fun setAmount(view: RNPEGooglePayButton, amount: Double) {
-    view.setAmount(amount)
-  }
+//  @ReactProp(name = "amount")
+//  fun setAmount(view: RNPEGooglePayButton, amount: Double) {
+//    view.setAmount(amount)
+//  }
+//
+//  @ReactProp(name = "merchantId")
+//  fun setMerchantId(view: RNPEGooglePayButton, merchantId: String) {
+//    view.setMerchantId(merchantId)
+//  }
 
-  @ReactProp(name = "merchantId")
-  fun setMerchantId(view: RNPEGooglePayButton, merchantId: String) {
-    view.setMerchantId(merchantId)
+  @ReactProp(name = "paymentRequest")
+  fun setPaymentRequest(view: RNPEGooglePayButton, paymentRequest: String) {
+    view.setPaymentRequest(paymentRequest)
   }
 
 
@@ -38,6 +43,11 @@ class RNPEGooglePayButtonManager: SimpleViewManager<RNPEGooglePayButton> {
     return RNPEGooglePayButton(reactContext, context.currentActivity)
   }
 
+//  override fun onAfterUpdateTransaction(view: RNPEGooglePayButton) {
+//    super.onAfterUpdateTransaction(view)
+//    view.setupView()
+//  }
+
 
   companion object {
     private const val REACT_CLASS = "RNPEGooglePayButton"

package/android/src/main/java/com/reactnativepayengine/v2/features/googlepay/RNPEPaymentRequest.kt

@@ -0,0 +1,20 @@
+package com.reactnativepayengine.v2.features.googlepay
+
+import org.json.JSONObject
+
+data class RNPEPaymentItem(
+  val label: String,
+  val amount: Double,
+)
+
+data class RNPEPaymentRequest(
+  val merchantId: String,
+  val paymentAmount: Double,
+  val currencyCode: String,
+  val paymentItems: List<RNPEPaymentItem>,
+  var billingAddressRequired: Boolean = true,
+  var shippingAddressRequired: Boolean = false,
+  var billingAddressParameters: JSONObject? = null,
+  var shippingAddressParameters: JSONObject? = null
+) {
+}

package/ios/PayEngineSDK.xcframework/ios-arm64/PayEngineSDK.framework/Headers/PayEngineSDK-Swift.h

@@ -341,7 +341,7 @@ SWIFT_CLASS("_TtC12PayEngineSDK22ApplePayPaymentRequest")
 ///
 /// \param paymentAmount The total amount you want to collect
 ///
-- (void)buildWithPaymentItems:(NSArray<PKPaymentSummaryItem *> * _Nonnull)paymentItems paymentAmount:(double)paymentAmount currencyCode:(NSString * _Nonnull)currencyCode;
+- (void)buildWithPaymentItems:(NSArray<PKPaymentSummaryItem *> * _Nonnull)paymentItems paymentAmount:(double)paymentAmount currencyCode:(NSString * _Nonnull)currencyCode requiredBillingContactFields:(NSSet<PKContactField> * _Nonnull)requiredBillingContactFields requiredShippingContactFields:(NSSet<PKContactField> * _Nonnull)requiredShippingContactFields;
 - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER;
 @end
 
@@ -453,7 +453,7 @@ SWIFT_PROTOCOL("_TtP12PayEngineSDK18PEApplePayDelegate_")
 - (void)paymentErrorWithError:(NSError * _Nonnull)error;
 - (void)paymentSheetDidMDismiss;
 - (void)paymentTokenDidReturnWithToken:(NSString * _Nonnull)token completion:(void (^ _Nonnull)(enum PEApplePayResult))completion;
-- (void)paymentTokenNotAvailable;
+- (void)paymentTokenNotAvailableWithError:(NSError * _Nullable)error;
 @end
 
 typedef SWIFT_ENUM(NSInteger, PEApplePayResult, open) {