From 641bffabd0bc891ac2c6245d4ca2b6b15677e861 Mon Sep 17 00:00:00 2001
From: Siegfried Siegert <s.siegert@atb-online.eu>
Date: Mon, 6 May 2024 12:28:32 +0200
Subject: [PATCH] Update ATBQT/States:

 - product selection: with licenscplate results in paperless ticket
 - ask for printing bank receipt
---
 etc/atbapp/states/APP_States.xml | 69 +++++++++++++++++++++++---------
 1 file changed, 50 insertions(+), 19 deletions(-)

diff --git a/etc/atbapp/states/APP_States.xml b/etc/atbapp/states/APP_States.xml
index 5ad7b76..b471ffc 100644
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ATB_APP_STATES version="1.1">
     <APP_STATE name="IDLE">
-        <EVENT name="BUTTON_START" resultingState="LICENSEPLATE_INPUT"/>
+        <EVENT name="BUTTON_START" resultingState="PRODUCT_SELECTION"/>
         <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
         <SCREEN name="START"/>
         <MODE name="IDLE"/>
@@ -12,17 +12,27 @@
         <MODE name="IDLE"/>
     </APP_STATE>
     
+    <APP_STATE name="PRODUCT_SELECTION">
+        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+        <EVENT name="BUTTON_VEHICLE_1" resultingState="LICENSEPLATE_INPUT" setProduct="SHORT_TERM_PARKING" setCheckFeature="SKIP_TICKET_PRINT"/>
+        <EVENT name="BUTTON_VEHICLE_2" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
+        <SCREEN name="PRODUCT_SELECTION"/>
+    </APP_STATE>
+    
+    <!--
+    <APP_STATE name="SKIP_TICKET_PRINT_TEST">
+        <ENTRY_TASK name="PRINT_LOG" text="APP_STATE name=SKIP_TICKET_PRINT_TEST"/>
+        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
+        <EVENT name="CHECK_TRUE"  resultingState="LICENSEPLATE_INPUT"/>
+        <EVENT name="CHECK_FALSE" resultingState="PARKTIME_SELECTION"/>
+    </APP_STATE>
+    -->
+    
     <APP_STATE name="LICENSEPLATE_INPUT">
         <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
         <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
         <SCREEN name="LICENSEPLATE_INPUT"/>
     </APP_STATE>
-   <APP_STATE name="PRODUCT_SELECTION">
-       <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-       <EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP"   setProduct="SHORT_TERM_PARKING"/>
-       <EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DAY_TICKET"/>
-       <SCREEN name="PRODUCT_SELECTION"/>
-   </APP_STATE>
    
    <APP_STATE name="PAYMENT_SELECTION">
        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
@@ -62,7 +72,7 @@
     <APP_STATE name="CARD_PAYMENT">
         <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
         <ENTRY_TASK name="REQUEST_CC_START_TRANSACTION"/>
-        <EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="PRINT_TICKET_CARD"/>
+        <EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="CHECK_PAPERLESS_CARD"/>
         <EVENT name="RECEIVED_CARD_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
         <EVENT name="BUTTON_CANCEL" resultingState="USER_CC_ABORT"/>
         <SCREEN name="CC_PAYMENT"/>
@@ -71,8 +81,8 @@
     <APP_STATE name="CASH_PAYMENT">
         <ENTRY_TASK name="REQUEST_CASH_INPUT"/>
         <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
-        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
-        <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_FINISHED"  resultingState="CHECK_PAPERLESS_CASH"/>
 	<EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
 	<EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
         <SCREEN name="COIN_PAYMENT"/>
@@ -80,8 +90,8 @@
     <APP_STATE name="CASH_PAYMENT_INPUT">
         <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
         <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
-        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
-        <EVENT name="RECEIVED_CASH_INPUT_FINISHED" resultingState="PRINT_TICKET_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_FINISHED"  resultingState="CHECK_PAPERLESS_CASH"/>
         <EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
         <EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
         <EVENT name="BUTTON_NEXT" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
@@ -94,7 +104,7 @@
         <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
     </APP_STATE>
     <APP_STATE name="CASH_OVERPAYED">
-        <ENTRY_TASK name="REQUEST_ISAMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
         <ENTRY_TASK name="CASH_ABORT"/>
         <ENTRY_TASK name="TIMER" timeout="3000"/>
         <EVENT name="TIMEOUT" resultingState="IDLE"/>
@@ -114,6 +124,19 @@
         <SCREEN name="BUSY"/>
     </APP_STATE>
     -->
+    
+    <APP_STATE name="CHECK_PAPERLESS_CASH">
+        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
+        <EVENT name="CHECK_TRUE"  resultingState="FINALISE_CASH_PAYMENT" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
+        <EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CASH"/>
+    </APP_STATE>
+    <APP_STATE name="CHECK_PAPERLESS_CARD">
+        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
+        <EVENT name="CHECK_TRUE"  resultingState="CARD_PAYMENT_CONFIRM" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
+        <EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CARD"/>
+    </APP_STATE>
+    
+    
     <APP_STATE name="PRINT_TICKET_CASH">
         <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
         <EVENT name="PRINT_TICKET_FINISHED" resultingState="FINALISE_CASH_PAYMENT"/>
@@ -137,20 +160,28 @@
 
     <APP_STATE name="CARD_PAYMENT_CONFIRM">
         <ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
-        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="PRINT_RECEIPT"/>
+        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="ASK_RECEIPT"/>
         <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR"   resultingState="CC_PAYMENT_ERROR"/>
-    </APP_STATE>      
+    </APP_STATE>
+    <APP_STATE name="ASK_RECEIPT">
+        <ENTRY_TASK name="TIMER" timeout="6000"/>
+        <EVENT name="TIMEOUT" resultingState="GOODBYE_PAYMENT_OK"/>
+        <EVENT name="BUTTON_YES" resultingState="PRINT_RECEIPT"/>
+        <EVENT name="BUTTON_NO"  resultingState="GOODBYE_PAYMENT_OK"/>
+        <SCREEN name="ASK_RECEIPT"/>
+    </APP_STATE>
     <APP_STATE name="PRINT_RECEIPT">
         <ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
         <EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
         <EVENT name="PRINT_RECEIPT_ERROR" resultingState="PRINT_TICKET_FAILED"/>
-    </APP_STATE>   
+        <SCREEN name="PRINT_RECEIPT"/>
+    </APP_STATE>
     
     <APP_STATE name="FINALISE_CASH_PAYMENT">
         <ENTRY_TASK name="CASH_COLLECT"/>
         <EVENT name="RECEIVED_CASH_CHANGE_BACK" resultingState="GIVE_CHANGE"/>
         <EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
-        <!-- TODO: hangle changer Error -->
+        <!-- TODO: handle changer Error -->
         <!-- no screen change here -->
     </APP_STATE>   
     <APP_STATE name="GIVE_CHANGE">
@@ -161,8 +192,8 @@
         <ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
         <ENTRY_TASK name="TIMER" timeout="2000"/>
         <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="GOODBYE_PAYMENT_OK"/>
-    </APP_STATE>
+        <SCREEN name="GOODBYE_3" note="green_hook"/>
+    </APP_STATE>   
     
     <APP_STATE name="CC_PAYMENT_ERROR">
         <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>