fix: 710 cent not selectable using minus-button.

This reverts commit d324449cc6.

etc/atb/SystemControl.ini

@@ -0,0 +1,66 @@
+[AT_TASKS]
+1\arguments=restart, atbapp
+1\envs=
+1\hourOfDay=4
+1\id=ATBAPP_RESTART
+1\program=/bin/systemctl
+2\arguments=restart, apism
+2\envs=
+2\hourOfDay=4
+2\id=APISM_RESTART
+2\program=/bin/systemctl
+3\arguments=start, atbupdatetool
+3\envs=
+3\hourOfDay=1
+3\id=PTU5UPDATE
+3\program=/bin/systemctl
+size=3
+
+[BACKLIGHT]
+SensorMax=3500
+SensorMin=0
+curve=1
+dimLowValue=499
+dimMax=100
+dimMin=20
+inputBrightness=30
+
+[COMMON]
+startBacklightController=true
+startMQTTController=false
+startMonitoringController=false
+startSuspendController=true
+
+[MONITORING]
+http_dataFormat=HTTP
+http_host=127.0.0.1
+http_ignoreSslErrors=on
+http_port=5000
+http_protocol=http
+http_service=
+monitoring_heartbeatInterval=60
+protocol=mqtt
+useDeviceId=on
+useRingbuffer=on
+
+[MQTT]
+mqtt_QoS=0
+mqtt_TopicDeviceType=MP
+mqtt_TopicPrefix=ATB
+mqtt_TopicScheme=ATB_ISMAS
+mqtt_debug=on
+mqtt_host=mqtt2.atb-comm.de
+mqtt_password=xyz123
+mqtt_port=8883
+mqtt_useSsl=on
+mqtt_username=testuser
+
+[NETWORKCHECK]
+PingHost=google.com
+networkRestart=/sbin/ifup -a
+setOOO=off
+useNetworkCheck=on
+
+[SUSPEND]
+program=/home/root/system_powerdown_wakeup.sh
+suspendLoopTimerValue=8

etc/atbapp/ATBAPP.ini

@@ -122,3 +122,4 @@ debug=1
 parity=0
 sleep=0
 stopBits=1
+terminalPowerOnOffHours="06:00:00,22:00:00"

etc/atbapp/states/APP_States.xml

@@ -152,7 +152,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"/>
@@ -165,7 +165,15 @@
         <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_ISMAS_FAIL_TRANSACTION"/>
         <ENTRY_TASK name="CASH_ABORT"/>
         <ENTRY_TASK name="TIMER" timeout="3000"/>
@@ -220,9 +228,18 @@
     
     <APP_STATE name="CARD_PAYMENT_CONFIRM">
         <ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
-        <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_SUCCESS" resultingState="GOODBYE_PAYMENT_OK"/>
+        <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="8000"/>
+        <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"/>

etc/atbapp/text/HMI_Texte.xml

@@ -490,7 +490,7 @@
                         <ru_RU>Максимальная сумма билета</ru_RU>
                 </Text>
 		<Text name="user_message_04" textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                         <en_GB>Minimum parking fee</en_GB>
                         <de_DE>Mindestparkgebühr</de_DE>
                         <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -600,7 +600,7 @@
                         <ru_RU>Максимальная сумма билета</ru_RU>
                 </Text>
 		<Text name="user_message_04" textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                         <en_GB>Minimum parking fee</en_GB>
                         <de_DE>Mindestparkgebühr</de_DE>
                         <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -782,7 +782,7 @@
                         <ru_RU>Максимальная сумма билета</ru_RU>
                 </Text>
 		<Text name="user_message_04"  textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                         <en_GB>Minimum parking fee</en_GB>
                         <de_DE>Mindestparkgebühr</de_DE>
                         <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -846,7 +846,7 @@
             <ru_RU>Максимальная сумма билета</ru_RU>
         </Text>
 		<Text name="user_message_04"  textnr="0x84">
-            <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+            <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
             <en_GB>Minimum parking fee</en_GB>
             <de_DE>Mindestparkgebühr</de_DE>
             <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -898,10 +898,10 @@
 	      <ru_RU> </ru_RU>
 	  </Text>
 	  <Text textnr="0x34">
-	      <lt_LT>Spausdinti bilietą</lt_LT>
+          <lt_LT>Spausdinti kvitą?</lt_LT>
-	      <en_GB>Request Ticket?</en_GB>
+          <en_GB>Print receipt?</en_GB>
-	      <de_DE>Parkschein anfordern?</de_DE>
+          <de_DE>Quittung drucken?</de_DE>
-	      <ru_RU>Заказ билета</ru_RU>
+          <ru_RU>Распечатать квитанцию?</ru_RU>
 	  </Text>
 	  <Text textnr="0x35">
 	      <lt_LT>ATŠAUKTI</lt_LT>
