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

some minor mailing-footer fixes

Browse source
This commit is contained in:
ragu 2023-08-01 14:26:20 +02:00
parent e3d3713994
commit 01ddabbad2
3 changed files with 21 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copri4/main/src/Mod/MailTransport.pm
View file

@ -95,7 +95,7 @@ sub mail_transport(){
$html .= "</body></html>";
$bw->log("Trying send_mail by $0",$mail_to,"");
print EMA "Trying send_mail by $0 to $mail_to\n";
print EMA Dumper($sendref);
if(ref($sendref) eq "HASH"){
@ -109,7 +109,7 @@ sub mail_transport(){
$smtp->datasend("To: $mail_to\n");
$smtp->datasend("Bcc: $mail_bcc\n") if($mail_bcc);
$smtp->datasend("Subject: $subject\n");
$smtp->datasend("\n") if(!$attachBinaryFile);
#$smtp->datasend("\n") if(!$attachBinaryFile);
$smtp->datasend("MIME-Version: 1.0\n");
$smtp->datasend("Content-type: multipart/mixed;\n\tboundary=\"$boundary\"\n");
$smtp->datasend("\n");

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

@ -171,7 +171,7 @@ td {
my $site_all=1;
my $header_top = 0;
my $footer_px = 1780;
my $footer_px = 1800;
my $footer_top = $footer_px;#end 1.site
my $sum_paid = 0;
@ -949,7 +949,7 @@ td {
my @txt12 = split (/;/,"$ctf->{txt12}");#Geschäftsführer
my @txt19 = split (/;/,"$ctf->{txt19}");#Bank usw.
my $top2 = $footer_top + 120;
my $top2 = $footer_top + 150;
$footer_top .= "px";
$top2 .= "px";
print PMA "sub text_footer --> footer_top: $footer_top | top2: $top2\n";
@ -984,10 +984,10 @@ td {
print "<br />\n";
}
print $q->start_table({-width=>'100%',-border=>'0',-align=>'center', -cellpadding=>'2', -cellspacing=>'0'});
print $q->start_table({-width=>'100%',-border=>'0',-align=>'left', -cellpadding=>'0', -cellspacing=>'0'});
print "<tr>";
print "<td style='width:25%;'>";
print "<td>";
print $q->start_table({-border=>'0',-align=>'left'});
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt12[0]"),"\n";
@ -1000,7 +1000,7 @@ td {
print $q->end_table;
print "</td>";
print "<td style='width:25%;'>";
print "<td>";
print $q->start_table({-border=>'0',-align=>'left'});
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "TEL: $ctf->{txt07}"),"\n";
@ -1010,18 +1010,10 @@ td {
print $q->td({-class=>'tdpdf2'}, "$txt11[0]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt11[1]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt11[2]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt11[3]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt11[4]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt11[5]"),"\n";
print $q->end_table;
print "</td>";
print "<td style='width:25%'>";
print "<td>";
print $q->start_table({-border=>'0',-align=>'left'});
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt19[0]"),"\n";
@ -1031,24 +1023,17 @@ td {
print $q->td({-class=>'tdpdf2'}, "$txt19[2]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt19[3]"),"\n";
print $q->end_table;
print "</td>";
print "<td>";
print $q->start_table({-border=>'0',-align=>'left'});
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt19[4]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt19[5]"),"\n";
print $q->end_table;
print "</td>";
print "<td style='width:25%;'>";
print $q->start_table({-width=>'100%',-border=>'0',-align=>'left'});
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt19[6]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt19[7]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt19[8]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt19[9]"),"\n";
print $q->Tr();
print $q->td({-class=>'tdpdf2'}, "$txt19[10]"),"\n";
print $q->end_table;
print "</td>";

11
copri4/main/src/scripts/mailTransportcms.pl
View file

@ -178,7 +178,7 @@ sub send_invoice {
my $ctt = { c_id => 0 };
$ctt = $dbt->fetch_tablerecord($dbh,$fetchctt);
$sendref = prepare_content($sendref,$ctadr,$uadr,$ctt,$varenv{cms}->{$cms_message_key}->{txt});
$sendref = prepare_content($sendref,$ctadr,$uadr,$ctt,$varenv{cms}->{$cms_message_key}->{txt},$with_pdf);
my $updatectt = {
table => "contenttrans",
@ -461,7 +461,8 @@ sub prepare_content {
my $ctadr = shift;
my $uadr = shift;
my $ctt = shift || {};
my $cms_prim = shift;
my $cms_prim = shift || "";
my $with_pdf = shift || "";
my $app_name = "Mietrad App";
$app_name = $dbt->{operator}->{$varenv{dbname}}->{app_name};
@ -470,7 +471,7 @@ sub prepare_content {
my $sharee_ticket = "";
if(ref($ctt) eq "HASH" && $ctt->{ct_name}){
$invoice_name = "$ctt->{txt00}-$varenv{dbname}-$ctt->{ct_name}.pdf";
$sendref->{attachment} = "$invoice_name";
$sendref->{attachment} = "$invoice_name" if($with_pdf);
$invoice_nr = "$varenv{dbname}-$ctt->{ct_name}";
$sharee_ticket = "[$invoice_nr]";
}
@ -489,7 +490,9 @@ my $signature = <<EOF
$uadr->{txt07}
$uadr->{txt08}
$uadr->{txt84}
$uadr->{txt09}
$uadr->{txt10}
EOF
;