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

adding fees by rental editor

Browse source
This commit is contained in:
ragu 2022-09-20 16:13:45 +02:00
parent 876d1e6df2
commit 80f7e5efe2
13 changed files with 103 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -334,6 +334,7 @@ EOF
if($key =~ /barcode/){
print $q->hidden(-name=>"$key",-override=>1,-value=>"$cttpos->{$key}"),"\n";
print $q->hidden(-name=>"ct_id",-override=>1,-value=>"$cttpos->{ct_id}"),"\n";
print $q->Tr(),"\n";
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
print $q->td({-class=>'content1_cms'}, $q->b("$prefix$cttpos->{$key}")),"\n";
@ -456,6 +457,12 @@ EOF
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
print $q->td({-class=>'content1_cms',-nowrap=>"1"}," \n");
}
#only if invoice isn't booked
if($key eq "txt23" && $cttpos->{ca_id} && $cttpos->{ct_id} && !$cttpos->{state}){
print $q->Tr(),"\n";
print $q->td({-class=>'left_italic_cms'}, $q->a({-class=>"linknav4",-href=>"/$dbt->{shareedms_conf}->{parent_node}/Waren/Gebühren?ca_id=$cttpos->{ca_id}\&ct_id=$cttpos->{ct_id}\&owner=$users_dms->{u_id}",-title=>""},"Gebühr hinzufügen")),"\n";
print $q->td({-class=>'content1_cms'}," \n");
}
}#end edit position
#service-config

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

