diff --git a/copri4/main/src/Mod/APIfunc.pm b/copri4/main/src/Mod/APIfunc.pm index 362677c..f576a6c 100755 --- a/copri4/main/src/Mod/APIfunc.pm +++ b/copri4/main/src/Mod/APIfunc.pm @@ -66,7 +66,7 @@ sub fetch_merchant { my $q = shift; my $varenv = shift; my $req_coo = shift || ""; - my $req_merchant_id = shift || "$dbt->{appsframe}->{'sharee.bike'}->{merchant_id}";#defaults to sharee.bike + my $req_merchant_id = shift || "";#"$dbt->{appsframe}->{'sharee.bike'}->{merchant_id}";#defaults to sharee.bike my $return = { aowner => "", diff --git a/copri4/main/src/Mod/Buttons.pm b/copri4/main/src/Mod/Buttons.pm index 3657c5d..ae25e0a 100755 --- a/copri4/main/src/Mod/Buttons.pm +++ b/copri4/main/src/Mod/Buttons.pm @@ -512,10 +512,10 @@ sub singlesubmit2glyph(){ my $a_key = ""; $a_key = "y" if("$b_name" =~ /save/); my $b_img = ""; - $b_img = "" if("$b_name" =~ /save/); - $b_img = "" if("$b_name" =~ /delete|remove/); - $b_img = "" if("$b_name" =~ /new/); - $b_img = "" if("$b_name" =~ /open|client/); + $b_img = "" if("$b_name" =~ /save/); + $b_img = "" if("$b_name" =~ /delete|remove/); + $b_img = "" if("$b_name" =~ /new/); + $b_img = "" if("$b_name" =~ /open|client/); my $button = " "; if($b_name){ if("$b_name" =~ /delete/){ diff --git a/copri4/main/src/Mod/DBtank.pm b/copri4/main/src/Mod/DBtank.pm index 31cd025..7ebde13 100755 --- a/copri4/main/src/Mod/DBtank.pm +++ b/copri4/main/src/Mod/DBtank.pm @@ -1331,10 +1331,11 @@ sub collect_theftpos { } $where .= " ORDER BY cp.c_id DESC LIMIT $search->{limit} OFFSET $search->{offset}" if($search->{limit}); - my $sth = $dbh->prepare("SELECT cp.* from $search->{table} cp $where"); + my $sql = "SELECT cp.* from $search->{table_pos} cp $where"; + my $sth = $dbh->prepare($sql); my $rc = $sth->execute(); my $ct = $sth->fetchall_hashref("c_id"); - $sth->finish; + $bw->log("collect_theftpos",$sql,"") if($debug); return $ct; } diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm index d1bf4a2..ba732da 100755 --- a/copri4/main/src/Mod/Indexsharee.pm +++ b/copri4/main/src/Mod/Indexsharee.pm @@ -726,7 +726,7 @@ sub handler { exit 0; } } - elsif(!$users_sharee->{c_id} && !$R::logedout && ($path !~ /$varenv{mandant}\/Anmelden|$varenv{mandant}\/Account/)){ + elsif(!$users_sharee->{c_id} && !$R::logedout && ($path !~ /$varenv{mandant}\/Karte|$varenv{mandant}\/Anmelden|$varenv{mandant}\/Account|$varenv{mandant}\/Kontakt/)){ print redirect("$varenv{wwwhost}?logedout=1$session_and"); exit 0; } diff --git a/copri4/shareeapp-operator/src/Tpl/CalReserv.pm b/copri4/shareeapp-operator/src/Tpl/CalReserv.pm index 0e35a74..4bffca6 100755 --- a/copri4/shareeapp-operator/src/Tpl/CalReserv.pm +++ b/copri4/shareeapp-operator/src/Tpl/CalReserv.pm @@ -404,7 +404,7 @@ EOF $response_bikes = decode_json($bikes_json); #bikes available - print $q->div({-class=>'content_title2',-style=>''},"$list_title $selected_station{name} | $selected_station{station_id}"),"\n" if(1 == 1); + print $q->div({-style=>'font-weight:bold;'},"$selected_station{name} | $selected_station{station_id}"),"\n" if(1 == 1); foreach my $bike (sort {$response_bikes->{shareejson}->{bikes}->{$a}->{bike} cmp $response_bikes->{shareejson}->{bikes}->{$b}->{bike} } keys (%{ $response_bikes->{shareejson}->{bikes} })) { #print "
\n"; diff --git a/copri4/shareeconf/examples/global.cfg b/copri4/shareeconf/examples/global.cfg index 591edfd..08ddfba 100755 --- a/copri4/shareeconf/examples/global.cfg +++ b/copri4/shareeconf/examples/global.cfg @@ -278,8 +278,8 @@ accounting_2 = "2.0. Zahlungsdaten" accounting_3 = "3. Verleihdaten" - local_style = "css/local_style2022-03-20.css" - jquery = "" + local_style = "css/local_style20240315.css" + jquery = "external/jquery-3.7.1.min.js" js_bootstrap = "external/bootstrap-5.2.3-dist/js/bootstrap.bundle.min.js" style_bootstrap = "external/bootstrap-5.2.3-dist/css/bootstrap.css" @@ -320,7 +320,7 @@ 5 = "3. Mahnung" - local_style = "css/local_style20221205.css" + local_style = "css/local_style20240206.css" jquery = "external/jquery-3.6.1.min.js" jquery_ui = "external/jquery-ui-1.13.2/jquery-ui.min.js" style_jquery_ui = "external/jquery-ui-1.13.2/jquery-ui.min.css" diff --git a/copri4/shareeconf/examples/sharee_operator.sql.gz b/copri4/shareeconf/examples/sharee_operator.sql.gz index 8d7ef0d..8de79f4 100755 Binary files a/copri4/shareeconf/examples/sharee_operator.sql.gz and b/copri4/shareeconf/examples/sharee_operator.sql.gz differ diff --git a/copri4/shareedms-operator/apache/shareedms-operator.conf b/copri4/shareedms-operator/apache/shareedms-operator.conf index 6f247b5..ad4d27d 100644 --- a/copri4/shareedms-operator/apache/shareedms-operator.conf +++ b/copri4/shareedms-operator/apache/shareedms-operator.conf @@ -83,6 +83,12 @@ PerlResponseHandler Mod::GBFSout + + SetHandler perl-script + PerlInitHandler Apache2::Reload + PerlResponseHandler Mod::APIshareeio + + SetHandler perl-script PerlInitHandler Apache2::Reload