roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-11 22:37:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

counting bikes on station by bike_count

Browse source
This commit is contained in:
ragu 2023-03-17 13:23:04 +01:00
parent 397c3b1917
commit 2a3f579b94
5 changed files with 65 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
copri4/main/src/Mod/APIsigclient.pm
View file

@ -113,6 +113,11 @@ sub sig_available {
if($station && looks_like_number($resp->{site}->{id}) && ref($bike_group) eq "ARRAY" && @{$bike_group}[0]){
print FILE "Station: $station\n\n";
$response_out->{$station}->{station} = "$station";
if($resp->{status} && $resp->{status} =~ /ACTIVE|PRIVATE/i && !$resp->{reservation_state}){
$response_out->{$station}->{bike_count}++;
}
$response_out->{$station}->{authed} = "$authed";
$response_out->{$station}->{uri_operator} = "$dbt->{operator}->{$varenv->{dbname}}->{operatorApp}";

1
copri4/main/src/Mod/GBFSout.pm
View file

@ -100,6 +100,7 @@ sub station_information {
$gbfs_station{$station}{station_id} = $response_stations->{shareejson}->{stations}->{$station}->{station};
$gbfs_station{$station}{name} = Encode::encode('utf-8', Encode::decode('iso-8859-1',$response_stations->{shareejson}->{stations}->{$station}->{description}));
$gbfs_station{$station}{capacity} = $response_stations->{shareejson}->{stations}->{$station}->{capacity};
$gbfs_station{$station}{bike_count} = $response_stations->{shareejson}->{stations}->{$station}->{bike_count};
$gbfs_station{$station}{lat} = $response_stations->{shareejson}->{stations}->{$station}->{gps}->{latitude};
$gbfs_station{$station}{lon} = $response_stations->{shareejson}->{stations}->{$station}->{gps}->{longitude};
#$gbfs_station{$station}{is_charging_station} = 1 if(grep(/300102/, @{$response_stations->{shareejson}->{stations}->{$station}->{station_group}}));#E-L

3
copri4/main/src/Mod/Payment.pm
View file

@ -488,13 +488,14 @@ sub rpc {
#$update_adr->{txt28} = $val if($key eq "mandate_text" && ($val =~ /SEPA/ || !$val));
$update_adr->{txt28} = $now_dt . " $todo\n" . $q->escapeHTML($res->content);
}
$update_adr->{int12} = 0;#Vde
$update_adr->{int12} = 0 if($vde_on_fail != 2);#Vde
$dbt->update_record($dbh,$update_adr,$ctadr) if($ctadr->{c_id} > 0);
my $ret = $self->pdfmandat($varenv,$ctadr->{c_id});
print FILE "pdfmandat call generates: $ret\n" if($debug);
}elsif($ctadr->{c_id}){
$update_adr->{int12} = $vde_on_fail;#Vde
}
print FILE "managemandate update_adr:" . Dumper($update_adr) . "\n" if($debug);
}
my $txidval = "";

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

@ -238,8 +238,8 @@ sub save_account(){
}
$u_rows = $dbt->update_one($dbh,$update_primary,"txt17='@operators'");
}
#Web-Login|Rabatt|Vde|payone cron-intervall|Ilockit-Admin|miniq
elsif($_ =~ /int05|int07|int16|int19|int23/){
#Rabatt|payone cron-intervall|Ilockit-Admin|miniq
elsif($_ =~ /int07|int16|int19|int23/){
$u_rows = $dbt->update_one("",$update_primary,"$_=$valxx");
}
#user_tour
@ -442,6 +442,9 @@ sub save_account(){
}
$u_rows = $dbt->update_one($dbh,$update_primary,"$_='$valxx'");
}
}elsif($_ eq "int05"){#Web-login
$u_rows = $dbt->update_one($dbh,$update_primary,"$_=$valxx");
$u_rows = $dbt->update_one($dbh,$update_primary,"txt05=null") if($valxx != 1);
}elsif($_ eq "int12" && $varenv{dbname} ne $dbt->{primary}->{sharee_primary}->{database}->{dbname}){
my $vde_on_fail = 0;
$vde_on_fail = 2 if($valxx && $valxx == 1);
@ -503,7 +506,7 @@ sub save_account(){
$ctadr = $dbt->fetch_record($dbh,$authref);
print FILE "+++ $R::request && $ctadr->{int03} == 1 && $ctadr->{ct_name} eq $ctadr->{c_id} \n" if($debug);
#if($R::request eq "managemandate" && $ctadr->{int03} == 1 && $ctadr->{ct_name} eq $ctadr->{c_id}){
#if($R::request eq "managemandate" && $ctadr->{int03} == 1 && $ctadr->{ct_name} eq $ctadr->{c_id})
#fraud workaround
my $iban = $ctadr->{txt22} || "";
$iban =~ s/\s//g;
@ -533,7 +536,8 @@ sub save_account(){
if(1==1){
$ctt->{txt16} = "$payone_txid";
$u_rows = $dbt->update_one($dbh,$update_primary,"int12=0");#Vde
$vde_on_fail = 0 if($vde_on_fail != 2);
$u_rows = $dbt->update_one($dbh,$update_primary,"int12=$vde_on_fail");#Vde
#$payone_txid = $payone->captureSEPA_main(\%varenv,$ctadr,$ctt,$owner);
#int12=0 should be set after capture success in payment module
@ -573,7 +577,7 @@ sub save_account(){
print FILE Dumper($feedb) . "\n" if($debug);
close(FILE) if($debug);
return ($ret,$feedb);
}
}#end save_account
#insert/save/delete DMS users
sub manage_dmsusers {