@@ -916,10 +916,10 @@
 	      <ru_RU>ДА</ru_RU>
 	  </Text>
 	  <Text textnr="0x37">
-	      <lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT>
+          <lt_LT> </lt_LT>
-	      <en_GB>Reached maximum number of coins.!</en_GB>
+          <en_GB> </en_GB>
-	      <de_DE>Maximalanzahl der Münzen erreicht!</de_DE>
+          <de_DE> </de_DE>
-	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
+          <ru_RU> </ru_RU>
 	  </Text>
 	  <Text name="user_message_01" textnr="0x81">	      
 	      <lt_LT>Permoka!</lt_LT>
@@ -934,7 +934,7 @@
 	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
 	  </Text>
 	  <Text name="user_message_04"  textnr="0x84">
-	      <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+	      <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
 	      <en_GB>Minimum parking fee</en_GB>
 	      <de_DE>Mindestparkgebühr</de_DE>
 	      <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -1438,11 +1438,11 @@
                         <ru_RU>Переплата!</ru_RU>
                 </Text>
 		<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 name="PayMethod3" screennr="0x41">
                 <Text textnr="0x30">
@@ -2219,7 +2219,7 @@
                         <ru_RU>Принимаются только платежные карточки…</ru_RU>
                 </Text>
 		<Text name="user_message_04"  textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
                         <en_GB>Minimum parking fee</en_GB>
                         <de_DE>Mindestparkgebühr</de_DE>
                         <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2280,6 +2280,12 @@
                         <de_DE>Fehler Kartenleser</de_DE>
                         <ru_RU>Ошибка считывающего устройства</ru_RU>
                 </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 name="CreditCard3" screennr="0x53">
                 <Text textnr="0x30">
@@ -2419,7 +2425,7 @@
 	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
 	  </Text>
 	  <Text name="user_message_04"  textnr="0x84">
-	      <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+	      <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
 	      <en_GB>Minimum parking fee</en_GB>
 	      <de_DE>Mindestparkgebühr</de_DE>
 	      <ru_RU>Минимальная плата за парковку</ru_RU>

etc/psa_config/DC2C_cash.json

@@ -1,12 +1,12 @@
 {	     
 "title":"DC2C_cash  ",
-"Project":"Klaipeda",
+"Project":"Klaipeda, Palanga",
-"Version":"6.7.1-2024-06-24",
+"Version":"1.0.0-2024-10-11",
-"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,0],
+"CoinDenom(15..0)":[200,100,50,20,10,0,0,0,0,0,0,0,0,0,0,3],
-"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,0,0,0,0,0,0,0],
+"CoinValue(15..0)":[200,100,50,20,10,0,0,0,0,0,0,0,0,0,0,3],
-"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0],
+"CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1],
 "ExchangeRate":1,
-"TokenChannel":6,
+"TokenChannel":1,
 "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":21,

etc/psa_config/DC2C_device.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_device",
-"Project":"Schoenau",
+"Project":"Klaipeda",
-"Version":"6.7.2-2024-06-17",
+"Version":"7.2.3-2024-08-22",
 "printer":1,
 "coinChk":1,
 "mifRd":1,
@@ -15,17 +15,21 @@
 "vaultLock":0,
 "autoAlarm":1,
 "autoOpen":1,
-"AccPrint":2,
+"AccPrint":1,
 "DorPrint":0,
-"TokPrint":0,
+"TokPrint":2,
 "CBwarnLev":1600,
 "CBerrLev":1900,
 "BattWarn":11800,
 "BattErr":11200,
-"foreign":3,
+"foreign":5,
 "refundPrint":1,
 "billWarnLev":300,
 "billFullLev":380,
-"housing":1
+"housing":1,
-
+"changeCoins":1,
+"dev_aux1":0,
+"dev_aux2":0,
+"dev_aux3":0,
+"dev_aux4":0
 }

etc/psa_config/DC2C_print01.json

