Merge pull request #15 from afterpay/maintenance/update-from-upstream…

…-button-cashapp maintenance: update from upstream - CashAppPay via Afterpay Button
afterpay · Jun 23, 2024 · 3ba3fbe · 3ba3fbe
2 parents 3a5df18 + 4e8e895
commit 3ba3fbe
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/afterpay/src/main/kotlin/com/afterpay/android/Afterpay.kt b/afterpay/src/main/kotlin/com/afterpay/android/Afterpay.kt
@@ -262,6 +262,8 @@ object Afterpay {
      * Returns an [Intent] for the given [context] and options that can be passed to
      * [startActivityForResult][android.app.Activity.startActivityForResult] to initiate the
      * Afterpay checkout.
+     *
+     * @param isCashApp Should this checkout be backed by Cash App (true) or Afterpay (false)
      */
     @JvmStatic
     @JvmOverloads
@@ -271,6 +273,7 @@ object Afterpay {
         orderTotal: OrderTotal,
         items: Array<CheckoutV3Item> = arrayOf(),
         buyNow: Boolean,
+        isCashApp: Boolean,
         configuration: CheckoutV3Configuration? = checkoutV3Configuration,
     ): Intent {
         requireNotNull(configuration) {
@@ -281,6 +284,7 @@ object Afterpay {
             orderTotal = orderTotal,
             items = items,
             configuration = configuration,
+            isCashAppPay = isCashApp,
         )
         val options = AfterpayCheckoutV3Options(
             buyNow = buyNow,

diff --git a/afterpay/src/main/kotlin/com/afterpay/android/internal/CheckoutV3.kt b/afterpay/src/main/kotlin/com/afterpay/android/internal/CheckoutV3.kt
@@ -42,11 +42,13 @@ internal object CheckoutV3 {
         val merchant: Merchant,
         val shipping: Contact?,
         val billing: Contact?,
+        val isCashAppPay: Boolean?,
     ) {
         companion object {
             @JvmStatic
             fun create(
                 consumer: CheckoutV3Consumer,
+                isCashAppPay: Boolean?,
                 orderTotal: OrderTotal,
                 items: Array<CheckoutV3Item>,
                 configuration: CheckoutV3Configuration,
@@ -75,6 +77,8 @@ internal object CheckoutV3 {
                     ),
                     shipping = Contact.create(consumer.shippingInformation),
                     billing = Contact.create(consumer.billingInformation),
+                    // server only handles true or null
+                    isCashAppPay = isCashAppPay?.let { if (!it) null else true },
                 )
             }
         }

diff --git a/example/src/main/kotlin/com/example/afterpay/checkout/CheckoutFragment.kt b/example/src/main/kotlin/com/example/afterpay/checkout/CheckoutFragment.kt
@@ -173,6 +173,7 @@ class CheckoutFragment : Fragment() {
                                 ),
                             ),
                             buyNow = command.buyNow,
+                            isCashApp = false,
                         )
                         startActivityForResult(intent, CHECKOUT_WITH_AFTERPAY_V3)
                     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -173,6 +173,7 @@ class CheckoutFragment : Fragment() { @@
                                     ),
                                 ),
                                 buyNow = command.buyNow,
+                                isCashApp = false,
                             )
                             startActivityForResult(intent, CHECKOUT_WITH_AFTERPAY_V3)
                         }
@@ Expand Down @@