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

sig service automatic and rental edit fix

Browse source
This commit is contained in:
ragu 2022-06-28 13:50:59 +02:00
parent ac2e93923b
commit 25a86e87e5
6 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
copri4/main/src/Mod/APIfunc.pm
View file

@ -1032,7 +1032,7 @@ sub booking_update(){
state => "",
lock_state => "",
#station_lock_state => "",
#co2saving => "",
co2saving => "",
response_state => "OK 1017: No update",
response_text => "Der Mietstatus wurde nicht geändert.",
};
@ -1527,7 +1527,7 @@ sub booking_update(){
}
my $co2saving = "";
#$booking->{int26} = 10 if(!$booking->{int26} && ($auth->{c_id} == 1842 || $auth->{c_id} == 5781 || $auth->{c_id} == 11765 || $auth->{c_id} == 1843));#10 km test
$booking->{int26} = 10 if(!$booking->{int26} && ($auth->{c_id} == 1842 || $auth->{c_id} == 5781 || $auth->{c_id} == 11765 || $auth->{c_id} == 1843));#10 km test
if($booking->{int26}){
$co2saving = "Einsparung: ";
my $co2diff = $pri->co2calc($booking);
@ -1586,12 +1586,19 @@ sub service_automatic {
$q->param(-name=>'work_val',-value=>"$lock_charge");
my $article = looks_like_number($bike_id) || looks_like_number($station_id);
(my $xresponse->{$article}, my $responseraw, my $node_template, my $crecord) = $self->service_select($q,$authraw,"","1");
#insert only new dataset if mtime > 10 days
(my $xresponse->{$article}, my $pos_record, my $node_template, my $crecord) = $self->service_select($q,$authraw,"","10");
my $service_id = "";
foreach my $id (sort { $pos_record->{$a}->{barcode} <=> $pos_record->{$b}->{barcode} } keys (%$pos_record)){
$service_id = $pos_record->{$id}->{c_id} if($pos_record->{$id}->{c_id} > 1);
}
if(ref($xresponse->{$article}) ne "HASH" || !$xresponse->{$article}->{c_id}){
if(!$service_id){
($response->{service_id}) = $self->service_insert($q,$authraw,$node_template,$crecord);
$bw->log("service_automatic insert ($xresponse->{$article}->{c_id}) ",$response,"");
$bw->log("service_automatic insert ($response->{service_id}) ",$response,"");
my $rows = $self->service_update($q,$authraw,$node_template,$response->{service_id});
}elsif($service_id){
my $rows = $self->service_update($q,$authraw,$node_template,$service_id);
}
}
@ -1854,8 +1861,8 @@ sub bikes_available(){
#new rental_description
$return->{$id}->{rental_description}->{name} = "$tariff_content->{$tid}->{ct_name}";
$return->{$id}->{rental_description}->{id} = "$tariff_content->{$tid}->{barcode}";
$return->{$id}->{rental_description}->{reserve_timerange} = "15 Min";
$return->{$id}->{rental_description}->{reserve_timerange} = "30 Min" if($record->{$id}->{int11} == 3);#sig timeout time
$return->{$id}->{rental_description}->{reserve_timerange} = "15";
$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} = ["AGB","Mit der Mietrad Anmietung wird folgender Betreiber <a href='$varenv->{wwwhost}/site/agb.html' target='_blank'>AGB</a> zugestimmt (als Demo sharee AGB)."] if($auth->{c_id} && ($auth->{c_id} == 1842 || $auth->{c_id} == 5781 || $auth->{c_id} == 22262 || $auth->{c_id} == 38883));