Fix typo in printer json

etc/atbapp/states/APP_States_744_NAZ.xml

@@ -48,7 +48,7 @@
     <APP_STATE name="CASH_PAYMENT_INPUT">
         <ENTRY_TASK name="REQUEST_PARKING_ENDTIME"/>
         <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_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
         <EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
@@ -61,13 +61,22 @@
         <EVENT name="TIMEOUT" resultingState="IDLE"/>
         <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
     </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="CASH_ABORT"/>
         <ENTRY_TASK name="TIMER" timeout="3000"/>
         <EVENT name="TIMEOUT" resultingState="IDLE"/>
         <SCREEN name="CASH_CHANGE_OVERPAID" note="screennumber 0x8a"/>
     </APP_STATE>
+    
     <APP_STATE name="CASH_PAYMENT_ABORT">
         <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
         <ENTRY_TASK name="CASH_ABORT"/>

etc/atbapp/text/HMI_Texte_744_NAZ.xml

@@ -858,11 +858,11 @@
 	</Screen>
 	<Screen name="Receipt" screennr="0x3c">
         <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 textnr="0x31">
             <de_AT> </de_AT>
@@ -886,8 +886,8 @@
             <it_IT> </it_IT>
         </Text>
         <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>
             <fr_FR>Demande billet?</fr_FR>
             <it_IT>Richiesta biglietto.</it_IT>
@@ -965,10 +965,10 @@
             <it_IT> </it_IT>
         </Text>
         <Text textnr="0x34">
-            <de_AT>Parkschein anfordern?</de_AT>
+            <de_AT>Ticket anfordern?</de_AT>
             <en_GB>Request Ticket?</en_GB>
             <fr_FR>Demande billet?</fr_FR>
-            <de_DE>Parkschein anfordern?</de_DE>
+            <de_DE>Ticket anfordern?</de_DE>
             <it_IT> </it_IT>
         </Text>
         <Text textnr="0x35">
@@ -1409,11 +1409,11 @@
             <it_IT>Selezioni il tipo di pagamento</it_IT>
 		</Text>
         <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 textnr="0x32">
             <de_AT> </de_AT>
@@ -1488,11 +1488,11 @@
             <it_IT>Prego inserire monete:</it_IT>
 		</Text>
         <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 textnr="0x32">
             <de_AT> </de_AT>
@@ -1644,11 +1644,11 @@
             <it_IT>Prego inserire monete:</it_IT>
 		</Text>
         <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 textnr="0x32">
             <de_AT> </de_AT>

etc/psa_config/DC2C_cash.json

@@ -0,0 +1,18 @@
+	     
+"title":"DC2C_cash  ",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,1],
+"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,3],
+"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0],
+"ExchangeRate":1,
+"TokenChannel":6,
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"LocalTaxRate":19,
+"ForeignTaxRate":0,
+"Surcharge":0,	
+"Discount":0
+}
+
+

etc/psa_config/DC2C_conf.json

@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"NVT NAZ",
+"version":"28.02.2024 00001",
+"custNum":744,
+"machNum":1,
+"borough":1,
+"zone":1,
+"alias":0,
+"location":"NAZ Parkplatz"
+}
+

etc/psa_config/DC2C_device.json

@@ -0,0 +1,27 @@
+{
+"title":"DC2C_device",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"printer":1,
+"coinChk":1,
+"mifRd":1,
+"solarPwr":0,
+"modem":0,
+"creditCard":1,
+"escrow":1,
+"RejMotor":0,
+"shutter":1,
+"billRd":0,
+"vaultLock":0,
+"autoAlarm":1,
+"autoOpen":1,
+"AccPrint":1,
+"DorPrint":1,
+"TokPrint":1,
+"CBwarnLev":1600,
+"CBerrLev":1900,
+"BattWarn":11800,
+"BattErr":11200,
+"foreign":1,
+"refPrint":0
+}

etc/psa_config/DC2C_print01.json

