Change for szeged: do not install atbupdatetool and do not upgrade the machine

Reset to previous prices keeping current holidays
Updated to use new prices.
2023-12-20 12:52:21 +01:00 · 2023-12-20 12:52:10 +01:00 · 2023-12-19 16:50:10 +01:00 · 2023-12-19 14:58:01 +01:00 · 2023-12-19 13:55:49 +01:00 · 2023-12-19 11:57:32 +01:00
18 changed files with 1381 additions and 595 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,28 +0,0 @@
-[core]
-	repositoryformatversion = 0
-	filemode = true
-	bare = false
-	logallrefupdates = true
-	symlinks = true
-[remote "origin"]
-	url = https://git.mimbach49.de/GerhardHoffmann/customer_999.git
-	fetch = +refs/heads/*:refs/remotes/origin/*
-[branch "master"]
-	remote = origin
-	merge = refs/heads/master
-[branch "zg1/zone1"]
-	remote = origin
-	merge = refs/heads/zg1/zone1
-[branch "zg1/zone2"]
-	remote = origin
-	merge = refs/heads/zg1/zone2
-[branch "zg1/zone3"]
-	remote = origin
-	merge = refs/heads/zg1/zone3
-[branch "zg1/zone4"]
-	remote = origin
-	merge = refs/heads/zg1/zone4
-[pull]
-	rebase = false
-[push]
-	autoSetupRemote = true
--- 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/*
-!etc/psa_config/*
-!etc/psa_update/*
-!etc/psa_tariff/*
-!etc/dc/*.hex
-!etc/dc/*.bin
-!*/etc/*.ini
-!*/etc/atb/*
-!*/etc/psa_config/*
-!*/etc/psa_update/*
-!*/etc/psa_tariff/*
-!*/etc/dc/*.hex
-!*/etc/dc/*.bin
+!**/.gitignore
+!**/.githooks/post-merge
+!/etc/*.ini
+!/etc/atb/*.ini
+!/etc/psa_config/*
+!/etc/psa_update/*
+!/etc/psa_tariff/*
+!/etc/dc/dc2c.hex
+
+!/opt/app/ATBAPP/*.ini
+!/opt/app/sysconfig/*.ini
+!/opt/app/ISMASMgr/*.ini

--- a/README.md
+++ b/README.md
--- a/etc/dc/dc2c.4.21.bin
+++ b/etc/dc/dc2c.4.21.bin
--- a/etc/dc/dc2c.4.22.bin
+++ b/etc/dc/dc2c.4.22.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
@@ -0,0 +1 @@
+dc2c.4.35.bin
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,16 +0,0 @@
-{	     
-"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
@@ -1,27 +0,0 @@
-"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
@@ -1,29 +0,0 @@
-{
-"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
@@ -1,34 +0,0 @@
-{
-"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/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -1,7 +1,4 @@
 {
-  "Project" :   "Szeged Zone 1",
-  "Version" :   "1.0.1",
-  "Info"    :   "6725",
  "Currency": [
    {
      "pcu_id": 2,
@@ -39,16 +36,16 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 360,
-      "pop_min_price": 42,
+      "pop_min_price": 0,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 990
+      "pop_daily_card_price": 900
    }
  ],
  "PaymentRate": [
    {
      "pra_payment_option_id": 1049,
      "pra_payment_unit_id": 1,
-      "pra_price": 165
+      "pra_price": 150
    }
  ],
  "Duration": [
@@ -468,102 +465,182 @@
    }
  ],
  "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": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-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": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "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_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-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",
@@ -581,18 +658,10 @@
      "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_id": 2054,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -606,38 +675,124 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
+      "ped_label": "NewYear",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "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_label": "Good Friday",
+      "ped_date_start": "2026-04-03",
+      "ped_date_end": "2026-04-03",
      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
    },
    {
      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2026-04-05",
+      "ped_date_end": "2026-04-05",
+      "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": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
+      "ped_id": 2064,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
      "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,7 +1,4 @@
 {
-  "Project" :   "Szeged Zone 2",
-  "Version" :   "1.0.1",
-  "Info"    :   "6724",
  "Currency": [
    {
      "pcu_id": 2,
@@ -38,17 +35,17 @@
      "pop_day_night_end_time": "16:27:00",
      "pop_price_night": 0,
      "pop_min_time": 15,
-      "pop_max_time": 360,
-      "pop_min_price": 65,
+      "pop_max_time": 300,
+      "pop_min_price": 0,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 1560
+      "pop_daily_card_price": 1320
    }
  ],
  "PaymentRate": [
    {
      "pra_payment_option_id": 1050,
      "pra_payment_unit_id": 1,
-      "pra_price": 260
+      "pra_price": 230
    }
  ],
  "Duration": [
@@ -468,102 +465,182 @@
    }
  ],
  "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": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-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": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "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_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-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",
@@ -581,18 +658,10 @@
      "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_id": 2054,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -606,39 +675,123 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
+      "ped_label": "NewYear",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "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_label": "Good Friday",
+      "ped_date_start": "2026-04-03",
+      "ped_date_end": "2026-04-03",
      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
    },
    {
      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2026-04-05",
+      "ped_date_end": "2026-04-05",
+      "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": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
+      "ped_id": 2064,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
      "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,7 +1,4 @@
 {
-  "Project" :   "Szeged Zone 3",
-  "Version" :   "1.0.1",
-  "Info"    :   "6721",
  "Currency": [
    {
      "pcu_id": 2,
@@ -39,16 +36,16 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 360,
-      "pop_min_price": 90,
+      "pop_min_price": 0,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 2160
+      "pop_daily_card_price": 1980
    }
  ],
  "PaymentRate": [
    {
      "pra_payment_option_id": 1051,
      "pra_payment_unit_id": 1,
-      "pra_price": 360
+      "pra_price": 330
    }
  ],
  "Duration": [
@@ -103,6 +100,13 @@
      "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": [
@@ -468,102 +472,182 @@
    }
  ],
  "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": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-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": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "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_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-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",
@@ -581,18 +665,10 @@
      "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_id": 2054,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -606,40 +682,123 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
+      "ped_label": "NewYear",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "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_label": "Good Friday",
+      "ped_date_start": "2026-04-03",
+      "ped_date_end": "2026-04-03",
      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
    },
    {
      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2026-04-05",
+      "ped_date_end": "2026-04-05",
+      "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": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
+      "ped_id": 2064,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
      "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,7 +1,4 @@
 {
-  "Project" :   "Szeged Zone 4",
-  "Version" :   "1.0.1",
-  "Info"    :   "6720",
  "Currency": [
    {
      "pcu_id": 2,
@@ -39,9 +36,9 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 240,
-      "pop_min_price": 163,
+      "pop_min_price": 0,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 2600,
+      "pop_daily_card_price": 2400,
      "pop_multi_hour_price": 0
    }
  ],
@@ -49,7 +46,7 @@
    {
      "pra_payment_option_id": 1052,
      "pra_payment_unit_id": 1,
-      "pra_price": 650
+      "pra_price": 600
    }
  ],
  "Duration": [
@@ -630,102 +627,182 @@
    }
  ],
  "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": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-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": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "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_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-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",
@@ -743,18 +820,10 @@
      "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_id": 2054,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -768,39 +837,125 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
+      "ped_label": "NewYear",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "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_label": "Good Friday",
+      "ped_date_start": "2026-04-03",
+      "ped_date_end": "2026-04-03",
      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
    },
    {
      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2026-04-05",
+      "ped_date_end": "2026-04-05",
+      "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": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
+      "ped_id": 2064,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
      "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,7 +1,4 @@
 {
-  "Project" :   "Szeged Zone 5",
-  "Version" :   "1.0.1",
-  "Info"    :   "6723",
  "Currency": [
    {
      "pcu_id": 2,
@@ -39,9 +36,9 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 360,
-      "pop_min_price": 90,
+      "pop_min_price": 0,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 2160,
+      "pop_daily_card_price": 1980,
      "pop_multi_hour_price": 0
    }
  ],
@@ -49,7 +46,7 @@
    {
      "pra_payment_option_id": 1081,
      "pra_payment_unit_id": 1,
-      "pra_price": 360
+      "pra_price": 330
    }
  ],
  "Duration": [
@@ -637,102 +634,182 @@
    }
  ],
  "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": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-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": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "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_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-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",
@@ -750,18 +827,10 @@
      "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_id": 2054,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -775,39 +844,123 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
+      "ped_label": "NewYear",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "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_label": "Good Friday",
+      "ped_date_start": "2026-04-03",
+      "ped_date_end": "2026-04-03",
      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
    },
    {
      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2026-04-05",
+      "ped_date_end": "2026-04-05",
+      "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": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
+      "ped_id": 2064,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
      "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,7 +1,4 @@
 {
-  "Project" :   "Szeged Zone 6",
-  "Version" :   "1.0.1",
-  "Info"    :   "6722",
  "Currency": [
    {
      "pcu_id": 2,
@@ -39,9 +36,9 @@
      "pop_price_night": 0,
      "pop_min_time": 15,
      "pop_max_time": 240,
-      "pop_min_price": 163,
+      "pop_min_price": 0,
      "pop_carry_over": 1,
-      "pop_daily_card_price": 2600,
+      "pop_daily_card_price": 2400,
      "pop_multi_hour_price": 0
    }
  ],
@@ -49,7 +46,7 @@
    {
      "pra_payment_option_id": 1082,
      "pra_payment_unit_id": 1,
-      "pra_price": 650
+      "pra_price": 600
    }
  ],
  "Duration": [
@@ -637,102 +634,182 @@
    }
  ],
  "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": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-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": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2023
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "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_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-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",
@@ -750,18 +827,10 @@
      "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_id": 2054,
+      "ped_label": "Republic Day (Hungary)",
+      "ped_date_start": "2025-10-23",
+      "ped_date_end": "2025-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -775,39 +844,123 @@
    },
    {
      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
+      "ped_label": "NewYear",
+      "ped_date_start": "2025-01-01",
+      "ped_date_end": "2025-01-01",
      "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_label": "Good Friday",
+      "ped_date_start": "2026-04-03",
+      "ped_date_end": "2026-04-03",
      "ped_period_special_day_id": 2,
-      "ped_year": 0
+      "ped_year": 2023
    },
    {
      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
+      "ped_label": "Easter Sunday",
+      "ped_date_start": "2026-04-05",
+      "ped_date_end": "2026-04-05",
+      "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": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
+      "ped_id": 2064,
+      "ped_label": "Labour Day",
+      "ped_date_start": "2025-05-01",
+      "ped_date_end": "2025-05-01",
      "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,16 +3,18 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-##
-# 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
-# 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 info atbqt
+opkg info atbupdatetool
+opkg update
+opkg install prepare-update
+# opkg install atbupdatetool
+# opkg remove atb-accountingtool
+# opkg install atb-accountingtool
+# opkg --cache /var/cache/opkg --download-only upgrade
+# opkg --cache /var/cache/opkg upgrade
+# opkg remove apism
+# opkg install apism
+opkg info apism
+opkg info atbqt
+opkg info atbupdatetool
Author	SHA1	Message	Date
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