roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2024-11-15 23:26:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

DB update and some minor fixes

Browse source
This commit is contained in:
ragu 2024-06-05 12:20:38 +02:00
parent 6dcd411a53
commit 000acb8e35
8 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,7 @@ sub fetch_merchant {
my $q = shift; my $q = shift;
my $varenv = shift; my $varenv = shift;
my $req_coo = shift || ""; my $req_coo = shift || "";
my $req_merchant_id = shift || "$dbt->{appsframe}->{'sharee.bike'}->{merchant_id}";#defaults to sharee.bike my $req_merchant_id = shift || "";#"$dbt->{appsframe}->{'sharee.bike'}->{merchant_id}";#defaults to sharee.bike
my $return = { my $return = {
aowner => "", aowner => "",

8
copri4/main/src/Mod/Buttons.pm
View file

@ -512,10 +512,10 @@ sub singlesubmit2glyph(){
my $a_key = ""; my $a_key = "";
$a_key = "y" if("$b_name" =~ /save/); $a_key = "y" if("$b_name" =~ /save/);
my $b_img = ""; my $b_img = "";
$b_img = "<span class='bi bi-check-circle' style='font-size:1.5em;'</span>" if("$b_name" =~ /save/); $b_img = "<span class='bi bi-check-circle' style='font-size:1.5em;'></span>" if("$b_name" =~ /save/);
$b_img = "<span class='bi bi-x-circle' style='font-size:1.5em;'</span>" if("$b_name" =~ /delete|remove/); $b_img = "<span class='bi bi-x-circle' style='font-size:1.5em;'></span>" if("$b_name" =~ /delete|remove/);
$b_img = "<span class='bi bi-file-earmark-plus-fill' style='font-size:1.5em;'</span>" if("$b_name" =~ /new/); $b_img = "<span class='bi bi-file-earmark-plus-fill' style='font-size:1.5em;'></span>" if("$b_name" =~ /new/);
$b_img = "<span class='bi bi-file-earmark-text-fill' style='font-size:1.5em;'</span>" if("$b_name" =~ /open|client/); $b_img = "<span class='bi bi-file-earmark-text-fill' style='font-size:1.5em;'></span>" if("$b_name" =~ /open|client/);
my $button = "<span style='width:25px;height=15px;'>&nbsp;</span>"; my $button = "<span style='width:25px;height=15px;'>&nbsp;</span>";
if($b_name){ if($b_name){
if("$b_name" =~ /delete/){ if("$b_name" =~ /delete/){

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

@ -1331,10 +1331,11 @@ sub collect_theftpos {
} }
$where .= " ORDER BY cp.c_id DESC LIMIT $search->{limit} OFFSET $search->{offset}" if($search->{limit}); $where .= " ORDER BY cp.c_id DESC LIMIT $search->{limit} OFFSET $search->{offset}" if($search->{limit});
my $sth = $dbh->prepare("SELECT cp.* from $search->{table} cp $where"); my $sql = "SELECT cp.* from $search->{table_pos} cp $where";
my $sth = $dbh->prepare($sql);
my $rc = $sth->execute(); my $rc = $sth->execute();
my $ct = $sth->fetchall_hashref("c_id"); my $ct = $sth->fetchall_hashref("c_id");
$sth->finish; $bw->log("collect_theftpos",$sql,"") if($debug);
return $ct; return $ct;
} }

2
copri4/main/src/Mod/Indexsharee.pm
View file

@ -726,7 +726,7 @@ sub handler {
exit 0; exit 0;
} }
} }
elsif(!$users_sharee->{c_id} && !$R::logedout && ($path !~ /$varenv{mandant}\/Anmelden|$varenv{mandant}\/Account/)){ elsif(!$users_sharee->{c_id} && !$R::logedout && ($path !~ /$varenv{mandant}\/Karte|$varenv{mandant}\/Anmelden|$varenv{mandant}\/Account|$varenv{mandant}\/Kontakt/)){
print redirect("$varenv{wwwhost}?logedout=1$session_and"); print redirect("$varenv{wwwhost}?logedout=1$session_and");
exit 0; exit 0;
} }

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

@ -404,7 +404,7 @@ EOF
$response_bikes = decode_json($bikes_json); $response_bikes = decode_json($bikes_json);
#bikes available #bikes available
print $q->div({-class=>'content_title2',-style=>''},"$list_title $selected_station{name} | $selected_station{station_id}"),"\n" if(1 == 1); print $q->div({-style=>'font-weight:bold;'},"$selected_station{name} | $selected_station{station_id}"),"\n" if(1 == 1);
foreach my $bike (sort {$response_bikes->{shareejson}->{bikes}->{$a}->{bike} cmp $response_bikes->{shareejson}->{bikes}->{$b}->{bike} } keys (%{ $response_bikes->{shareejson}->{bikes} })) { foreach my $bike (sort {$response_bikes->{shareejson}->{bikes}->{$a}->{bike} cmp $response_bikes->{shareejson}->{bikes}->{$b}->{bike} } keys (%{ $response_bikes->{shareejson}->{bikes} })) {
#print "<div style='border:1px solid #$bgcolor1;margin:1em 0;max-width:550px;'>\n"; #print "<div style='border:1px solid #$bgcolor1;margin:1em 0;max-width:550px;'>\n";

6
copri4/shareeconf/examples/global.cfg
View file

@ -278,8 +278,8 @@
accounting_2 = "2.0. Zahlungsdaten" accounting_2 = "2.0. Zahlungsdaten"
accounting_3 = "3. Verleihdaten" accounting_3 = "3. Verleihdaten"
local_style = "css/local_style2022-03-20.css" local_style = "css/local_style20240315.css"
jquery = "" jquery = "external/jquery-3.7.1.min.js"
js_bootstrap = "external/bootstrap-5.2.3-dist/js/bootstrap.bundle.min.js" js_bootstrap = "external/bootstrap-5.2.3-dist/js/bootstrap.bundle.min.js"
style_bootstrap = "external/bootstrap-5.2.3-dist/css/bootstrap.css" style_bootstrap = "external/bootstrap-5.2.3-dist/css/bootstrap.css"
</shareeapp_conf> </shareeapp_conf>
@ -320,7 +320,7 @@
5 = "3. Mahnung" 5 = "3. Mahnung"
</warning_state> </warning_state>
local_style = "css/local_style20221205.css" local_style = "css/local_style20240206.css"
jquery = "external/jquery-3.6.1.min.js" jquery = "external/jquery-3.6.1.min.js"
jquery_ui = "external/jquery-ui-1.13.2/jquery-ui.min.js" jquery_ui = "external/jquery-ui-1.13.2/jquery-ui.min.js"
style_jquery_ui = "external/jquery-ui-1.13.2/jquery-ui.min.css" style_jquery_ui = "external/jquery-ui-1.13.2/jquery-ui.min.css"

BIN
copri4/shareeconf/examples/sharee_operator.sql.gz
View file

Binary file not shown.

6
copri4/shareedms-operator/apache/shareedms-operator.conf
View file

@ -83,6 +83,12 @@
PerlResponseHandler Mod::GBFSout PerlResponseHandler Mod::GBFSout
</Location> </Location>
<Location /APIshareeio>
SetHandler perl-script
PerlInitHandler Apache2::Reload
PerlResponseHandler Mod::APIshareeio
</Location>
<Location /FileOut> <Location /FileOut>
SetHandler perl-script SetHandler perl-script
PerlInitHandler Apache2::Reload PerlInitHandler Apache2::Reload