PriceTaxCalculator: chart->taxkey lookup vorberechnen

diff --git a/SL/DB/Chart.pm b/SL/DB/Chart.pm
index 718d42251cab9ae6e8664a0d5b2b0f55357c8d2b..db8a3b945c13805d60306361865f5d8b669db3ca 100644 (file)
--- a/SL/DB/Chart.pm
+++ b/SL/DB/Chart.pm
@@ -16,6 +16,12 @@ __PACKAGE__->meta->initialize;
 sub get_active_taxkey {
   my ($self, $date) = @_;
   $date ||= DateTime->today_local;
+
+  my $cache = $::request->{cache}{chart}{$date};
+  if ($cache->{$self->id}) {
+    return $cache->{$self->id};
+  }
+
   require SL::DB::TaxKey;
   return SL::DB::Manager::TaxKey->get_all(query   => [ and => [ chart_id  => $self->id,
                                                                 startdate => { le => $date } ] ],

diff --git a/SL/DB/Helper/PriceTaxCalculator.pm b/SL/DB/Helper/PriceTaxCalculator.pm
index d95d1430937e89bd4d2d3b978a362b9b3faa8716..673bb248a00673a57325d11dd346ed5797cb5379 100644 (file)
--- a/SL/DB/Helper/PriceTaxCalculator.pm
+++ b/SL/DB/Helper/PriceTaxCalculator.pm
@@ -37,6 +37,8 @@ sub calculate_prices_and_taxes {
   $self->netamount(  0);
   $self->marge_total(0);
 
+  SL::DB::Manager::Chart->cache_taxkeys(date => $self->transdate);
+
   my $idx = 0;
   foreach my $item ($self->items) {
     $idx++;

diff --git a/SL/DB/Manager/Chart.pm b/SL/DB/Manager/Chart.pm
index a0167fd23f53aea92c6b87df23db53bf4007dfdf..81a65b5e89f359d0e2ec761e7060e1b0cedea5eb 100644 (file)
--- a/SL/DB/Manager/Chart.pm
+++ b/SL/DB/Manager/Chart.pm
@@ -6,6 +6,8 @@ use SL::DB::Helper::Manager;
 use base qw(SL::DB::Helper::Manager);
 
 use SL::DB::Helper::Sorted;
+use DateTime;
+use SL::DBUtils;
 
 sub object_class { 'SL::DB::Chart' }
 
@@ -20,6 +22,27 @@ sub link_filter {
                   link => { like => "\%:${link}:\%" } ]);
 }
 
+sub cache_taxkeys {
+  my ($self, %params) = @_;
+
+  my $date  = $params{date} || DateTime->today;
+  my $cache = $::request->{cache}{chart}{$date} ||= {};
+
+  require SL::DB::TaxKey;
+  my $tks = SL::DB::Manager::TaxKey->get_all;
+  my %tks_by_id = map { $_->id => $_ } @$tks;
+
+  my $rows = selectall_hashref_query($::form, $::form->get_standard_dbh, <<"", $date);
+    SELECT DISTINCT ON (chart_id) chart_id, startdate, id
+    FROM taxkeys
+    WHERE startdate < ?
+    ORDER BY chart_id, startdate DESC;
+
+  for (@$rows) {
+    $cache->{$_->{chart_id}} = $tks_by_id{$_->{id}};
+  }
+}
+
 1;
 
 __END__