afwollis

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

======= ДЕЛАЕМ РЕЗЕРВНЫЕ КОПИИ ФАЙЛОВ МАГАЗИНА И БАЗЫ ДАННЫХ =======

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

ЗАХОДИМ В === PHPMYADMIN ===

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

Выполняем такие запросы:

ALTER TABLE `ВАШ_ПРЕФИКС_order` ADD `total_purchase` decimal( 15, 4 ) NOT NULL default '0.0000' AFTER `total`;


ALTER TABLE `ВАШ_ПРЕФИКС_order_product` ADD `price_purchase` decimal( 15, 4 ) NOT NULL default '0.0000' AFTER `total` ;
ALTER TABLE `ВАШ_ПРЕФИКС_order_product` ADD `total_purchase` decimal( 15, 4 ) NOT NULL default '0.0000' AFTER `price_purchase` ;


UPDATE `ВАШ_ПРЕФИКС_order_product` op SET op.price_purchase = (SELECT `cost` FROM `ВАШ_ПРЕФИКС_product` p WHERE p.product_id=op.product_id);
UPDATE `ВАШ_ПРЕФИКС_order_product` op SET op.total_purchase = ((SELECT `cost` FROM `ВАШ_ПРЕФИКС_product` p WHERE p.product_id=op.product_id)*op.quantity);


UPDATE `ВАШ_ПРЕФИКС_order` o SET o.`total_purchase` = (SELECT SUM(op.`total_purchase`) as o_tp FROM `ВАШ_ПРЕФИКС_order_product` op WHERE op.`order_id`=o.`order_id`);

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

ЗАХОДИМ В ПАПКУ ADMIN

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

================ [ admin/language/LANG/report/sale.php ] ================

add

$_['column_total_purchase']      = 'Total Purchase';
$_['column_profit_diff']      = 'Profit Diff';

after

$_['column_total']      = 'Total';

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

================ [ admin/view/template/report/sale.tpl ] ================

После

<td class="right"><?php echo $column_total; ?></td>

Добавляем

<td class="right"><?php echo $column_total_purchase; ?></td>
	<td class="right"><?php echo $column_profit_diff; ?></td>

После

<td class="right"><?php echo $order['total']; ?></td>

Добавляем

<td class="right"><?php echo $order['total_purchase']; ?></td>
	<td class="right"><?php echo $order['profit']; ?></td>

Ниже в коде

<td class="center" colspan="4"><?php echo $text_no_results; ?></td>

Меняем 4 на 6.

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

================ [ admin/controller/report/sale.php ] ================

Находим

