Редактировать адрес личный кабинет контроллер

[pashajanx]

Доброе время суток, есть нужда перенести редактирование информации в личный кабинет (account/account). Изменил контролер account перенес туда "все" из контроллера edit, теперь не могу понять как мне перенести из контроллера address, чтоб смог отредактировать поле address_1. 

 

 

 

class ControllerAccountAccount extends Controller {
public function index() {
if (!$this->customer->isLogged()) {
$this->session->data['redirect'] = $this->url->link('account/account', '', 'SSL');
$this->response->redirect($this->url->link('account/login', '', 'SSL'));
}

$this->load->language('account/account');
//Edit
$this->load->language('account/edit');
$this->load->model('account/customer');
//Addres
$this->load->language('account/address');
$this->load->model('account/address');

$this->document->setTitle($this->language->get('heading_title'));

//Edit
if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
$this->model_account_customer->editCustomer($this->request->post);
$this->model_account_address->editAddress($this->request->get['address_id'], $this->request->post);

$this->session->data['success'] = $this->language->get('text_success');

// Add to activity log
$this->load->model('account/activity');

$activity_data = array(
'customer_id' => $this->customer->getId(),
'name' => $this->customer->getFirstName() . ' ' . $this->customer->getLastName()
);

$this->model_account_activity->addActivity('edit', $activity_data);

$this->response->redirect($this->url->link('account/account', '', 'SSL'));
}

$data['breadcrumbs'] = array();
$data['breadcrumbs'][] = array(
'text' => $this->language->get('text_home'),
'href' => $this->url->link('common/home')
);
$data['breadcrumbs'][] = array(
'text' => $this->language->get('text_account'),
'href' => $this->url->link('account/account', '', 'SSL')
);

if (isset($this->session->data['success'])) {
$data['success'] = $this->session->data['success'];
unset($this->session->data['success']);
} else {
$data['success'] = '';
}

//Edit
$data['entry_firstname'] = $this->language->get('entry_firstname');
$data['entry_lastname'] = $this->language->get('entry_lastname');
$data['entry_email'] = $this->language->get('entry_email');
$data['entry_telephone'] = $this->language->get('entry_telephone');
$data['entry_address_1'] = $this->language->get('entry_address_1');

$data['heading_title'] = $this->language->get('heading_title');
$data['text_my_account'] = $this->language->get('text_my_account');
$data['text_my_orders'] = $this->language->get('text_my_orders');
$data['text_my_newsletter'] = $this->language->get('text_my_newsletter');
$data['text_edit'] = $this->language->get('text_edit');
$data['text_password'] = $this->language->get('text_password');
$data['text_address'] = $this->language->get('text_address');
$data['text_wishlist'] = $this->language->get('text_wishlist');
$data['text_order'] = $this->language->get('text_order');
$data['text_download'] = $this->language->get('text_download');
$data['text_reward'] = $this->language->get('text_reward');
$data['text_return'] = $this->language->get('text_return');
$data['text_transaction'] = $this->language->get('text_transaction');
$data['text_newsletter'] = $this->language->get('text_newsletter');
$data['text_recurring'] = $this->language->get('text_recurring');
$data['edit'] = $this->url->link('account/edit', '', 'SSL');
$data['password'] = $this->url->link('account/password', '', 'SSL');
$data['address'] = $this->url->link('account/address', '', 'SSL');
$data['wishlist'] = $this->url->link('account/wishlist');
$data['order'] = $this->url->link('account/order', '', 'SSL');
$data['download'] = $this->url->link('account/download', '', 'SSL');
$data['return'] = $this->url->link('account/return', '', 'SSL');
$data['transaction'] = $this->url->link('account/transaction', '', 'SSL');
$data['newsletter'] = $this->url->link('account/newsletter', '', 'SSL');
$data['recurring'] = $this->url->link('account/recurring', '', 'SSL');


//edit
if (isset($this->error['warning'])) {
$data['error_warning'] = $this->error['warning'];
} else {
$data['error_warning'] = '';
}

if (isset($this->error['firstname'])) {
$data['error_firstname'] = $this->error['firstname'];
} else {
$data['error_firstname'] = '';
}

if (isset($this->error['lastname'])) {
$data['error_lastname'] = $this->error['lastname'];
} else {
$data['error_lastname'] = '';
}

if (isset($this->error['email'])) {
$data['error_email'] = $this->error['email'];
} else {
$data['error_email'] = '';
}

if (isset($this->error['telephone'])) {
$data['error_telephone'] = $this->error['telephone'];
} else {
$data['error_telephone'] = '';
}

if (isset($this->error['custom_field'])) {
$data['error_custom_field'] = $this->error['custom_field'];
} else {
$data['error_custom_field'] = array();
}

if (isset($this->error['address_1'])) {
$data['error_address_1'] = $this->error['error_address_1'];
} else {
$data['error_address_1'] = array();
}

$data['action'] = $this->url->link('account/account', '', 'SSL');

if ($this->request->server['REQUEST_METHOD'] != 'POST') {
$customer_info = $this->model_account_customer->getCustomer($this->customer->getId());
}

if (isset($this->request->get['address_id']) && ($this->request->server['REQUEST_METHOD'] != 'POST')) {
$address_info = $this->model_account_address->getAddress($this->request->get['address_id']);
}

if (isset($this->request->post['firstname'])) {
$data['firstname'] = $this->request->post['firstname'];
} elseif (!empty($customer_info)) {
$data['firstname'] = $customer_info['firstname'];
} else {
$data['firstname'] = '';
}

if (isset($this->request->post['lastname'])) {
$data['lastname'] = $this->request->post['lastname'];
} elseif (!empty($customer_info)) {
$data['lastname'] = $customer_info['lastname'];
} else {
$data['lastname'] = '';
}

if (isset($this->request->post['email'])) {
$data['email'] = $this->request->post['email'];
} elseif (!empty($customer_info)) {
$data['email'] = $customer_info['email'];
} else {
$data['email'] = '';
}

if (isset($this->request->post['telephone'])) {
$data['telephone'] = $this->request->post['telephone'];
} elseif (!empty($customer_info)) {
$data['telephone'] = $customer_info['telephone'];
} else {
$data['telephone'] = '';
}

if (isset($this->request->post['fax'])) {
$data['fax'] = $this->request->post['fax'];
} elseif (!empty($customer_info)) {
$data['fax'] = $customer_info['fax'];
} else {
$data['fax'] = '';
}

//Addres
if (isset($this->request->post['address_1'])) {
$data['address_1'] = $this->request->post['address_1'];
} elseif (!empty($address_info)) {
$data['address_1'] = $address_info['address_1'];
} else {
$data['address_1'] = '';
}

// Custom Fields
$this->load->model('account/custom_field');

$data['custom_fields'] = $this->model_account_custom_field->getCustomFields($this->config->get('config_customer_group_id'));

if (isset($this->request->post['custom_field'])) {
$data['account_custom_field'] = $this->request->post['custom_field'];
} elseif (isset($customer_info)) {
$data['account_custom_field'] = json_decode($customer_info['custom_field'], true);
} else {
$data['account_custom_field'] = array();
}

$data['back'] = $this->url->link('account/account', '', 'SSL');

if ($this->config->get('reward_status')) {
$data['reward'] = $this->url->link('account/reward', '', 'SSL');
} else {
$data['reward'] = '';
}

$data['column_left'] = $this->load->controller('common/column_left');
$data['column_right'] = $this->load->controller('common/column_right');
$data['content_top'] = $this->load->controller('common/content_top');
$data['content_bottom'] = $this->load->controller('common/content_bottom');
$data['footer'] = $this->load->controller('common/footer');
$data['header'] = $this->load->controller('common/header');
if (file_exists(DIR_TEMPLATE . $this->config->get('config_template') . '/template/account/account.tpl')) {
$this->response->setOutput($this->load->view($this->config->get('config_template') . '/template/account/account.tpl', $data));
} else {
$this->response->setOutput($this->load->view('default/template/account/account.tpl', $data));
}
}

