diff --git a/copri4/main/src/Mod/APIjsonserver.pm b/copri4/main/src/Mod/APIjsonserver.pm index ae48bbe..95428a0 100755 --- a/copri4/main/src/Mod/APIjsonserver.pm +++ b/copri4/main/src/Mod/APIjsonserver.pm @@ -68,7 +68,7 @@ my $response = { apiserver => "$apiserver", response => "$respreq", uri_primary => "$dbt->{primary}->{sharee_primary}->{primaryApp}", - copri_version => "4.1.23.18", + copri_version => "4.1.23.19", user_id => "", authcookie => "", new_authcoo => "0", diff --git a/copri4/main/src/Mod/Buttons.pm b/copri4/main/src/Mod/Buttons.pm index 7090a2c..db56b13 100755 --- a/copri4/main/src/Mod/Buttons.pm +++ b/copri4/main/src/Mod/Buttons.pm @@ -262,7 +262,7 @@ sub selector_class(){ my $column = shift; my $class = shift || ""; my $style = shift || ""; - my $sel = shift || ""; + my $sel = shift || 0; my @selval = @_; my @selopt = (); diff --git a/copri4/main/src/Mod/Modalbox.pm b/copri4/main/src/Mod/Modalbox.pm index c5fa462..6160267 100755 --- a/copri4/main/src/Mod/Modalbox.pm +++ b/copri4/main/src/Mod/Modalbox.pm @@ -24,6 +24,7 @@ sub new { } sub mobox(){ + my $varenv = shift; my $node_meta = shift; my $users_dms = shift; my $return = shift || ""; @@ -35,7 +36,6 @@ sub mobox(){ my $dbt = new DBtank; $q->import_names('R'); my @keywords = $q->param; - my %varenv = $cf->envonline(); my $script = $q->script_name(); my $path = $q->path_info(); my $lang = "de"; @@ -52,7 +52,7 @@ sub mobox(){ my $rows = $address_wc + $table_wc; my $height = "600"; - if($varenv{orga} eq "dms"){ + if($varenv->{orga} eq "dms"){ $rows = $rows - 0; }else{ $rows = $rows - 10; @@ -67,13 +67,13 @@ print< .ui-widget-header { - color:$varenv{color}; + color:$varenv->{color}; font-weight:normal; border:1px solid $bg_color2; background: $bg_color2; } .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; filter: Alpha(Opacity=50); } @@ -103,9 +103,9 @@ EOF print "
"; 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"; - &Address3::tpl($node_meta,$users_dms,$return); + &Address3::tpl($varenv,$node_meta,$users_dms,$return); } }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})", diff --git a/copri4/main/src/Mod/Modalbox3.pm b/copri4/main/src/Mod/Modalbox3.pm index 6ab57a6..1800e2b 100755 --- a/copri4/main/src/Mod/Modalbox3.pm +++ b/copri4/main/src/Mod/Modalbox3.pm @@ -21,6 +21,7 @@ sub new { } sub mobox3(){ + my $varenv = shift; my $node_meta = shift; my $users_dms = shift; my $feedb = shift || {}; @@ -31,7 +32,6 @@ sub mobox3(){ my $but = new Buttons; $q->import_names('R'); my @keywords = $q->param; - my %varenv = $cf->envonline(); my $script = $q->script_name(); my $path = $q->path_info(); my $coo = $q->cookie(-name=>'domcookie'); @@ -69,7 +69,7 @@ print<{metahost}/external/jquery-ui-1.12.1/images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat; opacity: .5; filter: Alpha(Opacity=50); } @@ -114,7 +114,7 @@ EOF #} elsif(($R::node2edit && $R::node2edit =~ /editpart/) || ($R::base_edit && $R::base_edit !~ /delete/)){ require "Tpl/BaseEdit.pm"; - &BaseEdit::tpl($node_meta,$users_dms,$feedb); + &BaseEdit::tpl($varenv,$node_meta,$users_dms,$feedb); } else{ print $q->div("Zugriff verweigert."); diff --git a/copri4/main/src/Mod/Pricing.pm b/copri4/main/src/Mod/Pricing.pm index 9c973e9..8db5a14 100755 --- a/copri4/main/src/Mod/Pricing.pm +++ b/copri4/main/src/Mod/Pricing.pm @@ -417,7 +417,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($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 .= " / $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"]; diff --git a/copri4/main/src/Mod/Printpreview.pm b/copri4/main/src/Mod/Printpreview.pm index 1688d2c..439ad36 100755 --- a/copri4/main/src/Mod/Printpreview.pm +++ b/copri4/main/src/Mod/Printpreview.pm @@ -52,6 +52,7 @@ sub printpre(){ my $pkey = $R::pkey || ""; 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 $aconf = Config::General->new($api_file); my %apikeyconf = $aconf->getall; diff --git a/copri4/main/src/Tpl/Address3.pm b/copri4/main/src/Tpl/Address3.pm index 369a555..981a800 100755 --- a/copri4/main/src/Tpl/Address3.pm +++ b/copri4/main/src/Tpl/Address3.pm @@ -28,6 +28,7 @@ sub new { #Template sub tpl(){ + my $varenv = shift; my $node_meta = shift; my $users_dms = shift; my $return = shift || ""; @@ -40,7 +41,6 @@ sub tpl(){ my $but = new Buttons; my $transp = new TransPositionen; my $trin = new TransInvoices; - my %varenv = $cf->envonline(); my $lang = "de"; my %ib = $but->ibuttons(); my $line_count1 = 0; @@ -65,7 +65,7 @@ sub tpl(){ c_id => $users_dms->{c_id4trans}, }; $ctt = $dbt->fetch_record($dbh,$pref); - my $praefix = "$ctt->{txt00}-$varenv{praefix}"; + my $praefix = "$ctt->{txt00}-$varenv->{praefix}"; my $warn_time = $ctt->{warn_time} || ""; $warn_time = $lb->time4de($warn_time,0) if($warn_time); @@ -150,7 +150,7 @@ EOF $journalhead = "
Journal" if($ctt->{template_id} == 209); $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->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 "\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=>'main_id', -override=>'1', -value=>"$ctt->{main_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;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->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 @@ -217,7 +217,7 @@ EOF $journal = "Journal " if($ctt_rel->{$id}->{template_id} == 209); my $rel_opos = ""; $rel_opos = "" 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; } } @@ -386,9 +386,9 @@ EOF #operator invoices else position accounting 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{ - $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 "\n"; diff --git a/copri4/main/src/Tpl/BaseEdit.pm b/copri4/main/src/Tpl/BaseEdit.pm index 09fb099..4936058 100755 --- a/copri4/main/src/Tpl/BaseEdit.pm +++ b/copri4/main/src/Tpl/BaseEdit.pm @@ -16,6 +16,7 @@ use Mod::Buttons; use Date::Calc qw(:all); use Mod::Libenz; use Mod::Basework; +use Scalar::Util qw(looks_like_number); use Mod::DBtank; use Mod::APIfunc; use Mod::Pricing; @@ -30,6 +31,7 @@ sub new { #Template sub tpl(){ + my $varenv = shift; my $node_meta = shift; my $users_dms = shift; my $feedb = shift || {}; @@ -44,7 +46,6 @@ sub tpl(){ my $but = new Buttons; my %ib = $but->ibuttons(); - my %varenv = $cf->envonline(); my $lang = "de"; my $dbh = ""; @@ -190,13 +191,13 @@ 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}){ - ($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 %varenv_prim = (); $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 = sprintf('%.2f', $gesamt); }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"); #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->end_table; @@ -323,7 +324,7 @@ sub tpl(){ my $year = strftime "%Y", localtime; my ($nyear,$nmonth,$nday) = Add_Delta_YMD($year,$month,$day, 0,0,-28); 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; #}else{ #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 -if($varenv{orga} eq "dms"){ +if($varenv->{orga} eq "dms"){ print< .ui-autocomplete { @@ -380,7 +381,7 @@ EOF #Mietjournal edit if($node_meta->{ct_table} eq "contenttranspos" && $node_meta->{tpl_id} == 221){ 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}; $prefix = "S3X" if($prefix eq "SX"); @@ -419,13 +420,15 @@ EOF } #pos end station 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)){ push (@_valxx, "$station_all->{$rid}->{int04}:$station_all->{$rid}->{int04} - $station_all->{$rid}->{txt01}"); } print $q->Tr(); 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"){ @@ -564,7 +567,7 @@ EOF elsif($key =~ /txt\d/ && $tplkey =~ /int\d/){ $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_name = ""; my $desc_size = ""; @@ -584,7 +587,7 @@ EOF my $w = $size . "em"; $w = "15em" if($size eq "readonly"); 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"){ my %station_filter_hash = (); @@ -632,7 +635,7 @@ EOF $ct_name = ""; } 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->td({-class=>'left_italic_cms'},"$des"),"\n"; #CMS Textkey readonly @@ -644,7 +647,7 @@ EOF } elsif($key eq "barcode"){ 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->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"; @@ -680,11 +683,11 @@ EOF } #bike station 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)){ 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->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)); @@ -692,7 +695,7 @@ EOF } elsif($key eq "int04"){ 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->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),""); @@ -742,7 +745,7 @@ EOF elsif($key =~ /int18/ && "$size" eq "select" && $node_meta->{tpl_id} == 210){#sharing_type my @_lock_valxx = (); #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} })) { 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) - 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 = (""); foreach my $rid (sort { $tariff_all->{$a}->{barcode} <=> $tariff_all->{$b}->{barcode} } keys (%$tariff_all)){ if($tariff_all->{$rid}->{ct_name}){ @@ -859,7 +862,7 @@ EOF else{ #Operator letzt Auswahl/Zuweisung 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 = (""); foreach my $key (sort keys (%{ $dbt->{operator} })) { push (@_valxx,$key); @@ -872,7 +875,7 @@ EOF } else{ my @_valxx = (""); - @_valxx = split(/,/,$varenv{$seldes}) if($varenv{$seldes}); + @_valxx = split(/,/,$varenv->{$seldes}) if($varenv->{$seldes}); my $selsize = "80px"; print $q->Tr(); 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"; } - 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 => "" }; #check after saving to see if matches - 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}); + 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}); } if(!$bonus_record->{ct_name}){ my $pref_cc = { diff --git a/copri4/main/src/Tpl/TransInvoices.pm b/copri4/main/src/Tpl/TransInvoices.pm index af18df9..d8844e4 100755 --- a/copri4/main/src/Tpl/TransInvoices.pm +++ b/copri4/main/src/Tpl/TransInvoices.pm @@ -33,6 +33,7 @@ sub new { #Template sub tpl(){ my $self = shift; + my $varenv = shift; my $node_meta = shift; my $users_dms = shift; my $set_main_id = shift; @@ -47,7 +48,6 @@ sub tpl(){ my $apif = new APIfunc; my $but = new Buttons; my $pri = new Pricing; - my %varenv = $cf->envonline(); my %ib = $but->ibuttons(); my $today = strftime "%d.%m.%Y",localtime; my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime; @@ -97,7 +97,7 @@ sub tpl(){ else{ ($cttpos,$rows) = $dbt->collect_contenttrans($dbh,$ctt->{content_id}); #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"); }else{ @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){ my ($key,$val) = split /=/,$_; $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"; } @@ -137,7 +137,7 @@ sub tpl(){ 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_netto += $oac->{int100};#Operator invoice (TeilRad Gebühren netto) $sum_all += $oac->{int99};#capture brutto @@ -228,7 +228,7 @@ sub tpl(){ $ctf->{$key} = $lb->newline($ctf->{$key},"",""); $ctt->{state} =~ s/\(payone.*//; 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){ $payment_text .= "$ctf->{txt58}"; }else{ @@ -357,11 +357,11 @@ sub tpl(){ 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"; if($ctt->{txt30}){ 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->hidden(-name=>'offset', -override=>'1', -value=>"$R::offset") if($R::offset); print $q->hidden(-name=>'limit', -override=>'1', -value=>"$R::limit") if($R::limit); @@ -370,8 +370,8 @@ sub tpl(){ print $q->end_form; } - 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"; + 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"; } $db->updater("contenttrans","c_id","$ctt->{content_id}","txt20","$accounting_start - $accounting_end","","","","","no_time") if(!$int05 && $accounting_start && $accounting_end); diff --git a/copri4/main/src/Tpl/TransPositionen.pm b/copri4/main/src/Tpl/TransPositionen.pm index bf3e16d..bc7b4d7 100755 --- a/copri4/main/src/Tpl/TransPositionen.pm +++ b/copri4/main/src/Tpl/TransPositionen.pm @@ -33,6 +33,7 @@ sub new { #Template sub tpl(){ my $self = shift; + my $varenv = shift; my $node_meta = shift; my $users_dms = shift; my $set_main_id = shift; @@ -47,7 +48,6 @@ sub tpl(){ my $apif = new APIfunc; my $but = new Buttons; my $pri = new Pricing; - my %varenv = $cf->envonline(); my %ib = $but->ibuttons(); my $today = strftime "%d.%m.%Y",localtime; my $now_dt = strftime "%Y-%m-%d %H:%M:%S", localtime; @@ -178,10 +178,10 @@ EOF my $rental_feed = {}; if($cttpos->{$id}->{int35} && $cttpos->{$id}->{start_time} && $cttpos->{$id}->{end_time}){ - $pri->count_freedrental($q,\%varenv,$ctt->{int10},$cttpos->{$id},1); - ($pricing,$counting) = $pri->counting_rental(\%varenv,$cttpos->{$id}); + $pri->count_freedrental($q,$varenv,$ctt->{int10},$cttpos->{$id},1); + ($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}; $gesamt = $pri->round($pricing->{total_price}); $gesamt = sprintf('%.2f', $gesamt); @@ -632,12 +632,12 @@ EOF } 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"; if($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"; - }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->hidden(-name=>'c_id4trans', -override=>'1', -value=>"$ctt->{content_id}"),"\n"; print $q->hidden(-name=>'tpl_id4trans', -override=>'1', -value=>"$ctt->{template_id}"),"\n"; @@ -647,16 +647,16 @@ EOF print $q->end_form; } - 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"; + 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"; } #copri-Ticket-mailing, eMail send by select cms_message_key - if("$varenv{praefix}-$ctt->{ct_name}" =~ /\d+/){ - $varenv{cms} = $dbt->fetch_cms($dbh,{ lang => 'de', ct_name => 'email-invoice%' }); + if("$varenv->{praefix}-$ctt->{ct_name}" =~ /\d+/){ + my $email_invoice_cms = $dbt->fetch_cms($dbh,{ lang => 'de', ct_name => 'email-invoice%' }); my @_valxx = ("email CMS-Text select"); - foreach my $rid (sort { $varenv{cms}->{$a}->{ct_name} cmp $varenv{cms}->{$b}->{ct_name} } keys (%{$varenv{cms}})){ - push (@_valxx, "$varenv{cms}->{$rid}->{ct_name}:$varenv{cms}->{$rid}->{ct_name}"); + foreach my $rid (sort { $email_invoice_cms->{$a}->{ct_name} cmp $email_invoice_cms->{$b}->{ct_name} } keys (%{$email_invoice_cms})){ + push (@_valxx, "$email_invoice_cms->{$rid}->{ct_name}:$email_invoice_cms->{$rid}->{ct_name}"); } print $q->start_form(),"\n"; diff --git a/copri4/shareeconf/examples/global.cfg b/copri4/shareeconf/examples/global.cfg index 2490ddf..af87dde 100755 --- a/copri4/shareeconf/examples/global.cfg +++ b/copri4/shareeconf/examples/global.cfg @@ -239,6 +239,10 @@ 2 = "CreditCard" 3 = "Prepaid" + + 0 = "nein" + 1 = "ja" + 0 = "keine" 1 = "lesen" diff --git a/copri4/shareedms-operator/src/Lib/Mlogic.pm b/copri4/shareedms-operator/src/Lib/Mlogic.pm index cba6f2d..f21c71e 100755 --- a/copri4/shareedms-operator/src/Lib/Mlogic.pm +++ b/copri4/shareedms-operator/src/Lib/Mlogic.pm @@ -340,9 +340,9 @@ sub tplselect(){ &Failure::tpl($varenv,$users_dms->{u_id},$feedb_req); }else{ 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/)){ - &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