Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1

ZoneId in tariff-files
Tariff: add tariff-info aka "TARIFF_ID"
2024-06-24 11:27:45 +02:00 · 2024-06-24 11:25:02 +02:00 · 2024-06-07 08:08:04 +02:00 · 2024-06-07 08:01:36 +02:00 · 2024-05-03 09:35:23 +02:00 · 2024-04-30 14:33:12 +02:00
12 changed files with 215 additions and 524 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -0,0 +1,28 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	symlinks = true
+[remote "origin"]
+	url = https://git.mimbach49.de/GerhardHoffmann/customer_999.git
+	fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+	remote = origin
+	merge = refs/heads/master
+[branch "zg1/zone1"]
+	remote = origin
+	merge = refs/heads/zg1/zone1
+[branch "zg1/zone2"]
+	remote = origin
+	merge = refs/heads/zg1/zone2
+[branch "zg1/zone3"]
+	remote = origin
+	merge = refs/heads/zg1/zone3
+[branch "zg1/zone4"]
+	remote = origin
+	merge = refs/heads/zg1/zone4
+[pull]
+	rebase = false
+[push]
+	autoSetupRemote = true
--- a/.githooks/post-merge
+++ b/.githooks/post-merge
@@ -11,10 +11,8 @@ if [ -z $IFS ]; then
    IFS=$'\n'
 fi

-
 GIT_UPDATE_LOG=/opt/app/tools/atbupdate/update_log.csv

