use strict;
use parent qw(SL::Controller::Base);
+use List::MoreUtils qw(any);
+
use SL::JSON;
use SL::DBUtils;
use SL::Helper::Flash;
title => ($self->is_vendor() ? t8('Edit Vendor') : t8('Edit Customer')),
%{$self->{template_args}}
);
- ::end_of_request();
+ $::dispatcher->end_request;
}
my $db = $self->{cv}->db;
- $db->do_transaction(sub {
+ $db->with_transaction(sub {
my $cvs_by_nr;
if ( $self->is_vendor() ) {
if ( $self->{cv}->vendornumber ) {
}
$self->{shipto}->trans_id($self->{cv}->id);
- if( $self->{shipto}->shiptoname ne '' ) {
- $self->{shipto}->save();
+ if(any { $self->{shipto}->$_ ne '' } qw(shiptoname shiptodepartment_1 shiptodepartment_2 shiptostreet shiptozipcode shiptocity shiptocountry shiptogln shiptocontact shiptophone shiptofax shiptoemail)) {
+ $self->{shipto}->save(cascade => 1);
}
my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;
$note->delete(cascade => 'delete');
}
}
+
+ 1;
}) || die($db->error);
}
sub _transaction {
my ($self, $script) = @_;
- $::auth->assert('general_ledger | invoice_edit | vendor_invoice_edit | ' .
+ $::auth->assert('gl_transactions | ap_transactions | ar_transactions'.
+ '| invoice_edit | vendor_invoice_edit | ' .
' request_quotation_edit | sales_quotation_edit | sales_order_edit | purchase_order_edit');
$self->_save();
sub action_save_and_ar_transaction {
my ($self) = @_;
- $main::auth->assert('general_ledger');
+ $main::auth->assert('ar_transactions');
$self->_transaction('ar.pl');
}
sub action_save_and_ap_transaction {
my ($self) = @_;
- $main::auth->assert('general_ledger');
+ $main::auth->assert('ap_transactions');
$self->_transaction('ap.pl');
}
$self->action_edit();
} else {
- $db->do_transaction(sub {
+ $db->with_transaction(sub {
$self->{cv}->delete(cascade => 1);
my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;
SL::Helper::Flash::flash('error', $::locale->text('No contact selected to delete'));
} else {
- $db->do_transaction(sub {
+ $db->with_transaction(sub {
if ( $self->{contact}->used ) {
$self->{contact}->detach();
$self->{contact}->save();
$self->{contact}->delete(cascade => 1);
SL::Helper::Flash::flash('info', $::locale->text('Contact deleted.'));
}
+
+ 1;
}) || die($db->error);
$self->{contact} = $self->_new_contact_object;
SL::Helper::Flash::flash('error', $::locale->text('No shipto selected to delete'));
} else {
- $db->do_transaction(sub {
+ $db->with_transaction(sub {
if ( $self->{shipto}->used ) {
$self->{shipto}->detach();
$self->{shipto}->save(cascade => 1);
$self->{shipto}->delete(cascade => 1);
SL::Helper::Flash::flash('info', $::locale->text('Shipto deleted.'));
}
+
+ 1;
}) || die($db->error);
$self->{shipto} = SL::DB::Shipto->new();
sub action_ajaj_get_shipto {
my ($self) = @_;
- my $data = {
+ my $data = {};
+ $data->{shipto} = {
map(
{
my $name = 'shipto'. $_;
$name => $self->{shipto}->$name;
}
- qw(_id name department_1 department_2 street zipcode city country contact phone fax email)
+ qw(_id name department_1 department_2 street zipcode city gln country contact phone fax email)
)
};
+ $data->{shipto_cvars} = $self->_prepare_cvar_configs_for_ajaj($self->{shipto}->cvars_by_config);
+
$self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
}
)
};
- $data->{contact_cvars} = {
- map {
- my $cvar = $_;
- my $result = { type => $cvar->config->type };
-
- if ($cvar->config->type eq 'number') {
- $result->{value} = $::form->format_amount(\%::myconfig, $cvar->value, -2);
-
- } elsif ($result->{type} =~ m{customer|vendor|part}) {
- my $object = $cvar->value;
- my $method = $result->{type} eq 'part' ? 'description' : 'name';
-
- $result->{id} = int($cvar->number_value) || undef;
- $result->{value} = $object ? $object->$method // '' : '';
-
- } else {
- $result->{value} = $cvar->value;
- }
-
- ( $cvar->config->name => $result )
-
- } grep { $_->is_valid } @{ $self->{contact}->cvars_by_config }
- };
+ $data->{contact_cvars} = $self->_prepare_cvar_configs_for_ajaj($self->{contact}->cvars_by_config);
$self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
}
return $self->{_is_orphaned} = !$dummy;
}
+sub _copy_form_to_cvars {
+ my ($self, %params) = @_;
+
+ foreach my $cvar (@{ $params{target}->cvars_by_config }) {
+ my $value = $params{source}->{$cvar->config->name};
+ $value = $::form->parse_amount(\%::myconfig, $value) if $cvar->config->type eq 'number';
+
+ $cvar->value($value);
+ }
+}
+
sub _instantiate_args {
my ($self) = @_;
$self->{cv}->hourly_rate($::instance_conf->get_customer_hourly_rate) if $self->is_customer && !$self->{cv}->hourly_rate;
- foreach my $cvar (@{$self->{cv}->cvars_by_config()}) {
- my $value = $::form->{cv_cvars}->{$cvar->config->name};
-
- if ( $cvar->config->type eq 'number' ) {
- $value = $::form->parse_amount(\%::myconfig, $value);
- }
-
- $cvar->value($value);
- }
-
if ( $::form->{note}->{id} ) {
$self->{note} = SL::DB::Note->new(id => $::form->{note}->{id})->load();
$self->{note_followup} = $self->{note}->follow_up;
}
$self->{contact}->assign_attributes(%{$::form->{contact}});
- foreach my $cvar (@{$self->{contact}->cvars_by_config()}) {
- my $value = $::form->{contact_cvars}->{$cvar->config->name};
-
- if ( $cvar->config->type eq 'number' ) {
- $value = $::form->parse_amount(\%::myconfig, $value);
- }
-
- $cvar->value($value);
- }
+ $self->_copy_form_to_cvars(target => $self->{cv}, source => $::form->{cv_cvars});
+ $self->_copy_form_to_cvars(target => $self->{contact}, source => $::form->{contact_cvars});
+ $self->_copy_form_to_cvars(target => $self->{shipto}, source => $::form->{shipto_cvars});
}
sub _load_customer_vendor {
$self->{all_salesmen} = SL::DB::Manager::Employee->get_all(query => [ or => [ id => $self->{cv}->salesman_id, deleted => 0 ] ]);
}
- $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all();
+ $self->{all_payment_terms} = SL::DB::Manager::PaymentTerm->get_all_sorted(where => [ or => [ id => $self->{cv}->payment_id,
+ obsolete => 0 ] ]);
$self->{all_delivery_terms} = SL::DB::Manager::DeliveryTerm->get_all();
- $self->{all_pricegroups} = SL::DB::Manager::Pricegroup->get_all();
+ if ($self->{cv}->is_customer) {
+ $self->{all_pricegroups} = SL::DB::Manager::Pricegroup->get_all_sorted(query => [ or => [ id => $self->{cv}->pricegroup_id, obsolete => 0 ] ]);
+ }
$query =
'SELECT DISTINCT(cp_abteilung) AS department
$::request->{layout}->add_javascripts('kivi.CustomerVendor.js');
}
+sub _prepare_cvar_configs_for_ajaj {
+ my ($self, $cvars) = @_;
+
+ return {
+ map {
+ my $cvar = $_;
+ my $result = { type => $cvar->config->type };
+
+ if ($cvar->config->type eq 'number') {
+ $result->{value} = $::form->format_amount(\%::myconfig, $cvar->value, -2);
+
+ } elsif ($result->{type} eq 'date') {
+ $result->{value} = $cvar->value ? $cvar->value->to_kivitendo : undef;
+
+ } elsif ($result->{type} =~ m{customer|vendor|part}) {
+ my $object = $cvar->value;
+ my $method = $result->{type} eq 'part' ? 'description' : 'name';
+
+ $result->{id} = int($cvar->number_value) || undef;
+ $result->{value} = $object ? $object->$method // '' : '';
+
+ } else {
+ $result->{value} = $cvar->value;
+ }
+
+ ( $cvar->config->name => $result )
+
+ } grep { $_->is_valid } @{ $cvars }
+ };
+}
+
sub normalize_name {
my ($self) = @_;