sync with brancht zg1/zone101

opkg update
opkg install prepare-update
opkg install atbupdatetool
opkg install mxt-touch-reset
opkg install apism
opkg info apism
opkg info atbupdatetool

etc/atb/SystemControl.ini

@@ -1,71 +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
-4\id=CASHBOX_CONTENT
-4\program=/opt/app/tools/atbAccountingTool
-4\arguments=-q, -c
-4\envs=
-4\hourOfDay=23
-size=4
-
-[BACKLIGHT]
-SensorMax=3500
-SensorMin=0
-curve=1
-dimLowValue=499
-dimMax=100
-dimMin=20
-inputBrightness=499
-
-[COMMON]
-startBacklightController=true
-startMQTTController=false
-startMonitoringController=false
-startSuspendController=false
-
-[MONITORING]
-http_dataFormat=HTTP
-http_host=127.0.0.1
-http_ignoreSslErrors=on
-http_port=5000
-http_protocol=http
-http_service=
-monitoring_heartbeatInterval=60
-protocol=mqtt
-useDeviceId=on
-useRingbuffer=on
-
-[MQTT]
-mqtt_QoS=0
-mqtt_TopicDeviceType=MP
-mqtt_TopicPrefix=ATB
-mqtt_TopicScheme=ATB_ISMAS
-mqtt_debug=on
-mqtt_host=mqtt2.atb-comm.de
-mqtt_password=xyz123
-mqtt_port=8883
-mqtt_useSsl=on
-mqtt_username=testuser
-
-[NETWORKCHECK]
-PingHost=google.com
-networkRestart=/sbin/ifup -a
-setOOO=off
-useNetworkCheck=on
-
-[SUSPEND]
-program=/home/root/system_powerdown_wakeup.sh
-suspendLoopTimerValue=8

etc/atbapp/states/APP_States.xml

@@ -1,8 +1,7 @@
 <?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="BUTTON_START" resultingState="LICENSEPLATE_INPUT"/>
-        <EVENT name="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
         <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
         <SCREEN name="START"/>
         <MODE name="IDLE"/>
@@ -13,32 +12,17 @@
         <MODE name="IDLE"/>
     </APP_STATE>
     
-    <APP_STATE name="SETUP_SELL_STATE">
-        <ENTRY_TASK name="TIMER" timeout="500"/>
-        <EVENT name="TIMEOUT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
-    </APP_STATE>   
-    
-    <APP_STATE name="PRODUCT_SELECTION">
-        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_VEHICLE_1" resultingState="LICENSEPLATE_INPUT" setProduct="SHORT_TERM_PARKING" setCheckFeature="SKIP_TICKET_PRINT"/>
-        <EVENT name="BUTTON_VEHICLE_2" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
-        <SCREEN name="PRODUCT_SELECTION"/>
-    </APP_STATE>
-    
-    <!--
-    <APP_STATE name="SKIP_TICKET_PRINT_TEST">
-        <ENTRY_TASK name="PRINT_LOG" text="APP_STATE name=SKIP_TICKET_PRINT_TEST"/>
-        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
-        <EVENT name="CHECK_TRUE"  resultingState="LICENSEPLATE_INPUT"/>
-        <EVENT name="CHECK_FALSE" resultingState="PARKTIME_SELECTION"/>
-    </APP_STATE>
-    -->
-    
     <APP_STATE name="LICENSEPLATE_INPUT">
         <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
-        <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="SHORT_TERM_PARKING"/>
+        <EVENT name="BUTTON_NEXT" resultingState="PARKTIME_SELECTION" setProduct="ShortTimeParking"/>
         <SCREEN name="LICENSEPLATE_INPUT"/>
     </APP_STATE>
+   <APP_STATE name="PRODUCT_SELECTION">
+       <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
+       <EVENT name="BUTTON_VEHICLE_1" resultingState="PAYMENT_SELECTION_SHORT_TIME" setCashInputMode="PAY_UP"   setProduct="ShortTimeParking"/>
+       <EVENT name="BUTTON_VEHICLE_2" resultingState="PAYMENT_SELECTION_DAY" setCashInputMode="PAY_DOWN" setProduct="DayTicket"/>
+       <SCREEN name="PRODUCT_SELECTION"/>
+   </APP_STATE>
    
    <APP_STATE name="PAYMENT_SELECTION">
        <EVENT name="BUTTON_CANCEL" resultingState="IDLE"/>
@@ -78,7 +62,7 @@
     <APP_STATE name="CARD_PAYMENT">
         <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
         <ENTRY_TASK name="REQUEST_CC_START_TRANSACTION"/>
-        <EVENT name="RECEIVED_CARD_TRANSACTION_SUCCESS" resultingState="CHECK_PAPERLESS_CARD"/>
+        <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"/>
@@ -87,8 +71,8 @@
     <APP_STATE name="CASH_PAYMENT">
         <ENTRY_TASK name="REQUEST_CASH_INPUT"/>
         <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
-        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
-        <EVENT name="RECEIVED_CASH_INPUT_FINISHED"  resultingState="CHECK_PAPERLESS_CASH"/>
+        <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"/>
         <SCREEN name="COIN_PAYMENT"/>
@@ -96,8 +80,8 @@
     <APP_STATE name="CASH_PAYMENT_INPUT">
         <ENTRY_TASK name="REQUEST_PARKING_ENDTIME" key="PRICE_INFO_GROSS"/>
         <EVENT name="RECEIVED_CASH_INPUT" resultingState="CASH_PAYMENT_INPUT"/>
