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

AAFahrten and SEPA

Browse source
This commit is contained in:
ragu 2022-08-08 13:59:42 +02:00
parent 1e81d08904
commit 00919c51eb
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1911,18 +1911,19 @@ sub bikes_available(){
my $station = $q->escapeHTML($q->param('station')) || "";
my $station_id = "";
$station_id = $1 if($station =~ /(\d+)/);
$station_id = $1 if($station =~ /(\d+)$/);
#to get A-A key for text
my $pref_st = {
table => "content",
fetch => "one",
fetch => "all",
keyfield => "int04",
template_id => "225",
int10 => "1",
int04 => "$station_id",
};
my $record_st = {};
$record_st = $dbt->fetch_record($dbh,$pref_st) if($station_id);
$pref_st->{int04} = "$station_id" if($station_id);
$record_st = $dbt->fetch_record($dbh,$pref_st);
my $bike = $q->escapeHTML($q->param('bike')) || "";
my $bike_id = $bike;
@ -2043,7 +2044,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} = ["AAFahrten","Achtung, das Mietende von diesem Lastenrad ist nur an dieser Station möglich!"] if($station_id && $record_st->{int42});
$return->{$id}->{rental_description}->{rental_info}->{2} = ["AAFahrten","Dieses E-Lastenrad darf nur an der Station zurück gegeben werden an der es ausgeliehen wurde!"] if($record_st->{$record->{$id}->{int04}}->{int42});
my $i = 0;
foreach my $td (sort keys (%$td_template)){

4
copri4/shareeapp-operator/src/Lib/Mlogic.pm
View file

@ -45,9 +45,9 @@ sub tpl(){
#my $api_test = "sharee_fr01"; my $bike="FR1538";
#my $api_test = "sharee_fr01"; my $bike="FR1005";#E-Lastenrad (bike_group=300101, bike_node=300102)
#my $api_test = "sharee_fr01"; my $bike="FR4781";#Tracking and BVB test
#my $api_test = "sharee_kn"; my $bike="KN1011";
my $api_test = "sharee_kn"; my $bike="KN1011";
#my $api_test = "sharee_wue"; my $bike="WUE5525";
my $api_test = "sharee_sx"; my $bike="S3X1001";
#my $api_test = "sharee_sx"; my $bike="S3X1001";
#my $api_test = "sharee_ren"; my $bike="REN2";
print $q->div({-style=>'float:right;text-align:right;height:25px;padding:6px 15px;background-color:white'},$q->a({-style=>"background-color:#ffffff;color:#$bgcolor1;", -href=>"$varenv->{metahost}/src/scripts/tests/index.pl?sessionid=$coo\&api_test=$api_test\&bike=$bike", -target=>'_blank'}," [ tests --> $api_test ] "),"$users_sharee->{txt08}",$q->a({-style=>"color:#$bgcolor1;", -href=>"logout_sharee$session"},"logout")),"\n";

4
copri4/shareeapp-operator/src/Tpl/PayoneSEPA.pm
View file

@ -121,8 +121,8 @@ sub tpl(){
#print $q->hidden(-name=>"$key",-override=>1,-value=>"3");
}else{
if($ctadr->{txt28} =~ /SEPA-Lastschriftmandat/){
#2022-08-08 disabled because of decoding, anyway, pdf should be enough
if(1==2 && $ctadr->{txt28} =~ /SEPA-Lastschriftmandat/){
print $q->div({-class=>'content2'}, ""),"\n";
$ctadr->{txt28} = $q->unescapeHTML("$ctadr->{txt28}");
use URI::Encode qw(uri_encode uri_decode);