$results = $this->model_report_sale->getSaleReport($data);
		
		foreach ($results as $result) {
			$this->data['orders'][] = array(

После

'total'      => $this->currency->format($result['total'], $this->config->get('config_currency'))

Добавляем

,
	'total_purchase'      => $this->currency->format($result['total_purchase'], $this->config->get('config_currency')),
	'profit'      => $this->currency->format($result['profit'], $this->config->get('config_currency'))

*****************************

После

$this->data['column_total'] = $this->language->get('column_total');

Добавляем

$this->data['column_total_purchase'] = $this->language->get('column_total_purchase');
	$this->data['column_profit_diff'] = $this->language->get('column_profit_diff');

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

================ [ admin/model/report/sale.php ] ================

public function getSaleReport($data = array()) {

в переменную $sql

После

SUM(total) AS total

Добавляем

, SUM(total_purchase) AS total_purchase, (SUM( total ) - SUM( total_purchase )) AS profit

Должно получиться так:

$sql = "SELECT MIN(date_added) AS date_start, MAX(date_added) AS date_end, COUNT(*) AS orders, SUM(total) AS total, SUM(total_purchase) AS total_purchase, (SUM( total ) - SUM( total_purchase )) AS profit FROM `" . DB_PREFIX . "order`";

*****************************

public function getSaleReportTotal($data = array()) {

в переменную $sql

После

SUM(total) AS total

Добавляем

, SUM(total_purchase) AS total_purchase, (SUM( total ) - SUM( total_purchase )) AS profit

Должно получиться так:

$sql = "SELECT MIN(date_added) AS date_start, MAX(date_added) AS date_end, COUNT(*) AS orders, SUM(total) AS total, SUM(total_purchase) AS total_purchase, (SUM( total ) - SUM( total_purchase )) AS profit FROM `" . DB_PREFIX . "order` WHERE order_status_id > '0'";

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

ПЕРЕХОДИМ В CATALOG

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

================ [ catalog/model/checkout/order.php ] ================

public function create($data) {

После

foreach ($query->rows as $result) {
			$this->db->query("DELETE FROM `" . DB_PREFIX . "order` WHERE order_id = '" . (int)$result['order_id'] . "'");
			$this->db->query("DELETE FROM " . DB_PREFIX . "order_history WHERE order_id = '" . (int)$result['order_id'] . "'");
			$this->db->query("DELETE FROM " . DB_PREFIX . "order_product WHERE order_id = '" . (int)$result['order_id'] . "'");
			$this->db->query("DELETE FROM " . DB_PREFIX . "order_option WHERE order_id = '" . (int)$result['order_id'] . "'");
			$this->db->query("DELETE FROM " . DB_PREFIX . "order_download WHERE order_id = '" . (int)$result['order_id'] . "'");
			$this->db->query("DELETE FROM " . DB_PREFIX . "order_total WHERE order_id = '" . (int)$result['order_id'] . "'");
		}

Находим запрос, который начинается

$this->db->query("INSERT INTO `" . DB_PREFIX . "order`

Находим в нем

total = '" . (float)$data['total'] . "',

Добавляем

total_purchase = '" . (float)$data['total_purchase'] . "',

******************

Находим такой участок кода

$order_id = $this->db->getLastId();
	
	foreach ($data['products'] as $product) {
			$this->db->query("INSERT INTO " . DB_PREFIX . "order_product

В запрос

$this->db->query("INSERT INTO " . DB_PREFIX . "order_product

После

total = '" . (float)$product['total'] . "',

Добавляем

price_purchase = '" . (float)$product['price_purchase'] . "', total_purchase = '" . (float)$product['total_purchase'] . "',

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

================ [ catalog/controller/checkout/confirm.php ] ================

После

$total_data = array();
	$total = 0;

Добавляем

$total_purchase = 0;

Находим такой участок кода (примерно 160-ая строка)

$product_data = array();
	
		foreach ($this->cart->getProducts() as $product) {
			$option_data = array();
			
			foreach ($product['option'] as $option) {
				$option_data[] = array(
					'product_option_value_id' => $option['product_option_value_id'],
					'name'                    => $option['name'],
					'value'                   => $option['value'],
					'prefix'                  => $option['prefix']
				);
			}
			
			$product_data[] = array(
				'product_id' => $product['product_id'],

После

'price'      => $product['price'],
				'total'      => $product['total'],

Добавляем

'price_purchase'      => $product['price_purchase'],
				'total_purchase'      => $product['total_purchase'],

Ниже, после

$data['total'] = $total;

Добавляем

		foreach($product_data as $pos => $prod) {
			$total_purchase += $prod['total_purchase'];
		}
		
		$data['total_purchase'] = $total_purchase;

***********************************

Идем ниже.

Ищем такой участок кода:

$this->data['products'] = array();
		
		foreach ($this->cart->getProducts() as $product) {
			$option_data = array();
			
			foreach ($product['option'] as $option) {
				$option_data[] = array(
					'name'  => $option['name'],
					'value' => $option['value']
				);
			}
			
			$this->data['products'][] = array(
				'product_id' => $product['product_id'],

В

$this->data['products'][] = array(

После

'total'      => $this->currency->format($product['total']),

Добавляем

'price_purchase'      => $product['price_purchase'],
				'total_purchase'      => $product['total_purchase'],

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

================ [ catalog/controller/checkout/guest_step_3.php ] ================

После

$total_data = array();
	$total = 0;

Добавляем

$total_purchase = 0;

Находим такой участок кода (примерно 160-ая строка)

$product_data = array();
	
		foreach ($this->cart->getProducts() as $product) {
			$option_data = array();
			
			foreach ($product['option'] as $option) {
				$option_data[] = array(
					'product_option_value_id' => $option['product_option_value_id'],
					'name'                    => $option['name'],
					'value'                   => $option['value'],
					'prefix'                  => $option['prefix']
				);
			}
			
			$product_data[] = array(
				'product_id' => $product['product_id'],

После

'price'      => $product['price'],
				'total'      => $product['total'],

Добавляем

'price_purchase'      => $product['price_purchase'],
				'total_purchase'      => $product['total_purchase'],

Ниже, после

$data['total'] = $total;

Добавляем

		foreach($product_data as $pos => $prod) {
			$total_purchase += $prod['total_purchase'];
		}
		
		$data['total_purchase'] = $total_purchase;

***********************************

Идем ниже.

Ищем такой участок кода:

$this->data['products'] = array();
		
		foreach ($this->cart->getProducts() as $product) {
			$option_data = array();
			
			foreach ($product['option'] as $option) {
				$option_data[] = array(
					'name'  => $option['name'],
					'value' => $option['value']
				);
			}
			
			$this->data['products'][] = array(
				'product_id' => $product['product_id'],

В

$this->data['products'][] = array(

После

'total'      => $this->currency->format($product['total']),

Добавляем

'price_purchase'      => $product['price_purchase'],
				'total_purchase'      => $product['total_purchase'],

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

ПЕРЕХОДИМ В ========= SYSTEM / LIBRARY

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

================ [ system/library/cart.php ] ================

public function getProducts() {

ищем такой участок кода (примерно со 105-ой строки)

if (!$product_query->row['quantity'] || ($product_query->row['quantity'] < $quantity)) {
					$stock = FALSE;
				}
				
				$product_data[$key] = array(

В

$product_data[$key] = array(

После

'price'        => ($price + $option_price),
					'total'        => ($price + $option_price) * $quantity,

Добавляем

'price_purchase'        => ($product_query->row['cost']),
					'total_purchase'        => ($product_query->row['cost']) * $quantity,