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

SubListe sortierung fix

Browse source
This commit is contained in:
ragu 2022-09-28 13:28:45 +02:00
parent 72dcd2ec13
commit 5c98c8b8a5
10 changed files with 105 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1307,8 +1307,10 @@ sub booking_update(){
#end-Station
$update_pos->{int04} = "$stations_raw->{$id}->{int04}";
$update_cc->{int04} = "$stations_raw->{$id}->{int04}";
$update_pos->{int24} = "1";
$update_pos->{int10} = "$state_key";
#if($lock_state eq "locked"){
$update_pos->{int24} = "1";
$update_pos->{int10} = "$state_key";
#}
$update_pos->{txt11} = "$sig_book->{rentalId}" if($sig_book->{rentalId});
$update_cc->{txt06} = "$gps";#end content coordinates
$update_pos->{txt06} = "$gps";#end pos coordinates
@ -1336,6 +1338,7 @@ sub booking_update(){
$rows = $dbt->update_record($dbh,$update_pos,$record_pos);
if($rows > 0){
#if($rows > 0 && $lock_state eq "locked"){
$booking_values->{response_state} = "OK: available bike " . $q->param('bike');
$booking_values->{response_text} = "Danke! Die Miete Fahrrad Nr. " . $q->param('bike') . " wurde beendet.";
$ct_state = $state_key;

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

@ -103,7 +103,7 @@ sub sig_available {
if(ref($response_in) eq "HASH"){
foreach my $resp (@{ $response_in->{items} }) {
print FILE "response_in loop $dbt->{operator}->{$varenv->{dbname}}->{operatorApp}\n" . $q->param('request') . "\n" . Dumper($resp) . "\n";
print FILE "$now_dt response_in loop $dbt->{operator}->{$varenv->{dbname}}->{operatorApp}\n" . $q->param('request') . "\n" . Dumper($resp) . "\n";
if(ref($resp->{site}) eq "HASH" && $dbt->{operator}->{$varenv->{dbname}}->{operatorApp} && $q->param('request') eq "stations_available"){

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

@ -548,7 +548,8 @@ sub handler {
c_id => $R::confirm_userid,
txt34 => "ilike::$confirm_code%",
};
my $confirmed_email = $dbt->fetch_record($dbh,$authref);
my $confirmed_email = { c_id => 0 };
$confirmed_email = $dbt->fetch_record($dbh,$authref);
#($api_return,$users_sharee) = $apif->auth_verify($q,"",$R::confirm_code);
if($confirmed_email->{c_id}){
@ -577,7 +578,8 @@ sub handler {
c_id => $R::confirm_userid,
txt34 => "ilike::%$confirm_smscode",
};
my $confirmed_sms = $dbt->fetch_record($dbh,$authref);
my $confirmed_sms = { c_id => 0 };
$confirmed_sms = $dbt->fetch_record($dbh,$authref);
#($api_return,$users_sharee) = $apif->auth_verify($q,"",$R::confirm_smscode);
if($confirmed_sms->{c_id}){

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

@ -1314,7 +1314,7 @@ sub search_jsonadr(){
$sth = $dbh->prepare("SELECT ct.c_id AS id ,ct.$mjkey AS name FROM $table ct, relation rel WHERE ct.c_id=rel.content_id and rel.template_id=$template_id and $sel");
}else{
my $sel = "txt01 ilike '%$search%'";
$sth = $dbh->prepare("SELECT ct.txt01 || ', ' || ct.txt08 AS value, ct.txt01 AS vorname_name, ct.c_id FROM $table ct, relation rel WHERE ct.c_id=rel.content_id and rel.template_id=$template_id and $sel");
$sth = $dbh->prepare("SELECT ct.txt01 || ', ' || ct.c_id AS value, ct.txt01 AS vorname_name, ct.c_id FROM $table ct, relation rel WHERE ct.c_id=rel.content_id and rel.template_id=$template_id and $sel");
}
my $rc = $sth->execute();
my $rows = $sth->rows;
@ -1786,8 +1786,10 @@ sub csv2xls(){
#with c_ids over tpl_ids. ct4tpl
sub collect_cid(){
my $self = shift;
my ($table,$lang,$tpl_id,$rel_id,$barcode,$column2,$content2) = @_;
my $where = "where ct.c_id=rel.content_id and rel.lang='$lang' and rel.template_id='$tpl_id'";
my ($table,$lang,$tplids,$rel_id,$barcode,$column2,$content2) = @_;
$tplids =~ s/,$//;
my $where = "where ct.c_id=rel.content_id and rel.lang='$lang' and rel.template_id IN ($tplids)";
if($barcode && $barcode =~ /^\d+$/){
$where .= " and ct.barcode='$barcode'";
}elsif($rel_id){

7
copri4/main/src/Mod/Prelib.pm
View file

@ -586,12 +586,17 @@ sub save_relation {
if($_ =~ /template_id/ && $valxx){
$u_rows = $dbt->update_one($dbh,$update_relation,"template_id=$valxx");
}
if($_ =~ /int|n_sort|owner|node_public/){
if($_ =~ /int|n_sort|owner/){
$valxx =~ s/,/./;
$valxx = "null" if(!$valxx && $valxx ne "0");#for empty
$valxx = "0" if($valxx eq "0");
$u_rows = $dbt->update_one($dbh,$update_node,"$_=$valxx") if($valxx =~ /^\d+$|null|0/);
}
if($_ =~ /node_public/){
$valxx = "t" if($valxx eq "1" || $valxx eq "t");
$valxx = "f" if(!$valxx || $valxx eq "f");
$u_rows = $dbt->update_one($dbh,$update_node,"$_='$valxx'");
}
if($_ =~ /txt01/){
$u_rows = $dbt->update_one($dbh,$update_node,"$_='$valxx'");
}

6
copri4/main/src/Mod/Prelogic.pm
View file

@ -570,7 +570,8 @@ sub preinit(){
my $c_id = $users_dms->{c_id4trans} || "";#Document id
return "failure::Abbruch, die Aktion konnte keinem Dokument zugeordnet werden. Arbeiten Sie mit mehreren Browser-Tabs? Bitte multiple COPRI Tabs schließen und anschließend das Verkauf-Terminal neu öffnen." if(!$c_id);
my $table = "contenttrans"; my $ctt;
my $table = "contenttrans";
my $ctt = { c_id => 0 };
my $rel = $db->get_rel4tpl("",$lang,$users_dms->{c_id4trans},$users_dms->{tpl_id4trans});
$ctt = $db->get_content1("contenttrans",$rel->{content_id});
my ($node,$ct_exist);
@ -643,12 +644,15 @@ sub preinit(){
#after delete preauth after 0€ capture sets new TXID and increment reference
$ctt->{payone_reset} = $R::payone_reset;
$ctt->{int01} = 0;
$ctt->{sequence} = $ctt->{int18} || 1;
$ctt->{sequence}++;
if($ctadr->{int03} == 1 && $ctt->{txt16} && $R::state =~ /SEPA/){#SEPA 0
my $payoneret = $payone->captureSEPA_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id});
}
if($ctadr->{int03} == 2 && $ctt->{txt16} && $R::state =~ /Kreditkarte/){#CC 0
my $payoneret = $payone->captureCC_main(\%varenv,$ctadr,$ctt,$users_dms->{u_id});
}
$ctt = $db->get_content1("contenttrans",$ctt->{c_id});
}
if($ctadr->{int03} == 1 && $ctadr->{ct_name} =~ /\w{2}-\d+/){