X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCustomerVendor.pm;h=625ec62e07253f96d19e28c437c4249b39c79972;hb=10d6fe63ec82e50322a1fe08902fde7a0c1efa4e;hp=5ea038944bf85f829a88be19f8a0cc6d5c10b308;hpb=064d15bb6c59188be545d75e895689cdfea04ad6;p=kivitendo-erp.git diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm index 5ea038944..625ec62e0 100644 --- a/SL/Controller/CustomerVendor.pm +++ b/SL/Controller/CustomerVendor.pm @@ -7,6 +7,7 @@ use SL::JSON; use SL::DBUtils; use SL::Helper::Flash; use SL::Locale::String; +use SL::Controller::Helper::GetModels; use SL::DB::Customer; use SL::DB::Vendor; @@ -23,6 +24,10 @@ use SL::DB::FollowUpLink; use SL::DB::History; use SL::DB::Currency; +use Rose::Object::MakeMethods::Generic ( + 'scalar --get_set_init' => [ qw(customer_models vendor_models) ], +); + # safety __PACKAGE__->run_before( sub { @@ -50,11 +55,35 @@ __PACKAGE__->run_before( '_load_customer_vendor', only => [ 'edit', + 'show', 'update', 'ajaj_get_shipto', 'ajaj_get_contact', ] ); + +# make sure this comes after _load_customer_vendor +__PACKAGE__->run_before( + '_check_customer_vendor_all_edit', + only => [ + 'edit', + 'show', + 'update', + 'delete', + 'save', + 'save_and_ap_transaction', + 'save_and_ar_transaction', + 'save_and_close', + 'save_and_invoice', + 'save_and_order', + 'save_and_quotation', + 'save_and_rfq', + 'delete', + 'delete_contact', + 'delete_shipto', + ] +); + __PACKAGE__->run_before( '_create_customer_vendor', only => [ @@ -69,6 +98,7 @@ sub action_add { my ($self) = @_; $self->_pre_render(); + $self->{cv}->assign_attributes(hourly_rate => $::instance_conf->get_customer_hourly_rate) if $self->{cv}->is_customer; $self->render( 'customer_vendor/form', title => ($self->is_vendor() ? $::locale->text('Add Vendor') : $::locale->text('Add Customer')), @@ -87,9 +117,37 @@ sub action_edit { ); } +sub action_show { + my ($self) = @_; + + if ($::request->type eq 'json') { + my $cv_hash; + if (!$self->{cv}) { + # TODO error + } else { + $cv_hash = $self->{cv}->as_tree; + $cv_hash->{cvars} = $self->{cv}->cvar_as_hashref; + } + + $self->render(\ SL::JSON::to_json($cv_hash), { layout => 0, type => 'json', process => 0 }); + } +} + sub _save { my ($self) = @_; + my @errors = $self->{cv}->validate; + if (@errors) { + flash('error', @errors); + $self->_pre_render(); + $self->render( + 'customer_vendor/form', + title => ($self->is_vendor() ? t8('Edit Vendor') : t8('Edit Customer')), + %{$self->{template_args}} + ); + ::end_of_request(); + } + my $db = $self->{cv}->db; $db->do_transaction(sub { @@ -117,7 +175,7 @@ sub _save { $self->{contact}->cp_cv_id($self->{cv}->id); if( $self->{contact}->cp_name ne '' || $self->{contact}->cp_givenname ne '' ) { - $self->{contact}->save(); + $self->{contact}->save(cascade => 1); } if( $self->{note}->subject ne '' && $self->{note}->body ne '' ) { @@ -170,34 +228,23 @@ sub _save { sub action_save { my ($self) = @_; - if (!$self->{cv}->name) { - flash('error', t8('Customer missing!')); - $self->_pre_render(); - $self->render( - 'customer_vendor/form', - title => ($self->is_vendor() ? t8('Edit Vendor') : t8('Edit Customer')), - %{$self->{template_args}} - ); - } else { - - $self->_save(); - - my @redirect_params = ( - action => 'edit', - id => $self->{cv}->id, - db => ($self->is_vendor() ? 'vendor' : 'customer'), - ); + $self->_save(); - if ( $self->{contact}->cp_id ) { - push(@redirect_params, contact_id => $self->{contact}->cp_id); - } + my @redirect_params = ( + action => 'edit', + id => $self->{cv}->id, + db => ($self->is_vendor() ? 'vendor' : 'customer'), + ); - if ( $self->{shipto}->shipto_id ) { - push(@redirect_params, shipto_id => $self->{shipto}->shipto_id); - } + if ( $self->{contact}->cp_id ) { + push(@redirect_params, contact_id => $self->{contact}->cp_id); + } - $self->redirect_to(@redirect_params); + if ( $self->{shipto}->shipto_id ) { + push(@redirect_params, shipto_id => $self->{shipto}->shipto_id); } + + $self->redirect_to(@redirect_params); } sub action_save_and_close { @@ -342,7 +389,7 @@ sub action_delete_contact { } }) || die($db->error); - $self->{contact} = SL::DB::Contact->new(); + $self->{contact} = $self->_new_contact_object; } $self->action_edit(); @@ -469,7 +516,8 @@ sub action_get_delivery { ON p.id = i.parts_id LEFT JOIN oe - ON (oe.ordnumber = ${arap}.ordnumber AND NOT ${arap}.ordnumber = '') + 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') ." ) ${where} ORDER BY ${arap}.transdate DESC LIMIT 15"; @@ -519,56 +567,91 @@ sub action_ajaj_get_contact { }; $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 }); } -sub action_ajaj_customer_autocomplete { +sub action_ajaj_autocomplete { my ($self, %params) = @_; - my $limit = $::form->{limit} || 20; - my $type = $::form->{type} || {}; - my $query = { ilike => '%'. $::form->{term} .'%' }; + my ($model, $manager, $number, $matches); + + # first see if this is customer or vendor picking + if ($::form->{type} eq 'customer') { + $model = $self->customer_models; + $manager = 'SL::DB::Manager::Customer'; + $number = 'customernumber'; + } elsif ($::form->{type} eq 'vendor') { + $model = $self->vendor_models; + $manager = 'SL::DB::Manager::Vendor'; + $number = 'vendornumber'; + } else { + die "unknown type $::form->{type}"; + } - my @filter; - push( - @filter, - $::form->{column} ? ($::form->{column} => $query) : (or => [ customernumber => $query, name => $query ]) - ); + # if someone types something, and hits enter, assume he entered the full name. + # if something matches, treat that as sole match + # unfortunately get_models can't do more than one per package atm, so we d it + # the oldfashioned way. + if ($::form->{prefer_exact}) { + my $exact_matches; + if (1 == scalar @{ $exact_matches = $manager->get_all( + query => [ + obsolete => 0, + (salesman_id => SL::DB::Manager::Employee->current->id) x !$::auth->assert('customer_vendor_all_edit', 1), + or => [ + name => { ilike => $::form->{filter}{'all:substr:multi::ilike'} }, + $number => { ilike => $::form->{filter}{'all:substr:multi::ilike'} }, + ] + ], + limit => 2, + ) }) { + $matches = $exact_matches; + } + } - my $customers = SL::DB::Manager::Customer->get_all(query => [ @filter ], limit => $limit); - my $value_col = $::form->{column} || 'name'; + $matches //= $model->get; + + my @hashes = map { + +{ + value => $_->displayable_name, + label => $_->displayable_name, + id => $_->id, + $number => $_->$number, + name => $_->name, + type => $::form->{type}, + cvars => { map { ($_->config->name => { value => $_->value_as_text, is_valid => $_->is_valid }) } @{ $_->cvars_by_config } }, + } + } @{ $matches }; - my $data = [ - map( - { - { - value => $_->can($value_col)->($_), - label => $_->displayable_name, - id => $_->id, - customernumber => $_->customernumber, - name => $_->name, - } - } - @{$customers} - ) - ]; + $self->render(\ SL::JSON::to_json(\@hashes), { layout => 0, type => 'json', process => 0 }); +} - $self->render(\SL::JSON::to_json($data), { layout => 0, type => 'json' }); +sub action_test_page { + $::request->{layout}->add_javascripts('autocomplete_customer.js'); + $_[0]->render('customer_vendor/test_page'); } sub is_vendor { @@ -587,7 +670,7 @@ sub is_orphaned { } my $arap = $self->is_vendor ? 'ap' : 'ar'; - my $num_args = 2; + my $num_args = 3; my $cv = $self->is_vendor ? 'vendor' : 'customer'; @@ -602,6 +685,13 @@ sub is_orphaned { SELECT a.id FROM oe a JOIN '. $cv .' ct ON (a.'. $cv .'_id = ct.id) + WHERE ct.id = ? + + UNION + + SELECT a.id + FROM delivery_orders a + JOIN '. $cv .' ct ON (a.'. $cv .'_id = ct.id) WHERE ct.id = ?'; @@ -629,11 +719,7 @@ sub _instantiate_args { $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}}); @@ -685,7 +771,7 @@ sub _instantiate_args { 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}}); @@ -736,18 +822,24 @@ sub _load_customer_vendor { die($::locale->text('Error')); } } else { - $self->{contact} = SL::DB::Contact->new(); + $self->{contact} = $self->_new_contact_object; } } +sub _check_customer_vendor_all_edit { + my ($self) = @_; + + unless ($::auth->assert('customer_vendor_all_edit', 1)) { + die($::locale->text("You don't have the rights to edit this customer.") . "\n") + if $self->{cv}->is_customer and + SL::DB::Manager::Employee->current->id != $self->{cv}->salesman_id; + }; +}; + 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(); @@ -756,7 +848,7 @@ sub _create_customer_vendor { $self->{shipto} = SL::DB::Shipto->new(); - $self->{contact} = SL::DB::Contact->new(); + $self->{contact} = $self->_new_contact_object; } sub _pre_render { @@ -802,7 +894,7 @@ sub _pre_render { $self->{all_languages} = SL::DB::Manager::Language->get_all(); - $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all(); + $self->{all_taxzones} = SL::DB::Manager::TaxZone->get_all_sorted(); if ( $::instance_conf->get_vertreter() ) { $query = @@ -877,4 +969,67 @@ sub normalize_name { $self->{cv}->name($name); } +sub home_address_for_google_maps { + my ($self) = @_; + + my $address = $::instance_conf->get_address // ''; + $address =~ s{^\s+|\s+$|\r+}{}g; + $address =~ s{\n+}{,}g; + $address =~ s{\s+}{ }g; + + return $address; +} + +sub init_customer_models { + my ($self) = @_; + + SL::Controller::Helper::GetModels->new( + controller => $self, + model => 'Customer', + sorted => { + _default => { + by => 'customernumber', + dir => 1, + }, + customernumber => t8('Customer Number'), + }, + query => [ + ( salesman_id => SL::DB::Manager::Employee->current->id) x !$::auth->assert('customer_vendor_all_edit', 1), + ], + ); +} + +sub init_vendor_models { + my ($self) = @_; + + SL::Controller::Helper::GetModels->new( + controller => $self, + model => 'Vendor', + sorted => { + _default => { + by => 'vendornumber', + dir => 1, + }, + 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;