Skip to content

EACQAPW-5761: Реализована возможность передачи paymentId на главную форму. #308

Open
wants to merge 1 commit into
base: 3.0.1
Choose a base branch
from
Open

EACQAPW-5761: Реализована возможность передачи paymentId на главную форму. #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sample/src/main/java/ru/tinkoff/acquiring/sample/ui/AttachCardManuallyDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import ru.tinkoff.acquiring.sample.R
import ru.tinkoff.acquiring.sample.SampleApplication
import ru.tinkoff.acquiring.sample.ui.MainActivity.Companion.toast
import ru.tinkoff.acquiring.sample.utils.SessionParams
import ru.tinkoff.acquiring.sample.utils.TerminalsManager
import ru.tinkoff.acquiring.sample.utils.toast
import ru.tinkoff.acquiring.sdk.models.enums.ResponseStatus
import ru.tinkoff.acquiring.sdk.models.options.screen.BaseAcquiringOptions
import ru.tinkoff.acquiring.sdk.models.paysources.CardData
Expand Down Expand Up @@ -89,4 +89,4 @@ class AttachCardManuallyDialogFragment : DialogFragment() {

const val TAG = "AttachCardManuallyDialogFragment"
}
}
}
5 changes: 1 addition & 4 deletions sample/src/main/java/ru/tinkoff/acquiring/sample/ui/CartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import ru.tinkoff.acquiring.sample.R
import ru.tinkoff.acquiring.sample.adapters.CartListAdapter
import ru.tinkoff.acquiring.sample.models.BooksRegistry
import ru.tinkoff.acquiring.sample.models.Cart
import ru.tinkoff.acquiring.sample.ui.payable.PayableActivity
import ru.tinkoff.acquiring.sdk.utils.Money

/**
Expand Down Expand Up @@ -166,10 +167,6 @@ class CartActivity : PayableActivity(), CartListAdapter.DeleteCartItemListener {
return result.toString()
}

private fun setupRecurrentParentPayment(hasRecurrent: Boolean) {
recurrentButton.isVisible = hasRecurrent
}

companion object {

fun start(context: Context) {
Expand Down
3 changes: 1 addition & 2 deletions sample/src/main/java/ru/tinkoff/acquiring/sample/ui/DetailsActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import android.view.View
import android.widget.ImageView
import android.widget.TextView
import android.widget.Toast
import androidx.activity.result.ActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.lifecycle.lifecycleScope
import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.Dispatchers
Expand All @@ -35,6 +33,7 @@ import ru.tinkoff.acquiring.sample.R
import ru.tinkoff.acquiring.sample.models.Book
import ru.tinkoff.acquiring.sample.models.BooksRegistry
import ru.tinkoff.acquiring.sample.models.Cart
import ru.tinkoff.acquiring.sample.ui.payable.PayableActivity
import ru.tinkoff.acquiring.sdk.AcquiringSdk
import ru.tinkoff.acquiring.sdk.models.options.screen.PaymentOptions
import ru.tinkoff.acquiring.sdk.payment.methods.InitConfigurator.configure
Expand Down
12 changes: 1 addition & 11 deletions sample/src/main/java/ru/tinkoff/acquiring/sample/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@

package ru.tinkoff.acquiring.sample.ui

import android.app.Activity
import android.content.Intent
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.widget.ListView
import android.widget.Toast
import androidx.annotation.StringRes
import androidx.appcompat.app.AppCompatActivity
import ru.tinkoff.acquiring.sample.R
import ru.tinkoff.acquiring.sample.SampleApplication
Expand All @@ -33,6 +31,7 @@ import ru.tinkoff.acquiring.sample.models.BooksRegistry
import ru.tinkoff.acquiring.sample.ui.environment.AcqEnvironmentDialog
import ru.tinkoff.acquiring.sample.utils.SettingsSdkManager
import ru.tinkoff.acquiring.sample.utils.TerminalsManager
import ru.tinkoff.acquiring.sample.utils.toast
import ru.tinkoff.acquiring.sdk.localization.AsdkSource
import ru.tinkoff.acquiring.sdk.localization.Language
import ru.tinkoff.acquiring.sdk.models.options.FeaturesOptions
Expand Down Expand Up @@ -247,17 +246,8 @@ class MainActivity : AppCompatActivity(), BooksListAdapter.BookDetailsClickListe
}

companion object {

private const val STATIC_QR_REQUEST_CODE = 12
const val NOTIFICATION_PAYMENT_REQUEST_CODE = 14
const val THREE_DS_REQUEST_CODE = 15

fun Activity.toast(message: String) = runOnUiThread {
Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
}

fun Activity.toast(@StringRes message: Int) = runOnUiThread {
Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
}
}
}
Loading