diff options
| author | Torsten Grote <t@grobox.de> | 2020-08-18 11:35:28 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2020-08-18 11:36:07 -0300 |
| commit | 612876e44de35cdbd563ac2ce40dcd1d4e397bc5 (patch) | |
| tree | b2127aff7376b7d2304e300d216d838a2e1d2595 /merchant-terminal/src/main/java/net/taler/merchantpos/order | |
| parent | 451157d992a4c771e3bdf80b6563f80fb1582c77 (diff) | |
| download | taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.tar.gz taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.tar.bz2 taler-android-612876e44de35cdbd563ac2ce40dcd1d4e397bc5.zip | |
Include Taler common Kotlin library as a submodule
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/order')
| -rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt | 2 | ||||
| -rw-r--r-- | merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt index a77e39b..738e32b 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/LiveOrder.kt @@ -20,8 +20,8 @@ import androidx.annotation.UiThread import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations -import net.taler.common.Amount import net.taler.common.CombinedLiveData +import net.taler.lib.common.Amount import net.taler.merchantpos.config.Category import net.taler.merchantpos.config.ConfigProduct import net.taler.merchantpos.order.RestartState.DISABLED diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt index 4053d4b..4fc2907 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/order/Order.kt @@ -16,10 +16,10 @@ package net.taler.merchantpos.order -import net.taler.common.Amount import net.taler.common.ContractTerms -import net.taler.common.Timestamp import net.taler.common.now +import net.taler.lib.common.Amount +import net.taler.lib.common.Timestamp import net.taler.merchantpos.config.Category import net.taler.merchantpos.config.ConfigProduct import java.net.URLEncoder |