-
 #TODO: use in UpdateController

 get_blob () {   # get the blob of the file(name) passed as $1
@@ -29,7 +27,6 @@ get_commit_for_blob () {
           grep -q $1 && echo -n {} && head -n 1")
 }

-
 write_log_file () {
    local now=$(date +"%Y-%m-%dT%T")
    for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
--- a/README.md
+++ b/README.md
--- a/etc/psa_config/DC2C_cash.json
+++ b/etc/psa_config/DC2C_cash.json
@@ -1,16 +1,18 @@
 {	     
 "title":"DC2C_cash  ",
 "project":"DBM Szeged",
-"version":"1.0.0-2024-07-05",
+"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)":[730,365,185,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":365,
+"ExchangeRate":350
 "TokenChannel":1,
 "BillValues(7..0)":[0,0,0,0,0,0,0,0],
 "LocalTaxRate":20,
 "ForeignTaxRate":19,
 "Surcharge":0,	
-"Discount":0
+"Discount":0,	
+
+
 }

--- a/etc/psa_tariff/.tariff04.json.swp
+++ b/etc/psa_tariff/.tariff04.json.swp
--- a/etc/psa_tariff/tariff01.json
+++ b/etc/psa_tariff/tariff01.json
@@ -471,96 +471,88 @@
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Labour Day 2",
-      "ped_date_start": "2025-05-02",
-      "ped_date_end": "2025-05-02",
+      "ped_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -580,22 +572,6 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2024-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Christmas 4th day",
-      "ped_date_start": "2024-12-28",
-      "ped_date_end": "2024-12-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -603,38 +579,6 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff02.json
+++ b/etc/psa_tariff/tariff02.json
@@ -103,13 +103,6 @@
      "pwd_period_day_in_week_id": 5,
      "pwd_time_from": "08:00:00",
      "pwd_time_to": "18:00:00"
-    },
-    {
-      "pwd_id": 626,
-      "pwd_period_week_day_id": 36,
-      "pwd_period_day_in_week_id": 6,
-      "pwd_time_from": "08:00:00",
-      "pwd_time_to": "18:00:00"
    }
  ],
  "PeriodYear": [
@@ -478,96 +471,88 @@
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Labour Day 2",
-      "ped_date_start": "2025-05-02",
-      "ped_date_end": "2025-05-02",
+      "ped_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -587,22 +572,6 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2024-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Christmas 4th day",
-      "ped_date_start": "2024-12-28",
-      "ped_date_end": "2024-12-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -610,38 +579,6 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff03.json
+++ b/etc/psa_tariff/tariff03.json
@@ -103,6 +103,13 @@
      "pwd_period_day_in_week_id": 5,
      "pwd_time_from": "08:00:00",
      "pwd_time_to": "18:00:00"
+    },
+    {
+      "pwd_id": 637,
+      "pwd_period_week_day_id": 37,
+      "pwd_period_day_in_week_id": 6,
+      "pwd_time_from": "08:00:00",
+      "pwd_time_to": "12:00:00"
    }
  ],
  "PeriodYear": [
@@ -471,96 +478,88 @@
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Labour Day 2",
-      "ped_date_start": "2025-05-02",
-      "ped_date_end": "2025-05-02",
+      "ped_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -580,22 +579,6 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2024-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Christmas 4th day",
-      "ped_date_start": "2024-12-28",
-      "ped_date_end": "2024-12-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -603,38 +586,6 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff04.json
+++ b/etc/psa_tariff/tariff04.json
@@ -633,96 +633,88 @@
    {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Labour Day 2",
-      "ped_date_start": "2025-05-02",
-      "ped_date_end": "2025-05-02",
+      "ped_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -742,22 +734,6 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2024-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Christmas 4th day",
-      "ped_date_start": "2024-12-28",
-      "ped_date_end": "2024-12-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -765,38 +741,6 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff05.json
+++ b/etc/psa_tariff/tariff05.json
@@ -637,99 +637,91 @@
    }
  ],
  "SpecialDays": [
-    {
+   {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Labour Day 2",
-      "ped_date_start": "2025-05-02",
-      "ped_date_end": "2025-05-02",
+      "ped_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -749,22 +741,6 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2024-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Christmas 4th day",
-      "ped_date_start": "2024-12-28",
-      "ped_date_end": "2024-12-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -772,38 +748,6 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_tariff/tariff06.json
+++ b/etc/psa_tariff/tariff06.json
@@ -640,96 +640,88 @@
   {
      "ped_id": 14,
      "ped_label": "Republic Day (Hungary)",
-      "ped_date_start": "2025-10-23",
-      "ped_date_end": "2025-10-23",
+      "ped_date_start": "2024-10-23",
+      "ped_date_end": "2024-10-23",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2022,
      "ped_label": "NewYear",
-      "ped_date_start": "2025-01-01",
-      "ped_date_end": "2025-01-01",
+      "ped_date_start": "2024-01-01",
+      "ped_date_end": "2024-01-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2024,
      "ped_label": "Good Friday",
-      "ped_date_start": "2025-04-18",
-      "ped_date_end": "2025-04-18",
+      "ped_date_start": "2024-03-29",
+      "ped_date_end": "2024-03-29",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2025,
      "ped_label": "Easter Sunday",
-      "ped_date_start": "2025-04-20",
-      "ped_date_end": "2025-04-20",
+      "ped_date_start": "2024-03-31",
+      "ped_date_end": "2024-03-31",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2026,
      "ped_label": "Easter Monday",
-      "ped_date_start": "2025-04-21",
-      "ped_date_end": "2025-04-21",
+      "ped_date_start": "2024-04-01",
+      "ped_date_end": "2024-04-01",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2027,
      "ped_label": "Whit Sunday",
-      "ped_date_start": "2025-06-08",
-      "ped_date_end": "2025-06-08",
+      "ped_date_start": "2024-05-19",
+      "ped_date_end": "2024-05-19",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2028,
      "ped_label": "Whit Monday",
-      "ped_date_start": "2025-06-09",
-      "ped_date_end": "2025-06-09",
+      "ped_date_start": "2024-05-20",
+      "ped_date_end": "2024-05-20",
      "ped_period_special_day_id": 2,
-      "ped_year": 2025
+      "ped_year": 2024
    },
    {
      "ped_id": 2029,
      "ped_label": "Revolution Day (Hungary)",
-      "ped_date_start": "2025-03-15",
-      "ped_date_end": "2025-03-15",
+      "ped_date_start": "2024-03-15",
+      "ped_date_end": "2024-03-15",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2030,
      "ped_label": "Labour Day",
-      "ped_date_start": "2025-05-01",
-      "ped_date_end": "2025-05-01",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2060,
-      "ped_label": "Labour Day 2",
-      "ped_date_start": "2025-05-02",
-      "ped_date_end": "2025-05-02",
+      "ped_date_start": "2024-05-01",
+      "ped_date_end": "2024-05-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2031,
      "ped_label": "Saint Stephens Day (Hungary)",
-      "ped_date_start": "2025-08-20",
-      "ped_date_end": "2025-08-20",
+      "ped_date_start": "2024-08-20",
+      "ped_date_end": "2024-08-20",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
    {
      "ped_id": 2032,
      "ped_label": "All Saints Day",
-      "ped_date_start": "2025-11-01",
-      "ped_date_end": "2025-11-01",
+      "ped_date_start": "2024-11-01",
+      "ped_date_end": "2024-11-01",
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
@@ -749,22 +741,6 @@
      "ped_period_special_day_id": 2,
      "ped_year": 0
    },
-    {
-      "ped_id": 2056,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2024-12-27",
-      "ped_date_end": "2024-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2061,
-      "ped_label": "Christmas 4th day",
-      "ped_date_start": "2024-12-28",
-      "ped_date_end": "2024-12-28",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
    {
      "ped_id": 2055,
      "ped_label": "Christmas (Sunday)",
@@ -772,38 +748,6 @@
      "ped_date_end": "2024-12-24",
      "ped_period_special_day_id": 2,
      "ped_year": 0
-    },
-    {
-      "ped_id": 2057,
-      "ped_label": "Christmas 1st day",
-      "ped_date_start": "2025-12-25",
-      "ped_date_end": "2025-12-25",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2058,
-      "ped_label": "Christmas 2nd day",
-      "ped_date_start": "2025-12-26",
-      "ped_date_end": "2025-12-26",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2059,
-      "ped_label": "Christmas 3rd day",
-      "ped_date_start": "2025-12-27",
-      "ped_date_end": "2025-12-27",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
-    },
-    {
-      "ped_id": 2055,
-      "ped_label": "Christmas",
-      "ped_date_start": "2025-12-24",
-      "ped_date_end": "2025-12-24",
-      "ped_period_special_day_id": 2,
-      "ped_year": 0
    }
  ]
 }
--- a/etc/psa_update/opkg_commands
+++ b/etc/psa_update/opkg_commands
@@ -3,16 +3,16 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-##
-# opkg update
-# opkg install prepare-update
+#
+opkg update
+opkg install prepare-update
 # download packages
-# opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
-# opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
-# opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
-# opkg --cache /var/cache/opkg --download-only upgrade atbqt
+opkg --cache /var/cache/opkg --download-only upgrade tariff-config-281
+opkg --cache /var/cache/opkg --download-only upgrade libmobilisis-calc2
+opkg --cache /var/cache/opkg --download-only upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg --download-only upgrade atbqt
 # install packages
-# opkg --cache /var/cache/opkg upgrade tariff-config-281
-# opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
-# opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
-# opkg --cache /var/cache/opkg upgrade atbqt
+opkg --cache /var/cache/opkg upgrade tariff-config-281
+opkg --cache /var/cache/opkg upgrade libmobilisis-calc2
+opkg --cache /var/cache/opkg upgrade atb-plugin-calculateprice-mobilisis
+opkg --cache /var/cache/opkg upgrade atbqt
Author	SHA1	Message	Date
Gerhard Hoffmann	bb73d8a5e5	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1	2024-06-24 11:27:45 +02:00
Gerhard Hoffmann	f00d70e996	ZoneId in tariff-files	2024-06-24 11:25:02 +02:00
Siegfried Siegert	24899b5488	Tariff: add tariff-info aka "TARIFF_ID"	2024-06-07 08:08:04 +02:00
Siegfried Siegert	488a630ea2	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2024-06-07 08:01:36 +02:00
Gnemeth	48cf2fc85d	test	2024-05-03 09:35:23 +02:00
Gerhard Hoffmann	9642cc5809	Remove all files except DC2C_cash/print22/print25/print28.json	2024-04-30 14:33:12 +02:00
Gerhard Hoffmann	be74101f29	Repeat update procedure in Szeged for 145-148,171,172,159-161	2024-04-30 08:50:37 +02:00
Gerhard Hoffmann	60624ae29c	Set exchange rate to 350. Add all other json-files from at-dat as provided by Thomas	2024-04-26 12:09:43 +02:00
Gerhard Hoffmann	98f9825259	Use empty file.	2024-04-18 16:09:10 +02:00
Siegfried Siegert	ad2915e1ae	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2024-04-18 14:10:01 +02:00
Gerhard Hoffmann	311fab1c5b	readd empty lines (just to be sure that files have been changed)	2024-03-28 12:09:10 +01:00
Gerhard Hoffmann	a43c11462e	added empty lines to restart download	2024-03-28 11:56:57 +01:00
Gerhard Hoffmann	8d6d458333	even remove opkg update	2024-03-26 10:05:57 +01:00
Gerhard Hoffmann	f2dbf1b426	only install prepare-update script	2024-03-26 09:51:18 +01:00
Gerhard Hoffmann	6b14fca1e1	Removed all holidays except thos for 2024	2024-03-26 09:39:27 +01:00
Gerhard Hoffmann	addb83bfd4	tariff01 -> exact prize: 42 tarif 04/06 -> exact price: 163	2024-02-19 17:28:54 +01:00
Gerhard Hoffmann	ba05e39541	tariff01.json: set min-price: 165 / 4 -> 45 tariff02.json: set min-price: 260 / 4 -> 65 tariff03.json: set min-price: 360 / 4 -> 90 tariff04.json: set min-price: 650 / 4 -> 165 tariff05.json: set min-price: 360 / 4 -> 90 tariff06.json: set min-price: 650 / 4 -> 165	2024-02-15 14:25:50 +01:00
Gerhard Hoffmann	e338f6984a	add libmobilisis-calc2 and activate upgrade step	2024-01-09 11:43:25 +01:00
Gerhard Hoffmann	68ab6c5ace	Set max. parking time: 360; tartiff04/06: daily ticket price (unused): 2600	2024-01-08 15:42:02 +01:00
Gerhard Hoffmann	605c12c220	Set zone 'green mars' as 'green', 'yellow mars' as 'yello'	2024-01-08 10:57:36 +01:00
Gerhard Hoffmann	8367af923a	Update exchange rate to 352.	2023-12-31 08:16:20 +01:00
Gerhard Hoffmann	7c313acda3	turn on new tariffs for szeged, valid from 01.01.2014, containing updated exceptional days.	2023-12-31 08:07:42 +01:00
Gerhard Hoffmann	93db60bc2f	switch back to previous prices until 01.01.2024	2023-12-23 08:33:04 +01:00
Gerhard Hoffmann	a717fccd62	set new prices: purple: 165, 990; blue: 260, 1560; yellow: 360, 2160; green: 650	2023-12-21 15:21:36 +01:00
Gerhard Hoffmann	b5151930f8	Add trailing lines for testing (800 lines by now)	2023-12-21 14:13:06 +01:00
Gerhard Hoffmann	98195ab2e2	remove until 01.01.2024	2023-12-21 14:11:44 +01:00
Gerhard Hoffmann	acaa419b81	set exchange rate to 352	2023-12-21 14:06:58 +01:00
Gerhard Hoffmann	7b21017b2d	remove trailing empty lines for testing	2023-12-21 13:24:32 +01:00
Gerhard Hoffmann	07e8de5d3b	add two empty trailing lines fro testing	2023-12-20 16:11:40 +01:00
Gerhard Hoffmann	3370171547	add two empty trailing lines fro testing	2023-12-20 14:33:46 +01:00
Gerhard Hoffmann	f690bccb3e	remove tariling empty line for testing	2023-12-20 14:01:13 +01:00
Gerhard Hoffmann	faf4f043d2	Remove dc-files (to be used later)	2023-12-20 13:55:27 +01:00
Gerhard Hoffmann	e68c3379a5	Change for szeged: do not install atbupdatetool and do not upgrade the machine	2023-12-20 12:50:00 +01:00
Gerhard Hoffmann	cdbb82df3a	Reset to previous prices keeping current holidays	2023-12-20 12:48:29 +01:00
Gerhard Hoffmann	a8d87e1c76	add empty line for testing	2023-12-19 17:15:10 +01:00
Gerhard Hoffmann	1348234792	Updated to use new prices.	2023-12-19 16:48:45 +01:00
Gerhard Hoffmann	e6a39ae7d0	Replace year period id from 8 to 2 as the special days refer to it	2023-12-19 14:56:33 +01:00
Gerhard Hoffmann	e52cd564c5	delete all json files	2023-12-19 13:53:36 +01:00
Gerhard Hoffmann	ed3032ab8b	Remove some comment lines.	2023-12-19 11:53:51 +01:00
Gerhard Hoffmann	145955ad28	switch back to previous prices, but keeping current holidays	2023-12-19 11:17:01 +01:00
Gerhard Hoffmann	3c89ccd387	tariff01: new price: 165 new daily price: 990 tariff02: new price: 260 new daily price: 1560 tariff03: new price: 360 new daily price: 2160 tariff04: new price: 650 Set new holidays starting from Dec. 2023.	2023-12-18 14:41:38 +01:00
Gerhard Hoffmann	eda0b41c56	Set new price: 260 (prev: 230). Set new daily price: 1560 (prev: 1320). Set new holidays from Dec. 2023 on.	2023-12-18 14:37:06 +01:00
Gerhard Hoffmann	d013bc6d80	Set new price: 165 (prev: 150) Set new holidays starting from Dec. 2023.	2023-12-18 14:36:28 +01:00
Gerhard Hoffmann	589fc3dbd5	reset exchange rate set to 360 after testing	2023-11-07 10:58:58 +01:00
Gerhard Hoffmann	7bfcb482f2	re-test json-download with exchange rate set to 300	2023-11-07 10:50:43 +01:00
Gerhard Hoffmann	5333cc0915	set version for testing	2023-11-06 15:57:07 +01:00
Gerhard Hoffmann	feedf2dc7a	set version for testing	2023-11-06 15:50:14 +01:00
Gerhard Hoffmann	f4556a8428	reset exchange rate to 360	2023-11-06 15:44:31 +01:00
Gerhard Hoffmann	614152e11c	set version for testing	2023-11-06 15:31:18 +01:00
Gerhard Hoffmann	91821ef594	set version for testing	2023-11-06 14:57:31 +01:00
Gerhard Hoffmann	5a264d1104	set version for testing	2023-11-06 14:50:26 +01:00
Gerhard Hoffmann	a761aa4168	set exchange rate to 300 for testing	2023-11-06 14:41:42 +01:00
Gerhard Hoffmann	90ff3f43c3	set exchange rate to 360 again	2023-11-02 10:48:06 +01:00
Gerhard Hoffmann	74c34bcc10	Setting exchange rate to 300 for testing	2023-10-31 16:11:58 +01:00
Gerhard Hoffmann	c9fb420f5d	activate upgrade commands for testing timeouts	2023-10-30 09:17:59 +01:00
Gerhard Hoffmann	69312ec586	add test (line) to trigger update	2023-10-17 16:15:46 +02:00
Gerhard Hoffmann	b915786387	update test especially for szeged	2023-10-16 09:50:05 +02:00
Gerhard Hoffmann	2b10c350bf	Install atbupdatetool without removing/installing apism. Do not upgrade in order to skip a possible timeout.	2023-10-13 12:44:58 +02:00
Gerhard Hoffmann	37779307a4	Install atbupdatetool after prepare-update packet.	2023-10-12 14:59:00 +02:00
Gerhard Hoffmann	b32f57dfa3	Fixed wrong comma after exchange rate	2023-10-11 14:12:18 +02:00
Gerhard Hoffmann	dfc3691510	use exchange-rates of 720,360 and 180	2023-10-10 15:49:25 +02:00
Gerhard Hoffmann	6883d994cb	use exchange-rate of 360, instead of just 360 without comma	2023-10-10 15:39:51 +02:00
Gerhard Hoffmann	696392f23d	set exchange rate to 360	2023-10-10 14:45:29 +02:00
Siegfried Siegert	02beaca057	Update opkg-commands for new update-test	2023-10-09 08:48:21 +02:00
Siegfried Siegert	a7fe7f1ba1	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-10-09 07:41:38 +02:00
Gerhard Hoffmann	97a5eb9b78	test: set version to 0.0.8	2023-10-06 12:37:39 +02:00
Gerhard Hoffmann	bf98e5c35f	test: set version to 0.0.7	2023-10-06 12:23:39 +02:00
Gerhard Hoffmann	3a3a7a8084	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1	2023-10-06 12:02:06 +02:00
Gerhard Hoffmann	0c4ac9f579	test: set version to 0.0.6	2023-10-06 11:59:45 +02:00
Siegfried Siegert	c1a3eec298	OPKG: remove / reinstall atb-accountingtool	2023-10-06 11:26:50 +02:00
Siegfried Siegert	5c040eddf0	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-10-06 11:24:14 +02:00
Siegfried Siegert	ce1583bfd4	OPKG: install package prepare-update	2023-10-05 17:26:52 +02:00
Siegfried Siegert	e8bac3140a	Update Test	2023-10-05 10:14:47 +02:00
Siegfried Siegert	58dd8e1b07	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-10-05 08:14:46 +02:00
Siegfried Siegert	8f30da3011	Updatetest 2	2023-09-27 14:15:46 +02:00
Siegfried Siegert	9c06b2e26b	Update test	2023-09-27 13:52:07 +02:00
Siegfried Siegert	8eb6eb2db8	Upate test: opkg with cachedir	2023-09-27 09:50:36 +02:00
Siegfried Siegert	99a2d0c8ae	Update test for image 20230925	2023-09-26 16:32:57 +02:00
Siegfried Siegert	d08e7d61dd	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-09-26 16:31:19 +02:00
Siegfried Siegert	d1067dbe1a	Fix: opkg-commands for update test	2023-09-18 17:20:15 +02:00
Siegfried Siegert	e988ea0c20	Update test 20230811113644-00281	2023-09-18 17:13:45 +02:00
Siegfried Siegert	4425d4aaa3	Update zg1/zone1 to image 20230811113644-00281	2023-09-18 08:48:34 +02:00
Siegfried Siegert	d284719d6d	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-09-18 08:46:48 +02:00
Gerhard Hoffmann	b04fc14d09	Install ptu5-gitinstaller, atbupdatetool and qtbqt.	2023-08-11 12:45:51 +02:00
Gerhard Hoffmann	ddf6902c73	Remove ini-file used for testing	2023-08-11 12:45:21 +02:00
Gerhard Hoffmann	7db30d94f2	append date line	2023-08-09 16:30:24 +02:00
Gerhard Hoffmann	3c4760abbf	240 -> 248	2023-08-09 16:29:48 +02:00
Gerhard Hoffmann	c47a02a06e	install apism via opkg	2023-08-09 16:28:27 +02:00
Gerhard Hoffmann	c7c234b502	set 240 -> 248 and appended date string	2023-08-08 16:43:07 +02:00
Gerhard Hoffmann	96953b2a62	last checking was an error -> return to previous state	2023-08-04 09:02:00 +02:00
Gerhard Hoffmann	6b925ef6c8	append line at the end	2023-08-04 08:59:00 +02:00
Gerhard Hoffmann	43530a1bf3	set daily cardprice to 2400	2023-08-03 15:43:46 +02:00
Gerhard Hoffmann	ff10f57715	add json files for zones 5 and 6	2023-08-03 15:22:14 +02:00
Gerhard Hoffmann	0d5bc29d19	remove empty test tariffs	2023-08-03 15:04:03 +02:00
Gerhard Hoffmann	c87e12b788	add emtpy tariff-files	2023-08-03 14:52:26 +02:00
Gerhard Hoffmann	44e48dc141	Renamed to ChangeLog	2023-08-03 12:55:27 +02:00
Gerhard Hoffmann	dadcdc9c26	append date line for testing	2023-08-03 10:52:51 +02:00
Gerhard Hoffmann	a121bed893	append date line for testing	2023-08-03 10:49:27 +02:00
Gerhard Hoffmann	ac92369da5	use 4 langues for testing	2023-08-03 09:58:26 +02:00
Gerhard Hoffmann	61908d34f3	Added test last line	2023-08-03 08:57:42 +02:00
Gerhard Hoffmann	bc04b90c0c	Added test last line	2023-08-03 08:54:48 +02:00
Gerhard Hoffmann	a4883dcca4	set use Language=248 for testing	2023-08-03 08:30:32 +02:00
Gerhard Hoffmann	fd5da4c466	set use Language=240 for testing	2023-08-03 08:22:54 +02:00
Gerhard Hoffmann	b1f010f4a7	supply production version	2023-08-03 08:10:56 +02:00
Gerhard Hoffmann	294c25a785	set use Language=248 for testing	2023-08-03 08:04:09 +02:00
Gerhard Hoffmann	e168ccbf61	append date line	2023-08-02 17:35:45 +02:00
Gerhard Hoffmann	62aa6415d8	XXXX	2023-08-02 17:20:18 +02:00
Gerhard Hoffmann	fd1196cad6	use same tariff-file as branch for zone4	2023-07-26 14:48:07 +02:00
Gerhard Hoffmann	32a615313c	Set max_time to 240	2023-07-25 10:14:55 +02:00
Gerhard Hoffmann	781cc71b37	re-test update	2023-07-21 08:55:46 +02:00
Gerhard Hoffmann	0f2ecf85e1	Set 'use language=240' instead of 248	2023-07-20 16:59:15 +02:00
Gerhard Hoffmann	234d1dec25	test via service-menu	2023-07-20 10:21:28 +02:00
Gerhard Hoffmann	de5cddbfb1	test 1 fuer YOCTO-ATBUpdateTool	2023-07-20 10:04:40 +02:00
Gerhard Hoffmann	099de28509	Added 'opkg info atbupdatetool'	2023-07-20 08:35:40 +02:00
Gerhard Hoffmann	cd262e5ddb	remove absolete file	2023-07-19 17:30:54 +02:00
Gerhard Hoffmann	2b08f11131	remove test file to be on the save side	2023-07-19 17:30:15 +02:00
Gerhard Hoffmann	00a73df4cf	ATBUpdateTest	2023-07-19 17:16:18 +02:00
Gerhard Hoffmann	139244f5b1	test 14	2023-07-18 16:56:21 +02:00
Gerhard Hoffmann	5c38ced7dd	test 13	2023-07-18 16:44:15 +02:00
Gerhard Hoffmann	b7c6d156ce	test 12	2023-07-18 16:40:33 +02:00
Gerhard Hoffmann	d81f29b8c4	test 11	2023-07-18 16:34:20 +02:00
Gerhard Hoffmann	5fa099933a	test 10	2023-07-18 16:28:10 +02:00
Gerhard Hoffmann	23df87ad28	test 9	2023-07-18 16:24:57 +02:00
Gerhard Hoffmann	8314e27e66	test 8	2023-07-18 16:17:20 +02:00
Gerhard Hoffmann	1a3ea80760	test 7	2023-07-18 15:54:28 +02:00
Gerhard Hoffmann	ced6ab3185	test 6	2023-07-18 15:50:58 +02:00
Gerhard Hoffmann	a5709d2465	test 5	2023-07-18 15:45:57 +02:00
Gerhard Hoffmann	e1536716e5	test 4	2023-07-18 15:40:09 +02:00
Gerhard Hoffmann	0782c029b2	test 3	2023-07-18 15:37:05 +02:00
Gerhard Hoffmann	17b5e9d806	set version to 0.0.5	2023-07-18 15:20:23 +02:00
Gerhard Hoffmann	b6eebb5107	set version to 0.0.4	2023-07-18 14:58:09 +02:00
Gerhard Hoffmann	d66f1b640e	set version to 0.0.3	2023-07-18 14:53:51 +02:00
Gerhard Hoffmann	fdf2ae8a69	set version to 0.0.2	2023-07-18 14:43:27 +02:00
Gerhard Hoffmann	0185eeddbe	set version to 0.0.1	2023-07-18 14:42:57 +02:00
Gerhard Hoffmann	b8b843eb7c	set version to 0.0.1	2023-07-18 14:40:41 +02:00
Gerhard Hoffmann	d466c0c2dc	test 2	2023-07-18 14:36:28 +02:00
Gerhard Hoffmann	a4e4cb63d5	test 1	2023-07-18 14:15:31 +02:00
Gerhard Hoffmann	fd4117b3be	config settings for git. Copied by ATBUpdateTool into .git/config	2023-07-17 12:22:26 +02:00
Gerhard Hoffmann	952ef0ed11	test 1 for upload-tool	2023-07-17 12:11:54 +02:00
Gerhard Hoffmann	2ce7cf2caa	Do not download anything. Only execute opkg-commands	2023-07-06 15:43:33 +02:00
Gerhard Hoffmann	793e8efebb	remove renamed file	2023-07-06 15:08:34 +02:00
Gerhard Hoffmann	09e7c378c9	Update json-printer-files (provided by Dennis).	2023-07-06 15:07:39 +02:00
Gerhard Hoffmann	a66d4232c5	set link to point to dc2c.04.36.bin	2023-07-04 14:25:45 +02:00
Gerhard Hoffmann	62134fdf8b	renamed to reflect naming inside the bin-file	2023-07-04 14:24:59 +02:00
Gerhard Hoffmann	ee7e2ca8bf	reset link to dc	2023-07-04 14:23:58 +02:00
Gerhard Hoffmann	e66ca83b34	remove handling og checkout_history file	2023-07-04 13:54:23 +02:00
Gerhard Hoffmann	1698e0bebb	reset link dc2c.bin to point to 4.36	2023-07-04 12:29:40 +02:00
Gerhard Hoffmann	6e9afe0d06	Add device controller version 4.36	2023-07-04 12:28:06 +02:00
Gerhard Hoffmann	dd0818943b	Add commands for opkg	2023-07-04 12:06:59 +02:00
Gerhard Hoffmann	b87072bb0a	removed debug-output	2023-07-04 12:05:40 +02:00
Gerhard Hoffmann	5c63c5d985	Add some debug output. Use repository path for opkg_commnds-file	2023-07-04 12:00:44 +02:00
Gerhard Hoffmann	46a8a8f0e3	Add some debug output. Use repository path for opkg_commnds-file	2023-07-04 11:06:29 +02:00
Gerhard Hoffmann	df1634e17c	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1	2023-07-04 11:02:05 +02:00
Gerhard Hoffmann	bb0f8a18bf	Add some debug output. Use repository path for opkg_commnds-file	2023-07-04 11:01:54 +02:00
Siegfried Siegert	033f8ac838	prevent any opkg command	2023-07-02 16:29:09 +02:00
Siegfried Siegert	af66a5e11e	Prevent atbqt update	2023-06-30 15:14:29 +02:00
Siegfried Siegert	8a3507eab1	Update Test in Szeged	2023-06-30 14:28:16 +02:00
Siegfried Siegert	5433e72198	Update Test in Szeged	2023-06-30 13:37:53 +02:00
Siegfried Siegert	31a7ceebe9	Update Test in Szeged	2023-06-30 13:21:22 +02:00
Siegfried Siegert	ed2bd852c2	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-30 13:19:32 +02:00
Gerhard Hoffmann	ac2f0fcdfa	return to normal workflow after testing	2023-06-30 10:50:50 +02:00
Gerhard Hoffmann	14d3cfd0c5	removed <opkg info vim>	2023-06-30 10:31:01 +02:00
Gerhard Hoffmann	6bb71dd857	post-merge-test-2: added <opkg info vim>	2023-06-30 10:18:36 +02:00
Gerhard Hoffmann	185e4d9e10	post-merge-test-1	2023-06-30 09:52:07 +02:00
Siegfried Siegert	7ae5791dd0	test-post-merge-step (11)	2023-06-29 15:59:12 +02:00
Siegfried Siegert	22cc6dc479	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-29 15:52:18 +02:00
Gerhard Hoffmann	a2b7d86ba2	test-post-merge-step (10)	2023-06-29 14:28:42 +02:00
Gerhard Hoffmann	be803b3298	test-post-merge-step (9)	2023-06-29 14:23:11 +02:00
Gerhard Hoffmann	280ad0b23a	test-post-merge-step (8)	2023-06-29 14:19:38 +02:00
Gerhard Hoffmann	dfff2abe01	test post-merge-step of update-process (7)	2023-06-29 12:11:23 +02:00
Gerhard Hoffmann	76796c4d26	test post-merge-step of update-process (6)	2023-06-29 11:55:17 +02:00
Gerhard Hoffmann	8f291b6877	test post-merge-step of update-process (5)	2023-06-29 11:29:09 +02:00
Gerhard Hoffmann	ec2d604705	test post-merge-step of update-process (4)	2023-06-29 11:17:04 +02:00
Gerhard Hoffmann	fac68e2a2c	test post-merge-step of update-process (3)	2023-06-29 11:14:19 +02:00
Gerhard Hoffmann	22f157c699	test post-merge-step of update-process (2)	2023-06-29 10:52:37 +02:00
Gerhard Hoffmann	fd99d95dd2	test post-merge-step of update-process: added opkg info atbqtw	2023-06-29 10:49:39 +02:00
Gerhard Hoffmann	626e9e239c	test post-merge-step of update-process	2023-06-29 10:40:06 +02:00
Gerhard Hoffmann	515f541ffd	28.06.2023 - test post-merge-step	2023-06-28 15:11:24 +02:00
Siegfried Siegert	0a9a515fd6	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-27 17:21:19 +02:00
Gerhard Hoffmann	b349e9ac59	dc2c.bin -> dc2c.4.35.bin	2023-06-27 16:19:27 +02:00
Gerhard Hoffmann	a8aefba58c	delete link before reset	2023-06-27 16:18:51 +02:00
Gerhard Hoffmann	ae05d76db0	Adding device-controller firmware version 4.35	2023-06-27 16:17:38 +02:00
Gerhard Hoffmann	ef3c2ae212	Set daily_card_price to 2400 for zone4	2023-06-27 14:19:03 +02:00
Siegfried Siegert	5c312820bb	opkg install ptu5-gitinstaller	2023-06-27 12:13:26 +02:00
Siegfried Siegert	d98794f6bf	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-27 11:59:54 +02:00
Siegfried Siegert	19b84dc37d	Force update opkg	2023-06-22 19:13:00 +02:00
Siegfried Siegert	0ddc9a3c5d	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-22 19:11:19 +02:00
Gerhard Hoffmann	fd6798cbc0	Add all DC2C_print*.json files for Szeged. Add DC2C_conf/cash/device.json.	2023-06-22 12:11:26 +02:00
Gerhard Hoffmann	c9748ad177	made non-executable	2023-06-22 12:10:19 +02:00
Gerhard Hoffmann	34838567ae	delete unused files	2023-06-22 12:09:31 +02:00
Gerhard Hoffmann	c934e6b341	deleted obsolete file	2023-06-22 12:07:29 +02:00
Gerhard Hoffmann	01c063e3e4	deleted file as in the wrong location	2023-06-22 12:06:59 +02:00
Gerhard Hoffmann	046d16651a	Update json configuration files.	2023-06-22 12:01:35 +02:00
Gerhard Hoffmann	5c170821fc	Add new DC2C config file for device configuration	2023-06-22 11:59:00 +02:00
Gerhard Hoffmann	bac8368079	create link dc2c.bin -> dc2c.4.33.bin	2023-06-21 08:55:41 +02:00
Gerhard Hoffmann	6ee9d22e6e	delete link, reset as next step	2023-06-21 08:54:53 +02:00
Gerhard Hoffmann	8fbae9e16d	Add device controller firmware dc2c.4.33.bin	2023-06-21 08:52:08 +02:00
Gerhard Hoffmann	7a790e442f	Write $line to checkout_history-file only once	2023-06-20 16:06:33 +02:00
Gerhard Hoffmann	68d5205530	re-test post-merge-hook	2023-06-20 15:26:38 +02:00
Gerhard Hoffmann	d1cffff1ba	test for post-merge-hook	2023-06-20 12:36:01 +02:00
Gerhard Hoffmann	7c77f1fe11	Merge branch 'zg1/zone1' of https://git.mimbach49.de/GerhardHoffmann/customer_281 into zg1/zone1	2023-06-19 17:10:36 +02:00
Gerhard Hoffmann	2b10e4df93	add new opkg commands: install atbqt, atb-plugin-cc-iself, atb-plugin-dc, libdevicecontroller	2023-06-19 17:10:28 +02:00
Siegfried Siegert	9528fa5ffc	Merge branch 'zg1/zone1' of git.mimbach49.de:GerhardHoffmann/customer_281 into zg1/zone1	2023-06-19 10:38:53 +02:00
Gerhard Hoffmann	1780e75ac9	testing 16:03	2023-06-05 16:03:41 +02:00
Gerhard Hoffmann	d71556abba	testing 16:00	2023-06-05 16:00:49 +02:00
Gerhard Hoffmann	e6342a1e8f	check for existence of opkg_commands-file (2)	2023-06-05 15:58:01 +02:00
Gerhard Hoffmann	72e9e645a1	check for existence of opkg_commands-file	2023-06-05 15:51:30 +02:00
Gerhard Hoffmann	530327e20d	testing 15:39	2023-06-05 15:39:28 +02:00
Gerhard Hoffmann	0a3bfde486	testing 15:26	2023-06-05 15:26:16 +02:00
Gerhard Hoffmann	94bde10396	testing 15:22	2023-06-05 15:23:07 +02:00
Gerhard Hoffmann	b66848bb75	use the link dc2c.bin and do not add timestamp into file	2023-06-05 15:20:18 +02:00
Gerhard Hoffmann	42317e7660	testing 15:11	2023-06-05 15:11:49 +02:00
Gerhard Hoffmann	605461897e	testing new update_psa	2023-06-05 13:59:25 +02:00