roko.li/sharee.bike
4
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2024-06-18 12:46:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Service-Config table fix

Browse source
This commit is contained in:
ragu 2022-09-29 17:27:02 +02:00
parent 5c98c8b8a5
commit 03d4fac62b
4 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
copri4/main/css/local_style20220915.css → copri4/main/css/local_style20220928.css
View file

@ -248,6 +248,12 @@ div#Oline {
border-right: 1px solid silver;
background-color:white;
}
.search_line_date {
border-bottom: 1px solid silver;
border-right: 1px solid silver;
background-color:white;
width: 50px;
}
.element3 {
margin:0.1em 0;
padding:0.2em;

10
copri4/main/src/Mod/Shareework.pm
View file

@ -489,7 +489,15 @@ sub save_account(){
#Testbuchhung mit 1 € preauthorization and 0 € capture
$ctadr = $dbt->fetch_record($dbh,$authref);
print FILE "+++ $R::request && $ctadr->{int03} == 1 && $ctadr->{ct_name} eq $ctadr->{c_id} \n" if($debug);
if($R::request eq "managemandate" && $ctadr->{int03} == 1 && $ctadr->{ct_name} eq $ctadr->{c_id}){
#if($R::request eq "managemandate" && $ctadr->{int03} == 1 && $ctadr->{ct_name} eq $ctadr->{c_id}){
#fraud workaround
my $iban = $ctadr->{txt22} || "";
$iban =~ s/\s//g;
my $iban_reject = 0;
$iban_reject = 1 if($iban =~ /DE33700202700000091600/i);
if($R::request eq "managemandate" && $ctadr->{int03} == 1 && $ctadr->{ct_name} eq $ctadr->{c_id} && !$iban_reject){
my $vde_on_fail = $ctadr->{int12} || 3;#keep last or set 3
my $payone_mival = $payone->managemandate_main(\%varenv,$ctadr,"",$owner);

8
copri4/main/src/Tpl/Liste3.pm
View file

@ -515,9 +515,9 @@ sub tpl(){
my $hstyle = "border-right: solid thin gray;border-bottom: solid thin gray;";
if($v_journal && $v_journal =~ /journal/){
print $q->div({-style=>"background-color:silver;$hstyle"},$but->singlesubmit1("detail_search","xxxxxxxxx","",""),"\n");
}
#if($v_journal && $v_journal =~ /journal/){
# print $q->div({-style=>"background-color:silver;$hstyle"},$but->singlesubmit1("detail_search","New methods xxxxxxxx","",""),"\n");
#}
print $q->hidden(-name=>'mandant_main_id', -value=>"$dbt->{shareedms_conf}->{parent_id}"),"\n";
print $q->hidden(-name=>'tpl_id4trans', -value=>"$node_meta->{tpl_id}"),"\n";
@ -654,7 +654,7 @@ sub tpl(){
$e_mtime = $searchref->{end_date_time};
}
print $q->td({-nowrap=>1,-class=>"search_line"},$q->textfield(-id=>'datepicker1',-class=>'sdate',-name=>"s_start_$key",-default=>"$s_mtime",-size=>"$size",-maxlength=>20),"-",$q->textfield(-id=>'datepicker2',-class=>'sdate',-name=>"s_end_$key",-default=>"$e_mtime",-size=>"$size",-maxlength=>20)),"\n" if($key =~ /time$/);
print $q->td({-nowrap=>1,-class=>"search_line_date"},$q->textfield(-id=>'datepicker1',-class=>'etxt',-name=>"s_start_$key",-default=>"$s_mtime",-size=>"7",-maxlength=>10),"-",$q->textfield(-id=>'datepicker2',-class=>'etxt',-name=>"s_end_$key",-default=>"$e_mtime",-size=>"7",-maxlength=>10)),"\n" if($key =~ /time$/);
}

24
copri4/main/src/Tpl/SubListe.pm
View file

@ -220,12 +220,12 @@ EOF
}
}
#trying to save hashref
if($R::detail_search && ref($searchref) eq "HASH"){
store $searchref, $hashfile;
}elsif($keycount > 0 && !$R::detail_search && -f $hashfile && !$R::col_sort && !$R::sort_updown){
$searchref = {};
$searchref = retrieve($hashfile);
}
#if($R::detail_search && ref($searchref) eq "HASH"){
# store $searchref, $hashfile;
#}elsif($keycount > 0 && !$R::detail_search && -f $hashfile && !$R::col_sort && !$R::sort_updown){
# $searchref = {};
# $searchref = retrieve($hashfile);
#}
#print Dumper($searchref);
my $export = "";
my $todo = "";
@ -272,16 +272,16 @@ EOF
$size = 10 if($size =~ /time/);
$size = 2 if($size =~ /checkbox/);
$s_val = $searchref->{$key} if($searchref->{$key});
#$s_val = $searchref->{$key} if($searchref->{$key});
#print "$key=$searchref->{$key}|";
if($key =~ /node|txt|int|uri|ct_name|_id|barcode|sort|public/){
if($key =~ /barcode|int04/){
print $q->td({-class=>"search_line"},$q->textfield(-class=>'stxt',-name=>"s_$key",-size=>"4",-default=>"$s_val",-maxlength=>40, -autofocus=>1)),"\n";
if($key =~ /node|txt|int|ct_name|_id|barcode|sort|public/){
if($key =~ /_id|barcode|int04/){
print $q->td({-class=>"search_line", -style=>'width:100px;'},$q->textfield(-class=>'stxt',-name=>"s_$key",-size=>"4",-default=>"$s_val",-maxlength=>40, -autofocus=>1)),"\n";
}else{
print $q->td({-class=>"search_line"},$q->textfield(-class=>'stxt',-name=>"s_$key",-size=>"$size",-default=>"$s_val",-maxlength=>40)),"\n";
}
}elsif($key =~ /owner/){
print $q->td({-class=>'search_line'},$but->selector("s_$key","","$s_val",@_users)),"\n";
print $q->td({-class=>'search_line', -style=>'width:10px;'},$but->selector("s_$key","","$s_val",@_users)),"\n";
}
my $s_mtime; my $e_mtime;
if($key eq "mtime"){
@ -293,7 +293,7 @@ EOF
$e_mtime = $searchref->{end_date_time};
}
print $q->td({-nowrap=>1,-class=>"search_line"},$q->textfield(-id=>'datepicker1',-class=>'etxt',-name=>"s_start_$key",-default=>"$s_mtime",-size=>"11",-maxlength=>10),"-",$q->textfield(-id=>'datepicker2',-class=>'etxt',-name=>"s_end_$key",-default=>"$e_mtime",-size=>"11", -maxlength=>10)),"\n" if($key =~ /time/);
print $q->td({-nowrap=>1,-class=>"search_line_date"},$q->textfield(-id=>'datepicker1',-class=>'etxt',-name=>"s_start_$key",-default=>"$s_mtime",-size=>"$size",-maxlength=>10),"-",$q->textfield(-id=>'datepicker2',-class=>'etxt',-name=>"s_end_$key",-default=>"$e_mtime",-size=>"$size", -maxlength=>10)),"\n" if($key =~ /time/);
}#end Search-fields
}