diff --git a/etc/dc/dc2c.4.21.bin b/etc/dc/dc2c.4.21.bin deleted file mode 100755 index 0d6ce45..0000000 Binary files a/etc/dc/dc2c.4.21.bin and /dev/null differ diff --git a/etc/dc/dc2c.4.22.bin b/etc/dc/dc2c.4.22.bin deleted file mode 100755 index 5172732..0000000 Binary files a/etc/dc/dc2c.4.22.bin and /dev/null differ diff --git a/etc/dc/dc2c.4.35.bin b/etc/dc/dc2c.4.35.bin deleted file mode 100755 index 197a56e..0000000 Binary files a/etc/dc/dc2c.4.35.bin and /dev/null differ diff --git a/etc/dc/dc2c.bin b/etc/dc/dc2c.bin deleted file mode 120000 index 6012a81..0000000 --- a/etc/dc/dc2c.bin +++ /dev/null @@ -1 +0,0 @@ -dc2c.4.35.bin \ No newline at end of file diff --git a/etc/psa_config/DC2C_cash.json b/etc/psa_config/DC2C_cash.json old mode 100644 new mode 100755 index 0d2f62d..e495340 --- a/etc/psa_config/DC2C_cash.json +++ b/etc/psa_config/DC2C_cash.json @@ -1,16 +1,17 @@ { "title":"DC2C_cash ", "project":"DBM Szeged", -"version":"13.02.2023 12:20 00001", -"localCoinAccept(7..0)":[0,0,0,1,1,1,1,1], -"Name of Currency":"Huf", -"local tax rate":20, -"foreignCoinAccept(15..8)":[0,0,0,0,0,1,1,1], -"CurrencyName":"EUR", -"foreign tax rate":19, -"TokenChannel":3, -"Bills(7..0)":[0,0,0,0,0,0,0,0], -"surcharge":0, -"discount":0, -"":"" +"version":"26.04.2024 01.02.04", +"CoinDenom(15..0)":[200,100,50,0,0,0,0,100,200,100,50,20,10,5,0,3], +"CoinValue(15..0)":[700,350,175,0,0,0,0,100,200,100,50,20,10,5,0,3], +"CoinAccept(15..0)":[1,1,1,0,0,0,0,1,1,1,1,1,1,1,0,1], +"ExchangeRate":350 +"TokenChannel":1, +"BillValues(7..0)":[0,0,0,0,0,0,0,0], +"LocalTaxRate":20, +"ForeignTaxRate":19, +"Surcharge":0, +"Discount":0, + } + diff --git a/etc/psa_config/DC2C_conf.json b/etc/psa_config/DC2C_conf.json deleted file mode 100644 index cb0aa24..0000000 --- a/etc/psa_config/DC2C_conf.json +++ /dev/null @@ -1,13 +0,0 @@ -{ -"title":"DC2C_config", -"project":"DBM Szeged", -"version":"13.02.2023 12:20 00001", -"custNum":281, -"machNum":999, -"borough":1, -"zone":1, -"alias":1357, -"location":"92637Weiden/Opf_Bahnhofstraße 65", -"":"" -} - diff --git a/etc/psa_config/DC2C_print01.json b/etc/psa_config/DC2C_print01.json deleted file mode 100644 index 699e451..0000000 --- a/etc/psa_config/DC2C_print01.json +++ /dev/null @@ -1,41 +0,0 @@ -{ -"title":"DC2C_pri01", -"styl":"font 08", -"styl":"size 10", -"feed":"margin02", -"feed":"rim02", -"text":"PARKOLÓJEGY", -"styl":"size 00", -"feed":"nl", -"text":"Kérjük az elsö szélvédö", -"feed":"nl", -"text":"mögé jól láthatóan", -"feed":"nl", -"text":"elhelyezni!", -"feed":"nl", -"text":"A PARKOLÓ NEM ÕRZÖTT", -"feed":"nl", -"text":"Please place it clearly visible", -"feed":"nl", -"text":"behind the", -"text":" front windshield!", -"feed":"nl", -"feed":"nl", -"text":"Rendszám: ", -"vari":"Dynamic01", -"feed":"nl", -"text":"Parkolási idõ vége:", -"feed":"nl", -"styl":"size 01", -"vari":"Dynamic04", -"vari":"Dynamic03", -"styl":"size 00", -"feed":"nl", -"text":"Parkolás helye: ", -"feed":"nl", -"vari":"location", -"feed":"nl", -"feed":"nl", -} - - diff --git a/etc/psa_config/DC2C_print02.json b/etc/psa_config/DC2C_print02.json deleted file mode 100644 index 3fd6231..0000000 --- a/etc/psa_config/DC2C_print02.json +++ /dev/null @@ -1,36 +0,0 @@ -{ -"title":"DC2C_pri02", -"text":"Összeg: ", -"styl":"size 01", -"vari":"Dynamic02", -"styl":"size 00", -"feed":"nl", -"text":"Kiadás időpontja:", -"feed":"nl", -"vari":"date us", -"vari":"time short", -"feed":"nl", -"text":"Automata száma: ", -"vari":"manu", -"text":"Park.jegy sorsz.: ", -"vari":"TickCtr", -"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", -"text":"Üf. szolg nyitvatartás:", -"feed":"nl", -"feed":"nl", -"feed":"nl", -} - - diff --git a/etc/psa_config/DC2C_print03.json b/etc/psa_config/DC2C_print03.json deleted file mode 100644 index 512c8a0..0000000 --- a/etc/psa_config/DC2C_print03.json +++ /dev/null @@ -1,22 +0,0 @@ -{ -"title":"DC2C_pri03", -"project":"DBM Szeged park_coins", -"issued":"13.04.2023 01.01", - -"styl":"size 00", -"text":"H - P: 7:45 - 17:00", -"feed":"nl", -"text":"Tel: (80) 820-500", -"feed":"nl", -"text":"Parkoljon egy érintéssel. ", -"feed":"nl", -"text":"Használja bankkártyáját ", -"feed":"nl", -"text":" automatáinknál is!", -"feed":"nl", -"feed":"nl", -"feed":"nl", -"feed":"eject", -} - - diff --git a/etc/psa_config/DC2C_print04.json b/etc/psa_config/DC2C_print04.json deleted file mode 100644 index 1e44623..0000000 --- a/etc/psa_config/DC2C_print04.json +++ /dev/null @@ -1,9 +0,0 @@ -{ -"title":"DC2C_pri04", -"project":"empty template", -"issued":"09.06.2023 01.01", -"styl":"size 00" - -} - - diff --git a/etc/psa_config/DC2C_print05.json b/etc/psa_config/DC2C_print05.json deleted file mode 100644 index b7e78d8..0000000 --- a/etc/psa_config/DC2C_print05.json +++ /dev/null @@ -1,41 +0,0 @@ -{ -"title":"DC2C_pri05", -"styl":"font 08", -"styl":"size 10", -"feed":"margin02", -"feed":"rim02", -"text":"PARKOLÓJEGY", -"styl":"size 00", -"feed":"nl", -"text":"Kérjük az elsö szélvédö", -"feed":"nl", -"text":"mögé jól láthatóan", -"feed":"nl", -"text":"elhelyezni!", -"feed":"nl", -"text":"A PARKOLÓ NEM ÕRZÖTT", -"feed":"nl", -"text":"Please place it clearly visible", -"feed":"nl", -"text":"behind the", -"text":" front windshield!", -"feed":"nl", -"feed":"nl", -"text":"Rendszám: ", -"vari":"Dynamic01", -"feed":"nl", -"text":"Parkolási idõ vége:", -"feed":"nl", -"styl":"size 01", -"vari":"Dynamic04", -"vari":"Dynamic03", -"styl":"size 00", -"feed":"nl", -"text":"Parkolás helye: ", -"feed":"nl", -"vari":"location", -"feed":"nl", -"feed":"nl", -} - - diff --git a/etc/psa_config/DC2C_print06.json b/etc/psa_config/DC2C_print06.json deleted file mode 100644 index 3de6e90..0000000 --- a/etc/psa_config/DC2C_print06.json +++ /dev/null @@ -1,36 +0,0 @@ -{ -"title":"DC2C_pri06", -"text":"Összeg: ", -"styl":"size 01", -"vari":"Dynamic02", -"styl":"size 00", -"feed":"nl", -"text":"Kiadás időpontja:", -"feed":"nl", -"vari":"date us", -"vari":"time short", -"feed":"nl", -"text":"Automata száma: ", -"vari":"manu", -"text":"Park.jegy sorsz.: ", -"vari":"TickCtr", -"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", -"text":"Üf. szolg nyitvatartás:", -"feed":"nl", -"feed":"nl", -"feed":"nl", -} - - diff --git a/etc/psa_config/DC2C_print07.json b/etc/psa_config/DC2C_print07.json deleted file mode 100644 index 9f425b0..0000000 --- a/etc/psa_config/DC2C_print07.json +++ /dev/null @@ -1,22 +0,0 @@ -{ -"title":"DC2C_pri07", -"project":"DBM Szeged", -"issued":"13.04.2023 01.01", - -"styl":"size 00", -"text":"H - P: 7:45 - 17:00", -"feed":"nl", -"text":"Tel: (80) 820-500", -"feed":"nl", -"text":"Parkoljon egy érintéssel. ", -"feed":"nl", -"text":"Használja bankkártyáját ", -"feed":"nl", -"text":" automatáinknál is!", -"feed":"nl", -"feed":"nl", -"feed":"nl", -"feed":"eject", -} - - diff --git a/etc/psa_config/DC2C_print08.json b/etc/psa_config/DC2C_print08.json deleted file mode 100644 index 9568011..0000000 --- a/etc/psa_config/DC2C_print08.json +++ /dev/null @@ -1,8 +0,0 @@ -{ -"title":"DC2C_pri08", -"project":"empty template", -"issued":"09.06.2023 01.01", -"styl":"size 00" -} - - diff --git a/etc/psa_config/DC2C_print09.json b/etc/psa_config/DC2C_print09.json deleted file mode 100644 index 7206cd7..0000000 --- a/etc/psa_config/DC2C_print09.json +++ /dev/null @@ -1,41 +0,0 @@ -{ -"title":"DC2C_pri09", -"styl":"font 08", -"styl":"size 10", -"feed":"margin02", -"feed":"rim02", -"text":"PARKOLÓJEGY", -"styl":"size 00", -"feed":"nl", -"text":"Kérjük az elsö szélvédö", -"feed":"nl", -"text":"mögé jól láthatóan", -"feed":"nl", -"text":"elhelyezni!", -"feed":"nl", -"text":"A PARKOLÓ NEM ÕRZÖTT", -"feed":"nl", -"text":"Please place it clearly visible", -"feed":"nl", -"text":"behind the", -"text":" front windshield!", -"feed":"nl", -"feed":"nl", -"text":"Rendszám: ", -"vari":"Dynamic01", -"feed":"nl", -"text":"Parkolási idõ vége:", -"feed":"nl", -"styl":"size 01", -"vari":"Dynamic04", -"vari":"Dynamic03", -"styl":"size 00", -"feed":"nl", -"text":"Parkolás helye: ", -"feed":"nl", -"vari":"location", -"feed":"nl", -"feed":"nl", -} - - diff --git a/etc/psa_config/DC2C_print10.json b/etc/psa_config/DC2C_print10.json deleted file mode 100644 index 495a1db..0000000 --- a/etc/psa_config/DC2C_print10.json +++ /dev/null @@ -1,40 +0,0 @@ -{ -"title":"DC2C_pri10", -"styl":"size 01", -"text":"Napijegy K", -"styl":"size 00", -"feed":"nl", -"text":"Összeg: ", -"styl":"size 01", -"vari":"Dynamic02", -"styl":"size 00", -"feed":"nl", -"text":"Kiadás időpontja:", -"feed":"nl", -"vari":"date us", -"vari":"time short", -"feed":"nl", -"text":"Automata száma: ", -"vari":"manu", -"text":"Park.jegy sorsz.: ", -"vari":"TickCtr", -"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", -"text":"Üf. szolg nyitvatartás:", -"feed":"nl", -"feed":"nl", -"feed":"nl", -} - - diff --git a/etc/psa_config/DC2C_print11.json b/etc/psa_config/DC2C_print11.json deleted file mode 100644 index 2e5cc48..0000000 --- a/etc/psa_config/DC2C_print11.json +++ /dev/null @@ -1,22 +0,0 @@ -{ -"title":"DC2C_pri11", -"project":"DBM Szeged", -"issued":"13.04.2023 01.01", - -"styl":"size 00", -"text":"H - P: 7:45 - 17:00", -"feed":"nl", -"text":"Tel: (80) 820-500", -"feed":"nl", -"text":"Parkoljon egy érintéssel. ", -"feed":"nl", -"text":"Használja bankkártyáját ", -"feed":"nl", -"text":" automatáinknál is!", -"feed":"nl", -"feed":"nl", -"feed":"nl", -"feed":"nl" -} - - diff --git a/etc/psa_config/DC2C_print12.json b/etc/psa_config/DC2C_print12.json deleted file mode 100644 index bef43b3..0000000 --- a/etc/psa_config/DC2C_print12.json +++ /dev/null @@ -1,9 +0,0 @@ -{ -"title":"DC2C_pri12", -"project":"empty template", -"issued":"09.06.2023 01.01", -"styl":"size 00" - -} - - diff --git a/etc/psa_config/DC2C_print13.json b/etc/psa_config/DC2C_print13.json deleted file mode 100644 index a670fee..0000000 --- a/etc/psa_config/DC2C_print13.json +++ /dev/null @@ -1,41 +0,0 @@ -{ -"title":"DC2C_pri13", -"styl":"font 08", -"styl":"size 10", -"feed":"margin02", -"feed":"rim02", -"text":"PARKOLÓJEGY", -"styl":"size 00", -"feed":"nl", -"text":"Kérjük az elsö szélvédö", -"feed":"nl", -"text":"mögé jól láthatóan", -"feed":"nl", -"text":"elhelyezni!", -"feed":"nl", -"text":"A PARKOLÓ NEM ÕRZÖTT", -"feed":"nl", -"text":"Please place it clearly visible", -"feed":"nl", -"text":"behind the", -"text":" front windshield!", -"feed":"nl", -"feed":"nl", -"text":"Rendszám: ", -"vari":"Dynamic01", -"feed":"nl", -"text":"Parkolási idõ vége:", -"feed":"nl", -"styl":"size 01", -"vari":"Dynamic04", -"vari":"Dynamic03", -"styl":"size 00", -"feed":"nl", -"text":"Parkolás helye: ", -"feed":"nl", -"vari":"location", -"feed":"nl", -"feed":"nl", -} - - diff --git a/etc/psa_config/DC2C_print14.json b/etc/psa_config/DC2C_print14.json deleted file mode 100644 index af22030..0000000 --- a/etc/psa_config/DC2C_print14.json +++ /dev/null @@ -1,40 +0,0 @@ -{ -"title":"DC2C_pri14", -"styl":"size 01", -"text":"Napijegy K", -"styl":"size 00", -"feed":"nl", -"text":"Összeg: ", -"styl":"size 01", -"vari":"Dynamic02", -"styl":"size 00", -"feed":"nl", -"text":"Kiadás időpontja:", -"feed":"nl", -"vari":"date us", -"vari":"time short", -"feed":"nl", -"text":"Automata száma: ", -"vari":"manu", -"text":"Park.jegy sorsz.: ", -"vari":"TickCtr", -"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", -"text":"Üf. szolg nyitvatartás:", -"feed":"nl", -"feed":"nl", -"feed":"nl", -} - - diff --git a/etc/psa_config/DC2C_print15.json b/etc/psa_config/DC2C_print15.json deleted file mode 100644 index 80cff00..0000000 --- a/etc/psa_config/DC2C_print15.json +++ /dev/null @@ -1,22 +0,0 @@ -{ -"title":"DC2C_pri15", -"project":"DBM Szeged park_coins", -"issued":"13.04.2023 01.01", - -"styl":"size 00", -"text":"H - P: 7:45 - 17:00", -"feed":"nl", -"text":"Tel: (80) 820-500", -"feed":"nl", -"text":"Parkoljon egy érintéssel. ", -"feed":"nl", -"text":"Használja bankkártyáját ", -"feed":"nl", -"text":" automatáinknál is!", -"feed":"nl", -"feed":"nl", -"feed":"nl", -"feed":"nl" -} - - diff --git a/etc/psa_config/DC2C_print16.json b/etc/psa_config/DC2C_print16.json deleted file mode 100644 index 16f9154..0000000 --- a/etc/psa_config/DC2C_print16.json +++ /dev/null @@ -1,8 +0,0 @@ -{ -"title":"DC2C_pri16", -"project":"empty template", -"issued":"09.06.2023 01.01", -"styl":"size 00" -} - - diff --git a/etc/psa_config/DC2C_print17.json b/etc/psa_config/DC2C_print17.json deleted file mode 100644 index 7724bdc..0000000 --- a/etc/psa_config/DC2C_print17.json +++ /dev/null @@ -1,25 +0,0 @@ -{ -"title":"DC2C_pri17", -"styl":"align l", -"feed":"margin01", -"feed":"nl", -"feed":"nl", -"feed":"nl", -"feed":"part", -"text":"Utazzon tovább közösségi közle-", -"feed":"nl", -"text":"kedéssel! Ehhez a leválasztható", -"feed":"nl", -"text":" szelvényhez a közösségi közle- ", -"feed":"nl", -"text":"kedési járművek (villamos, helyi-", -"feed":"nl", -"text":"járatos busz,trolibusz,vasútvilla-", -"feed":"nl", -"text":"mos) bankkártyás fedélzeti jegy-", -"feed":"nl", -"text":"kiadó automatáiból,illetve a jegy-", -"feed":"nl", -"feed":"nl" -} - diff --git a/etc/psa_config/DC2C_print18.json b/etc/psa_config/DC2C_print18.json deleted file mode 100644 index 7b64a6d..0000000 --- a/etc/psa_config/DC2C_print18.json +++ /dev/null @@ -1,18 +0,0 @@ -"title":"DC2C_pri18", -"styl":"align l", -"feed":"margin01", - -"text":"árusító applikációkból Közterületi", -"feed":"nl", -"text":"fizető parkolás napijegyhez vál-", -"feed":"nl", -"text":"tott kiegészítő Körút napijegy vá-", -"feed":"nl", -"text":"sárolható (ára 440,-Ft)1 fő részé-", -"feed":"nl", -"text":"re. Ez a napijegy Szeged, Nagy-", -"feed":"nl", -"text":" körútig bezárólag illetve a Nagy-", -"feed":"nl", -"feed":"nl" -} diff --git a/etc/psa_config/DC2C_print19.json b/etc/psa_config/DC2C_print19.json deleted file mode 100644 index 6bfea6c..0000000 --- a/etc/psa_config/DC2C_print19.json +++ /dev/null @@ -1,13 +0,0 @@ -{ -"title":"DC2C_pri19", -"styl":"align l", -"feed":"margin01", - -"text":"körúton túli első megállóhelytől", -"feed":"nl", -"text":"vagy megállóhelyig korlátlan uta-", -"feed":"nl", -"text":"zásra érvényes a parkolás nap-", -"feed":"nl", -"text":"ján." -} diff --git a/etc/psa_config/DC2C_print20.json b/etc/psa_config/DC2C_print20.json deleted file mode 100644 index 3856417..0000000 --- a/etc/psa_config/DC2C_print20.json +++ /dev/null @@ -1,28 +0,0 @@ -{ -"title":"DC2C_pri20", -"project":"empty template", -"issued":"09.06.2023 01.01", -"styl":"size 00" - -"text":"Ellenőrzéshez ezt a szelvényt", -"feed":"nl", -"text":"és az utazásra jogosító papírt" , -"feed":"nl", -"text":"vagy elektronikus napijegyet ", -"feed":"nl", -"text":"együttesen kell bemutatni.", -"feed":"nl", -"text":"Rendszám: ", -"vari":"Dynamic01", -"feed":"nl", -"text":"Parkolás kezdete:", -"text":"(Kék Zóna)", -"feed":"nl", -"vari":"date us", -"vari":"time short", -"feed":"nl", -"feed":"eject" - -} - - diff --git a/etc/psa_config/DC2C_print21.json b/etc/psa_config/DC2C_print21.json deleted file mode 100644 index 6609b64..0000000 --- a/etc/psa_config/DC2C_print21.json +++ /dev/null @@ -1,40 +0,0 @@ -{ -"title":"DC2C_pri21", -"project":"DBM Szeged StartParking", -"styl":"size 10", -"text":"Igazoló ", -"text":"szelvény", -"styl":"size 00", -"feed":"nl", -"feed":"nl", -"text":" Bizonylat ", -"feed":"nl", -"text":"Szélvédõ mögé NEM", -"feed":"nl", -"text":"kell kihelyezni!", -"feed":"nl", -"text":"A PARKOLÓ NEM ÕRZÖTT!", -"feed":"nl", -"feed":"nl", -"text":"Rendszám: ", -"vari":"Dynamic01", -"feed":"nl", -"text":"Parkolás helye: ", -"feed":"nl", -"styl":"size 10", -"vari":"location", -"styl":"size 00", -"feed":"nl", -"text":"Zárolt összeg/Ft.: ", -"feed":"nl", -"styl":"size 11", -"vari":"Dynamic02", -"styl":"size 00", -"feed":"nl", -"text":"Kiadás idõpontja:", -"feed":"nl", -"vari":"date us", -"vari":"time short", -"feed":"nl" -} - diff --git a/etc/psa_config/DC2C_print22.json b/etc/psa_config/DC2C_print22.json old mode 100644 new mode 100755 index cbc5fc0..2bceb79 --- a/etc/psa_config/DC2C_print22.json +++ b/etc/psa_config/DC2C_print22.json @@ -17,7 +17,7 @@ "feed":"nl", "text":"Üf. szolg nyitvatartás:", "feed":"nl", -"text":"Deák Ferenc u. 31.", +"text":"Zrínyi utca 4-8", "feed":"nl", "text":"H - P: 7:45 - 17:00", "feed":"nl", @@ -25,5 +25,3 @@ "feed":"nl", "feed":"nl" } - - diff --git a/etc/psa_config/DC2C_print23.json b/etc/psa_config/DC2C_print23.json deleted file mode 100644 index 8cf6dc4..0000000 --- a/etc/psa_config/DC2C_print23.json +++ /dev/null @@ -1,34 +0,0 @@ -"title":"DC2C_pri23", -"project":"DBM Szeged StartParking", -"styl":"size 00", -"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", -"feed":"nl", -"text":"Parkoljon egy érintéssel.", -"feed":"nl", -"text":"Használja bankkártyáját", -"feed":"nl", -"text":" automatáinknál is!", -"feed":"nl", -"feed":"nl", -"text":"Leállító KÓD:", -"feed":"nl", -"styl":"size 11", -"vari":"Dynamic07", -"feed":"nl", -"vari":"Dynamic08", -"styl":"size 00", -"feed":"nl", -"text":"Õrizze meg, tartsa magánál!", -"feed":"nl", -"feed":"eject" -} - - diff --git a/etc/psa_config/DC2C_print24.json b/etc/psa_config/DC2C_print24.json deleted file mode 100644 index 5cf438c..0000000 --- a/etc/psa_config/DC2C_print24.json +++ /dev/null @@ -1,39 +0,0 @@ -{ -"title":"DC2C_pri24", -"project":"DBM Szeged StopParking", -"styl":"size 10" -"text":"Parkolójegy", -"styl":"size 00" -"feed":"nl", -"feed":"nl", -"text":"Nyugta : ", -"feed":"nl", -"vari":"Dynamic07", -"feed":"nl", -"vari":"Dynamic08", -"feed":"nl", -"text":"Rendszám: ", -"vari":"Dynamic01", -"feed":"nl", -"text":"Leállítás helye:", -"feed":"nl", -"styl":"size 10" -"vari":"location", -"styl":"size 00", -"text":"Leállítás idõpontja:", -"feed":"nl", -"vari":"date us", -"vari":"time short", -"feed":"nl", -"text":"Automata száma: ", -"vari":"manu", -"feed":"nl", -"text":"Terhelt Összeg: ", -"vari":"Dynamic02", -"text":"Ft. (BK)", -"feed":"nl", -"text":"A nyugta az igazoló", -"feed":"nl", -"text":"szelvénnyel együtt" -} - diff --git a/etc/psa_config/DC2C_print25.json b/etc/psa_config/DC2C_print25.json old mode 100644 new mode 100755 index 24ab60c..302ac6c --- a/etc/psa_config/DC2C_print25.json +++ b/etc/psa_config/DC2C_print25.json @@ -6,7 +6,7 @@ "feed":"nl", "text":"Üf. szolg nyitvatartás:" "feed":"nl", -"text":" Arany Janos u. 5", +"text":" Zrínyi utca 4-8", "styl":"size 00", "feed":"nl", "text":" H - P: 7:45 - 17:00", @@ -27,5 +27,3 @@ "text":" tartalmazza!", "feed":"nl" } - - diff --git a/etc/psa_config/DC2C_print26.json b/etc/psa_config/DC2C_print26.json deleted file mode 100644 index d58182c..0000000 --- a/etc/psa_config/DC2C_print26.json +++ /dev/null @@ -1,17 +0,0 @@ -{ -"title":"DC2C_pri26", -"project":"DBM Szeged StopParking", -"feed":"nl", -"text":"Start azonosító:", -"styl":"size 00", -"feed":"nl", -"vari":"Dynamic07", -"feed":"nl", -"vari":"Dynamic08", -"feed":"nl", -"text":"Õrizze meg, tartsa magánál!", -"feed":"nl", -"feed":"eject" -} - - diff --git a/etc/psa_config/DC2C_print27.json b/etc/psa_config/DC2C_print27.json deleted file mode 100644 index 3a88351..0000000 --- a/etc/psa_config/DC2C_print27.json +++ /dev/null @@ -1,36 +0,0 @@ -{ -"title":"DC2C_pri27", -"project":"DBM Szeged Error", -"styl":"size 00", -"feed":"nl", -"text":"TRANZAKCIÓ ELUTASÍTVA!", -"feed":"nl", -"feed":"nl", -"text":" Bizonylat", -"feed":"nl", -"feed":"nl", -"text":"Rendszám: ", -"vari":"Dynamic01", -"feed":"nl", -"text":"Indítás helye:", -"feed":"nl", -"vari":"location", -"feed":"nl", -"text":"Kiadás idõpontja:", -"feed":"nl", -"vari":"date us", -"vari":"time short", -"feed":"nl", -"text":"Automata száma: ", -"vari":"manu", -"text":"Bizonylat sorsz.: ", -"feed":"nl", -"vari":"Dynamic07", -"feed":"nl", -"vari":"Dynamic08", -"feed":"nl", -"text":"Hibaüzenet: ", -"vari":"Dynamic06", -"feed":"nl" -} - diff --git a/etc/psa_config/DC2C_print28.json b/etc/psa_config/DC2C_print28.json old mode 100644 new mode 100755 index 8279c24..27671f5 --- a/etc/psa_config/DC2C_print28.json +++ b/etc/psa_config/DC2C_print28.json @@ -4,7 +4,7 @@ "styl":"size 00", "text":" Üf. szolg nyitvatartás:", "feed":"nl", -"text":" Deák Ferenc u. 31. ", +"text":" Zrínyi utca 4-8 ", "feed":"nl", "text":" H - P: 7:45 - 17:00", "feed":"nl", @@ -32,4 +32,3 @@ "feed":"eject" } - diff --git a/etc/psa_config/DC2C_print29.json b/etc/psa_config/DC2C_print29.json deleted file mode 100644 index 3a8f572..0000000 --- a/etc/psa_config/DC2C_print29.json +++ /dev/null @@ -1,24 +0,0 @@ -{ -"title":"DC2C_pri29", -"project":"ATB test", -"issued":"24.05.2023 01.00", -"styl":"font 08", -"styl":"size 11", -"feed":"margin02", -"feed":"rim02", -"text":"All 8 Variables:", -"feed":"nl", -"vari":"Dynamic01", -"vari":"Dynamic02", -"vari":"Dynamic03", -"vari":"Dynamic04", -"vari":"Dynamic05", -"vari":"Dynamic06", -"vari":"Dynamic07", -"vari":"Dynamic08", -"feed":"eject", - - -} - - diff --git a/etc/psa_config/DC2C_print30.json b/etc/psa_config/DC2C_print30.json deleted file mode 100644 index 0fa09d2..0000000 --- a/etc/psa_config/DC2C_print30.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri30", -"version":"27.02.2023 12:20 00001", -"":"" -} \ No newline at end of file diff --git a/etc/psa_config/DC2C_print31.json b/etc/psa_config/DC2C_print31.json deleted file mode 100644 index 68b706d..0000000 --- a/etc/psa_config/DC2C_print31.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -"title":"DC2C_pri31", -"version":"27.02.2023 12:20 00001", -"":"iiii" -} diff --git a/etc/psa_config/DC2C_print32.json b/etc/psa_config/DC2C_print32.json deleted file mode 100644 index 5cf6645..0000000 --- a/etc/psa_config/DC2C_print32.json +++ /dev/null @@ -1,39 +0,0 @@ -{ -"title":"DC2C_pri32", -"project":"DBM Szeged door", -"issued":"18.04.2023 01.01", -"styl":"font 08", -"styl":"size 10", -"feed":"margin02", -"feed":"rim02", -"styl":"size 11", -"text":"AJTÓ NYITÁS", -"feed":"nl", -"styl":"size 00", -"text":"Door closed", -"feed":"nl", -"feed":"nl", -"text":"CuNu: ", -"vari":"cunu", -"text":"MaNu: ", -"vari":"manu", -"text":"Place: ", -"vari":"location", -"text":"Group: ", -"vari":"group", -"text":"Zone: ", -"vari":"zone", -"text":"Name: ", -"vari":"alias", -"text":"Date: ", -"vari":"date us", -"text":"Time: ", -"vari":"time long", -"feed":"nl", -"text":" * * * * * * * * ", -"feed":"nl", -"feed":"nl", -"feed":"eject", -} - - diff --git a/etc/psa_config/DC2C_serial.json b/etc/psa_config/DC2C_serial.json deleted file mode 100644 index d73012b..0000000 --- a/etc/psa_config/DC2C_serial.json +++ /dev/null @@ -1,13 +0,0 @@ -{ -"title":"DC2C_serial", -"setup_master_interface":"", -"project":"DBM Szeged", -"version":"13.02.2023 12:20 00001", -"crcChk":1, -"baudRate":9600, -"data":8, -"parity":"no", -"stop":1, -"":"" -} - diff --git a/etc/psa_config/tariff01.json b/etc/psa_config/tariff01.json deleted file mode 100644 index a4f50e6..0000000 --- a/etc/psa_config/tariff01.json +++ /dev/null @@ -1,2 +0,0 @@ -{"version":"0.1.0","project":"szeged","zone":2,"info":"summer sale","Currency":[{"pcu_id":2,"pcu_sign":"Ft","pcu_major":"HUF","pcu_minor":"","pcu_active":true}],"PaymentMethod":[{"pme_id":1,"pme_label":"progressive"},{"pme_id":2,"pme_label":"degressive"},{"pme_id":3,"pme_label":"linear"},{"pme_id":4,"pme_label":"steps"}],"PaymentOption":[{"pop_id":22,"pop_label":"Zone 2","pop_payment_method_id":3,"pop_day_end_time":"00:00:00","pop_day_night_end_time":"00:00:00","pop_price_night":0,"pop_min_time":15,"pop_max_time":240,"pop_min_price":120,"pop_carry_over":1}],"PaymentRate":[{"pra_payment_option_id":22,"pra_payment_unit_id":3,"pra_price":480}],"Duration":[{"pun_id":1,"pun_label":"1h","pun_duration":60},{"pun_id":2,"pun_label":"1 min","pun_duration":1},{"pun_id":3,"pun_label":"15 min","pun_duration":15},{"pun_id":4,"pun_label":"1d","pun_duration":1440},{"pun_id":6,"pun_label":"2h","pun_duration":120},{"pun_id":7,"pun_label":"3h","pun_duration":180},{"pun_id":11,"pun_label":"4h","pun_duration":240},{"pun_id":17,"pun_label":"30 min","pun_duration":30},{"pun_id":18,"pun_label":"1.5h","pun_duration":90},{"pun_id":20,"pun_label":"10min","pun_duration":10}],"WeekDaysWorktime":[{"pwd_id":540,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":1,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":541,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":2,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":542,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":3,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":543,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":4,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"},{"pwd_id":544,"pwd_period_week_day_id":32,"pwd_period_day_in_week_id":5,"pwd_time_from":"08:00:00","pwd_time_to":"18:00:00"}],"PeriodYear":[{"pye_id":1,"pye_label":"Summer","pye_start_month":6,"pye_start_day":1,"pye_end_month":9,"pye_end_day":30},{"pye_id":2,"pye_label":"Winter","pye_start_month":10,"pye_start_day":1,"pye_end_month":5,"pye_end_day":31},{"pye_id":8,"pye_label":"Whole year","pye_start_month":1,"pye_start_day":1,"pye_end_month":12,"pye_end_day":31}],"SpecialDaysWorktime":[{"pedwt_id":2156,"pedwt_period_exc_day_id":2024,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2158,"pedwt_period_exc_day_id":2025,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2160,"pedwt_period_exc_day_id":2026,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2162,"pedwt_period_exc_day_id":2027,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2164,"pedwt_period_exc_day_id":2028,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2170,"pedwt_period_exc_day_id":2030,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2172,"pedwt_period_exc_day_id":2032,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2174,"pedwt_period_exc_day_id":11,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2175,"pedwt_period_exc_day_id":13,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2178,"pedwt_period_exc_day_id":2022,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2179,"pedwt_period_exc_day_id":14,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2180,"pedwt_period_exc_day_id":2017,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2181,"pedwt_period_exc_day_id":2018,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2182,"pedwt_period_exc_day_id":2019,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2183,"pedwt_period_exc_day_id":2020,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2184,"pedwt_period_exc_day_id":2021,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2185,"pedwt_period_exc_day_id":2023,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2188,"pedwt_period_exc_day_id":2031,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2189,"pedwt_period_exc_day_id":2029,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2194,"pedwt_period_exc_day_id":2034,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2196,"pedwt_period_exc_day_id":2035,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2198,"pedwt_period_exc_day_id":2036,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2200,"pedwt_period_exc_day_id":2037,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2202,"pedwt_period_exc_day_id":2038,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2219,"pedwt_period_exc_day_id":2041,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2220,"pedwt_period_exc_day_id":2042,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2221,"pedwt_period_exc_day_id":2043,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2222,"pedwt_period_exc_day_id":2044,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2223,"pedwt_period_exc_day_id":2045,"pedwt_time_from":"00:00:00","pedwt_time_to":"01:00:00","pedwt_price":0},{"pedwt_id":2224,"pedwt_period_exc_day_id":2046,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0},{"pedwt_id":2226,"pedwt_period_exc_day_id":2016,"pedwt_time_from":"00:00:00","pedwt_time_to":"00:00:00","pedwt_price":0}],"SpecialDays":[{"ped_id":11,"ped_label":"Christmas 1st day","ped_date_start":"2022-12-25","ped_date_end":"2022-12-25","ped_period_special_day_id":2,"ped_year":0},{"ped_id":13,"ped_label":"Christmas 2nd day","ped_date_start":"2022-12-26","ped_date_end":"2022-12-26","ped_period_special_day_id":2,"ped_year":0},{"ped_id":14,"ped_label":"Republic Day (Hungary)","ped_date_start":"2022-10-23","ped_date_end":"2022-10-23","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2016,"ped_label":"Christmas (Sunday)","ped_date_start":"2022-12-24","ped_date_end":"2022-12-24","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2017,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-27","ped_date_end":"2022-12-27","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2018,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-28","ped_date_end":"2022-12-28","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2019,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-29","ped_date_end":"2022-12-29","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2020,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-30","ped_date_end":"2022-12-30","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2021,"ped_label":"Holiday (Hungary)","ped_date_start":"2022-12-31","ped_date_end":"2022-12-31","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2022,"ped_label":"NewYear","ped_date_start":"2023-01-01","ped_date_end":"2023-01-01","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2023,"ped_label":"Holiday (Hungary)","ped_date_start":"2023-01-02","ped_date_end":"2023-01-02","ped_period_special_day_id":1,"ped_year":2024},{"ped_id":2024,"ped_label":"Good Friday","ped_date_start":"2023-04-07","ped_date_end":"2023-04-07","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2025,"ped_label":"Easter Sunday","ped_date_start":"2023-04-09","ped_date_end":"2023-04-09","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2026,"ped_label":"Easter Monday","ped_date_start":"2023-04-10","ped_date_end":"2023-04-10","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2027,"ped_label":"Whit Sunday","ped_date_start":"2023-05-28","ped_date_end":"2023-05-28","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2028,"ped_label":"Whit Monday","ped_date_start":"2023-05-29","ped_date_end":"2023-05-29","ped_period_special_day_id":2,"ped_year":2023},{"ped_id":2029,"ped_label":"Revolution Day (Hungary)","ped_date_start":"2023-03-15","ped_date_end":"2023-03-15","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2030,"ped_label":"Labour Day","ped_date_start":"2023-05-01","ped_date_end":"2023-05-01","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2031,"ped_label":"Saint Stephens Day (Hungary)","ped_date_start":"2023-08-20","ped_date_end":"2023-08-20","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2032,"ped_label":"All Saints Day","ped_date_start":"2023-11-01","ped_date_end":"2023-11-01","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2034,"ped_label":"Good Friday","ped_date_start":"2024-03-29","ped_date_end":"2024-03-29","ped_period_special_day_id":2,"ped_year":2024},{"ped_id":2035,"ped_label":"Easter","ped_date_start":"2024-03-31","ped_date_end":"2024-03-31","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2036,"ped_label":"Easter Monday","ped_date_start":"2024-04-01","ped_date_end":"2024-04-01","ped_period_special_day_id":2,"ped_year":0},{"ped_id":2037,"ped_label":"Whit Monday","ped_date_start":"2024-05-20","ped_date_end":"2024-05-20","ped_period_special_day_id":2,"ped_year":2024},{"ped_id":2038,"ped_label":"Whit Sunday","ped_date_start":"2024-05-19","ped_date_end":"2024-05-19","ped_period_special_day_id":2,"ped_year":2024},{"ped_id":2041,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-27","ped_date_end":"2024-12-27","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2042,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-28","ped_date_end":"2024-12-28","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2043,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-29","ped_date_end":"2024-12-29","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2044,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-30","ped_date_end":"2024-12-30","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2045,"ped_label":"Holiday (Hungary)","ped_date_start":"2024-12-31","ped_date_end":"2024-12-31","ped_period_special_day_id":1,"ped_year":0},{"ped_id":2046,"ped_label":"Holiday (Hungary)","ped_date_start":"2025-01-02","ped_date_end":"2025-01-02","ped_period_special_day_id":1,"ped_year":2025}]} - diff --git a/etc/psa_tariff/tariff01.json b/etc/psa_tariff/tariff01.json index b3155a3..d4098c9 100644 --- a/etc/psa_tariff/tariff01.json +++ b/etc/psa_tariff/tariff01.json @@ -35,17 +35,17 @@ "pop_day_night_end_time": "16:25:00", "pop_price_night": 0, "pop_min_time": 15, - "pop_max_time": 300, - "pop_min_price": 0, + "pop_max_time": 360, + "pop_min_price": 42, "pop_carry_over": 1, - "pop_daily_card_price": 900 + "pop_daily_card_price": 990 } ], "PaymentRate": [ { "pra_payment_option_id": 1049, "pra_payment_unit_id": 1, - "pra_price": 150 + "pra_price": 165 } ], "Duration": [ @@ -104,7 +104,7 @@ ], "PeriodYear": [ { - "pye_id": 8, + "pye_id": 2, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -465,341 +465,120 @@ } ], "SpecialDays": [ - { - "ped_id": 11, - "ped_label": "Christmas 1st day", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 13, - "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, { "ped_id": 14, "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-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": "2022-12-24", - "ped_date_end": "2022-12-24", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2021, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2022, "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-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": "2023-04-07", - "ped_date_end": "2023-04-07", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2025, "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2026, "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2027, "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2028, "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2029, "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-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": "2023-05-01", - "ped_date_end": "2023-05-01", + "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": "2023-08-20", - "ped_date_end": "2023-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": "2023-11-01", - "ped_date_end": "2023-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": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2035, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2036, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2037, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2038, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "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", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", + "ped_date_start": "2024-12-25", + "ped_date_end": "2024-12-25", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2053, "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2054, - "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-10-23", + "ped_date_start": "2024-12-26", + "ped_date_end": "2024-12-26", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", - "ped_date_start": "2022-12-24", - "ped_date_end": "2022-12-24", + "ped_date_start": "2024-12-24", + "ped_date_end": "2024-12-24", "ped_period_special_day_id": 2, "ped_year": 0 - }, - { - "ped_id": 2056, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2057, - "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-01-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2058, - "ped_label": "Good Friday", - "ped_date_start": "2023-04-07", - "ped_date_end": "2023-04-07", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2059, - "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2060, - "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2061, - "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2062, - "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2063, - "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-03-15", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2064, - "ped_label": "Labour Day", - "ped_date_start": "2023-05-01", - "ped_date_end": "2023-05-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2065, - "ped_label": "Saint Stephens Day (Hungary)", - "ped_date_start": "2023-08-20", - "ped_date_end": "2023-08-20", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2066, - "ped_label": "All Saints Day", - "ped_date_start": "2023-11-01", - "ped_date_end": "2023-11-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2067, - "ped_label": "Good Friday", - "ped_date_start": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2068, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2069, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2070, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2071, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_year": 2024 } ] } + + + diff --git a/etc/psa_tariff/tariff02.json b/etc/psa_tariff/tariff02.json index 1608191..e28667d 100644 --- a/etc/psa_tariff/tariff02.json +++ b/etc/psa_tariff/tariff02.json @@ -35,17 +35,17 @@ "pop_day_night_end_time": "16:27:00", "pop_price_night": 0, "pop_min_time": 15, - "pop_max_time": 300, - "pop_min_price": 0, + "pop_max_time": 360, + "pop_min_price": 65, "pop_carry_over": 1, - "pop_daily_card_price": 1320 + "pop_daily_card_price": 1560 } ], "PaymentRate": [ { "pra_payment_option_id": 1050, "pra_payment_unit_id": 1, - "pra_price": 230 + "pra_price": 260 } ], "Duration": [ @@ -104,7 +104,7 @@ ], "PeriodYear": [ { - "pye_id": 8, + "pye_id": 2, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -465,341 +465,121 @@ } ], "SpecialDays": [ - { - "ped_id": 11, - "ped_label": "Christmas 1st day", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 13, - "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, { "ped_id": 14, "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-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": "2022-12-24", - "ped_date_end": "2022-12-24", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2021, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2022, "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-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": "2023-04-07", - "ped_date_end": "2023-04-07", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2025, "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2026, "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2027, "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2028, "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2029, "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-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": "2023-05-01", - "ped_date_end": "2023-05-01", + "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": "2023-08-20", - "ped_date_end": "2023-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": "2023-11-01", - "ped_date_end": "2023-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": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2035, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2036, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2037, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2038, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "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", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", + "ped_date_start": "2024-12-25", + "ped_date_end": "2024-12-25", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2053, "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2054, - "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-10-23", + "ped_date_start": "2024-12-26", + "ped_date_end": "2024-12-26", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", - "ped_date_start": "2022-12-24", - "ped_date_end": "2022-12-24", + "ped_date_start": "2024-12-24", + "ped_date_end": "2024-12-24", "ped_period_special_day_id": 2, "ped_year": 0 - }, - { - "ped_id": 2056, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2057, - "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-01-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2058, - "ped_label": "Good Friday", - "ped_date_start": "2023-04-07", - "ped_date_end": "2023-04-07", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2059, - "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2060, - "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2061, - "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2062, - "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2063, - "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-03-15", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2064, - "ped_label": "Labour Day", - "ped_date_start": "2023-05-01", - "ped_date_end": "2023-05-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2065, - "ped_label": "Saint Stephens Day (Hungary)", - "ped_date_start": "2023-08-20", - "ped_date_end": "2023-08-20", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2066, - "ped_label": "All Saints Day", - "ped_date_start": "2023-11-01", - "ped_date_end": "2023-11-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2067, - "ped_label": "Good Friday", - "ped_date_start": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2068, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2069, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2070, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2071, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_year": 2024 } ] } + + + + diff --git a/etc/psa_tariff/tariff03.json b/etc/psa_tariff/tariff03.json index 2edec6e..74f0e97 100644 --- a/etc/psa_tariff/tariff03.json +++ b/etc/psa_tariff/tariff03.json @@ -35,17 +35,17 @@ "pop_day_night_end_time": "16:29:00", "pop_price_night": 0, "pop_min_time": 15, - "pop_max_time": 300, - "pop_min_price": 0, + "pop_max_time": 360, + "pop_min_price": 90, "pop_carry_over": 1, - "pop_daily_card_price": 1980 + "pop_daily_card_price": 2160 } ], "PaymentRate": [ { "pra_payment_option_id": 1051, "pra_payment_unit_id": 1, - "pra_price": 330 + "pra_price": 360 } ], "Duration": [ @@ -111,7 +111,7 @@ ], "PeriodYear": [ { - "pye_id": 8, + "pye_id": 2, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -472,341 +472,122 @@ } ], "SpecialDays": [ - { - "ped_id": 11, - "ped_label": "Christmas 1st day", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 13, - "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, { "ped_id": 14, "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-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": "2022-12-24", - "ped_date_end": "2022-12-24", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2021, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2022, "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-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": "2023-04-07", - "ped_date_end": "2023-04-07", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2025, "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2026, "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2027, "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2028, "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2029, "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-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": "2023-05-01", - "ped_date_end": "2023-05-01", + "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": "2023-08-20", - "ped_date_end": "2023-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": "2023-11-01", - "ped_date_end": "2023-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": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2035, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2036, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2037, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2038, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "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", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", + "ped_date_start": "2024-12-25", + "ped_date_end": "2024-12-25", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2053, "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2054, - "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-10-23", + "ped_date_start": "2024-12-26", + "ped_date_end": "2024-12-26", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", - "ped_date_start": "2022-12-24", - "ped_date_end": "2022-12-24", + "ped_date_start": "2024-12-24", + "ped_date_end": "2024-12-24", "ped_period_special_day_id": 2, "ped_year": 0 - }, - { - "ped_id": 2056, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2057, - "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-01-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2058, - "ped_label": "Good Friday", - "ped_date_start": "2023-04-07", - "ped_date_end": "2023-04-07", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2059, - "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2060, - "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2061, - "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2062, - "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2063, - "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-03-15", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2064, - "ped_label": "Labour Day", - "ped_date_start": "2023-05-01", - "ped_date_end": "2023-05-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2065, - "ped_label": "Saint Stephens Day (Hungary)", - "ped_date_start": "2023-08-20", - "ped_date_end": "2023-08-20", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2066, - "ped_label": "All Saints Day", - "ped_date_start": "2023-11-01", - "ped_date_end": "2023-11-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2067, - "ped_label": "Good Friday", - "ped_date_start": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2068, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2069, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2070, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2071, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_year": 2024 } ] } + + + + + diff --git a/etc/psa_tariff/tariff04.json b/etc/psa_tariff/tariff04.json index bcdc392..9e7659c 100644 --- a/etc/psa_tariff/tariff04.json +++ b/etc/psa_tariff/tariff04.json @@ -36,9 +36,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 +46,7 @@ { "pra_payment_option_id": 1052, "pra_payment_unit_id": 1, - "pra_price": 600 + "pra_price": 650 } ], "Duration": [ @@ -110,7 +110,7 @@ ], "PeriodYear": [ { - "pye_id": 8, + "pye_id": 2, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -627,503 +627,121 @@ } ], "SpecialDays": [ - { - "ped_id": 11, - "ped_label": "Christmas 1st day", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 13, - "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, { "ped_id": 14, "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-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": "2022-12-24", - "ped_date_end": "2022-12-24", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2021, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2022, "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-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": "2023-04-07", - "ped_date_end": "2023-04-07", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2025, "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2026, "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2027, "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2028, "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2029, "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-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": "2023-05-01", - "ped_date_end": "2023-05-01", + "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": "2023-08-20", - "ped_date_end": "2023-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": "2023-11-01", - "ped_date_end": "2023-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": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2035, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2036, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2037, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2038, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "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", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", + "ped_date_start": "2024-12-25", + "ped_date_end": "2024-12-25", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2053, "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2054, - "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-10-23", + "ped_date_start": "2024-12-26", + "ped_date_end": "2024-12-26", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", - "ped_date_start": "2022-12-24", - "ped_date_end": "2022-12-24", + "ped_date_start": "2024-12-24", + "ped_date_end": "2024-12-24", "ped_period_special_day_id": 2, "ped_year": 0 - }, - { - "ped_id": 2056, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2057, - "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-01-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2058, - "ped_label": "Good Friday", - "ped_date_start": "2023-04-07", - "ped_date_end": "2023-04-07", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2059, - "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2060, - "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2061, - "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2062, - "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2063, - "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-03-15", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2064, - "ped_label": "Labour Day", - "ped_date_start": "2023-05-01", - "ped_date_end": "2023-05-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2065, - "ped_label": "Saint Stephens Day (Hungary)", - "ped_date_start": "2023-08-20", - "ped_date_end": "2023-08-20", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2066, - "ped_label": "All Saints Day", - "ped_date_start": "2023-11-01", - "ped_date_end": "2023-11-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2067, - "ped_label": "Good Friday", - "ped_date_start": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2068, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2069, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2070, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2071, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2072, - "ped_label": "Christmas 1st day", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2073, - "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2074, - "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-10-23", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2075, - "ped_label": "Christmas (Sunday)", - "ped_date_start": "2022-12-24", - "ped_date_end": "2022-12-24", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2076, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2077, - "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-01-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2078, - "ped_label": "Good Friday", - "ped_date_start": "2023-04-07", - "ped_date_end": "2023-04-07", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2079, - "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2080, - "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2081, - "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2082, - "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2083, - "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-03-15", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2084, - "ped_label": "Labour Day", - "ped_date_start": "2023-05-01", - "ped_date_end": "2023-05-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2085, - "ped_label": "Saint Stephens Day (Hungary)", - "ped_date_start": "2023-08-20", - "ped_date_end": "2023-08-20", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2086, - "ped_label": "All Saints Day", - "ped_date_start": "2023-11-01", - "ped_date_end": "2023-11-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2087, - "ped_label": "Good Friday", - "ped_date_start": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2088, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2089, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2090, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2091, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_year": 2024 } ] } + + diff --git a/etc/psa_tariff/tariff05.json b/etc/psa_tariff/tariff05.json index d29637b..529eadf 100644 --- a/etc/psa_tariff/tariff05.json +++ b/etc/psa_tariff/tariff05.json @@ -36,9 +36,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 +46,7 @@ { "pra_payment_option_id": 1081, "pra_payment_unit_id": 1, - "pra_price": 330 + "pra_price": 360 } ], "Duration": [ @@ -117,7 +117,7 @@ ], "PeriodYear": [ { - "pye_id": 8, + "pye_id": 2, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -634,501 +634,121 @@ } ], "SpecialDays": [ - { - "ped_id": 11, - "ped_label": "Christmas 1st day", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 13, - "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { + { "ped_id": 14, "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-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": "2022-12-24", - "ped_date_end": "2022-12-24", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2021, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2022, "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-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": "2023-04-07", - "ped_date_end": "2023-04-07", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2025, "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2026, "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2027, "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2028, "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2029, "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-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": "2023-05-01", - "ped_date_end": "2023-05-01", + "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": "2023-08-20", - "ped_date_end": "2023-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": "2023-11-01", - "ped_date_end": "2023-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": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2035, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2036, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2037, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2038, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "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", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", + "ped_date_start": "2024-12-25", + "ped_date_end": "2024-12-25", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2053, "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2054, - "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-10-23", + "ped_date_start": "2024-12-26", + "ped_date_end": "2024-12-26", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", - "ped_date_start": "2022-12-24", - "ped_date_end": "2022-12-24", + "ped_date_start": "2024-12-24", + "ped_date_end": "2024-12-24", "ped_period_special_day_id": 2, "ped_year": 0 - }, - { - "ped_id": 2056, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2057, - "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-01-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2058, - "ped_label": "Good Friday", - "ped_date_start": "2023-04-07", - "ped_date_end": "2023-04-07", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2059, - "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2060, - "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2061, - "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2062, - "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2063, - "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-03-15", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2064, - "ped_label": "Labour Day", - "ped_date_start": "2023-05-01", - "ped_date_end": "2023-05-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2065, - "ped_label": "Saint Stephens Day (Hungary)", - "ped_date_start": "2023-08-20", - "ped_date_end": "2023-08-20", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2066, - "ped_label": "All Saints Day", - "ped_date_start": "2023-11-01", - "ped_date_end": "2023-11-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2067, - "ped_label": "Good Friday", - "ped_date_start": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2068, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2069, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2070, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2071, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2072, - "ped_label": "Christmas 1st day", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2073, - "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2074, - "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-10-23", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2075, - "ped_label": "Christmas (Sunday)", - "ped_date_start": "2022-12-24", - "ped_date_end": "2022-12-24", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2076, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2077, - "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-01-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2078, - "ped_label": "Good Friday", - "ped_date_start": "2023-04-07", - "ped_date_end": "2023-04-07", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2079, - "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2080, - "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2081, - "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2082, - "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2083, - "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-03-15", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2084, - "ped_label": "Labour Day", - "ped_date_start": "2023-05-01", - "ped_date_end": "2023-05-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2085, - "ped_label": "Saint Stephens Day (Hungary)", - "ped_date_start": "2023-08-20", - "ped_date_end": "2023-08-20", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2086, - "ped_label": "All Saints Day", - "ped_date_start": "2023-11-01", - "ped_date_end": "2023-11-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2087, - "ped_label": "Good Friday", - "ped_date_start": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2088, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2089, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2090, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2091, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_year": 2024 } ] } + + + + diff --git a/etc/psa_tariff/tariff06.json b/etc/psa_tariff/tariff06.json index 7aa4ef9..ea6ebd4 100644 --- a/etc/psa_tariff/tariff06.json +++ b/etc/psa_tariff/tariff06.json @@ -36,9 +36,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 +46,7 @@ { "pra_payment_option_id": 1082, "pra_payment_unit_id": 1, - "pra_price": 600 + "pra_price": 650 } ], "Duration": [ @@ -117,7 +117,7 @@ ], "PeriodYear": [ { - "pye_id": 8, + "pye_id": 2, "pye_label": "Whole year", "pye_start_month": 1, "pye_start_day": 1, @@ -634,501 +634,121 @@ } ], "SpecialDays": [ - { - "ped_id": 11, - "ped_label": "Christmas 1st day", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 13, - "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { + { "ped_id": 14, "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-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": "2022-12-24", - "ped_date_end": "2022-12-24", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2021, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, { "ped_id": 2022, "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-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": "2023-04-07", - "ped_date_end": "2023-04-07", + "ped_date_start": "2024-03-29", + "ped_date_end": "2024-03-29", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2025, "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", + "ped_date_start": "2024-03-31", + "ped_date_end": "2024-03-31", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2026, "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", + "ped_date_start": "2024-04-01", + "ped_date_end": "2024-04-01", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2027, "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", + "ped_date_start": "2024-05-19", + "ped_date_end": "2024-05-19", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2028, "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", + "ped_date_start": "2024-05-20", + "ped_date_end": "2024-05-20", "ped_period_special_day_id": 2, - "ped_year": 2023 + "ped_year": 2024 }, { "ped_id": 2029, "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-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": "2023-05-01", - "ped_date_end": "2023-05-01", + "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": "2023-08-20", - "ped_date_end": "2023-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": "2023-11-01", - "ped_date_end": "2023-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": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2035, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2036, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2037, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2038, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "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", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", + "ped_date_start": "2024-12-25", + "ped_date_end": "2024-12-25", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2053, "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2054, - "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-10-23", + "ped_date_start": "2024-12-26", + "ped_date_end": "2024-12-26", "ped_period_special_day_id": 2, "ped_year": 0 }, { "ped_id": 2055, "ped_label": "Christmas (Sunday)", - "ped_date_start": "2022-12-24", - "ped_date_end": "2022-12-24", + "ped_date_start": "2024-12-24", + "ped_date_end": "2024-12-24", "ped_period_special_day_id": 2, "ped_year": 0 - }, - { - "ped_id": 2056, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2057, - "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-01-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2058, - "ped_label": "Good Friday", - "ped_date_start": "2023-04-07", - "ped_date_end": "2023-04-07", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2059, - "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2060, - "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2061, - "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2062, - "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2063, - "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-03-15", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2064, - "ped_label": "Labour Day", - "ped_date_start": "2023-05-01", - "ped_date_end": "2023-05-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2065, - "ped_label": "Saint Stephens Day (Hungary)", - "ped_date_start": "2023-08-20", - "ped_date_end": "2023-08-20", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2066, - "ped_label": "All Saints Day", - "ped_date_start": "2023-11-01", - "ped_date_end": "2023-11-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2067, - "ped_label": "Good Friday", - "ped_date_start": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2068, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2069, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2070, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2071, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2072, - "ped_label": "Christmas 1st day", - "ped_date_start": "2022-12-25", - "ped_date_end": "2022-12-25", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2073, - "ped_label": "Christmas 2nd day", - "ped_date_start": "2022-12-26", - "ped_date_end": "2022-12-26", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2074, - "ped_label": "Republic Day (Hungary)", - "ped_date_start": "2022-10-23", - "ped_date_end": "2022-10-23", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2075, - "ped_label": "Christmas (Sunday)", - "ped_date_start": "2022-12-24", - "ped_date_end": "2022-12-24", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2076, - "ped_label": "Holiday (Hungary)", - "ped_date_start": "2022-12-31", - "ped_date_end": "2022-12-31", - "ped_period_special_day_id": 1, - "ped_year": 0 - }, - { - "ped_id": 2077, - "ped_label": "NewYear", - "ped_date_start": "2023-01-01", - "ped_date_end": "2023-01-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2078, - "ped_label": "Good Friday", - "ped_date_start": "2023-04-07", - "ped_date_end": "2023-04-07", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2079, - "ped_label": "Easter Sunday", - "ped_date_start": "2023-04-09", - "ped_date_end": "2023-04-09", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2080, - "ped_label": "Easter Monday", - "ped_date_start": "2023-04-10", - "ped_date_end": "2023-04-10", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2081, - "ped_label": "Whit Sunday", - "ped_date_start": "2023-05-28", - "ped_date_end": "2023-05-28", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2082, - "ped_label": "Whit Monday", - "ped_date_start": "2023-05-29", - "ped_date_end": "2023-05-29", - "ped_period_special_day_id": 2, - "ped_year": 2023 - }, - { - "ped_id": 2083, - "ped_label": "Revolution Day (Hungary)", - "ped_date_start": "2023-03-15", - "ped_date_end": "2023-03-15", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2084, - "ped_label": "Labour Day", - "ped_date_start": "2023-05-01", - "ped_date_end": "2023-05-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2085, - "ped_label": "Saint Stephens Day (Hungary)", - "ped_date_start": "2023-08-20", - "ped_date_end": "2023-08-20", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2086, - "ped_label": "All Saints Day", - "ped_date_start": "2023-11-01", - "ped_date_end": "2023-11-01", - "ped_period_special_day_id": 2, - "ped_year": 0 - }, - { - "ped_id": 2087, - "ped_label": "Good Friday", - "ped_date_start": "2024-03-29", - "ped_date_end": "2024-03-29", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2088, - "ped_label": "Easter", - "ped_date_start": "2024-03-31", - "ped_date_end": "2024-03-31", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2089, - "ped_label": "Easter Monday", - "ped_date_start": "2024-04-01", - "ped_date_end": "2024-04-01", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2090, - "ped_label": "Whit Monday", - "ped_date_start": "2024-05-20", - "ped_date_end": "2024-05-20", - "ped_period_special_day_id": 2, - "ped_year": 2024 - }, - { - "ped_id": 2091, - "ped_label": "Whit Sunday", - "ped_date_start": "2024-05-19", - "ped_date_end": "2024-05-19", - "ped_period_special_day_id": 2, - "ped_year": 2024 } ] } + + + + diff --git a/etc/psa_update/opkg_commands b/etc/psa_update/opkg_commands index 766a151..3c81da9 100755 --- a/etc/psa_update/opkg_commands +++ b/etc/psa_update/opkg_commands @@ -3,15 +3,19 @@ ############################################################################### # opkg-commands added to this file will be executed by ATBUpdateTool. ############################################################################### -# opkg prefix will be added inside evaluating script -# -opkg info ptu5-gitinstaller -opkg info atbqt -opkg info atbupdatetool -opkg update -opkg install ptu5-gitinstaller -opkg install atbupdatetool -opkg install atbqt -opkg info ptu5-gitinstaller -opkg info atbqt -opkg info atbupdatetool +# # +# opkg info atbqt +# opkg info atbupdatetool +# opkg update +# opkg install prepare-update +# opkg install libmobilisis-calc2 +# 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