GerhardHoffmann/customer_335
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'zg1/zone2' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone2

Browse Source
This commit is contained in:
Gerhard Hoffmann
2024-08-21 17:54:37 +02:00
parent 21512f927e 1b85f4ac03
commit ff78bf1411
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
etc/atbapp/states/APP_States.xml
View File

@@ -152,7 +152,7 @@
<APP_STATE name="CASH_PAYMENT_INPUT"> <APP_STATE name="CASH_PAYMENT_INPUT">
<ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/> <ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/>
<EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/> <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
<EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CASH_OVERPAYED"/> <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CASH_OVERPAYED_ASK"/>
<EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/> <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/> <EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/> <EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
@@ -165,7 +165,15 @@
<EVENT name="TIMEOUT" resultingState="IDLE"/> <EVENT name="TIMEOUT" resultingState="IDLE"/>
<SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/> <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
</APP_STATE> </APP_STATE>
<APP_STATE name="CASH_OVERPAYED">
<APP_STATE name="CASH_OVERPAYED_ASK">
<ENTRY_TASK name="PAYMENT_ACCEPTED"/>
<EVENT name="BUTTON_YES" resultingState="PRINT_TICKET_CASH"/>
<EVENT name="BUTTON_NO" resultingState="CASH_OVERPAYED_ABORT"/>
<SCREEN name="CASH_OVERPAYED" note="screennumber 0x3c"/>
</APP_STATE>
<APP_STATE name="CASH_OVERPAYED_ABORT">
<ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/> <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
<ENTRY_TASK name="CASH_ABORT"/> <ENTRY_TASK name="CASH_ABORT"/>
<ENTRY_TASK name="TIMER" timeout="3000"/> <ENTRY_TASK name="TIMER" timeout="3000"/>

22
etc/atbapp/text/HMI_Texte.xml
View File

@@ -916,10 +916,10 @@
<ru_RU>ДА</ru_RU> <ru_RU>ДА</ru_RU>
</Text> </Text>
<Text textnr="0x37"> <Text textnr="0x37">
<lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT> <lt_LT>Permoka!</lt_LT>
<en_GB>Reached maximum number of coins.!</en_GB> <en_GB>Overpaid!</en_GB>
<de_DE>Maximalanzahl der Münzen erreicht!</de_DE> <de_DE>Überbezahlt!</de_DE>
<ru_RU>Достигнуто максимальное количество монет!</ru_RU> <ru_RU>Переплата!</ru_RU>
</Text> </Text>
<Text name="user_message_01" textnr="0x81"> <Text name="user_message_01" textnr="0x81">
<lt_LT>Permoka!</lt_LT> <lt_LT>Permoka!</lt_LT>
@@ -1438,10 +1438,10 @@
<ru_RU>Переплата!</ru_RU> <ru_RU>Переплата!</ru_RU>
</Text> </Text>
<Text name="user_message_08" textnr="0x88"> <Text name="user_message_08" textnr="0x88">
<lt_LT>Minimalus stovėjimo mokėstis</lt_LT> <lt_LT>SUTEIKITE TIKSLIĄ SUMĄ…</lt_LT>
<en_GB>Minimum parking fee</en_GB> <en_GB>PLEASE, PAY APPROPRIATELY</en_GB>
<de_DE>Mindestparkgebühr</de_DE> <de_DE>BITTE PASSEND ZAHLEN</de_DE>
<ru_RU>Минимальная плата за парковку</ru_RU> <ru_RU>ПРЕДОСТАВЬТЕ ТОЧНУЮ СУММУ…</ru_RU>
</Text> </Text>
</Screen> </Screen>
<Screen name="PayMethod3" screennr="0x41"> <Screen name="PayMethod3" screennr="0x41">
@@ -2280,6 +2280,12 @@
<de_DE>Fehler Kartenleser</de_DE> <de_DE>Fehler Kartenleser</de_DE>
<ru_RU>Ошибка считывающего устройства</ru_RU> <ru_RU>Ошибка считывающего устройства</ru_RU>
</Text> </Text>
<Text textnr="0x88">
<lt_LT>Laukiama kortelių terminalo…</lt_LT>
<en_GB>Waiting for card reader…</en_GB>
<de_DE>Warte auf Kartenterminal…</de_DE>
<ru_RU>Ожидание терминала для карт…</ru_RU>
</Text>
</Screen> </Screen>
<Screen name="CreditCard3" screennr="0x53"> <Screen name="CreditCard3" screennr="0x53">
<Text textnr="0x30"> <Text textnr="0x30">