added missing comma

fixed saints_day 2025-11-01
updated holidays
2025-10-23 18:08:05 +02:00 · 2025-10-23 18:04:11 +02:00 · 2025-10-23 10:24:05 +02:00 · 2025-10-23 09:36:51 +02:00 · 2025-10-17 13:13:22 +02:00 · 2025-10-17 12:55:52 +02:00
8 changed files with 623 additions and 193 deletions
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,18 +1,16 @@
 {	     
 "title":"DC2C_cash  ",
 "project":"DBM Szeged",
-"version":"26.04.2024 01.02.04",
+"version":"1.0.0-2024-07-05",
 "CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3],
-"CoinValue(15..0)":[700,350,175,0,0,0,0,100,200,100,50,20,10,5,0,3],
+"CoinValue(15..0)":[730,365,185,0,0,0,0,100,200,100,50,20,10,5,0,3],
 "CoinAccept(15..0)":[1,1,1,0,0,0,0,1,1,1,1,1,1,1,0,1],
-"ExchangeRate":350
+"ExchangeRate":365,
 "TokenChannel":1,
 "BillValues(7..0)":[0,0,0,0,0,0,0,0],
 "LocalTaxRate":20,
 "ForeignTaxRate":19,
 "Surcharge":0,	
-"Discount":0,	
-
-
+"Discount":0
 }

--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -249,6 +249,13 @@
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
    },