//Edit
protected function validate() {
if ((utf8_strlen(trim($this->request->post['firstname'])) < 1) || (utf8_strlen(trim($this->request->post['firstname'])) > 32)) {
$this->error['firstname'] = $this->language->get('error_firstname');
}

if ((utf8_strlen(trim($this->request->post['lastname'])) < 1) || (utf8_strlen(trim($this->request->post['lastname'])) > 32)) {
$this->error['lastname'] = $this->language->get('error_lastname');
}

if ((utf8_strlen($this->request->post['email']) > 96) || !preg_match($this->config->get('config_mail_regexp'), $this->request->post['email'])) {
$this->error['email'] = $this->language->get('error_email');
}

if (($this->customer->getEmail() != $this->request->post['email']) && $this->model_account_customer->getTotalCustomersByEmail($this->request->post['email'])) {
$this->error['warning'] = $this->language->get('error_exists');
}

if ((utf8_strlen($this->request->post['telephone']) < 3) || (utf8_strlen($this->request->post['telephone']) > 32)) {
$this->error['telephone'] = $this->language->get('error_telephone');
}

// Custom field validation
$this->load->model('account/custom_field');

$custom_fields = $this->model_account_custom_field->getCustomFields($this->config->get('config_customer_group_id'));

foreach ($custom_fields as $custom_field) {
if (($custom_field['location'] == 'account') && $custom_field['required'] && empty($this->request->post['custom_field'][$custom_field['custom_field_id']])) {
$this->error['custom_field'][$custom_field['custom_field_id']] = sprintf($this->language->get('error_custom_field'), $custom_field['name']);
}
}

return !$this->error;
}
}