roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-11 22:37:27 +02:00
Code Issues Projects Releases Packages 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
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"];