OpenCartModules/hutko_v4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix payload rendering

Browse Source
This commit is contained in:
O K
2025-12-14 15:21:47 +02:00
parent d9f349db3b
commit 6f9c749dcd
1 changed files with 62 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
admin/controller/payment/hutko.php
View File

@@ -92,55 +92,40 @@ class Hutko extends \Opencart\System\Engine\Controller {
public function install(): void { public function install(): void {
$this->load->model('extension/hutko/payment/hutko'); $this->load->model('extension/hutko/payment/hutko');
$this->model_extension_hutko_payment_hutko->install(); $this->model_extension_hutko_payment_hutko->install();
// No event registration needed - we use the native 'order()' method now
$this->load->model('setting/event');
$this->model_setting_event->deleteEventByCode('hutko_order_info');
// COMPATIBILITY FIX: Check version strictly for Event Registration
if (version_compare(VERSION, '4.0.2.0', '>=')) {
$event_data = [
'code' => 'hutko_order_info',
'description' => 'Hutko Payment Info Panel',
'trigger' => 'admin/view/sale/order_info/after',
'action' => 'extension/hutko/payment/hutko.order_info',
'status' => 1,
'sort_order' => 1
];
$this->model_setting_event->addEvent($event_data);
} else {
$this->model_setting_event->addEvent('hutko_order_info', 'admin/view/sale/order_info/after', 'extension/hutko/payment/hutko.order_info', 1, 1);
}
} }
public function uninstall(): void { public function uninstall(): void {
$this->load->model('setting/event'); $this->load->model('setting/event');
$this->model_setting_event->deleteEventByCode('hutko_order_info'); $this->model_setting_event->deleteEventByCode('hutko_order_info'); // Cleanup old events if any
} }
/** /**
* Event Handler to inject Hutko Panel into Order Info * Native OpenCart Order Info hook.
* OC4 calls this method automatically if the payment method is 'hutko'.
* It renders the content into a Tab in the Order Info page.
*/ */
public function order_info(string &$route, array &$args, string &$output): void { public function order(): string {
$order_id = isset($args['order_id']) ? (int)$args['order_id'] : 0;
if (!$order_id) return;
$this->load->model('sale/order');
$order_info = $this->model_sale_order->getOrder($order_id);
// Check if payment method is Hutko
if ($order_info && isset($order_info['payment_code']) &&
($order_info['payment_code'] == 'hutko' || $order_info['payment_code'] == 'hutko.hutko')) {
$this->load->language('extension/hutko/payment/hutko'); $this->load->language('extension/hutko/payment/hutko');
$this->load->model('extension/hutko/payment/hutko');
// In OC4, load->controller calls for order info don't always pass arguments,
// so we rely on the global request
$order_id = isset($this->request->get['order_id']) ? (int)$this->request->get['order_id'] : 0;
if (!$order_id) return '';
$this->load->model('extension/hutko/payment/hutko');
$transactions = $this->model_extension_hutko_payment_hutko->getTransactions($order_id); $transactions = $this->model_extension_hutko_payment_hutko->getTransactions($order_id);
$data['transactions'] = []; $data['transactions'] = [];
foreach ($transactions as $t) { foreach ($transactions as $t) {
$payload_arr = json_decode($t['payload'], true); $payload_arr = json_decode($t['payload'], true);
$pretty_payload = $payload_arr ? json_encode($payload_arr, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) : $t['payload']; if (isset($payload_arr['request_data']['reservation_data'])) {
$inner = json_decode(base64_decode($payload_arr['request_data']['reservation_data']), true);
if ($inner) $payload_arr['request_data']['reservation_data'] = $inner;
}
// FIX: Pretty print with unescaped characters for better readability
$pretty_payload = $payload_arr ? json_encode($payload_arr, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) : $t['payload'];
$data['transactions'][] = [ $data['transactions'][] = [
'date' => date($this->language->get('datetime_format'), strtotime($t['date_added'])), 'date' => date($this->language->get('datetime_format'), strtotime($t['date_added'])),
'ref' => $t['hutko_ref'], 'ref' => $t['hutko_ref'],
@@ -155,9 +140,9 @@ class Hutko extends \Opencart\System\Engine\Controller {
$data['order_id'] = $order_id; $data['order_id'] = $order_id;
$data['user_token'] = $this->session->data['user_token']; $data['user_token'] = $this->session->data['user_token'];
$data['refund_url'] = $this->url->link('extension/hutko/payment/hutko.refund', 'user_token=' . $this->session->data['user_token'] . '&order_id=' . $order_id); $data['refund_url'] = $this->url->link('extension/hutko/payment/hutko.refund', 'user_token=' . $this->session->data['user_token'] . '&order_id=' . $order_id, true);
$data['status_url'] = $this->url->link('extension/hutko/payment/hutko.status', 'user_token=' . $this->session->data['user_token']); $data['status_url'] = $this->url->link('extension/hutko/payment/hutko.status', 'user_token=' . $this->session->data['user_token'], true);
$data['create_link_url'] = $this->url->link('extension/hutko/payment/hutko.create_payment_link', 'user_token=' . $this->session->data['user_token'] . '&order_id=' . $order_id); $data['create_link_url'] = $this->url->link('extension/hutko/payment/hutko.create_payment_link', 'user_token=' . $this->session->data['user_token'] . '&order_id=' . $order_id, true);
$data['text_payment_information'] = $this->language->get('text_payment_information'); $data['text_payment_information'] = $this->language->get('text_payment_information');
$data['text_hutko_refund_title'] = $this->language->get('text_hutko_refund_title'); $data['text_hutko_refund_title'] = $this->language->get('text_hutko_refund_title');
@@ -172,15 +157,10 @@ class Hutko extends \Opencart\System\Engine\Controller {
$data['text_create_link_info'] = 'Create a new payment link using current order totals.'; $data['text_create_link_info'] = 'Create a new payment link using current order totals.';
$panel_html = $this->load->view('extension/hutko/payment/hutko_order_info_panel', $data); return $this->load->view('extension/hutko/payment/hutko_order_info_panel', $data);
// FIX: Simply append the panel to the end of the output.
// This avoids regex failures if the 'history' ID is nested or named differently in themes.
$output .= $panel_html;
}
} }
public function create_payment_link(): void { public function create_payment_link(): void {
$this->load->language('extension/hutko/payment/hutko'); $this->load->language('extension/hutko/payment/hutko');
$this->load->model('extension/hutko/payment/hutko'); $this->load->model('extension/hutko/payment/hutko');
$this->load->model('sale/order'); $this->load->model('sale/order');
@@ -190,9 +170,8 @@ class Hutko extends \Opencart\System\Engine\Controller {
$order_info = $this->model_sale_order->getOrder($order_id); $order_info = $this->model_sale_order->getOrder($order_id);
if ($order_info) { if ($order_info) {
$hutko_ref = $order_id . '#ADM' . time(); // Admin unique ref $hutko_ref = $order_id . '#ADM' . time();
// Call Shared Logic
$request_data = $this->buildRequest($order_info, $hutko_ref); $request_data = $this->buildRequest($order_info, $hutko_ref);
if (!$request_data) { if (!$request_data) {
@@ -217,6 +196,13 @@ class Hutko extends \Opencart\System\Engine\Controller {
] ]
); );
if ((int)$order_info['order_status_id'] == 0) {
$new_status_id = (int)$this->config->get('payment_hutko_new_order_status_id');
if ($new_status_id <= 0) $new_status_id = 1; // Default to Pending
$this->model_extension_hutko_payment_hutko->addOrderHistory($order_id, $new_status_id, 'Payment Link Created (Admin)', false);
}
$json['success'] = 'Payment Link Created Successfully'; $json['success'] = 'Payment Link Created Successfully';
$json['url'] = $url; $json['url'] = $url;
} else { } else {