Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#13749 issues - Customer view order history error #13862

Closed
wants to merge 3 commits into from
Closed

#13749 issues - Customer view order history error #13862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c33efc6
first try to resolve issue #13749 - error on view order history
TheoDelaporte Apr 19, 2024
71a0d3f
fix getOrder
TheoDelaporte Apr 19, 2024
6570b7f
fix getorder from account model
TheoDelaporte Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
90 changes: 46 additions & 44 deletions upload/admin/model/sale/order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,72 +14,74 @@ class Order extends \Opencart\System\Engine\Model {
* @return array<string, mixed>
*/
public function getOrder(int $order_id): array {
$order_query = $this->db->query("SELECT *, (SELECT `os`.`name` FROM `" . DB_PREFIX . "order_status` `os` WHERE `os`.`order_status_id` = `o`.`order_status_id` AND `os`.`language_id` = '" . (int)$this->config->get('config_language_id') . "') AS `order_status` FROM `" . DB_PREFIX . "order` `o` WHERE `o`.`order_id` = '" . (int)$order_id . "'");
$query = "
SELECT
*,
(SELECT `os`.`name` FROM `" . DB_PREFIX . "order_status` `os` WHERE `os`.`order_status_id` = `o`.`order_status_id` AND `os`.`language_id` = '" . (int)$this->config->get('config_language_id') . "') AS `order_status`
FROM `" . DB_PREFIX . "order` `o`
WHERE `o`.`order_id` = '" . (int)$order_id . "'
";

if ($order_query->num_rows) {
$country_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE `country_id` = '" . (int)$order_query->row['payment_country_id'] . "'");
$order_query = $this->db->query($query);

if (!$order_query->num_rows) {
return [];
}

$order_row = $order_query->row;

$payment_iso_code_2 = '';
$payment_iso_code_3 = '';
$payment_zone_code = '';

$shipping_iso_code_2 = '';
$shipping_iso_code_3 = '';
$shipping_zone_code = '';

$reward = 0;

if ($order_row['payment_country_id']) {
$country_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE `country_id` = '" . (int)$order_row['payment_country_id'] . "'");
if ($country_query->num_rows) {
$payment_iso_code_2 = $country_query->row['iso_code_2'];
$payment_iso_code_3 = $country_query->row['iso_code_3'];
} else {
$payment_iso_code_2 = '';
$payment_iso_code_3 = '';
}
}

$zone_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE `zone_id` = '" . (int)$order_query->row['payment_zone_id'] . "'");

if ($order_row['payment_zone_id']) {
$zone_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE `zone_id` = '" . (int)$order_row['payment_zone_id'] . "'");
if ($zone_query->num_rows) {
$payment_zone_code = $zone_query->row['code'];
} else {
$payment_zone_code = '';
}
}

$country_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE `country_id` = '" . (int)$order_query->row['shipping_country_id'] . "'");

if ($order_row['shipping_country_id']) {
$country_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE `country_id` = '" . (int)$order_row['shipping_country_id'] . "'");
if ($country_query->num_rows) {
$shipping_iso_code_2 = $country_query->row['iso_code_2'];
$shipping_iso_code_3 = $country_query->row['iso_code_3'];
} else {
$shipping_iso_code_2 = '';
$shipping_iso_code_3 = '';
}
}

$zone_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE `zone_id` = '" . (int)$order_query->row['shipping_zone_id'] . "'");

if ($order_row['shipping_zone_id']) {
$zone_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE `zone_id` = '" . (int)$order_row['shipping_zone_id'] . "'");
if ($zone_query->num_rows) {
$shipping_zone_code = $zone_query->row['code'];
} else {
$shipping_zone_code = '';
}

$reward = 0;

$order_product_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "order_product` WHERE `order_id` = '" . (int)$order_id . "'");

foreach ($order_product_query->rows as $product) {
$reward += $product['reward'];
}

$this->load->model('customer/customer');

$affiliate_info = $this->model_customer_customer->getCustomer($order_query->row['affiliate_id']);

if ($affiliate_info) {
$affiliate = $affiliate_info['firstname'] . ' ' . $affiliate_info['lastname'];
} else {
$affiliate = '';
}
}

$this->load->model('localisation/language');
$order_product_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "order_product` WHERE `order_id` = '" . (int)$order_id . "'");
foreach ($order_product_query->rows as $product) {
$reward += $product['reward'];
}

$language_info = $this->model_localisation_language->getLanguage($order_query->row['language_id']);
$this->load->model('customer/customer');
$affiliate_info = $this->model_customer_customer->getCustomer($order_row['affiliate_id']);
$affiliate = $affiliate_info ? $affiliate_info['firstname'] . ' ' . $affiliate_info['lastname'] : '';

if ($language_info) {
$language_code = $language_info['code'];
} else {
$language_code = $this->config->get('config_language');
}
$this->load->model('localisation/language');
$language_info = $this->model_localisation_language->getLanguage($order_row['language_id']);
$language_code = $language_info ? $language_info['code'] : $this->config->get('config_language');

return [
'order_id' => $order_query->row['order_id'],
Expand Down
171 changes: 94 additions & 77 deletions upload/catalog/model/account/order.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,105 +14,122 @@ class Order extends \Opencart\System\Engine\Model {
* @return array<string, mixed>
*/
public function getOrder(int $order_id): array {
$order_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "order` WHERE `order_id` = '" . (int)$order_id . "' AND `customer_id` = '" . (int)$this->customer->getId() . "' AND `customer_id` != '0' AND `order_status_id` > '0'");
$query = "
SELECT
*,
(SELECT `os`.`name` FROM `" . DB_PREFIX . "order_status` `os` WHERE `os`.`order_status_id` = `o`.`order_status_id` AND `os`.`language_id` = '" . (int)$this->config->get('config_language_id') . "') AS `order_status`
FROM `" . DB_PREFIX . "order` `o`
WHERE
`o`.`order_id` = '" . (int)$order_id . "'
AND `o`.`customer_id` = '" . (int)$this->customer->getId() . "'
AND `o`.`customer_id` != '0'
AND `o`.`order_status_id` > '0'
";

$order_query = $this->db->query($query);

if (!$order_query->num_rows) {
return [];
}

$order_row = $order_query->row;

$payment_iso_code_2 = '';
$payment_iso_code_3 = '';
$payment_zone_code = '';

if ($order_query->num_rows) {
$country_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE `country_id` = '" . (int)$order_query->row['payment_country_id'] . "'");
$shipping_iso_code_2 = '';
$shipping_iso_code_3 = '';
$shipping_zone_code = '';

if ($order_row['payment_country_id']) {
$country_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE `country_id` = '" . (int)$order_row['payment_country_id'] . "'");
if ($country_query->num_rows) {
$payment_iso_code_2 = $country_query->row['iso_code_2'];
$payment_iso_code_3 = $country_query->row['iso_code_3'];
} else {
$payment_iso_code_2 = '';
$payment_iso_code_3 = '';
}
}

$zone_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE `zone_id` = '" . (int)$order_query->row['payment_zone_id'] . "'");

if ($order_row['payment_zone_id']) {
$zone_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE `zone_id` = '" . (int)$order_row['payment_zone_id'] . "'");
if ($zone_query->num_rows) {
$payment_zone_code = $zone_query->row['code'];
} else {
$payment_zone_code = '';
}
}

$country_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE country_id = '" . (int)$order_query->row['shipping_country_id'] . "'");

if ($order_row['shipping_country_id']) {
$country_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "country` WHERE `country_id` = '" . (int)$order_row['shipping_country_id'] . "'");
if ($country_query->num_rows) {
$shipping_iso_code_2 = $country_query->row['iso_code_2'];
$shipping_iso_code_3 = $country_query->row['iso_code_3'];
} else {
$shipping_iso_code_2 = '';
$shipping_iso_code_3 = '';
}
}

$zone_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE `zone_id` = '" . (int)$order_query->row['shipping_zone_id'] . "'");

if ($order_row['shipping_zone_id']) {
$zone_query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "zone` WHERE `zone_id` = '" . (int)$order_row['shipping_zone_id'] . "'");
if ($zone_query->num_rows) {
$shipping_zone_code = $zone_query->row['code'];
} else {
$shipping_zone_code = '';
}

return [
'order_id' => $order_query->row['order_id'],
'invoice_no' => $order_query->row['invoice_no'],
'invoice_prefix' => $order_query->row['invoice_prefix'],
'store_id' => $order_query->row['store_id'],
'store_name' => $order_query->row['store_name'],
'store_url' => $order_query->row['store_url'],
'customer_id' => $order_query->row['customer_id'],
'firstname' => $order_query->row['firstname'],
'lastname' => $order_query->row['lastname'],
'telephone' => $order_query->row['telephone'],
'email' => $order_query->row['email'],
'payment_firstname' => $order_query->row['payment_firstname'],
'payment_lastname' => $order_query->row['payment_lastname'],
'payment_company' => $order_query->row['payment_company'],
'payment_address_1' => $order_query->row['payment_address_1'],
'payment_address_2' => $order_query->row['payment_address_2'],
'payment_postcode' => $order_query->row['payment_postcode'],
'payment_city' => $order_query->row['payment_city'],
'payment_zone_id' => $order_query->row['payment_zone_id'],
'payment_zone' => $order_query->row['payment_zone'],
'payment_zone_code' => $payment_zone_code,
'payment_country_id' => $order_query->row['payment_country_id'],
'payment_country' => $order_query->row['payment_country'],
'payment_iso_code_2' => $payment_iso_code_2,
'payment_iso_code_3' => $payment_iso_code_3,
'payment_address_format' => $order_query->row['payment_address_format'],
'payment_method' => $order_query->row['payment_method'] ? json_decode($order_query->row['payment_method'], true) : '',
'shipping_firstname' => $order_query->row['shipping_firstname'],
'shipping_lastname' => $order_query->row['shipping_lastname'],
'shipping_company' => $order_query->row['shipping_company'],
'shipping_address_1' => $order_query->row['shipping_address_1'],
'shipping_address_2' => $order_query->row['shipping_address_2'],
'shipping_postcode' => $order_query->row['shipping_postcode'],
'shipping_city' => $order_query->row['shipping_city'],
'shipping_zone_id' => $order_query->row['shipping_zone_id'],
'shipping_zone' => $order_query->row['shipping_zone'],
'shipping_zone_code' => $shipping_zone_code,
'shipping_country_id' => $order_query->row['shipping_country_id'],
'shipping_country' => $order_query->row['shipping_country'],
'shipping_iso_code_2' => $shipping_iso_code_2,
'shipping_iso_code_3' => $shipping_iso_code_3,
'shipping_address_format' => $order_query->row['shipping_address_format'],
'shipping_method' => $order_query->row['shipping_method'] ? json_decode($order_query->row['shipping_method'], true) : '',
'comment' => $order_query->row['comment'],
'total' => $order_query->row['total'],
'order_status_id' => $order_query->row['order_status_id'],
'language_id' => $order_query->row['language_id'],
'currency_id' => $order_query->row['currency_id'],
'currency_code' => $order_query->row['currency_code'],
'currency_value' => $order_query->row['currency_value'],
'date_modified' => $order_query->row['date_modified'],
'date_added' => $order_query->row['date_added'],
'ip' => $order_query->row['ip']
];
} else {
return [];
}

return [
'order_id' => $order_row['order_id'],
'invoice_no' => $order_row['invoice_no'],
'invoice_prefix' => $order_row['invoice_prefix'],
'store_id' => $order_row['store_id'],
'store_name' => $order_row['store_name'],
'store_url' => $order_row['store_url'],
'customer_id' => $order_row['customer_id'],
'firstname' => $order_row['firstname'],
'lastname' => $order_row['lastname'],
'telephone' => $order_row['telephone'],
'email' => $order_row['email'],
'payment_firstname' => $order_row['payment_firstname'],
'payment_lastname' => $order_row['payment_lastname'],
'payment_company' => $order_row['payment_company'],
'payment_address_1' => $order_row['payment_address_1'],
'payment_address_2' => $order_row['payment_address_2'],
'payment_postcode' => $order_row['payment_postcode'],
'payment_city' => $order_row['payment_city'],
'payment_zone_id' => $order_row['payment_zone_id'],
'payment_zone' => $order_row['payment_zone'],
'payment_zone_code' => $payment_zone_code,
'payment_country_id' => $order_row['payment_country_id'],
'payment_country' => $order_row['payment_country'],
'payment_iso_code_2' => $payment_iso_code_2,
'payment_iso_code_3' => $payment_iso_code_3,
'payment_address_format' => $order_row['payment_address_format'],
'payment_method' => $order_row['payment_method'] ? json_decode($order_row['payment_method'], true) : '',
'shipping_firstname' => $order_row['shipping_firstname'],
'shipping_lastname' => $order_row['shipping_lastname'],
'shipping_company' => $order_row['shipping_company'],
'shipping_address_1' => $order_row['shipping_address_1'],
'shipping_address_2' => $order_row['shipping_address_2'],
'shipping_postcode' => $order_row['shipping_postcode'],
'shipping_city' => $order_row['shipping_city'],
'shipping_zone_id' => $order_row['shipping_zone_id'],
'shipping_zone' => $order_row['shipping_zone'],
'shipping_zone_code' => $shipping_zone_code,
'shipping_country_id' => $order_row['shipping_country_id'],
'shipping_country' => $order_row['shipping_country'],
'shipping_iso_code_2' => $shipping_iso_code_2,
'shipping_iso_code_3' => $shipping_iso_code_3,
'shipping_address_format' => $order_row['shipping_address_format'],
'shipping_method' => $order_row['shipping_method'] ? json_decode($order_row['shipping_method'], true) : '',
'comment' => $order_row['comment'],
'total' => $order_row['total'],
'order_status_id' => $order_row['order_status_id'],
'language_id' => $order_row['language_id'],
'currency_id' => $order_row['currency_id'],
'currency_code' => $order_row['currency_code'],
'currency_value' => $order_row['currency_value'],
'date_modified' => $order_row['date_modified'],
'date_added' => $order_row['date_added'],
'ip' => $order_row['ip']
];
}


/**
* Get Orders
*
Expand Down