-        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="CHECK_PAPERLESS_CASH"/>
+        <EVENT name="RECEIVED_CASH_INPUT_OVERPAYED" resultingState="PRINT_TICKET_CASH"/>
-        <EVENT name="RECEIVED_CASH_INPUT_FINISHED"  resultingState="CHECK_PAPERLESS_CASH"/>
+        <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"/>
@@ -110,7 +94,7 @@
         <SCREEN name="CASH_PAYMENT_FAILED" note="screennumber 0x39"/>
     </APP_STATE>
     <APP_STATE name="CASH_OVERPAYED">
-        <ENTRY_TASK name="REQUEST_ISMAS_FAIL_TRANSACTION"/>
+        <ENTRY_TASK name="REQUEST_ISAMAS_FAIL_TRANSACTION"/>
         <ENTRY_TASK name="CASH_ABORT"/>
         <ENTRY_TASK name="TIMER" timeout="3000"/>
         <EVENT name="TIMEOUT" resultingState="IDLE"/>
@@ -130,19 +114,6 @@
         <SCREEN name="BUSY"/>
     </APP_STATE>
     -->
-    
-    <APP_STATE name="CHECK_PAPERLESS_CASH">
-        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
-        <EVENT name="CHECK_TRUE"  resultingState="FINALISE_CASH_PAYMENT" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
-        <EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CASH"/>
-    </APP_STATE>
-    <APP_STATE name="CHECK_PAPERLESS_CARD">
-        <ENTRY_TASK name="CHECK_FEATURE" checkFeatureName="SKIP_TICKET_PRINT"/>
-        <EVENT name="CHECK_TRUE"  resultingState="CARD_PAYMENT_CONFIRM" setTransactionDelivery="ONLINE" setTransactionResult="SUCCESS"/>
-        <EVENT name="CHECK_FALSE" resultingState="PRINT_TICKET_CARD"/>
-    </APP_STATE>
-    
-    
     <APP_STATE name="PRINT_TICKET_CASH">
         <ENTRY_TASK name="REQUEST_PRINT_TICKET"/>
         <EVENT name="PRINT_TICKET_FINISHED" resultingState="FINALISE_CASH_PAYMENT"/>
@@ -166,28 +137,20 @@
 
     <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_SUCCESS" resultingState="PRINT_RECEIPT"/>
         <EVENT name="RECEIVED_CARD_CONFIRM_TRANSACTION_ERROR"   resultingState="CC_PAYMENT_ERROR"/>
     </APP_STATE>      
-    <APP_STATE name="ASK_RECEIPT">
-        <ENTRY_TASK name="TIMER" timeout="6000"/>
-        <EVENT name="TIMEOUT" resultingState="GOODBYE_PAYMENT_OK"/>
-        <EVENT name="BUTTON_YES" resultingState="PRINT_RECEIPT"/>
-        <EVENT name="BUTTON_NO"  resultingState="GOODBYE_PAYMENT_OK"/>
-        <SCREEN name="ASK_RECEIPT"/>
-    </APP_STATE>
     <APP_STATE name="PRINT_RECEIPT">
         <ENTRY_TASK name="REQUEST_PRINT_RECEIPT"/>
         <EVENT name="PRINT_RECEIPT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
         <EVENT name="PRINT_RECEIPT_ERROR" resultingState="PRINT_TICKET_FAILED"/>
-        <SCREEN name="PRINT_RECEIPT"/>
     </APP_STATE>   
     
     <APP_STATE name="FINALISE_CASH_PAYMENT">
         <ENTRY_TASK name="CASH_COLLECT"/>
         <EVENT name="RECEIVED_CASH_CHANGE_BACK" resultingState="GIVE_CHANGE"/>
         <EVENT name="RECEIVED_CASH_PAYMENT_FINISHED" resultingState="GOODBYE_PAYMENT_OK"/>
-        <!-- TODO: handle changer Error -->
+        <!-- TODO: hangle changer Error -->
         <!-- no screen change here -->
     </APP_STATE>   
     <APP_STATE name="GIVE_CHANGE">
@@ -198,7 +161,7 @@
         <ENTRY_TASK name="REQUEST_ISMAS_TRANSACTION"/>
         <ENTRY_TASK name="TIMER" timeout="2000"/>
         <EVENT name="TIMEOUT" resultingState="IDLE"/>
-        <SCREEN name="GOODBYE_3" note="green_hook"/>
+        <SCREEN name="GOODBYE_PAYMENT_OK"/>
     </APP_STATE>
     
     <APP_STATE name="CC_PAYMENT_ERROR">

etc/psa_config/DC2C_cash.json

@@ -1,14 +1,14 @@
 {	     
 "title":"DC2C_cash  ",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"version":"15.10.2023 14:55 02.00.06",
-"CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],
+"CoinDenom(15..0)":[200,100,50,0,0,0,0,0,0,255,200,100,50,20,10,5],
-"CoinValue(15..0)":[0,0,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
+"CoinValue(15..0)":[0,380,0,0,0,0,0,0,0,3,200,100,50,20,10,5],
-"CoinAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,0],
+"CoinAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
 "ExchangeRate":1,
 "TokenChannel":6,
-"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,5000,2000,1000,500],
+"BillValues(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],
-"BillAccept(15..0)":[0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1],
+"BillAccept(15..0)":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1],
 "LocalTaxRate":19,
 "ForeignTaxRate":0,
 "Surcharge":0,	

etc/psa_config/DC2C_conf.json

@@ -1,12 +1,12 @@
 { 
-"Title":"DC2C_config",
+"title":"DC2C_config",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"version":"15.11.2023 00001",
 "custNum":332,
-"machNum":99,
+"machNum":1000,
-"borough":101,
+"borough":0,
-"zone":1,
+"zone":0,
 "alias":0,
-"location":"Atb Buero Gerhardt"
+"location":"Vorplatz 1"
 }
 

etc/psa_config/DC2C_conf21.json

@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Schoenau",
+"version":"15.11.2023 00001",
+"custNum":332,
+"machNum":21,
+"borough":0,
+"zone":0,
+"alias":0,
+"location":"Vorplatz 1"
+}
+

