roko.li/sharee.bike
5
0
Fork 0
mirror of https://gitlab.com/t6353/sharee.bike.git synced 2025-02-21 11:16:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

tarif_elements cms language fix

Browse source
This commit is contained in:
ragu 2023-10-18 12:15:15 +02:00
parent b92f2c6b5c
commit 41bd55d6c2
12 changed files with 74 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
copri4/main/src/Mod/APIjsonserver.pm
View file

@ -68,7 +68,7 @@ my $response = {
apiserver => "$apiserver", apiserver => "$apiserver",
response => "$respreq", response => "$respreq",
uri_primary => "$dbt->{primary}->{sharee_primary}->{primaryApp}", uri_primary => "$dbt->{primary}->{sharee_primary}->{primaryApp}",
copri_version => "4.1.23.18", copri_version => "4.1.23.19",
user_id => "", user_id => "",
authcookie => "", authcookie => "",
new_authcoo => "0", new_authcoo => "0",

2
copri4/main/src/Mod/Buttons.pm
View file

@ -262,7 +262,7 @@ sub selector_class(){
my $column = shift; my $column = shift;
my $class = shift || ""; my $class = shift || "";
my $style = shift || ""; my $style = shift || "";
my $sel = shift || ""; my $sel = shift || 0;
my @selval = @_; my @selval = @_;
my @selopt = (); my @selopt = ();

12
copri4/main/src/Mod/Modalbox.pm
View file

@ -24,6 +24,7 @@ sub new {
} }
sub mobox(){ sub mobox(){
my $varenv = shift;
my $node_meta = shift; my $node_meta = shift;
my $users_dms = shift; my $users_dms = shift;
my $return = shift || ""; my $return = shift || "";
@ -35,7 +36,6 @@ sub mobox(){
my $dbt = new DBtank; my $dbt = new DBtank;
$q->import_names('R'); $q->import_names('R');
my @keywords = $q->param; my @keywords = $q->param;
my %varenv = $cf->envonline();
my $script = $q->script_name(); my $script = $q->script_name();
my $path = $q->path_info(); my $path = $q->path_info();
my $lang = "de"; my $lang = "de";
@ -52,7 +52,7 @@ sub mobox(){
my $rows = $address_wc + $table_wc; my $rows = $address_wc + $table_wc;
my $height = "600"; my $height = "600";
if($varenv{orga} eq "dms"){ if($varenv->{orga} eq "dms"){
$rows = $rows - 0; $rows = $rows - 0;
}else{ }else{
$rows = $rows - 10; $rows = $rows - 10;
@ -67,13 +67,13 @@ print<<EOF
background: $bg_color; background: $bg_color;
} }
.ui-dialog > .ui-widget-header { .ui-dialog > .ui-widget-header {
color:$varenv{color}; color:$varenv->{color};
font-weight:normal; font-weight:normal;
border:1px solid $bg_color2; border:1px solid $bg_color2;
background: $bg_color2; background: $bg_color2;
} }
.ui-widget-overlay { .ui-widget-overlay {
background: #666 url("$varenv{metahost}/external/jquery-ui-1.12.1/images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat; background: #666 url("$varenv->{metahost}/external/jquery-ui-1.12.1/images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat;
opacity: .5; opacity: .5;
filter: Alpha(Opacity=50); filter: Alpha(Opacity=50);
} }
@ -103,9 +103,9 @@ EOF
print "<div id='dialog-form' style='text-align:center;margin:0;padding:2px;max-width:1200px;' title='Terminal – Faktura $debug'>"; print "<div id='dialog-form' style='text-align:center;margin:0;padding:2px;max-width:1200px;' title='Terminal – Faktura $debug'>";
if(looks_like_number($users_dms->{c_id4trans}) && looks_like_number($users_dms->{tpl_id4trans})){ if(looks_like_number($users_dms->{c_id4trans}) && looks_like_number($users_dms->{tpl_id4trans})){
if($table eq "contenttrans" && $varenv{orga} eq "dms"){ if($table eq "contenttrans" && $varenv->{orga} eq "dms"){
require "Tpl/Address3.pm"; require "Tpl/Address3.pm";
&Address3::tpl($node_meta,$users_dms,$return); &Address3::tpl($varenv,$node_meta,$users_dms,$return);
} }
}else{ }else{
print $q->div({-style=>"padding:0.1em;margin:0em;background-color:white;font-size:0.81em;"}, "Ein neues Formular kann im COPRI Hauptfenster geöffnet werden (Code: $users_dms->{c_id4trans} && $users_dms->{tpl_id4trans})", print $q->div({-style=>"padding:0.1em;margin:0em;background-color:white;font-size:0.81em;"}, "Ein neues Formular kann im COPRI Hauptfenster geöffnet werden (Code: $users_dms->{c_id4trans} && $users_dms->{tpl_id4trans})",

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

@ -21,6 +21,7 @@ sub new {
} }
sub mobox3(){ sub mobox3(){
my $varenv = shift;
my $node_meta = shift; my $node_meta = shift;
my $users_dms = shift; my $users_dms = shift;
my $feedb = shift || {}; my $feedb = shift || {};
@ -31,7 +32,6 @@ sub mobox3(){
my $but = new Buttons; my $but = new Buttons;
$q->import_names('R'); $q->import_names('R');
my @keywords = $q->param; my @keywords = $q->param;
my %varenv = $cf->envonline();
my $script = $q->script_name(); my $script = $q->script_name();
my $path = $q->path_info(); my $path = $q->path_info();
my $coo = $q->cookie(-name=>'domcookie'); my $coo = $q->cookie(-name=>'domcookie');
@ -69,7 +69,7 @@ print<<EOF
background: $bg_color2; background: $bg_color2;
} }
.ui-widget-overlay { .ui-widget-overlay {
background: #666 url("$varenv{metahost}/external/jquery-ui-1.12.1/images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat; background: #666 url("$varenv->{metahost}/external/jquery-ui-1.12.1/images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat;
opacity: .5; opacity: .5;
filter: Alpha(Opacity=50); filter: Alpha(Opacity=50);
} }
@ -114,7 +114,7 @@ EOF
#} #}
elsif(($R::node2edit && $R::node2edit =~ /editpart/) || ($R::base_edit && $R::base_edit !~ /delete/)){ elsif(($R::node2edit && $R::node2edit =~ /editpart/) || ($R::base_edit && $R::base_edit !~ /delete/)){
require "Tpl/BaseEdit.pm"; require "Tpl/BaseEdit.pm";
&BaseEdit::tpl($node_meta,$users_dms,$feedb); &BaseEdit::tpl($varenv,$node_meta,$users_dms,$feedb);
} }
else{ else{
print $q->div("Zugriff verweigert."); print $q->div("Zugriff verweigert.");

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

@ -417,7 +417,7 @@ sub fetch_rentalfeed {
$ctpos->{int17} =~ s/\./,/ if($lang eq "de"); $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}"]; $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]/){ }elsif($td_template->{$td}->{time02} && $ctpos->{time02} =~ /[1-9]/){
if($further_freedtime_available == 1 || ($ctpos->{int10} == 3 && $ctpos->{time02})){ if($varenv->{orga} eq "dms" || $further_freedtime_available == 1 || ($ctpos->{int10} == 3 && $ctpos->{time02})){
$time_unit = $dbt->time_format($varenv_prim,$ctpos->{time02}); $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"); $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"]; $return->{rental_description}->{tarif_elements}->{$td} = ["$td_template->{$td}->{time02}","$time_unit"];

1
copri4/main/src/Mod/Printpreview.pm
View file

@ -52,6 +52,7 @@ sub printpre(){
my $pkey = $R::pkey || ""; my $pkey = $R::pkey || "";
my $debug = 0;#print line to doc if debug my $debug = 0;#print line to doc if debug
$varenv{cms} = $dbt->fetch_cms($dbh,{ lang => $lang });
my $api_file = "/var/www/copri4/shareeconf/apikeys.cfg"; my $api_file = "/var/www/copri4/shareeconf/apikeys.cfg";
my $aconf = Config::General->new($api_file); my $aconf = Config::General->new($api_file);
my %apikeyconf = $aconf->getall; my %apikeyconf = $aconf->getall;

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

@ -28,6 +28,7 @@ sub new {
#Template #Template
sub tpl(){ sub tpl(){
my $varenv = shift;
my $node_meta = shift; my $node_meta = shift;
my $users_dms = shift; my $users_dms = shift;
my $return = shift || ""; my $return = shift || "";
@ -40,7 +41,6 @@ sub tpl(){
my $but = new Buttons; my $but = new Buttons;
my $transp = new TransPositionen; my $transp = new TransPositionen;
my $trin = new TransInvoices; my $trin = new TransInvoices;
my %varenv = $cf->envonline();
my $lang = "de"; my $lang = "de";
my %ib = $but->ibuttons(); my %ib = $but->ibuttons();
my $line_count1 = 0; my $line_count1 = 0;
@ -65,7 +65,7 @@ sub tpl(){
c_id => $users_dms->{c_id4trans}, c_id => $users_dms->{c_id4trans},
}; };
$ctt = $dbt->fetch_record($dbh,$pref); $ctt = $dbt->fetch_record($dbh,$pref);
my $praefix = "$ctt->{txt00}-$varenv{praefix}"; my $praefix = "$ctt->{txt00}-$varenv->{praefix}";
my $warn_time = $ctt->{warn_time} || ""; my $warn_time = $ctt->{warn_time} || "";
$warn_time = $lb->time4de($warn_time,0) if($warn_time); $warn_time = $lb->time4de($warn_time,0) if($warn_time);
@ -150,7 +150,7 @@ EOF
$journalhead = "<br /><span style='color:silver;font-size:0.81em;'>Journal</span>" if($ctt->{template_id} == 209); $journalhead = "<br /><span style='color:silver;font-size:0.81em;'>Journal</span>" if($ctt->{template_id} == 209);
$set_main_id=$main_id if($ctt->{main_id} > "300000"); $set_main_id=$main_id if($ctt->{main_id} > "300000");
print $q->hidden(-name=>'set_main_id', -override=>'1', -value=>"$set_main_id"); print $q->hidden(-name=>'set_main_id', -override=>'1', -value=>"$set_main_id");
print $q->span({-style=>'margin:0em 0.5em 0 0.5em;padding:0.2em 1em;background-color:white;border:solid thin gray;position:absolute;left:3px;'}, "$ctt->{txt00} $varenv{praefix}-$ctt->{ct_name} $journalhead"); print $q->span({-style=>'margin:0em 0.5em 0 0.5em;padding:0.2em 1em;background-color:white;border:solid thin gray;position:absolute;left:3px;'}, "$ctt->{txt00} $varenv->{praefix}-$ctt->{ct_name} $journalhead");
print "<span style='margin:0 0.2em;position:absolute;left:280px;'>\n"; print "<span style='margin:0 0.2em;position:absolute;left:280px;'>\n";
#print $q->b({-style=>'padding:0 1em;'}, "\# $ctt->{ct_name}"), "\n"; #print $q->b({-style=>'padding:0 1em;'}, "\# $ctt->{ct_name}"), "\n";
@ -175,7 +175,7 @@ EOF
print $q->hidden(-name=>'template_id', -override=>'1', -value=>"$ctt->{template_id}"); print $q->hidden(-name=>'template_id', -override=>'1', -value=>"$ctt->{template_id}");
print $q->hidden(-name=>'main_id', -override=>'1', -value=>"$ctt->{main_id}"); print $q->hidden(-name=>'main_id', -override=>'1', -value=>"$ctt->{main_id}");
print $q->hidden(-name=>'rel_id', -override=>'1', -value=>"$ctt->{rel_id}"); print $q->hidden(-name=>'rel_id', -override=>'1', -value=>"$ctt->{rel_id}");
}elsif(looks_like_number($ctt->{int01}) && ! -f "$varenv{basedir}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf"){ }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;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 $q->span({-style=>'margin:0 0.2em;padding:0.3em;font-size:0.81em;position:absolute;right:100px;'}, "$buchen_users->{txt01} / $invoice_time "),"\n";
@ -192,7 +192,7 @@ EOF
print $q->hidden(-name=>'close_time', -override=>'1', -value=>"$ctt->{close_time}"); print $q->hidden(-name=>'close_time', -override=>'1', -value=>"$ctt->{close_time}");
print $q->end_form,"\n"; print $q->end_form,"\n";
print $q->div({-style=>'position:fixed;bottom:2%;right:1%;z-index:10;font-size:13px;'}," (c_id: $ctt->{c_id} | rel_id: $ctt->{rel_id} | tpl_id: $ctt->{tpl_id})"),"\n" if($users_dms->{u_id} eq $varenv{superu_id}); print $q->div({-style=>'position:fixed;bottom:2%;right:1%;z-index:10;font-size:13px;'}," (c_id: $ctt->{c_id} | rel_id: $ctt->{rel_id} | tpl_id: $ctt->{tpl_id})"),"\n" if($users_dms->{u_id} eq $varenv->{superu_id});
########## ##########
#Relationen #Relationen
@ -217,7 +217,7 @@ EOF
$journal = "<span style='color:silver;background-color:white;'>Journal </span>" if($ctt_rel->{$id}->{template_id} == 209); $journal = "<span style='color:silver;background-color:white;'>Journal </span>" if($ctt_rel->{$id}->{template_id} == 209);
my $rel_opos = ""; my $rel_opos = "";
$rel_opos = "<span style='color:red'>&bull;</span>" if($ctt_rel->{$id}->{int14}); $rel_opos = "<span style='color:red'>&bull;</span>" if($ctt_rel->{$id}->{int14});
print $q->div({-style=>"position:absolute;top:$toppx;right:10px;font-size:0.91em;background-color:$rel_color"}, "$journal ", $q->a({-class=>"linknav",-href=>"/$dbt->{shareedms_conf}->{parent_node}/Faktura/$ctt_rel->{$id}->{node_name}?ct_trans=open\&c_id4trans=$ctt_rel->{$id}->{c_id}\&tpl_id4trans=$ctt_rel->{$id}->{template_id}\&owner=$users_dms->{u_id}",-title=>"Faktura Terminal öffnen"},"[ $rel_opos $ctt_rel->{$id}->{txt00} $varenv{praefix}-$ctt_rel->{$id}->{ct_name} ]")),"\n"; print $q->div({-style=>"position:absolute;top:$toppx;right:10px;font-size:0.91em;background-color:$rel_color"}, "$journal ", $q->a({-class=>"linknav",-href=>"/$dbt->{shareedms_conf}->{parent_node}/Faktura/$ctt_rel->{$id}->{node_name}?ct_trans=open\&c_id4trans=$ctt_rel->{$id}->{c_id}\&tpl_id4trans=$ctt_rel->{$id}->{template_id}\&owner=$users_dms->{u_id}",-title=>"Faktura Terminal öffnen"},"[ $rel_opos $ctt_rel->{$id}->{txt00} $varenv->{praefix}-$ctt_rel->{$id}->{ct_name} ]")),"\n";
$top += 22; $top += 22;
} }
} }
@ -386,9 +386,9 @@ EOF
#operator invoices else position accounting #operator invoices else position accounting
if($ctt->{template_id} == 208 || $ctt->{int10} == 2){ if($ctt->{template_id} == 208 || $ctt->{int10} == 2){
$line_count2 = $trin->tpl($node_meta,$users_dms,$set_main_id,$ctt,$return); $line_count2 = $trin->tpl($varenv,$node_meta,$users_dms,$set_main_id,$ctt,$return);
}else{ }else{
$line_count2 = $transp->tpl($node_meta,$users_dms,$set_main_id,$ctt,$return); $line_count2 = $transp->tpl($varenv,$node_meta,$users_dms,$set_main_id,$ctt,$return);
} }
print "</td></tr>\n"; print "</td></tr>\n";

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

@ -16,6 +16,7 @@ use Mod::Buttons;
use Date::Calc qw(:all); use Date::Calc qw(:all);
use Mod::Libenz; use Mod::Libenz;
use Mod::Basework; use Mod::Basework;
use Scalar::Util qw(looks_like_number);
use Mod::DBtank; use Mod::DBtank;
use Mod::APIfunc; use Mod::APIfunc;
use Mod::Pricing; use Mod::Pricing;
@ -30,6 +31,7 @@ sub new {
#Template #Template
sub tpl(){ sub tpl(){
my $varenv = shift;
my $node_meta = shift; my $node_meta = shift;
my $users_dms = shift; my $users_dms = shift;
my $feedb = shift || {}; my $feedb = shift || {};
@ -44,7 +46,6 @@ sub tpl(){
my $but = new Buttons; my $but = new Buttons;
my %ib = $but->ibuttons(); my %ib = $but->ibuttons();
my %varenv = $cf->envonline();
my $lang = "de"; my $lang = "de";
my $dbh = ""; my $dbh = "";
@ -190,13 +191,13 @@ sub tpl(){
$occupied_style = "color:#ff1493" if($cttpos->{int10} == 2 ||$cttpos->{int10} == 3 || $cttpos->{int10} == 6); $occupied_style = "color:#ff1493" if($cttpos->{int10} == 2 ||$cttpos->{int10} == 3 || $cttpos->{int10} == 6);
if($cttpos->{int35} && $cttpos->{start_time} && $cttpos->{end_time}){ if($cttpos->{int35} && $cttpos->{start_time} && $cttpos->{end_time}){
($pricing,$counting) = $pri->counting_rental(\%varenv,$cttpos); ($pricing,$counting) = $pri->counting_rental($varenv,$cttpos);
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname}); my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
my %varenv_prim = (); my %varenv_prim = ();
$varenv_prim{cms} = $dbt->fetch_cms($dbh_primary,{ lang => $q->escapeHTML($lang) }); $varenv_prim{cms} = $dbt->fetch_cms($dbh_primary,{ lang => $q->escapeHTML($lang) });
$rental_feed = $pri->fetch_rentalfeed(\%varenv_prim,\%varenv,$cttpos,$counting); $rental_feed = $pri->fetch_rentalfeed(\%varenv_prim,$varenv,$cttpos,$counting);
$gesamt = $pri->round($pricing->{total_price}); $gesamt = $pri->round($pricing->{total_price});
$gesamt = sprintf('%.2f', $gesamt); $gesamt = sprintf('%.2f', $gesamt);
}else{ }else{
@ -285,7 +286,7 @@ sub tpl(){
print $q->td({-style=>"background-color:#a7a18f;border-bottom: 1px solid silver;text-align:right;font-size:11px;"}, "$u_name / $dbmtime"); print $q->td({-style=>"background-color:#a7a18f;border-bottom: 1px solid silver;text-align:right;font-size:11px;"}, "$u_name / $dbmtime");
#if($node_meta->{tpl_id} !~ /199|221/){ #if($node_meta->{tpl_id} !~ /199|221/){
if(($node_meta->{tpl_id} =~ /198|205|210|219|224|225|228|229/) || ($node_meta->{tpl_id} == 202 && $varenv{dbname} eq $dbt->{primary}->{sharee_primary}->{database}->{dbname}) || ($node_meta->{tpl_id} == 194 && !$ctrel->{int11})){ if(($node_meta->{tpl_id} =~ /198|205|210|219|224|225|228|229/) || ($node_meta->{tpl_id} == 202 && $varenv->{dbname} eq $dbt->{primary}->{sharee_primary}->{database}->{dbname}) || ($node_meta->{tpl_id} == 194 && !$ctrel->{int11})){
print $q->td({-style=>"background-color:#a7a18f;padding-right:10px;border-bottom: 1px solid silver;text-align:right;"},$but->singlesubmit7("$edit","remove_chk4rel","$ib{remove_chk4rel}","margin:0 5px;")); print $q->td({-style=>"background-color:#a7a18f;padding-right:10px;border-bottom: 1px solid silver;text-align:right;"},$but->singlesubmit7("$edit","remove_chk4rel","$ib{remove_chk4rel}","margin:0 5px;"));
} }
print $q->end_table; print $q->end_table;
@ -323,7 +324,7 @@ sub tpl(){
my $year = strftime "%Y", localtime; my $year = strftime "%Y", localtime;
my ($nyear,$nmonth,$nday) = Add_Delta_YMD($year,$month,$day, 0,0,-28); my ($nyear,$nmonth,$nday) = Add_Delta_YMD($year,$month,$day, 0,0,-28);
my $toppx = $top . "px"; my $toppx = $top . "px";
print $q->div({-style=>"position:absolute;top:$toppx;right:20px;"}, $q->span({-style=>"background-color:#86cbd7"},$q->a({-class=>"linknav",-href=>"/$dbt->{shareedms_conf}->{parent_node}/Mietjournal/?detail_search=1&barcode=$ctrel->{barcode}&start_date_time=$nday.$nmonth.$nyear",-title=>"Mietjournal der letzten 4 Wochen"},"[ Mietjournal zu Rad $dbt->{operator}->{$varenv{dbname}}->{oprefix}$ctrel->{barcode} ]"))),"\n"; print $q->div({-style=>"position:absolute;top:$toppx;right:20px;"}, $q->span({-style=>"background-color:#86cbd7"},$q->a({-class=>"linknav",-href=>"/$dbt->{shareedms_conf}->{parent_node}/Mietjournal/?detail_search=1&barcode=$ctrel->{barcode}&start_date_time=$nday.$nmonth.$nyear",-title=>"Mietjournal der letzten 4 Wochen"},"[ Mietjournal zu Rad $dbt->{operator}->{$varenv->{dbname}}->{oprefix}$ctrel->{barcode} ]"))),"\n";
$top += 22; $top += 22;
#}else{ #}else{
#print $q->div({-style=>"position:absolute;top:$top;right:20px;"},"no valid users path definition: $tpath"),"\n"; #print $q->div({-style=>"position:absolute;top:$top;right:20px;"},"no valid users path definition: $tpath"),"\n";
@ -331,7 +332,7 @@ sub tpl(){
### ###
#just for checking if ct_name or barcode still available #just for checking if ct_name or barcode still available
if($varenv{orga} eq "dms"){ if($varenv->{orga} eq "dms"){
print<<EOF print<<EOF
<style> <style>
.ui-autocomplete { .ui-autocomplete {
@ -380,7 +381,7 @@ EOF
#Mietjournal edit #Mietjournal edit
if($node_meta->{ct_table} eq "contenttranspos" && $node_meta->{tpl_id} == 221){ if($node_meta->{ct_table} eq "contenttranspos" && $node_meta->{tpl_id} == 221){
my ($key,$des,$size,$postdes) = split /=/,$_; my ($key,$des,$size,$postdes) = split /=/,$_;
$des .= " ($key)" if($users_dms->{u_id} eq $varenv{superu_id}); $des .= " ($key)" if($users_dms->{u_id} eq $varenv->{superu_id});
my $prefix = $cttpos->{txt12}; my $prefix = $cttpos->{txt12};
$prefix = "S3X" if($prefix eq "SX"); $prefix = "S3X" if($prefix eq "SX");
@ -419,13 +420,15 @@ EOF
} }
#pos end station #pos end station
elsif($key eq "int04" && "$size" eq "select" && $node_meta->{tpl_id} == 221){ elsif($key eq "int04" && "$size" eq "select" && $node_meta->{tpl_id} == 221){
my @_valxx = (""); my @_valxx = ("null:");
my $end_station = "null";
$end_station = $cttpos->{int04} if(looks_like_number($cttpos->{int04}));
foreach my $rid (sort { $station_all->{$a}->{int04} <=> $station_all->{$b}->{int04} } keys (%$station_all)){ foreach my $rid (sort { $station_all->{$a}->{int04} <=> $station_all->{$b}->{int04} } keys (%$station_all)){
push (@_valxx, "$station_all->{$rid}->{int04}:$station_all->{$rid}->{int04} - $station_all->{$rid}->{txt01}"); push (@_valxx, "$station_all->{$rid}->{int04}:$station_all->{$rid}->{int04} - $station_all->{$rid}->{txt01}");
} }
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'left_italic_cms',-colspan=>'1'},"$des"); print $q->td({-class=>'left_italic_cms',-colspan=>'1'},"$des");
print $q->td({-class=>'content1_cms',-colspan=>'1'},"$prefix",$but->selector_class("$key","eselect2","width:250px;",$cttpos->{int04},@_valxx)); print $q->td({-class=>'content1_cms',-colspan=>'1'},"$prefix",$but->selector_class("$key","eselect2","width:250px;","$end_station",@_valxx));
} }
elsif($key eq "int04"){ elsif($key eq "int04"){
@ -564,7 +567,7 @@ EOF
elsif($key =~ /txt\d/ && $tplkey =~ /int\d/){ elsif($key =~ /txt\d/ && $tplkey =~ /int\d/){
$j++; $j++;
my $desc_num = "$des $j"; my $desc_num = "$des $j";
$desc_num .= " ($key:$tplkey)" if($users_dms->{u_id} eq $varenv{superu_id}); $desc_num .= " ($key:$tplkey)" if($users_dms->{u_id} eq $varenv->{superu_id});
my $desc_key = ""; my $desc_key = "";
my $desc_name = ""; my $desc_name = "";
my $desc_size = ""; my $desc_size = "";
@ -584,7 +587,7 @@ EOF
my $w = $size . "em"; my $w = $size . "em";
$w = "15em" if($size eq "readonly"); $w = "15em" if($size eq "readonly");
my $seldes = $des; my $seldes = $des;
$des .= " ($key)" if($users_dms->{u_id} eq $varenv{superu_id}); $des .= " ($key)" if($users_dms->{u_id} eq $varenv->{superu_id});
if($key =~ /txt25/ && $node_meta->{tpl_id} == 225 && $size eq "readonly"){ if($key =~ /txt25/ && $node_meta->{tpl_id} == 225 && $size eq "readonly"){
my %station_filter_hash = (); my %station_filter_hash = ();
@ -632,7 +635,7 @@ EOF
$ct_name = ""; $ct_name = "";
} }
my $oprefix = ""; my $oprefix = "";
$oprefix = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}-" if($node_meta->{tpl_id} == 224 || $node_meta->{tpl_id} == 228); $oprefix = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}-" if($node_meta->{tpl_id} == 224 || $node_meta->{tpl_id} == 228);
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
#CMS Textkey readonly #CMS Textkey readonly
@ -644,7 +647,7 @@ EOF
} }
elsif($key eq "barcode"){ elsif($key eq "barcode"){
my $oprefix = ""; my $oprefix = "";
$oprefix = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}" if($node_meta->{tpl_id} == 205); $oprefix = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}" if($node_meta->{tpl_id} == 205);
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
print $q->td({-class=>'content1_cms',-colspan=>1}, "$oprefix", $q->textfield(-class=>'etxt',-style=>"width:$w;",-id=>"json_select",-name=>"$key",-value=>"$ctrel->{$key}", -override=>'1',-size=>"25",-maxlength=>50),$q->span({-id=>'log'},"")),"\n"; print $q->td({-class=>'content1_cms',-colspan=>1}, "$oprefix", $q->textfield(-class=>'etxt',-style=>"width:$w;",-id=>"json_select",-name=>"$key",-value=>"$ctrel->{$key}", -override=>'1',-size=>"25",-maxlength=>50),$q->span({-id=>'log'},"")),"\n";
@ -680,11 +683,11 @@ EOF
} }
#bike station #bike station
elsif($key eq "int04" && "$size" eq "select" && $node_meta->{tpl_id} == 205){ elsif($key eq "int04" && "$size" eq "select" && $node_meta->{tpl_id} == 205){
my @_valxx = (""); my @_valxx = ();
foreach my $rid (sort { $station_all->{$a}->{int04} <=> $station_all->{$b}->{int04} } keys (%$station_all)){ foreach my $rid (sort { $station_all->{$a}->{int04} <=> $station_all->{$b}->{int04} } keys (%$station_all)){
push (@_valxx, "$station_all->{$rid}->{int04}:$station_all->{$rid}->{int04} - $station_all->{$rid}->{txt01}"); push (@_valxx, "$station_all->{$rid}->{int04}:$station_all->{$rid}->{int04} - $station_all->{$rid}->{txt01}");
} }
my $oprefix = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}"; my $oprefix = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}";
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'left_italic_cms',-colspan=>'1'},"$des"); print $q->td({-class=>'left_italic_cms',-colspan=>'1'},"$des");
print $q->td({-class=>'content1_cms',-colspan=>'1'},"$oprefix",$but->selector_class("$key","eselect","width:250px;",$ctrel->{int04},@_valxx)); print $q->td({-class=>'content1_cms',-colspan=>'1'},"$oprefix",$but->selector_class("$key","eselect","width:250px;",$ctrel->{int04},@_valxx));
@ -692,7 +695,7 @@ EOF
} }
elsif($key eq "int04"){ elsif($key eq "int04"){
my $oprefix = ""; my $oprefix = "";
$oprefix = "$dbt->{operator}->{$varenv{dbname}}->{oprefix}" if($node_meta->{tpl_id} == 225 || $node_meta->{tpl_id} == 205); $oprefix = "$dbt->{operator}->{$varenv->{dbname}}->{oprefix}" if($node_meta->{tpl_id} == 225 || $node_meta->{tpl_id} == 205);
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
print $q->td({-class=>'content1_cms',-colspan=>1}, "$oprefix", $q->textfield(-class=>'etxt',-style=>"width:$w;",-name=>"$key",-value=>"$ctrel->{$key}", -override=>'1',-size=>"25",-maxlength=>50),""); print $q->td({-class=>'content1_cms',-colspan=>1}, "$oprefix", $q->textfield(-class=>'etxt',-style=>"width:$w;",-name=>"$key",-value=>"$ctrel->{$key}", -override=>'1',-size=>"25",-maxlength=>50),"");
@ -742,7 +745,7 @@ EOF
elsif($key =~ /int18/ && "$size" eq "select" && $node_meta->{tpl_id} == 210){#sharing_type elsif($key =~ /int18/ && "$size" eq "select" && $node_meta->{tpl_id} == 210){#sharing_type
my @_lock_valxx = (); my @_lock_valxx = ();
#delete hidden-lv if not LV #delete hidden-lv if not LV
delete $dbt->{copri_conf}->{sharing_type}->{4} if($varenv{syshost} ne "shareedms-lv"); delete $dbt->{copri_conf}->{sharing_type}->{4} if($varenv->{syshost} ne "shareedms-lv");
foreach my $s_key (sort keys (%{ $dbt->{copri_conf}->{sharing_type} })) { foreach my $s_key (sort keys (%{ $dbt->{copri_conf}->{sharing_type} })) {
push @_lock_valxx, "$s_key:$dbt->{copri_conf}->{sharing_type}->{$s_key}"; push @_lock_valxx, "$s_key:$dbt->{copri_conf}->{sharing_type}->{$s_key}";
} }
@ -842,7 +845,7 @@ EOF
} }
#sharee user_group Tarif-2.0 (tarif.c_ids) #sharee user_group Tarif-2.0 (tarif.c_ids)
elsif($key =~ /txt30/ && $varenv{dbname} ne $dbt->{primary}->{sharee_primary}->{database}->{dbname}){ elsif($key =~ /txt30/ && $varenv->{dbname} ne $dbt->{primary}->{sharee_primary}->{database}->{dbname}){
my @_valxx = (""); my @_valxx = ("");
foreach my $rid (sort { $tariff_all->{$a}->{barcode} <=> $tariff_all->{$b}->{barcode} } keys (%$tariff_all)){ foreach my $rid (sort { $tariff_all->{$a}->{barcode} <=> $tariff_all->{$b}->{barcode} } keys (%$tariff_all)){
if($tariff_all->{$rid}->{ct_name}){ if($tariff_all->{$rid}->{ct_name}){
@ -859,7 +862,7 @@ EOF
else{ else{
#Operator letzt Auswahl/Zuweisung #Operator letzt Auswahl/Zuweisung
if($key eq "txt19" && $node_meta->{tpl_id} == 202){ if($key eq "txt19" && $node_meta->{tpl_id} == 202){
if($varenv{dbname} eq $dbt->{primary}->{sharee_primary}->{database}->{dbname}){ if($varenv->{dbname} eq $dbt->{primary}->{sharee_primary}->{database}->{dbname}){
my @_valxx = (""); my @_valxx = ("");
foreach my $key (sort keys (%{ $dbt->{operator} })) { foreach my $key (sort keys (%{ $dbt->{operator} })) {
push (@_valxx,$key); push (@_valxx,$key);
@ -872,7 +875,7 @@ EOF
} }
else{ else{
my @_valxx = (""); my @_valxx = ("");
@_valxx = split(/,/,$varenv{$seldes}) if($varenv{$seldes}); @_valxx = split(/,/,$varenv->{$seldes}) if($varenv->{$seldes});
my $selsize = "80px"; my $selsize = "80px";
print $q->Tr(); print $q->Tr();
print $q->td({-class=>'left_italic_cms'},"$des"),"\n"; print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
@ -906,12 +909,12 @@ EOF
} }
print $q->td({-class=>'content1_cms', -colspan=>'3'},$q->textarea(-id=>"$key", -class=>"etxt", -style=>"border: 1px solid silver;$h $w", -name=>"$key", -override=>'1',-default=>"$ctrel->{$key}")),"\n"; print $q->td({-class=>'content1_cms', -colspan=>'3'},$q->textarea(-id=>"$key", -class=>"etxt", -style=>"border: 1px solid silver;$h $w", -name=>"$key", -override=>'1',-default=>"$ctrel->{$key}")),"\n";
} }
elsif($key =~ /txt15/ && $varenv{dbname} ne $dbt->{primary}->{sharee_primary}->{database}->{dbname} && $node_meta->{tpl_id} == 202){ elsif($key =~ /txt15/ && $varenv->{dbname} ne $dbt->{primary}->{sharee_primary}->{database}->{dbname} && $node_meta->{tpl_id} == 202){
my $bonus_record = { c_id => 0, ct_name => "" }; my $bonus_record = { c_id => 0, ct_name => "" };
#check after saving to see if matches #check after saving to see if matches
if($varenv{dbname} eq "sharee_kn"){ if($varenv->{dbname} eq "sharee_kn"){
$bonus_record->{ct_name} = $lb->grep_filecontent("$dbt->{copri_conf}->{basedir}/$dbt->{operator}->{$varenv{dbname}}->{dir_app}/ftp/SWK_codes/got_last.csv","$ctrel->{txt15}") if($ctrel->{txt15}); $bonus_record->{ct_name} = $lb->grep_filecontent("$dbt->{copri_conf}->{basedir}/$dbt->{operator}->{$varenv->{dbname}}->{dir_app}/ftp/SWK_codes/got_last.csv","$ctrel->{txt15}") if($ctrel->{txt15});
} }
if(!$bonus_record->{ct_name}){ if(!$bonus_record->{ct_name}){
my $pref_cc = { my $pref_cc = {

18
copri4/main/src/Tpl/TransInvoices.pm
View file

@ -33,6 +33,7 @@ sub new {
#Template #Template
sub tpl(){ sub tpl(){
my $self = shift; my $self = shift;
my $varenv = shift;
my $node_meta = shift; my $node_meta = shift;
my $users_dms = shift; my $users_dms = shift;
my $set_main_id = shift; my $set_main_id = shift;
@ -47,7 +48,6 @@ sub tpl(){
my $apif = new APIfunc; my $apif = new APIfunc;
my $but = new Buttons; my $but = new Buttons;
my $pri = new Pricing; my $pri = new Pricing;
my %varenv = $cf->envonline();
my %ib = $but->ibuttons(); my %ib = $but->ibuttons();
my $today = strftime "%d.%m.%Y",localtime; my $today = strftime "%d.%m.%Y",localtime;
my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime; my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime;
@ -97,7 +97,7 @@ sub tpl(){
else{ else{
($cttpos,$rows) = $dbt->collect_contenttrans($dbh,$ctt->{content_id}); ($cttpos,$rows) = $dbt->collect_contenttrans($dbh,$ctt->{content_id});
#int9x are not in db #int9x are not in db
if($varenv{dbname} eq "sharee_sx"){ if($varenv->{dbname} eq "sharee_sx"){
@tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=Disagio","int02=Gutschrift"); @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=Disagio","int02=Gutschrift");
}else{ }else{
@tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=Disagio","int95=Transaktion","int96=Zahlungsmeldung","int97=Kreditkarte Zuordnung","int02=Gutschrift"); @tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int94=Disagio","int95=Transaktion","int96=Zahlungsmeldung","int97=Kreditkarte Zuordnung","int02=Gutschrift");
@ -119,7 +119,7 @@ sub tpl(){
foreach (@tpl_order){ foreach (@tpl_order){
my ($key,$val) = split /=/,$_; my ($key,$val) = split /=/,$_;
$tc++ if($val); $tc++ if($val);
$val .= " ($key)" if($users_dms->{u_id} eq $varenv{superu_id}); $val .= " ($key)" if($users_dms->{u_id} eq $varenv->{superu_id});
print $q->th("$val"),"\n"; print $q->th("$val"),"\n";
} }
@ -137,7 +137,7 @@ sub tpl(){
foreach my $id (sort { $cttpos->{$b}->{c_id} <=> $cttpos->{$a}->{c_id} } keys(%$cttpos)){ foreach my $id (sort { $cttpos->{$b}->{c_id} <=> $cttpos->{$a}->{c_id} } keys(%$cttpos)){
my $oac = $pri->operator_accounting2calc(\%varenv,$cttpos->{$id},$ctf_operator); my $oac = $pri->operator_accounting2calc($varenv,$cttpos->{$id},$ctf_operator);
$sum_operatorcredit += $oac->{int02};#Abrechnung Gutschrift $sum_operatorcredit += $oac->{int02};#Abrechnung Gutschrift
$sum_netto += $oac->{int100};#Operator invoice (TeilRad Gebühren netto) $sum_netto += $oac->{int100};#Operator invoice (TeilRad Gebühren netto)
$sum_all += $oac->{int99};#capture brutto $sum_all += $oac->{int99};#capture brutto
@ -228,7 +228,7 @@ sub tpl(){
$ctf->{$key} = $lb->newline($ctf->{$key},"",""); $ctf->{$key} = $lb->newline($ctf->{$key},"","");
$ctt->{state} =~ s/\(payone.*//; $ctt->{state} =~ s/\(payone.*//;
if($des =~ /$ctt->{state}/){ if($des =~ /$ctt->{state}/){
$payment_text = "($key) " if($users_dms->{u_id} eq $varenv{superu_id}); $payment_text = "($key) " if($users_dms->{u_id} eq $varenv->{superu_id});
if($sum_netto < 0){ if($sum_netto < 0){
$payment_text .= "$ctf->{txt58}"; $payment_text .= "$ctf->{txt58}";
}else{ }else{
@ -357,11 +357,11 @@ sub tpl(){
print $q->end_form; print $q->end_form;
my $praefix = "$ctt->{txt00}-$varenv{praefix}"; my $praefix = "$ctt->{txt00}-$varenv->{praefix}";
print $q->div({-style=>"clear:both;height:0.1px;"},""),"\n"; print $q->div({-style=>"clear:both;height:0.1px;"},""),"\n";
if($ctt->{txt30}){ if($ctt->{txt30}){
print $q->div({-style=>"padding:0.5em;font-size:0.81em;width:98%;text-align:right;"}, "$ctt->{txt30}"),"\n"; print $q->div({-style=>"padding:0.5em;font-size:0.81em;width:98%;text-align:right;"}, "$ctt->{txt30}"),"\n";
}elsif( -f "$varenv{pdf}/$praefix-$ctt->{ct_name}.pdf" ){ }elsif( -f "$varenv->{pdf}/$praefix-$ctt->{ct_name}.pdf" ){
print $q->start_form(),"\n"; print $q->start_form(),"\n";
print $q->hidden(-name=>'offset', -override=>'1', -value=>"$R::offset") if($R::offset); print $q->hidden(-name=>'offset', -override=>'1', -value=>"$R::offset") if($R::offset);
print $q->hidden(-name=>'limit', -override=>'1', -value=>"$R::limit") if($R::limit); print $q->hidden(-name=>'limit', -override=>'1', -value=>"$R::limit") if($R::limit);
@ -370,8 +370,8 @@ sub tpl(){
print $q->end_form; print $q->end_form;
} }
if( -f "$varenv{basedir}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf"){ if( -f "$varenv->{basedir}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf"){
print $q->div({-style=>'padding:0.5em;font-size:0.81em;width:98%;text-align:right;'}, "Download: ", $q->a({-href=>"$varenv{wwwhost}/FileOut?file=$praefix-$ctt->{ct_name}.pdf&sessionid=$coo", -target=>"_blank" , -type=>'application/octet-stream', -style=>'text-decoration:underline;'}), "$praefix-$ctt->{ct_name}.pdf"),"\n"; print $q->div({-style=>'padding:0.5em;font-size:0.81em;width:98%;text-align:right;'}, "Download: ", $q->a({-href=>"$varenv->{wwwhost}/FileOut?file=$praefix-$ctt->{ct_name}.pdf&sessionid=$coo", -target=>"_blank" , -type=>'application/octet-stream', -style=>'text-decoration:underline;'}), "$praefix-$ctt->{ct_name}.pdf"),"\n";
} }
$db->updater("contenttrans","c_id","$ctt->{content_id}","txt20","$accounting_start - $accounting_end","","","","","no_time") if(!$int05 && $accounting_start && $accounting_end); $db->updater("contenttrans","c_id","$ctt->{content_id}","txt20","$accounting_start - $accounting_end","","","","","no_time") if(!$int05 && $accounting_start && $accounting_end);

24
copri4/main/src/Tpl/TransPositionen.pm
View file

@ -33,6 +33,7 @@ sub new {
#Template #Template
sub tpl(){ sub tpl(){
my $self = shift; my $self = shift;
my $varenv = shift;
my $node_meta = shift; my $node_meta = shift;
my $users_dms = shift; my $users_dms = shift;
my $set_main_id = shift; my $set_main_id = shift;
@ -47,7 +48,6 @@ sub tpl(){
my $apif = new APIfunc; my $apif = new APIfunc;
my $but = new Buttons; my $but = new Buttons;
my $pri = new Pricing; my $pri = new Pricing;
my %varenv = $cf->envonline();
my %ib = $but->ibuttons(); my %ib = $but->ibuttons();
my $today = strftime "%d.%m.%Y",localtime; my $today = strftime "%d.%m.%Y",localtime;
my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime; my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime;
@ -178,10 +178,10 @@ EOF
my $rental_feed = {}; my $rental_feed = {};
if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){ if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){
$pri->count_freedrental($q,\%varenv,$ctt->{int10},$cttpos->{$id},1); $pri->count_freedrental($q,$varenv,$ctt->{int10},$cttpos->{$id},1);
($pricing,$counting) = $pri->counting_rental(\%varenv,$cttpos->{$id}); ($pricing,$counting) = $pri->counting_rental($varenv,$cttpos->{$id});
$rental_feed = $pri->fetch_rentalfeed(\%varenv,\%varenv,$cttpos->{$id},$counting); $rental_feed = $pri->fetch_rentalfeed($varenv,$varenv,$cttpos->{$id},$counting);
$sum_parts19 += $pricing->{total_price}; $sum_parts19 += $pricing->{total_price};
$gesamt = $pri->round($pricing->{total_price}); $gesamt = $pri->round($pricing->{total_price});
$gesamt = sprintf('%.2f', $gesamt); $gesamt = sprintf('%.2f', $gesamt);
@ -632,12 +632,12 @@ EOF
} }
print $q->end_form; print $q->end_form;
my $praefix = "$ctt->{txt00}-$varenv{praefix}"; my $praefix = "$ctt->{txt00}-$varenv->{praefix}";
print $q->div({-style=>"clear:both;height:0.1px;"},""),"\n"; print $q->div({-style=>"clear:both;height:0.1px;"},""),"\n";
if($ctt->{txt30}){ if($ctt->{txt30}){
$ctt->{txt30} = $lb->newline($ctt->{txt30},"",""); $ctt->{txt30} = $lb->newline($ctt->{txt30},"","");
print $q->div({-style=>"padding:0.5em;font-size:0.81em;width:98%;text-align:right;"}, "$ctt->{txt30}"),"\n"; print $q->div({-style=>"padding:0.5em;font-size:0.81em;width:98%;text-align:right;"}, "$ctt->{txt30}"),"\n";
}elsif( -f "$dbt->{copri_conf}->{basedir}/$varenv{syshost}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf" ){ }elsif( -f "$dbt->{copri_conf}->{basedir}/$varenv->{syshost}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf" ){
print $q->start_form(),"\n"; print $q->start_form(),"\n";
print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctt->{content_id}"),"\n"; print $q->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctt->{content_id}"),"\n";
print $q->hidden(-name=>'tpl_id4trans', -override=>'1', -value=>"$ctt->{template_id}"),"\n"; print $q->hidden(-name=>'tpl_id4trans', -override=>'1', -value=>"$ctt->{template_id}"),"\n";
@ -647,16 +647,16 @@ EOF
print $q->end_form; print $q->end_form;
} }
if( -f "$varenv{basedir}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf"){ if( -f "$varenv->{basedir}/pdfinvoice/$praefix-$ctt->{ct_name}.pdf"){
print $q->div({-style=>'padding:0.5em;font-size:0.91em;width:98%;text-align:right;'}, "PDF download: ", $q->a({-href=>"$varenv{wwwhost}/FileOut?file=$praefix-$ctt->{ct_name}.pdf&sessionid=$coo", -target=>"_blank" , -type=>'application/octet-stream', -style=>'text-decoration:underline;'}, "$praefix-$ctt->{ct_name}.pdf")),"\n"; print $q->div({-style=>'padding:0.5em;font-size:0.91em;width:98%;text-align:right;'}, "PDF download: ", $q->a({-href=>"$varenv->{wwwhost}/FileOut?file=$praefix-$ctt->{ct_name}.pdf&sessionid=$coo", -target=>"_blank" , -type=>'application/octet-stream', -style=>'text-decoration:underline;'}, "$praefix-$ctt->{ct_name}.pdf")),"\n";
} }
#copri-Ticket-mailing, eMail send by select cms_message_key #copri-Ticket-mailing, eMail send by select cms_message_key
if("$varenv{praefix}-$ctt->{ct_name}" =~ /\d+/){ if("$varenv->{praefix}-$ctt->{ct_name}" =~ /\d+/){
$varenv{cms} = $dbt->fetch_cms($dbh,{ lang => 'de', ct_name => 'email-invoice%' }); my $email_invoice_cms = $dbt->fetch_cms($dbh,{ lang => 'de', ct_name => 'email-invoice%' });
my @_valxx = ("email CMS-Text select"); my @_valxx = ("email CMS-Text select");
foreach my $rid (sort { $varenv{cms}->{$a}->{ct_name} cmp $varenv{cms}->{$b}->{ct_name} } keys (%{$varenv{cms}})){ foreach my $rid (sort { $email_invoice_cms->{$a}->{ct_name} cmp $email_invoice_cms->{$b}->{ct_name} } keys (%{$email_invoice_cms})){
push (@_valxx, "$varenv{cms}->{$rid}->{ct_name}:$varenv{cms}->{$rid}->{ct_name}"); push (@_valxx, "$email_invoice_cms->{$rid}->{ct_name}:$email_invoice_cms->{$rid}->{ct_name}");
} }
print $q->start_form(),"\n"; print $q->start_form(),"\n";

4
copri4/shareeconf/examples/global.cfg
View file

@ -239,6 +239,10 @@
2 = "CreditCard" 2 = "CreditCard"
3 = "Prepaid" 3 = "Prepaid"
</payment_type> </payment_type>
<access>
0 = "nein"
1 = "ja"
</access>
<permission> <permission>
0 = "keine" 0 = "keine"
1 = "lesen" 1 = "lesen"

4
copri4/shareedms-operator/src/Lib/Mlogic.pm
View file

@ -340,9 +340,9 @@ sub tplselect(){
&Failure::tpl($varenv,$users_dms->{u_id},$feedb_req); &Failure::tpl($varenv,$users_dms->{u_id},$feedb_req);
}else{ }else{
if(($R::ct_trans !~ /close/) && ($ct_table =~ /contenttrans/) && ($R::ct_trans || $R::trans2edit || $R::ctpos_activ || $R::select_part || $R::set_main_id)){ if(($R::ct_trans !~ /close/) && ($ct_table =~ /contenttrans/) && ($R::ct_trans || $R::trans2edit || $R::ctpos_activ || $R::select_part || $R::set_main_id)){
&Modalbox::mobox($node_meta,$users_dms,$feedb_req); &Modalbox::mobox($varenv,$node_meta,$users_dms,$feedb_req);
}elsif(($R::ct_trans !~ /close/) && ($ct_table =~ /content$|contentadr|contentuser|contentpos|users$|contenttranspos/ && ($R::ct_trans || $R::rel_edit || $R::base_edit)) || ($R::node2edit && $R::node2edit =~ /edit/)){ }elsif(($R::ct_trans !~ /close/) && ($ct_table =~ /content$|contentadr|contentuser|contentpos|users$|contenttranspos/ && ($R::ct_trans || $R::rel_edit || $R::base_edit)) || ($R::node2edit && $R::node2edit =~ /edit/)){
&Modalbox3::mobox3($node_meta,$users_dms,$feedb_req) if($R::rel_edit !~ /delete|save/ && $R::ct_trans !~ /delete/ && $R::base_edit !~ /delete|save_pos/ && !$R::service_id); &Modalbox3::mobox3($varenv,$node_meta,$users_dms,$feedb_req) if($R::rel_edit !~ /delete|save/ && $R::ct_trans !~ /delete/ && $R::base_edit !~ /delete|save_pos/ && !$R::service_id);
} }
} }
#prio feedback on data request #prio feedback on data request