}
}
- map { _print_invoice(@{ $_ }) } @invoices_to_print;
+ _print_invoice(@{ $_ }) for @invoices_to_print;
_send_email(\@new_invoices, [ map { $_->[0] } @invoices_to_print ]) if @new_invoices;
previous_month => [ $period_start_date->clone->truncate(to => 'month')->subtract(months => 1), sub { $_[0]->month } ],
next_month => [ $period_start_date->clone->truncate(to => 'month')->add( months => 1), sub { $_[0]->month } ],
+ current_month_long => [ $period_start_date->clone->truncate(to => 'month'), sub { $month_names[ $_[0]->month ] } ],
+ previous_month_long => [ $period_start_date->clone->truncate(to => 'month')->subtract(months => 1), sub { $month_names[ $_[0]->month ] } ],
+ next_month_long => [ $period_start_date->clone->truncate(to => 'month')->add( months => 1), sub { $month_names[ $_[0]->month ] } ],
+
current_year => [ $period_start_date->clone->truncate(to => 'year'), sub { $_[0]->year } ],
previous_year => [ $period_start_date->clone->truncate(to => 'year')->subtract(years => 1), sub { $_[0]->year } ],
next_year => [ $period_start_date->clone->truncate(to => 'year')->add( years => 1), sub { $_[0]->year } ],
period_start_date => [ $period_start_date->clone->truncate(to => 'month'), sub { $::locale->format_date(\%::myconfig, $_[0]) } ],
- period_end_date => [ $period_end_date ->clone->truncate(to => 'month'), sub { $::locale->format_date(\%::myconfig, $_[0]) } ],
+ period_end_date => [ $period_end_date, sub { $::locale->format_date(\%::myconfig, $_[0]) } ],
};
- map { $vars->{"${_}_month_long"} = $month_names[ $vars->{"${_}_month"} ] } qw(current previous next);
-
return $vars;
}
sub _replace_vars {
- my $object = shift;
- my $vars = shift;
- my $sub = shift;
- my $str = $object->$sub;
+ my (%params) = @_;
+ my $sub = $params{attribute};
+ my $str = $params{object}->$sub;
+ my $sub_fmt = lc($params{attribute_format} // 'text');
- $str =~ s{ <\% ([a-z0-9_]+) ( \s+ format \s*=\s* (.*?) \s* )? \%>}{
+ my ($start_tag, $end_tag) = $sub_fmt eq 'html' ? ('<%', '%>') : ('<%', '%>');
+
+ $str =~ s{ ${start_tag} ([a-z0-9_]+) ( \s+ format \s*=\s* (.*?) \s* )? ${end_tag} }{
my ($key, $format) = ($1, $3);
- if (!$vars->{$key}) {
- '';
+ $key = $::locale->unquote_special_chars('html', $key) if $sub_fmt eq 'html';
+ my $new_value;
+
+ if (!$params{vars}->{$key}) {
+ $new_value = '';
} elsif ($format) {
- DateTime::Format::Strptime->new(
+ $format = $::locale->unquote_special_chars('html', $format) if $sub_fmt eq 'html';
+
+ $new_value = DateTime::Format::Strptime->new(
pattern => $format,
locale => 'de_DE',
time_zone => 'local',
- )->format_datetime($vars->{$key}->[0]);
+ )->format_datetime($params{vars}->{$key}->[0]);
} else {
- $vars->{$1}->[1]->($vars->{$1}->[0]);
+ $new_value = $params{vars}->{$1}->[1]->($params{vars}->{$1}->[0]);
}
+
+ $new_value = $::locale->quote_special_chars('html', $new_value) if $sub_fmt eq 'html';
+
+ $new_value;
+
}eigx;
- $object->$sub($str);
+ $params{object}->$sub($str);
}
sub _create_periodic_invoice {
$invoice->assign_attributes(deliverydate => $period_start_date,
intnotes => $intnotes,
+ employee => $order->employee, # new_from sets employee to import user
);
- map { _replace_vars($invoice, $time_period_vars, $_) } qw(notes intnotes transaction_description);
+ _replace_vars(object => $invoice, vars => $time_period_vars, attribute => $_) for qw(notes intnotes transaction_description);
foreach my $item (@{ $invoice->items }) {
- map { _replace_vars($item, $time_period_vars, $_) } qw(description longdescription);
+ _replace_vars(object => $item, vars => $time_period_vars, attribute => $_, attribute_format => ($_ eq 'longdescription' ? 'html' : 'text')) for qw(description longdescription);
}
$invoice->post(ar_id => $config->ar_chart_id) || die;
sub _calculate_dates {
my ($config) = @_;
- return $config->calculate_invoice_dates(end_date => DateTime->today_local->add(days => 1));
+ return $config->calculate_invoice_dates(end_date => DateTime->today_local);
}
sub _send_email {
return unless $template;
my $email_template = $config{periodic_invoices}->{email_template};
- my $filename = $email_template || ( (SL::DB::Default->get->templates || "templates/webpages") . "/periodic_invoices_email.txt" );
+ my $filename = $email_template || ( (SL::DB::Default->get->templates || "templates/webpages") . "/oe/periodic_invoices_email.txt" );
my %params = ( POSTED_INVOICES => $posted_invoices,
PRINTED_INVOICES => $printed_invoices );