roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-13 15:16:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Bike-smartlock archive refactoring and adding fleed hotline. 0 euro tariff extension

Browse source
This commit is contained in:
ragu 2023-11-23 19:02:16 +01:00
parent 60f5bf58ed
commit b1c6a62657
11 changed files with 85 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

14
copri4/main/src/Mod/APIjsonserver.pm
View file

@ -50,6 +50,9 @@ sub handler {
my @keywords = $q->param;
my $debug=1;
my $user_agent = $q->user_agent();
my $user_agent_subversion = 1000;
#$user_agent = "Meinkonrad/3.0.363";#test
$user_agent_subversion = $1 if($user_agent =~ /3\.0\.(\d+)/);
#my %headers = map { $_ => $q->http($_) } $q->http();
#$bw->log("headers:",\%headers,"");
@ -68,7 +71,7 @@ my $response = {
apiserver => "$apiserver",
response => "$respreq",
uri_primary => "$dbt->{primary}->{sharee_primary}->{primaryApp}",
copri_version => "4.1.23.20",
copri_version => "4.1.23.22",
user_id => "",
authcookie => "",
new_authcoo => "0",
@ -522,12 +525,11 @@ elsif($q->param('request') eq "bikes_available"){
}
#2023-11-13, return also bikes_occupied on bikes_available by operator request
#if(1==1 && $varenv{syshost} ne "shareeapp-primary" && $dbt->{copri_conf}->{betau_id}->{$authraw->{c_id}}){
#return list of occupied/requested bikes
if($user_agent_subversion >= 375 || $user_agent =~ /Mozilla/){#Mozilla for testing
my $record = {};
$record = $apif->user_bikes_occupied($dbh,$authraw,"");
$response->{bikes_occupied} = $apif->rentals(\%varenv,$record,$authraw,"1");#returns JSON rental values
#}
}
}
if(ref($response->{bikes}) ne "HASH"){
$response->{response_state} = "Failure 5003: cannot find any user defined bike tariff";
@ -715,10 +717,6 @@ elsif($q->param('request') eq "stations_available"){
my $authraw = {};
($auth,$authraw) = $apif->auth_verify($q);
my $user_agent_subversion = 1000;
#$user_agent = "Meinkonrad/3.0.363";#test
$user_agent_subversion = $1 if($user_agent =~ /3\.0\.(\d+)/);
#merchant_message timerange
my $lnow = strftime("%Y-%m-%d %H:%M:%S", localtime(time));
my $localtime = Time::Piece->strptime($lnow, "%Y-%m-%d %H:%M:%S");