aboutsummaryrefslogtreecommitdiff
path: root/merchant-terminal
diff options
context:
space:
mode:
Diffstat (limited to 'merchant-terminal')
-rw-r--r--merchant-terminal/.gitlab-ci.yml5
-rw-r--r--merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt2
-rw-r--r--merchant-terminal/src/main/res/values/strings.xml1
3 files changed, 5 insertions, 3 deletions
diff --git a/merchant-terminal/.gitlab-ci.yml b/merchant-terminal/.gitlab-ci.yml
index 4c03405..467824c 100644
--- a/merchant-terminal/.gitlab-ci.yml
+++ b/merchant-terminal/.gitlab-ci.yml
@@ -4,6 +4,10 @@ merchant_test:
changes:
- "merchant-terminal"
script: ./gradlew :merchant-terminal:lint :merchant-terminal:assembleRelease
+ artifacts:
+ paths:
+ - merchant-terminal/build/reports/lint-results.html
+ expire_in: 1 week
merchant_deploy_nightly:
stage: deploy
@@ -12,6 +16,7 @@ merchant_deploy_nightly:
- master
changes:
- "merchant-terminal"
+ needs: ["merchant_test"]
script:
# Ensure that key exists
- test -z "$DEBUG_KEYSTORE" && exit 0
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt
index 594e7cc..faee226 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/history/HistoryManager.kt
@@ -16,12 +16,10 @@
package net.taler.merchantpos.history
-import android.util.Log
import androidx.annotation.UiThread
import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import com.android.volley.Request.Method.GET
-import com.android.volley.Request.Method.POST
import com.android.volley.RequestQueue
import com.android.volley.Response.ErrorListener
import com.android.volley.Response.Listener
diff --git a/merchant-terminal/src/main/res/values/strings.xml b/merchant-terminal/src/main/res/values/strings.xml
index 77c7e03..ae82f96 100644
--- a/merchant-terminal/src/main/res/values/strings.xml
+++ b/merchant-terminal/src/main/res/values/strings.xml
@@ -46,7 +46,6 @@
<string name="payment_canceled">Payment Canceled</string>
<string name="history_label">Payment History</string>
- <string name="history_received_at">Received at</string>
<string name="history_ref_no">Ref. No: %s</string>
<string name="history_refund">Refund Order</string>
<string name="refund_amount">Amount</string>