+    {
+      "pedwt_id": 2180,
+      "pedwt_period_exc_day_id": 15,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
    {
      "pedwt_id": 2184,
      "pedwt_period_exc_day_id": 2021,
@@ -471,88 +478,104 @@
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 15,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-24",
+      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
+      "ped_date_start": "2025-04-18",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
+      "ped_date_start": "2025-06-08",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_start": "2025-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Labour Day 2",
+      "ped_date_start": "2025-05-02",
+      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_start": "2025-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_start": "2025-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -572,6 +595,22 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "ped_date_end": "2024-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2061,
+      "ped_label": "Christmas 4th day",
+      "ped_date_start": "2024-12-28",
+      "ped_date_end": "2024-12-28",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -579,6 +618,38 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "ped_date_end": "2025-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "ped_date_end": "2025-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -248,6 +248,13 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
+    },
+	{
+      "pedwt_id": 2180,
+      "pedwt_period_exc_day_id": 15,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -471,88 +478,104 @@
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },    
+	{
+      "ped_id": 15,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-24",
+      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
+      "ped_date_start": "2025-04-18",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
+      "ped_date_start": "2025-06-08",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_start": "2025-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Labour Day 2",
+      "ped_date_start": "2025-05-02",
+      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_start": "2025-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_start": "2025-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -572,6 +595,22 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "ped_date_end": "2024-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2061,
+      "ped_label": "Christmas 4th day",
+      "ped_date_start": "2024-12-28",
+      "ped_date_end": "2024-12-28",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -579,6 +618,38 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "ped_date_end": "2025-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "ped_date_end": "2025-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -103,13 +103,6 @@
      "pwd_period_day_in_week_id": 5,
      "pwd_time_from": "08:00:00",
      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 637,
-      "pwd_period_week_day_id": 37,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "12:00:00"
    }
  ],
  "PeriodYear": [
@@ -255,6 +248,13 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
+    },
+	{
+      "pedwt_id": 2180,
+      "pedwt_period_exc_day_id": 15,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -478,88 +478,104 @@
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+	{
+      "ped_id": 15,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-24",
+      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
+      "ped_date_start": "2025-04-18",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
+      "ped_date_start": "2025-06-08",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_start": "2025-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Labour Day 2",
+      "ped_date_start": "2025-05-02",
+      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_start": "2025-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_start": "2025-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -579,6 +595,22 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "ped_date_end": "2024-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2061,
+      "ped_label": "Christmas 4th day",
+      "ped_date_start": "2024-12-28",
+      "ped_date_end": "2024-12-28",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -586,6 +618,38 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "ped_date_end": "2025-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "ped_date_end": "2025-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -270,6 +270,13 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
+    },
+	{
+      "pedwt_id": 2180,
+      "pedwt_period_exc_day_id": 15,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -633,88 +640,103 @@
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2022,
+	{
+      "ped_id": 15,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-24",
+      "ped_date_end": "2025-10-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {"ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
+      "ped_date_start": "2025-04-18",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
+      "ped_date_start": "2025-06-08",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_start": "2025-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Labour Day 2",
+      "ped_date_start": "2025-05-02",
+      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_start": "2025-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_start": "2025-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -734,6 +756,22 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "ped_date_end": "2024-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2061,
+      "ped_label": "Christmas 4th day",
+      "ped_date_start": "2024-12-28",
+      "ped_date_end": "2024-12-28",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -741,6 +779,38 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "ped_date_end": "2025-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "ped_date_end": "2025-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -277,6 +277,20 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
+    },
+	{
+      "pedwt_id": 2180,
+      "pedwt_period_exc_day_id": 15,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+	{
+      "pedwt_id": 2180,
+      "pedwt_period_exc_day_id": 16,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -637,91 +651,107 @@
    }
  ],
  "SpecialDays": [
-   {
+    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+	{
+      "ped_id": 15,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-24",
+      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
+      "ped_date_start": "2025-04-18",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
+      "ped_date_start": "2025-06-08",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_start": "2025-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Labour Day 2",
+      "ped_date_start": "2025-05-02",
+      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_start": "2025-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2032,
-      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_id": 16,
+      "ped_label": "Saints Day",
+      "ped_date_start": "2025-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -741,6 +771,22 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "ped_date_end": "2024-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2061,
+      "ped_label": "Christmas 4th day",
+      "ped_date_start": "2024-12-28",
+      "ped_date_end": "2024-12-28",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -748,6 +794,38 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "ped_date_end": "2025-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "ped_date_end": "2025-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
@@ -277,6 +277,20 @@
      "pedwt_time_from": "00:00:00",
      "pedwt_time_to": "00:00:00",
      "pedwt_price": 0
+    },    
+	{
+      "pedwt_id": 2180,
+      "pedwt_period_exc_day_id": 15,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
+    },
+	{
+      "pedwt_id": 2180,
+      "pedwt_period_exc_day_id": 16,
+      "pedwt_time_from": "00:00:00",
+      "pedwt_time_to": "00:00:00",
+      "pedwt_price": 0
    },
    {
      "pedwt_id": 2184,
@@ -640,88 +654,104 @@
   {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+	{
+      "ped_id": 15,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-24",
+      "ped_date_end": "2025-10-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
-      "ped_date_end": "2024-01-01",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2024-03-29",
-      "ped_date_end": "2024-03-29",
+      "ped_date_start": "2025-04-18",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
-      "ped_date_end": "2024-03-31",
+      "ped_date_start": "2025-04-20",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
-      "ped_date_end": "2024-04-01",
+      "ped_date_start": "2025-04-21",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
-      "ped_date_end": "2024-05-19",
+      "ped_date_start": "2025-06-08",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
-      "ped_date_end": "2024-05-20",
+      "ped_date_start": "2025-06-09",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2024
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
-      "ped_date_end": "2024-03-15",
+      "ped_date_start": "2025-03-15",
+      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2024-05-01",
-      "ped_date_end": "2024-05-01",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2060,
+      "ped_label": "Labour Day 2",
+      "ped_date_start": "2025-05-02",
+      "ped_date_end": "2025-05-02",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2024-08-20",
-      "ped_date_end": "2024-08-20",
+      "ped_date_start": "2025-08-20",
+      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2032,
-      "ped_label": "All Saints Day",
-      "ped_date_start": "2024-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_id": 16,
+      "ped_label": "Saints Day",
+      "ped_date_start": "2025-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -741,6 +771,22 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
+    {
+      "ped_id": 2056,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2024-12-27",
+      "ped_date_end": "2024-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2061,
+      "ped_label": "Christmas 4th day",
+      "ped_date_start": "2024-12-28",
+      "ped_date_end": "2024-12-28",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -748,6 +794,38 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
+    },
+    {
+      "ped_id": 2057,
+      "ped_label": "Christmas 1st day",
+      "ped_date_start": "2025-12-25",
+      "ped_date_end": "2025-12-25",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2058,
+      "ped_label": "Christmas 2nd day",
+      "ped_date_start": "2025-12-26",
+      "ped_date_end": "2025-12-26",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2059,
+      "ped_label": "Christmas 3rd day",
+      "ped_date_start": "2025-12-27",
+      "ped_date_end": "2025-12-27",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
+    },
+    {
+      "ped_id": 2055,
+      "ped_label": "Christmas",
+      "ped_date_start": "2025-12-24",
+      "ped_date_end": "2025-12-24",
+      "ped_period_special_day_id": 2,
+      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -3,16 +3,16 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-#
-opkg update
-opkg install prepare-update
+##
+# opkg update
+# opkg install prepare-update
 # download packages
-opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
-opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
-opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
-opkg --cache /var/cache/opkg --download-only upgrade atbqt
+# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
+# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
+# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
+# opkg --cache /var/cache/opkg --download-only upgrade atbqt
 # install packages
-opkg --cache /var/cache/opkg upgrade tariff-config-281
-opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
-opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
-opkg --cache /var/cache/opkg upgrade atbqt
+# opkg --cache /var/cache/opkg upgrade tariff-config-281
+# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
+# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
+# opkg --cache /var/cache/opkg upgrade atbqt
Author	SHA1	Message	Date
Dennis Schwarzer	88039b55c0	added missing comma	2025-10-23 18:08:05 +02:00
Dennis Schwarzer	6cf2cd11ea	fixed saints_day 2025-11-01	2025-10-23 18:04:11 +02:00
Dennis Schwarzer	24158005dc	updated holidays	2025-10-23 10:24:05 +02:00
Dennis Schwarzer	cb2c54e616	updated holidays	2025-10-23 09:36:51 +02:00
DennisSchwarzer	9b048fba29	quick hack for saturday workday, revert in KW 43!!!	2025-10-17 13:13:22 +02:00
Dennis Schwarzer	a148ecd080	added special work day 2025-10-18	2025-10-17 12:55:52 +02:00
Dennis Schwarzer	8b834055bb	added specialday 2025-10-24	2025-10-17 12:25:38 +02:00
Dennis Schwarzer	f7e532013c	added 2025-10-24 as Specialday	2025-10-17 12:16:18 +02:00
DennisSchwarzer	d3b44088e9	etc/psa_config/DC2C_print23.json gelöscht	2025-08-19 09:29:11 +02:00
Dennis Schwarzer	647547f306	Merge branch 'zg1/zone1' of https://ptu-config.atb-comm.de/ATB/customer_281 into zg1/zone1	2025-08-19 09:00:00 +02:00
Dennis Schwarzer	6f8e7a4bc9	DC2C_print23.json provided by customer	2025-08-19 08:59:34 +02:00
DennisSchwarzer	085a9d6eaa	etc/DC2C_print23.json gelöscht	2025-08-19 08:55:31 +02:00
DennisSchwarzer	e47ed6632c	DC2C_print23.json provided by customer	2025-08-19 08:19:05 +02:00
Gerhard Hoffmann	acf3053026	Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.	2025-05-22 11:05:34 +02:00
Gerhard Hoffmann	c517c4c68b	restore tariff files after special day at 17th of May	2025-05-20 10:07:55 +02:00
Gerhard Hoffmann	eed37df900	comment all opkg lines	2025-05-12 09:45:15 +02:00
Gerhard Hoffmann	5ddebf4968	special saturday 2025/05/17	2025-05-12 08:49:13 +02:00
Gerhard Hoffmann	ab2772f9b9	set service fridays: 8-18	2025-01-07 10:41:21 +01:00
Gerhard Hoffmann	49cdc8f5f6	Add holiday 2024-12-28. Switch back to normal handling of Saturdays.	2024-12-16 15:48:13 +01:00
Gerhard Hoffmann	3ee649d8fe	additional holidays 2024/2025	2024-12-03 13:46:56 +01:00
Gerhard Hoffmann	52ba0f8c04	Adapt for Saturday 07/12	2024-12-02 17:10:27 +01:00
Gerhard Hoffmann	ce7b6e5f43	Remove Sat 08:00-12:00 from Zone 3 (Yellow)	2024-10-29 15:31:41 +01:00
Gerhard Hoffmann	8f41a7a5e5	Revert to original versions	2024-08-08 12:22:11 +02:00
Gerhard Hoffmann	7760bf1fbe	set 8:00-18:00 for 03.08	2024-08-01 12:37:28 +02:00
Gerhard Hoffmann	1857a80885	Activate opkg_commands	2024-07-15 08:53:42 +02:00
Gerhard Hoffmann	f2ac2a6b5e	opkg: none	2024-07-08 13:36:33 +02:00
Gerhard Hoffmann	3cb00ff9c7	Set ex.rate to 365.	2024-07-05 09:59:27 +02:00
Gerhard Hoffmann	829a27471b	Set ex.rate to 365.	2024-07-05 09:29:23 +02:00
Gerhard Hoffmann	c49aec3a96	re-commit: change of ISMAS settings	2024-06-25 08:35:18 +02:00