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

Faktura Address edit

Browse source
This commit is contained in:
Rainer Gümpelein 2022-03-18 14:51:25 +01:00
parent 6a99d40224
commit 41ba9e252e
8 changed files with 46 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -62,11 +62,14 @@ sub tpl(){
my $ctt = $ctx;
if(("$R::trans2edit" eq "client" && $R::c_idadr) || ($R::ct_trans eq "add_transadr")){
$ctt = $db->get_content1("contentadr",$R::c_idadr);
$c_idadr = $ctt->{c_id};
#print "c_idadr Got it from contentadr.c_id: $c_idadr\n";
#$mandat = " | Mandat $ctt->{ct_name}" if($ctt->{ct_name});
#$c_kdnr = $ctt->{ct_name};
$ctadr = $db->get_content1("contentadr",$R::c_idadr);
$c_idadr = $ctadr->{c_id};
$ctt->{int03} = $ctadr->{int03};
$ctt->{txt01} = $ctadr->{txt01};
$ctt->{txt03} = $ctadr->{txt03};
$ctt->{txt06} = $ctadr->{txt06};
$ctt->{txt07} = $ctadr->{txt07};
$ctt->{txt08} = $ctadr->{txt08};
}
print<<EOF
@ -127,21 +130,19 @@ EOF
$set_main_id=$main_id if($rel4tpl->{main_id} > "300000");
print $q->hidden(-name=>'set_main_id', -override=>'1', -value=>"$set_main_id");
print $q->span({-style=>'margin:0.2em 0.5em 0 0.5em;padding:0.8em 3em;background-color:white;border:solid thin gray;'}, "$ctx->{txt00}");
print $q->span({-style=>'margin:0em 0.5em 0 0.5em;padding:0.5em 3em;background-color:white;border:solid thin gray;position:absolute;left:3px;'}, "$ctx->{txt00}");
print $q->b("\# $ctx->{ct_name}");
print $q->span({-style=>'margin:0 0.5em;'},"&nbsp;");
print "<span style='margin:0 0.2em;position:absolute;left:180px;'>\n";
print $q->b({-style=>'padding:0 1em;'}, "\# $ctx->{ct_name}"), "\n";
if($ctx->{ct_name} =~ /\d+/ && $ctx->{txt00} eq "Storno"){
print $but->singlesubmit3("ct_trans","set_workflow2invoice","","","");
print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300008");
print $q->span({-style=>'margin:0 0.5em;'},"&nbsp;");
print $but->singlesubmit3("ct_trans","set_workflow2invoice","","",""),"\n";
print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300008"), "\n";
}
if($ctx->{ct_name} =~ /\d+/ && $ctx->{txt00} eq "Rechnung"){
print $but->singlesubmit3("ct_trans","set_workflow2storno","","","");
print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300009");
print $q->span({-style=>'margin:0 0.5em;'},"&nbsp;");
print $but->singlesubmit3("ct_trans","set_workflow2storno","","",""), "\n";
print $q->hidden(-name=>'set_main_id4workflow', -override=>'1', -value=>"300009"), "\n";
}
print "</span>\n";
if(!$ctt->{int01} || $ctt->{ct_name} =~ /-/){
print $q->span({-style=>'margin:0 0.2em;position:absolute;right:3px;'}, $but->singlesubmit3("ct_trans","print_pdf","","","")," $buchen_users->{txt01} / $invoice_time ", $but->singlesubmit7("ct_trans","remove_chk4rel","$ib{remove_chk4rel}","")),"\n";
@ -183,19 +184,21 @@ EOF
$int05 = "(manuell)" if($ctt->{int05});
if($users_dms->{u_id} && ($R::trans2edit eq "client" || $R::ct_trans eq "add_transadr")){
my @_anrede = ("","Frau","Herr","Firma");
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctx->{c_id}"),"\n";#c_id from contenttrans
#my @_anrede = ("","Frau","Herr","Firma");
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctx->{c_id}"),"\n";
print $q->hidden(-name=>'int10', -override=>'1', -value=>"$c_idadr"),"\n";
print $q->hidden(-name=>'c_idadr', -override=>'1', -value=>"$c_idadr"),"\n";
print $q->hidden(-name=>'int03', -override=>'1', -value=>"$ctt->{int03}"),"\n";
print $q->hidden(-name=>'rel_id', -override=>'1', -value=>"$rel4tpl->{rel_id}"),"\n";
print $q->Tr(),"\n";
print "<td class='tdtxt' nowrap>";
print $but->singlesubmit7("ct_trans","save_adr","$ib{save_adr}","","","ebutton"),"\n";
#print $q->span($q->a({-class=>"ebutton3",-href=>'javascript:history.back()'}, " back "));
print "</td>\n";
print $q->td({-class=>'tdval',-nowrap=>1}, $but->selector("txt02","60px",$ctt->{txt02},@_anrede)),"\n";
#print $q->td({-class=>'tdval',-nowrap=>1}, $but->selector("txt02","60px",$ctt->{txt02},@_anrede)),"\n";
#print $q->td({-class=>'tdval'}," ID $c_idadr $mandat"),"\n";
print $q->td({-class=>'tdval'},"Kunden ID $c_idadr"),"\n";
print $q->td({-class=>'tdval',-colspan=>'2'},"Kunden ID $c_idadr"),"\n";
$ctt->{txt01} = $lb->newline($ctt->{txt01},"","1");
print $q->Tr(),"\n";
print $q->td({-class=>'tdescr'},"Vorname Name<br />Zusatz"),"\n";
@ -232,10 +235,12 @@ EOF
print $q->td({-class=>'tdtxt'},"&nbsp;"),"\n";
}
print $q->td({-class=>'tdval'},"$ctt->{txt02}"),"\n";
if($c_idadr && $rel_adr->{rel_id}){
print $q->td({-class=>'tdval'},$q->span({-style=>"background-color:#dcd77f;"},$q->a({-class=>"linknav",-href=>"/DMS/Kunden?node2edit=editpart\&mode=manager\&rel_id=$rel_adr->{rel_id}\&tpl_id=202",-title=>"Kunden Stammdaten öffnen"}," Kunden ID $c_idadr ")), $q->span({-style=>"color:red;"}," $ctadr->{int12}")),"\n";
}
#print $q->td({-class=>'tdval'},"$ctt->{txt02}"),"\n";
if($c_idadr && $rel_adr->{rel_id}){
my $vde = "";
$vde = " Vde $ctadr->{int12}" if($ctadr->{int12});
print $q->td({-class=>'tdval',-colspan=>'2'},$q->span({-style=>"background-color:#dcd77f;"},$q->a({-class=>"linknav",-href=>"/DMS/Kunden?node2edit=editpart\&mode=manager\&rel_id=$rel_adr->{rel_id}\&tpl_id=202",-title=>"Kunden Stammdaten öffnen"}," Kunden ID $c_idadr ")), $q->span({-style=>"color:red;padding-left:10px;"}," $vde")),"\n";
}
$ctt->{txt01} = $lb->newline($ctt->{txt01},"","");
print $q->Tr(),"\n"; $line_count1++;
print $q->td({-class=>'tdtxt'},"&nbsp;"),"\n";

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

@ -549,7 +549,7 @@ EOF
foreach my $tf_id (@tariff){
$tf_id =~ s/\s//g;
#print "$record_bonus->{int22} == $tf_id<br>";
if($record_bonus->{int22} == $tf_id){
if($record_bonus->{int22} == $tf_id && $varenv{syshost} ne "shareedms-kn"){
$postdes = "Tarif: $record_bonus->{int21} - $record_bonus->{int22} (public - bonus)";
$postdes .= $q->span({-style=>'color:red;padding-left:10px;'},"Fehler: Bonusnummer") if(!$ctrel->{$key});
}

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

@ -382,7 +382,7 @@ sub tpl(){
my $pos_id = "";
my $user_device = "";
#if($users_dms->{u_id} == $dbt->{copri_conf}->{bike_state}->{superu_id}){
if($users_dms->{u_id} && $users_dms->{u_id} =~ /1842|5781|11765/){
if($users_dms->{u_id} && $users_dms->{u_id} =~ /1842|5781|11765|21618/){
$pos_id = $q->div({-class=>"popup",-onclick=>"toggle_box('$pid')"},"$cttpos->{$pid}->{c_id}", $q->span({-class=>"popuptext",-id=>"$pid"},"$pos_details"));
my $txt26 = $cttpos->{$pid}->{txt26};
my $txt21 = $cttpos->{$pid}->{txt21};