etc/psa_config/DC2C_conf25.json

@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Schoenau",
+"version":"15.11.2023 00001",
+"custNum":332,
+"machNum":25,
+"borough":0,
+"zone":0,
+"alias":0,
+"location":"Vorplatz 1"
+}
+

etc/psa_config/DC2C_conf26.json

@@ -0,0 +1,12 @@
+{ 
+"title":"DC2C_config",
+"project":"Schoenau",
+"version":"15.11.2023 00001",
+"custNum":332,
+"machNum":26,
+"borough":0,
+"zone":0,
+"alias":0,
+"location":"Vorplatz 1"
+}
+

etc/psa_config/DC2C_device.json

@@ -1,12 +1,12 @@
 {
 "title":"DC2C_device",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2025-01-27",
+"Version":"15.11.2023 00102",
 "printer":1,
 "coinChk":3,
 "mifRd":1,
 "solarPwr":0,
-"modem":1,
+"modem":0,
 "creditCard":1,
 "escrow":0,
 "RejMotor":0,
@@ -23,9 +23,5 @@
 "BattWarn":11800,
 "BattErr":11200,
 "foreign":1,
-"refundPrint":1,
+"refPrint":1
-"billWarnLev":300,
-"billFullLev":380,
-"housing":1
-
 }

etc/psa_config/DC2C_print01.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri01",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"15.11.2023 00001",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",

etc/psa_config/DC2C_print02.json

@@ -1,7 +1,8 @@
 {
 "title":"DC2C_pri02",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"01.12.2023 00008",
+"issued":"13.11.2023 01.01",
 "text":"Standort: ",
 "feed":"nl",
 "vari":"location",

etc/psa_config/DC2C_print03.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri03",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"05.04.2024 00001",
 "feed":"nl",
 "styl":"size 00",
 "text":"Automat: ",
@@ -16,14 +16,9 @@
 "styl":"align c",
 "text":"Schönau am Königssee",
 "feed":"nl",
-"text":"Ticket-Nr. ",
-"vari":"TickCtr",
-"feed":"nl",
 "text":"Automatentechnik ",
 "feed":"nl",
 "text":"Baumann GmbH",
-"feed":"nl",
-"feed":"nl",
 "feed":"eject"
 }
 

etc/psa_config/DC2C_print04.json

@@ -1,6 +1,6 @@
 {
 "title":"DC2C_pri04",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"15.11.2023 01.01",
 "text":"";
 }

etc/psa_config/DC2C_print05.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri05",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"15.11.2023 00001",
 "styl":"font 10",
 "styl":"size 11",
 "styl":"align c",

etc/psa_config/DC2C_print06.json

@@ -1,7 +1,8 @@
 {
 "title":"DC2C_pri06",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"15.11.2023 00002",
+"issued":"13.11.2023 01.01",
 "text":"Standort: ",
 "feed":"nl",
 "vari":"location",
@@ -15,7 +16,6 @@
 "vari":"wday deu short",
 "vari":"date ge",	
 "vari":"time long"
-
 }
 
 

etc/psa_config/DC2C_print07.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri07",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"05.04.2024 00001",
 "feed":"nl",
 "styl":"size 00",
 "text":"Automat: ",
@@ -16,14 +16,9 @@
 "styl":"align c",
 "text":"Schönau am Königssee",
 "feed":"nl",
-"text":"Ticket-Nr. ",
-"vari":"TickCtr",
-"feed":"nl",
 "text":"Automatentechnik ",
 "feed":"nl",
 "text":"Baumann GmbH",
-"feed":"nl",
-"feed":"nl",
 "feed":"eject"
 }
 

etc/psa_config/DC2C_print08.json

@@ -1,6 +1,6 @@
 {
 "title":"DC2C_pri08",
-"Project":"Schoenau",
+"project":"Schoenau",
-"Version":"6.7.1-2024-06-17",
+"Version":"15.11.2023 01.01",
 "text":"";
 }

etc/psa_config/DC2C_print31.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri31",
-"Project":"door close print",
+"project":"door close print",
-"Version":"6.7.1-2024-06-17",
+"Version":"15.11.2023 00001",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",

etc/psa_config/DC2C_print32.json

