mirror of
https://gitlab.com/t6353/sharee.bike.git
synced 2025-06-16 05:36:29 +02:00
operator build debug and fix. Faktura warning state
This commit is contained in:
ragu
parent
2e2c824dbe
commit
5b32d2b7f5
40 changed files with 254 additions and 1203 deletions
|
|
@ -364,19 +364,23 @@ EOF
|
|||
|
||||
|
||||
print $q->Tr(),"\n";
|
||||
print $q->td({-class=>'tdval5',-colspan=>"2"},$q->span({-style=>'font-weight:bold;'},"Internas und Bearbeitungstatus")),"\n";
|
||||
print $q->td({-class=>'tdval5',-colspan=>"2"},$q->span({-style=>'font-weight:bold;'},"PDF Formular Texte "),$q->span({-style=>'color:silver;font-weight:normal;'}," ( für den Kunden sichtbar )")),"\n";
|
||||
print $q->td({-class=>'tdval5',-colspan=>"1"},$q->span({-style=>'font-weight:bold;'},"Internas und Bearbeitungstatus")),"\n";
|
||||
print $q->td({-class=>'tdval5',-colspan=>"1"},$q->span({-style=>''},"Mahnwesen")),"\n";
|
||||
print $q->td({-class=>'tdval5',-colspan=>"2"},$q->span({-style=>'font-weight:bold;'},"PDF Formular Text "),$q->span({-style=>'color:silver;font-weight:normal;'}," ( für den Kunden sichtbar )")),"\n";
|
||||
if($dbt->{shareedms_conf}->{order_state}){
|
||||
print $q->Tr(),"\n";
|
||||
my @_orderstate = split(/\|/,$dbt->{shareedms_conf}->{order_state});
|
||||
print $q->td({-class=>'tdval5',-colspan=>2},$but->selector("txt22","180px",$ctt->{txt22},@_orderstate)),"\n";
|
||||
print $q->td({-class=>'tdval5',-colspan=>1},$but->selector("txt22","180px",$ctt->{txt22},@_orderstate)),"\n";
|
||||
my @_warningstate = split(/\|/,$dbt->{shareedms_conf}->{warning_state});
|
||||
print $q->td({-class=>'tdval5',-colspan=>1},$but->selector("txt19","180px",$ctt->{txt19},@_warningstate)),"\n";
|
||||
|
||||
}
|
||||
$ctt->{txt23} = $q->unescapeHTML("$ctt->{txt23}") if($ctt->{txt23});
|
||||
print $q->Tr(),"\n";
|
||||
print $q->td({-class=>'tdval5',-colspan=>'2'},$q->textarea(-class=>'etxt',-name=>'txt23', -default=>"$ctt->{txt23}", -rows=>6, -columns=>65)),"\n";
|
||||
print $q->td({-class=>'tdval5',-colspan=>'2'},$q->textarea(-class=>'etxt',-name=>'txt23', -default=>"$ctt->{txt23}", -rows=>8, -columns=>90)),"\n";
|
||||
|
||||
$ctt->{txt12} = $q->unescapeHTML($ctt->{txt12}) || "";
|
||||
print $q->td({-class=>'tdval5',-colspan=>'2'},$q->textarea(-class=>'etxt',-name=>'txt12', -default=>"$ctt->{txt12}", -rows=>6, -columns=>65)),"\n";
|
||||
print $q->td({-class=>'tdval5',-colspan=>'2'},$q->textarea(-class=>'etxt',-name=>'txt12', -default=>"$ctt->{txt12}", -rows=>8, -columns=>70)),"\n";
|
||||
|
||||
print $q->Tr(),"\n"; $line_count1++;
|
||||
my @line_txt12 = split(/\n/,$ctt->{txt12});
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ sub tpl(){
|
|||
$edit_template = "$ctrel->{template_id}" . "000";
|
||||
$tpl = $dbt->get_tpl($dbh,$edit_template);
|
||||
}elsif($node_meta->{ct_table} eq "users" && $node_meta->{tpl_id} == 198 && $u_id){
|
||||
my $dbh_primary = $dbt->dbconnect_extern("sharee_primary");
|
||||
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
|
||||
my $users_dms_primary = { u_id => 0 };
|
||||
$users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int03=2");
|
||||
$tpl = $dbt->get_tpl($dbh,$node_meta->{tpl_id});
|
||||
|
|
@ -742,7 +742,7 @@ EOF
|
|||
print $q->td({-class=>'content1_cms',-colspan=>'1'},$but->selector2("$key","250px;","$height",$ctrel->{$key},@_valxx));
|
||||
}
|
||||
#sharee user_group Tarif-2.0 (tarif.c_ids)
|
||||
elsif($key =~ /txt30/ && $varenv{dbname} ne "sharee_primary"){
|
||||
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}){
|
||||
|
|
@ -817,7 +817,7 @@ EOF
|
|||
}
|
||||
#Operators or Operators Antrag
|
||||
elsif($key =~ /txt17|txt19/){
|
||||
if($varenv{dbname} eq "sharee_primary"){
|
||||
if($varenv{dbname} eq $dbt->{primary}->{sharee_primary}->{database}->{dbname}){
|
||||
print $q->Tr();
|
||||
print $q->td({-class=>'left_italic_cms'},"$des"),"\n";
|
||||
print $q->td({-class=>'content1_cms',-colspan=>'2'},$q->textfield(-class=>'etxt', -style=>"width:$w;",-name=>"$key", -override=>'1', -default=>"$ctrel->{$key}"), $postdes),"\n";
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ sub tpl(){
|
|||
$path =~ s/\/user|\/manager|\/admin//;
|
||||
my $now_time = strftime "%Y-%m-%d %H:%M", localtime;
|
||||
|
||||
my $dbh_primary = $dbt->dbconnect_extern("sharee_primary");
|
||||
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
|
||||
my $users_dms_primary = { u_id => 0 };
|
||||
$users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int03=2");
|
||||
|
||||
|
|
|
|||
|
|
@ -1,134 +0,0 @@
|
|||
package Karte;
|
||||
#
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
# Copyright (c) Rainer Gümpelein, TeilRad GmbH
|
||||
#
|
||||
use strict;
|
||||
use warnings;
|
||||
use CGI ':standard';
|
||||
use Lib::Config;
|
||||
use Mod::DBtank;
|
||||
use Mod::APIfunc;
|
||||
|
||||
sub new {
|
||||
my $class = shift;
|
||||
my $self = {};
|
||||
bless($self,$class);
|
||||
return $self;
|
||||
}
|
||||
|
||||
#Template
|
||||
sub tpl(){
|
||||
my $node_meta = shift;
|
||||
my $users_dms = shift || "";
|
||||
my $mode = shift || "";
|
||||
my $varenv = shift;
|
||||
my $users_sharee = shift || { c_id => 0 };
|
||||
my $return = shift || "";
|
||||
|
||||
my $q = new CGI;
|
||||
my $dbt = new DBtank;
|
||||
my $apif = new APIfunc;
|
||||
|
||||
my $api_file = "/var/www/copri4/shareeconf/apikeys.cfg";
|
||||
my $aconf = Config::General->new($api_file);
|
||||
my %apikeyconf = $aconf->getall;
|
||||
|
||||
my $api_return = { authcookie => '' };
|
||||
my $coo = $q->cookie(-name=>'domcookie') || $R::sessionid;
|
||||
($api_return,$users_sharee) = $apif->auth_verify($q,$coo,"");
|
||||
|
||||
my $initMap = $dbt->{website}->{$varenv->{syshost}}->{initMap};
|
||||
my $map_zoom = $dbt->{website}->{$varenv->{syshost}}->{map_zoom} || "10";
|
||||
my $project = "all";
|
||||
my $uri_request = $dbt->{primary}->{sharee_primary}->{primaryDMS};
|
||||
|
||||
if($dbt->{website}->{$varenv->{syshost}}->{merchant_id}){
|
||||
$api_return->{authcookie} = $dbt->{website}->{$varenv->{syshost}}->{merchant_id} if(!$api_return->{authcookie});
|
||||
$project = $dbt->{website}->{$varenv->{syshost}}->{project} if($dbt->{website}->{$varenv->{syshost}}->{project});
|
||||
$uri_request = $dbt->{website}->{$varenv->{syshost}}->{operatorWeb};
|
||||
}elsif($dbt->{operator}->{$varenv->{dbname}}->{merchant_id}){
|
||||
$api_return->{authcookie} = $dbt->{operator}->{$varenv->{dbname}}->{merchant_id} if(!$api_return->{authcookie});
|
||||
$initMap = $dbt->{operator}->{$varenv->{dbname}}->{initMap} if($dbt->{operator}->{$varenv->{dbname}}->{initMap});
|
||||
$map_zoom = $dbt->{operator}->{$varenv->{dbname}}->{map_zoom} if($dbt->{operator}->{$varenv->{dbname}}->{map_zoom});
|
||||
$project = $dbt->{operator}->{$varenv->{dbname}}->{project} if($dbt->{operator}->{$varenv->{dbname}}->{project});
|
||||
$uri_request = $dbt->{operator}->{$varenv->{dbname}}->{operatorDMS};
|
||||
}elsif($dbt->{primary}->{$varenv->{dbname}}->{merchant_id}){
|
||||
$api_return->{authcookie} = $dbt->{primary}->{$varenv->{dbname}}->{merchant_id} if(!$api_return->{authcookie});
|
||||
$initMap = $dbt->{primary}->{$varenv->{dbname}}->{initMap} if($dbt->{primary}->{$varenv->{dbname}}->{initMap});
|
||||
$uri_request = $dbt->{primary}->{$varenv->{dbname}}->{primaryDMS};
|
||||
}
|
||||
|
||||
my $icon_green = "Open_Green.png";
|
||||
my $icon_red = "Open_Red.png";
|
||||
my $icon_blue = "Open_Blue.png";
|
||||
my $mapheight = "600px;";
|
||||
if($project eq "Bayern"){
|
||||
$icon_green = "LastenradBay_Standortpfeil_gruen_03a.png";
|
||||
$icon_red = "LastenradBay_Standortpfeil_rot_03a.png";
|
||||
$icon_blue = "LastenradBay_Standortpfeil_blau_03a.png";
|
||||
$mapheight = "800px;";
|
||||
}
|
||||
|
||||
$users_sharee->{c_id} = "0" if(!$users_sharee->{c_id});
|
||||
$initMap =~ s/\s//g;
|
||||
my ($lat,$lng) = split(/,/,$initMap);
|
||||
my $kmlfile = "";
|
||||
my $filesize = 0;
|
||||
my $preserve_view = "false";
|
||||
|
||||
require "Mod/KMLout.pm";
|
||||
$kmlfile = Mod::KMLout::kmlGenerator($api_return,$varenv,$users_sharee);
|
||||
my $filesize = -s "$varenv->{metahost}/xml/$kmlfile";
|
||||
#
|
||||
#used by empty station card like without public stations
|
||||
#setting to true to keeps lat,lng and zoom
|
||||
$preserve_view = "true" if($filesize < 200);
|
||||
|
||||
print $q->div({-class=>"content2_contact"},"Hier können Lastenfahrräder gemietet werden:"),"\n";
|
||||
print "<div style='background-color:#cccccc;width:100%;margin-top:1em;'>\n";
|
||||
|
||||
print "<div id='map' style='height:$mapheight'></div>\n";
|
||||
|
||||
print<<EOF
|
||||
<script>
|
||||
|
||||
function initMap() {
|
||||
var map = new google.maps.Map(document.getElementById('map'), {
|
||||
scrollwheel: false,
|
||||
//draggable: !("ontouchend" in document),
|
||||
center: {lat: $lat, lng: $lng},
|
||||
zoom: $map_zoom
|
||||
});
|
||||
|
||||
var ctaLayer = new google.maps.KmlLayer({
|
||||
position: map.getCenter(),
|
||||
preserveViewport: $preserve_view,
|
||||
//url: '$uri_request/KMLout?authcookie=$api_return->{authcookie}&dynamo=' + (new Date()).getTime(),
|
||||
url: '$varenv->{metahost}/xml/$kmlfile',
|
||||
map: map
|
||||
});
|
||||
console.log(ctaLayer);
|
||||
|
||||
};
|
||||
|
||||
|
||||
</script>
|
||||
<script async defer
|
||||
src="https://maps.googleapis.com/maps/api/js?key=$apikeyconf{googlemap}->{google_key}&callback=initMap">
|
||||
</script>
|
||||
EOF
|
||||
;
|
||||
|
||||
print "</div>\n";
|
||||
|
||||
#print $q->div({-class=>"content2_legende", -style=>'font-weight:bold;'}, "• Ist ein Lastenrad an einer Mietradstation verfügbar?"),"\n";
|
||||
print $q->div({-class=>"content2_legende"}, $q->img({-style=>'height:30px;', -src=>"$varenv->{metahost}/img/$icon_green"}), "Lastenrad verfügbar"),"\n";
|
||||
print $q->div({-class=>"content2_legende"}, $q->img({-style=>'height:30px;', -src=>"$varenv->{metahost}/img/$icon_red"}), "Lastenrad nicht verfügbar"),"\n";
|
||||
#print $q->div({-class=>"content2_legende"}, " "),"\n";
|
||||
|
||||
print "$initMap|$varenv->{dbname}|$api_return->{authcookie}|$users_sharee->{c_id}|$kmlfile" if($users_dms->{u_id} == $dbt->{copri_conf}->{superu_id});
|
||||
|
||||
}
|
||||
1;
|
||||
|
||||
|
|
@ -147,7 +147,7 @@ sub tpl(){
|
|||
$node_meta->{tpl_order} =~ s/txt17=[\w\s=]+,//;
|
||||
$node_meta->{tpl_order} =~ s/byte01=[\w\s=]+,//;
|
||||
}
|
||||
if($table eq "contentadr" && $varenv{dbname} ne "sharee_primary"){
|
||||
if($table eq "contentadr" && $varenv{dbname} ne $dbt->{primary}->{sharee_primary}->{database}->{dbname}){
|
||||
$node_meta->{tpl_order} =~ s/txt17=[\w\s=]+,//;
|
||||
$node_meta->{tpl_order} =~ s/txt19=[\w\s=]+,//;
|
||||
}
|
||||
|
|
@ -191,8 +191,10 @@ sub tpl(){
|
|||
my $k=0;
|
||||
my $message = "";
|
||||
|
||||
#print $q->end_form,"\n";
|
||||
print "<div id='Content4list'>\n";
|
||||
my $framewidth = "min-width: 1200px;";
|
||||
#to keep calendar line
|
||||
$framewidth = "min-width: 2000px;" if($node_meta->{ct_table} eq "content");
|
||||
print "<div id='Content4list' style='$framewidth'>\n";
|
||||
|
||||
my $v_journal = $R::v_journal || "";
|
||||
if($node_meta->{main_id} == $dbt->{shareedms_conf}->{invoicejournal}){
|
||||
|
|
@ -379,7 +381,7 @@ sub tpl(){
|
|||
my $bike_nodes = $dbt->fetch_rel4tpl4nd($dbh,$node);
|
||||
my $tariff_all = $db->collect_ct4rel("content","300026",$lang,"","","","","210");
|
||||
|
||||
my $dbh_primary = $dbt->dbconnect_extern("sharee_primary");
|
||||
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
|
||||
my $users_dms_primary = { u_id => 0 };
|
||||
$users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int02 >= 1");
|
||||
|
||||
|
|
@ -543,6 +545,7 @@ sub tpl(){
|
|||
foreach(@tpl_order){
|
||||
$h++;
|
||||
my ($key,$val,$size) = split /=/,$_;
|
||||
if($size ne "select"){
|
||||
if($size =~ /area/){
|
||||
$size = "5em";
|
||||
}elsif($key =~ /int0|c_id|ct_name/){
|
||||
|
|
@ -550,7 +553,7 @@ sub tpl(){
|
|||
}else{
|
||||
$size = "2em";
|
||||
}
|
||||
|
||||
}
|
||||
$s_val = $searchref->{$key};
|
||||
#print "$key=$searchref->{$key}|";
|
||||
if($key =~ /byte|node|txt|int|time\d+|ct_name|c_id|barcode|sort|public/){
|
||||
|
|
@ -585,6 +588,11 @@ sub tpl(){
|
|||
push (@s_valxx, "$tariff_all->{$rid}->{barcode}:$tariff_all->{$rid}->{barcode} - $tariff_all->{$rid}->{ct_name}");
|
||||
}
|
||||
print $q->td({-class=>'search_line'},$but->selector_class("s_$key","","",$s_val,@s_valxx)),"\n";
|
||||
|
||||
}elsif($size =~ /select/ && $key eq "txt19" && $tpl_id =~ /209|218/){
|
||||
my @_warningstates = split(/\|/,$dbt->{shareedms_conf}->{warning_state});
|
||||
print $q->td({-class=>'search_line'},$but->selector("s_$key","120px","$s_val",@_warningstates)),"\n";
|
||||
|
||||
}elsif($size =~ /select/ && $key !~ /txt23|txt24/){#txt23=color-code or txt24=Flotten ID select
|
||||
my @s_valxx = ("");
|
||||
my $s_hash = {};
|
||||
|
|
@ -892,7 +900,7 @@ sub tpl(){
|
|||
$set_style4nr="background-color:#e3dbc9;" if(($key eq "barcode") || ($key eq "int04"));
|
||||
$ct4rel->{$id}->{$key} =~ s/\./,/ if($key =~ /int/);
|
||||
|
||||
if($key eq "c_id" && $val eq "raw"){
|
||||
if($key eq "c_id"){
|
||||
|
||||
my $pos_hash = $ct4rel->{$id};
|
||||
my $pos_details = "";
|
||||
|
|
@ -901,13 +909,15 @@ sub tpl(){
|
|||
if($pos_hash->{$did}){
|
||||
$teaser = substr($pos_hash->{$did},0,30);
|
||||
}
|
||||
$pos_details .= $did . " = " . $teaser . "</br>";
|
||||
$pos_details .= $did . " = " . $teaser . "</br>" if($pos_hash->{$did});
|
||||
}
|
||||
|
||||
my $pos_id = $q->div({-class=>"popup",-onclick=>"toggle_box('$id')"},"$ct4rel->{$id}->{c_id}", $q->span({-class=>"popuptext",-id=>"$id"},"$pos_details"));
|
||||
my $pos_id = "$ct4rel->{$id}->{c_id}";
|
||||
if($users_dms->{u_id} && $users_dms->{u_id} =~ /1842|5781|11765|21618|38883/){
|
||||
$pos_id = $q->div({-class=>"popup",-onclick=>"toggle_box('$id')"},"$ct4rel->{$id}->{c_id}", $q->span({-class=>"popuptext",-id=>"$id"},"$pos_details"));
|
||||
}
|
||||
print $q->td({-class=>'tdtxt',-style=>"font-weight:normal;$set_style4nr"},"$pos_id"),"\n";
|
||||
}
|
||||
elsif($key =~ /ct_name|c_id/ && $ct4rel->{$id}->{$key}){
|
||||
elsif($key eq "ct_name" && $ct4rel->{$id}->{$key}){
|
||||
if($table =~ /contenttrans|contenttver/){
|
||||
print $q->td({-class=>'tdint',-style=>"font-weight:normal;$set_style4nr"},$q->a({-class=>"linknav3",-href=>"?ct_trans=open\&mode=manager\&c_id4trans=$ct4rel->{$id}->{c_id}\&tpl_id4trans=$ct4rel->{$id}->{template_id}\&kind_of_trans=$node_meta->{node_name}\&owner=$users_dms->{u_id}\&offset=$offset\&limit=$limit",-title=>"Terminal öffnen"},"$ct4rel->{$id}->{$key}"));
|
||||
}elsif($table =~ /content$|contentadr|contentnel/){
|
||||
|
|
@ -1097,14 +1107,13 @@ sub tpl(){
|
|||
|
||||
|
||||
if(($nr > 0) && ($v_journal || $R::v_abschluss) && !$R::rel_id){
|
||||
$k="9" if(!$k);
|
||||
$k="13";# if(!$k);
|
||||
my $m = $k;
|
||||
$close_time = $R::s_mtime if($R::s_mtime);
|
||||
print $q->Tr();
|
||||
print $q->td({-style=>"background-color:silver;"},""),"\n";
|
||||
print $q->td({-class=>'tdtxt',-style=>'text-align:center;background-color:silver;',-colspan=>"$m"},"Gesamt Umsätze");
|
||||
print $q->td({-class=>'tdsum',-colspan=>"1",-style=>'background-color:silver;'},"");
|
||||
print $q->td({-class=>'tdsum',-colspan=>"1",-style=>'background-color:silver;'},"");
|
||||
print $q->td({-class=>'tdsum',-colspan=>"4",-style=>'background-color:silver;'},"");
|
||||
|
||||
|
||||
if(1==1){
|
||||
|
|
@ -1115,6 +1124,7 @@ sub tpl(){
|
|||
print $q->td({-class=>'tdint',-colspan=>"$m"},"Saldo Summe");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"$sum_saldo €");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"2"},"");
|
||||
}
|
||||
if($sum_opos != 0){
|
||||
$sum_opos *= -1;
|
||||
|
|
@ -1124,7 +1134,7 @@ sub tpl(){
|
|||
print $q->td({-style=>"background-color:silver;"},""),"\n";
|
||||
print $q->td({-class=>'tdint',-colspan=>"$m"},"OPOS Summe");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"$sum_opos €");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"");
|
||||
print $q->td({-class=>'tdint',-colspan=>"3",-nowrap=>"1"},"");
|
||||
}
|
||||
if($sum_ueb != 0){
|
||||
$sum_ueb = sprintf('%.2f',$sum_ueb);
|
||||
|
|
@ -1133,7 +1143,7 @@ sub tpl(){
|
|||
print $q->td({-style=>"background-color:silver;"},""),"\n";
|
||||
print $q->td({-class=>'tdint',-colspan=>"$m"},"Überweisung Summe");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"$sum_ueb €");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"");
|
||||
print $q->td({-class=>'tdint',-colspan=>"3",-nowrap=>"1"},"");
|
||||
}
|
||||
if($sum_SEPApayone != 0){
|
||||
$sum_SEPApayone = sprintf('%.2f',$sum_SEPApayone);
|
||||
|
|
@ -1142,7 +1152,7 @@ sub tpl(){
|
|||
print $q->td({-style=>"background-color:silver;"},""),"\n";
|
||||
print $q->td({-class=>'tdint',-colspan=>"$m"},"SEPA-Lastschrift (payone) Summe");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"$sum_SEPApayone €");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"");
|
||||
print $q->td({-class=>'tdint',-colspan=>"3",-nowrap=>"1"},"");
|
||||
}
|
||||
if($sum_CCpayone != 0){
|
||||
$sum_CCpayone = sprintf('%.2f',$sum_CCpayone);
|
||||
|
|
@ -1151,7 +1161,7 @@ sub tpl(){
|
|||
print $q->td({-style=>"background-color:silver;"},""),"\n";
|
||||
print $q->td({-class=>'tdint',-colspan=>"$m"},"Kreditkarte (payone) Summe");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"$sum_CCpayone €");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"");
|
||||
print $q->td({-class=>'tdint',-colspan=>"3",-nowrap=>"1"},"");
|
||||
}
|
||||
if($sum_ausfall != 0){
|
||||
$sum_ausfall *= -1;
|
||||
|
|
@ -1161,7 +1171,7 @@ sub tpl(){
|
|||
print $q->td({-style=>"background-color:silver;"},""),"\n";
|
||||
print $q->td({-class=>'tdint',-colspan=>"$m"},"Zahlungsausfall Summe");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"$sum_ausfall €");
|
||||
print $q->td({-class=>'tdint',-colspan=>"1",-nowrap=>"1"},"");
|
||||
print $q->td({-class=>'tdint',-colspan=>"3",-nowrap=>"1"},"");
|
||||
}
|
||||
if($sum_success != 0){
|
||||
$sum_success = sprintf('%.2f',$sum_success);
|
||||
|
|
@ -1169,7 +1179,7 @@ sub tpl(){
|
|||
print $q->td({-style=>"background-color:silver;"},""),"\n";
|
||||
print $q->td({-class=>'tdsum',-colspan=>"$m"},"Erfolgreiche Zahlungen");
|
||||
print $q->td({-class=>'tdsum',-colspan=>"1",-nowrap=>"1"},"$sum_success €");
|
||||
print $q->td({-class=>'tdsum',-colspan=>"1",-nowrap=>"1"},"");
|
||||
print $q->td({-class=>'tdsum',-colspan=>"3",-nowrap=>"1"},"");
|
||||
}
|
||||
|
||||
if($users_dms->{u_id}){
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ sub tpl(){
|
|||
$path =~ s/\/user|\/manager|\/admin//;
|
||||
my $lang = "de";
|
||||
my $dbh = "";
|
||||
my $dbh_primary = $dbt->dbconnect_extern("sharee_primary");
|
||||
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
|
||||
my $users_dms_primary = { u_id => 0 };
|
||||
$users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int02 >= 1");
|
||||
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ sub tpl(){
|
|||
$tpl_ids = $node_meta->{tpl_id};
|
||||
}
|
||||
elsif($node_meta->{tpl_id} == 198){
|
||||
my $dbh_primary = $dbt->dbconnect_extern("sharee_primary");
|
||||
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
|
||||
my $users_dms_primary = { u_id => 0 };
|
||||
$users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int03=2");
|
||||
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ sub tpl(){
|
|||
my $ctt_accounting = $dbt->fetch_record($dbh,$pref);
|
||||
($cttpos,$rows) = $dbt->collect_contenttrans($dbh,$ctt_accounting->{content_id});
|
||||
#int9x are not in db
|
||||
@tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int93=TeilRad Gebühren","int100=Summe");
|
||||
@tpl_order = ("c_id=ID","int01=Netto Erlös","state=Zahlungsart","int93=Entgeld TeilRad GmbH");
|
||||
}
|
||||
#operator accounting
|
||||
else{
|
||||
|
|
@ -258,7 +258,7 @@ sub tpl(){
|
|||
|
||||
print $q->Tr("\n");$line_count2++;
|
||||
print $q->td({-class=>'tdint',-colspan=>1,-style=>'color:silver;'},"(Einzüge brutto $sum_all)");
|
||||
print $q->td({-class=>'tdsum',-colspan=>1},"Gesamtbetrag");
|
||||
print $q->td({-class=>'tdsum',-colspan=>1},"Entgeld TeilRad GmbH");
|
||||
print $q->td({-class=>'tdint',-nowrap=>"1"},"$sum_paid €");
|
||||
}
|
||||
#Summe Betreiber Abrechnung (Gutschrift)
|
||||
|
|
@ -290,7 +290,7 @@ sub tpl(){
|
|||
if($users_dms->{int03} == 2){
|
||||
#only if user is also a primary DMS user with invoice rw
|
||||
print $q->hidden(-name=>'printer_id', -value=>"PDF", -override=>'1');
|
||||
my $dbh_primary = $dbt->dbconnect_extern("sharee_primary");
|
||||
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
|
||||
my $users_dms_primary = { u_id => 0 };
|
||||
$users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int03=2");
|
||||
|
||||
|
|
@ -299,7 +299,7 @@ sub tpl(){
|
|||
my $kind_of_payment = "";
|
||||
if($ctt->{template_id} != 208){#not equal Abrechnung
|
||||
print $q->hidden(-name=>'sum_paid', -override=>'1',-value=>"$sum_paid");
|
||||
push @_paymentstate, "Disagio";
|
||||
push @_paymentstate, "Entgeld TeilRad GmbH";
|
||||
if($ctt->{state} && $ctt->{int01}){
|
||||
$kind_of_payment = "$ctt->{state}";
|
||||
$ctt->{int01} =~ s/\./,/;
|
||||
|
|
|
|||
|
|
@ -524,7 +524,7 @@ EOF
|
|||
if($users_dms->{int03} == 2){
|
||||
#only if user is also a primary DMS user with invoice rw
|
||||
print $q->hidden(-name=>'printer_id', -value=>"PDF", -override=>'1');
|
||||
my $dbh_primary = $dbt->dbconnect_extern("sharee_primary");
|
||||
my $dbh_primary = $dbt->dbconnect_extern($dbt->{primary}->{sharee_primary}->{database}->{dbname});
|
||||
my $users_dms_primary = { u_id => 0 };
|
||||
$users_dms_primary = $dbt->select_users($dbh_primary,$users_dms->{u_id},"and int03=2");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue