diff --git a/copri4/main/src/Mod/APIjsonserver.pm b/copri4/main/src/Mod/APIjsonserver.pm index cba37a2..846c6bb 100755 --- a/copri4/main/src/Mod/APIjsonserver.pm +++ b/copri4/main/src/Mod/APIjsonserver.pm @@ -254,7 +254,7 @@ elsif($q->param('request') eq "booking_request"){ if($bike_id && $bike_id == $record->{$id}->{barcode}){ $still_requested = 1; $response->{response_state} = "OK, bike " . $bike . " already in timerange reserved"; - $response->{response_text} = "Rad " . $bike . " ist für diesen Zeitraum nicht verfügbar."; + $response->{response_text} = "Rad " . $bike . " ist bereits gebucht."; } } diff --git a/copri4/main/src/Mod/Indexsharee.pm b/copri4/main/src/Mod/Indexsharee.pm index 9f4a2d9..d1bf4a2 100755 --- a/copri4/main/src/Mod/Indexsharee.pm +++ b/copri4/main/src/Mod/Indexsharee.pm @@ -574,9 +574,6 @@ sub handler { elsif($users_sharee->{c_id} && $R::sharee_edit && $R::sharee_edit =~ /generate_payonelink/ && $R::prepaid_amount && $R::prepaid_amount =~ /\d+/){ system("$dbt->{copri_conf}->{basedir}/$varenv{syshost}/src/scripts/payonelink.pl '$varenv{syshost}' '$users_sharee->{c_id}' '$R::prepaid_amount' '$aowner' &"); } - elsif($users_sharee->{c_id} && $R::sharee_edit && $R::sharee_edit =~ /bike_reserv/){ - $returnwww = $shwo->bike_reserv($q,\%varenv,$users_sharee->{c_id},$aowner); - } if($returnwww && $returnwww =~ /failure::(.*)/){ $returnwww =~ s/::/=/g; diff --git a/copri4/main/src/Mod/Shareework.pm b/copri4/main/src/Mod/Shareework.pm index 984a158..68e4bb5 100755 --- a/copri4/main/src/Mod/Shareework.pm +++ b/copri4/main/src/Mod/Shareework.pm @@ -52,19 +52,6 @@ my $i_rows=0; my $u_rows=0; my $d_rows=0; -#bike reservation by CalReserv -sub bike_reserv { - my $self = shift; - my $q = shift; - my $varenv = shift; - my $ca_id = shift; - my $aowner = shift; - - return; -} - - -# #also done in src/Tpl/Anmelden.pm!? sub delete_account { my $self = shift; diff --git a/copri4/shareeapp-operator/src/Lib/Mlogic.pm b/copri4/shareeapp-operator/src/Lib/Mlogic.pm index 96a7a71..4d5ddd8 100755 --- a/copri4/shareeapp-operator/src/Lib/Mlogic.pm +++ b/copri4/shareeapp-operator/src/Lib/Mlogic.pm @@ -96,7 +96,7 @@ print "