@@ -1,7 +1,7 @@
 {
 "title":"DC2C_pri32",
-"Project":"refund reciept",
+"project":"refund reciept",
-"Version":"6.7.1-2024-06-17",
+"Version":"15.11.2023 00002",
 "styl":"font 08",
 "styl":"size 10",
 "feed":"margin02",
@@ -14,7 +14,6 @@
 "text":"Erstattungsbetrag: ",
 "feed":"nl",
 "vari":"Dynamic07",
-"text":"€",
 "feed":"nl",
 "text":"KuNu: ",
 "vari":"cunu",	

etc/psa_tariff/tariff01.json

@@ -1,13 +1,13 @@
 {
   "Project" :   "Schoenau",
-  "Version" : "1.3.0-2025-02-03T00:09:12+02:00",
+  "Version" :   "1.2.0",
-  "Info"    : "Zone 1",
+  "Info"    :   "<<Tariff for Zone 1>>",
   "Currency": [
     {
-      "pcu_id": 2,
+      "pcu_id": 1,
       "pcu_sign": "€",
-      "pcu_major": "EUR",
+      "pcu_major": "Euro",
-      "pcu_minor": "",
+      "pcu_minor": "Cent",
       "pcu_active": true
     }
   ],
@@ -27,370 +27,151 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
-    },
-    {
-      "pme_id": 5,
-      "pme_label": "unified",
-      "comment": "deprecated"
-    }
-  ],
-  "TimeRange" : [
-    {
-      "time_range_id": 1,
-      "time_range_from": "20:00:00",
-      "time_range_to": "08:00:00"
-    },
-    {
-      "time_range_id": 2,
-      "time_range_from": "08:00:00",
-      "time_range_to": "20:00:00"
-    },
-    {
-      "time_range_id": 3,
-      "time_range_from": "00:00:00",
-      "time_range_to": "08:00:00"
     }
   ],
   "PaymentOption": [
     {
-      "pop_id": 1049,
+      "pop_id": 1099,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 5,
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "15:20:00",
+      "pop_day_night_end_time": "15:20:00",
+      "pop_price_night": 0,
       "pop_min_time": 60,
-      "comment_pop_min_time": "60mins -> 300 cent",
       "pop_max_time": 14400,
-      "comment_pop_max_time": "14400mins = 240h -> 90 euros",
       "pop_min_price": 300,
-      "pop_max_price": 9000,
-      "pop_plus_steps": 1,
-      "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_daily_card_price": 0,
+      "pop_multi_hour_price": 8
     }
   ],
   "PaymentRate": [
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 0,
+      "pra_payment_unit_id": 1,
       "pra_price": 300
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 1,
+      "pra_payment_unit_id": 6,
       "pra_price": 700
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 2,
+      "pra_payment_unit_id": 5,
       "pra_price": 900
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 3,
+      "pra_payment_unit_id": 7,
       "pra_price": 1800
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 4,
+      "pra_payment_unit_id": 8,
       "pra_price": 2700
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 5,
+      "pra_payment_unit_id": 9,
       "pra_price": 3600
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 6,
+      "pra_payment_unit_id": 10,
       "pra_price": 4500
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 7,
+      "pra_payment_unit_id": 11,
       "pra_price": 5400
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 8,
+      "pra_payment_unit_id": 12,
       "pra_price": 6300
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 9,
+      "pra_payment_unit_id": 13,
       "pra_price": 7200
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 10,
+      "pra_payment_unit_id": 14,
       "pra_price": 8100
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 11,
+      "pra_payment_unit_id": 15,
       "pra_price": 9000
     }
   ],
   "Duration": [
     {
-	"pun_duration": 60,
+      "pun_id": 1,
-	"pun_id": 0
+      "pun_label": "1h",
+      "pun_duration": 60
     },
     {
-	"pun_duration": 180,
+      "pun_id": 3,
-	"pun_id": 1
+      "pun_label": "15 min",
+      "pun_duration": 15
     },
     {
-	"pun_duration": 1440,
+      "pun_id": 5,
-	"pun_id": 2
+      "pun_label": "24h",
+      "pun_duration": 1440
     },
     {
-	"pun_duration": 2880,
+      "pun_id": 6,
-	"pun_id": 3
+      "pun_label": "3h",
+      "pun_duration": 180
     },
     {
-	"pun_duration": 4320,
+      "pun_id": 7,
-	"pun_id": 4
+      "pun_label": "48h",
+      "pun_duration": 2880
     },
     {
-	"pun_duration": 5760,
+      "pun_id": 8,
-	"pun_id": 5
+      "pun_label": "72h",
+      "pun_duration": 4320
     },
     {
-	"pun_duration": 7200,
+      "pun_id": 9,
-	"pun_id": 6
+      "pun_label": "96h",
+      "pun_duration": 5760
     },
     {
-	"pun_duration": 8640,
+      "pun_id": 10,
-	"pun_id": 7
+      "pun_label": "120h",
+      "pun_duration": 7200
     },
     {
-	"pun_duration": 10080,
+      "pun_id": 11,
-	"pun_id": 8
+      "pun_label": "144h",
+      "pun_duration": 8640
     },
     {
-	"pun_duration": 11520,
+      "pun_id": 12,
-	"pun_id": 9
+      "pun_label": "168h",
+      "pun_duration": 10080
     },
     {
-	"pun_duration": 12960,
+      "pun_id": 13,
-	"pun_id": 10
+      "pun_label": "192h",
+      "pun_duration": 11520
     },
     {
-	"pun_duration": 14400,
+      "pun_id": 14,
-	"pun_id": 11
+      "pun_label": "216h",
-    }
+      "pun_duration": 12960
-  ],
+    },
-    "Monday" : [{
-        "default" : {
-            "payment_settings" : [
     {
-                    "min_time" : 60,
+      "pun_id": 15,
-                    "max_time" : 14400,
+      "pun_label": "240h",
-                    "max_price": 9000,
+      "pun_duration": 14400
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
     }
   ]
 }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Tuesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Wednesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Thursday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Friday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Saturday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Sunday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }]
-}

etc/psa_tariff/tariff02.json

