commit 1145de61d14950d8cebd20f2c1aa49dbe10e1b22
parent 19a965a3bb7dc181bff92890a357c1c16bd7dca7
Author: Bohdan Potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date: Thu, 5 Nov 2026 15:10:20 +0100
[pos] some new sscreenshots logic
Diffstat:
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
@@ -6,6 +6,7 @@
<GradleProjectSettings>
<option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
+ <option name="gradleJvm" value="jbr-17" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/merchant-terminal/scripts/capture-screenshots.py b/merchant-terminal/scripts/capture-screenshots.py
@@ -79,6 +79,7 @@ SCENARIOS = [
'order-details-products',
'settings-about',
'order-catalogue-more',
+ 'payment-partial',
]
SCROLLED = {
'order-details-products': 'order-details',
@@ -183,7 +184,7 @@ def capture(jobs, args):
if time.monotonic() > deadline:
raise RuntimeError(f'No ready signal: {job.path}')
time.sleep(.2)
- time.sleep(8 if scenario in ('payment', 'payment-external', 'refund-qr') else 1.5)
+ time.sleep(8 if scenario in ('payment', 'payment-partial', 'payment-external', 'refund-qr') else 1.5)
if job.scenario in SCROLLED:
w, h = expected
start_y = .5 if job.scenario == 'order-catalogue-more' else .65
diff --git a/merchant-terminal/src/debug/java/net/taler/merchantpos/debug/ScreenshotActivity.kt b/merchant-terminal/src/debug/java/net/taler/merchantpos/debug/ScreenshotActivity.kt
@@ -349,7 +349,7 @@ class ScreenshotActivity : AppCompatActivity()
}
}
- "payment", "payment-claimed", "payment-external" ->
+ "payment", "payment-claimed", "payment-external", "payment-partial" ->
{
WithTopBar(
stringResource(
@@ -430,7 +430,7 @@ class ScreenshotActivity : AppCompatActivity()
"quantity-before", "quantity-after", "order-cleared"
-> seedOrder(scenario)
- "payment", "payment-claimed", "payment-external" -> seedPayment(scenario)
+ "payment", "payment-claimed", "payment-external", "payment-partial" -> seedPayment(scenario)
"history" -> seedHistory()
@@ -534,13 +534,14 @@ class ScreenshotActivity : AppCompatActivity()
{
val claimed = scenario == "payment-claimed"
val externalReceipt = scenario == "payment-external"
+ val partial = scenario == "payment-partial"
val currentOrderId = model.orderManager.currentOrderId.value ?: 0
if (!externalReceipt)
{
val paymentProduct =
ConfigProduct(
- description = if (claimed) "Coffee and sandwich" else "Order total",
- price = Amount.fromString(CURRENCY, if (claimed) "5.40" else "123.45"),
+ description = if (claimed) "Coffee and sandwich" else if (partial) "Remaining balance" else "Order total",
+ price = Amount.fromString(CURRENCY, if (claimed) "5.40" else if (partial) "14.00" else "123.45"),
categories = listOf(Int.MIN_VALUE),
)
model.orderManager.addProduct(currentOrderId, paymentProduct)
@@ -576,7 +577,7 @@ class ScreenshotActivity : AppCompatActivity()
orderId = "2026-ORD-1042",
talerPayUri = "taler://pay/example.invalid/2026-ORD-1042/ZXCVBNM123456",
claimed = claimed,
- checkoutId = if (externalReceipt) "checkout-external-fixture" else null,
+ checkoutId = if (externalReceipt) "checkout-external-fixture" else if (partial) "checkout-partial-fixture" else null,
selfCollect = externalReceipt,
merchantName = "Sandbox merchant",
payDeadline = Timestamp.fromMillis(System.currentTimeMillis() + 3_600_000),