From bc35e8924e652c323001f62f6781657545fa378f Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 28 Jul 2020 17:16:57 -0300 Subject: [pos] adapt history to new v1 API --- .../main/java/net/taler/merchantpos/history/RefundManager.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundManager.kt') diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundManager.kt index da642d6..7f9b4c5 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundManager.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/history/RefundManager.kt @@ -25,6 +25,7 @@ import com.android.volley.RequestQueue import com.android.volley.Response.Listener import com.android.volley.VolleyError import net.taler.common.Amount +import net.taler.merchantlib.OrderHistoryEntry import net.taler.merchantpos.LogErrorListener import net.taler.merchantpos.config.ConfigManager import net.taler.merchantpos.config.MerchantRequest @@ -36,7 +37,7 @@ sealed class RefundResult { object AlreadyRefunded : RefundResult() class Success( val refundUri: String, - val item: HistoryItem, + val item: OrderHistoryEntry, val amount: Amount, val reason: String ) : RefundResult() @@ -51,14 +52,14 @@ class RefundManager( val TAG = RefundManager::class.java.simpleName } - var toBeRefunded: HistoryItem? = null + var toBeRefunded: OrderHistoryEntry? = null private set private val mRefundResult = MutableLiveData() internal val refundResult: LiveData = mRefundResult @UiThread - internal fun startRefund(item: HistoryItem) { + internal fun startRefund(item: OrderHistoryEntry) { toBeRefunded = item mRefundResult.value = null } @@ -70,7 +71,7 @@ class RefundManager( } @UiThread - internal fun refund(item: HistoryItem, amount: Amount, reason: String) { + internal fun refund(item: OrderHistoryEntry, amount: Amount, reason: String) { val merchantConfig = configManager.merchantConfig!! val refundRequest = mapOf( "order_id" to item.orderId, @@ -89,7 +90,7 @@ class RefundManager( @UiThread private fun onRefundResponse( json: JSONObject, - item: HistoryItem, + item: OrderHistoryEntry, amount: Amount, reason: String ) { -- cgit v1.2.3