@@ -0,0 +1,51 @@
+{
+"title":"DC2C_pri01",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"styl":"font 08",
+"feed":"margin05",
+"feed":"rim02",
+"styl":"size 00",
+"graf":"logo1",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Nordisches",
+"feed":"nl",
+"text":"Ausbildungs",
+"feed":"nl",
+"text":"-zentrum",
+"feed":"nl",
+"feed":"nl",
+"text":"Eintritt",
+"feed":"nl",
+"text":"Erwachsener",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 10",
+"text":"bezaht: 9,-€",
+"feed":"nl",
+"text":"am: ",
+"vari":"wday deu short",
+"text":"den ",
+"vari":"date ge",
+"feed":"nl",
+"text":"Ticket Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print02.json

@@ -0,0 +1,21 @@
+{
+"title":"DC2C_pri02",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"issued":"22.01.2024 01.01",
+"feed":"nl",
+
+
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print03.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri03",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"text":"";
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print04.json

@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri04",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"text":"";
+}

etc/psa_config/DC2C_print05.json

@@ -0,0 +1,51 @@
+{
+"title":"DC2C_pri05",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"styl":"font 08",
+"feed":"margin05",
+"feed":"rim02",
+"styl":"size 00",
+"graf":"logo1",
+"styl":"font 10",
+"styl":"size 11",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Nordisches",
+"feed":"nl",
+"text":"Ausbildungs",
+"feed":"nl",
+"text":"-zentrum",
+"feed":"nl",
+"feed":"nl",
+"text":"Eintritt",
+"feed":"nl",
+"text":"Jugendlich",
+"feed":"nl",
+"feed":"nl",
+"styl":"size 10",
+"text":"bezahlt: 5,-€",
+"feed":"nl",
+"text":"am: ",
+"vari":"wday deu short",
+"text":"den ",
+"vari":"date ge",
+"feed":"nl",
+"text":"Ticket Nr. ",
+"vari":"TickCtr",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print06.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri06",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"text":""
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print07.json

@@ -0,0 +1,18 @@
+{
+"title":"DC2C_pri07",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"text":""
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print08.json

@@ -0,0 +1,6 @@
+{
+"title":"DC2C_pri08",
+"project":"NVT NAZ",
+"Version":"28.02.2024 00103",
+"text":""
+}

etc/psa_config/DC2C_print31.json

@@ -0,0 +1,21 @@
+{
+"title":"DC2C_pri31",
+"project":"door close print",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"feed":"nl",
+"text":"Türöffnung um:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"feed":"eject"
+}
+
+

etc/psa_config/DC2C_print32.json

@@ -0,0 +1,42 @@
+{
+"title":"DC2C_pri32",
+"project":"refund reciept",
+"Version":"15.11.2023 00001",
+"styl":"font 08",
+"styl":"size 10",
+"feed":"margin02",
+"feed":"rim02",
+"feed":"speed10",
+"styl":"size 11",
+"text":"Ersatzbeleg",
+"feed":"nl",
+"styl":"size 00",
+"text":"Erstattungsbetrag: ",
+"feed":"nl",
+"vari":"Dynamic07",
+"text":"€",
+"feed":"nl",
+"text":"KuNu: ",
+"vari":"cunu",	
+"text":"MaNu: ",
+"vari":"manu",	
+"text":"Ort: ",
+"vari":"location",	
+"text":"Gruppe: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"text":"Am: ",
+"vari":"date us",
+"text":"Um: ",
+"vari":"time long",
+"feed":"nl",
+"text":" * * * * * * * * ",
+"feed":"nl",
+"feed":"nl",
+"feed":"eject"
+}
+
+

etc/psa_tariff/note_tariff_744_NAZ.txt

@@ -0,0 +1 @@
+Ticket price is also fixed in printer jsons!

etc/psa_tariff/tariff01.json

@@ -90,9 +90,9 @@
       "pop_price_night": 0,
       "pop_min_time": 1,
       "pop_max_time": 720,
-      "pop_min_price": 400,
+      "pop_min_price": 500,
       "pop_carry_over": 0,
-      "pop_daily_card_price": 400,
+      "pop_daily_card_price": 500,
       "pop_business_hours": 128
     },
     {
@@ -104,9 +104,9 @@
       "pop_price_night": 0,
       "pop_min_time": 1,
       "pop_max_time": 720,
-      "pop_min_price": 800,
+      "pop_min_price": 900,
       "pop_carry_over": 0,
-      "pop_daily_card_price": 800,
+      "pop_daily_card_price": 900,
       "pop_business_hours": 128 
     }
   ],
@@ -140,7 +140,7 @@
     },
     {
       "tariff_product_id": 4,
-      "tariff_product_price": 800,
+      "tariff_product_price": 900,
       "tariff_product_name": "DAY_TICKET_ADULT",
       "tariff_product_start": "08:00:00",
       "tariff_product_end": "20:00:00",
@@ -149,7 +149,7 @@
     },
     {
       "tariff_product_id": 5,
-      "tariff_product_price": 400,
+      "tariff_product_price": 500,
       "tariff_product_name": "DAY_TICKET_TEEN",
       "tariff_product_start": "08:00:00",
       "tariff_product_end": "20:00:00",
@@ -179,12 +179,12 @@
     {
       "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 1,
-      "pra_price": 400
+      "pra_price": 500
     },
     {
       "pra_payment_option_id": 1050,
       "pra_payment_unit_id": 2,
-      "pra_price": 800
+      "pra_price": 900
     }
   ],
   "DailyTicket": [