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

Add JSON files as saved on ATB server
Merge branch 'zg1/zone1' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone1
2024-07-19 10:31:36 +02:00 · 2024-07-19 10:30:43 +02:00 · 2024-07-19 09:59:02 +02:00 · 2024-07-19 09:58:49 +02:00 · 2024-07-18 15:38:17 +02:00 · 2024-07-17 14:46:04 +02:00
46 changed files with 408 additions and 11261 deletions
--- a/etc/atb/SystemControl.ini
+++ b/etc/atb/SystemControl.ini
@@ -1,66 +0,0 @@
-[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
--- a/etc/atbapp/ATBAPP.ini
+++ b/etc/atbapp/ATBAPP.ini
@@ -1,7 +1,115 @@
+[COMMON]
+com_port_name=/dev/ttyS1
+com_baud_rate=9600
+lang1=lt_LT
+lang2=en_GB
+lang3=de_DE
+lang4=ru_RU
+lang5=
+
+defaultLanguage=1
+CharacterSet="ISO 8859-13"
+
+showInfoButton=false
+showHelpButton=false
+
+#useLanguage=[128+][64+][32+][16]
+useLanguage=240
+#usePayment=[128+][64+][32+][16]
+usePayment=96
+#useVehicle=[128+][64+][32+][16+][8]
+useVehicle=192
+#useProduct=[128+][64+][32+][16+][8]
+useProduct=192
+
+textfile=/opt/app/ATBAPP/text/HMI_Texte.xml
+logfile=/var/log/atbqt.log
+alternativeLogoFile=/opt/app/ATBAPP/logo/logo_klaipeda2.png
+
+feature_Log=off
+feature_TouchFeedback=off
+feature_StartButton=on
+feature_selfOOO=off
+feature_ShowParkingTime=off
+
+suspend_methode=sysfs
+suspend_program=
+suspend_time=8
+
+touch_feedback_gpio=121
+touch_feedback_on_value=1
+touch_feedback_off_value=0
+
+#ooo_mode={useDisk|otherMachine}
+ooo_mode=otherMachine
+sellTimeout_time=60
+
+showInfoButton=false
+showHelpButton=false
+
+useAppStates=1
+statefile=/opt/app/ATBAPP/states/APP_States.xml
+
+[SCREENCONFIG]
+sc_31="1,1,0"
+sc_33="1,0,1"
+sc_3F="1,0,0"
+sc_40="1,0,1"
+sc_41="1,0,0"
+sc_35="0,0,0"
+sc_51="1,0,1"
+sc_52="1,0,0"
+sc_53="1,0,0"
+
+
+[PLUGINS]
+CCPlugin=AsyncPOS_CCPlugin
+CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
+DeviceControllerPlugin=ATBDeviceControllerPlugin
+
+
+[IngenicoISelf_CCPlugin]
+debug=1
+PortName=/dev/ttymxc0
+ZVT=DE
+sleep=1
+sleepExtended=1
+Currency=HUF
+
+
+[TCP_CONTROL]
+enable=1
+
+
+[PAYMENT]
+currencySymbol=€
+currencyISOCode=EUR
+cashVariant=CoinsAndNotes
+paymentPointInTime=poa
+useDecimal=yes
+
+
+[MOBILISIS_CalculatePricePlugin]
+useDebug=1
+tariffFileName=/etc/psa_tariff/tariff01.json
+
 [ATBDeviceControllerPlugin]
-printerEncoding=Windows-1257
-printerLocale=lt_LT
 serialPort=ttymxc2
+printerEncoding="Windows-1252"
+printerLocale="de_DE"
+
+[TCP_ZVT_CCPlugin]
+CurrencyCode=EUR
+debug=1
+IP=192.168.6.242
+Port=22000
+SSL=0
+ZVT=DE
+sleep=1
+printIntermediateStatus=1
+Password=277296
+NumberOfChars=37
+dcHours="0"

 [AsyncPOS_CCPlugin]
 APAK=8AC304380E0E476BA2558B75DB9E2516
@@ -14,102 +122,3 @@ debug=1
 parity=0
 sleep=0
 stopBits=1
-terminalPowerOnOffHours="06:00:00,22:00:00"
-
-[COMMON]
-%23ooo_mode={useDisk|otherMachine}
-%23useLanguage=[128+][64+][32+][16]
-%23usePayment=[128+][64+][32+][16]
-%23useProduct=[128+][64+][32+][16+][8]
-%23useVehicle=[128+][64+][32+][16+][8]
-CharacterSet=ISO 8859-13
-alternativeLogoFile=/opt/app/ATBAPP/logo/logo_Palanga.png
-com_baud_rate=9600
-com_port_name=/dev/ttyS1
-defaultLanguage=1
-feature_DBusDisplayControl=on
-feature_DBusDisplayDimLow=off
-feature_DBusSuspendControl=off
-feature_Log=off
-feature_ShowParkingTime=off
-feature_StartButton=on
-feature_TouchFeedback=off
-feature_selfOOO=off
-lang1=lt_LT
-lang2=en_GB
-lang3=de_DE
-lang4=ru_RU
-lang5=
-logfile=/var/log/atbqt.log
-ooo_alternativeLocation=
-ooo_mode=otherMachine
-ooo_serviceEmail=
-ooo_serviceNumber=
-sellTimeout_time=60
-showHelpButton=false
-showInfoButton=false
-statefile=/etc/atbapp/states/APP_States.xml
-suspend_methode=sysfs
-suspend_program=
-suspend_time=8
-textfile=/etc/atbapp/text/HMI_Texte.xml
-touch_feedback_gpio=121
-touch_feedback_off_value=0
-touch_feedback_on_value=1
-useAppStates=1
-useLanguage=240
-usePayment=96
-useProduct=192
-useVehicle=192
-
-[IngenicoISelf_CCPlugin]
-Currency=HUF
-PortName=/dev/ttymxc0
-ZVT=DE
-debug=1
-sleep=1
-sleepExtended=1
-
-[MOBILISIS_CalculatePricePlugin]
-tariffFileName=/etc/psa_tariff/tariff01.json
-useDebug=1
-
-[PAYMENT]
-cashVariant=CoinsAndNotes
-currencyISOCode=EUR
-currencySymbol=€
-paymentPointInTime=poa
-useDecimal=yes
-useHonestPayment=on
-
-[PLUGINS]
-CCPlugin=AsyncPOS_CCPlugin
-CalculatePricePlugin=MOBILISIS_CalculatePricePlugin
-DeviceControllerPlugin=ATBDeviceControllerPlugin
-
-[SCREENCONFIG]
-sc_31="1,1,0"
-sc_33="1,0,1"
-sc_35="0,0,0"
-sc_3F="1,0,0"
-sc_40="1,0,1"
-sc_41="1,0,0"
-sc_51="1,0,1"
-sc_52="1,0,0"
-sc_53="1,0,0"
-
-[TCP_CONTROL]
-enable=1
-
-[TCP_ZVT_CCPlugin]
-CurrencyCode=EUR
-IP=192.168.6.242
-NumberOfChars=37
-Password=277296
-Port=22000
-SSL=0
-ZVT=DE
-dcHours=0
-debug=1
-printIntermediateStatus=1
-sleep=1
--- a/etc/atbapp/states/APP_States.xml
+++ b/etc/atbapp/states/APP_States.xml
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ATB_APP_STATES version="1.1">
-    <APP_STATE name="IDLE">
-        <EVENT name="BUTTON_START" resultingState="PRODUCT_SELECTION"/>
-        <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
-        <SCREEN name="START"/>
-        <MODE name="IDLE"/>
-    </APP_STATE>
-    <APP_STATE name="FREE_PARK">
-        <EVENT name="SELL_ENABLE" resultingState="IDLE"/>
-        <SCREEN name="START"/>
-        <MODE name="IDLE"/>
-    </APP_STATE>
-    
-    
-    <APP_STATE name="PRODUCT_SELECTION">
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_VEHICLE_1" resultingState="LICENSEPLATE_INPUT" setCashInputMode="PAY_UP"   setProduct="SHORT_TERM_PARKING"/>
-        <EVENT name="BUTTON_VEHICLE_2" resultingState="LICENSEPLATE_INPUT_FINE_PAYMENT" setCashInputMode="PAY_DOWN" setProduct="FINE_PAYMENT"/>
-        <SCREEN name="PRODUCT_SELECTION"/>
-    </APP_STATE>
-    
-    <APP_STATE name="LICENSEPLATE_INPUT">
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_NEXT" resultingState="PAYMENT_SELECTION_SHORT_TIME"/>
-        <SCREEN name="LICENSEPLATE_INPUT"/>
-    </APP_STATE>
-    
-    <APP_STATE name="LICENSEPLATE_INPUT_FINE_PAYMENT">
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_NEXT" resultingState="ENTER_TICKET_NUMBER"/>
-        <SCREEN name="LICENSEPLATE_INPUT"/>
-    </APP_STATE>
-    
-    <!-- ************** FINE PAYMENT *************** -->
-    
-    <APP_STATE name="FINE_PAYMENT_WAIT">
-        <ENTRY_TASK name="REQUEST_INITIAL_PRICE"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="ENTER_TICKET_NUMBER"/>
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <SCREEN name="WAIT_2"/>
-    </APP_STATE>
-    <APP_STATE name="ENTER_TICKET_NUMBER">
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="NEW_PIN" resultingState="FINE_PAYMENT_WAIT_2"/>
-        <SCREEN name="RESIDENT"/>
-    </APP_STATE>
-    <APP_STATE name="FINE_PAYMENT_WAIT_2">
-        <ENTRY_TASK name="REQUEST_FINE_PAYMENT_PRICE"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="RECEIVED_FINE_PAYMENT_PRICE_SUCCESS" resultingState="PAYMENT_SELECTION_FINE_PAYMENT"/>
-        <EVENT name="RECEIVED_FINE_PAYMENT_PRICE_ERROR" resultingState="ABORT_FINE_PAYMENT_NOT_AVAILABLE"/>
-        <EVENT name="RECEIVED_FINE_PAYMENT_PRICE_ERROR_BACKEND" resultingState="ABORT_FINE_PAYMENT_NOT_AVAILABLE"/>
-        <EVENT name="RECEIVED_FINE_PAYMENT_PRICE_ERROR_STATUS" resultingState="ABORT_FINE_PAYMENT_STATUS"/>
-        <SCREEN name="WAIT_2"/>
-    </APP_STATE>   
-    
-    <APP_STATE name="PRINT_FINE_PAYMENT_RECEIPT">
-        <ENTRY_TASK name="REQUEST_PRINT_CUSTOMER_TICKET_2"/>
-        <EVENT name="PRINT_TICKET_FINISHED" resultingState="FINE_PAYMENT_SUCCESS"/>
-        <EVENT name="PRINT_TICKET_ERROR" resultingState="PRINT_TICKET_FAILED"/>
-        <SCREEN name="PRINT_RECEIPT_2"/>
-    </APP_STATE>
-    <APP_STATE name="FINE_PAYMENT_SUCCESS">
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="GOODBYE_3"/>
-    </APP_STATE>
-
-    
-    <!-- ************** FINE PAYMENT: ABORT STATES ************** -->  
-    
-    <APP_STATE name="ABORT_FINE_PAYMENT_NOT_AVAILABLE">
-        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="ABORT_8"/>
-    </APP_STATE>   
-    <APP_STATE name="ABORT_NOT_ALLOWED">
-        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="ABORT_6"/>
-    </APP_STATE> 
-    <APP_STATE name="ABORT_FINE_PAYMENT_STATUS">
-        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="ABORT_7"/>
-    </APP_STATE>
-    
-    
-    <!-- ************** PAYMENT SELECTION ************** -->
-    
-    <APP_STATE name="PAYMENT_SELECTION_SHORT_TIME">
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
-        <EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setPaymentType="CASH"/>
-        <EVENT name="BUTTON_PAYMETHOD_3" resultingState="PARKTIME_SELECTION" setPaymentType="CARD"/>
-        <EVENT name="BUTTON_PAYMETHOD_4" resultingState="IDLE"/>
-        <SCREEN name="PAYMENT_SELECTION"/>
-    </APP_STATE>   
-    <APP_STATE name="PAYMENT_SELECTION_FINE_PAYMENT">
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_PAYMETHOD_1" resultingState="IDLE"/>
-        <EVENT name="BUTTON_PAYMETHOD_2" resultingState="CASH_PAYMENT" setPaymentType="CASH"/>
-        <EVENT name="BUTTON_PAYMETHOD_3" resultingState="CARD_PAYMENT" setPaymentType="CARD"/>
-        <EVENT name="BUTTON_PAYMETHOD_4" resultingState="IDLE"/>
-        <SCREEN name="PAYMENT_SELECTION"/>
-    </APP_STATE>  
-    
-    
-    <!-- ************** PARKTIME SELECTION ************** -->
-    
-    <APP_STATE name="PARKTIME_SELECTION">
-        <ENTRY_TASK name="REQUEST_INITIAL_PRICE"/>
-        <EVENT name="BUTTON_PLUS_STEP"  resultingState="PARKTIME_SELECTION_PLUS"/>
-        <EVENT name="BUTTON_MINUS_STEP" resultingState="PARKTIME_SELECTION_MINUS"/>
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_BACK" resultingState="PAYMENT_SELECTION"/>
-        <EVENT name="BUTTON_NEXT" resultingState="CARD_PAYMENT"/>
-        <SCREEN name="PARKTIME_SELECTION"/>
-    </APP_STATE>
-    <APP_STATE name="PARKTIME_SELECTION_PLUS">
-        <ENTRY_TASK name="REQUEST_STEP_UP_PRICE"/>
-        <EVENT name="BUTTON_PLUS_STEP"  resultingState="PARKTIME_SELECTION_PLUS"/>
-        <EVENT name="BUTTON_MINUS_STEP" resultingState="PARKTIME_SELECTION_MINUS"/>
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_BACK" resultingState="PAYMENT_SELECTION"/>
-        <EVENT name="BUTTON_NEXT" resultingState="CARD_PAYMENT"/>
-    </APP_STATE>
-    <APP_STATE name="PARKTIME_SELECTION_MINUS">
-        <ENTRY_TASK name="REQUEST_STEP_DOWN_PRICE"/>
-        <EVENT name="BUTTON_PLUS_STEP"  resultingState="PARKTIME_SELECTION_PLUS"/>
-        <EVENT name="BUTTON_MINUS_STEP" resultingState="PARKTIME_SELECTION_MINUS"/>
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_BACK" resultingState="PAYMENT_SELECTION"/>
-        <EVENT name="BUTTON_NEXT" resultingState="CARD_PAYMENT"/>
-    </APP_STATE>
-    
-    
-    <!-- ************** CASH PAYMENT ************** -->
-    
-    <APP_STATE name="CASH_PAYMENT">
-        <ENTRY_TASK name="REQUEST_CASH_INPUT"/>
-        <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
-        <EVENT name="RECEIVED_CASH_INPUT_ERROR" resultingState="CASH_PAYMENT_ERROR"/>
-        <EVENT name="BUTTON_CANCEL" resultingState="CASH_PAYMENT_ABORT"/>
-        <SCREEN name="COIN_PAYMENT"/>
-    </APP_STATE>
-    <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_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"/>
-        <EVENT name="BUTTON_NEXT" task="PAYMENT_ACCEPTED" resultingState="CASH_PAYMENT_INPUT"/>
-    </APP_STATE>
-    <APP_STATE name="CASH_PAYMENT_ERROR">
-        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
-        <ENTRY_TASK name="CASH_ABORT"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
-    </APP_STATE>
-    
-    <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"/>
-        <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"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-    </APP_STATE>
-    
-    
-    <!-- ************** CARD PAYMENT ************** -->
-    
-    <APP_STATE name="CARD_PAYMENT">
-        <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
-        <ENTRY_TASK name="REQUEST_CC_START_TRANSACTION"/>
-        <EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="PRINT_TICKET_CARD"/>
-        <EVENT name="RECEIVED_CARD_TRANSACTION_ERROR" resultingState="CC_PAYMENT_ERROR"/>
-        <EVENT name="BUTTON_CANCEL" resultingState="USER_CC_ABORT"/>
-        <SCREEN name="CC_PAYMENT"/>
-    </APP_STATE>
-    
-    
-    <!-- ************** PRINT TICKET / GOOD ISSUE ************** -->
-    
-    <APP_STATE name="PRINT_TICKET_CASH">
-        <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
-        <EVENT name="PRINT_TICKET_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
-        <EVENT name="PRINT_TICKET_ERROR" resultingState="PRINT_TICKET_FAILED"/>
-        <SCREEN name="SCREEN_WAITFOR"/>
-    </APP_STATE>
-    <APP_STATE name="PRINT_TICKET_CARD">
-        <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
-        <EVENT name="PRINT_TICKET_FINISHED" resultingState="CARD_PAYMENT_CONFIRM"/>
-        <EVENT name="PRINT_TICKET_ERROR" resultingState="PRINT_TICKET_FAILED"/>
-        <SCREEN name="SCREEN_WAITFOR"/>
-    </APP_STATE>     
-    <APP_STATE name="PRINT_TICKET_FAILED">
-        <ENTRY_TASK name="REQUEST_CC_CANCEL_TRANSACTION"/>
-        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
-        <ENTRY_TASK name="CASH_ABORT"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="PRINT_TICKET_FAILED"/>
-    </APP_STATE>   
-    
-    
-    <!-- ************** CONFIRM CARD PAYMENT ************** -->
-    
-    <APP_STATE name="CARD_PAYMENT_CONFIRM">
-        <ENTRY_TASK name="REQUEST_CC_CONFIRM_TRANSACTION"/>
-        <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 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"/>
-        <EVENT name="PRINT_RECEIPT_ERROR" resultingState="PRINT_TICKET_FAILED"/>
-    </APP_STATE>   
-    
-    
-    <!-- ************** GOODBYE ************** -->
-    
-    <APP_STATE name="GOODBYE_PAYMENT_OK">
-        <ENTRY_TASK name="CASH_COLLECT"/>
-        <ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
-        <ENTRY_TASK name="TIMER" timeout="5000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="GOODBYE_PAYMENT_OK"/>
-    </APP_STATE>
-    
-    
-    <!-- ************** CARD PAYMENT ERROR / ABORT ************** -->
-    
-    <APP_STATE name="CC_PAYMENT_ERROR">
-        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="CC_PAYMENT_ERROR"/>
-    </APP_STATE>
-    <APP_STATE name="USER_CC_ABORT">
-        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
-        <ENTRY_TASK name="REQUEST_CC_CANCEL_TRANSACTION"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="USER_ABORT"/>
-    </APP_STATE>  
-    
- 
-    <!-- ************** ABORT STATES ************** -->  
-    
-    <APP_STATE name="ABORT_NOCONNECTION">
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="ABORT_2"/>
-    </APP_STATE>   
-    <APP_STATE name="ABORT_NOCARD">
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="ABORT_4"/>
-    </APP_STATE>    
-    <APP_STATE name="ABORT_CARD_DENIED">
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="ABORT_5"/>
-    </APP_STATE>     
-    <APP_STATE name="ABORT_NOT_ALLOWED">
-        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
-        <ENTRY_TASK name="TIMER" timeout="3000"/>
-        <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="ABORT_6"/>
-    </APP_STATE>
-    
-    
-</ATB_APP_STATES>
--- a/etc/atbapp/text/HMI_Texte.xml
+++ b/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 mokestis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokėstis</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 mokestis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokėstis</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 mokestis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokėstis</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 mokestis</lt_LT>
+            <lt_LT>Minimalus stovėjimo mokėstis</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 kvitą?</lt_LT>
-          <en_GB>Print receipt?</en_GB>
-          <de_DE>Quittung drucken?</de_DE>
-          <ru_RU>Распечатать квитанцию?</ru_RU>
+	      <lt_LT>Spausdinti bilietą</lt_LT>
+	      <en_GB>Request Ticket?</en_GB>
+	      <de_DE>Parkschein anfordern?</de_DE>
+	      <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> </lt_LT>
-          <en_GB> </en_GB>
-          <de_DE> </de_DE>
-          <ru_RU> </ru_RU>
+	      <lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT>
+	      <en_GB>Reached maximum number of coins.!</en_GB>
+	      <de_DE>Maximalanzahl der Münzen erreicht!</de_DE>
+	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
 	  </Text>
 	  <Text name="user_message_01" textnr="0x81">	      
 	      <lt_LT>Permoka!</lt_LT>
@@ -934,80 +934,12 @@
 	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
 	  </Text>
 	  <Text name="user_message_04"  textnr="0x84">
-	      <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
+	      <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
 	      <en_GB>Minimum parking fee</en_GB>
 	      <de_DE>Mindestparkgebühr</de_DE>
 	      <ru_RU>Минимальная плата за парковку</ru_RU>
 	  </Text>
 	</Screen>
-    <Screen name="OVERPAID" screennr="0xB1">
-        <Text textnr="0x30">
-            <lt_LT>Stovėjimo laiko pabaiga:</lt_LT>
-            <en_GB>End of Parking time:</en_GB>
-            <de_DE>Parkende:</de_DE>
-            <ru_RU>Окончание времени парковки:</ru_RU>
-        </Text>
-        <Text textnr="0x31">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text textnr="0x32">
-            <lt_LT>Suma:</lt_LT>
-            <en_GB>Amount:</en_GB>
-            <de_DE>Betrag:</de_DE>
-            <ru_RU>Сумма:</ru_RU>
-        </Text>	
-        <Text textnr="0x33">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text textnr="0x34">
-            <lt_LT>Spausdinti kvitą?</lt_LT>
-            <en_GB>Print receipt?</en_GB>
-            <de_DE>Quittung drucken?</de_DE>
-            <ru_RU>Распечатать квитанцию?</ru_RU>
-        </Text>
-        <Text textnr="0x35">
-            <lt_LT>ATŠAUKTI</lt_LT>
-            <en_GB>NO</en_GB>
-            <de_DE>NEIN</de_DE>
-            <ru_RU>НЕТ</ru_RU>
-        </Text>	  
-        <Text textnr="0x36">
-            <lt_LT>TĘSTI</lt_LT>
-            <en_GB>YES</en_GB>
-            <de_DE>JA</de_DE>
-            <ru_RU>ДА</ru_RU>
-        </Text>
-        <Text textnr="0x37">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text name="user_message_01" textnr="0x81">	      
-            <lt_LT>Permoka!</lt_LT>
-            <en_GB>Overpaid</en_GB>
-            <de_DE>Überbezahlt</de_DE>
-            <ru_RU>Переплата!</ru_RU>
-        </Text>
-        <Text name="user_message_02"  textnr="0x82">
-            <lt_LT>Pasiektas maksimalus monetų kiekis!</lt_LT>
-            <en_GB>Reached maximum number of coins.!</en_GB>
-            <de_DE>Maximalanzahl der Münzen erreicht!</de_DE>
-            <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
-        </Text>
-        <Text name="user_message_04"  textnr="0x84">
-            <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>
-        </Text>
-    </Screen>
 	<Screen name="Welcome2" screennr="0x3d">
                <Text textnr="0x30">
 			<lt_LT>Sveiki!</lt_LT>
@@ -1506,11 +1438,11 @@
                        <ru_RU>Переплата!</ru_RU>
                </Text>
 		<Text name="user_message_08"  textnr="0x88">
-            <lt_LT>SUTEIKITE TIKSLIĄ SUMĄ…</lt_LT>
-            <en_GB>PLEASE, PAY APPROPRIATELY</en_GB>
-            <de_DE>BITTE PASSEND ZAHLEN</de_DE>
-            <ru_RU>ПРЕДОСТАВЬТЕ ТОЧНУЮ СУММУ…</ru_RU>
-        </Text>
+                    <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
+                        <en_GB>Minimum parking fee</en_GB>
+                        <de_DE>Mindestparkgebühr</de_DE>
+                        <ru_RU>Минимальная плата за парковку</ru_RU>
+                </Text>
 	</Screen>
 	<Screen name="PayMethod3" screennr="0x41">
                <Text textnr="0x30">
@@ -2287,7 +2219,7 @@
                        <ru_RU>Принимаются только платежные карточки…</ru_RU>
                </Text>
 		<Text name="user_message_04"  textnr="0x84">
-                        <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
+                        <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
                        <en_GB>Minimum parking fee</en_GB>
                        <de_DE>Mindestparkgebühr</de_DE>
                        <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2348,12 +2280,6 @@
                        <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">
@@ -2493,7 +2419,7 @@
 	      <ru_RU>Достигнуто максимальное количество монет!</ru_RU>
 	  </Text>
 	  <Text name="user_message_04"  textnr="0x84">
-	      <lt_LT>Minimalus stovėjimo mokestis</lt_LT>
+	      <lt_LT>Minimalus stovėjimo mokėstis</lt_LT>
 	      <en_GB>Minimum parking fee</en_GB>
 	      <de_DE>Mindestparkgebühr</de_DE>
 	      <ru_RU>Минимальная плата за парковку</ru_RU>
@@ -2568,61 +2494,5 @@
            <de_DE>880012344</de_DE>
            <ru_RU>880012344</ru_RU>
        </Text>
-    </Screen>
-    <Screen name="COMMON_USER_MESSAGES" screennr="0xF3">
-        <Text  name="PAY_MORE" textnr="0x30">
-            <lt_LT>Mokėti daugiau</lt_LT>
-            <en_GB>pay more…</en_GB>
-            <de_DE>mehr zahlen…</de_DE>
-            <ru_RU>платить больше</ru_RU>
-        </Text>
-        <Text  name="PAY_APPROPRIATELY" textnr="0x31">
-            <lt_LT>suteikite tikslią sumą…</lt_LT>
-            <en_GB>give the exact money…</en_GB>
-            <de_DE>passend zahlen…</de_DE>
-            <ru_RU>предоставьте точную сумму…</ru_RU>
-        </Text>
-        <Text  name="NO_CANGE" textnr="0x32">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text  name="MINIMUM_PRICE" textnr="0x33">
-            <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>
-        </Text>
-        <Text  name="MAXIMUM_PRICE" textnr="0x34">
-            <lt_LT>Maksimali bilieto suma</lt_LT>
-            <en_GB>Max. Ticket amount</en_GB>
-            <de_DE>Höchstparkdauer erreicht</de_DE>
-            <ru_RU>Максимальная сумма билета</ru_RU>
-        </Text>
-        <Text  name="CARDPAYMENT_ONLY" textnr="0x35">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text  name="CASHPAYMENT_ONLY" textnr="0x36">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-        <Text  name="OVERPAID" textnr="0x37">
-            <lt_LT>Permoka!</lt_LT>
-            <en_GB>Overpaid</en_GB>
-            <de_DE>Überbezahlt</de_DE>
-            <ru_RU>Переплата!</ru_RU>
-        </Text>
-        <Text  name="MAXIMUM_NUM_OF_COINS" textnr="0x38">
-            <lt_LT> </lt_LT>
-            <en_GB> </en_GB>
-            <de_DE> </de_DE>
-            <ru_RU> </ru_RU>
-        </Text>
-    </Screen>
+    </Screen>	
 </ATB_Text>
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,13 +1,13 @@
 {	     
 "title":"DC2C_cash  ",
-"Project":"Klaipeda, Palanga",
-"Version":"1.0.0-2024-10-11",
-"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,0,0,0,0,0,0,0,0,0,0,3],
+"Project":"Klaipeda",
+"Version":"6.7.1-2024-06-24",
+"CoinDenom(15..0)":[200,100,50,20,10,5,0,0,0,50,20,10,5,2,1,1],
+"CoinValue(15..0)":[200,100,50,20,10,5,0,0,0,50,20,10,5,2,1,3],
 "CoinAccept(15..0)":[1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,1],
 "ExchangeRate":1,
-"TokenChannel":1,
-"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
+"TokenChannel":6,
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,5000,2000,1000,500],
 "BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
 "LocalTaxRate":21,
 "ForeignTaxRate":0,
--- a/etc/psa_config/DC2C_device.json
+++ b/etc/psa_config/DC2C_device.json
@@ -1,7 +1,7 @@
 {
 "title":"DC2C_device",
 "Project":"Klaipeda",
-"Version":"7.2.3-2024-08-22",
+"Version":"6.8.0-2024-06-27",
 "printer":1,
 "coinChk":1,
 "mifRd":1,
@@ -15,14 +15,14 @@
 "vaultLock":0,
 "autoAlarm":1,
 "autoOpen":1,
-"AccPrint":1,
-"DorPrint":0,
-"TokPrint":2,
+"AccPrint":2,
+"DorPrint":1,
+"TokPrint":1,
 "CBwarnLev":1600,
 "CBerrLev":1900,
 "BattWarn":11800,
 "BattErr":11200,
-"foreign":5,
+"foreign":4,
 "refundPrint":1,
 "billWarnLev":300,
 "billFullLev":380,
@@ -32,4 +32,6 @@
 "dev_aux2":0,
 "dev_aux3":0,
 "dev_aux4":0
+
+
 }
--- a/etc/psa_config/DC2C_print01.json
+++ b/etc/psa_config/DC2C_print01.json
@@ -1,25 +1,23 @@
 {
 "title":"DC2C_pri01",
-"Project":"Klaipeda",
-"Version":"1.1.4-2024-08-22",
+"project":"Klaipeda",
+"Version":"6.7.1-2024-06-24",
 "text":"",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"size 00",
+"styl":"font 10",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"Privaloma įmoka - vietinė rinkliava.",
+"styl":"size 10",
+"text":"Parking Ticket",
+"styl":"size 00",
 "feed":"nl",
-"text":"Bilietą padėkite už priekinio stiklo",
+"text":"Please put clearly",
 "feed":"nl",
-"text":"ant prietaisų skydelio, kad būtų",
-"feed":"nl",
-"text":"lengvai įskaitomi bilieto duomenys.",
+"text":"visible behind your",
+"text":"wind screen",
 "feed":"nl",
 "feed":"nl",
-"text":"Galioja šia puse į viršų.",
-"feed":"nl"
+"text":"Your license plate:"
 }


@@ -33,3 +31,4 @@



+
--- a/etc/psa_config/DC2C_print02.json
+++ b/etc/psa_config/DC2C_print02.json
@@ -1,36 +1,30 @@
 {
 "title":"DC2C_pri02",
-"Project":"Klaipeda",
-"Version":"1.1.4-2024-08-22",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"size 00",
-"styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
+"project":"Klaipeda",
+"Version":"6.7.1-2024-06-24",
 "feed":"nl",
-"text":"Automobilio valstybinis",
-"feed":"nl",
-"text":" numeris:",
-"feed":"nl",
-"styl":"size 22",
+"styl":"size 11",
 "vari":"Dynamic01",
 "styl":"size 00",
 "feed":"nl",
-"text":"Apmokėta iki:",
+"text":"Parking end:",
 "feed":"nl",
-"styl":"size 32",
+"styl":"size 11",
+"vari":"Dynamic04",
 "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",	
-"vari":"time long",
-"feed":"nl"
+"text":"Printed at:",
+"feed":"nl",
+"styl":"size 11",
+"vari":"time short",
+"vari":"date us",
+"styl":"size 00",
+"feed":"nl",
+"text":"Payed:",
+"feed":"nl",
+"vari":"Dynamic07",
+"feed":"nl",
 }


--- a/etc/psa_config/DC2C_print03.json
+++ b/etc/psa_config/DC2C_print03.json
@@ -1,24 +1,29 @@
 {
 "title":"DC2C_pri03",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"styl":"size 00",
-"text":"Sumokėta:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Raudonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 1,50Eur/h",
+"project":"Klaipeda",
+"Version":"6.7.1-2024-06-24",
 "feed":"nl",
 "styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
+"text":"Ticket nr.:",
 "vari":"Dynamic08",
 "feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
+"text":"CustomerNr.: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
+"vari":"manu",	
+"text":"Place: ",
+"feed":"nl",
+"vari":"location",	
+"feed":"nl",
+"text":"Automato adresas: S.Daukanto g. 2",
+"feed":"nl",
+"text":"VDA Automobilio stovejimo aikoteles",
+"feed":"nl",
+"text":"Puodpio g. 24-1, LT-44295, Kaunas,",
+"feed":"nl",
+"text":"Am. kodas 134929849 PVM kodas LT349298414",
+"feed":"nl",
+"feed":"eject"
 }


@@ -32,3 +37,4 @@



+
--- a/etc/psa_config/DC2C_print03_red.json
+++ b/etc/psa_config/DC2C_print03_red.json
@@ -1,40 +0,0 @@
-{
-"title":"DC2C_pri03",
-"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",
-"styl":"size 00",
-"text":"Sumokėta grynais:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Raudonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 1,50Eur/h",
-"feed":"nl",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
-"vari":"Dynamic08",
-"feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print03_yellow.json
+++ b/etc/psa_config/DC2C_print03_yellow.json
@@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri03",
-"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":"Sumokėta grynais:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Geltonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 60 ct/h",
-"feed":"nl",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
-"vari":"Dynamic08",
-"feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print04.json
+++ b/etc/psa_config/DC2C_print04.json
@@ -1,28 +1,8 @@
 {
 "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ė",
-"feed":"nl",
-"text":"Liepų g. 11, LT-92138",
-"feed":"nl",
-"text":" Klaipėda,",
-"feed":"nl",
-"text":"Įm.k. 188710823",
-"feed":"nl",
-"text":"Informacija tel.:",
-"feed":"nl",
-"text":" +370 800 12344 "
-"feed":"nl",
-"feed":"eject"
+"project":"Klaipeda",
+"Version":"6.7.1-2024-06-24",
+"styl":"size 00"
 }


@@ -36,3 +16,4 @@



+
--- a/etc/psa_config/DC2C_print05.json
+++ b/etc/psa_config/DC2C_print05.json
@@ -1,25 +1,23 @@
 {
 "title":"DC2C_pri05",
-"Project":"Klaipeda",
-"Version":"1.1.4-2024-08-22",
+"project":"Klaipeda",
+"Version":"6.7.1-2024-06-24",
 "text":"",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"size 00",
+"styl":"font 10",
 "styl":"align c",
 "feed":"margin02",
 "feed":"rim02",
-"text":"Privaloma įmoka - vietinė rinkliava.",
+"styl":"size 10",
+"text":"Parking Ticket",
+"styl":"size 00",
 "feed":"nl",
-"text":"Bilietą padėkite už priekinio stiklo",
+"text":"Please put clearly",
 "feed":"nl",
-"text":"ant prietaisų skydelio, kad būtų",
-"feed":"nl",
-"text":"lengvai įskaitomi bilieto duomenys.",
+"text":"visible behind your",
+"text":"wind screen",
 "feed":"nl",
 "feed":"nl",
-"text":"Galioja šia puse į viršų.",
-"feed":"nl"
+"text":"Your license plate:"
 }


@@ -33,3 +31,4 @@



+
--- a/etc/psa_config/DC2C_print06.json
+++ b/etc/psa_config/DC2C_print06.json
@@ -1,36 +1,30 @@
 {
 "title":"DC2C_pri06",
-"Project":"Klaipeda",
-"Version":"1.1.4-2024-08-22",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"size 00",
-"styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
+"project":"Klaipeda",
+"Version":"6.7.1-2024-06-24",
 "feed":"nl",
-"text":"Automobilio valstybinis",
-"feed":"nl",
-"text":" numeris:",
-"feed":"nl",
-"styl":"size 22",
+"styl":"size 11",
 "vari":"Dynamic01",
 "styl":"size 00",
 "feed":"nl",
-"text":"Apmokėta iki:",
+"text":"Parking end:",
 "feed":"nl",
-"styl":"size 32",
+"styl":"size 11",
+"vari":"Dynamic04",
 "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",	
-"vari":"time long",
-"feed":"nl"
+"text":"Printed at:",
+"feed":"nl",
+"styl":"size 11",
+"vari":"time short",
+"vari":"date us",
+"styl":"size 00",
+"feed":"nl",
+"text":"Payed:",
+"feed":"nl",
+"vari":"Dynamic07",
+"feed":"nl",
 }


--- a/etc/psa_config/DC2C_print07.json
+++ b/etc/psa_config/DC2C_print07.json
@@ -1,24 +1,29 @@
 {
 "title":"DC2C_pri07",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"styl":"size 00",
-"text":"Sumokėta:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Raudonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 1,50Eur/h",
+"project":"Klaipeda",
+"Version":"6.7.1-2024-06-24",
 "feed":"nl",
 "styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
+"text":"Ticket nr.:",
 "vari":"Dynamic08",
 "feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
+"text":"CustomerNr.: ",
+"vari":"cunu",	
+"text":"MachineNr: ",
+"vari":"manu",	
+"text":"Place: ",
+"feed":"nl",
+"vari":"location",	
+"feed":"nl",
+"text":"Automato adresas: S.Daukanto g. 2",
+"feed":"nl",
+"text":"VDA Automobilio stovejimo aikoteles",
+"feed":"nl",
+"text":"Puodpio g. 24-1, LT-44295, Kaunas,",
+"feed":"nl",
+"text":"Am. kodas 134929849 PVM kodas LT349298414",
+"feed":"nl",
+"feed":"eject"
 }


@@ -32,3 +37,4 @@



+
--- a/etc/psa_config/DC2C_print07_red.json
+++ b/etc/psa_config/DC2C_print07_red.json
@@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri07",
-"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":"Sumokėta kortele:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Raudonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 1,50Eur/h",
-"feed":"nl",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
-"vari":"Dynamic08",
-"feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print07_yellow.json
+++ b/etc/psa_config/DC2C_print07_yellow.json
@@ -1,39 +0,0 @@
-{
-"title":"DC2C_pri07",
-"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":"Sumokėta kortele:", 
-"vari":"Dynamic02",
-"styl":"size 21",
-"text":"Geltonoji zona",
-"feed":"nl",
-"styl":"size 10",
-"text":"tarifas 60 ct/h",
-"feed":"nl",
-"styl":"size 00",
-"feed":"nl",
-"text":"Bilieto nr.:",
-"vari":"Dynamic08",
-"feed":"nl",
-"text":"Automato nr.:",
-"vari":"manu",
-"feed":"nl"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print08.json
+++ b/etc/psa_config/DC2C_print08.json
@@ -1,28 +1,8 @@
 {
 "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ė",
-"feed":"nl",
-"text":"Liepų g. 11, LT-92138",
-"feed":"nl",
-"text":" Klaipėda,",
-"feed":"nl",
-"text":"Įm.k. 188710823",
-"feed":"nl",
-"text":"Informacija tel.:",
-"feed":"nl",
-"text":" +370 800 12344 "
-"feed":"nl",
-"feed":"eject"
+"project":"Klaipeda",
+"Version":"6.7.1-2024-06-24",
+"styl":"size 00"
 }


@@ -36,3 +16,4 @@



+
--- a/etc/psa_config/DC2C_print09.json
+++ b/etc/psa_config/DC2C_print09.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri09",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print10.json
+++ b/etc/psa_config/DC2C_print10.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri10",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print11.json
+++ b/etc/psa_config/DC2C_print11.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri11",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print12.json
+++ b/etc/psa_config/DC2C_print12.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri12",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print13.json
+++ b/etc/psa_config/DC2C_print13.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri13",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print14.json
+++ b/etc/psa_config/DC2C_print14.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri14",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print15.json
+++ b/etc/psa_config/DC2C_print15.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri15",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print16.json
+++ b/etc/psa_config/DC2C_print16.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri16",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print17.json
+++ b/etc/psa_config/DC2C_print17.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri17",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print18.json
+++ b/etc/psa_config/DC2C_print18.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri18",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print19.json
+++ b/etc/psa_config/DC2C_print19.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri19",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print20.json
+++ b/etc/psa_config/DC2C_print20.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri20",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print21.json
+++ b/etc/psa_config/DC2C_print21.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri21",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print22.json
+++ b/etc/psa_config/DC2C_print22.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri22",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print23.json
+++ b/etc/psa_config/DC2C_print23.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri23",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print24.json
+++ b/etc/psa_config/DC2C_print24.json
@@ -1,33 +0,0 @@
-{
-"title":"DC2C_pri24",
-"Project":"Klaipeda",
-"Version":"1.1.4-2024-08-22",
-"text":"",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"size 00",
-"styl":"align c",
-"feed":"margin02",
-"feed":"rim02",
-"text":"Privaloma įmoka - vietinė rinkliava.",
-"feed":"nl",
-"text":"Vietinė rinkliava",
-"feed":"nl",
-"text":"pagal pranešimą Nr.",
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic08",
-"styl":"size 00"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -1,41 +0,0 @@
-{
-"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":"size 22",
-"vari":"Dynamic01",
-"styl":"size 00",
-"feed":"nl",
-"text":"Sumokėta:", 
-"feed":"nl",
-"styl":"size 11",
-"vari":"Dynamic02",
-"styl":"size 00",
-"feed":"nl",
-"text":"Mokėjimo data ir laikas:", 
-"feed":"nl",
-"styl":"size 11",
-"vari":"date us",	
-"vari":"time long"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print26.json
+++ b/etc/psa_config/DC2C_print26.json
@@ -1,42 +0,0 @@
-{
-"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",	
-"feed":"nl",
-"text":"Klaipėdos miesto",
-"feed":"nl",
-"text":"savivaldybė",
-"feed":"nl",
-"text":"Liepų g. 11, LT-92138",
-"feed":"nl",
-"text":" Klaipėda,",
-"feed":"nl",
-"text":"Įm.k. 188710823",
-"feed":"nl",
-"text":"Informacija tel.:",
-"feed":"nl",
-"text":" +370 800 12344 "
-"feed":"nl",
-"feed":"eject"
-
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print27.json
+++ b/etc/psa_config/DC2C_print27.json
@@ -1,18 +0,0 @@
-{
-"title":"DC2C_pri27",
-"Project":"Klaipeda",
-"Version":"1.1.3-2024-08-08",
-"text":"" 
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print30.json
+++ b/etc/psa_config/DC2C_print30.json
@@ -1,44 +0,0 @@
-{
-"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"
-}
-
-
-
-
-
-
-
-
-
-
-
-
--- a/etc/psa_config/DC2C_print31.json
+++ b/etc/psa_config/DC2C_print31.json
@@ -1,14 +1,12 @@
 {
 "title":"DC2C_pri31",
 "Project":"door close print",
-"Version":"6.7.2-2024-08-22",
-"text":"",
-"styl":"font 24",
-"styl":"csiz 08",
-"styl":"size 00",
-"styl":"align c",
+"Version":"6.7.1-2024-06-17",
+"styl":"font 08",
+"styl":"size 10",
 "feed":"margin02",
 "feed":"rim02",
+"feed":"speed10",
 "styl":"size 11",
 "feed":"nl",
 "text":"Door closed at:",
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,7 +1,7 @@
 {
  "Project" : "Kleipeda",
-  "Version" : "2.1.0-2024-04-23T12:36:12+02:00",
-  "Info"    : "Red Zone (center)",
+  "Version" : "1.0.0-2024-06-06T14:56:00+02:00",
+  "Info"    : "",
  "Currency": [
    {
      "pcu_id": 2,
@@ -27,11 +27,6 @@
    {
      "pme_id": 4,
      "pme_label": "steps"
-    },
-    {
-      "pme_id": 5,
-      "pme_label": "unified",
-      "comment": "deprecated"
    }
  ],
  "TimeRange" : [
@@ -55,28 +50,25 @@
    {
      "pop_id": 1049,
      "pop_label": "Zone 1",
-      "pop_payment_method_id": 5,
+      "pop_payment_method_id": 4,
+      "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,
      "comment_pop_max_time": "840mins = 14h -> 21 euros",
      "pop_min_price": 30,
      "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_business_hours": 0
+      "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": [
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 0,
-        "pra_price": 0
-    },
    {
        "pra_payment_option_id": 1049,
        "pra_payment_unit_id": 1,
@@ -1129,11 +1121,6 @@
    }
  ],
  "Duration": [
-    {
-	"pun_duration": 0,
-	"pun_id": 0,
-	"pun_label": "0 min"
-    },
    {
 	"pun_duration": 4,
 	"pun_id": 1,
@@ -2185,666 +2172,65 @@
 	"pun_label": "840 min"
    }
  ],
-    "Monday" : [{
-        "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" : [
-	    ]
-        }
-    }],
-    "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" : [
-	    ]
-        }
-    }]
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22: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"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 7,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 8,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
+  ]
 }
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -1,7 +1,7 @@
 {
  "Project" : "Kleipeda",
-  "Version" : "2.0.0-2025-04-23T09:32:12+02:00",
-  "Info"    : "Yellow Zone (plus)",
+  "Version" : "1.0.0-2024-06-06T14:56:00+02:00",
+  "Info"    : "Yellow Zone",
  "Currency": [
    {
      "pcu_id": 2,
@@ -27,11 +27,6 @@
    {
      "pme_id": 4,
      "pme_label": "steps"
-    },
-    {
-      "pme_id": 5,
-      "pme_label": "unified",
-      "comment": "deprecated"
    }
  ],
  "TimeRange" : [
@@ -55,28 +50,25 @@
    {
      "pop_id": 1049,
      "pop_label": "Zone 1",
-      "pop_payment_method_id": 5,
+      "pop_payment_method_id": 4,
+      "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": "12mins -> 30 cent",
+      "comment_pop_min_time": "30mins -> 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_business_hours": 0
+      "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": [
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 0,
-        "pra_price": 0
-    },
    {
        "pra_payment_option_id": 1049,
        "pra_payment_unit_id": 1,
@@ -495,45 +487,10 @@
    {
        "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_id": 0,
-	"pun_label": "0 min"
-    },
    {
        "pun_duration": 10,
        "pun_id": 1,
@@ -949,621 +906,71 @@
        "pun_id": 83,
        "pun_label": "830 min"
    },
-    {
-        "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_id": 84,
        "pun_label": "840 min"
    }
  ],
-    "Monday" : [{
-        "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" : [
-	    ]
-        }
-    }],
-    "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" : [
-	        ]
-        }
-    }]
+  "WeekDaysWorktime": [
+    {
+      "pwd_id": 621,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 1,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 622,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 2,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 623,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 3,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 624,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 4,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22: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"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    },
+    {
+      "pwd_id": 626,
+      "pwd_period_week_day_id": 36,
+      "pwd_period_day_in_week_id": 7,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "22:00:00"
+    }
+  ],
+  "PeriodYear": [
+    {
+      "pye_id": 8,
+      "pye_label": "Whole year",
+      "pye_start_month": 1,
+      "pye_start_day": 1,
+      "pye_end_month": 12,
+      "pye_end_day": 31
+    }
+  ]
 }
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -4,27 +4,13 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
-opkg update
-opkg install prepare-update
+#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 --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 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
+#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
Author	SHA1	Message	Date
Gerhard Hoffmann	b268100e34	Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_335 into zg1/zone1	2024-07-19 10:31:36 +02:00
Gerhard Hoffmann	23eb6ca07b	Add JSON files as saved on ATB server	2024-07-19 10:30:43 +02:00
Siegfried Siegert	5674fd9165	Merge branch 'zg1/zone1' of ptu-config.atb-comm.de:ATB/customer_335 into zg1/zone1	2024-07-19 09:59:02 +02:00
Siegfried Siegert	42b26ee0ca	Merge branch 'master' into zg1/zone1	2024-07-19 09:58:49 +02:00
Gerhard Hoffmann	109ce63b71	Add tariff for Yellow Zone	2024-07-18 15:38:17 +02:00
Gerhard Hoffmann	f3d04ab718	Provide empty file as start	2024-07-17 14:46:04 +02:00
Gerhard Hoffmann	7b912cea2c	Removed for Kleipeda (too many machines, each one needs maybe own conf-file)	2024-06-28 12:45:39 +02:00
Gerhard Hoffmann	ed92e95e87	Changed to UNIX format (test) and set version info.	2024-06-28 12:45:11 +02:00
Gerhard Hoffmann	7dd4874870	removed empty line after testing	2024-06-28 12:39:33 +02:00
Gerhard Hoffmann	0474b7e649	Add empty line for testing	2024-06-28 12:10:33 +02:00
Siegfried Siegert	120cdc0220	Merge branch 'master' into zg1/zone1	2024-06-27 12:15:55 +02:00
Gerhard Hoffmann	135d93adf1	first draft of tariff for kleipeda	2024-06-06 17:16:29 +02:00