Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4650c028

Von Jan Büren vor mehr als 6 Jahren hinzugefügt

  • ID 4650c028ef460043fdecf9f137d864403a3e0edf
  • Vorgänger 75806fa7
  • Nachfolger 6c19cff0

Ergänzend zu #359 DB->load anstatt croak

croak|die liefert keine Meldung an den ajax-Aufrufer zurück.
SL::DB::..->load hingegen schon. Entsprechend geändert.

Unterschiede anzeigen:

SL/DB/Helper/Payment.pm
sub get_payment_select_options_for_bank_transaction {
my ($self, $bt_id, %params) = @_;
my $bt = SL::DB::Manager::BankTransaction->find_by( id => $bt_id );
croak ("Need bt_id to get a valid bank transaction") unless $bt;
# user may overpay invoices and if not, this case should better be handled elsewhere
#my $open_amount = $self->open_amount;
#croak ("Need an open invoice") unless $open_amount;
my $bt = SL::DB::BankTransaction->new(id => $bt_id)->load;
my @options;
if ($self->skonto_date && $self->within_skonto_period($bt->transdate)) {
push(@options, { payment_type => 'without_skonto', display => t8('without skonto') });
push(@options, { payment_type => 'with_skonto_pt', display => t8('with skonto acc. to pt'), selected => 1 });
} else {
push(@options, { payment_type => 'without_skonto', display => t8('without skonto') , selected => 1 });
push(@options, { payment_type => 'with_skonto_pt', display => t8('with skonto acc. to pt')});
}
if ($self->skonto_date && $self->within_skonto_period($bt->transdate)) {
push(@options, { payment_type => 'without_skonto', display => t8('without skonto') });
push(@options, { payment_type => 'with_skonto_pt', display => t8('with skonto acc. to pt'), selected => 1 });
} else {
push(@options, { payment_type => 'without_skonto', display => t8('without skonto') , selected => 1 });
push(@options, { payment_type => 'with_skonto_pt', display => t8('with skonto acc. to pt')});
}
return @options;
}

Auch abrufbar als: Unified diff