<table width=100%>
<tr>
- <th class=listtop colspan=9>$form->{title}</th>
+ <th class=listtop colspan=10>$form->{title}</th>
</tr>
<tr height="5"></tr>
<tr>|;
$column_data{dunning_level} =
qq|<td><input type=hidden size=2 name=dunning_level_$i value=$i>$i</td>|;
$column_data{dunning_description} = qq|<td><input name=dunning_description_$i ></td>|;
- my $active = "";
$column_data{active} =
- qq|<td><input type=checkbox name=active_$i value=1 $active></td>|;
+ qq|<td><input type=checkbox name=active_$i value=1></td>|;
my $email = "";
$column_data{email} =
qq|<td><input type=checkbox name=email_$i value=1 $email><button type="button" onclick="set_email_window('email_subject_$i', 'email_body_$i', 'email_attachment_$i')">| . $locale->text('L') . qq|</button><input type=hidden name=email_body_$i><input type=hidden name=email_subject_$i><input type=hidden name=email_attachment_$i></td>|;
<th align=right nowrap>| . $locale->text('Payment until') . qq|</th>
$button1
</tr>
- <input type=hidden name=sort value=transdate>
</table>
</td>
</tr>
<table width=100%>
<tr>
- <th class=listtop colspan=9>$form->{title}</th>
+ <th class=listtop colspan=11>$form->{title}</th>
</tr>
<tr height="5"></tr>
<tr>|;
|;
$form->{selectdunning} =~ s/ selected//g;
- if ($ref->{next_dunning_id} ne "") {
- $form->{selectdunning} =~ s/value=$ref->{next_dunning_id}/value=$ref->{next_dunning_id} selected/;
+ if ($ref->{next_dunning_config_id} ne "") {
+ $form->{selectdunning} =~ s/value=$ref->{next_dunning_config_id}/value=$ref->{next_dunning_config_id} selected/;
}
- $dunning = qq|<select name=next_dunning_id_$i>$form->{selectdunning}</select>|;
+ $dunning = qq|<select name=next_dunning_config_id_$i>$form->{selectdunning}</select>|;
$column_data{dunning_description} = qq|<td><input type=hidden name=inv_id_$i size=2 value="$ref->{id}"><input type=hidden name=customer_id_$i size=2 value="$ref->{customer_id}">$ref->{dunning_level}: $dunning</td>|;
- my $active = "checked";
+ my $active = ($ref->{active}) ? "checked" : "";
$column_data{active} =
qq|<td><input type=checkbox name=active_$i value=1 $active></td>|;
- my $email = "checked";
+ my $email = ($ref->{email}) ? "checked" : "";
$column_data{email} =
qq|<td><input type=checkbox name=email_$i value=1 $email></td>|;
$column_data{next_duedate} = qq|<td><input type=hidden name=next_duedate_$i size=6 value="$ref->{next_duedate}">$ref->{next_duedate}</td>|;
<td><hr size=3 noshade></td>
</tr>
</table>|;
- &print_options;
+ print_options();
print qq|
<br>
<form method=post action=$form->{script}>
}
DN->save_config(\%myconfig, \%$form);
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{addition} = "SAVED FOR DUNNING";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
$form->redirect($locale->text('Dunning Process Config saved!'));
$lxdebug->leave_sub();
if ($form->{groupinvoices}) {
while ($active) {
$lastcustomer = 0;
- $form->{inv_ids} = "";
+ $form->{inv_ids} = [];
$active = 0;
@rows = ();
for my $i (1 .. $form->{rowcount}) {
$form->{"active_$i"} *= 1;
$lastcustomer = $form->{"customer_id_$i"} unless ($lastcustomer);
if ($form->{"active_$i"} && ($form->{"customer_id_$i"} == $lastcustomer)) {
- if ($form->{inv_ids}) {
- $form->{inv_ids} .= qq|,$form->{"inv_id_$i"}|;
- } else {
- $form->{inv_ids} = qq|($form->{"inv_id_$i"}|;
- }
+ push(@{ $form->{inv_ids} }, $form->{"inv_id_$i"});
$form->{"active_$i"} = 0;
$form->{"customer_id_$i"} = 0;
push(@rows, $i);
$form->{"customer_id_$i"} = 0;
}
}
- if ($form->{inv_ids} ne "") {
- $form->{inv_ids} .= ")";
- DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath,$spool, $sendmail);
+ if (scalar(@{ $form->{inv_ids} }) != 0) {
+ DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath, $spool, $sendmail);
}
}
} else {
for my $i (1 .. $form->{rowcount}) {
if ($form->{"active_$i"}) {
@rows = ();
- $form->{inv_ids} = qq|($form->{"inv_id_$i"})|;
+ $form->{inv_ids} = [ $form->{"inv_id_$i"} ];
push(@rows, $i);
- DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath,$spool, $sendmail);
+ DN->save_dunning(\%myconfig, \%$form, \@rows, $userspath, $spool, $sendmail);
}
}
}
if($form->{DUNNING_PDFS}) {
DN->melt_pdfs(\%myconfig, \%$form,$spool);
}
-
+ # saving the history
+ if(!exists $form->{addition} && $form->{id} ne "") {
+ $form->{addition} = "DUNNING STARTED";
+ $form->save_history($form->dbconnect(\%myconfig));
+ }
+ # /saving the history
$form->redirect($locale->text('Dunning Process started for selected invoices!'));
$lxdebug->leave_sub();
$button4
</tr>
- <input type=hidden name=sort value=transdate>
</table>
</td>
</tr>
<table width=100%>
<tr>
- <th class=listtop colspan=9>$form->{title}</th>
+ <th class=listtop colspan=10>$form->{title}</th>
</tr>
<tr height="5"></tr>
<tr>|;
print qq|
</tr>
|;
+
+ my %columns = (
+ "dunning_duedate" => "next_duedate",
+ "duedate" => "inv_duedate",
+ "transdate" => "invdate",
+ "amount" => "invamount",
+ );
+
my $i = 0;
+ my $j = 0;
+ my ($previous_dunning_id, $first_row_for_dunning);
foreach $ref (@{ $form->{DUNNINGS} }) {
-
$i++;
- my $j = $i % 2;
+
+ if ($previous_dunning_id != $ref->{dunning_id}) {
+ $j++;
+ $j = $j % 2;
+ $first_row_for_dunning = 1;
+ } else {
+ $first_row_for_dunning = 0;
+ }
+ $previous_dunning_id = $ref->{dunning_id};
print qq|
<tr valign=top class=listrow$j>
- $dunning = qq|<select name=next_dunning_id_$i>$form->{selectdunning}</select>|;
-
-
- $column_data{dunning_description} = qq|<td><a href=dn.pl?action=print_dunning&dunning_id=$ref->{dunning_id}&format=pdf&media=screen&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$form->{callback}>$ref->{dunning_description}</a></td>|;
- my $active = "checked";
- $column_data{dunning_date} = qq|<td>$ref->{dunning_date}</td>|;
- $column_data{next_duedate} = qq|<td>$ref->{dunning_duedate}</td>|;
-
- $column_data{inv_duedate} = qq|<td>$ref->{duedate}</td>|;
- $column_data{invdate} = qq|<td>$ref->{transdate}</td>|;
- $column_data{invnumber} = qq|<td><a href=ar.pl?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$form->{callback}>$ref->{invnumber}</a></td>|;
- $column_data{customername} = qq|<td>$ref->{customername}</td>|;
- $column_data{invamount} = qq|<td>$ref->{amount}</td>|;
- $column_data{fee} = qq|<td>$ref->{fee}</td>|;
- $column_data{interest} = qq|<td>$ref->{interest}</td>|;
+ foreach (qw(dunning_date dunning_duedate duedate transdate customername
+ amount fee interest)) {
+ my $col = $columns{$_} ? $columns{$_} : $_;
+ $column_data{$col} = "<td>" . H($ref->{$_}) . "</td>";
+ }
+ if ($first_row_for_dunning) {
+ $column_data{dunning_description} =
+ qq|<td><a href="dn.pl?action=print_dunning&format=pdf&media=screen&| .
+ qq|dunning_id=| . E($ref->{dunning_id}) .
+ join(map({ "&${_}=" . E($form->{$_}) } qw(login path password callback))) .
+ qq|">| . H($ref->{dunning_description}) . qq|</a></td>|;
+ } else {
+ $column_data{dunning_description} = qq|<td> </td>|;
+ $column_data{customername} = qq|<td> </td>|;
+ }
+ $column_data{invnumber} =
+ qq|<td><a href="| . ($ref->{invoice} ? "is.pl" : "ar.pl" ) .
+ qq|?action=edit&id=| . H($ref->{id}) .
+ join(map({ "&${_}=" . E($form->{$_}) } qw(login path password callback))) .
+ qq|">| . H($ref->{invnumber}) . qq|</a></td>|;
map { print "$column_data{$_}\n" } @column_index;
sub print_dunning {
$lxdebug->enter_sub();
- DN->print_dunning(\%myconfig, \%$form, $form->{dunning_id}, $userspath,$spool, $sendmail);
+ DN->print_dunning(\%myconfig, \%$form, $form->{dunning_id}, $userspath, $spool, $sendmail);
if($form->{DUNNING_PDFS}) {
DN->melt_pdfs(\%myconfig, \%$form,$spool);