@@ -1,13 +1,13 @@
 {
   "Project" :   "Schoenau",
-  "Version" : "1.3.0-2025-02-03T00:09:12+02:00",
+  "Version" :   "1.2.0",
-  "Info"    : "Zone 2",
+  "Info"    :   "<<<Tariff for zone 2>>>",
   "Currency": [
     {
-      "pcu_id": 2,
+      "pcu_id": 1,
       "pcu_sign": "€",
-      "pcu_major": "EUR",
+      "pcu_major": "Euro",
-      "pcu_minor": "",
+      "pcu_minor": "Cent",
       "pcu_active": true
     }
   ],
@@ -27,370 +27,151 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
-    },
-    {
-      "pme_id": 5,
-      "pme_label": "unified",
-      "comment": "deprecated"
-    }
-  ],
-  "TimeRange" : [
-    {
-      "time_range_id": 1,
-      "time_range_from": "20:00:00",
-      "time_range_to": "08:00:00"
-    },
-    {
-      "time_range_id": 2,
-      "time_range_from": "08:00:00",
-      "time_range_to": "20:00:00"
-    },
-    {
-      "time_range_id": 3,
-      "time_range_from": "00:00:00",
-      "time_range_to": "08:00:00"
     }
   ],
   "PaymentOption": [
     {
-      "pop_id": 1049,
+      "pop_id": 1100,
-      "pop_label": "Zone 1",
+      "pop_label": "Zone 2",
-      "pop_payment_method_id": 5,
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "15:07:00",
+      "pop_day_night_end_time": "15:07:00",
+      "pop_price_night": 0,
       "pop_min_time": 60,
-      "comment_pop_min_time": "60mins -> 300 cent",
       "pop_max_time": 14400,
-      "comment_pop_max_time": "14400mins = 240h -> 90 euros",
       "pop_min_price": 300,
-      "pop_max_price": 6000,
-      "pop_plus_steps": 1,
-      "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_daily_card_price": 0,
+      "pop_multi_hour_price": 8
     }
   ],
   "PaymentRate": [
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 0,
+      "pra_payment_unit_id": 1,
       "pra_price": 300
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 1,
+      "pra_payment_unit_id": 6,
       "pra_price": 500
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 2,
+      "pra_payment_unit_id": 5,
       "pra_price": 600
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 3,
+      "pra_payment_unit_id": 7,
       "pra_price": 1200 
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 4,
+      "pra_payment_unit_id": 8,
       "pra_price": 1800
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 5,
+      "pra_payment_unit_id": 9,
       "pra_price": 2400
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 6,
+      "pra_payment_unit_id": 10,
       "pra_price": 3000
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 7,
+      "pra_payment_unit_id": 11,
       "pra_price": 3600
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 8,
+      "pra_payment_unit_id": 12,
       "pra_price": 4200
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 9,
+      "pra_payment_unit_id": 13,
       "pra_price": 4800
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 10,
+      "pra_payment_unit_id": 14,
       "pra_price": 5400
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 11,
+      "pra_payment_unit_id": 15,
       "pra_price": 6000
     }
   ],
   "Duration": [
     {
-	"pun_duration": 60,
+      "pun_id": 1,
-	"pun_id": 0
+      "pun_label": "1h",
+      "pun_duration": 60
     },
     {
-	"pun_duration": 180,
+      "pun_id": 3,
-	"pun_id": 1
+      "pun_label": "15 min",
+      "pun_duration": 15
     },
     {
-	"pun_duration": 1440,
+      "pun_id": 5,
-	"pun_id": 2
+      "pun_label": "24h",
+      "pun_duration": 1440
     },
     {
-	"pun_duration": 2880,
+      "pun_id": 6,
-	"pun_id": 3
+      "pun_label": "3h",
+      "pun_duration": 180
     },
     {
-	"pun_duration": 4320,
+      "pun_id": 7,
-	"pun_id": 4
+      "pun_label": "48h",
+      "pun_duration": 2880
     },
     {
-	"pun_duration": 5760,
+      "pun_id": 8,
-	"pun_id": 5
+      "pun_label": "72h",
+      "pun_duration": 4320
     },
     {
-	"pun_duration": 7200,
+      "pun_id": 9,
-	"pun_id": 6
+      "pun_label": "96h",
+      "pun_duration": 5760
     },
     {
-	"pun_duration": 8640,
+      "pun_id": 10,
-	"pun_id": 7
+      "pun_label": "120h",
+      "pun_duration": 7200
     },
     {
-	"pun_duration": 10080,
+      "pun_id": 11,
-	"pun_id": 8
+      "pun_label": "144h",
+      "pun_duration": 8640
     },
     {
-	"pun_duration": 11520,
+      "pun_id": 12,
-	"pun_id": 9
+      "pun_label": "168h",
+      "pun_duration": 10080
     },
     {
-	"pun_duration": 12960,
+      "pun_id": 13,
-	"pun_id": 10
+      "pun_label": "192h",
+      "pun_duration": 11520
     },
     {
-	"pun_duration": 14400,
+      "pun_id": 14,
-	"pun_id": 11
+      "pun_label": "216h",
-    }
+      "pun_duration": 12960
-  ],
+    },
-    "Monday" : [{
-        "default" : {
-            "payment_settings" : [
     {
-                    "min_time" : 60,
+      "pun_id": 15,
-                    "max_time" : 14400,
+      "pun_label": "240h",
-                    "max_price": 6000,
+      "pun_duration": 14400
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
     }
   ]
 }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Tuesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 6000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Wednesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 6000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Thursday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 6000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Friday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 6000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Saturday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 6000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Sunday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 6000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }]
-}

etc/psa_tariff/tariff03.json

