roko.li/sharee.bike
4
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2024-06-21 05:47:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tarif AAFahrten text

Browse source
This commit is contained in:
ragu 2022-08-05 18:35:39 +02:00
parent 68b58e0345
commit 4cec179664
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1208,9 +1208,11 @@ sub booking_update(){
mtime => "now()",
};
if($user_agent && $user_agent !~ /axios/){#keep device info if sig push
$update_pos->{txt21} = $q->escapeHTML($q->param('user_device')) if($q->param('user_device'));
$update_pos->{txt26} = $q->escapeHTML($user_agent) if($user_agent);
$update_pos->{txt27} = $q->escapeHTML($q->param('app_debug')) if($q->param('app_debug'));
}
#if($state =~ /canceled/ && $record_pos->{txt10} =~ /requested/)
if($state_key == 6 && $record_pos->{int10} == 2){
@ -1463,10 +1465,12 @@ sub booking_update(){
int24 => 0,
};
if($user_agent && $user_agent !~ /axios/){#keep device info if sig push
$update_pos->{int14} = $q->escapeHTML($q->param('voltage')) if($q->param('voltage'));
$update_pos->{txt21} = $q->escapeHTML($q->param('user_device')) if($q->param('user_device'));
$update_pos->{txt26} = $q->escapeHTML($user_agent) if($user_agent);
$update_pos->{txt27} = $q->escapeHTML($q->param('app_debug')) if($q->param('app_debug'));
}
my $lock_value = 0;
if($lock_state eq "locked"){
@ -1906,7 +1910,19 @@ sub bikes_available(){
my $authed = 0;
my $station = $q->escapeHTML($q->param('station')) || "";
my $station_id = $1 if($station =~ /(\d+)/);
my $station_id = "";
$station_id = $1 if($station =~ /(\d+)/);
#to get A-A key for text
my $pref_st = {
table => "content",
fetch => "one",
template_id => "225",
int10 => "1",
int04 => "$station_id",
};
my $record_st = {};
$record_st = $dbt->fetch_record($dbh,$pref_st) if($station_id);
my $bike = $q->escapeHTML($q->param('bike')) || "";
my $bike_id = $bike;
@ -2027,7 +2043,7 @@ sub bikes_available(){
$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} == 1843 || $auth->{c_id} == 5781 || $auth->{c_id} == 11765 || $auth->{c_id} == 38883));
$return->{$id}->{rental_description}->{rental_info}->{2} = ["AAFahrten","Achtung, das Mietende von diesem Lastenrad ist nur an dieser Station möglich!"] if($station_id && $record_st->{int42});
my $i = 0;
foreach my $td (sort keys (%$td_template)){

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

@ -114,9 +114,10 @@ if(!$coo && !$q->param('merchant_id')){
$response->{bike_info_html} = "site/bike_info_konrad_1.html";
}
if($return_merchant->{project_id} eq "Bayern"){
$response->{agb_html} = "site/agb_lastenradbayern.html";
$response->{agb_html} = "site/agb_lastenradbayern_220804.html";
$response->{bike_info_html} = "site/bike_info_bayern.html";
$response->{privacy_html} = "site/privacy_lastenradbayern.html";
$response->{tariff_info_html} = "site/tarif_info_lastenradbayern_220804.html";
}
}

2
copri4/shareeapp-operator/src/Tpl/FormEdit.pm
View file

@ -175,7 +175,7 @@ Weitere Personen aus Ihrem Haushalt profitieren jedoch ebenfalls, falls Sie weit
$sharee_agb_text->{txt01} = "<iframe src='$varenv->{wwwhost}/site/agb_konrad_1.html' style='width:100%;height:10000px;border:none;' scrolling='auto'></iframe>";
}
if($project eq "Bayern"){
$sharee_agb_text->{txt01} = "<iframe src='$varenv->{wwwhost}/site/agb_lastenradbayern.html' style='width:100%;height:11000px;border:none;' scrolling='auto'></iframe>";
$sharee_agb_text->{txt01} = "<iframe src='$varenv->{wwwhost}/site/agb_lastenradbayern_220804.html' style='width:100%;height:11000px;border:none;' scrolling='auto'></iframe>";
$sharee_privacy_text->{txt01} = "<iframe src='$varenv->{wwwhost}/site/privacy_lastenradbayern.html' style='width:100%;height:8000px;border:none;' scrolling='auto'></iframe>";
}