Improve cut for ticket

- product selection: with licenscplate results in paperless ticket
 - ask for printing bank receipt

etc/atb/SystemControl.ini

@@ -34,7 +34,7 @@ inputBrightness=499
 startBacklightController=true
 startMQTTController=false
 startMonitoringController=false
-startSuspendController=false
+startSuspendController=true
 
 [MONITORING]
 http_dataFormat=HTTP

etc/atbapp/states/APP_States.xml

@@ -1,7 +1,8 @@
 <?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/atbapp/text/HMI_Texte.xml

@@ -1000,14 +1000,14 @@
       <en_GB>PLATE ENTRY\n(not required for display in the vehicle)</en_GB>
       <fr_FR>D'IDENTIFICATION\n(pas nécessaire de l'afficher dans le véhicule)</fr_FR>
       <nl_NL> </nl_NL>
-      <es_ES>ENTRADA DE PLACA\n(no necesaria para exhibir en el vehículo)</es_ES>
+      <es_ES>ENTRADA DE PLACA (no necesaria para exhibir en el vehículo)</es_ES>
     </Text>
     <Text textnr="0x32">
       <de_DE>PAPIERTICKET\n(zur Auslage im Fahrzeug)</de_DE>
       <en_GB>PAPER TICKET\n(for display in the vehicle)</en_GB>
       <fr_FR>BILLET PAPIER\n(à présenter dans le véhicule)</fr_FR>
       <nl_NL> </nl_NL>
-      <es_ES>BILLETE DE PAPEL\n(para exponer en el vehículo)</es_ES>
+      <es_ES>BILLETE DE PAPEL (para exponer en el vehículo)</es_ES>
     </Text>
     <Text textnr="0x33">
       <de_DE> </de_DE>

etc/psa_config/DC2C_device.json

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

etc/psa_config/DC2C_device.json-netz

@@ -1,27 +0,0 @@
-{
-"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

@@ -1,27 +0,0 @@
-{
-"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

@@ -3,6 +3,7 @@
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "styl":"font 10",
+"styl":"csiz 10",
 "styl":"size 11",
 "styl":"align c",
 "feed":"margin02",

etc/psa_config/DC2C_print05.json

@@ -3,6 +3,7 @@
 "Project":"Schoenau",
 "Version":"6.7.1-2024-06-17",
 "styl":"font 10",
+"styl":"csiz 10",
 "styl":"size 11",
 "styl":"align c",
 "feed":"margin02",

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,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