@@ -1,9 +1,10 @@
 {
 "title":"DC2C_pri01",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
 "text":"",
-"styl":"font 23",
+"styl":"font 24",
+"styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
 "feed":"margin02",

etc/psa_config/DC2C_print02.json

@@ -1,28 +1,31 @@
 {
 "title":"DC2C_pri02",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "feed":"nl",
-"styl":"font 23",
 "text":"Automobilio valstybinis",
 "feed":"nl",
 "text":" numeris:",
 "feed":"nl",
-"styl":"font 10",
 "styl":"size 22",
 "vari":"Dynamic01",
-"feed":"nl",
-"styl":"font 23",
 "styl":"size 00",
+"feed":"nl",
 "text":"Apmokėta iki:",
 "feed":"nl",
 "styl":"size 32",
-"vari":"Dynamic04",
-"styl":"size 00",
-"text":" Data: ",
-"styl":"size 32",
 "vari":"Dynamic03",
 "styl":"size 00",
+"text":"Data: ",
+"styl":"size 32",
+"vari":"Dynamic04",
+"styl":"size 00",
 "text":"Mokėjimo data ir laikas:",
 "feed":"nl",
 "vari":"date us",	

etc/psa_config/DC2C_print03.json

@@ -2,8 +2,14 @@
 "title":"DC2C_pri03",
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
 "styl":"size 00",
-"text":"Sumokėta:", 
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"styl":"size 00",
+"text":"Sumokėta grynais:", 
 "vari":"Dynamic02",
 "styl":"size 21",
 "text":"Raudonoji zona",

etc/psa_config/DC2C_print04.json

@@ -2,6 +2,12 @@
 "title":"DC2C_pri04",
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "text":"Klaipėdos miesto",
 "feed":"nl",
 "text":"savivaldybė",

etc/psa_config/DC2C_print05.json

@@ -1,9 +1,10 @@
 {
 "title":"DC2C_pri05",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
 "text":"",
-"styl":"font 23",
+"styl":"font 24",
+"styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
 "feed":"margin02",

etc/psa_config/DC2C_print06.json

@@ -1,28 +1,31 @@
 {
 "title":"DC2C_pri06",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "feed":"nl",
-"styl":"font 23",
 "text":"Automobilio valstybinis",
 "feed":"nl",
 "text":" numeris:",
 "feed":"nl",
-"styl":"font 10",
 "styl":"size 22",
 "vari":"Dynamic01",
-"feed":"nl",
-"styl":"font 23",
 "styl":"size 00",
+"feed":"nl",
 "text":"Apmokėta iki:",
 "feed":"nl",
 "styl":"size 32",
-"vari":"Dynamic04",
-"styl":"size 00",
-"text":" Data: ",
-"styl":"size 32",
 "vari":"Dynamic03",
 "styl":"size 00",
+"text":"Data: ",
+"styl":"size 32",
+"vari":"Dynamic04",
+"styl":"size 00",
 "text":"Mokėjimo data ir laikas:",
 "feed":"nl",
 "vari":"date us",	

etc/psa_config/DC2C_print07.json

@@ -2,8 +2,13 @@
 "title":"DC2C_pri07",
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
 "styl":"size 00",
-"text":"Sumokėta:", 
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"text":"Sumokėta kortele:", 
 "vari":"Dynamic02",
 "styl":"size 21",
 "text":"Raudonoji zona",

etc/psa_config/DC2C_print08.json

@@ -2,6 +2,12 @@
 "title":"DC2C_pri08",
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "text":"Klaipėdos miesto",
 "feed":"nl",
 "text":"savivaldybė",

etc/psa_config/DC2C_print24.json

@@ -1,9 +1,10 @@
 {
 "title":"DC2C_pri24",
 "Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
+"Version":"1.1.4-2024-08-22",
 "text":"",
-"styl":"font 23",
+"styl":"font 24",
+"styl":"csiz 08",
 "styl":"size 00",
 "styl":"align c",
 "feed":"margin02",
@@ -12,9 +13,9 @@
 "feed":"nl",
 "text":"Vietinė rinkliava",
 "feed":"nl",
-"text":"pagal pranesima Nr.",
+"text":"pagal pranešimą Nr.",
 "feed":"nl",
-"styl":"size 21",
+"styl":"size 11",
 "vari":"Dynamic08",
 "styl":"size 00"
 }

etc/psa_config/DC2C_print25.json

@@ -2,21 +2,26 @@
 "title":"DC2C_pri25",
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
 "styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "feed":"nl",
 "text":"Automobilio valstybinis numeris:",
 "feed":"nl",
-"styl":"font 10",
+"styl":"size 22",
-"styl":"size 21",
 "vari":"Dynamic01",
 "styl":"size 00",
 "feed":"nl",
 "text":"Sumokėta:", 
 "feed":"nl",
+"styl":"size 11",
 "vari":"Dynamic02",
 "styl":"size 00",
 "feed":"nl",
-"text":"Mokejimo data ir laikas:", 
+"text":"Mokėjimo data ir laikas:", 
 "feed":"nl",
 "styl":"size 11",
 "vari":"date us",	

etc/psa_config/DC2C_print26.json

@@ -2,6 +2,11 @@
 "title":"DC2C_pri26",
 "Project":"Klaipeda",
 "Version":"1.1.3-2024-08-08",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
 "styl":"size 00",
 "text":"Parkomato numeris:", 
 "vari":"manu",	

etc/psa_config/DC2C_print30.json

@@ -0,0 +1,44 @@
+{
+"title":"DC2C_pri30",
+"Project":"Klaipeda",
+"Version":"1.0.0-2024-10-11",
+"text":"",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
+"feed":"margin02",
+"feed":"rim02",
+"styl":"size 11",
+"feed":"nl",
+"text":"TestTicket:",
+"feed":"nl",
+"styl":"size 00",
+"vari":"date ge",
+"vari":"time long",
+"feed":"nl",
+"text":"CustomerNr.: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
+"vari":"manu",	
+"text":"Adresas: ",
+"vari":"location",	
+"feed":"nl",
+"text":"**Klaipėdos keleivinis transportas ",
+"feed":"nl",
+"text":" * * * * * * * * * ",
+"feed":"nl",
+"feed":"eject"
+}
+
+
+
+
+
+
+
+
+
+
+
+

etc/psa_config/DC2C_print31.json

@@ -1,20 +1,41 @@
 {
 "title":"DC2C_pri31",
-"project":"door close print",
+"Project":"door close print",
-"Version":"27.06.2024 00001",
+"Version":"6.7.2-2024-08-22",
-"styl":"font 08",
+"text":"",
-"styl":"size 10",
+"styl":"font 24",
+"styl":"csiz 08",
+"styl":"size 00",
+"styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"feed":"speed10",
 "styl":"size 11",
 "feed":"nl",
-"text":"Türöffnung um:",
+"text":"Door closed at:",
 "feed":"nl",
 "styl":"size 00",
 "vari":"date ge",
 "vari":"time long",
 "feed":"nl",
+"text":"CustomerNr.: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
+"vari":"manu",	
+"text":"Place: ",
+"vari":"location",	
+"text":"Group: ",
+"vari":"group",	
+"text":"Zone: ",
+"vari":"zone",	
+"text":"Name: ",
+"vari":"alias",	
+"feed":"nl",
+"text":"**Automatentechnik ",
+"feed":"nl",
+"text":"   Baumann GmbH ***",
+"feed":"nl",
+"text":" * * * * * * * * * ",
+"feed":"nl",
 "feed":"eject"
 }
 

etc/psa_config/DC2C_print32.json

@@ -1,40 +1,38 @@
 {
 "title":"DC2C_pri32",
-"project":"refund reciept",
+"Project":"refund reciept",
-"Version":"27.06.2024 00001",
+"Version":"6.7.1-2024-06-17",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
 "feed":"rim02",
 "feed":"speed10",
 "styl":"size 11",
-"text":"Ersatzbeleg",
+"text":"Refund Receipt",
 "feed":"nl",
 "styl":"size 00",
-"text":"Erstattungsbetrag: ",
+"text":"Amount to be refunded: ",
 "feed":"nl",
 "vari":"Dynamic07",
-"text":"€",
 "feed":"nl",
-"text":"KuNu: ",
+"styl":"size 00",
+"text":"Printed at:",
+"feed":"nl",
+"vari":"date us",
+"vari":"time long",
+"feed":"nl",
+"text":"CustomerNr.: ",
 "vari":"cunu",	
-"text":"MaNu: ",
+"text":"MachineNr: ",
 "vari":"manu",	
-"text":"Ort: ",
+"text":"Place: ",
 "vari":"location",	
-"text":"Gruppe: ",
+"text":"Group: ",
 "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/tariff01.json

@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
+  "Version" : "2.1.0-2024-04-23T12:36:12+02:00",
-  "Info"    : "Red Zone",
+  "Info"    : "Red Zone (center)",
   "Currency": [
     {
       "pcu_id": 2,
@@ -27,6 +27,11 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
+    },
+    {
+      "pme_id": 5,
+      "pme_label": "unified",
+      "comment": "deprecated"
     }
   ],
   "TimeRange" : [
@@ -46,171 +51,11 @@
       "time_range_to": "08:00:00"
     }
   ],
-  "Prepaid": [
-    {
-        "prepaid_id": 1,
-        "prepaid_anytime": true,
-        "prepaid_never": false
-    },
-    {
-        "prepaid_id": 2,
-        "prepaid_anytime": false,
-        "prepaid_never": true
-    },
-    {
-        "prepaid_id": 3,
-        "prepaid_anytime": false,
-        "prepaid_never": false,
-        "prepaid_static_start": "22:00:00",
-        "prepaid_static_end": "08:00:00"
-    }
-  ],
-  "CarryOver": [
-    {
-      "carry_over_id" : 1,
-      "carry_over_week" : [
-          {
-            "carry_over_day" : 1,
-            "carry_over_day_comment" : "Monday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 2,
-            "carry_over_day_comment" : "Tuesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 3,
-            "carry_over_day_comment" : "Wednesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 4,
-            "carry_over_day_comment" : "Thursday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 5,
-            "carry_over_day_comment" : "Friday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 6,
-            "carry_over_day_comment" : "Saturday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 7,
-            "carry_over_day_comment" : "Sunday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          }
-      ]
-    },
-    {
-      "carry_over_id" : 2,
-      "carry_over_week" : [
-          {
-            "carry_over_day" : 1,
-            "carry_over_day_comment" : "Monday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 2,
-            "carry_over_day_comment" : "Tuesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 3,
-            "carry_over_day_comment" : "Wednesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 4,
-            "carry_over_day_comment" : "Thursday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 5,
-            "carry_over_day_comment" : "Friday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 6,
-            "carry_over_day_comment" : "Saturday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 7,
-            "carry_over_day_comment" : "Sunday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          }
-      ]
-    }
-  ],
   "PaymentOption": [
     {
       "pop_id": 1049,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
+      "pop_payment_method_id": 5,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
       "pop_min_time": 12,
       "comment_pop_min_time": "12mins -> 30 cent",
       "pop_max_time": 840,
@@ -219,14 +64,11 @@
       "pop_max_price": 2100,
       "pop_plus_steps": 10,
       "pop_minus_steps": 1,
+      "pop_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
-      "pop_carry_over_option_id": 1,
+      "pop_business_hours": 0
-      "pop_prepaid_option_id" : 3,
-      "pop_carry_over_time_range": 1,
-      "pop_carry_over_start_time_range": 2,
-      "pop_carry_over_end_time_range": 3,
-      "pop_business_hours": 163584,
-      "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
     }
   ],
   "PaymentRate": [
@@ -2343,73 +2185,666 @@
 	"pun_label": "840 min"
     }
   ],
-  "WeekDaysWorktime": [
+    "Monday" : [{
-    {
+        "default" : {
-      "pwd_id": 621,
+            "payment_settings" : [
-      "pwd_period_week_day_id": 36,
+                {
-      "pwd_period_day_in_week_id": 1,
+                    "min_time" : 12,
-      "pwd_time_from": "08:00:00",
+                    "max_time" : 840,
-      "pwd_time_to": "22:00:00"
+                    "max_price": 2100,
-    },
+                    "min_price": 30
-    {
+                }
-      "pwd_id": 622,
+            ],
-      "pwd_period_week_day_id": 36,
+            "prepaid_settings" : [
-      "pwd_period_day_in_week_id": 2,
+                {
-      "pwd_time_from": "08:00:00",
+                    "prepaid_ranges" : [
-      "pwd_time_to": "22:00:00"
+                        {
-    },
+                            "prepaid_id" : 1,
-    {
+                            "prepaid_duration": 480,
-      "pwd_id": 623,
+                            "prepaid_start" : "00:00:00",
-      "pwd_period_week_day_id": 36,
+                            "prepaid_end": "08:00:00"
-      "pwd_period_day_in_week_id": 3,
+                        },
-      "pwd_time_from": "08:00:00",
+                        {
-      "pwd_time_to": "22:00:00"
+                            "prepaid_id" : 2,
-    },
+                            "prepaid_duration": 120,
-    {
+                            "prepaid_start" : "12:00:00",
-      "pwd_id": 624,
+                            "prepaid_end": "14:00:00"
-      "pwd_period_week_day_id": 36,
+                        },
-      "pwd_period_day_in_week_id": 4,
+                        {
-      "pwd_time_from": "08:00:00",
+                            "prepaid_id" : 3,
-      "pwd_time_to": "22:00:00"
+                            "prepaid_duration": 120,
-    },
+                            "prepaid_start" : "22:00:00",
-    {
+                            "prepaid_end": "24:00:00"
-      "pwd_id": 625,
+                        }
-      "pwd_period_week_day_id": 36,
+                    ]
-      "pwd_period_day_in_week_id": 5,
+                }
-      "pwd_time_from": "08:00:00",
+            ],
-      "pwd_time_to": "22:00:00"
+            "carry_over_settings" : [
-    },
+                {
-    {
+                    "carry_over_ranges" : [
-      "pwd_id": 626,
+                        {
-      "pwd_period_week_day_id": 36,
+                            "carry_over_id" : 1,
-      "pwd_period_day_in_week_id": 6,
+                            "carry_over_if": "always",
-      "pwd_time_from": "08:00:00",
+                            "carry_over_duration": 480,
-      "pwd_time_to": "22:00:00"
+                            "carry_over_start" : "00:00:00",
-    },
+                            "carry_over_end": "08:00:00"
-    {
+                        },
-      "pwd_id": 627,
+                        {
-      "pwd_period_week_day_id": 36,
+                            "carry_over_id" : 2,
-      "pwd_period_day_in_week_id": 7,
+                            "carry_over_if": "always",
-      "pwd_time_from": "08:00:00",
+                            "carry_over_duration": 120,
-      "pwd_time_to": "22:00:00"
+                            "carry_over_start" : "12:00:00",
-    }
+                            "carry_over_end": "14:00:00"
-  ],
+                        },
-  "PeriodYear": [
+                        {
-    {
+                            "carry_over_id" : 3,
-      "pye_id": 1,
+                            "carry_over_if": "always",
-      "pye_label": "May - September",
+                            "carry_over_duration": 120,
-      "pye_start_month": 5,
+                            "carry_over_start" : "22:00:00",
-      "pye_start_day": 1,
+                            "carry_over_end": "24:00:00"
-      "pye_end_month": 9,
+                        }
-      "pye_end_day": 15
+                    ]
-    },
+                }
-    {
+            ],
-      "pye_id": 2,
+            "service_settings" : [
-      "pye_label": "September - April",
+                {
-      "pye_start_month": 9,
+                    "service_ranges" : [
-      "pye_start_day": 16,
+                        {
-      "pye_end_month": 4,
+                            "service_id" : 1,
-      "pye_end_day": 30
+                            "service_duration": 240,
-    }
+                            "service_start" : "08:00:00",
-  ]
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Tuesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Wednesday" : [{
+        "2025-01-01" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        },
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Thursday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Friday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Saturday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Sunday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 12,
+                    "max_time" : 840,
+                    "max_price": 2100,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }]
 }

etc/psa_tariff/tariff02.json

@@ -1,7 +1,7 @@
 {
   "Project" : "Kleipeda",
-  "Version" : "1.0.0-2024-08-01T09:32:12+02:00",
+  "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
-  "Info"    : "Yellow Zone",
+  "Info"    : "Yellow Zone (plus)",
   "Currency": [
     {
       "pcu_id": 2,
@@ -27,6 +27,11 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
+    },
+    {
+      "pme_id": 5,
+      "pme_label": "unified",
+      "comment": "deprecated"
     }
   ],
   "TimeRange" : [
@@ -50,183 +55,20 @@
     {
       "pop_id": 1049,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
+      "pop_payment_method_id": 5,
-      "pop_day_end_time": "00:00:00",
-      "pop_day_night_end_time": "00:00:00",
-      "pop_price_night": 0,
       "pop_min_time": 30,
-      "comment_pop_min_time": "30mins -> 30 cent",
+      "comment_pop_min_time": "12mins -> 30 cent",
       "pop_max_time": 840,
       "comment_pop_max_time": "840mins = 14h -> 21 euros",
       "pop_min_price": 30,
       "pop_max_price": 840,
       "pop_plus_steps": 10,
       "pop_minus_steps": 1,
+      "pop_time_step_config": 1,
+      "pop_time_step_config_comment": "STATIC",
+      "pop_allow_overpay": true,
       "pop_carry_over": 1,
-      "pop_carry_over_option_id": 1,
+      "pop_business_hours": 0
-      "pop_prepaid_option_id" : 3,
-      "pop_carry_over_time_range": 1,
-      "pop_carry_over_start_time_range": 2,
-      "pop_carry_over_end_time_range": 3,
-      "pop_business_hours": 163584,
-      "comment_1": "163584 = 0x27F00 = 10|0011|1111|0000|0000 -> all days with restricted hours"
-    }
-  ],
-  "Prepaid": [
-    {
-        "prepaid_id": 1,
-        "prepaid_anytime": true,
-        "prepaid_never": false
-    },
-    {
-        "prepaid_id": 2,
-        "prepaid_anytime": false,
-        "prepaid_never": true
-    },
-    {
-        "prepaid_id": 3,
-        "prepaid_anytime": false,
-        "prepaid_never": false,
-        "prepaid_static_start": "22:00:00",
-        "prepaid_static_end": "08:00:00"
-    }
-  ],
-  "CarryOver": [
-    {
-      "carry_over_id" : 1,
-      "carry_over_week" : [
-          {
-            "carry_over_day" : 1,
-            "carry_over_day_comment" : "Monday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 2,
-            "carry_over_day_comment" : "Tuesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 3,
-            "carry_over_day_comment" : "Wednesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 4,
-            "carry_over_day_comment" : "Thursday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 5,
-            "carry_over_day_comment" : "Friday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 6,
-            "carry_over_day_comment" : "Saturday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 7,
-            "carry_over_day_comment" : "Sunday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 600,
-            "carry_over_static_start" : "22:00:00",
-            "carry_over_static_end": "08:00:00"
-          }
-      ]
-    },
-    {
-      "carry_over_id" : 2,
-      "carry_over_week" : [
-          {
-            "carry_over_day" : 1,
-            "carry_over_day_comment" : "Monday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 2,
-            "carry_over_day_comment" : "Tuesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 3,
-            "carry_over_day_comment" : "Wednesday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 4,
-            "carry_over_day_comment" : "Thursday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 5,
-            "carry_over_day_comment" : "Friday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 6,
-            "carry_over_day_comment" : "Saturday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          },
-          {
-            "carry_over_day" : 7,
-            "carry_over_day_comment" : "Sunday",
-            "carry_over_seemless": false,
-            "carry_over_never" : false,
-            "carry_over_duration": 720,
-            "carry_over_static_start" : "20:00:00",
-            "carry_over_static_end": "08:00:00"
-          }
-      ]
     }
   ],
   "PaymentRate": [
@@ -653,14 +495,44 @@
     {
         "pra_payment_option_id": 1049,
         "pra_payment_unit_id": 84,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 85,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 86,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 87,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 88,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 89,
+        "pra_price": 0
+    },
+    {
+        "pra_payment_option_id": 1049,
+        "pra_payment_unit_id": 90,
         "pra_price": 840
     }
   ],
   "Duration": [
     {
-	     "pun_duration": 0,
+	"pun_duration": 0,
-	     "pun_id": 0,
+	"pun_id": 0,
-	     "pun_label": "0 min"
+	"pun_label": "0 min"
     },
     {
         "pun_duration": 10,
@@ -1078,78 +950,620 @@
         "pun_label": "830 min"
     },
     {
-        "pun_duration": 840,
+        "pun_duration": 830,
         "pun_id": 84,
         "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 85,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 86,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 87,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 88,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 830,
+        "pun_id": 89,
+        "pun_label": "840 min"
+    },
+    {
+        "pun_duration": 840,
+        "pun_id": 90,
+        "pun_label": "840 min"
     }
   ],
-  "WeekDaysWorktime": [
+    "Monday" : [{
-    {
+        "default" : {
-      "pwd_id": 621,
+            "payment_settings" : [
-      "pwd_period_week_day_id": 36,
+                {
-      "pwd_period_day_in_week_id": 1,
+                    "min_time" : 30,
-      "pwd_time_from": "08:00:00",
+                    "max_time" : 840,
-      "pwd_time_to": "22:00:00"
+                    "max_price": 840,
-    },
+                    "min_price": 30
-    {
+                }
-      "pwd_id": 622,
+            ],
-      "pwd_period_week_day_id": 36,
+            "prepaid_settings" : [
-      "pwd_period_day_in_week_id": 2,
+                {
-      "pwd_time_from": "08:00:00",
+                    "prepaid_ranges" : [
-      "pwd_time_to": "22:00:00"
+                        {
-    },
+                            "prepaid_id" : 1,
-    {
+                            "prepaid_duration": 480,
-      "pwd_id": 623,
+                            "prepaid_start" : "00:00:00",
-      "pwd_period_week_day_id": 36,
+                            "prepaid_end": "08:00:00"
-      "pwd_period_day_in_week_id": 3,
+                        },
-      "pwd_time_from": "08:00:00",
+                        {
-      "pwd_time_to": "22:00:00"
+                            "prepaid_id" : 2,
-    },
+                            "prepaid_duration": 120,
-    {
+                            "prepaid_start" : "12:00:00",
-      "pwd_id": 624,
+                            "prepaid_end": "14:00:00"
-      "pwd_period_week_day_id": 36,
+                        },
-      "pwd_period_day_in_week_id": 4,
+                        {
-      "pwd_time_from": "08:00:00",
+                            "prepaid_id" : 3,
-      "pwd_time_to": "22:00:00"
+                            "prepaid_duration": 120,
-    },
+                            "prepaid_start" : "22:00:00",
-    {
+                            "prepaid_end": "24:00:00"
-      "pwd_id": 625,
+                        }
-      "pwd_period_week_day_id": 36,
+                    ]
-      "pwd_period_day_in_week_id": 5,
+                }
-      "pwd_time_from": "08:00:00",
+            ],
-      "pwd_time_to": "22:00:00"
+            "carry_over_settings" : [
-    },
+                {
-    {
+                    "carry_over_ranges" : [
-      "pwd_id": 626,
+                        {
-      "pwd_period_week_day_id": 36,
+                            "carry_over_id" : 1,
-      "pwd_period_day_in_week_id": 6,
+                            "carry_over_if": "always",
-      "pwd_time_from": "08:00:00",
+                            "carry_over_duration": 480,
-      "pwd_time_to": "22:00:00"
+                            "carry_over_start" : "00:00:00",
-    },
+                            "carry_over_end": "08:00:00"
-    {
+                        },
-      "pwd_id": 626,
+                        {
-      "pwd_period_week_day_id": 36,
+                            "carry_over_id" : 2,
-      "pwd_period_day_in_week_id": 7,
+                            "carry_over_if": "always",
-      "pwd_time_from": "08:00:00",
+                            "carry_over_duration": 120,
-      "pwd_time_to": "22:00:00"
+                            "carry_over_start" : "12:00:00",
-    }
+                            "carry_over_end": "14:00:00"
-  ],
+                        },
-  "PeriodYear": [
+                        {
-    {
+                            "carry_over_id" : 3,
-      "pye_id": 1,
+                            "carry_over_if": "always",
-      "pye_label": "May - September",
+                            "carry_over_duration": 120,
-      "pye_start_month": 5,
+                            "carry_over_start" : "22:00:00",
-      "pye_start_day": 1,
+                            "carry_over_end": "24:00:00"
-      "pye_end_month": 9,
+                        }
-      "pye_end_day": 15
+                    ]
-    },
+                }
-    {
+            ],
-      "pye_id": 2,
+            "service_settings" : [
-      "pye_label": "September - April",
+                {
-      "pye_start_month": 9,
+                    "service_ranges" : [
-      "pye_start_day": 16,
+                        {
-      "pye_end_month": 4,
+                            "service_id" : 1,
-      "pye_end_day": 30
+                            "service_duration": 240,
-    }
+                            "service_start" : "08:00:00",
-  ]
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Tuesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 840,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Wednesday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 840,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Thursday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 840,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	    ]
+        }
+    }],
+    "Friday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 840,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	        ]
+        }
+    }],
+    "Saturday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 840,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	        ]
+        }
+    }],
+    "Sunday" : [{
+        "default" : {
+            "payment_settings" : [
+                {
+                    "min_time" : 30,
+                    "max_time" : 840,
+                    "max_price": 840,
+                    "min_price": 30
+                }
+            ],
+            "prepaid_settings" : [
+                {
+                    "prepaid_ranges" : [
+                        {
+                            "prepaid_id" : 1,
+                            "prepaid_duration": 480,
+                            "prepaid_start" : "00:00:00",
+                            "prepaid_end": "08:00:00"
+                        },
+                        {
+                            "prepaid_id" : 2,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "12:00:00",
+                            "prepaid_end": "14:00:00"
+                        },
+                        {
+                            "prepaid_id" : 3,
+                            "prepaid_duration": 120,
+                            "prepaid_start" : "22:00:00",
+                            "prepaid_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "carry_over_settings" : [
+                {
+                    "carry_over_ranges" : [
+                        {
+                            "carry_over_id" : 1,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 480,
+                            "carry_over_start" : "00:00:00",
+                            "carry_over_end": "08:00:00"
+                        },
+                        {
+                            "carry_over_id" : 2,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "12:00:00",
+                            "carry_over_end": "14:00:00"
+                        },
+                        {
+                            "carry_over_id" : 3,
+                            "carry_over_if": "always",
+                            "carry_over_duration": 120,
+                            "carry_over_start" : "22:00:00",
+                            "carry_over_end": "24:00:00"
+                        }
+                    ]
+                }
+            ],
+            "service_settings" : [
+                {
+                    "service_ranges" : [
+                        {
+                            "service_id" : 1,
+                            "service_duration": 240,
+                            "service_start" : "08:00:00",
+                            "service_end": "12:00:00"
+                        },
+                        {
+                            "service_id" : 2,
+                            "service_duration": 480,
+                            "service_start" : "14:00:00",
+                            "service_end": "22:00:00"
+                        }
+                    ]
+                }
+            ],
+            "out_of_service_settings" : [
+	        ]
+        }
+    }]
 }

etc/psa_update/opkg_commands

@@ -7,12 +7,24 @@
 opkg update
 opkg install prepare-update
 #
+opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc
 opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-cc-asyncpos
 opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
 opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
 opkg --cache /var/cache/opkg --download-only upgrade atbqt
+opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
+opkg --cache /var/cache/opkg --download-only install ptu-package-versions
+opkg --cache /var/cache/opkg --download-only install wbdw
+opkg --cache /var/cache/opkg --download-only upgrade ptu5-sysconfig
 #
+opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg upgrade libmobilisis-calc
 opkg --cache /var/cache/opkg upgrade atb-plugin-cc-asyncpos
 opkg --cache /var/cache/opkg upgrade atb-dc-libraries
 opkg --cache /var/cache/opkg upgrade atb-plugin-dc
 opkg --cache /var/cache/opkg upgrade atbqt
+opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
+opkg --cache /var/cache/opkg install ptu-package-versions
+opkg --cache /var/cache/opkg install wbdw
+opkg --cache /var/cache/opkg upgrade ptu5-sysconfig