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

some minor fixes

Browse source
This commit is contained in:
ragu 2023-10-19 16:55:21 +02:00
parent 41bd55d6c2
commit 60f21a4f85
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -156,7 +156,7 @@ sub update_operatorsloop {
#delete $record_primary->{int05};#Web-Login
#delete $record_primary->{int12};#Vde (remove delete for global setting)
delete $record_primary->{int23};#mini_answer count will be saved on operator
delete $record_primary->{txt29};#Sonstiges
#delete $record_primary->{txt29};#Sonstiges
delete $record_primary->{txt35};#Umfragelink
my $update = {
@ -1703,7 +1703,7 @@ sub search_content(){
$ck4ex =~ s/,$//;
my $owner = $users_dms->{u_id} || 0;
my $sort_updown = $users_dms->{sort_updown} || "down";
my $sort_updown = $users_dms->{"sort_updown_$table"} || "down";
my $scol = $searchref->{scol} || "mtime";
my $offset = $searchref->{offset} || 0;
my $limit = $searchref->{limit} || 200;
@ -1716,7 +1716,7 @@ sub search_content(){
open(FILE,">>$varenv{logdir}/Liste3.log") if($debug);
print FILE "*** $stamp_time Libenzdb.search_content3 ***\n" if($debug);
print FILE Dumper($searchref) if($debug);
print FILE "$table,$node_meta->{node_name},$owner,$main_ids,$tplids,$ct_ids,$v_journal,$ck4ex\n" if($debug);
print FILE "$table,$node_meta->{node_name},$owner,$sort_updown,$main_ids,$tplids,$ct_ids,$v_journal,$ck4ex\n" if($debug);
close(FILE) if($debug);

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

@ -71,7 +71,7 @@ sub count_freedrental {
#2023-10-10 changed from 0min to rental_minute_all >= 5min to keep freed time on rentals >=5min
#freed mangement will be only dony on accountable rental
if($pricing->{rentalog}->{rental_minute_all} >= 5 && $ca_id == $pos->{ca_id}){
if($ca_id == $pos->{ca_id}){
my $pref_pos = {
table => "contenttranspos",
fetch => "all",
@ -101,11 +101,11 @@ sub count_freedrental {
if($freed_count > 1 && $pos->{c_id} != $record_pos->{$pid}->{c_id}){
$further_freedtime_available = 0;
if($adjust_freedtime){
my $pos_ref = {
if($adjust_freedtime && $pricing->{rentalog}->{rental_minute_all} >= 5){
my $pos_ref = {
table => "contenttranspos",
c_id => $record_pos->{$pid}->{c_id},
};
};
$dbt->update_one($dbh,$pos_ref,"time02='00:00'");
print FILE "--> delete freed_time on c_id=$record_pos->{$pid}->{c_id} to time02=00:00\n" if($debug);
}else{
@ -304,6 +304,7 @@ sub counting_rental {
$return->{freed_time} = "$freed_time";
$return->{computed_hours} = "$computed_hours";
$return->{unit_price} = "$ctpos->{int35}" || "";
$return->{rental_minute_all} = "$rental_minute_all";
$return->{real_clock} = "$real_clock";
$return->{total_price} = "$total_price";
$return->{discount} = "$discount";
@ -417,7 +418,7 @@ sub fetch_rentalfeed {
$ctpos->{int17} =~ s/\./,/ if($lang eq "de");
$return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{int17}","$ctpos->{int17} € / 24 $varenv_prim->{cms}->{'unit-hour'}->{txt}"];
}elsif($td_template->{$td}->{time02} && $ctpos->{time02} =~ /[1-9]/){
if($varenv->{orga} eq "dms" || $further_freedtime_available == 1 || ($ctpos->{int10} == 3 && $ctpos->{time02})){
if($varenv->{orga} eq "dms" || $further_freedtime_available == 1 || ($ctpos->{int10} == 3 && $ctpos->{time02} && $returned_counting->{rental_minute_all} >= 5)){
$time_unit = $dbt->time_format($varenv_prim,$ctpos->{time02});
$time_unit .= " / $varenv_prim->{cms}->{'unit-day'}->{txt}" if($dbt->{operator}->{$varenv->{dbname}}->{project} ne "Konstanz");
$return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{time02}","$time_unit"];

4
copri4/main/src/Tpl/Address3.pm
View file

@ -178,8 +178,8 @@ EOF
}elsif(looks_like_number($ctt->{int01}) && ! -f "$varenv->{basedir}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf"){
print $q->span({-style=>'margin:0 0.2em;position:absolute;right:3px;'}, $but->singlesubmit3("ct_trans","print_pdf","","","")),"\n";
}
print $q->span({-style=>'margin:0 0.2em;padding:0.3em;font-size:0.81em;position:absolute;right:100px;'}, "$buchen_users->{txt01} / $invoice_time "),"\n";
print "</div>\n";
print $q->span({-style=>'margin:0 0.2em;padding:0.3em;font-size:0.81em;position:absolute;right:100px;'},$q->a({-class=>"ebutton3",-target=>'_blank', -href=>"$dbt->{shareedms_conf}->{copri_wiki}"}, "copri wiki"), "$buchen_users->{txt01} / $invoice_time "),"\n";
print "</div>\n";
print $q->hidden(-name=>'owner', -override=>'1', -value=>"$users_dms->{owner}");
print $q->hidden(-name=>'c_idadr', -override=>'1', -value=>"$c_idadr");

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

@ -196,12 +196,12 @@ EOF
my @tpl_order = split /,/,$node_meta->{tpl_order};
my $rows = 0;
#table columne check for col_sort
if($users_dms->{"col_sort_$table"}){
$searchref->{scol} = $users_dms->{"col_sort_$table"};
if($users_dms->{"col_sort_$searchref->{table_pos}"}){
$searchref->{scol} = $users_dms->{"col_sort_$searchref->{table_pos}"};
}
$searchref->{scol} = "u_id" if($node_meta->{template_id} == 198);
$users_dms->{"sort_updown_$table"} = "down" if(!$users_dms->{"sort_updown_$table"});
$users_dms->{"sort_updown_$searchref->{table_pos}"} = "down" if(!$users_dms->{"sort_updown_$searchref->{table_pos}"});
#print Dumper($node_meta);
my $hashfile = "$varenv{logdir}/$users_dms->{u_id}-$varenv{dbname}-$searchref->{table_pos}-searchhash";
@ -329,8 +329,8 @@ EOF
#print $q->th({-style=>""},"&nbsp;"),"\n";
my $sort_up = "up";
my $sort_down = "down";
$sort_up = "<b>$sort_up</b>" if($users_dms->{"sort_updown_$table"} eq "up");
$sort_down = "<b>$sort_down</b>" if($users_dms->{"sort_updown_$table"} eq "down");
$sort_up = "<b>$sort_up</b>" if($users_dms->{"sort_updown_$searchref->{table_pos}"} eq "up");
$sort_down = "<b>$sort_down</b>" if($users_dms->{"sort_updown_$searchref->{table_pos}"} eq "down");
print $q->th($q->a({-class=>"sortnav",-href=>"?sort_updown=up\&offset=$searchref->{offset}\&limit=$searchref->{limit}",-title=>'Aufsteigend sortieren'},"$sort_up"),"|",$q->a({-class=>"sortnav",-href=>"?sort_updown=down\&offset=$searchref->{offset}\&limit=$searchref->{limit}",-title=>'Absteigend sortieren'},"$sort_down")),"\n";
print $q->th({-style=>""},"&nbsp;"),"\n";
}
@ -355,7 +355,7 @@ EOF
my $sort_title="| $val";
if($node_meta->{tpl_id} !~ /198|199/){
$val = "<b>$val</b>" if($key eq $users_dms->{"col_sort_$table"});
$val = "<b>$val</b>" if($key eq $users_dms->{"col_sort_$searchref->{table_pos}"});
print $q->th({-style=>'padding:5px 0'},$q->div({-style=>"$divstyle"},$q->a({-class=>"sortnav",-href=>"?col_sort=$key\&offset=$searchref->{offset}\&limit=$searchref->{limit}",-title=>"$val"},"$val"))),"\n" if($key ne "u_id");
}else{
print $q->th({-style=>'padding:5px 0'},$q->div({-style=>"$divstyle"},"$val")),"\n" if($key ne "u_id");
@ -388,7 +388,7 @@ EOF
else{
my $scol = $searchref->{scol};
foreach my $id (sort {
if($users_dms->{"sort_updown_$table"} eq "down"){
if($users_dms->{"sort_updown_$searchref->{table_pos}"} eq "down"){
if ($scol =~ /barcode|int|_id/) {
$ct4rel->{$b}->{$scol} <=> $ct4rel->{$a}->{$scol}
}else{
@ -495,7 +495,7 @@ EOF
print $q->end_form,"\n";
print "</div>\n";
my $debug = "(ct_table: $node_meta->{ct_table} | main_id: $node_meta->{main_id} | template_id: $node_meta->{template_id})";
my $debug = "(ct_table: $node_meta->{ct_table} | main_id: $node_meta->{main_id} | template_id: $node_meta->{template_id} | table_pos: $searchref->{table_pos})";
print $q->div({-style=>'position:fixed;bottom:1%;font-size:13px;'},"$debug"),"\n" if($users_dms->{u_id} eq $varenv{superu_id});
return $feedb;