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

tarif 04/06 -> exact price: 163

.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

.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

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,	
+
+
 }
 

etc/psa_update/opkg_commands

@@ -3,18 +3,16 @@
 ###############################################################################
 # opkg-commands added to this file will be executed by ATBUpdateTool.          
 ###############################################################################
-##
+#
 opkg update
-# opkg install prepare-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=4.99.11+git0+66f98a3bef-r0
-opkg --cache /var/cache/opkg --download-only upgrade apism=1.7.0-r1
+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=4.99.11+git0+66f98a3bef-r0
-opkg --cache /var/cache/opkg upgrade apism=1.7.0-r1
+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