roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-05-12 23:06:27 +02:00
Code Issues Projects Releases Packages Wiki Activity

sig service automatic and rental edit fix

Browse source
This commit is contained in:
ragu 2022-06-28 13:50:59 +02:00
parent ac2e93923b
commit 25a86e87e5
6 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
copri4/main/src/Tpl/BaseEdit.pm
View file

@ -150,7 +150,7 @@ sub tpl(){
$occupied_style = "color:#ff1493" if($cttpos->{int10} == 2 ||$cttpos->{int10} == 3 || $cttpos->{int10} == 6);
if($cttpos->{int35} && $cttpos->{start_time} && $cttpos->{end_time}){
$cttpos->{end_time} = $now_dt if($cttpos->{int10} == 3);
$cttpos->{end_time} = $now_dt if($cttpos->{int10} == 3 && $cttpos->{int20} == 2);
($pricing,$counting) = $pri->counting_rental(\%varenv,$cttpos,"calc_price");
$rental_feed = $pri->fetch_rentalfeed(\%varenv,$cttpos,$counting);
$gesamt = $pri->round($pricing->{total_price});
@ -305,6 +305,7 @@ EOF
my ($key,$des,$size,$postdes) = split /=/,$_;
if($key =~ /c_id|ct_name|txt08|barcode/){
print $q->hidden(-name=>"$key",-override=>1,-value=>"$cttpos->{$key}"),"\n" if($key eq "barcode");
print $q->Tr(),"\n";
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
print $q->td({-class=>'content1_cms'}, $q->b("$cttpos->{$key}")),"\n";

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

@ -192,7 +192,7 @@ sub tpl(){
end_date_time => "$end_date_time",
} if(!$R::cttpos_id);
$search->{c_id} = $R::c_id if($R::base_edit eq "save_pos" && $R::c_id);
$search->{barcode} = $q->escapeHTML("$R::barcode") if($R::base_edit eq "save_pos" && $R::barcode);
if(!$start_chck && !$end_chck){
if($node_meta->{ct_table} eq "contenttranspos"){
@ -242,7 +242,7 @@ sub tpl(){
#$h++;
my ($key,$des,$size) = split /=/,$_;
my $valxx = $q->param("$_");
$valxx = "" if($R::base_edit eq "save_pos");#empty search fields
$valxx = "" if($R::base_edit eq "save_pos" && $key ne "barcode");#empty search fields, select only bike number
if($key =~ /time/){
$size="10px";
@ -275,9 +275,9 @@ sub tpl(){
else{
$size="9px" if($key =~ /int/);
if($key =~ /ct_name/){
print $q->textfield(-class=>'stxt2',-name=>"$key",-default=>"",-size=>"$size",-override=>'1',-maxlength=>40, -placeholder=>"$des",-autofocus=>1),"\n";
print $q->textfield(-class=>'stxt2',-name=>"$key",-default=>"$valxx",-size=>"$size",-override=>'1',-maxlength=>40, -placeholder=>"$des",-autofocus=>1),"\n";
}else{
print $q->textfield(-class=>'stxt2',-name=>"$key",-default=>"",-size=>"$size",-override=>'1', -maxlength=>40, -placeholder=>"$des"),"\n";
print $q->textfield(-class=>'stxt2',-name=>"$key",-default=>"$valxx",-size=>"$size",-override=>'1', -maxlength=>40, -placeholder=>"$des"),"\n";
}
}
}