X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FDN.pm;h=95ff16ac3714c271ca1db0878898adc10ab1daa3;hb=6ed3eaf6cdcec633878703161f2d6d886bfe2ac3;hp=c706ee4a21ba67d868e56ebc4f522f51ebe8c76c;hpb=8f98fc19d76ab2d20022b3103ac22618bbde5656;p=kivitendo-erp.git diff --git a/SL/DN.pm b/SL/DN.pm index c706ee4a2..95ff16ac3 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -36,6 +36,8 @@ package DN; use SL::Template; use SL::IS; +use SL::Common; +use SL::DBUtils; use Data::Dumper; sub get_config { @@ -46,26 +48,22 @@ sub get_config { # connect to database my $dbh = $form->dbconnect($myconfig); - my $query = qq|SELECT dn.* - FROM dunning_config dn - ORDER BY dn.dunning_level|; + my $query = + qq|SELECT * | . + qq|FROM dunning_config | . + qq|ORDER BY dunning_level|; + $form->{DUNNING} = selectall_hashref_query($form, $dbh, $query); - $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); - - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { + foreach my $ref (@{ $form->{DUNNING} }) { $ref->{fee} = $form->format_amount($myconfig, $ref->{fee}, 2); - $ref->{interest} = $form->format_amount($myconfig, ($ref->{interest} * 100)); - push @{ $form->{DUNNING} }, $ref; + $ref->{interest_rate} = $form->format_amount($myconfig, ($ref->{interest_rate} * 100)); } - $sth->finish; - $dbh->disconnect; + $dbh->disconnect(); $main::lxdebug->leave_sub(); } - sub save_config { $main::lxdebug->enter_sub(); @@ -74,42 +72,43 @@ sub save_config { # connect to database my $dbh = $form->dbconnect_noauto($myconfig); + my ($query, @values); + for my $i (1 .. $form->{rowcount}) { - $form->{"active_$i"} *= 1; - $form->{"auto_$i"} *= 1; - $form->{"email_$i"} *= 1; - $form->{"terms_$i"} *= 1; - $form->{"payment_terms_$i"} *= 1; - $form->{"email_attachment_$i"} *= 1; $form->{"fee_$i"} = $form->parse_amount($myconfig, $form->{"fee_$i"}) * 1; - $form->{"interest_$i"} = $form->parse_amount($myconfig, $form->{"interest_$i"})/100; - - if (($form->{"dunning_level_$i"} ne "") && ($form->{"dunning_description_$i"} ne "")) { + $form->{"interest_rate_$i"} = $form->parse_amount($myconfig, $form->{"interest_rate_$i"}) / 100; + + if (($form->{"dunning_level_$i"} ne "") && + ($form->{"dunning_description_$i"} ne "")) { + @values = (conv_i($form->{"dunning_level_$i"}), $form->{"dunning_description_$i"}, + $form->{"email_subject_$i"}, $form->{"email_body_$i"}, + $form->{"template_$i"}, $form->{"fee_$i"}, $form->{"interest_rate_$i"}, + $form->{"active_$i"} ? 't' : 'f', $form->{"auto_$i"} ? 't' : 'f', $form->{"email_$i"} ? 't' : 'f', + $form->{"email_attachment_$i"} ? 't' : 'f', conv_i($form->{"payment_terms_$i"}), conv_i($form->{"terms_$i"})); if ($form->{"id_$i"}) { - my $query = qq|UPDATE dunning_config SET - dunning_level = | . $dbh->quote($form->{"dunning_level_$i"}) . qq|, - dunning_description = | . $dbh->quote($form->{"dunning_description_$i"}) . qq|, - email_subject = | . $dbh->quote($form->{"email_subject_$i"}) . qq|, - email_body = | . $dbh->quote($form->{"email_body_$i"}) . qq|, - template = | . $dbh->quote($form->{"template_$i"}) . qq|, - fee = '$form->{"fee_$i"}', - interest = '$form->{"interest_$i"}', - active = '$form->{"active_$i"}', - auto = '$form->{"auto_$i"}', - email = '$form->{"email_$i"}', - email_attachment = '$form->{"email_attachment_$i"}', - payment_terms = $form->{"payment_terms_$i"}, - terms = $form->{"terms_$i"} - WHERE id=$form->{"id_$i"}|; - $dbh->do($query) || $form->dberror($query); + $query = + qq|UPDATE dunning_config SET + dunning_level = ?, dunning_description = ?, + email_subject = ?, email_body = ?, + template = ?, fee = ?, interest_rate = ?, + active = ?, auto = ?, email = ?, + email_attachment = ?, payment_terms = ?, terms = ? + WHERE id = ?|; + push(@values, conv_i($form->{"id_$i"})); } else { - my $query = qq|INSERT INTO dunning_config (dunning_level, dunning_description, email_subject, email_body, template, fee, interest, active, auto, email, email_attachment, terms, payment_terms) VALUES (| . $dbh->quote($form->{"dunning_level_$i"}) . qq|,| . $dbh->quote($form->{"dunning_description_$i"}) . qq|,| . $dbh->quote($form->{"email_subject_$i"}) . qq|,| . $dbh->quote($form->{"email_body_$i"}) . qq|,| . $dbh->quote($form->{"template_$i"}) . qq|,'$form->{"fee_$i"}','$form->{"interest_$i"}','$form->{"active_$i"}','$form->{"auto_$i"}','$form->{"email_$i"}','$form->{"email_attachment_$i"}',$form->{"terms_$i"},$form->{"payment_terms_$i"})|; - $dbh->do($query) || $form->dberror($query); + $query = + qq|INSERT INTO dunning_config + (dunning_level, dunning_description, email_subject, email_body, + template, fee, interest_rate, active, auto, email, + email_attachment, payment_terms, terms) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)|; } + do_query($form, $dbh, $query, @values); } + if (($form->{"dunning_description_$i"} eq "") && ($form->{"id_$i"})) { - my $query = qq|DELETE FROM dunning_config WHERE id=$form->{"id_$i"}|; - $dbh->do($query) || $form->dberror($query); + $query = qq|DELETE FROM dunning_config WHERE id = ?|; + do_query($form, $dbh, $query, $form->{"id_$i"}); } } @@ -122,45 +121,122 @@ sub save_config { sub save_dunning { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form, $rows, $userspath,$spool, $sendmail) = @_; + my ($self, $myconfig, $form, $rows, $userspath, $spool, $sendmail) = @_; # connect to database my $dbh = $form->dbconnect_noauto($myconfig); - foreach my $row (@{ $rows }) { - - $form->{"interest_$row"} = $form->parse_amount($myconfig,$form->{"interest_$row"}); - $form->{"fee_$row"} = $form->parse_amount($myconfig,$form->{"fee_$row"}); - $form->{send_email} = $form->{"email_$row"}; - - my $query = qq| UPDATE ar set dunning_id = '$form->{"next_dunning_id_$row"}' WHERE id='$form->{"inv_id_$row"}'|; - $dbh->do($query) || $form->dberror($query); - my $query = qq| INSERT into dunning (dunning_id,dunning_level,trans_id,fee,interest,transdate,duedate) VALUES ($form->{"next_dunning_id_$row"},(select dunning_level from dunning_config WHERE id=$form->{"next_dunning_id_$row"}),$form->{"inv_id_$row"},'$form->{"fee_$row"}', '$form->{"interest_$row"}',current_date, |.$dbh->quote($form->{"next_duedate_$row"}) . qq|)|; - $dbh->do($query) || $form->dberror($query); - } - - my $query = qq| SELECT invnumber, ordnumber, customer_id, amount, netamount, ar.transdate, ar.duedate, paid, amount-paid AS open_amount, template AS formname, email_subject, email_body, email_attachment, da.fee, da.interest, da.transdate AS dunning_date, da.duedate AS dunning_duedate FROM ar LEFT JOIN dunning_config ON (dunning_config.id=ar.dunning_id) LEFT JOIN dunning da ON (ar.id=da.trans_id AND dunning_config.dunning_level=da.dunning_level) where ar.id IN $form->{inv_ids}|; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + my ($query, @values); + + my ($dunning_id) = selectrow_query($form, $dbh, qq|SELECT nextval('id')|); + + my $q_update_ar = qq|UPDATE ar SET dunning_config_id = ? WHERE id = ?|; + my $h_update_ar = prepare_query($form, $dbh, $q_update_ar); + + my $q_insert_dunning = + qq|INSERT INTO dunning (dunning_id, dunning_config_id, dunning_level, + trans_id, fee, interest, transdate, duedate) + VALUES (?, ?, + (SELECT dunning_level FROM dunning_config WHERE id = ?), + ?, + (SELECT SUM(fee) + FROM dunning_config + WHERE dunning_level <= (SELECT dunning_level FROM dunning_config WHERE id = ?)), + (SELECT (amount - paid) * (current_date - transdate) FROM ar WHERE id = ?) + * (SELECT interest_rate FROM dunning_config WHERE id = ?) + / 360, + current_date, + current_date + (SELECT payment_terms FROM dunning_config WHERE id = ?))|; + my $h_insert_dunning = prepare_query($form, $dbh, $q_insert_dunning); + + my @invoice_ids; + my ($next_dunning_config_id, $customer_id); + my $send_email = 0; + + foreach my $row (@{ $rows }) { + push @invoice_ids, $row->{invoice_id}; + $next_dunning_config_id = $row->{next_dunning_config_id}; + $customer_id = $row->{customer_id}; + + @values = ($row->{next_dunning_config_id}, $row->{invoice_id}); + do_statement($form, $h_update_ar, $q_update_ar, @values); + + $send_email |= $row->{email}; + + my $next_config_id = conv_i($row->{next_dunning_config_id}); + my $invoice_id = conv_i($row->{invoice_id}); + + @values = ($dunning_id, $next_config_id, $next_config_id, + $invoice_id, $next_config_id, $invoice_id, + $next_config_id, $next_config_id); + do_statement($form, $h_insert_dunning, $q_insert_dunning, @values); + } + + $h_update_ar->finish(); + $h_insert_dunning->finish(); + + my $query = + qq|SELECT + ar.invnumber, ar.ordnumber, ar.amount, ar.netamount, + ar.transdate, ar.duedate, ar.paid, ar.amount - ar.paid AS open_amount, + da.fee, da.interest, da.transdate AS dunning_date, da.duedate AS dunning_duedate + FROM ar + LEFT JOIN dunning_config cfg ON (cfg.id = ar.dunning_config_id) + LEFT JOIN dunning da ON (ar.id = da.trans_id AND cfg.dunning_level = da.dunning_level) + WHERE ar.id IN (| + . join(", ", map { "?" } @invoice_ids) . qq|)|; + + my $sth = prepare_execute_query($form, $dbh, $query, @invoice_ids); my $first = 1; while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { if ($first) { map({ $form->{"dn_$_"} = []; } keys(%{$ref})); $first = 0; } + + $ref->{interest_rate} = $form->format_amount($myconfig, $ref->{interest_rate} * 100); map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest); - map { $form->{$_} = $ref->{$_} } keys %$ref; - #print(STDERR Dumper($ref)); - map { push @{ $form->{"dn_$_"} }, $ref->{$_}} keys %$ref; + map { push(@{ $form->{"dn_$_"} }, $ref->{$_})} keys %$ref; + map { $form->{$_} = $ref->{$_} } keys %{ $ref }; } $sth->finish; - IS->customer_details($myconfig,$form); - #print(STDERR Dumper($form->{dn_invnumber})); - $form->{templates} = "$myconfig->{templates}"; - - - - $form->{language} = $form->get_template_language(\%myconfig); + $query = + qq|SELECT id AS customer_id, name, street, zipcode, city, country, department_1, department_2, email + FROM customer + WHERE id = ?|; + $ref = selectfirst_hashref_query($form, $dbh, $query, $customer_id); + map { $form->{$_} = $ref->{$_} } keys %{ $ref }; + + $query = + qq|SELECT + cfg.interest_rate, cfg.template AS formname, + cfg.email_subject, cfg.email_body, cfg.email_attachment, + (SELECT fee + FROM dunning + WHERE dunning_id = ? + LIMIT 1) + AS fee, + (SELECT SUM(interest) + FROM dunning + WHERE dunning_id = ?) + AS total_interest, + (SELECT SUM(amount) - SUM(paid) + FROM ar + WHERE id IN (| . join(", ", map { "?" } @invoice_ids) . qq|)) + AS total_open_amount + FROM dunning_config cfg + WHERE id = ?|; + $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id, $dunning_id, @invoice_ids, $next_dunning_config_id); + map { $form->{$_} = $ref->{$_} } keys %{ $ref }; + + $form->{interest_rate} = $form->format_amount($myconfig, $ref->{interest_rate} * 100); + $form->{fee} = $form->format_amount($myconfig, $ref->{fee}, 2); + $form->{total_interest} = $form->format_amount($myconfig, $form->round_amount($ref->{total_interest}, 2), 2); + $form->{total_open_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{total_open_amount}, 2), 2); + $form->{total_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{fee} + $ref->{total_interest} + $ref->{total_open_amount}, 2), 2); + + $form->{templates} = "$myconfig->{templates}"; + $form->{language} = $form->get_template_language(\%myconfig); $form->{printer_code} = $form->get_printer_code(\%myconfig); if ($form->{language} ne "") { @@ -187,7 +263,7 @@ sub save_dunning { $form->{"IN"} =~ s/html$/odt/; } - if ($form->{"send_email"} && ($form->{email} ne "")) { + if ($send_email && ($form->{email} ne "")) { $form->{media} = 'email'; } @@ -206,20 +282,14 @@ sub save_dunning { $form->{OUT} = "$sendmail"; } else { - - my $uid = rand() . time; - - $uid .= $form->{login}; - $uid = substr($uid, 2, 75); - $filename = $uid; - - $filename .= '.pdf'; + my $filename = Common::unique_id() . $form->{login} . ".pdf"; $form->{OUT} = ">$spool/$filename"; push(@{ $form->{DUNNING_PDFS} }, $filename); $form->{keep_tmpfile} = 1; } - + + delete($form->{tmpfile}); $form->parse_template($myconfig, $userspath); $dbh->commit; @@ -237,76 +307,100 @@ sub get_invoices { # connect to database my $dbh = $form->dbconnect($myconfig); - $where = qq| WHERE 1=1 AND a.paid < a.amount AND a.duedate < current_date AND dnn.id = (select id from dunning_config WHERE dunning_level>(select case when a.dunning_id is null then 0 else (select dunning_level from dunning_config where id=a.dunning_id order by dunning_level limit 1 ) end from dunning_config limit 1) limit 1) |; + my $where; + my @values; - if ($form->{"$form->{vc}_id"}) { - $where .= qq| AND a.$form->{vc}_id = $form->{"$form->{vc}_id"}|; - } else { - if ($form->{ $form->{vc} }) { - $where .= " AND lower(ct.name) LIKE '$name'"; - } - } + $form->{customer_id} = $1 if ($form->{customer} =~ /--(\d+)$/); - my $sortorder = join ', ', - ("a.id", $form->sort_columns(transdate, duedate, name)); - $sortorder = $form->{sort} if $form->{sort}; + if ($form->{customer_id}) { + $where .= qq| AND (a.customer_id = ?)|; + push(@values, $form->{customer_id}); + + } elsif ($form->{customer}) { + $where .= qq| AND (ct.name ILIKE ?)|; + push(@values, '%' . $form->{customer} . '%'); + } - $where .= " AND lower(ordnumber) LIKE '$form->{ordnumber}'" if $form->{ordnumber}; - $where .= " AND lower(invnumber) LIKE '$form->{invnumber}'" if $form->{invnumber}; + my %columns = ( + "ordnumber" => "a.ordnumber", + "invnumber" => "a.invnumber", + "notes" => "a.notes", + ); + foreach my $key (keys(%columns)) { + next unless ($form->{$key}); + $where .= qq| AND $columns{$key} ILIKE ?|; + push(@values, '%' . $form->{$key} . '%'); + } + if ($form->{dunning_level}) { + $where .= qq| AND nextcfg.id = ?|; + push(@values, conv_i($form->{dunning_level})); + } $form->{minamount} = $form->parse_amount($myconfig,$form->{minamount}); - $where .= " AND a.dunning_id='$form->{dunning_level}'" - if $form->{dunning_level}; - $where .= " AND a.ordnumber ilike '%$form->{ordnumber}%'" - if $form->{ordnumber}; - $where .= " AND a.invnumber ilike '%$form->{invnumber}%'" - if $form->{invnumber}; - $where .= " AND a.notes ilike '%$form->{notes}%'" - if $form->{notes}; - $where .= " AND ct.name ilike '%$form->{customer}%'" - if $form->{customer}; + if ($form->{minamount}) { + $where .= qq| AND ((a.amount - a.paid) > ?) |; + push(@values, $form->{minamount}); + } - $where .= " AND a.amount-a.paid>'$form->{minamount}'" - if $form->{minamount}; + $query = + qq|SELECT + a.id, a.ordnumber, a.transdate, a.invnumber, a.amount, + ct.name AS customername, a.customer_id, a.duedate, - $where .= " ORDER by $sortorder"; + cfg.dunning_description, cfg.dunning_level, - $paymentdate = ($form->{paymentuntil}) ? "'$form->{paymentuntil}'" : current_date; + d.transdate AS dunning_date, d.duedate AS dunning_duedate, + d.fee, d.interest, - $query = qq|SELECT a.id, a.ordnumber, a.transdate, a.invnumber,a.amount, ct.name AS customername, a.customer_id, a.duedate,da.fee AS old_fee, dnn.fee as fee, dn.dunning_description, da.transdate AS dunning_date, da.duedate AS dunning_duedate, a.duedate + dnn.terms - current_date AS nextlevel, $paymentdate - a.duedate AS pastdue, dn.dunning_level, current_date + dnn.payment_terms AS next_duedate, dnn.dunning_description AS next_dunning_description, dnn.id AS next_dunning_id, dnn.interest AS interest_rate, dnn.terms - FROM dunning_config dnn, ar a - JOIN customer ct ON (a.customer_id = ct.id) - LEFT JOIN dunning_config dn ON (dn.id = a.dunning_id) - LEFT JOIN dunning da ON (da.trans_id=a.id AND dunning_config.dunning_level=da.dunning_level) - $where|; + a.duedate + cfg.terms - current_date AS nextlevel, + current_date - COALESCE(d.duedate, a.duedate) AS pastdue, + current_date + cfg.payment_terms AS next_duedate, - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + nextcfg.dunning_description AS next_dunning_description, + nextcfg.id AS next_dunning_config_id, + nextcfg.terms, nextcfg.active, nextcfg.email + FROM ar a - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { - $ref->{fee} += $ref->{old_fee}; - $ref->{interest} = ($ref->{amount} * $ref->{pastdue} * $ref->{interest_rate}) /360; - $ref->{interest} = $form->round_amount($ref->{interest},2); - map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2)} qw(amount fee interest); - if ($ref->{pastdue} >= $ref->{terms}) { - push @{ $form->{DUNNINGS} }, $ref; - } - } + LEFT JOIN customer ct ON (a.customer_id = ct.id) + LEFT JOIN dunning_config cfg ON (a.dunning_config_id = cfg.id) + LEFT JOIN dunning_config nextcfg ON + (nextcfg.id = + (SELECT id + FROM dunning_config + WHERE dunning_level > + COALESCE((SELECT dunning_level + FROM dunning_config + WHERE id = a.dunning_config_id + ORDER BY dunning_level DESC + LIMIT 1), + 0) + LIMIT 1)) + LEFT JOIN dunning d ON ((d.trans_id = a.id) AND (cfg.dunning_level = d.dunning_level)) - $sth->finish; + WHERE (a.paid < a.amount) + AND (a.duedate < current_date) + + $where + + ORDER BY a.id, transdate, duedate, name|; + my $sth = prepare_execute_query($form, $dbh, $query, @values); - $query = qq|select id, dunning_description FROM dunning_config order by dunning_level|; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + $form->{DUNNINGS} = []; while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { - push @{ $form->{DUNNING_CONFIG} }, $ref; + next if !$ref->{terms} || ($ref->{pastdue} < $ref->{terms}); + + $ref->{interest} = $form->round_amount($ref->{interest}, 2); + push(@{ $form->{DUNNINGS} }, $ref); } $sth->finish; + $query = qq|SELECT id, dunning_description FROM dunning_config ORDER BY dunning_level|; + $form->{DUNNING_CONFIG} = selectall_hashref_query($form, $dbh, $query); + $dbh->disconnect; $main::lxdebug->leave_sub(); } @@ -320,82 +414,103 @@ sub get_dunning { # connect to database my $dbh = $form->dbconnect($myconfig); - $where = qq| WHERE 1=1 AND da.trans_id=a.id|; + $where = qq| WHERE (da.trans_id = a.id)|; - if ($form->{"$form->{vc}_id"}) { - $where .= qq| AND a.$form->{vc}_id = $form->{"$form->{vc}_id"}|; - } else { - if ($form->{ $form->{vc} }) { - $where .= " AND lower(ct.name) LIKE '$name'"; - } - } + my @values; - my $sortorder = join ', ', - ("a.id", $form->sort_columns(transdate, duedate, name)); - $sortorder = $form->{sort} if $form->{sort}; - - $where .= " AND lower(ordnumber) LIKE '$form->{ordnumber}'" if $form->{ordnumber}; - $where .= " AND lower(invnumber) LIKE '$form->{invnumber}'" if $form->{invnumber}; + if ($form->{customer_id}) { + $where .= qq| AND (a.customer_id = ?)|; + push(@values, $form->{customer_id}); + } elsif ($form->{customer}) { + $where .= qq| AND (ct.name ILIKE ?)|; + push(@values, '%' . $form->{customer} . '%'); + } - $form->{minamount} = $form->parse_amount($myconfig,$form->{minamount}); - $where .= " AND a.dunning_id='$form->{dunning_level}'" - if $form->{dunning_level}; - $where .= " AND a.ordnumber ilike '%$form->{ordnumber}%'" - if $form->{ordnumber}; - $where .= " AND a.invnumber ilike '%$form->{invnumber}%'" - if $form->{invnumber}; - $where .= " AND a.notes ilike '%$form->{notes}%'" - if $form->{notes}; - $where .= " AND ct.name ilike '%$form->{customer}%'" - if $form->{customer}; - $where .= " AND a.amount > a.paid AND da.dunning_id=a.dunning_id " unless ($form->{showold}); + my %columns = ( + "ordnumber" => "a.ordnumber", + "invnumber" => "a.invnumber", + "notes" => "a.notes", + ); + foreach my $key (keys(%columns)) { + next unless ($form->{$key}); + $where .= qq| AND $columns{$key} ILIKE ?|; + push(@values, '%' . $form->{$key} . '%'); + } - $where .= " AND a.transdate >='$form->{transdatefrom}' " if ($form->{transdatefrom}); - $where .= " AND a.transdate <='$form->{transdateto}' " if ($form->{transdateto}); - $where .= " AND da.transdate >='$form->{dunningfrom}' " if ($form->{dunningfrom}); - $where .= " AND da.transdate <='$form->{dunningto}' " if ($form->{dunningto}); + if ($form->{dunning_level}) { + $where .= qq| AND a.dunning_config_id = ?|; + push(@values, conv_i($form->{dunning_level})); + } - $where .= " ORDER by $sortorder"; + if ($form->{department_id}) { + $where .= qq| AND a.department_id = ?|; + push @values, conv_i($form->{department_id}); + } + $form->{minamount} = $form->parse_amount($myconfig, $form->{minamount}); + if ($form->{minamount}) { + $where .= qq| AND ((a.amount - a.paid) > ?) |; + push(@values, $form->{minamount}); + } - $query = qq|SELECT a.id, a.ordnumber,a.invoice, a.transdate, a.invnumber,a.amount, ct.name AS customername, a.duedate,da.fee ,da.interest, dn.dunning_description, da.transdate AS dunning_date, da.duedate AS dunning_duedate, da.dunning_id - FROM ar a - JOIN customer ct ON (a.customer_id = ct.id), - dunning da LEFT JOIN dunning_config dn ON (da.dunning_id=dn.id) - $where|; + if (!$form->{showold}) { + $where .= qq| AND (a.amount > a.paid) AND (da.dunning_config_id = a.dunning_config_id) |; + } - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + if ($form->{transdatefrom}) { + $where .= qq| AND a.transdate >= ?|; + push(@values, $form->{transdatefrom}); + } + if ($form->{transdateto}) { + $where .= qq| AND a.transdate <= ?|; + push(@values, $form->{transdateto}); + } + if ($form->{dunningfrom}) { + $where .= qq| AND da.transdate >= ?|; + push(@values, $form->{dunningfrom}); + } + if ($form->{dunningto}) { + $where .= qq| AND da.transdate >= ?|; + push(@values, $form->{dunningto}); + } + $query = + qq|SELECT a.id, a.ordnumber, a.invoice, a.transdate, a.invnumber, a.amount, + ct.name AS customername, ct.id AS customer_id, a.duedate, da.fee, + da.interest, dn.dunning_description, da.transdate AS dunning_date, + da.duedate AS dunning_duedate, da.dunning_id, da.dunning_config_id + FROM ar a + JOIN customer ct ON (a.customer_id = ct.id), dunning da + LEFT JOIN dunning_config dn ON (da.dunning_config_id = dn.id) + $where + ORDER BY name, a.id|; - while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { + $form->{DUNNINGS} = selectall_hashref_query($form, $dbh, $query, @values); + foreach my $ref (@{ $form->{DUNNINGS} }) { map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2)} qw(amount fee interest); - push @{ $form->{DUNNINGS} }, $ref; } - $sth->finish; - - - $dbh->disconnect; $main::lxdebug->leave_sub(); } - sub parse_strings { $main::lxdebug->enter_sub(); my ($myconfig, $form, $userspath, $string) = @_; + local (*IN, *OUT); + my $format = $form->{format}; $form->{format} = "html"; $tmpstring = "parse_string.html"; $tmpfile = "$myconfig->{templates}/$tmpstring"; - open(OUT, ">$tmpfile") or $form->error("$tmpfile : $!"); + open(OUT, ">", $tmpfile) or $form->error("$tmpfile : $!"); + print(OUT $string); close(OUT); @@ -405,20 +520,16 @@ sub parse_strings { my $fileid = time; $form->{tmpfile} = "$userspath/${fileid}.$tmpstring"; - $out = $form->{OUT}; - $form->{OUT} = ">$form->{tmpfile}"; - if ($form->{OUT}) { - open(OUT, "$form->{OUT}") or $form->error("$form->{OUT} : $!"); - } + open(OUT, ">", $form->{tmpfile}) or $form->error("$form->{OUT} : $!"); if (!$template->parse(*OUT)) { $form->cleanup(); $form->error("$form->{IN} : " . $template->get_error()); } - + close(OUT); my $result = ""; - open(IN, $form->{tmpfile}) or $form->error($form->cleanup . "$form->{tmpfile} : $!"); + open(IN, "<", $form->{tmpfile}) or $form->error($form->cleanup . "$form->{tmpfile} : $!"); while () { $result .= $_; @@ -439,57 +550,47 @@ sub melt_pdfs { $main::lxdebug->enter_sub(); my ($self, $myconfig, $form, $userspath) = @_; - - foreach my $file (@{ $form->{DUNNING_PDFS} }) { - $inputfiles .= " $userspath/$file "; - } - my $outputfile = "$userspath/dunning.pdf"; - system("gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=$outputfile $inputfiles"); - foreach my $file (@{ $form->{DUNNING_PDFS} }) { - unlink("$userspath/$file"); - } - $out=""; + local (*IN, *OUT); + # Don't allow access outside of $userspath. + map { $_ =~ s|.*/||; } @{ $form->{DUNNING_PDFS} }; - $form->{OUT} = $out; + my $inputfiles = join " ", map { "$userspath/$_" } @{ $form->{DUNNING_PDFS} }; + my $outputfile = "$userspath/dunning.pdf"; - my $numbytes = (-s $outputfile); - open(IN, $outputfile) - or $form->error($self->cleanup . "$outputfile : $!"); + system("gs -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=$outputfile $inputfiles"); - $form->{copies} = 1 unless $form->{media} eq 'printer'; + map { unlink("$userspath/$_") } @{ $form->{DUNNING_PDFS} }; - chdir("$self->{cwd}"); + my $numbytes = (-s $outputfile); + open(IN, $outputfile) || $form->error($self->cleanup() . "$outputfile : $!"); - for my $i (1 .. $form->{copies}) { - if ($form->{OUT}) { - open(OUT, $form->{OUT}) - or $form->error($form->cleanup . "$form->{OUT} : $!"); - } else { + $form->{copies} = 1 unless $form->{media} eq 'printer'; - # launch application - print qq|Content-Type: Application/PDF + chdir($self->{cwd}); + + for my $i (1 .. $form->{copies}) { + # launch application + print qq|Content-Type: Application/PDF Content-Disposition: attachment; filename="$outputfile" Content-Length: $numbytes |; - open(OUT, ">-") or $form->error($form->cleanup . "$!: STDOUT"); - - } + open(OUT, ">-") or $form->error($form->cleanup . "$!: STDOUT"); - while () { - print OUT $_; - } + while () { + print OUT $_; + } - close(OUT); + close(OUT); - seek IN, 0, 0; - } + seek(IN, 0, 0); + } - close(IN); - unlink("$userspath/$outputfile"); + close(IN); + unlink($outputfile); $main::lxdebug->leave_sub(); } @@ -497,14 +598,21 @@ Content-Length: $numbytes sub print_dunning { $main::lxdebug->enter_sub(); - my ($self, $myconfig, $form, $dunning_id, $userspath,$spool, $sendmail) = @_; + my ($self, $myconfig, $form, $dunning_id, $userspath, $spool, $sendmail) = @_; # connect to database my $dbh = $form->dbconnect_noauto($myconfig); - - my $query = qq| SELECT invnumber, ordnumber, customer_id, amount, netamount, ar.transdate, ar.duedate, paid, amount-paid AS open_amount, template AS formname, email_subject, email_body, email_attachment, da.fee, da.interest, da.transdate AS dunning_date, da.duedate AS dunning_duedate FROM ar LEFT JOIN dunning_config ON (dunning_config.id=ar.dunning_id) LEFT JOIN dunning da ON (ar.id=da.trans_id AND dunning_config.dunning_level=da.dunning_level) where ar.dunning_id=$dunning_id|; - my $sth = $dbh->prepare($query); - $sth->execute || $form->dberror($query); + my $query = + qq|SELECT invnumber, ordnumber, customer_id, amount, netamount, + ar.transdate, ar.duedate, paid, amount - paid AS open_amount, + template AS formname, email_subject, email_body, email_attachment, + da.fee, da.interest, da.transdate AS dunning_date, da.duedate AS dunning_duedate + FROM dunning da + LEFT JOIN dunning_config ON (dunning_config.id = da.dunning_config_id) + LEFT JOIN ar ON (ar.id = da.trans_id) + WHERE (da.dunning_id = ?)|; + + my $sth = prepare_execute_query($form, $dbh, $query, $dunning_id); my $first = 1; while (my $ref = $sth->fetchrow_hashref(NAME_lc)) { if ($first) { @@ -513,16 +621,52 @@ sub print_dunning { } map { $ref->{$_} = $form->format_amount($myconfig, $ref->{$_}, 2) } qw(amount netamount paid open_amount fee interest); map { $form->{$_} = $ref->{$_} } keys %$ref; - #print(STDERR Dumper($ref)); map { push @{ $form->{"dn_$_"} }, $ref->{$_}} keys %$ref; } $sth->finish; - IS->customer_details($myconfig,$form); - #print(STDERR Dumper($form->{dn_invnumber})); - $form->{templates} = "$myconfig->{templates}"; + $query = + qq|SELECT id AS customer_id, name, street, zipcode, city, country, department_1, department_2, email + FROM customer + WHERE id = + (SELECT customer_id + FROM dunning d + LEFT JOIN ar ON (d.trans_id = ar.id) + WHERE d.id = ?)|; + $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id); + map { $form->{$_} = $ref->{$_} } keys %{ $ref }; + + $query = + qq|SELECT + cfg.interest_rate, cfg.template AS formname, + cfg.email_subject, cfg.email_body, cfg.email_attachment, + d.fee, d.transdate AS dunning_date, + (SELECT SUM(interest) + FROM dunning + WHERE dunning_id = ?) + AS total_interest, + (SELECT SUM(amount) - SUM(paid) + FROM ar + WHERE id IN + (SELECT trans_id + FROM dunning + WHERE dunning_id = ?)) + AS total_open_amount + FROM dunning d + LEFT JOIN dunning_config cfg ON (d.dunning_config_id = cfg.id) + WHERE d.dunning_id = ? + LIMIT 1|; + $ref = selectfirst_hashref_query($form, $dbh, $query, $dunning_id, $dunning_id, $dunning_id); + map { $form->{$_} = $ref->{$_} } keys %{ $ref }; + + $form->{interest_rate} = $form->format_amount($myconfig, $ref->{interest_rate} * 100); + $form->{fee} = $form->format_amount($myconfig, $ref->{fee}, 2); + $form->{total_interest} = $form->format_amount($myconfig, $form->round_amount($ref->{total_interest}, 2), 2); + $form->{total_open_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{total_open_amount}, 2), 2); + $form->{total_amount} = $form->format_amount($myconfig, $form->round_amount($ref->{fee} + $ref->{total_interest} + $ref->{total_open_amount}, 2), 2); + $form->{templates} = "$myconfig->{templates}"; $form->{language} = $form->get_template_language(\%myconfig); $form->{printer_code} = $form->get_printer_code(\%myconfig); @@ -570,20 +714,13 @@ sub print_dunning { $form->{OUT} = "$sendmail"; } else { - - my $uid = rand() . time; - - $uid .= $form->{login}; - $uid = substr($uid, 2, 75); - $filename = $uid; + my $filename = Common::unique_id() . $form->{login} . ".pdf"; - $filename .= '.pdf'; - $form->{OUT} = ">$spool/$filename"; push(@{ $form->{DUNNING_PDFS} }, $filename); $form->{keep_tmpfile} = 1; } - + $form->parse_template($myconfig, $userspath); $dbh->commit;