first commit

13 files changed, 2271 insertions, 0 deletions

diff --git a/public/admin/controller/extension/report/customer_activity.php b/public/admin/controller/extension/report/customer_activity.php
new file mode 100644
index 0000000..0d95a51
--- /dev/null
+++ b/public/admin/controller/extension/report/customer_activity.php
@@ -0,0 +1,179 @@
+<?php
+class ControllerExtensionReportCustomerActivity extends Controller {
+	public function index() {
+		$this->load->language('extension/report/customer_activity');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_customer_activity', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/customer_activity', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/customer_activity', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_customer_activity_status'])) {
+			$data['report_customer_activity_status'] = $this->request->post['report_customer_activity_status'];
+		} else {
+			$data['report_customer_activity_status'] = $this->config->get('report_customer_activity_status');
+		}
+
+		if (isset($this->request->post['report_customer_activity_sort_order'])) {
+			$data['report_customer_activity_sort_order'] = $this->request->post['report_customer_activity_sort_order'];
+		} else {
+			$data['report_customer_activity_sort_order'] = $this->config->get('report_customer_activity_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/customer_activity_form', $data));
+	}
+		
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/customer_activity')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+		
+	public function report() {
+		$this->load->language('extension/report/customer_activity');
+
+		if (isset($this->request->get['filter_customer'])) {
+			$filter_customer = $this->request->get['filter_customer'];
+		} else {
+			$filter_customer = '';
+		}
+
+		if (isset($this->request->get['filter_ip'])) {
+			$filter_ip = $this->request->get['filter_ip'];
+		} else {
+			$filter_ip = '';
+		}
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/customer');
+
+		$data['activities'] = array();
+
+		$filter_data = array(
+			'filter_customer'   => $filter_customer,
+			'filter_ip'         => $filter_ip,
+			'filter_date_start'	=> $filter_date_start,
+			'filter_date_end'	=> $filter_date_end,
+			'start'             => ($page - 1) * 20,
+			'limit'             => 20
+		);
+
+		$activity_total = $this->model_extension_report_customer->getTotalCustomerActivities($filter_data);
+
+		$results = $this->model_extension_report_customer->getCustomerActivities($filter_data);
+
+		foreach ($results as $result) {
+			$comment = vsprintf($this->language->get('text_activity_' . $result['key']), json_decode($result['data'], true));
+
+			$find = array(
+				'customer_id=',
+				'order_id='
+			);
+
+			$replace = array(
+				$this->url->link('customer/customer/edit', 'user_token=' . $this->session->data['user_token'] . '&customer_id=', true),
+				$this->url->link('sale/order/info', 'user_token=' . $this->session->data['user_token'] . '&order_id=', true)
+			);
+
+			$data['activities'][] = array(
+				'comment'    => str_replace($find, $replace, $comment),
+				'ip'         => $result['ip'],
+				'date_added' => date($this->language->get('datetime_format'), strtotime($result['date_added']))
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$url = '';
+
+		if (isset($this->request->get['filter_customer'])) {
+			$url .= '&filter_customer=' . urlencode($this->request->get['filter_customer']);
+		}
+
+		if (isset($this->request->get['filter_ip'])) {
+			$url .= '&filter_ip=' . $this->request->get['filter_ip'];
+		}
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $activity_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=customer_activity' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($activity_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($activity_total - $this->config->get('config_limit_admin'))) ? $activity_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $activity_total, ceil($activity_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_customer'] = $filter_customer;
+		$data['filter_ip'] = $filter_ip;
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+
+		return $this->load->view('extension/report/customer_activity_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/customer_order.php b/public/admin/controller/extension/report/customer_order.php
new file mode 100644
index 0000000..82f127b
--- /dev/null
+++ b/public/admin/controller/extension/report/customer_order.php
@@ -0,0 +1,176 @@
+<?php
+class ControllerExtensionReportCustomerOrder extends Controller {
+	public function index() {
+		$this->load->language('extension/report/customer_order');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_customer_order', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/customer_order', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/customer_order', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_customer_order_status'])) {
+			$data['report_customer_order_status'] = $this->request->post['report_customer_order_status'];
+		} else {
+			$data['report_customer_order_status'] = $this->config->get('report_customer_order_status');
+		}
+
+		if (isset($this->request->post['report_customer_order_sort_order'])) {
+			$data['report_customer_order_sort_order'] = $this->request->post['report_customer_order_sort_order'];
+		} else {
+			$data['report_customer_order_sort_order'] = $this->config->get('report_customer_order_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/customer_order_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/customer_order')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+			
+	public function report() {
+		$this->load->language('extension/report/customer_order');
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['filter_customer'])) {
+			$filter_customer = $this->request->get['filter_customer'];
+		} else {
+			$filter_customer = '';
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$filter_order_status_id = $this->request->get['filter_order_status_id'];
+		} else {
+			$filter_order_status_id = 0;
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/customer');
+
+		$data['customers'] = array();
+
+		$filter_data = array(
+			'filter_date_start'			=> $filter_date_start,
+			'filter_date_end'			=> $filter_date_end,
+			'filter_customer'			=> $filter_customer,
+			'filter_order_status_id'	=> $filter_order_status_id,
+			'start'						=> ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'						=> $this->config->get('config_limit_admin')
+		);
+
+		$customer_total = $this->model_extension_report_customer->getTotalOrders($filter_data);
+
+		$results = $this->model_extension_report_customer->getOrders($filter_data);
+
+		foreach ($results as $result) {
+			$data['customers'][] = array(
+				'customer'       => $result['customer'],
+				'email'          => $result['email'],
+				'customer_group' => $result['customer_group'],
+				'status'         => ($result['status'] ? $this->language->get('text_enabled') : $this->language->get('text_disabled')),
+				'orders'         => $result['orders'],
+				'products'       => $result['products'],
+				'total'          => $this->currency->format($result['total'], $this->config->get('config_currency')),
+				'edit'           => $this->url->link('customer/customer/edit', 'user_token=' . $this->session->data['user_token'] . '&customer_id=' . $result['customer_id'], true)
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$this->load->model('localisation/order_status');
+
+		$data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_customer'])) {
+			$url .= '&filter_customer=' . urlencode($this->request->get['filter_customer']);
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$url .= '&filter_order_status_id=' . $this->request->get['filter_order_status_id'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $customer_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=customer_order' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($customer_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($customer_total - $this->config->get('config_limit_admin'))) ? $customer_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $customer_total, ceil($customer_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_customer'] = $filter_customer;
+		$data['filter_order_status_id'] = $filter_order_status_id;
+
+		return $this->load->view('extension/report/customer_order_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/customer_reward.php b/public/admin/controller/extension/report/customer_reward.php
new file mode 100644
index 0000000..b7a67c9
--- /dev/null
+++ b/public/admin/controller/extension/report/customer_reward.php
@@ -0,0 +1,160 @@
+<?php
+class ControllerExtensionReportCustomerReward extends Controller {
+	public function index() {
+		$this->load->language('extension/report/customer_reward');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_customer_reward', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/customer_reward', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/customer_reward', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_customer_reward_status'])) {
+			$data['report_customer_reward_status'] = $this->request->post['report_customer_reward_status'];
+		} else {
+			$data['report_customer_reward_status'] = $this->config->get('report_customer_reward_status');
+		}
+
+		if (isset($this->request->post['report_customer_reward_sort_order'])) {
+			$data['report_customer_reward_sort_order'] = $this->request->post['report_customer_reward_sort_order'];
+		} else {
+			$data['report_customer_reward_sort_order'] = $this->config->get('report_customer_reward_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/customer_reward_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/customer_reward')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+		
+	public function report() {
+		$this->load->language('extension/report/customer_reward');
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['filter_customer'])) {
+			$filter_customer = $this->request->get['filter_customer'];
+		} else {
+			$filter_customer = '';
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/customer');
+
+		$data['customers'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	=> $filter_date_start,
+			'filter_date_end'	=> $filter_date_end,
+			'filter_customer'	=> $filter_customer,
+			'start'				=> ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'				=> $this->config->get('config_limit_admin')
+		);
+
+		$customer_total = $this->model_extension_report_customer->getTotalRewardPoints($filter_data);
+
+		$results = $this->model_extension_report_customer->getRewardPoints($filter_data);
+
+		foreach ($results as $result) {
+			$data['customers'][] = array(
+				'customer'       => $result['customer'],
+				'email'          => $result['email'],
+				'customer_group' => $result['customer_group'],
+				'status'         => ($result['status'] ? $this->language->get('text_enabled') : $this->language->get('text_disabled')),
+				'points'         => $result['points'],
+				'orders'         => $result['orders'],
+				'total'          => $this->currency->format($result['total'], $this->config->get('config_currency')),
+				'edit'           => $this->url->link('customer/customer/edit', 'user_token=' . $this->session->data['user_token'] . '&customer_id=' . $result['customer_id'], true)
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_customer'])) {
+			$url .= '&filter_customer=' . urlencode($this->request->get['filter_customer']);
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $customer_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=customer_reward' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($customer_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($customer_total - $this->config->get('config_limit_admin'))) ? $customer_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $customer_total, ceil($customer_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_customer'] = $filter_customer;
+	
+		return $this->load->view('extension/report/customer_reward_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/customer_search.php b/public/admin/controller/extension/report/customer_search.php
new file mode 100644
index 0000000..6a2aa63
--- /dev/null
+++ b/public/admin/controller/extension/report/customer_search.php
@@ -0,0 +1,201 @@
+<?php
+class ControllerExtensionReportCustomerSearch extends Controller {
+	public function index() {
+		$this->load->language('extension/report/customer_search');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_customer_search', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/customer_search', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/customer_search', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_customer_search_status'])) {
+			$data['report_customer_search_status'] = $this->request->post['report_customer_search_status'];
+		} else {
+			$data['report_customer_search_status'] = $this->config->get('report_customer_search_status');
+		}
+
+		if (isset($this->request->post['report_customer_search_sort_order'])) {
+			$data['report_customer_search_sort_order'] = $this->request->post['report_customer_search_sort_order'];
+		} else {
+			$data['report_customer_search_sort_order'] = $this->config->get('report_customer_search_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/customer_search_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/customer_search')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+	
+	public function report() {
+		$this->load->language('extension/report/customer_search');
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['filter_keyword'])) {
+			$filter_keyword = $this->request->get['filter_keyword'];
+		} else {
+			$filter_keyword = '';
+		}
+
+		if (isset($this->request->get['filter_customer'])) {
+			$filter_customer = $this->request->get['filter_customer'];
+		} else {
+			$filter_customer = '';
+		}
+
+		if (isset($this->request->get['filter_ip'])) {
+			$filter_ip = $this->request->get['filter_ip'];
+		} else {
+			$filter_ip = '';
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/customer');
+		$this->load->model('catalog/category');
+
+		$data['searches'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	=> $filter_date_start,
+			'filter_date_end'	=> $filter_date_end,
+			'filter_keyword'    => $filter_keyword,
+			'filter_customer'   => $filter_customer,
+			'filter_ip'         => $filter_ip,
+			'start'             => ($page - 1) * 20,
+			'limit'             => 20
+		);
+
+		$search_total = $this->model_extension_report_customer->getTotalCustomerSearches($filter_data);
+
+		$results = $this->model_extension_report_customer->getCustomerSearches($filter_data);
+
+		foreach ($results as $result) {
+			$category_info = $this->model_catalog_category->getCategory($result['category_id']);
+
+			if ($category_info) {
+				$category = ($category_info['path']) ? $category_info['path'] . ' &gt; ' . $category_info['name'] : $category_info['name'];
+			} else {
+				$category = '';
+			}
+
+			if ($result['customer_id'] > 0) {
+				$customer = sprintf($this->language->get('text_customer'), $this->url->link('customer/customer/edit', 'user_token=' . $this->session->data['user_token'] . '&customer_id=' . $result['customer_id'], true), $result['customer']);
+			} else {
+				$customer = $this->language->get('text_guest');
+			}
+
+			$data['searches'][] = array(
+				'keyword'     => $result['keyword'],
+				'products'    => $result['products'],
+				'category'    => $category,
+				'customer'    => $customer,
+				'ip'          => $result['ip'],
+				'date_added'  => date($this->language->get('datetime_format'), strtotime($result['date_added']))
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_keyword'])) {
+			$url .= '&filter_keyword=' . urlencode($this->request->get['filter_keyword']);
+		}
+
+		if (isset($this->request->get['filter_customer'])) {
+			$url .= '&filter_customer=' . urlencode($this->request->get['filter_customer']);
+		}
+
+		if (isset($this->request->get['filter_ip'])) {
+			$url .= '&filter_ip=' . $this->request->get['filter_ip'];
+		}
+
+		if (isset($this->request->get['page'])) {
+			$url .= '&page=' . $this->request->get['page'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $search_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=customer_search' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($search_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($search_total - $this->config->get('config_limit_admin'))) ? $search_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $search_total, ceil($search_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_keyword'] = $filter_keyword;
+		$data['filter_customer'] = $filter_customer;
+		$data['filter_ip'] = $filter_ip;
+
+		return $this->load->view('extension/report/customer_search_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/customer_transaction.php b/public/admin/controller/extension/report/customer_transaction.php
new file mode 100644
index 0000000..1657d34
--- /dev/null
+++ b/public/admin/controller/extension/report/customer_transaction.php
@@ -0,0 +1,158 @@
+<?php
+class ControllerExtensionReportCustomerTransaction extends Controller {
+	public function index() {
+		$this->load->language('extension/report/customer_transaction');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_customer_transaction', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/customer_transaction', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/customer_transaction', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_customer_transaction_status'])) {
+			$data['report_customer_transaction_status'] = $this->request->post['report_customer_transaction_status'];
+		} else {
+			$data['report_customer_transaction_status'] = $this->config->get('report_customer_transaction_status');
+		}
+
+		if (isset($this->request->post['report_customer_transaction_sort_order'])) {
+			$data['report_customer_transaction_sort_order'] = $this->request->post['report_customer_transaction_sort_order'];
+		} else {
+			$data['report_customer_transaction_sort_order'] = $this->config->get('report_customer_transaction_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/customer_transaction_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/customer_transaction')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+		
+	public function report() {
+		$this->load->language('extension/report/customer_transaction');
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['filter_customer'])) {
+			$filter_customer = $this->request->get['filter_customer'];
+		} else {
+			$filter_customer = '';
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/customer_transaction');
+		
+		$data['customers'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	=> $filter_date_start,
+			'filter_date_end'	=> $filter_date_end,
+			'filter_customer'	=> $filter_customer,
+			'start'				=> ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'				=> $this->config->get('config_limit_admin')
+		);
+
+		$customer_total = $this->model_extension_report_customer_transaction->getTotalTransactions($filter_data);
+
+		$results = $this->model_extension_report_customer_transaction->getTransactions($filter_data);
+
+		foreach ($results as $result) {
+			$data['customers'][] = array(
+				'customer'       => $result['customer'],
+				'email'          => $result['email'],
+				'customer_group' => $result['customer_group'],
+				'status'         => ($result['status'] ? $this->language->get('text_enabled') : $this->language->get('text_disabled')),
+				'total'          => $this->currency->format($result['total'], $this->config->get('config_currency')),
+				'edit'           => $this->url->link('customer/customer/edit', 'user_token=' . $this->session->data['user_token'] . '&customer_id=' . $result['customer_id'], true)
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_customer'])) {
+			$url .= '&filter_customer=' . urlencode($this->request->get['filter_customer']);
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $customer_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=customer_transaction' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($customer_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($customer_total - $this->config->get('config_limit_admin'))) ? $customer_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $customer_total, ceil($customer_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_customer'] = $filter_customer;
+
+		return $this->load->view('extension/report/customer_transaction_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/marketing.php b/public/admin/controller/extension/report/marketing.php
new file mode 100644
index 0000000..1d8f465
--- /dev/null
+++ b/public/admin/controller/extension/report/marketing.php
@@ -0,0 +1,162 @@
+<?php
+class ControllerExtensionReportMarketing extends Controller {
+	public function index() {
+		$this->load->language('extension/report/marketing');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_marketing', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/marketing', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/marketing', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_marketing_status'])) {
+			$data['report_marketing_status'] = $this->request->post['report_marketing_status'];
+		} else {
+			$data['report_marketing_status'] = $this->config->get('report_marketing_status');
+		}
+
+		if (isset($this->request->post['report_marketing_sort_order'])) {
+			$data['report_marketing_sort_order'] = $this->request->post['report_marketing_sort_order'];
+		} else {
+			$data['report_marketing_sort_order'] = $this->config->get('report_marketing_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/marketing_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/marketing')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+	
+	public function report() {
+		$this->load->language('extension/report/marketing');
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$filter_order_status_id = $this->request->get['filter_order_status_id'];
+		} else {
+			$filter_order_status_id = 0;
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/marketing');
+
+		$data['marketings'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	     => $filter_date_start,
+			'filter_date_end'	     => $filter_date_end,
+			'filter_order_status_id' => $filter_order_status_id,
+			'start'                  => ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'                  => $this->config->get('config_limit_admin')
+		);
+
+		$marketing_total = $this->model_extension_report_marketing->getTotalMarketing($filter_data);
+
+		$results = $this->model_extension_report_marketing->getMarketing($filter_data);
+
+		foreach ($results as $result) {
+			$data['marketings'][] = array(
+				'campaign' => $result['campaign'],
+				'code'     => $result['code'],
+				'clicks'   => $result['clicks'],
+				'orders'   => $result['orders'],
+				'total'    => $this->currency->format($result['total'], $this->config->get('config_currency')),
+				'action'   => $this->url->link('marketing/marketing/edit', 'user_token=' . $this->session->data['user_token'] . '&marketing_id=' . $result['marketing_id'], true)
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$this->load->model('localisation/order_status');
+
+		$data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$url .= '&filter_order_status_id=' . $this->request->get['filter_order_status_id'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $marketing_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=marketing' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($marketing_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($marketing_total - $this->config->get('config_limit_admin'))) ? $marketing_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $marketing_total, ceil($marketing_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_order_status_id'] = $filter_order_status_id;
+
+		return $this->load->view('extension/report/marketing_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/product_purchased.php b/public/admin/controller/extension/report/product_purchased.php
new file mode 100644
index 0000000..405da7d
--- /dev/null
+++ b/public/admin/controller/extension/report/product_purchased.php
@@ -0,0 +1,160 @@
+<?php
+class ControllerExtensionReportProductPurchased extends Controller {
+	public function index() {
+		$this->load->language('extension/report/product_purchased');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_product_purchased', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/product_purchased', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/product_purchased', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_product_purchased_status'])) {
+			$data['report_product_purchased_status'] = $this->request->post['report_product_purchased_status'];
+		} else {
+			$data['report_product_purchased_status'] = $this->config->get('report_product_purchased_status');
+		}
+
+		if (isset($this->request->post['report_product_purchased_sort_order'])) {
+			$data['report_product_purchased_sort_order'] = $this->request->post['report_product_purchased_sort_order'];
+		} else {
+			$data['report_product_purchased_sort_order'] = $this->config->get('report_product_purchased_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/product_purchased_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/product_purchased')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+		
+	public function report() {
+		$this->load->language('extension/report/product_purchased');
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$filter_order_status_id = $this->request->get['filter_order_status_id'];
+		} else {
+			$filter_order_status_id = 0;
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/product');
+
+		$data['products'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	     => $filter_date_start,
+			'filter_date_end'	     => $filter_date_end,
+			'filter_order_status_id' => $filter_order_status_id,
+			'start'                  => ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'                  => $this->config->get('config_limit_admin')
+		);
+
+		$product_total = $this->model_extension_report_product->getTotalPurchased($filter_data);
+
+		$results = $this->model_extension_report_product->getPurchased($filter_data);
+
+		foreach ($results as $result) {
+			$data['products'][] = array(
+				'name'     => $result['name'],
+				'model'    => $result['model'],
+				'quantity' => $result['quantity'],
+				'total'    => $this->currency->format($result['total'], $this->config->get('config_currency'))
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$this->load->model('localisation/order_status');
+
+		$data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$url .= '&filter_order_status_id=' . $this->request->get['filter_order_status_id'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $product_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=product_purchased' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($product_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($product_total - $this->config->get('config_limit_admin'))) ? $product_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $product_total, ceil($product_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_order_status_id'] = $filter_order_status_id;
+
+		return $this->load->view('extension/report/product_purchased_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/product_viewed.php b/public/admin/controller/extension/report/product_viewed.php
new file mode 100644
index 0000000..4afa4fe
--- /dev/null
+++ b/public/admin/controller/extension/report/product_viewed.php
@@ -0,0 +1,149 @@
+<?php
+class ControllerExtensionReportProductViewed extends Controller {
+	public function index() {
+		$this->load->language('extension/report/product_viewed');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_product_viewed', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/product_viewed', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/product_viewed', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_product_viewed_status'])) {
+			$data['report_product_viewed_status'] = $this->request->post['report_product_viewed_status'];
+		} else {
+			$data['report_product_viewed_status'] = $this->config->get('report_product_viewed_status');
+		}
+
+		if (isset($this->request->post['report_product_viewed_sort_order'])) {
+			$data['report_product_viewed_sort_order'] = $this->request->post['report_product_viewed_sort_order'];
+		} else {
+			$data['report_product_viewed_sort_order'] = $this->config->get('report_product_viewed_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/product_viewed_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/product_viewed')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+		
+	public function report() {
+		$this->load->language('extension/report/product_viewed');
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+		
+		$data['reset'] = $this->url->link('extension/report/product_viewed/reset', 'user_token=' . $this->session->data['user_token'] . '&page={page}', true);
+
+		$this->load->model('extension/report/product');
+
+		$filter_data = array(
+			'start' => ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit' => $this->config->get('config_limit_admin')
+		);
+
+		$data['products'] = array();
+
+		$product_viewed_total = $this->model_extension_report_product->getTotalProductViews();
+
+		$product_total = $this->model_extension_report_product->getTotalProductsViewed();
+
+		$results = $this->model_extension_report_product->getProductsViewed($filter_data);
+
+		foreach ($results as $result) {
+			if ($result['viewed']) {
+				$percent = round($result['viewed'] / $product_viewed_total * 100, 2);
+			} else {
+				$percent = 0;
+			}
+
+			$data['products'][] = array(
+				'name'    => $result['name'],
+				'model'   => $result['model'],
+				'viewed'  => $result['viewed'],
+				'percent' => $percent . '%'
+			);
+		}
+		
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$url = '';
+
+		if (isset($this->request->get['page'])) {
+			$url .= '&page=' . $this->request->get['page'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $product_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=product_viewed&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($product_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($product_total - $this->config->get('config_limit_admin'))) ? $product_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $product_total, ceil($product_total / $this->config->get('config_limit_admin')));
+		
+		return $this->load->view('extension/report/product_viewed_info', $data);
+	}
+
+	public function reset() {
+		$this->load->language('extension/report/product_viewed');
+
+		if (!$this->user->hasPermission('modify', 'extension/report/product_viewed')) {
+			$this->session->data['error'] = $this->language->get('error_permission');
+		} else {
+			$this->load->model('extension/report/product');
+
+			$this->model_extension_report_product->reset();
+
+			$this->session->data['success'] = $this->language->get('text_success');
+		}
+
+		$this->response->redirect($this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=product_viewed' . $url, true));
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/sale_coupon.php b/public/admin/controller/extension/report/sale_coupon.php
new file mode 100644
index 0000000..aebab08
--- /dev/null
+++ b/public/admin/controller/extension/report/sale_coupon.php
@@ -0,0 +1,145 @@
+<?php
+class ControllerExtensionReportSaleCoupon extends Controller {
+	public function index() {
+		$this->load->language('extension/report/sale_coupon');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_sale_coupon', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/sale_coupon', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/sale_coupon', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_sale_coupon_status'])) {
+			$data['report_sale_coupon_status'] = $this->request->post['report_sale_coupon_status'];
+		} else {
+			$data['report_sale_coupon_status'] = $this->config->get('report_sale_coupon_status');
+		}
+
+		if (isset($this->request->post['report_sale_coupon_sort_order'])) {
+			$data['report_sale_coupon_sort_order'] = $this->request->post['report_sale_coupon_sort_order'];
+		} else {
+			$data['report_sale_coupon_sort_order'] = $this->config->get('report_sale_coupon_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/sale_coupon_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/sale_coupon')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+		
+	public function report() {
+		$this->load->language('extension/report/sale_coupon');
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/coupon');
+
+		$data['coupons'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	=> $filter_date_start,
+			'filter_date_end'	=> $filter_date_end,
+			'start'             => ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'             => $this->config->get('config_limit_admin')
+		);
+
+		$coupon_total = $this->model_extension_report_coupon->getTotalCoupons($filter_data);
+
+		$results = $this->model_extension_report_coupon->getCoupons($filter_data);
+
+		foreach ($results as $result) {
+			$data['coupons'][] = array(
+				'name'   => $result['name'],
+				'code'   => $result['code'],
+				'orders' => $result['orders'],
+				'total'  => $this->currency->format($result['total'], $this->config->get('config_currency')),
+				'edit'   => $this->url->link('marketing/coupon/edit', 'user_token=' . $this->session->data['user_token'] . '&coupon_id=' . $result['coupon_id'], true)
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $coupon_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=sale_coupon' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($coupon_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($coupon_total - $this->config->get('config_limit_admin'))) ? $coupon_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $coupon_total, ceil($coupon_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+
+		return $this->load->view('extension/report/sale_coupon_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/sale_order.php b/public/admin/controller/extension/report/sale_order.php
new file mode 100644
index 0000000..e718ce8
--- /dev/null
+++ b/public/admin/controller/extension/report/sale_order.php
@@ -0,0 +1,196 @@
+<?php
+class ControllerExtensionReportSaleOrder extends Controller {
+	public function index() {
+		$this->load->language('extension/report/sale_order');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_sale_order', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/sale_order', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/sale_order', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_sale_order_status'])) {
+			$data['report_sale_order_status'] = $this->request->post['report_sale_order_status'];
+		} else {
+			$data['report_sale_order_status'] = $this->config->get('report_sale_order_status');
+		}
+
+		if (isset($this->request->post['report_sale_order_sort_order'])) {
+			$data['report_sale_order_sort_order'] = $this->request->post['report_sale_order_sort_order'];
+		} else {
+			$data['report_sale_order_sort_order'] = $this->config->get('report_sale_order_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/sale_order_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/sale_order')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+		
+	public function report() {
+		$this->load->language('extension/report/sale_order');
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = date('Y-m-d', strtotime(date('Y') . '-' . date('m') . '-01'));
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = date('Y-m-d');
+		}
+
+		if (isset($this->request->get['filter_group'])) {
+			$filter_group = $this->request->get['filter_group'];
+		} else {
+			$filter_group = 'week';
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$filter_order_status_id = $this->request->get['filter_order_status_id'];
+		} else {
+			$filter_order_status_id = 0;
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/sale');
+
+		$data['orders'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	     => $filter_date_start,
+			'filter_date_end'	     => $filter_date_end,
+			'filter_group'           => $filter_group,
+			'filter_order_status_id' => $filter_order_status_id,
+			'start'                  => ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'                  => $this->config->get('config_limit_admin')
+		);
+
+		$order_total = $this->model_extension_report_sale->getTotalOrders($filter_data);
+
+		$results = $this->model_extension_report_sale->getOrders($filter_data);
+
+		foreach ($results as $result) {
+			$data['orders'][] = array(
+				'date_start' => date($this->language->get('date_format_short'), strtotime($result['date_start'])),
+				'date_end'   => date($this->language->get('date_format_short'), strtotime($result['date_end'])),
+				'orders'     => $result['orders'],
+				'products'   => $result['products'],
+				'tax'        => $this->currency->format($result['tax'], $this->config->get('config_currency')),
+				'total'      => $this->currency->format($result['total'], $this->config->get('config_currency'))
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$this->load->model('localisation/order_status');
+
+		$data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();
+
+		$data['groups'] = array();
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_year'),
+			'value' => 'year',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_month'),
+			'value' => 'month',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_week'),
+			'value' => 'week',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_day'),
+			'value' => 'day',
+		);
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_group'])) {
+			$url .= '&filter_group=' . $this->request->get['filter_group'];
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$url .= '&filter_order_status_id=' . $this->request->get['filter_order_status_id'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $order_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=sale_order' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($order_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($order_total - $this->config->get('config_limit_admin'))) ? $order_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $order_total, ceil($order_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_group'] = $filter_group;
+		$data['filter_order_status_id'] = $filter_order_status_id;
+
+		return $this->load->view('extension/report/sale_order_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/sale_return.php b/public/admin/controller/extension/report/sale_return.php
new file mode 100644
index 0000000..85f5767
--- /dev/null
+++ b/public/admin/controller/extension/report/sale_return.php
@@ -0,0 +1,193 @@
+<?php
+class ControllerExtensionReportSaleReturn extends Controller {
+	public function index() {
+		$this->load->language('extension/report/sale_return');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_sale_return', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/sale_return', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/sale_return', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_sale_return_status'])) {
+			$data['report_sale_return_status'] = $this->request->post['report_sale_return_status'];
+		} else {
+			$data['report_sale_return_status'] = $this->config->get('report_sale_return_status');
+		}
+
+		if (isset($this->request->post['report_sale_return_sort_order'])) {
+			$data['report_sale_return_sort_order'] = $this->request->post['report_sale_return_sort_order'];
+		} else {
+			$data['report_sale_return_sort_order'] = $this->config->get('report_sale_return_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/sale_return_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/sale_return')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+	
+	public function report() {
+		$this->load->language('extension/report/sale_return');
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['filter_group'])) {
+			$filter_group = $this->request->get['filter_group'];
+		} else {
+			$filter_group = 'week';
+		}
+
+		if (isset($this->request->get['filter_return_status_id'])) {
+			$filter_return_status_id = $this->request->get['filter_return_status_id'];
+		} else {
+			$filter_return_status_id = 0;
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+		
+		$this->load->model('extension/report/return');
+
+		$data['returns'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	      => $filter_date_start,
+			'filter_date_end'	      => $filter_date_end,
+			'filter_group'            => $filter_group,
+			'filter_return_status_id' => $filter_return_status_id,
+			'start'                   => ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'                   => $this->config->get('config_limit_admin')
+		);
+
+		$return_total = $this->model_extension_report_return->getTotalReturns($filter_data);
+
+		$results = $this->model_extension_report_return->getReturns($filter_data);
+
+		foreach ($results as $result) {
+			$data['returns'][] = array(
+				'date_start' => date($this->language->get('date_format_short'), strtotime($result['date_start'])),
+				'date_end'   => date($this->language->get('date_format_short'), strtotime($result['date_end'])),
+				'returns'    => $result['returns']
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$this->load->model('localisation/return_status');
+
+		$data['return_statuses'] = $this->model_localisation_return_status->getReturnStatuses();
+
+		$data['groups'] = array();
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_year'),
+			'value' => 'year',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_month'),
+			'value' => 'month',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_week'),
+			'value' => 'week',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_day'),
+			'value' => 'day',
+		);
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_group'])) {
+			$url .= '&filter_group=' . $this->request->get['filter_group'];
+		}
+
+		if (isset($this->request->get['filter_return_status_id'])) {
+			$url .= '&filter_return_status_id=' . $this->request->get['filter_return_status_id'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $return_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=sale_return' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($return_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($return_total - $this->config->get('config_limit_admin'))) ? $return_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $return_total, ceil($return_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_group'] = $filter_group;
+		$data['filter_return_status_id'] = $filter_return_status_id;
+		
+		return $this->load->view('extension/report/sale_return_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/sale_shipping.php b/public/admin/controller/extension/report/sale_shipping.php
new file mode 100644
index 0000000..5f56fdc
--- /dev/null
+++ b/public/admin/controller/extension/report/sale_shipping.php
@@ -0,0 +1,195 @@
+<?php
+class ControllerExtensionReportSaleShipping extends Controller {
+	public function index() {
+		$this->load->language('extension/report/sale_shipping');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_sale_shipping', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/sale_shipping', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/sale_shipping', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_sale_shipping_status'])) {
+			$data['report_sale_shipping_status'] = $this->request->post['report_sale_shipping_status'];
+		} else {
+			$data['report_sale_shipping_status'] = $this->config->get('report_sale_shipping_status');
+		}
+
+		if (isset($this->request->post['report_sale_shipping_sort_order'])) {
+			$data['report_sale_shipping_sort_order'] = $this->request->post['report_sale_shipping_sort_order'];
+		} else {
+			$data['report_sale_shipping_sort_order'] = $this->config->get('report_sale_shipping_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/sale_shipping_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/sale_shipping')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+		
+	public function report() {
+		$this->load->language('extension/report/sale_shipping');
+	
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['filter_group'])) {
+			$filter_group = $this->request->get['filter_group'];
+		} else {
+			$filter_group = 'week';
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$filter_order_status_id = $this->request->get['filter_order_status_id'];
+		} else {
+			$filter_order_status_id = 0;
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/sale');
+
+		$data['orders'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	     => $filter_date_start,
+			'filter_date_end'	     => $filter_date_end,
+			'filter_group'           => $filter_group,
+			'filter_order_status_id' => $filter_order_status_id,
+			'start'                  => ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'                  => $this->config->get('config_limit_admin')
+		);
+
+		$order_total = $this->model_extension_report_sale->getTotalShipping($filter_data);
+
+		$results = $this->model_extension_report_sale->getShipping($filter_data);
+
+		foreach ($results as $result) {
+			$data['orders'][] = array(
+				'date_start' => date($this->language->get('date_format_short'), strtotime($result['date_start'])),
+				'date_end'   => date($this->language->get('date_format_short'), strtotime($result['date_end'])),
+				'title'      => $result['title'],
+				'orders'     => $result['orders'],
+				'total'      => $this->currency->format($result['total'], $this->config->get('config_currency'))
+			);
+		}
+		
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$this->load->model('localisation/order_status');
+
+		$data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();
+
+		$data['groups'] = array();
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_year'),
+			'value' => 'year',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_month'),
+			'value' => 'month',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_week'),
+			'value' => 'week',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_day'),
+			'value' => 'day',
+		);
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_group'])) {
+			$url .= '&filter_group=' . $this->request->get['filter_group'];
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$url .= '&filter_order_status_id=' . $this->request->get['filter_order_status_id'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $order_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=sale_shipping' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($order_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($order_total - $this->config->get('config_limit_admin'))) ? $order_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $order_total, ceil($order_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_group'] = $filter_group;
+		$data['filter_order_status_id'] = $filter_order_status_id;
+
+		return $this->load->view('extension/report/sale_shipping_info', $data);
+	}
+}
\ No newline at end of file
diff --git a/public/admin/controller/extension/report/sale_tax.php b/public/admin/controller/extension/report/sale_tax.php
new file mode 100644
index 0000000..d16cdc6
--- /dev/null
+++ b/public/admin/controller/extension/report/sale_tax.php
@@ -0,0 +1,197 @@
+<?php
+class ControllerExtensionReportSaleTax extends Controller {
+	public function index() {
+		$this->load->language('extension/report/sale_tax');
+
+		$this->document->setTitle($this->language->get('heading_title'));
+
+		$this->load->model('setting/setting');
+
+		if (($this->request->server['REQUEST_METHOD'] == 'POST') && $this->validate()) {
+			$this->model_setting_setting->editSetting('report_sale_tax', $this->request->post);
+
+			$this->session->data['success'] = $this->language->get('text_success');
+
+			$this->response->redirect($this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true));
+		}
+
+		if (isset($this->error['warning'])) {
+			$data['error_warning'] = $this->error['warning'];
+		} else {
+			$data['error_warning'] = '';
+		}
+
+		$data['breadcrumbs'] = array();
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_home'),
+			'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('text_extension'),
+			'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true)
+		);
+
+		$data['breadcrumbs'][] = array(
+			'text' => $this->language->get('heading_title'),
+			'href' => $this->url->link('extension/report/sale_tax', 'user_token=' . $this->session->data['user_token'], true)
+		);
+
+		$data['action'] = $this->url->link('extension/report/sale_tax', 'user_token=' . $this->session->data['user_token'], true);
+
+		$data['cancel'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=report', true);
+
+		if (isset($this->request->post['report_sale_tax_status'])) {
+			$data['report_sale_tax_status'] = $this->request->post['report_sale_tax_status'];
+		} else {
+			$data['report_sale_tax_status'] = $this->config->get('report_sale_tax_status');
+		}
+
+		if (isset($this->request->post['report_sale_tax_sort_order'])) {
+			$data['report_sale_tax_sort_order'] = $this->request->post['report_sale_tax_sort_order'];
+		} else {
+			$data['report_sale_tax_sort_order'] = $this->config->get('report_sale_tax_sort_order');
+		}
+
+		$data['header'] = $this->load->controller('common/header');
+		$data['column_left'] = $this->load->controller('common/column_left');
+		$data['footer'] = $this->load->controller('common/footer');
+
+		$this->response->setOutput($this->load->view('extension/report/sale_tax_form', $data));
+	}
+	
+	protected function validate() {
+		if (!$this->user->hasPermission('modify', 'extension/report/sale_tax')) {
+			$this->error['warning'] = $this->language->get('error_permission');
+		}
+
+		return !$this->error;
+	}
+	
+	public function report() {
+		$this->load->language('extension/report/sale_tax');
+		
+		if (isset($this->request->get['filter_date_start'])) {
+			$filter_date_start = $this->request->get['filter_date_start'];
+		} else {
+			$filter_date_start = '';
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$filter_date_end = $this->request->get['filter_date_end'];
+		} else {
+			$filter_date_end = '';
+		}
+
+		if (isset($this->request->get['filter_group'])) {
+			$filter_group = $this->request->get['filter_group'];
+		} else {
+			$filter_group = 'week';
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$filter_order_status_id = $this->request->get['filter_order_status_id'];
+		} else {
+			$filter_order_status_id = 0;
+		}
+
+		if (isset($this->request->get['page'])) {
+			$page = $this->request->get['page'];
+		} else {
+			$page = 1;
+		}
+
+		$this->load->model('extension/report/sale');
+
+		$data['orders'] = array();
+
+		$filter_data = array(
+			'filter_date_start'	     => $filter_date_start,
+			'filter_date_end'	     => $filter_date_end,
+			'filter_group'           => $filter_group,
+			'filter_order_status_id' => $filter_order_status_id,
+			'start'                  => ($page - 1) * $this->config->get('config_limit_admin'),
+			'limit'                  => $this->config->get('config_limit_admin')
+		);
+
+		$order_total = $this->model_extension_report_sale->getTotalTaxes($filter_data);
+
+		$data['orders'] = array();
+
+		$results = $this->model_extension_report_sale->getTaxes($filter_data);
+
+		foreach ($results as $result) {
+			$data['orders'][] = array(
+				'date_start' => date($this->language->get('date_format_short'), strtotime($result['date_start'])),
+				'date_end'   => date($this->language->get('date_format_short'), strtotime($result['date_end'])),
+				'title'      => $result['title'],
+				'orders'     => $result['orders'],
+				'total'      => $this->currency->format($result['total'], $this->config->get('config_currency'))
+			);
+		}
+
+		$data['user_token'] = $this->session->data['user_token'];
+
+		$this->load->model('localisation/order_status');
+
+		$data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();
+
+		$data['groups'] = array();
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_year'),
+			'value' => 'year',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_month'),
+			'value' => 'month',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_week'),
+			'value' => 'week',
+		);
+
+		$data['groups'][] = array(
+			'text'  => $this->language->get('text_day'),
+			'value' => 'day',
+		);
+
+		$url = '';
+
+		if (isset($this->request->get['filter_date_start'])) {
+			$url .= '&filter_date_start=' . $this->request->get['filter_date_start'];
+		}
+
+		if (isset($this->request->get['filter_date_end'])) {
+			$url .= '&filter_date_end=' . $this->request->get['filter_date_end'];
+		}
+
+		if (isset($this->request->get['filter_group'])) {
+			$url .= '&filter_group=' . $this->request->get['filter_group'];
+		}
+
+		if (isset($this->request->get['filter_order_status_id'])) {
+			$url .= '&filter_order_status_id=' . $this->request->get['filter_order_status_id'];
+		}
+
+		$pagination = new Pagination();
+		$pagination->total = $order_total;
+		$pagination->page = $page;
+		$pagination->limit = $this->config->get('config_limit_admin');
+		$pagination->url = $this->url->link('report/report', 'user_token=' . $this->session->data['user_token'] . '&code=sale_tax' . $url . '&page={page}', true);
+
+		$data['pagination'] = $pagination->render();
+
+		$data['results'] = sprintf($this->language->get('text_pagination'), ($order_total) ? (($page - 1) * $this->config->get('config_limit_admin')) + 1 : 0, ((($page - 1) * $this->config->get('config_limit_admin')) > ($order_total - $this->config->get('config_limit_admin'))) ? $order_total : ((($page - 1) * $this->config->get('config_limit_admin')) + $this->config->get('config_limit_admin')), $order_total, ceil($order_total / $this->config->get('config_limit_admin')));
+
+		$data['filter_date_start'] = $filter_date_start;
+		$data['filter_date_end'] = $filter_date_end;
+		$data['filter_group'] = $filter_group;
+		$data['filter_order_status_id'] = $filter_order_status_id;
+
+		return $this->load->view('extension/report/sale_tax_info', $data);
+	}
+}
\ No newline at end of file