restore before pulling

This commit is contained in:
Gerhard Hoffmann 2024-02-29 11:26:21 +01:00
commit de76a59a5b
2 changed files with 35 additions and 26 deletions

View File

@ -48,7 +48,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"/>
@ -61,13 +61,22 @@
<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_ISAMAS_FAIL_TRANSACTION"/> <ENTRY_TASK name="REQUEST_ISAMAS_FAIL_TRANSACTION"/>
<ENTRY_TASK name="CASH_ABORT"/> <ENTRY_TASK name="CASH_ABORT"/>
<ENTRY_TASK name="TIMER" timeout="3000"/> <ENTRY_TASK name="TIMER" timeout="3000"/>
<EVENT name="TIMEOUT" resultingState="IDLE"/> <EVENT name="TIMEOUT" resultingState="IDLE"/>
<SCREEN name="CASH_CHANGE_OVERPAID" note="screennumber 0x8a"/> <SCREEN name="CASH_CHANGE_OVERPAID" note="screennumber 0x8a"/>
</APP_STATE> </APP_STATE>
<APP_STATE name="CASH_PAYMENT_ABORT"> <APP_STATE name="CASH_PAYMENT_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"/>

View File

@ -858,11 +858,11 @@
</Screen> </Screen>
<Screen name="Receipt" screennr="0x3c"> <Screen name="Receipt" screennr="0x3c">
<Text textnr="0x30"> <Text textnr="0x30">
<de_DE>Parkzeitende:</de_DE> <de_DE> </de_DE>
<de_AT>Parkzeitende:</de_AT> <de_AT> </de_AT>
<en_GB>Park. time ends:</en_GB> <en_GB> </en_GB>
<fr_FR>Heure de fin:</fr_FR> <fr_FR> </fr_FR>
<it_IT>Fine sosta:</it_IT> <it_IT> </it_IT>
</Text> </Text>
<Text textnr="0x31"> <Text textnr="0x31">
<de_AT> </de_AT> <de_AT> </de_AT>
@ -886,8 +886,8 @@
<it_IT> </it_IT> <it_IT> </it_IT>
</Text> </Text>
<Text textnr="0x34"> <Text textnr="0x34">
<de_DE>Parkschein anfordern?</de_DE> <de_DE>Ticket anfordern?</de_DE>
<de_AT>Parkschein anfordern?</de_AT> <de_AT>Ticket anfordern?</de_AT>
<en_GB>Request Ticket?</en_GB> <en_GB>Request Ticket?</en_GB>
<fr_FR>Demande billet?</fr_FR> <fr_FR>Demande billet?</fr_FR>
<it_IT>Richiesta biglietto.</it_IT> <it_IT>Richiesta biglietto.</it_IT>
@ -965,10 +965,10 @@
<it_IT> </it_IT> <it_IT> </it_IT>
</Text> </Text>
<Text textnr="0x34"> <Text textnr="0x34">
<de_AT>Parkschein anfordern?</de_AT> <de_AT>Ticket anfordern?</de_AT>
<en_GB>Request Ticket?</en_GB> <en_GB>Request Ticket?</en_GB>
<fr_FR>Demande billet?</fr_FR> <fr_FR>Demande billet?</fr_FR>
<de_DE>Parkschein anfordern?</de_DE> <de_DE>Ticket anfordern?</de_DE>
<it_IT> </it_IT> <it_IT> </it_IT>
</Text> </Text>
<Text textnr="0x35"> <Text textnr="0x35">
@ -1409,11 +1409,11 @@
<it_IT>Selezioni il tipo di pagamento</it_IT> <it_IT>Selezioni il tipo di pagamento</it_IT>
</Text> </Text>
<Text textnr="0x31"> <Text textnr="0x31">
<de_AT>Parkende: </de_AT> <de_AT> </de_AT>
<en_GB>End of Parking time: </en_GB> <en_GB> </en_GB>
<fr_FR>Fin du temps: </fr_FR> <fr_FR> </fr_FR>
<de_DE>Parkende: </de_DE> <de_DE> </de_DE>
<it_IT>Fine sosta: </it_IT> <it_IT> </it_IT>
</Text> </Text>
<Text textnr="0x32"> <Text textnr="0x32">
<de_AT> </de_AT> <de_AT> </de_AT>
@ -1488,11 +1488,11 @@
<it_IT>Prego inserire monete:</it_IT> <it_IT>Prego inserire monete:</it_IT>
</Text> </Text>
<Text textnr="0x31"> <Text textnr="0x31">
<de_AT>Parkende: </de_AT> <de_AT> </de_AT>
<en_GB>End of Parking time: </en_GB> <en_GB> </en_GB>
<fr_FR>Fin du temps: </fr_FR> <fr_FR> </fr_FR>
<de_DE>Parkende: </de_DE> <de_DE> </de_DE>
<it_IT>Fine sosta: </it_IT> <it_IT> </it_IT>
</Text> </Text>
<Text textnr="0x32"> <Text textnr="0x32">
<de_AT> </de_AT> <de_AT> </de_AT>
@ -1644,11 +1644,11 @@
<it_IT>Prego inserire monete:</it_IT> <it_IT>Prego inserire monete:</it_IT>
</Text> </Text>
<Text textnr="0x31"> <Text textnr="0x31">
<de_AT>Parkende: </de_AT> <de_AT> </de_AT>
<en_GB>End of Parking time: </en_GB> <en_GB> </en_GB>
<fr_FR>Fin du temps: </fr_FR> <fr_FR> </fr_FR>
<de_DE>Parkende: </de_DE> <de_DE> </de_DE>
<it_IT>Fine sosta: </it_IT> <it_IT> </it_IT>
</Text> </Text>
<Text textnr="0x32"> <Text textnr="0x32">
<de_AT> </de_AT> <de_AT> </de_AT>