From b81e12c8730d9dc23b8bc80713328759b2cc772b Mon Sep 17 00:00:00 2001 From: ragu Date: Wed, 10 Aug 2022 07:30:50 +0200 Subject: [PATCH] Account icons and akku message --- copri4/main/src/Mod/APIfunc.pm | 10 ++++---- copri4/main/src/Mod/APIjsonserver.pm | 2 ++ copri4/main/src/Mod/APIsigclient.pm | 2 ++ .../src/Tpl/AccountSubmenu.pm | 25 +++++++++++-------- 4 files changed, 23 insertions(+), 16 deletions(-) diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index 6ea2832..6b59c16 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -68,7 +68,6 @@ sub fetch_merchant { my $aowner = 0; while ((my $merchant_conf, my $value) = each %{ $dbt->{merchant_ids}}) { - #$bw->log("---> trying merchant select by session-cookie OR authcookie OR merchant_id: if($merchant_conf && (($req_coo && $req_coo =~ /$merchant_conf/) || ($req_merchant_id && $req_merchant_id eq $merchant_conf))){",$merchant_conf,""); if($merchant_conf && (($req_coo && $req_coo =~ /$merchant_conf$/) || ($req_merchant_id && $req_merchant_id eq $merchant_conf))){ $merchanized = 1; @@ -87,7 +86,7 @@ sub fetch_merchant { $return->{init_map}->{center}->{longitude} = $lng; $return->{init_map}->{radius} = "2.9"; } - $bw->log("===> merchant select by $return->{project_id} session-cookie OR authcookie OR merchant_id: if($merchant_conf && (($req_coo && $req_coo =~ /$merchant_conf/) || ($req_merchant_id && $req_merchant_id eq $merchant_conf))){",$return->{merchant_id},""); + #$bw->log("===> merchant select by $return->{project_id} session-cookie OR authcookie OR merchant_id: if($merchant_conf && (($req_coo && $req_coo =~ /$merchant_conf/) || ($req_merchant_id && $req_merchant_id eq $merchant_conf))){",$return->{merchant_id},""); #last; } } @@ -98,7 +97,7 @@ sub fetch_merchant { $return->{merchant_id} = $dbt->{primary}->{sharee_primary}->{merchant_id}; $return->{project_id} = $dbt->{primary}->{sharee_primary}->{project}; $merchanized = 1; - $bw->log("===> merchant select by $return->{project_id} primary dbname: sharee_primary:",$return->{merchant_id},""); + #$bw->log("===> merchant select by $return->{project_id} primary dbname: sharee_primary:",$return->{merchant_id},""); } elsif($varenv->{syshost} =~ /shareeapp-(\w+)/ || $varenv->{syshost} =~ /shareedms-(\w+)/){ $aowner = $dbt->{operator}->{$varenv->{dbname}}->{owner}; @@ -106,7 +105,7 @@ sub fetch_merchant { $return->{merchant_id} = $dbt->{operator}->{$varenv->{dbname}}->{merchant_id}; $return->{project_id} = $dbt->{operator}->{$varenv->{dbname}}->{project}; $merchanized = 1; - $bw->log("===> merchant select by $return->{project_id} operator dbname=$varenv->{dbname}:",$return->{merchant_id},""); + #$bw->log("===> merchant select by $return->{project_id} operator dbname=$varenv->{dbname}:",$return->{merchant_id},""); } elsif($varenv->{syshost} =~ /shareeweb-/){ $aowner = $dbt->{website}->{$varenv->{syshost}}->{owner}; @@ -114,7 +113,7 @@ sub fetch_merchant { $return->{merchant_id} = $dbt->{website}->{$varenv->{syshost}}->{merchant_id}; $return->{project_id} = $dbt->{website}->{$varenv->{syshost}}->{project}; $merchanized = 1; - $bw->log("===> merchant select by $return->{project_id} website syshost=$varenv->{syshost}:",$return->{merchant_id},""); + #$bw->log("===> merchant select by $return->{project_id} website syshost=$varenv->{syshost}:",$return->{merchant_id},""); } } @@ -2048,6 +2047,7 @@ sub bikes_available(){ $return->{$id}->{rental_description}->{reserve_timerange} = "30" if($record->{$id}->{int11} == 3);#sig timeout time $return->{$id}->{rental_description}->{rental_info}->{1} = ["Tracking","Ich stimme der Speicherung (Tracking) meiner Fahrstrecke zwecks wissenschaftlicher Auswertung und Berechnung der CO2-Einsparung zu!"] if($record->{$id}->{int25}); $return->{$id}->{rental_description}->{rental_info}->{2} = ["AAFahrten","Dieses E-Lastenrad darf nur an der Station zurück gegeben werden an der es ausgeliehen wurde!"] if($record_st->{$record->{$id}->{int04}}->{int42}); + $return->{$id}->{rental_description}->{rental_info}->{3} = ["Lowcharge","Die Fahrrad Akkukapazität war zuletzt niedrig. Bitte überprüfen sie vor der Fahrt die Ladung am Fahrraddisplay. Die Miete kann innerhalb 5 Minuten kostenlos abgebrochen werden."] if($record->{$id}->{energy_id} && (!$record->{$id}->{int19} || $record->{$id}->{int19} < 20)); my $i = 0; foreach my $td (sort keys (%$td_template)){ diff --git a/copri4/main/src/Mod/APIjsonserver.pm b/copri4/main/src/Mod/APIjsonserver.pm index e8451ad..f0950d4 100755 --- a/copri4/main/src/Mod/APIjsonserver.pm +++ b/copri4/main/src/Mod/APIjsonserver.pm @@ -124,6 +124,7 @@ if(!$coo && !$q->param('merchant_id')){ #If param>40 || value > 400 then exit foreach(@keywords){ + if($_ ne "app_debug"){ if(length($_) > 40 || length($q->param($_)) > 400){ $response->{response_state} = "Failure 9000: amount of characters in $_ exceeds"; $bw->log("Failure 9000: amount of characters in $_ exceeds",$q,""); @@ -132,6 +133,7 @@ foreach(@keywords){ return Apache2::Const::OK; exit 0; } + } } diff --git a/copri4/main/src/Mod/APIsigclient.pm b/copri4/main/src/Mod/APIsigclient.pm index 6d35587..4324f8f 100755 --- a/copri4/main/src/Mod/APIsigclient.pm +++ b/copri4/main/src/Mod/APIsigclient.pm @@ -156,6 +156,8 @@ sub sig_available { $return2copri->{$station}->{txt24} = "300102";#node.main_id $return2copri->{$station}->{txt24} = "300001" if($response_out->{$station}->{description} =~ /sigo GmbH/i);#Contributor flot $return2copri->{$station}->{txt25} = "300101";#node_type_id + $return2copri->{$station}->{int42} = "1";#A-A fahrten + $return2copri->{$station}->{int42} = "0" if($response_out->{$station}->{description} =~ /Passau/i);#A-B fahrten while (my ($key, $value) = each %{ $dbt->{copri_conf}->{station_state} }) { if($response_out->{$station}->{state} eq $value){ $return2copri->{$station}->{int10} = $key; diff --git a/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm b/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm index b5d93a3..c7c8eab 100755 --- a/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm +++ b/copri4/shareeapp-operator/src/Tpl/AccountSubmenu.pm @@ -108,14 +108,17 @@ if(1==1){ justify-content:center; transition: all 0.3s ease; margin: 0; - padding: 1em; - height: auto; + padding: 0em; + height: 45px; background-color: #$bgcolor1; font-family:Arial,sans-serif; text-decoration: none; font-weight: normal; color: #fffffe; } + ul#AccNavi li a img { + width:50px; + } ul#AccNavi a:hover { color: #fffffe; background-color: #$hgcolor1; @@ -147,19 +150,19 @@ if(1==1){ print $q->li($q->a({-style=>"$mstyle_1",-title=>"$node1->{$id1}->{node_name}", -href=>"/$viewsel[0]/Account/$node1->{$id1}->{node_name}$session"}, "$node1->{$id1}->{node_name}")),"\n"; } elsif(!$users_sharee->{int03}){ - print $q->li($q->a({-style=>"$mstyle_1",-title=>"$varenv->{accounting_1}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1}$session"}, $q->span({-class=>"bi bi-file-earmark-person"}))),"\n"; - print $q->li($q->a({-style=>"$mstyle_1_5",-title=>"$varenv->{accounting_1_5}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1_5}$session"}, $q->span({-class=>"bi bi-credit-card"}))),"\n"; + print $q->li($q->a({-style=>"$mstyle_1",-title=>"$varenv->{accounting_1}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1}$session"}, $q->img({-src=>"$varenv->{metahost}/img/Account_Kundendaten.svg"}))),"\n"; + print $q->li($q->a({-style=>"$mstyle_1_5",-title=>"$varenv->{accounting_1_5}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1_5}$session"}, $q->img({-src=>"$varenv->{metahost}/img/Account_Zahlungsart.svg"}))),"\n"; } elsif($payable_check){ - print $q->li($q->a({-style=>"$mstyle_1",-title=>"$varenv->{accounting_1}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1}$session"}, $q->span({-class=>"bi bi-file-earmark-person"}))),"\n"; - print $q->li($q->a({-style=>"$mstyle_1_5",-title=>"$varenv->{accounting_1_5}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1_5}$session"}, $q->span({-class=>"bi bi-credit-card"}))),"\n"; - print $q->li($q->a({-style=>"$mstyle_2",-title=>"$varenv->{accounting_2}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_2}$session"},$q->span({-class=>"bi bi-cash"}))),"\n"; - print $q->li($q->a({-style=>"$mstyle_3",-title=>"$varenv->{accounting_3}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_3}$session"},$q->span({-class=>"bi bi-list-ul"}))),"\n"; + print $q->li($q->a({-style=>"$mstyle_1",-title=>"$varenv->{accounting_1}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1}$session"}, $q->img({-src=>"$varenv->{metahost}/img/Account_Kundendaten.svg"}))),"\n"; + print $q->li($q->a({-style=>"$mstyle_1_5",-title=>"$varenv->{accounting_1_5}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1_5}$session"}, $q->img({-src=>"$varenv->{metahost}/img/Account_Zahlungsart.svg"}))),"\n"; + print $q->li($q->a({-style=>"$mstyle_2",-title=>"$varenv->{accounting_2}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_2}$session"}, $q->img({-src=>"$varenv->{metahost}/img/Account_Kontoverbindung.svg"}))),"\n"; + print $q->li($q->a({-style=>"$mstyle_3",-title=>"$varenv->{accounting_3}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_3}$session"}, $q->img({-src=>"$varenv->{metahost}/img/Account_Verleihdaten.svg"}))),"\n"; } else{ - print $q->li($q->a({-style=>"$mstyle_1",-title=>"$varenv->{accounting_1}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1}$session"}, $q->span({-class=>"bi bi-file-earmark-person"}))),"\n"; - print $q->li($q->a({-style=>"$mstyle_1_5",-title=>"$varenv->{accounting_1_5}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1_5}$session"}, $q->span({-class=>"bi bi-credit-card"}))),"\n"; - print $q->li($q->a({-style=>"$mstyle_2",-title=>"$varenv->{accounting_2}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_2}$session"},$q->span({-class=>"bi bi-cash"}))),"\n"; + print $q->li($q->a({-style=>"$mstyle_1",-title=>"$varenv->{accounting_1}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1}$session"}, $q->img({-src=>"$varenv->{metahost}/img/Account_Kundendaten.svg"}))),"\n"; + print $q->li($q->a({-style=>"$mstyle_1_5",-title=>"$varenv->{accounting_1_5}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_1_5}$session"}, $q->img({-src=>"$varenv->{metahost}/img/Account_Zahlungsart.svg"}))),"\n"; + print $q->li($q->a({-style=>"$mstyle_2",-title=>"$varenv->{accounting_2}", -href=>"/$viewsel[0]/Account/$varenv->{accounting_2}$session"}, $q->img({-src=>"$varenv->{metahost}/img/Account_Kontoverbindung.svg"}))),"\n"; } }