@ -191,7 +191,8 @@ sub tpl(){
end_date_time => "$end_date_time",
} if(!$R::cttpos_id);
$search->{barcode} = $q->escapeHTML("$R::barcode") if($R::base_edit eq "save_pos" && $R::barcode);
#$search->{barcode} = $q->escapeHTML("$R::barcode") if($R::base_edit eq "save_pos" && $R::barcode);
$search->{ct_id} = $q->escapeHTML("$R::ct_id") if($R::ct_id);#done on save_pos and insert fee
if(!$start_chck && !$end_chck){
if($node_meta->{ct_table} eq "contenttranspos"){
@ -469,7 +470,7 @@ sub tpl(){
print $q->div({-style=>'float:left;margin-left:1em;'}, "→ Faktura", $q->a({-class=>"linknav3",-style=>"$trans_style",-href=>"/DMS/Faktura?ct_trans=open\&c_id4trans=$c_id4trans\&tpl_id4trans=$tpl_id4trans\&kind_of_trans=Faktura\&owner=$users_dms->{owner}",-title=>"Faktura Terminal öffnen"},"\#$ct_name")),"\n" if($c_id4trans && $tpl_id4trans);
print $q->div({-style=>'float:left;margin-left:1em;'}, "$user_device"),"\n";
}
print $q->div({-style=>'float:left;margin-left:1em;'}, " → $comment"),"\n";
print $q->div({-style=>'float:left;margin-left:1em;'}, " → $comment"),"\n" if($comment);
}elsif($node_meta->{ct_table} eq "contenttheftpos"){
my $speed = 0;
@ -500,9 +501,9 @@ sub tpl(){
#backward | forward
print $q->div({-style=>'float:left;padding:0.5em;'}, "Zeile: $offset - $offset_nr"),"\n";
print "<div style='padding:0.5em;'>\n";
print $q->a({-class=>"linknav",-href=>"?go=backward_list;offset=$offset;limit=$limit",-title=>''},"< zurück ... ") if($offset >= $limit);
print $q->a({-class=>"linknav",-href=>"?go=forward_list;offset=$offset;limit=$limit",-title=>''}," ... vorwärts >") if($nr >= $limit-10);
print "<div style='float:left;padding:0.5em;'>\n";
print $q->a({-class=>"linknav1",-href=>"?go=backward_list;offset=$offset;limit=$limit",-title=>'backward'}," &larr; ") if($offset >= $limit);
print $q->a({-class=>"linknav1",-href=>"?go=forward_list;offset=$offset;limit=$limit",-title=>'forward'}," &rarr;") if($nr >= $limit-10);
print "</div>\n";
print $q->end_form;

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

@ -194,7 +194,6 @@ sub tpl(){
my ($daymarker,$raster_mmpx,$day4month) = $lb->month_line($users_dms);
my $rows = 0;
my $tpath = "";
#get Firma
my $ctf = $db->get_content1("contentuser","$dbt->{sharedms_conf}->{parent_id}");
@ -825,10 +824,12 @@ sub tpl(){
if($table =~ /content$|contentadr|contentnel/){
$ecol++;
print "<td class='tb_inst' style='$set_style' nowrap>\n";
#2021-06-08 disabled because dms must be browser-tab save
if(1==2 && $table eq "content" && ($ct4rel->{$id}->{template_id} =~ /205|224|229/)){#bikes|Gutschein|Zubehör
print $q->a({-class=>"editnav",-href=>"$tpath?ct_trans=add_transpos\&mandant_main_id=$dbt->{shareedms_conf}->{parent_id}\&kind_of_trans=$users_dms->{kind_of_trans}\&c_id=$ct4rel->{$id}->{content_id}\&owner=$users_dms->{u_id}",-title=>"zum $users_dms->{kind_of_trans} \#$ctrel->{ct_name} $ctrel->{txt01} hinzufügen"}, $q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-512-copy.png", -style=>'height:1.3em;'}));
#fee2pos
if($table eq "content" && ($ct4rel->{$id}->{template_id} =~ /229/) && $R::ca_id && $R::ct_id){
print $q->a({-class=>"editnav",-href=>"/$dbt->{shareedms_conf}->{parent_node}/Mietjournal?insert_contenttranspos=1\&c_id=$ct4rel->{$id}->{c_id}\&ca_id=$R::ca_id\&ct_id=$R::ct_id\&owner=$users_dms->{u_id}",-title=>"Gebühr hinzufügen"}, $q->img({-src=>"$varenv{metahost}/glyphicons/glyphicons-512-copy.png", -style=>'height:1.3em;'}));
}
if($table eq "content" && ($ct4rel->{$id}->{template_id} =~ /205|225/)){
my $rnid = $ct4rel->{$id}->{rel_id};
my $node_names = "failure $rnid | $relnod->{$rnid}->{content_id} == $ct4rel->{$id}->{c_id}";
@ -1351,10 +1352,10 @@ sub tpl(){
print $q->hidden(-name=>'tpl_id',-override=>'1', -value=>"$tpl_id");
print "<div id='jump_bottom' style='clear:both;border:0px dotted silver;height:35px;'>\n";
if($R::detail_search !~ /suchen/ && $rows > $limit && $nr > 0){
print $q->div({-style=>'float:left;padding:6px 0 0 20px;'},"Datensätze pro Seite:",$q->textfield(-style=>'height:16px;',-name=>"limit",-default=>"$limit",-size=>"3",-maxlength=>10)),"\n";
print $q->div({-style=>'float:left;padding:7px 0 0 10px;'},$but->singlesubmit3("detail_search","reload_search","$varenv{metahost}/img/refresh.png","height:14px;","Tabelle neu laden")),"\n";
}
#if($R::detail_search !~ /suchen/ && $rows > $limit && $nr > 0){
#print $q->div({-style=>'float:left;padding:6px 0 0 20px;'},"Datensätze pro Seite:",$q->textfield(-style=>'height:16px;',-name=>"limit",-default=>"$limit",-size=>"3",-maxlength=>10)),"\n";
#print $q->div({-style=>'float:left;padding:7px 0 0 10px;'},$but->singlesubmit3("detail_search","reload_search","$varenv{metahost}/img/refresh.png","height:14px;","Tabelle neu laden")),"\n";
#}
print $q->end_form;
my $offset_nr = $offset + $nr;
@ -1364,8 +1365,8 @@ sub tpl(){
#backward | forward
print "<div style='padding:6px 0 0 10px;'>\n";
print $q->a({-class=>"linknav",-href=>"?go=backward_list;offset=$offset;limit=$limit",-title=>''},"< zurück ... ") if($offset >= $limit);
print $q->a({-class=>"linknav",-href=>"?go=forward_list;offset=$offset;limit=$limit",-title=>''}," ... vorwärts >") if($counter >= $limit-10); #if($rows > $limit && $nr > 0);
print $q->a({-class=>"linknav1",-href=>"?go=backward_list;offset=$offset;limit=$limit",-title=>'backward'},"&larr; ") if($offset >= $limit);
print $q->a({-class=>"linknav1",-href=>"?go=forward_list;offset=$offset;limit=$limit",-title=>'forward'}," &rarr;") if($counter >= $limit-10); #if($rows > $limit && $nr > 0);
print "</div>\n";
print "</div>\n";
print $q->div({-style=>'padding:6px 0 6px 20px;text-decoration:underline;'}, "Symbol Legende"),"\n";

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

@ -441,8 +441,8 @@ EOF
#backward | forward
print "<div style='padding:0.5em;'>\n";
print $q->a({-class=>"linknav",-href=>"?go=backward_list;offset=$offset;limit=$limit",-title=>''},"< zurück ... ") if($offset >= $limit);
print $q->a({-class=>"linknav",-href=>"?go=forward_list;offset=$offset;limit=$limit",-title=>''}," ... vorwärts >") if($nr >= $limit-10); #if($rows > $limit && $nr > 0);
print $q->a({-class=>"linknav1",-href=>"?go=backward_list;offset=$offset;limit=$limit",-title=>'backward'}," &larr; ") if($offset >= $limit);
print $q->a({-class=>"linknav1",-href=>"?go=forward_list;offset=$offset;limit=$limit",-title=>'forward'}," &rarr; ") if($nr >= $limit-10); #if($rows > $limit && $nr > 0);
print "</div>\n";
print $q->end_form,"\n";