}
}) || die($db->error);
- $self->{contact} = SL::DB::Contact->new();
+ $self->{contact} = $self->_new_contact_object;
}
$self->action_edit();
LEFT JOIN oe
ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = ''
- AND ". ($arap eq 'ar' ? 'oe.customer_id IS NOT NULL' : 'oe_vendor_id IS NOT NULL') ." )
+ AND ". ($arap eq 'ar' ? 'oe.customer_id IS NOT NULL' : 'oe.vendor_id IS NOT NULL') ." )
${where}
ORDER BY ${arap}.transdate DESC LIMIT 15";
};
$data->{contact_cvars} = {
- map(
- {
- if ( $_->config->type eq 'number' ) {
- $_->config->name => $::form->format_amount(\%::myconfig, $_->value, -2);
- } else {
- $_->config->name => $_->value;
- }
+ 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;
}
- grep(
- { $_->is_valid; }
- @{$self->{contact}->cvars_by_config}
- )
- )
+
+ ( $cvar->config->name => $result )
+
+ } grep { $_->is_valid } @{ $self->{contact}->cvars_by_config }
};
$self->render(\SL::JSON::to_json($data), { type => 'json', process => 0 });
my @hashes = map {
+{
- value => $_->name,
+ value => $_->displayable_name,
label => $_->displayable_name,
id => $_->id,
$number => $_->$number,
$self->{cv} = SL::DB::Customer->new(id => $::form->{cv}->{id})->load();
}
} else {
- if ( $self->is_vendor() ) {
- $self->{cv} = SL::DB::Vendor->new();
- } else {
- $self->{cv} = SL::DB::Customer->new();
- }
+ $self->{cv} = $self->_new_customer_vendor_object;
}
$self->{cv}->assign_attributes(%{$::form->{cv}});
if ( $::form->{contact}->{cp_id} ) {
$self->{contact} = SL::DB::Contact->new(cp_id => $::form->{contact}->{cp_id})->load();
} else {
- $self->{contact} = SL::DB::Contact->new();
+ $self->{contact} = $self->_new_contact_object;
}
$self->{contact}->assign_attributes(%{$::form->{contact}});
die($::locale->text('Error'));
}
} else {
- $self->{contact} = SL::DB::Contact->new();
+ $self->{contact} = $self->_new_contact_object;
}
}
sub _create_customer_vendor {
my ($self) = @_;
- if ( $self->is_vendor() ) {
- $self->{cv} = SL::DB::Vendor->new();
- } else {
- $self->{cv} = SL::DB::Customer->new();
- }
+ $self->{cv} = $self->_new_customer_vendor_object;
$self->{cv}->currency_id($::instance_conf->get_currency_id());
$self->{note} = SL::DB::Note->new();
$self->{shipto} = SL::DB::Shipto->new();
- $self->{contact} = SL::DB::Contact->new();
+ $self->{contact} = $self->_new_contact_object;
}
sub _pre_render {
model => 'Customer',
sorted => {
_default => {
- by => 'name',
+ by => 'customernumber',
dir => 1,
},
- name => t8('Name'),
+ customernumber => t8('Customer Number'),
},
);
}
model => 'Vendor',
sorted => {
_default => {
- by => 'name',
+ by => 'vendornumber',
dir => 1,
},
- name => t8('Name'),
+ vendornumber => t8('Vendor Number'),
},
);
}
+sub _new_customer_vendor_object {
+ my ($self) = @_;
+
+ my $class = 'SL::DB::' . ($self->is_vendor ? 'Vendor' : 'Customer');
+ return $class->new(
+ contacts => [],
+ shipto => [],
+ custom_variables => [],
+ );
+}
+
+sub _new_contact_object {
+ my ($self) = @_;
+
+ return SL::DB::Contact->new(custom_variables => []);
+}
+
1;