@@ -1,13 +1,13 @@
 {
   "Project" :   "Schoenau",
-  "Version" : "1.3.0-2025-02-03T00:09:12+02:00",
+  "Version" :   "1.0.0",
-  "Info"    : "Zone 3",
+  "Info"    :   "",
   "Currency": [
     {
-      "pcu_id": 2,
+      "pcu_id": 1,
       "pcu_sign": "€",
-      "pcu_major": "EUR",
+      "pcu_major": "Euro",
-      "pcu_minor": "",
+      "pcu_minor": "Cent",
       "pcu_active": true
     }
   ],
@@ -27,370 +27,91 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
-    },
-    {
-      "pme_id": 5,
-      "pme_label": "unified",
-      "comment": "deprecated"
-    }
-  ],
-  "TimeRange" : [
-    {
-      "time_range_id": 1,
-      "time_range_from": "20:00:00",
-      "time_range_to": "08:00:00"
-    },
-    {
-      "time_range_id": 2,
-      "time_range_from": "08:00:00",
-      "time_range_to": "20:00:00"
-    },
-    {
-      "time_range_id": 3,
-      "time_range_from": "00:00:00",
-      "time_range_to": "08:00:00"
     }
   ],
   "PaymentOption": [
     {
-      "pop_id": 1049,
+      "pop_id": 1100,
-      "pop_label": "Zone 1",
+      "pop_label": "Zone 2",
-      "pop_payment_method_id": 5,
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "15:07:00",
+      "pop_day_night_end_time": "15:07:00",
+      "pop_price_night": 0,
       "pop_min_time": 60,
-      "comment_pop_min_time": "60mins -> 200 cent",
+      "pop_max_time": 1440,
-      "pop_max_time": 14400,
-      "comment_pop_max_time": "1440mins = 24h -> 5 euros",
       "pop_min_price": 200,
-      "pop_max_price": 5000,
-      "pop_plus_steps": 1,
-      "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_daily_card_price": 0,
+      "pop_multi_hour_price": 5
     }
   ],
   "PaymentRate": [
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 0,
+      "pra_payment_unit_id": 1,
       "pra_price": 200
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 1,
+      "pra_payment_unit_id": 6,
       "pra_price": 400
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1100,
-        "pra_payment_unit_id": 2,
-        "pra_price": 500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 3,
-        "pra_price": 1000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 4,
-        "pra_price": 1500
-    },
-    {
-        "pra_payment_option_id": 1049,
       "pra_payment_unit_id": 5,
-        "pra_price": 2000
+      "pra_price": 500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 6,
-        "pra_price": 2500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 7,
-        "pra_price": 3000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 8,
-        "pra_price": 3500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 9,
-        "pra_price": 4000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 10,
-        "pra_price": 4500
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 11,
-        "pra_price": 5000
     }
   ],
   "Duration": [
     {
-	"pun_duration": 60,
+      "pun_id": 1,
-	"pun_id": 0
+      "pun_label": "1h",
+      "pun_duration": 60
     },
     {
-	"pun_duration": 180,
+      "pun_id": 3,
-	"pun_id": 1
+      "pun_label": "15 min",
+      "pun_duration": 15
     },
     {
-	"pun_duration": 1440,
+      "pun_id": 5,
-	"pun_id": 2
+      "pun_label": "24h",
+      "pun_duration": 1440
     },
     {
-	"pun_duration": 2880,
+      "pun_id": 6,
-	"pun_id": 3
+      "pun_label": "3h",
+      "pun_duration": 180
     },
     {
-	"pun_duration": 4320,
+      "pun_id": 7,
-	"pun_id": 4
+      "pun_label": "48h",
+      "pun_duration": 2880
     },
     {
-	"pun_duration": 5760,
+      "pun_id": 8,
-	"pun_id": 5
+      "pun_label": "72h",
+      "pun_duration": 4320
     },
     {
-	"pun_duration": 7200,
+      "pun_id": 9,
-	"pun_id": 6
+      "pun_label": "96h",
+      "pun_duration": 5760
     },
     {
-	"pun_duration": 8640,
+      "pun_id": 10,
-	"pun_id": 7
+      "pun_label": "120h",
+      "pun_duration": 7200
     },
     {
-	"pun_duration": 10080,
+      "pun_id": 11,
-	"pun_id": 8
+      "pun_label": "144h",
+      "pun_duration": 8640
     },
     {
-	"pun_duration": 11520,
+      "pun_id": 12,
-	"pun_id": 9
+      "pun_label": "168h",
-    },
+      "pun_duration": 10080
-    {
-	"pun_duration": 12960,
-	"pun_id": 10
-    },
-    {
-	"pun_duration": 14400,
-	"pun_id": 11
-    }
-  ],
-    "Monday" : [{
-        "default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
-                    "min_price": 200
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
     }
   ]
 }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Tuesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
-                    "min_price": 200
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Wednesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
-                    "min_price": 200
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Thursday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
-                    "min_price": 200
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Friday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
-                    "min_price": 200
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Saturday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
-                    "min_price": 200
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Sunday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 5000,
-                    "min_price": 200
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }]
-}

etc/psa_tariff/tariff04.json

@@ -1,553 +0,0 @@
-{
-  "Project" : "Schoenau",
-  "Version" : "1.3.0-2025-02-03T00:09:12+02:00",
-  "Info"    : "Zone 4",
-  "Currency": [
-    {
-      "pcu_id": 2,
-      "pcu_sign": "€",
-      "pcu_major": "EUR",
-      "pcu_minor": "",
-      "pcu_active": true
-    }
-  ],
-  "PaymentMethod": [
-    {
-      "pme_id": 1,
-      "pme_label": "progressive"
-    },
-    {
-      "pme_id": 2,
-      "pme_label": "degressive"
-    },
-    {
-      "pme_id": 3,
-      "pme_label": "linear"
-    },
-    {
-      "pme_id": 4,
-      "pme_label": "steps"
-    },
-    {
-      "pme_id": 5,
-      "pme_label": "unified",
-      "comment": "deprecated"
-    }
-  ],
-  "TimeRange" : [
-    {
-      "time_range_id": 1,
-      "time_range_from": "20:00:00",
-      "time_range_to": "08:00:00"
-    },
-    {
-      "time_range_id": 2,
-      "time_range_from": "08:00:00",
-      "time_range_to": "20:00:00"
-    },
-    {
-      "time_range_id": 3,
-      "time_range_from": "00:00:00",
-      "time_range_to": "08:00:00"
-    }
-  ],
-  "PaymentOption": [
-    {
-      "pop_id": 1049,
-      "pop_label": "Zone 1",
-      "pop_payment_method_id": 5,
-      "pop_min_time": 60,
-      "comment_pop_min_time": "60mins -> 200 cent",
-      "pop_max_time": 1440,
-      "comment_pop_max_time": "1440mins = 24h -> 5 euros",
-      "pop_min_price": 1000,
-      "pop_max_price": 2500,
-      "pop_plus_steps": 1,
-      "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
-    }
-  ],
-  "PaymentRate": [
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 0,
-        "pra_price": 1000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 1,
-        "pra_price": 2000
-    },
-    {
-        "pra_payment_option_id": 1049,
-        "pra_payment_unit_id": 2,
-        "pra_price": 2500
-    }
-  ],
-  "Duration": [
-    {
-	"pun_duration": 60,
-	"pun_id": 0
-    },
-    {
-	"pun_duration": 300,
-	"pun_id": 1
-    },
-    {
-	"pun_duration": 1440,
-	"pun_id": 2
-    }
-  ],
-    "Monday" : [{
-        "default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 2500,
-                    "min_price": 1000
-                }
-            ],
-            "prepaid_settings" : [
-		{
-		    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 420,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "07:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 300,
-                            "prepaid_start" : "19:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-		{
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 420,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "07:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 300,
-                            "carry_over_start" : "19:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 720,
-                            "service_start" : "07:00:00",
-                            "service_end": "19:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Tuesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 2500,
-                    "min_price": 1000
-                }
-            ],
-            "prepaid_settings" : [
-		{
-		    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 420,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "07:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 300,
-                            "prepaid_start" : "19:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-		{
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 420,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "07:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 300,
-                            "carry_over_start" : "19:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-	    ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 720,
-                            "service_start" : "07:00:00",
-                            "service_end": "19:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Wednesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 2500,
-                    "min_price": 1000
-                }
-            ],
-            "prepaid_settings" : [
-		{
-		    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 420,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "07:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 300,
-                            "prepaid_start" : "19:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-		{
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 420,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "07:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 300,
-                            "carry_over_start" : "19:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-	    ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 720,
-                            "service_start" : "07:00:00",
-                            "service_end": "19:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Thursday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 2500,
-                    "min_price": 1000
-                }
-            ],
-            "prepaid_settings" : [
-		{
-		    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 420,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "07:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 300,
-                            "prepaid_start" : "19:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }		
-            ],
-            "carry_over_settings" : [
-		{
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 420,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "07:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 300,
-                            "carry_over_start" : "19:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-	    ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 720,
-                            "service_start" : "07:00:00",
-                            "service_end": "19:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Friday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 2500,
-                    "min_price": 1000
-                }
-            ],
-            "prepaid_settings" : [
-		{
-		    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 420,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "07:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 300,
-                            "prepaid_start" : "19:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-		{
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 420,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "07:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 300,
-                            "carry_over_start" : "19:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-	    ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 720,
-                            "service_start" : "07:00:00",
-                            "service_end": "19:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Saturday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 2500,
-                    "min_price": 1000
-                }
-            ],
-            "prepaid_settings" : [
-		{
-		    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 420,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "07:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 300,
-                            "prepaid_start" : "19:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-		{
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 420,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "07:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 300,
-                            "carry_over_start" : "19:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-	    ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 720,
-                            "service_start" : "07:00:00",
-                            "service_end": "19:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Sunday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 1440,
-                    "max_price": 2500,
-                    "min_price": 1000
-                }
-            ],
-            "prepaid_settings" : [
-		{
-		    "prepaid_ranges" : [
-                        {
-                            "prepaid_id" : 1,
-                            "prepaid_duration": 420,
-                            "prepaid_start" : "00:00:00",
-                            "prepaid_end": "07:00:00"
-                        },
-                        {
-                            "prepaid_id" : 2,
-                            "prepaid_duration": 300,
-                            "prepaid_start" : "19:00:00",
-                            "prepaid_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "carry_over_settings" : [
-		{
-                    "carry_over_ranges" : [
-                        {
-                            "carry_over_id" : 1,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 420,
-                            "carry_over_start" : "00:00:00",
-                            "carry_over_end": "07:00:00"
-                        },
-                        {
-                            "carry_over_id" : 2,
-                            "carry_over_if": "always",
-                            "carry_over_duration": 300,
-                            "carry_over_start" : "19:00:00",
-                            "carry_over_end": "24:00:00"
-                        }
-                    ]
-                }
-	    ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 720,
-                            "service_start" : "07:00:00",
-                            "service_end": "19:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }]
-}

etc/psa_tariff/tariff101.json

@@ -1,13 +1,13 @@
 {
   "Project" :   "Schoenau",
-  "Version" : "1.3.0-2025-02-03T00:09:12+02:00",
+  "Version" :   "1.2.1",
-  "Info"    : "Zone 1",
+  "Info"    :   "<<Tariff for Zone 1>>",
   "Currency": [
     {
-      "pcu_id": 2,
+      "pcu_id": 1,
       "pcu_sign": "€",
-      "pcu_major": "EUR",
+      "pcu_major": "Euro",
-      "pcu_minor": "",
+      "pcu_minor": "Cent",
       "pcu_active": true
     }
   ],
@@ -27,370 +27,151 @@
     {
       "pme_id": 4,
       "pme_label": "steps"
-    },
-    {
-      "pme_id": 5,
-      "pme_label": "unified",
-      "comment": "deprecated"
-    }
-  ],
-  "TimeRange" : [
-    {
-      "time_range_id": 1,
-      "time_range_from": "20:00:00",
-      "time_range_to": "08:00:00"
-    },
-    {
-      "time_range_id": 2,
-      "time_range_from": "08:00:00",
-      "time_range_to": "20:00:00"
-    },
-    {
-      "time_range_id": 3,
-      "time_range_from": "00:00:00",
-      "time_range_to": "08:00:00"
     }
   ],
   "PaymentOption": [
     {
-      "pop_id": 1049,
+      "pop_id": 1099,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 5,
+      "pop_payment_method_id": 4,
+      "pop_day_end_time": "15:20:00",
+      "pop_day_night_end_time": "15:20:00",
+      "pop_price_night": 0,
       "pop_min_time": 60,
-      "comment_pop_min_time": "60mins -> 300 cent",
       "pop_max_time": 14400,
-      "comment_pop_max_time": "14400mins = 240h -> 90 euros",
       "pop_min_price": 300,
-      "pop_max_price": 9000,
-      "pop_plus_steps": 1,
-      "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_daily_card_price": 0,
+      "pop_multi_hour_price": 8
     }
   ],
   "PaymentRate": [
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 0,
+      "pra_payment_unit_id": 1,
       "pra_price": 300
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 1,
+      "pra_payment_unit_id": 6,
       "pra_price": 700
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 2,
+      "pra_payment_unit_id": 5,
       "pra_price": 900
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 3,
+      "pra_payment_unit_id": 7,
       "pra_price": 1800
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 4,
+      "pra_payment_unit_id": 8,
       "pra_price": 2700
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 5,
+      "pra_payment_unit_id": 9,
       "pra_price": 3600
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 6,
+      "pra_payment_unit_id": 10,
       "pra_price": 4500
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 7,
+      "pra_payment_unit_id": 11,
       "pra_price": 5400
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 8,
+      "pra_payment_unit_id": 12,
       "pra_price": 6300
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 9,
+      "pra_payment_unit_id": 13,
       "pra_price": 7200
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 10,
+      "pra_payment_unit_id": 14,
       "pra_price": 8100
     },
     {
-        "pra_payment_option_id": 1049,
+      "pra_payment_option_id": 1099,
-        "pra_payment_unit_id": 11,
+      "pra_payment_unit_id": 15,
       "pra_price": 9000
     }
   ],
   "Duration": [
     {
-	"pun_duration": 60,
+      "pun_id": 1,
-	"pun_id": 0
+      "pun_label": "1h",
+      "pun_duration": 60
     },
     {
-	"pun_duration": 180,
+      "pun_id": 3,
-	"pun_id": 1
+      "pun_label": "15 min",
+      "pun_duration": 15
     },
     {
-	"pun_duration": 1440,
+      "pun_id": 5,
-	"pun_id": 2
+      "pun_label": "24h",
+      "pun_duration": 1440
     },
     {
-	"pun_duration": 2880,
+      "pun_id": 6,
-	"pun_id": 3
+      "pun_label": "3h",
+      "pun_duration": 180
     },
     {
-	"pun_duration": 4320,
+      "pun_id": 7,
-	"pun_id": 4
+      "pun_label": "48h",
+      "pun_duration": 2880
     },
     {
-	"pun_duration": 5760,
+      "pun_id": 8,
-	"pun_id": 5
+      "pun_label": "72h",
+      "pun_duration": 4320
     },
     {
-	"pun_duration": 7200,
+      "pun_id": 9,
-	"pun_id": 6
+      "pun_label": "96h",
+      "pun_duration": 5760
     },
     {
-	"pun_duration": 8640,
+      "pun_id": 10,
-	"pun_id": 7
+      "pun_label": "120h",
+      "pun_duration": 7200
     },
     {
-	"pun_duration": 10080,
+      "pun_id": 11,
-	"pun_id": 8
+      "pun_label": "144h",
+      "pun_duration": 8640
     },
     {
-	"pun_duration": 11520,
+      "pun_id": 12,
-	"pun_id": 9
+      "pun_label": "168h",
+      "pun_duration": 10080
     },
     {
-	"pun_duration": 12960,
+      "pun_id": 13,
-	"pun_id": 10
+      "pun_label": "192h",
+      "pun_duration": 11520
     },
     {
-	"pun_duration": 14400,
+      "pun_id": 14,
-	"pun_id": 11
+      "pun_label": "216h",
-    }
+      "pun_duration": 12960
-  ],
+    },
-    "Monday" : [{
-        "default" : {
-            "payment_settings" : [
     {
-                    "min_time" : 60,
+      "pun_id": 15,
-                    "max_time" : 14400,
+      "pun_label": "240h",
-                    "max_price": 9000,
+      "pun_duration": 14400
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
     }
   ]
 }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Tuesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Wednesday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Thursday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Friday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Saturday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }],
-    "Sunday" : [{
-	"default" : {
-            "payment_settings" : [
-                {
-                    "min_time" : 60,
-                    "max_time" : 14400,
-                    "max_price": 9000,
-                    "min_price": 300
-                }
-            ],
-            "prepaid_settings" : [
-            ],
-            "carry_over_settings" : [
-            ],
-            "service_settings" : [
-                {
-                    "service_ranges" : [
-                        {
-                            "service_id" : 1,
-                            "service_duration": 1440,
-                            "service_start" : "00:00:00",
-                            "service_end": "24:00:00"
-                        }
-                    ]
-                }
-            ],
-            "out_of_service_settings" : [
-	    ]
-        }
-    }]
-}

etc/psa_update/opkg_commands

@@ -4,13 +4,11 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
-# opkg update
+opkg update
-# opkg install prepare-update
+opkg install prepare-update
-#
+opkg install atbupdatetool
-# opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
+opkg install mxt-touch-reset
-# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-dc
+opkg install apism
-# opkg --cache /var/cache/opkg --download-only upgrade atbqt
+opkg install tariff-config-332
-#
+opkg --cache /var/cache/opkg --download-only upgrade ptu5-systemcontroller
-# opkg --cache /var/cache/opkg upgrade atb-dc-libraries
+opkg --cache /var/cache/opkg upgrade ptu5-systemcontroller
-# opkg --cache /var/cache/opkg upgrade atb-plugin-dc
-# opkg --cache /var/cache/opkg upgrade atbqt