Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.

Switch back to tariffs before 05/17.
comment all opkg lines
2025-05-22 11:07:23 +02:00 · 2025-05-20 14:43:39 +02:00 · 2025-05-12 09:49:14 +02:00 · 2025-05-12 08:55:57 +02:00 · 2025-01-07 10:47:34 +01:00 · 2024-12-16 15:52:28 +01:00
18 changed files with 550 additions and 1388 deletions
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -11,10 +11,8 @@ if [ -z $IFS ]; then
    IFS=$'\n'
 fi
 GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv
 #TODO: use in UpdateController
 get_blob () {   # get the blob of the file(name) passed as $1
@@ -29,7 +27,6 @@ get_commit_for_blob () {
           grep -q $1 && echo -n {} && head -n 1")
 }
 write_log_file () {
    local now=$(date +"%Y-%m-%dT%T")
    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
--- a/.gitignore
+++ b/.gitignore
@@ -1,27 +1,16 @@
 # First, ignore everything
 *
 # Now, whitelist anything that's a directory
 !*/
 # And all the file types you're interested in
 !.gitignore
 !.githooks/post-merge
 !.githooks/post-checkout
 !**/.gitignore
 !**/.githooks/post-merge
 !**/.githooks/post-checkout
 ## Except
-!etc/atb/*
+!**/.gitignore
-!etc/psa_config/*
+!**/.githooks/post-merge
-!etc/psa_update/*
+!/etc/*.ini
-!etc/psa_tariff/*
+!/etc/atb/*.ini
-!etc/dc/*.hex
+!/etc/psa_config/*
-!etc/dc/*.bin
+!/etc/psa_update/*
-!*/etc/*.ini
+!/etc/psa_tariff/*
-!*/etc/atb/*
+!/etc/dc/dc2c.hex
-!*/etc/psa_config/*
+
-!*/etc/psa_update/*
+!/opt/app/ATBAPP/*.ini
-!*/etc/psa_tariff/*
+!/opt/app/sysconfig/*.ini
-!*/etc/dc/*.hex
+!/opt/app/ISMASMgr/*.ini
 !*/etc/dc/*.bin
--- a/etc/dc/dc2c.4.11.bin
+++ b/etc/dc/dc2c.4.11.bin
--- a/etc/dc/dc2c.4.33.bin
+++ b/etc/dc/dc2c.4.33.bin
--- a/etc/dc/dc2c.4.35.bin
+++ b/etc/dc/dc2c.4.35.bin
--- a/etc/dc/dc2c.bin
+++ b/etc/dc/dc2c.bin
@@ -1 +0,0 @@
 dc2c.4.33.bin
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -0,0 +1,16 @@
 {	     
 "title":"DC2C_cash  ",
 "project":"DBM Szeged",
 "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)":[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":365,
 "TokenChannel":1,
 "BillValues(7..0)":[0,0,0,0,0,0,0,0],
 "LocalTaxRate":20,
 "ForeignTaxRate":19,
 "Surcharge":0,	
 "Discount":0
 }
--- a/etc/psa_config/DC2C_print22.json
+++ b/etc/psa_config/DC2C_print22.json
@@ -0,0 +1,27 @@
 "title":"DC2C_pri22",
 "project":"DBM Szeged StartParking",
 "styl":"size 00",
 "text":"Automata száma: ",
 "vari":"manu",
 "feed":"nl",
 "text":"Igazoló sz. sorsz: ",
 "feed":"nl",
 "vari":"Dynamic07",
 "feed":"nl",
 "vari":"Dynamic08",
 "feed":"nl",
 "text":"Az igazolo szelvény",
 "feed":"nl"
 "text":"a nyugtával együtt érvényes. ",
 "feed":"nl",
 "feed":"nl",
 "text":"Üf. szolg nyitvatartás:",
 "feed":"nl",
 "text":"Zrínyi utca 4-8",
 "feed":"nl",
 "text":"H - P: 7:45 - 17:00",
 "feed":"nl",
 "text":"Tel: (80) 820-500",
 "feed":"nl",
 "feed":"nl"
 }
--- a/etc/psa_config/DC2C_print25.json
+++ b/etc/psa_config/DC2C_print25.json
@@ -0,0 +1,29 @@
 {
 "title":"DC2C_pri25",
 "project":"DBM Szeged StopParking",
 "text":"érvényes.",
 "feed":"nl",
 "feed":"nl",
 "text":"Üf. szolg nyitvatartás:"
 "feed":"nl",
 "text":"    Zrínyi utca 4-8",
 "styl":"size 00",
 "feed":"nl",
 "text":"  H - P: 7:45 - 17:00",
 "feed":"nl",
 "text":"   Tel: (80) 820-500",
 "feed":"nl",
 "feed":"nl",
 "text":"Szegedi Közlekedési Kft",
 "feed":"nl",
 "text":"   6720 Szeged ",
 "feed":"nl",
 "text":" Zrínyi utca 4-8.",
 "feed":"nl",
 "text":"Adósz: 11092612-2-06",
 "feed":"nl",
 "text":"  A jegy ára az ÁFA-t",
 "feed":"nl",
 "text":"     tartalmazza!",
 "feed":"nl"
 }
--- a/etc/psa_config/DC2C_print28.json
+++ b/etc/psa_config/DC2C_print28.json
@@ -0,0 +1,34 @@
 {
 "title":"DC2C_pri28",
 "project":"DBM Szeged Error",
 "styl":"size 00",
 "text":" Üf. szolg nyitvatartás:",
 "feed":"nl",
 "text":"  Zrínyi utca 4-8 ",
 "feed":"nl",
 "text":"  H - P: 7:45 - 17:00",
 "feed":"nl",
 "text":"   Tel: (80) 820-500",
 "feed":"nl",
 "feed":"nl",
 "text":"Szegedi Közlekedési Kft",
 "feed":"nl",
 "text":"     6720",
 "text":" Szeged ",
 "feed":"nl",
 "text":"  Zrínyi utca 4-8",
 "feed":"nl",
 "text":"Adósz: ", 
 "text":"11092612-2-06", 
 "feed":"nl",
 "feed":"nl",
 "text":"Parkoljon egy érintéssel.",
 "feed":"nl",
 "text":"Használja bankkártyáját",
 "feed":"nl",
 "text":"  automatáinknál",
 "text":" is!",
 "feed":"nl",
 "feed":"eject"
 }
--- a/etc/psa_tariff/.tariff04.json.swp
+++ b/etc/psa_tariff/.tariff04.json.swp
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 1",
  "Version" :   "1.0.1",
  "Info"    :   "6725",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,7 +39,7 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 360,
-      "pop_min_price": 0,
+      "pop_min_price": 42,
      "pop_carry_over": 1,
      "pop_daily_card_price": 990
    }
@@ -465,182 +468,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-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_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-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_start": "2025-05-01",
-      "ped_date_end": "2024-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_start": "2025-08-20",
-      "ped_date_end": "2024-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_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -658,10 +581,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "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
    },
@@ -675,123 +606,38 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 2",
  "Version" :   "1.0.1",
  "Info"    :   "6724",
  "Currency": [
    {
      "pcu_id": 2,
@@ -35,8 +38,8 @@
      "pop_day_night_end_time": "16:27:00",
      "pop_price_night": 0,
      "pop_min_time": 15,
-      "pop_max_time": 300,
+      "pop_max_time": 360,
-      "pop_min_price": 0,
+      "pop_min_price": 65,
      "pop_carry_over": 1,
      "pop_daily_card_price": 1560
    }
@@ -465,182 +468,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-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_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-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_start": "2025-05-01",
-      "ped_date_end": "2024-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_start": "2025-08-20",
-      "ped_date_end": "2024-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_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -658,10 +581,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "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
    },
@@ -675,123 +606,39 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 3",
  "Version" :   "1.0.1",
  "Info"    :   "6721",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,7 +39,7 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 360,
-      "pop_min_price": 0,
+      "pop_min_price": 90,
      "pop_carry_over": 1,
      "pop_daily_card_price": 2160
    }
@@ -100,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": [
@@ -472,182 +468,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-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_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-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_start": "2025-05-01",
-      "ped_date_end": "2024-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_start": "2025-08-20",
-      "ped_date_end": "2024-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_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -665,10 +581,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "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
    },
@@ -682,123 +606,40 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 4",
  "Version" :   "1.0.1",
  "Info"    :   "6720",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,9 +39,9 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 240,
-      "pop_min_price": 0,
+      "pop_min_price": 163,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 2400,
+      "pop_daily_card_price": 2600,
      "pop_multi_hour_price": 0
    }
  ],
@@ -627,182 +630,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-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_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-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_start": "2025-05-01",
-      "ped_date_end": "2024-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_start": "2025-08-20",
-      "ped_date_end": "2024-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_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -820,10 +743,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "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
    },
@@ -837,125 +768,39 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 5",
  "Version" :   "1.0.1",
  "Info"    :   "6723",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,9 +39,9 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 360,
-      "pop_min_price": 0,
+      "pop_min_price": 90,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 1980,
+      "pop_daily_card_price": 2160,
      "pop_multi_hour_price": 0
    }
  ],
@@ -46,7 +49,7 @@
    {
      "pra_payment_option_id": 1081,
      "pra_payment_unit_id": 1,
-      "pra_price": 330
+      "pra_price": 360
    }
  ],
  "Duration": [
@@ -634,182 +637,102 @@
    }
  ],
  "SpecialDays": [
    {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-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_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-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_start": "2025-05-01",
-      "ped_date_end": "2024-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_start": "2025-08-20",
-      "ped_date_end": "2024-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_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -827,10 +750,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "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
    },
@@ -844,123 +775,39 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
@@ -1,4 +1,7 @@
 {
  "Project" :   "Szeged Zone 6",
  "Version" :   "1.0.1",
  "Info"    :   "6722",
  "Currency": [
    {
      "pcu_id": 2,
@@ -36,9 +39,9 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 240,
-      "pop_min_price": 0,
+      "pop_min_price": 163,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 2400,
+      "pop_daily_card_price": 2600,
      "pop_multi_hour_price": 0
    }
  ],
@@ -46,7 +49,7 @@
    {
      "pra_payment_option_id": 1082,
      "pra_payment_unit_id": 1,
-      "pra_price": 600
+      "pra_price": 650
    }
  ],
  "Duration": [
@@ -634,182 +637,102 @@
    }
  ],
  "SpecialDays": [
-    {
+   {
      "ped_id": 11,
      "ped_label": "Christmas 1st day",
      "ped_date_start": "2023-12-25",
      "ped_date_end": "2023-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 13,
      "ped_label": "Christmas 2nd day",
      "ped_date_start": "2023-12-26",
      "ped_date_end": "2023-12-26",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2024-10-23",
+      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2024-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2016,
      "ped_label": "Christmas (Sunday)",
      "ped_date_start": "2023-12-24",
      "ped_date_end": "2023-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2021,
      "ped_label": "Holiday (Hungary)",
      "ped_date_start": "2024-08-19",
      "ped_date_end": "2024-08-19",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2024-01-01",
+      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2024-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_start": "2025-04-18",
-      "ped_date_end": "2024-03-29",
+      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2024-03-31",
+      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2024-03-31",
+      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2024-04-01",
+      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2024-04-01",
+      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2024-05-19",
+      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2024-05-19",
+      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2024-05-20",
+      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2024-05-20",
+      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 2025
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2024-03-15",
+      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2024-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_start": "2025-05-01",
-      "ped_date_end": "2024-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_start": "2025-08-20",
-      "ped_date_end": "2024-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_start": "2025-11-01",
-      "ped_date_end": "2024-11-01",
+      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2034,
      "ped_label": "Good Friday",
      "ped_date_start": "2025-04-18",
      "ped_date_end": "2025-04-18",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2035,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2025-04-20",
      "ped_date_end": "2025-04-20",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2036,
      "ped_label": "Easter Monday",
      "ped_date_start": "2025-04-21",
      "ped_date_end": "2025-04-21",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2037,
      "ped_label": "Whit Monday",
      "ped_date_start": "2025-06-09",
      "ped_date_end": "2025-06-09",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2038,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2025-06-08",
      "ped_date_end": "2025-06-08",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2050,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2051,
      "ped_label": "Uskrs",
      "ped_date_start": "2023-04-16",
      "ped_date_end": "2023-04-16",
      "ped_period_special_day_id": 1,
      "ped_year": 0
    },
    {
      "ped_id": 2052,
      "ped_label": "Christmas 1st day",
@@ -827,10 +750,18 @@
      "ped_year": 0
    },
    {
-      "ped_id": 2054,
+      "ped_id": 2056,
-      "ped_label": "Republic Day (Hungary)",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-10-23",
+      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2025-10-23",
+      "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
    },
@@ -844,123 +775,39 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "NewYear",
+      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-01-01",
+      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-01-01",
+      "ped_date_end": "2025-12-25",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2058,
-      "ped_label": "Good Friday",
+      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2026-04-03",
+      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2026-04-03",
+      "ped_date_end": "2025-12-26",
      "ped_period_special_day_id": 2,
-      "ped_year": 2023
+      "ped_year": 0
    },
    {
      "ped_id": 2059,
-      "ped_label": "Easter Sunday",
+      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2026-04-05",
+      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2026-04-05",
+      "ped_date_end": "2025-12-27",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2060,
      "ped_label": "Easter Monday",
      "ped_date_start": "2026-04-05",
      "ped_date_end": "2026-04-05",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2061,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2026-05-24",
      "ped_date_end": "2026-05-24",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2062,
      "ped_label": "Whit Monday",
      "ped_date_start": "2026-05-25",
      "ped_date_end": "2026-05-25",
      "ped_period_special_day_id": 2,
      "ped_year": 2023
    },
    {
      "ped_id": 2063,
      "ped_label": "Revolution Day (Hungary)",
      "ped_date_start": "2025-03-15",
      "ped_date_end": "2025-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
-      "ped_id": 2064,
+      "ped_id": 2055,
-      "ped_label": "Labour Day",
+      "ped_label": "Christmas",
-      "ped_date_start": "2025-05-01",
+      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-05-01",
+      "ped_date_end": "2025-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2065,
      "ped_label": "Saint Stephens Day (Hungary)",
      "ped_date_start": "2025-08-20",
      "ped_date_end": "2025-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2066,
      "ped_label": "All Saints Day",
      "ped_date_start": "2025-11-01",
      "ped_date_end": "2025-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2067,
      "ped_label": "Good Friday",
      "ped_date_start": "2027-03-26",
      "ped_date_end": "2027-03-26",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2068,
      "ped_label": "Easter Sunday",
      "ped_date_start": "2027-03-28",
      "ped_date_end": "2027-03-28",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2069,
      "ped_label": "Easter Monday",
      "ped_date_start": "2027-03-29",
      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2070,
      "ped_label": "Whit Monday",
      "ped_date_start": "2027-05-17",
      "ped_date_end": "2027-05-17",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    },
    {
      "ped_id": 2071,
      "ped_label": "Whit Sunday",
      "ped_date_start": "2027-05-16",
      "ped_date_end": "2027-05-16",
      "ped_period_special_day_id": 2,
      "ped_year": 2024
    }
  ]
 }
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -3,18 +3,16 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-# 
+##
-opkg info atbqt
+# opkg update
-opkg info atbupdatetool
+# opkg install prepare-update
-opkg update
+# download packages
-opkg install prepare-update
+# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
-opkg install atbupdatetool
+# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
-# opkg remove atb-accountingtool
+# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
-# opkg install atb-accountingtool
+# opkg --cache /var/cache/opkg --download-only upgrade atbqt
-opkg --cache /var/cache/opkg --download-only upgrade
+# install packages
-opkg --cache /var/cache/opkg upgrade
+# opkg --cache /var/cache/opkg upgrade tariff-config-281
-# opkg remove apism
+# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
-# opkg install apism
+# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
-opkg info apism
+# opkg --cache /var/cache/opkg upgrade atbqt
 opkg info atbqt
 opkg info atbupdatetool
Author	SHA1	Message	Date
Gerhard Hoffmann	f94b8abc66	Remove Sat 08:00-12:00 for Zone 3 (Yellow) -> slipped in Dec 2024.	2025-05-22 11:07:23 +02:00
Gerhard Hoffmann	649b260685	Switch back to tariffs before 05/17.	2025-05-20 14:43:39 +02:00
Gerhard Hoffmann	fd15196f8e	comment all opkg lines	2025-05-12 09:49:14 +02:00
Gerhard Hoffmann	b15068f21f	special saturday 2025/05/17	2025-05-12 08:55:57 +02:00
Gerhard Hoffmann	48ec3432b1	set service fridays: 8-18	2025-01-07 10:47:34 +01:00
Gerhard Hoffmann	37522a8a97	Add holiday 2024-12-28. Switch back to normal handling of Saturdays.	2024-12-16 15:52:28 +01:00
Gerhard Hoffmann	bf3fe7ffd2	additional holidays 2024/2025	2024-12-03 13:49:56 +01:00
Gerhard Hoffmann	d288123575	Adapt for Saturday 07/12	2024-12-02 17:12:57 +01:00
Gerhard Hoffmann	2822db5e2f	Remove Sat 08:00-12:00 from Zone 3 (Yellow)	2024-10-29 15:33:18 +01:00
Gerhard Hoffmann	71fdf02bf4	Revert to original versions	2024-08-08 12:24:57 +02:00
Gerhard Hoffmann	ffb969e2e2	set 8:00-18:00 for 03.08	2024-08-01 12:39:56 +02:00
Gerhard Hoffmann	70727db07a	Activate opkg_commands	2024-07-15 08:56:02 +02:00
Gerhard Hoffmann	7960874f95	opkg: none	2024-07-08 13:39:17 +02:00
Gerhard Hoffmann	99de8a08ec	Set ex.rate to 365.	2024-07-05 10:03:49 +02:00
Gnemeth	6968d15458	euro exchange rate update	2024-06-30 19:11:49 +02:00
Gerhard Hoffmann	828a9a69b4	re-commit: change of ISMAS settings	2024-06-25 08:38:12 +02:00
Gerhard Hoffmann	7e0b58e2be	ZoneId in tariff-files	2024-06-24 11:34:36 +02:00
Siegfried Siegert	e5508f3ba6	Tariff: add tariff-info aka "TARIFF_ID"	2024-06-07 08:12:33 +02:00
Gerhard Hoffmann	f889943a1b	Remove all files except DC2C_cash/print22/print25/print28.json	2024-04-30 14:34:16 +02:00
Gerhard Hoffmann	0840e20b82	Repeat update procedure in Szeged for 145-148,171,172,159-161	2024-04-30 08:51:49 +02:00
Gerhard Hoffmann	a003e880f7	Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas	2024-04-26 12:11:46 +02:00
Gerhard Hoffmann	9aa652d307	Use empty file.	2024-04-18 16:10:59 +02:00
Gerhard Hoffmann	87c23c9d11	readd empty lines (just to be sure that files have been changed)	2024-03-28 12:10:26 +01:00
Gerhard Hoffmann	68856b876a	added empty lines to restart download	2024-03-28 11:58:09 +01:00
Gerhard Hoffmann	90d545016f	even remove opkg update	2024-03-26 10:06:56 +01:00
Gerhard Hoffmann	82146f7dfb	only install prepare-update script	2024-03-26 09:50:06 +01:00
Gerhard Hoffmann	ddc5fad05a	Removed all holidays except thos for 2024	2024-03-26 09:40:58 +01:00
Gerhard Hoffmann	917ba07e58	tariff01 -> exact prize: 42 tarif 04/06 -> exact price: 163	2024-02-19 17:31:23 +01:00
Gerhard Hoffmann	a5ed998753	tariff01.json: set min-price: 165 / 4 -> 45 tariff02.json: set min-price: 260 / 4 -> 65 tariff03.json: set min-price: 360 / 4 -> 90 tariff04.json: set min-price: 650 / 4 -> 165 tariff05.json: set min-price: 360 / 4 -> 90 tariff06.json: set min-price: 650 / 4 -> 165	2024-02-15 14:27:42 +01:00
Gerhard Hoffmann	68bd83a63f	Added # character: Testing PSA 997	2024-01-23 16:41:45 +01:00
Gerhard Hoffmann	a7bb2c1aaf	add libmobilisis-calc2 and activate upgrade step	2024-01-09 11:45:56 +01:00
Gerhard Hoffmann	0c504b4832	Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600	2024-01-08 15:44:20 +01:00
Gerhard Hoffmann	672bd852ed	Set zone 'green mars' as 'green', 'yellow mars' as 'yello'	2024-01-08 11:00:12 +01:00
Gerhard Hoffmann	699a777dfd	Update exchange rate to 352.	2023-12-31 08:17:59 +01:00
Gerhard Hoffmann	869cecdb4a	turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days.	2023-12-31 08:08:52 +01:00
Gerhard Hoffmann	f85bf40d3d	switch back to previous prices until 01.01.2024	2023-12-23 08:34:21 +01:00
Gerhard Hoffmann	088228d0ad	set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650	2023-12-21 15:26:00 +01:00
Gerhard Hoffmann	fd61002d65	Remove dc-files (to be used later)	2023-12-20 13:56:41 +01:00
Gerhard Hoffmann	35f198ba7c	Change for szeged: do not install atbupdatetool and do not upgrade the machine	2023-12-20 12:52:21 +01:00
Gerhard Hoffmann	b0b43603b4	Reset to previous prices keeping current holidays	2023-12-20 12:52:10 +01:00
Gerhard Hoffmann	7c6d92b38c	Updated to use new prices.	2023-12-19 16:50:10 +01:00
Gerhard Hoffmann	6209855f0b	Replace year period id from 8 to 2 as the special days refer to it	2023-12-19 14:58:01 +01:00
Gerhard Hoffmann	14807f7a1d	delete all json files	2023-12-19 13:55:49 +01:00
Gerhard Hoffmann	382e2b34ab	use opkg_commands file as used in schoenau (00332)	2023-12-19 11:57:32 +01:00
Gerhard Hoffmann	9c3147101f	switch back to previous prices, but keeping current holidays	2023-12-19 11:18:24 +01:00
Gerhard Hoffmann	a851b59581	tariff01: new price: 165 new daily price: 990 tariff02: new price: 260 new daily price: 1560 tariff03: new price: 360 new daily price: 2160 tariff04: new price: 650 Set new holidays starting from Dec. 2023.	2023-12-18 14:44:14 +01:00
Gerhard Hoffmann	cc5b4947c2	Fixed wrong comma after exchange rate	2023-10-11 14:14:56 +02:00
Gerhard Hoffmann	de7c644813	set exchange rate to 360	2023-10-10 16:30:48 +02:00
Gerhard Hoffmann	0caaece756	remove absolete file	2023-08-11 12:41:04 +02:00
Gerhard Hoffmann	b20097a867	Install ptu5-gitinstaller, atbupdatetool and atbqt.	2023-08-11 12:40:04 +02:00
Gerhard Hoffmann	fa0a7e2c10	set daily cardprice to 2400	2023-08-03 15:39:34 +02:00
Gerhard Hoffmann	89d2812724	add json files for zones 5 and 6	2023-08-03 15:32:38 +02:00
Gerhard Hoffmann	d23139f5af	add another empty line	2023-07-25 17:21:11 +02:00
Gerhard Hoffmann	d5425192b6	add empty line	2023-07-25 17:15:07 +02:00
Gerhard Hoffmann	8b25cd70b3	Set carry over to 1, daily_price to 2400	2023-07-25 16:07:54 +02:00
Gerhard Hoffmann	9f83afce3a	add another empty line	2023-07-25 14:07:30 +02:00
Gerhard Hoffmann	c958ed2632	add another empty line	2023-07-25 12:39:16 +02:00
Gerhard Hoffmann	583955df67	add 2 other lines	2023-07-25 12:15:18 +02:00
Gerhard Hoffmann	a6a8ad436a	add another testline	2023-07-25 11:50:10 +02:00
Gerhard Hoffmann	33e9f2a3f2	add another empty line for testing	2023-07-25 11:36:02 +02:00
Gerhard Hoffmann	6117764e42	add new line	2023-07-25 11:29:24 +02:00
Gerhard Hoffmann	55f23b4099	Set max_time to 240	2023-07-25 10:13:18 +02:00
Gerhard Hoffmann	9443f5c372	Do not download anything. Only execute opkg-commands	2023-07-06 15:44:43 +02:00
Gerhard Hoffmann	1b9e55592f	Update json-printer-files (provided by Dennis)	2023-07-06 15:11:59 +02:00
Gerhard Hoffmann	92e8e0946d	remove handling og checkout_history file	2023-07-04 14:01:23 +02:00
Gerhard Hoffmann	c272d9013d	populate opkg_commands-file with valid opkg instructions	2023-07-04 12:17:48 +02:00
Gerhard Hoffmann	1dd56a5084	use opgk_commands-file in repository rather than in global file-system	2023-07-04 12:15:07 +02:00
Gerhard Hoffmann	236c4ea33a	Add some debug output	2023-07-04 10:56:43 +02:00
Gerhard Hoffmann	c8dc474476	Add some debug output	2023-07-04 10:54:24 +02:00
Gerhard Hoffmann	8d87f21cce	Add some debug output	2023-07-04 10:52:24 +02:00
Gerhard Hoffmann	3c32455a12	Merge branch 'zg1/zone4' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone4	2023-07-04 10:44:59 +02:00
Gerhard Hoffmann	8679da9be4	Use OPKG_COMMANDS_FILE in repository, not in global file-system	2023-07-04 10:44:47 +02:00
Siegfried Siegert	f8178f1f7f	pr	2023-07-02 16:30:39 +02:00
Gerhard Hoffmann	2bc06c4027	return to normal workflow after testing	2023-06-30 10:52:03 +02:00
Gerhard Hoffmann	24a06b54f3	Provide opkg commands for zone4	2023-06-29 14:31:50 +02:00
Gerhard Hoffmann	0daa7cb254	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:25:34 +02:00
Gerhard Hoffmann	e40c1b54c8	Adding device-controller firmware version 4.35	2023-06-27 16:25:08 +02:00
Gerhard Hoffmann	f4771cb2be	remove obsolete file	2023-06-27 16:24:22 +02:00
Gerhard Hoffmann	760819d4e8	sync post-checkout/merge-hooks with zg/zone1	2023-06-27 14:45:43 +02:00
Gerhard Hoffmann	e4ce5cbd84	sync tariff-files with zg1/zone1	2023-06-27 14:44:33 +02:00
Gerhard Hoffmann	fa90fa90e9	remove unused tariff-files	2023-06-27 14:43:18 +02:00
Gerhard Hoffmann	9f2525e503	Set daily_card_price to 2400 for zone4	2023-06-27 14:22:09 +02:00
Gerhard Hoffmann	cc62a9b139	check for existence of opkg_commands-file (2)	2023-06-05 15:58:43 +02:00
Gerhard Hoffmann	2d27a8a6d4	check for existence of opkg_commands-file	2023-06-05 15:52:57 +02:00
Gerhard Hoffmann	2618ee154d	adding post-checkout hook ad for zone1	2023-06-05 15:47:26 +02:00
Gerhard Hoffmann	4f5a45f096	Add device controller version 4.22	2023-05-31 08:59:27 +02:00
Gerhard Hoffmann	3e7ae97312	Adding new print-templates because of printing-problems on DC-side	2023-05-24 16:22:03 +02:00
Gerhard Hoffmann	df2ca1901e	Add DC-version 4.21	2023-05-24 16:21:58 +02:00
Gerhard Hoffmann	bb812c882b	Updating print templates as of May 11, 2023.	2023-05-18 12:17:22 +02:00
Gerhard Hoffmann	044b9e6834	Add tariff-file for zone 4	2023-05-04 10:56:37 +02:00
Gerhard Hoffmann	8828b75917	Update as for branch zg1/zone1	2023-04-25 11:53:13 +02:00
Gerhard Hoffmann	4e4320c4a2	test	2022-07-08 14:55:05 +02:00
Gerhard Hoffmann	7013aeea3e	test	2022-07-08 14:52:35 +02:00
Gerhard Hoffmann	abc5bc57d4	Removed *.ini-Files.	2023-03-31 11:46:18 +02:00
Gerhard Hoffmann	d7168d096f	Add .gitignore	2023-03-31 09:51:11 +02:00