diff --git a/copri4/main/css/local_style20221002.css b/copri4/main/css/local_style20221106.css similarity index 98% rename from copri4/main/css/local_style20221002.css rename to copri4/main/css/local_style20221106.css index 3816801..5ed20e7 100755 --- a/copri4/main/css/local_style20221002.css +++ b/copri4/main/css/local_style20221106.css @@ -530,7 +530,16 @@ div#Oline { border-right: solid thin silver; border-bottom: solid thin silver; } - +.tdtxt3 { + padding:0.2em 0.5em; + vertical-align: top; + text-align: left; + min-width:45px; + font-size:0.81em; + background-color:white; + border-right: solid thin silver; + border-bottom: solid thin silver; +} .tdsum { padding:0.1em 0.5em; vertical-align: top; @@ -720,7 +729,14 @@ div#Content4list { padding: 40px 5px 5px 0px; min-width: 2000px; } - +div#Content4sublist { + text-align:left; + font-size:15px; + border: 0px solid yellow; + margin: 0; + padding: 40px 5px 5px 0px; + min-width: 200px; +} div#Content4cal { text-align:left; font-size:14px; diff --git a/copri4/main/src/Mod/FileOut.pm b/copri4/main/src/Mod/FileOut.pm index 4a31553..91227b0 100755 --- a/copri4/main/src/Mod/FileOut.pm +++ b/copri4/main/src/Mod/FileOut.pm @@ -28,7 +28,13 @@ sub handler { my %varenv = $cf->envonline(); my $filesuff = $q->param('file'); - rcopy("$varenv{basedir}/pdfinvoice/$filesuff","$varenv{basedir}/cache/$coo/$filesuff"); + if($filesuff =~ /\.pdf/){ + rcopy("$varenv{basedir}/pdfinvoice/$filesuff","$varenv{basedir}/cache/$coo/$filesuff"); + }elsif($filesuff =~ /got_last\.csv/i){ + rcopy("$varenv{basedir}/ftp/SWK_codes/$filesuff","$varenv{basedir}/cache/$coo/$filesuff"); + }elsif($filesuff =~ /Statistik_\d{4}-\d{2}\.zip/i){ + rcopy("$varenv{basedir}/csv/$filesuff","$varenv{basedir}/cache/$coo/$filesuff"); + } print $q->redirect(-uri=>"$varenv{metahost}/cache/$coo/$filesuff", -type=>"application/octet-stream"); #remove_tree("$varenv{basedir}/cache/$coo"); # diff --git a/copri4/main/src/Mod/Pricing.pm b/copri4/main/src/Mod/Pricing.pm index dc68bf1..f63019c 100755 --- a/copri4/main/src/Mod/Pricing.pm +++ b/copri4/main/src/Mod/Pricing.pm @@ -502,28 +502,42 @@ sub operator_accounting2calc { foreach(@tplf_order){ my ($key,$val,$size) = split /=/,$_; if($key =~ /int/){ - $oac->{int01} = $oac->{int01} + $ctpos->{int01} if($key eq "int01" && $ctpos->{int01});#invoice capture + $oac->{int99} = $ctpos->{int01} if($key eq "int01" && $ctpos->{int01});#invoice capture brutto + $oac->{int01} = $ctpos->{int01} / 119 * 100 if($key eq "int01" && $ctpos->{int01});#invoice capture netto + if($ctpos->{state} =~ /Lastschrift/){ $oac->{int93} = $oac->{int01} / 100 * $ctf->{$key} * -1 if($key eq "int01");#7,5% + $oac->{int93} = sprintf('%.3f', $oac->{int93}); $oac->{int98} = $oac->{int93} * 0.19 if($oac->{int93});#UmSt auf 7,5% - $oac->{int94} = $oac->{int01} / 100 * $ctf->{$key} * -1 if($key eq "int02");#Disagio % - $oac->{int99} = $oac->{int94} * 0.19 if($varenv->{dbname} eq "sharee_sx" && $oac->{int94});#UmSt TeilRad Disagio - $oac->{int95} = $ctf->{$key} * -1 if($key eq "int04");#Trans - $oac->{int96} = $ctf->{$key} * -1 if($key eq "int06");#Zahlungsmeldung + $oac->{int98} = sprintf('%.3f', $oac->{int98}); + $oac->{int94} = $oac->{int01} / 100 * $ctf->{$key} * -1 if($key eq "int02");#po Disagio % + $oac->{int94} = sprintf('%.3f', $oac->{int94}); + $oac->{int95} = $ctf->{$key} * -1 if($key eq "int04");#po Trans + $oac->{int95} = sprintf('%.3f', $oac->{int95}); + $oac->{int96} = $ctf->{$key} * -1 if($key eq "int06");#po Zahlungsmeldung + $oac->{int96} = sprintf('%.3f', $oac->{int96}); $oac->{int97} = 0; } if($ctpos->{state} =~ /Kreditkarte/){ $oac->{int93} = $oac->{int01} / 100 * $ctf->{$key} * -1 if($key eq "int01");#7,5% + $oac->{int93} = sprintf('%.3f', $oac->{int93}); $oac->{int98} = $oac->{int93} * 0.19 if($oac->{int93});#UmSt auf 7,5% - $oac->{int94} = $oac->{int01} / 100 * $ctf->{$key} * -1 if($key eq "int03");#Disagio % - $oac->{int99} = $oac->{int94} * 0.19 if($varenv->{dbname} eq "sharee_sx" && $oac->{int94});#UmSt TeilRad Disagio - $oac->{int95} = $ctf->{$key} * -1 if($key eq "int05");#Trans - $oac->{int96} = $ctf->{$key} * -1 if($key eq "int06");#Zahlungsmeldung - $oac->{int97} = $ctf->{$key} * -1 if($key eq "int07");#CC Zuordnung + $oac->{int98} = sprintf('%.3f', $oac->{int98}); + $oac->{int94} = $oac->{int01} / 100 * $ctf->{$key} * -1 if($key eq "int03");#po Disagio % + $oac->{int94} = sprintf('%.3f', $oac->{int94}); + $oac->{int95} = $ctf->{$key} * -1 if($key eq "int05");#po Trans + $oac->{int95} = sprintf('%.3f', $oac->{int95}); + $oac->{int96} = $ctf->{$key} * -1 if($key eq "int06");#po Zahlungsmeldung + $oac->{int96} = sprintf('%.3f', $oac->{int96}); + $oac->{int97} = $ctf->{$key} * -1 if($key eq "int07");#po CC Zuordnung + $oac->{int97} = sprintf('%.3f', $oac->{int97}); } #operator accounting - $oac->{int02} = $oac->{int01} + $oac->{int93} + $oac->{int98} + $oac->{int94} + $oac->{int99} + $oac->{int95} + $oac->{int96} + $oac->{int97}; - $oac->{int100} = ($oac->{int93} + $oac->{int98} + $oac->{int94} + $oac->{int99}) * -1; + $oac->{int02} = $oac->{int01} + $oac->{int94} + $oac->{int95} + $oac->{int96} + $oac->{int97}; + $oac->{int02} = sprintf('%.3f', $oac->{int02}); + #operator invoice + $oac->{int100} = ($oac->{int93} + $oac->{int98}) * -1; + $oac->{int100} = sprintf('%.3f', $oac->{int100}); } } diff --git a/copri4/main/src/Mod/Printpreview.pm b/copri4/main/src/Mod/Printpreview.pm index 7280057..133bccc 100755 --- a/copri4/main/src/Mod/Printpreview.pm +++ b/copri4/main/src/Mod/Printpreview.pm @@ -160,7 +160,7 @@ td { my $site_all=1; my $header_top = 0; - my $footer_px = 1800; + my $footer_px = 1790; my $footer_top = $footer_px;#end 1.site my $sum_paid = 0; @@ -424,17 +424,16 @@ td { my @tpl_order = (); #int9x are not in db + #operator invoice if($ctt->{txt00} eq "Rechnung"){ - @tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int93=TeilRad Gebühren","int98=TeilRad Gebühren 19%","int100=Summe"); - if($varenv->{dbname} eq "sharee_sx"){ - @tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int93=TeilRad Gebühren","int98=TeilRad Gebühren 19%","int94=TeilRad Disagio","int99=TeilRad Disagio 19%","int100=Summe"); - } + @tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int93=TeilRad Gebühren","int98=19% UmSt","int100=Summe"); } - #default to Abrechnung + #operator accounting else{ - @tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int93=TeilRad Gebühren","int98=TeilRad Gebühren 19%","int94=payone Disagio","int95=payone Transaktion","int96=payone Zahlungs-meldung","int97=payone Kreditkarte Zuordnung","int02=Summe Gutschrift"); - if($varenv->{dbname} eq "sharee_sx"){ - @tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int93=TeilRad Gebühren","int98=TeilRad Gebühren 19%","int94=TeilRad Disagio","int99=TeilRad Disagio 19%","int02=Summe Gutschrift"); + if($varenv->{dbname} eq "sharee_sx"){ + @tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int94=payone Disagio","int02=Summe Gutschrift"); + }else{ + @tpl_order = ("c_id=ID","int01=Summe Einzug","state=Zahlungsart","int94=payone Disagio","int95=payone Transaktion","int96=payone Zahlungsmeldung","int97=payone Kreditkarte Zuordnung","int02=Summe Gutschrift"); } } @@ -934,7 +933,7 @@ td { $line = $footer_top if($debug); print "