comment for pure tariff-update

This reverts commit fdcaaefa36.

etc/atb/SystemControl.ini

@@ -0,0 +1,71 @@
+[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="PRODUCT_SELECTION"/>
-        <EVENT name="BUTTON_START" resultingState="SETUP_SELL_STATE"/>
         <EVENT name="SELL_DISABLE" resultingState="FREE_PARK"/>
         <SCREEN name="START"/>
         <MODE name="IDLE"/>

etc/psa_config/DC2C_cash.json

@@ -1,5 +1,5 @@
 {	     
-"Title":"DC2C_cash  ",
+"title":"DC2C_cash  ",
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "CoinDenom(15..0)":[0,0,0,0,0,0,0,0,0,255,200,100,50,20,10,5],

etc/psa_config/DC2C_device.json

@@ -1,11 +1,11 @@
 {
-"Title":"DC2C_device",
+"title":"DC2C_device",
 "Project":"Schoenau",
-"Version":"6.7.2-2024-06-17",
+"Version":"6.7.1-2024-06-17",
 "printer":1,
 "coinChk":3,
 "mifRd":1,
-"solarPwr":1,
+"solarPwr":0,
 "modem":1,
 "creditCard":1,
 "escrow":0,

etc/psa_config/DC2C_device.json-netz

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

etc/psa_config/DC2C_device.json-solar

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

etc/psa_config/DC2C_print01.json

@@ -1,5 +1,5 @@
 {
-"Title":"DC2C_pri01",
+"title":"DC2C_pri01",
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "styl":"font 10",

etc/psa_config/DC2C_print02.json

@@ -1,5 +1,5 @@
 {
-"Title":"DC2C_pri02",
+"title":"DC2C_pri02",
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "text":"Standort: ",

etc/psa_config/DC2C_print03.json

@@ -1,5 +1,5 @@
 {
-"Title":"DC2C_pri03",
+"title":"DC2C_pri03",
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "feed":"nl",
@@ -22,6 +22,8 @@
 "text":"Automatentechnik ",
 "feed":"nl",
 "text":"Baumann GmbH",
+"feed":"nl",
+"feed":"nl",
 "feed":"eject"
 }
 

etc/psa_config/DC2C_print04.json

@@ -1,5 +1,5 @@
 {
-"Title":"DC2C_pri04",
+"title":"DC2C_pri04",
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "text":"";

etc/psa_config/DC2C_print05.json

@@ -1,5 +1,5 @@
 {
-"Title":"DC2C_pri05",
+"title":"DC2C_pri05",
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "styl":"font 10",

etc/psa_config/DC2C_print06.json

@@ -15,6 +15,7 @@
 "vari":"wday deu short",
 "vari":"date ge",	
 "vari":"time long"
+
 }
 
 

etc/psa_config/DC2C_print07.json

@@ -1,5 +1,5 @@
 {
-"Title":"DC2C_pri07",
+"title":"DC2C_pri07",
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "feed":"nl",
@@ -22,6 +22,8 @@
 "text":"Automatentechnik ",
 "feed":"nl",
 "text":"Baumann GmbH",
+"feed":"nl",
+"feed":"nl",
 "feed":"eject"
 }
 

etc/psa_config/DC2C_print08.json

@@ -1,5 +1,5 @@
 {
-"Title":"DC2C_pri08",
+"title":"DC2C_pri08",
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "text":"";

etc/psa_config/DC2C_print31.json

@@ -1,5 +1,5 @@
 {
-"Title":"DC2C_pri31",
+"title":"DC2C_pri31",
 "Project":"door close print",
 "Version":"6.7.1-2024-06-17",
 "styl":"font 08",

etc/psa_config/DC2C_print32.json

@@ -1,5 +1,5 @@
 {
-"Ttitle":"DC2C_pri32",
+"title":"DC2C_pri32",
 "Project":"refund reciept",
 "Version":"6.7.1-2024-06-17",
 "styl":"font 08",

etc/psa_tariff/tariff01.json

@@ -1,13 +1,13 @@
 {
-  "Project" :   "Schoenau",
+  "Project" : "Schoenau",
-  "Version" :   "1.2.0",
+  "Version" : "1.3.0-2025-02-03T00:09:12+02:00",
-  "Info"    :   "<<Tariff for Zone 1>>",
+  "Info"    : "Zone 1",
   "Currency": [
     {
-      "pcu_id": 1,
+      "pcu_id": 2,
       "pcu_sign": "€",
-      "pcu_major": "Euro",
+      "pcu_major": "EUR",
-      "pcu_minor": "Cent",
+      "pcu_minor": "",
       "pcu_active": true
     }
   ],
@@ -27,151 +27,370 @@
     {
       "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": 1099,
+      "pop_id": 1049,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
+      "pop_payment_method_id": 5,
-      "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_daily_card_price": 0,
+      "pop_business_hours": 0
-      "pop_multi_hour_price": 8
     }
   ],
   "PaymentRate": [
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 1,
+        "pra_payment_unit_id": 0,
-      "pra_price": 300
+        "pra_price": 300
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 6,
+        "pra_payment_unit_id": 1,
-      "pra_price": 700
+        "pra_price": 700
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 5,
+        "pra_payment_unit_id": 2,
-      "pra_price": 900
+        "pra_price": 900
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 7,
+        "pra_payment_unit_id": 3,
-      "pra_price": 1800
+        "pra_price": 1800
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 8,
+        "pra_payment_unit_id": 4,
-      "pra_price": 2700
+        "pra_price": 2700
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 9,
+        "pra_payment_unit_id": 5,
-      "pra_price": 3600
+        "pra_price": 3600
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 10,
+        "pra_payment_unit_id": 6,
-      "pra_price": 4500
+        "pra_price": 4500
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 11,
+        "pra_payment_unit_id": 7,
-      "pra_price": 5400
+        "pra_price": 5400
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 12,
+        "pra_payment_unit_id": 8,
-      "pra_price": 6300
+        "pra_price": 6300
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 13,
+        "pra_payment_unit_id": 9,
-      "pra_price": 7200
+        "pra_price": 7200
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 14,
+        "pra_payment_unit_id": 10,
-      "pra_price": 8100
+        "pra_price": 8100
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 15,
+        "pra_payment_unit_id": 11,
-      "pra_price": 9000
+        "pra_price": 9000
     }
   ],
   "Duration": [
     {
-      "pun_id": 1,
+	"pun_duration": 60,
-      "pun_label": "1h",
+	"pun_id": 0
-      "pun_duration": 60
     },
     {
-      "pun_id": 3,
+	"pun_duration": 180,
-      "pun_label": "15 min",
+	"pun_id": 1
-      "pun_duration": 15
     },
     {
-      "pun_id": 5,
+	"pun_duration": 1440,
-      "pun_label": "24h",
+	"pun_id": 2
-      "pun_duration": 1440
     },
     {
-      "pun_id": 6,
+	"pun_duration": 2880,
-      "pun_label": "3h",
+	"pun_id": 3
-      "pun_duration": 180
     },
     {
-      "pun_id": 7,
+	"pun_duration": 4320,
-      "pun_label": "48h",
+	"pun_id": 4
-      "pun_duration": 2880
     },
     {
-      "pun_id": 8,
+	"pun_duration": 5760,
-      "pun_label": "72h",
+	"pun_id": 5
-      "pun_duration": 4320
     },
     {
-      "pun_id": 9,
+	"pun_duration": 7200,
-      "pun_label": "96h",
+	"pun_id": 6
-      "pun_duration": 5760
     },
     {
-      "pun_id": 10,
+	"pun_duration": 8640,
-      "pun_label": "120h",
+	"pun_id": 7
-      "pun_duration": 7200
     },
     {
-      "pun_id": 11,
+	"pun_duration": 10080,
-      "pun_label": "144h",
+	"pun_id": 8
-      "pun_duration": 8640
     },
     {
-      "pun_id": 12,
+	"pun_duration": 11520,
-      "pun_label": "168h",
+	"pun_id": 9
-      "pun_duration": 10080
     },
     {
-      "pun_id": 13,
+	"pun_duration": 12960,
-      "pun_label": "192h",
+	"pun_id": 10
-      "pun_duration": 11520
     },
     {
-      "pun_id": 14,
+	"pun_duration": 14400,
-      "pun_label": "216h",
+	"pun_id": 11
-      "pun_duration": 12960
-    },
-    {
-      "pun_id": 15,
-      "pun_label": "240h",
-      "pun_duration": 14400
     }
-  ]
+  ],
+    "Monday" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "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",
+  "Project" : "Schoenau",
-  "Version" :   "1.2.0",
+  "Version" : "1.3.0-2025-02-03T00:09:12+02:00",
-  "Info"    :   "<<<Tariff for zone 2>>>",
+  "Info"    : "Zone 2",
   "Currency": [
     {
-      "pcu_id": 1,
+      "pcu_id": 2,
       "pcu_sign": "€",
-      "pcu_major": "Euro",
+      "pcu_major": "EUR",
-      "pcu_minor": "Cent",
+      "pcu_minor": "",
       "pcu_active": true
     }
   ],
@@ -27,151 +27,370 @@
     {
       "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": 1100,
+      "pop_id": 1049,
-      "pop_label": "Zone 2",
+      "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
+      "pop_payment_method_id": 5,
-      "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_daily_card_price": 0,
+      "pop_business_hours": 0
-      "pop_multi_hour_price": 8
     }
   ],
   "PaymentRate": [
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 1,
+        "pra_payment_unit_id": 0,
-      "pra_price": 300
+        "pra_price": 300
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 6,
+        "pra_payment_unit_id": 1,
-      "pra_price": 500
+        "pra_price": 500
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 5,
+        "pra_payment_unit_id": 2,
-      "pra_price": 600
+        "pra_price": 600
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 7,
+        "pra_payment_unit_id": 3,
-      "pra_price": 1200 
+        "pra_price": 1200
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 8,
+        "pra_payment_unit_id": 4,
-      "pra_price": 1800
+        "pra_price": 1800
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 9,
+        "pra_payment_unit_id": 5,
-      "pra_price": 2400
+        "pra_price": 2400
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 10,
+        "pra_payment_unit_id": 6,
-      "pra_price": 3000
+        "pra_price": 3000
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 11,
+        "pra_payment_unit_id": 7,
-      "pra_price": 3600
+        "pra_price": 3600
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 12,
+        "pra_payment_unit_id": 8,
-      "pra_price": 4200
+        "pra_price": 4200
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 13,
+        "pra_payment_unit_id": 9,
-      "pra_price": 4800
+        "pra_price": 4800
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 14,
+        "pra_payment_unit_id": 10,
-      "pra_price": 5400
+        "pra_price": 5400
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 15,
+        "pra_payment_unit_id": 11,
-      "pra_price": 6000
+        "pra_price": 6000
     }
   ],
   "Duration": [
     {
-      "pun_id": 1,
+	"pun_duration": 60,
-      "pun_label": "1h",
+	"pun_id": 0
-      "pun_duration": 60
     },
     {
-      "pun_id": 3,
+	"pun_duration": 180,
-      "pun_label": "15 min",
+	"pun_id": 1
-      "pun_duration": 15
     },
     {
-      "pun_id": 5,
+	"pun_duration": 1440,
-      "pun_label": "24h",
+	"pun_id": 2
-      "pun_duration": 1440
     },
     {
-      "pun_id": 6,
+	"pun_duration": 2880,
-      "pun_label": "3h",
+	"pun_id": 3
-      "pun_duration": 180
     },
     {
-      "pun_id": 7,
+	"pun_duration": 4320,
-      "pun_label": "48h",
+	"pun_id": 4
-      "pun_duration": 2880
     },
     {
-      "pun_id": 8,
+	"pun_duration": 5760,
-      "pun_label": "72h",
+	"pun_id": 5
-      "pun_duration": 4320
     },
     {
-      "pun_id": 9,
+	"pun_duration": 7200,
-      "pun_label": "96h",
+	"pun_id": 6
-      "pun_duration": 5760
     },
     {
-      "pun_id": 10,
+	"pun_duration": 8640,
-      "pun_label": "120h",
+	"pun_id": 7
-      "pun_duration": 7200
     },
     {
-      "pun_id": 11,
+	"pun_duration": 10080,
-      "pun_label": "144h",
+	"pun_id": 8
-      "pun_duration": 8640
     },
     {
-      "pun_id": 12,
+	"pun_duration": 11520,
-      "pun_label": "168h",
+	"pun_id": 9
-      "pun_duration": 10080
     },
     {
-      "pun_id": 13,
+	"pun_duration": 12960,
-      "pun_label": "192h",
+	"pun_id": 10
-      "pun_duration": 11520
     },
     {
-      "pun_id": 14,
+	"pun_duration": 14400,
-      "pun_label": "216h",
+	"pun_id": 11
-      "pun_duration": 12960
-    },
-    {
-      "pun_id": 15,
-      "pun_label": "240h",
-      "pun_duration": 14400
     }
-  ]
+  ],
+    "Monday" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "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",
+  "Project" : "Schoenau",
-  "Version" :   "1.0.0",
+  "Version" : "1.3.0-2025-02-03T00:09:12+02:00",
-  "Info"    :   "",
+  "Info"    : "Zone 3",
   "Currency": [
     {
-      "pcu_id": 1,
+      "pcu_id": 2,
       "pcu_sign": "€",
-      "pcu_major": "Euro",
+      "pcu_major": "EUR",
-      "pcu_minor": "Cent",
+      "pcu_minor": "",
       "pcu_active": true
     }
   ],
@@ -27,91 +27,370 @@
     {
       "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": 1100,
+      "pop_id": 1049,
-      "pop_label": "Zone 2",
+      "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
+      "pop_payment_method_id": 5,
-      "pop_day_end_time": "15:07:00",
-      "pop_day_night_end_time": "15:07:00",
-      "pop_price_night": 0,
       "pop_min_time": 60,
-      "pop_max_time": 1440,
+      "comment_pop_min_time": "60mins -> 200 cent",
+      "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_daily_card_price": 0,
+      "pop_business_hours": 0
-      "pop_multi_hour_price": 5
     }
   ],
   "PaymentRate": [
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 1,
+        "pra_payment_unit_id": 0,
-      "pra_price": 200
+        "pra_price": 200
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 6,
+        "pra_payment_unit_id": 1,
-      "pra_price": 400
+        "pra_price": 400
     },
     {
-      "pra_payment_option_id": 1100,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 5,
+        "pra_payment_unit_id": 2,
-      "pra_price": 500
+        "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_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_id": 1,
+	"pun_duration": 60,
-      "pun_label": "1h",
+	"pun_id": 0
-      "pun_duration": 60
     },
     {
-      "pun_id": 3,
+	"pun_duration": 180,
-      "pun_label": "15 min",
+	"pun_id": 1
-      "pun_duration": 15
     },
     {
-      "pun_id": 5,
+	"pun_duration": 1440,
-      "pun_label": "24h",
+	"pun_id": 2
-      "pun_duration": 1440
     },
     {
-      "pun_id": 6,
+	"pun_duration": 2880,
-      "pun_label": "3h",
+	"pun_id": 3
-      "pun_duration": 180
     },
     {
-      "pun_id": 7,
+	"pun_duration": 4320,
-      "pun_label": "48h",
+	"pun_id": 4
-      "pun_duration": 2880
     },
     {
-      "pun_id": 8,
+	"pun_duration": 5760,
-      "pun_label": "72h",
+	"pun_id": 5
-      "pun_duration": 4320
     },
     {
-      "pun_id": 9,
+	"pun_duration": 7200,
-      "pun_label": "96h",
+	"pun_id": 6
-      "pun_duration": 5760
     },
     {
-      "pun_id": 10,
+	"pun_duration": 8640,
-      "pun_label": "120h",
+	"pun_id": 7
-      "pun_duration": 7200
     },
     {
-      "pun_id": 11,
+	"pun_duration": 10080,
-      "pun_label": "144h",
+	"pun_id": 8
-      "pun_duration": 8640
     },
     {
-      "pun_id": 12,
+	"pun_duration": 11520,
-      "pun_label": "168h",
+	"pun_id": 9
-      "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

@@ -0,0 +1,553 @@
+{
+  "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",
+  "Project" : "Schoenau",
-  "Version" :   "1.2.1",
+  "Version" : "1.3.0-2025-02-03T00:09:12+02:00",
-  "Info"    :   "<<Tariff for Zone 1>>",
+  "Info"    : "Zone 1",
   "Currency": [
     {
-      "pcu_id": 1,
+      "pcu_id": 2,
       "pcu_sign": "€",
-      "pcu_major": "Euro",
+      "pcu_major": "EUR",
-      "pcu_minor": "Cent",
+      "pcu_minor": "",
       "pcu_active": true
     }
   ],
@@ -27,151 +27,370 @@
     {
       "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": 1099,
+      "pop_id": 1049,
       "pop_label": "Zone 1",
-      "pop_payment_method_id": 4,
+      "pop_payment_method_id": 5,
-      "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_daily_card_price": 0,
+      "pop_business_hours": 0
-      "pop_multi_hour_price": 8
     }
   ],
   "PaymentRate": [
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 1,
+        "pra_payment_unit_id": 0,
-      "pra_price": 300
+        "pra_price": 300
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 6,
+        "pra_payment_unit_id": 1,
-      "pra_price": 700
+        "pra_price": 700
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 5,
+        "pra_payment_unit_id": 2,
-      "pra_price": 900
+        "pra_price": 900
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 7,
+        "pra_payment_unit_id": 3,
-      "pra_price": 1800
+        "pra_price": 1800
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 8,
+        "pra_payment_unit_id": 4,
-      "pra_price": 2700
+        "pra_price": 2700
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 9,
+        "pra_payment_unit_id": 5,
-      "pra_price": 3600
+        "pra_price": 3600
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 10,
+        "pra_payment_unit_id": 6,
-      "pra_price": 4500
+        "pra_price": 4500
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 11,
+        "pra_payment_unit_id": 7,
-      "pra_price": 5400
+        "pra_price": 5400
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 12,
+        "pra_payment_unit_id": 8,
-      "pra_price": 6300
+        "pra_price": 6300
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 13,
+        "pra_payment_unit_id": 9,
-      "pra_price": 7200
+        "pra_price": 7200
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 14,
+        "pra_payment_unit_id": 10,
-      "pra_price": 8100
+        "pra_price": 8100
     },
     {
-      "pra_payment_option_id": 1099,
+        "pra_payment_option_id": 1049,
-      "pra_payment_unit_id": 15,
+        "pra_payment_unit_id": 11,
-      "pra_price": 9000
+        "pra_price": 9000
     }
   ],
   "Duration": [
     {
-      "pun_id": 1,
+	"pun_duration": 60,
-      "pun_label": "1h",
+	"pun_id": 0
-      "pun_duration": 60
     },
     {
-      "pun_id": 3,
+	"pun_duration": 180,
-      "pun_label": "15 min",
+	"pun_id": 1
-      "pun_duration": 15
     },
     {
-      "pun_id": 5,
+	"pun_duration": 1440,
-      "pun_label": "24h",
+	"pun_id": 2
-      "pun_duration": 1440
     },
     {
-      "pun_id": 6,
+	"pun_duration": 2880,
-      "pun_label": "3h",
+	"pun_id": 3
-      "pun_duration": 180
     },
     {
-      "pun_id": 7,
+	"pun_duration": 4320,
-      "pun_label": "48h",
+	"pun_id": 4
-      "pun_duration": 2880
     },
     {
-      "pun_id": 8,
+	"pun_duration": 5760,
-      "pun_label": "72h",
+	"pun_id": 5
-      "pun_duration": 4320
     },
     {
-      "pun_id": 9,
+	"pun_duration": 7200,
-      "pun_label": "96h",
+	"pun_id": 6
-      "pun_duration": 5760
     },
     {
-      "pun_id": 10,
+	"pun_duration": 8640,
-      "pun_label": "120h",
+	"pun_id": 7
-      "pun_duration": 7200
     },
     {
-      "pun_id": 11,
+	"pun_duration": 10080,
-      "pun_label": "144h",
+	"pun_id": 8
-      "pun_duration": 8640
     },
     {
-      "pun_id": 12,
+	"pun_duration": 11520,
-      "pun_label": "168h",
+	"pun_id": 9
-      "pun_duration": 10080
     },
     {
-      "pun_id": 13,
+	"pun_duration": 12960,
-      "pun_label": "192h",
+	"pun_id": 10
-      "pun_duration": 11520
     },
     {
-      "pun_id": 14,
+	"pun_duration": 14400,
-      "pun_label": "216h",
+	"pun_id": 11
-      "pun_duration": 12960
-    },
-    {
-      "pun_id": 15,
-      "pun_label": "240h",
-      "pun_duration": 14400
     }
-  ]
+  ],
+    "Monday" : [{
+        "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" : [
+	    ]
+        }
+    }],
+    "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,13 @@
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
 # 
-opkg update
+# opkg update
-opkg install prepare-update
+# opkg install prepare-update
 #
-opkg --cache /var/cache/opkg --download-only upgrade atb-dc-libraries
+# 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 atb-plugin-dc
-opkg --cache /var/cache/opkg --download-only upgrade atbqt
+# opkg --cache /var/cache/opkg --download-only upgrade atbqt
 #
-opkg --cache /var/cache/opkg upgrade atb-dc-libraries
+# opkg --cache /var/cache/opkg upgrade atb-dc-libraries
-opkg --cache /var/cache/opkg upgrade atb-plugin-dc
+# opkg --cache /var/cache/opkg upgrade atb-plugin-dc
-opkg --cache /var/cache/opkg upgrade atbqt
+# opkg --cache /var/cache/opkg upgrade atbqt