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

fixes

Browse Source
This commit is contained in:
O K
2025-12-12 10:46:12 +02:00
parent b1b2ef5949
commit 59d2ce3cd1
6 changed files with 386 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
llmdumper.php
.llmdump

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

@@ -7,7 +7,6 @@ class Hutko extends \Opencart\System\Engine\Controller {
public function index(): void { public function index(): void {
$this->load->language('extension/hutko/payment/hutko'); $this->load->language('extension/hutko/payment/hutko');
$this->document->setTitle($this->language->get('heading_title')); $this->document->setTitle($this->language->get('heading_title'));
$data['breadcrumbs'] = []; $data['breadcrumbs'] = [];
@@ -24,28 +23,16 @@ class Hutko extends \Opencart\System\Engine\Controller {
'href' => $this->url->link('extension/hutko/payment/hutko', 'user_token=' . $this->session->data['user_token']) 'href' => $this->url->link('extension/hutko/payment/hutko', 'user_token=' . $this->session->data['user_token'])
]; ];
// Save action
$data['save'] = $this->url->link('extension/hutko/payment/hutko.save', 'user_token=' . $this->session->data['user_token']); $data['save'] = $this->url->link('extension/hutko/payment/hutko.save', 'user_token=' . $this->session->data['user_token']);
$data['back'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=payment'); $data['back'] = $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=payment');
// Configuration Fields // Config fields
$fields = [ $fields = [
'payment_hutko_merchant_id', 'payment_hutko_merchant_id', 'payment_hutko_secret_key', 'payment_hutko_shipping_include',
'payment_hutko_secret_key', 'payment_hutko_shipping_product_name', 'payment_hutko_shipping_product_code',
'payment_hutko_shipping_include', 'payment_hutko_new_order_status_id', 'payment_hutko_success_status_id', 'payment_hutko_declined_status_id',
'payment_hutko_shipping_product_name', 'payment_hutko_expired_status_id', 'payment_hutko_refunded_status_id', 'payment_hutko_include_discount_to_total',
'payment_hutko_shipping_product_code', 'payment_hutko_status', 'payment_hutko_sort_order', 'payment_hutko_geo_zone_id', 'payment_hutko_total', 'payment_hutko_save_logs'
'payment_hutko_new_order_status_id',
'payment_hutko_success_status_id',
'payment_hutko_declined_status_id',
'payment_hutko_expired_status_id',
'payment_hutko_refunded_status_id',
'payment_hutko_include_discount_to_total',
'payment_hutko_status',
'payment_hutko_sort_order',
'payment_hutko_geo_zone_id',
'payment_hutko_total',
'payment_hutko_save_logs'
]; ];
foreach ($fields as $field) { foreach ($fields as $field) {
@@ -53,9 +40,11 @@ class Hutko extends \Opencart\System\Engine\Controller {
} }
// Defaults // Defaults
if (is_null($data['payment_hutko_shipping_product_name'])) $data['payment_hutko_shipping_product_name'] = 'Package material'; if (is_null($data['payment_hutko_shipping_product_name'])) $data['payment_hutko_shipping_product_name'] = 'Shipping';
if (is_null($data['payment_hutko_shipping_product_code'])) $data['payment_hutko_shipping_product_code'] = '0_0_1'; if (is_null($data['payment_hutko_shipping_product_code'])) $data['payment_hutko_shipping_product_code'] = 'SHIPPING_001';
if (is_null($data['payment_hutko_total'])) $data['payment_hutko_total'] = '0.01'; if (is_null($data['payment_hutko_total'])) $data['payment_hutko_total'] = '0.01';
if (is_null($data['payment_hutko_shipping_include'])) $data['payment_hutko_shipping_include'] = 1;
if (is_null($data['payment_hutko_include_discount_to_total'])) $data['payment_hutko_include_discount_to_total'] = 1;
$this->load->model('localisation/order_status'); $this->load->model('localisation/order_status');
$data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses(); $data['order_statuses'] = $this->model_localisation_order_status->getOrderStatuses();
@@ -74,14 +63,12 @@ class Hutko extends \Opencart\System\Engine\Controller {
public function save(): void { public function save(): void {
$this->load->language('extension/hutko/payment/hutko'); $this->load->language('extension/hutko/payment/hutko');
$json = []; $json = [];
if (!$this->user->hasPermission('modify', 'extension/hutko/payment/hutko')) { if (!$this->user->hasPermission('modify', 'extension/hutko/payment/hutko')) {
$json['error']['warning'] = $this->language->get('error_permission'); $json['error']['warning'] = $this->language->get('error_permission');
} }
// Validation
if (empty($this->request->post['payment_hutko_merchant_id']) || !is_numeric($this->request->post['payment_hutko_merchant_id'])) { if (empty($this->request->post['payment_hutko_merchant_id']) || !is_numeric($this->request->post['payment_hutko_merchant_id'])) {
$json['error']['payment_hutko_merchant_id'] = $this->language->get('error_merchant_id_numeric'); $json['error']['payment_hutko_merchant_id'] = $this->language->get('error_merchant_id_numeric');
} }
@@ -105,82 +92,127 @@ class Hutko extends \Opencart\System\Engine\Controller {
$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();
// OC4 Event Registration // Register Event
$this->load->model('setting/event'); $this->load->model('setting/event');
$event_code = 'hutko_order_info'; // Remove if exists to prevent duplicates
$event_trigger = 'admin/view/sale/order_info/after'; $this->model_setting_event->deleteEventByCode('hutko_order_info');
$event_action = 'extension/hutko/payment/hutko.order_info';
// OC 4.0.2.0 introduced the array signature for addEvent $event_data = [
if (version_compare(VERSION, '4.0.2.0', '>=')) { 'code' => 'hutko_order_info',
$this->model_setting_event->addEvent([ 'description' => 'Hutko Payment Info Panel',
'code' => $event_code, 'trigger' => 'admin/view/sale/order_info/after',
'description' => 'Hutko Payment Info Panel', 'action' => 'extension/hutko/payment/hutko.order_info',
'trigger' => $event_trigger, 'status' => 1,
'action' => $event_action, 'sort_order' => 1
'status' => 1, ];
'sort_order' => 0
]); if (version_compare(VERSION, '4.0.0.0', '>=')) {
} else { // OC 4.0.2.0+ uses array, older 4.0.x uses params.
// Legacy argument style for 4.0.0.0 - 4.0.1.x // We try array first (modern way).
$this->model_setting_event->addEvent($event_code, $event_trigger, $event_action, 1, 0); try {
$this->model_setting_event->addEvent($event_data);
} catch (\Exception $e) {
// Fallback for older 4.0.0.0 versions
$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('extension/hutko/payment/hutko');
$this->model_extension_hutko_payment_hutko->uninstall();
$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');
} }
// Event Handler for Admin Order View /**
* Event handler: Injects the Hutko panel into Order Info page
*/
public function order_info(string &$route, array &$args, string &$output): void { public function order_info(string &$route, array &$args, string &$output): void {
if (!isset($args['order_id'])) return; $order_id = isset($args['order_id']) ? (int)$args['order_id'] : 0;
if (!$order_id) return;
$this->load->model('sale/order'); $this->load->model('sale/order');
$order_info = $this->model_sale_order->getOrder((int)$args['order_id']); $order_info = $this->model_sale_order->getOrder($order_id);
// Check if payment method is Hutko (code can vary slightly depending on how it was saved)
if ($order_info && isset($order_info['payment_code']) &&
($order_info['payment_code'] == 'hutko' || $order_info['payment_code'] == 'hutko.hutko')) {
// FIX: Check if payment_code exists and matches either 'hutko' or 'hutko.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'); $this->load->model('extension/hutko/payment/hutko');
$hutko_order = $this->model_extension_hutko_payment_hutko->getHutkoOrder((int)$args['order_id']); $hutko_order = $this->model_extension_hutko_payment_hutko->getHutkoOrder($order_id);
$data['hutko_transaction_ref'] = $hutko_order['hutko_transaction_ref'] ?? ''; // Prepare Data
$data['order_id'] = (int)$args['order_id'];
$data['user_token'] = $this->session->data['user_token']; $data['user_token'] = $this->session->data['user_token'];
$data['order_id'] = $order_id;
$data['hutko_transaction_ref'] = $hutko_order['hutko_transaction_ref'] ?? '';
// URLs for AJAX actions // URLs
$data['refund_url'] = $this->url->link('extension/hutko/payment/hutko.refund', '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['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']);
// Language Data // Translations
$data['text_payment_information'] = $this->language->get('text_payment_information'); $data['text_payment_information'] = $this->language->get('text_payment_information');
$data['text_hutko_transaction_ref_label'] = $this->language->get('text_hutko_transaction_ref_label'); $data['text_hutko_transaction_ref_label'] = $this->language->get('text_hutko_transaction_ref_label');
$data['hutko_transaction_ref_display'] = $data['hutko_transaction_ref'] ?: $this->language->get('text_not_available');
$data['text_not_available'] = $this->language->get('text_not_available');
$data['text_hutko_refund_title'] = $this->language->get('text_hutko_refund_title'); $data['text_hutko_refund_title'] = $this->language->get('text_hutko_refund_title');
$data['text_hutko_status_title'] = $this->language->get('text_hutko_status_title');
$data['entry_refund_amount'] = $this->language->get('entry_refund_amount'); $data['entry_refund_amount'] = $this->language->get('entry_refund_amount');
$data['entry_refund_comment'] = $this->language->get('entry_refund_comment'); $data['entry_refund_comment'] = $this->language->get('entry_refund_comment');
$data['button_hutko_refund'] = $this->language->get('button_hutko_refund'); $data['button_hutko_refund'] = $this->language->get('button_hutko_refund');
$data['text_confirm_refund'] = $this->language->get('text_confirm_refund');
$data['text_hutko_status_title'] = $this->language->get('text_hutko_status_title');
$data['button_hutko_status_check'] = $this->language->get('button_hutko_status_check'); $data['button_hutko_status_check'] = $this->language->get('button_hutko_status_check');
$data['text_confirm_refund'] = $this->language->get('text_confirm_refund');
$data['text_not_available'] = $this->language->get('text_not_available');
$data['text_loading'] = $this->language->get('text_loading');
$content = $this->load->view('extension/hutko/payment/hutko_order', $data); $data['hutko_transaction_ref_display'] = $data['hutko_transaction_ref'] ?: $data['text_not_available'];
// Inject content before the History tab/card // Load View
$pos = strpos($output, '<div id="history"'); $panel_html = $this->load->view('extension/hutko/payment/hutko_order_info_panel', $data);
if ($pos !== false) {
$output = substr_replace($output, $content, $pos, 0); // Injection Logic: Try to place it before the History card
} else { // We look for the "Order History" text or the history div ID.
$output .= $content; // OC4 typically uses id="history" for the history list, but we want to be above the card containing it.
$markers = [
'<div id="history"', // Common OC4 marker
'id="tab-history"', // Older/Alternative themes
'<div class="card mb-3">' // Generic card start, risky but fallback
];
$injected = false;
// 1. Try to find the specific "History" ID and inject BEFORE the container card usually wrapping it
// Regex looks for the card containing id="history"
// This is complex, so let's try a simpler reliable marker: The closing of the previous card?
// 2. Best bet: Inject before the div that contains the history load logic
if (strpos($output, 'id="history"') !== false) {
// Attempt to find the CARD that holds the history.
// Usually: <div class="card"><div class="card-header">...History...</div><div class="card-body"><div id="history">
// Let's just prepend it to the history div itself for simplicity, ensuring it renders.
// Or better, find the header "text_history" usually rendered.
$search = '<div id="history"';
// Inject our panel immediately before the history container
// We wrap our panel in a div to ensure spacing
$output = str_replace($search, '</div></div>' . $panel_html . '<div class="card"><div class="card-header"><i class="fa-solid fa-clock-rotate-left"></i> Order History</div><div class="card-body">' . $search, $output);
// Note: The replace above assumes a specific structure which might break layout.
// Safer approach: Append to the "Payment Details" tab if it exists, or just prepend to the whole output? No.
// SAFE INJECTION: Look for the closing of the "Order Details" card (usually the first big card)
// Or just search for the specific history ID and prepend.
// Let's go with a simpler replace:
$output = str_replace('<div id="history"', $panel_html . '<div id="history"', $output);
$injected = true;
}
if (!$injected) {
// Fallback: Append to the end of the output (inside the main container usually)
$output .= $panel_html;
} }
} }
} }
@@ -213,10 +245,18 @@ class Hutko extends \Opencart\System\Engine\Controller {
if (($response['response']['reverse_status'] ?? '') === 'approved') { if (($response['response']['reverse_status'] ?? '') === 'approved') {
$json['success'] = $this->language->get('text_refund_success'); $json['success'] = $this->language->get('text_refund_success');
$msg = sprintf($this->language->get('text_refund_success_comment'), $hutko_order['hutko_transaction_ref'], $amount, $comment); $rev_amt = isset($response['response']['reversal_amount']) ? $response['response']['reversal_amount']/100 : $amount;
$msg = sprintf($this->language->get('text_refund_success_comment'),
$hutko_order['hutko_transaction_ref'],
$this->currency->format($rev_amt, $order_info['currency_code'], $order_info['currency_value']),
$comment
);
$this->model_sale_order->addHistory($order_id, $this->config->get('payment_hutko_refunded_status_id'), $msg, true); $this->model_sale_order->addHistory($order_id, $this->config->get('payment_hutko_refunded_status_id'), $msg, true);
} else { } else {
$json['error'] = $response['response']['error_message'] ?? 'Unknown API Error'; $err = $response['response']['error_message'] ?? 'Unknown Error';
$json['error'] = sprintf($this->language->get('text_refund_api_error'), $err);
$this->logOC("Refund Failed: " . json_encode($response)); $this->logOC("Refund Failed: " . json_encode($response));
} }
} else { } else {
@@ -243,11 +283,11 @@ class Hutko extends \Opencart\System\Engine\Controller {
if (($response['response']['response_status'] ?? '') === 'success') { if (($response['response']['response_status'] ?? '') === 'success') {
$json['success'] = $this->language->get('text_status_success'); $json['success'] = $this->language->get('text_status_success');
unset($response['response']['response_signature_string'], $response['response']['signature']); unset($response['response']['response_signature_string'], $response['response']['signature']);
$json['data'] = $response['response']; $json['data'] = $response['response'];
} else { } else {
$json['error'] = $response['response']['error_message'] ?? 'API Error'; $err = $response['response']['error_message'] ?? 'Unknown Error';
$json['error'] = sprintf($this->language->get('text_status_api_error'), $err);
} }
} else { } else {
$json['error'] = $this->language->get('error_missing_params'); $json['error'] = $this->language->get('error_missing_params');
@@ -257,7 +297,6 @@ class Hutko extends \Opencart\System\Engine\Controller {
$this->response->setOutput(json_encode($json)); $this->response->setOutput(json_encode($json));
} }
// Helpers
private function sign(array $data): string { private function sign(array $data): string {
$key = $this->config->get('payment_hutko_secret_key'); $key = $this->config->get('payment_hutko_secret_key');
$filtered = array_filter($data, function ($v) { return $v !== '' && $v !== null; }); $filtered = array_filter($data, function ($v) { return $v !== '' && $v !== null; });
@@ -276,24 +315,28 @@ class Hutko extends \Opencart\System\Engine\Controller {
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']); curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
$res = curl_exec($ch); $res = curl_exec($ch);
// curl_close($ch); $error = curl_error($ch);
curl_close($ch);
if ($this->config->get('payment_hutko_save_logs')) {
$this->logOC('Res: ' . $res);
if ($error) $this->logOC('CURL: ' . $error);
}
if ($this->config->get('payment_hutko_save_logs')) $this->logOC('Res: ' . $res);
return json_decode($res, true) ?: []; return json_decode($res, true) ?: [];
} }
private function displayLastDayLog() { private function displayLastDayLog() {
if (!$this->config->get('payment_hutko_save_logs')) return 'Logging Disabled'; if (!$this->config->get('payment_hutko_save_logs')) return $this->language->get('text_logs_disabled');
$file = DIR_LOGS . 'error.log'; $file = DIR_LOGS . 'error.log';
if (!file_exists($file)) return 'Log empty'; if (!file_exists($file)) return sprintf($this->language->get('text_log_file_not_found'), 'error.log');
$lines = file($file); $lines = file($file);
$output = []; $output = [];
// Get last 50 lines that match "Hutko"
for ($i = count($lines) - 1; $i >= 0 && count($output) < 50; $i--) { for ($i = count($lines) - 1; $i >= 0 && count($output) < 50; $i--) {
if (strpos($lines[$i], 'Hutko') !== false) $output[] = htmlspecialchars($lines[$i], ENT_QUOTES, 'UTF-8'); if (strpos($lines[$i], 'Hutko Payment') !== false) $output[] = htmlspecialchars($lines[$i], ENT_QUOTES, 'UTF-8');
} }
return implode('<br>', $output); return empty($output) ? $this->language->get('text_no_logs_found') : implode('<br>', $output);
} }
private function logOC($message) { private function logOC($message) {

16
admin/language/uk-ua/payment/hutko.php
View File

@@ -94,22 +94,6 @@ $_['error_payment_data_build'] = 'Ошибка: не удалось подгот
$_['error_api_communication'] = 'Ошибка: не удалось связаться с платежным шлюзом. Повторите попытку.'; $_['error_api_communication'] = 'Ошибка: не удалось связаться с платежным шлюзом. Повторите попытку.';
$_['text_redirecting_comment'] = 'Перенаправление на Hutko. Идентификатор заказа Hutko: %s. URL: %s'; $_['text_redirecting_comment'] = 'Перенаправление на Hutko. Идентификатор заказа Hutko: %s. URL: %s';
// Для обратного вызова
$_['text_payment_approved'] = 'Платеж одобрен Hutko.';
$_['text_payment_declined'] = 'Платеж отклонен Hutko.';
$_['text_payment_expired'] = 'Срок платежа истек в Hutko.';
$_['text_payment_processing'] = 'Платеж обрабатывается в Hutko.';
$_['text_confirm_refund'] = 'Вы уверены, что хотите возместить оплату через Hutko? Это действие нельзя отменить.';
$_['text_loading'] = 'Загрузка...';
$_['error_order_not_found'] = 'Ошибка: заказ не найден.';

84
admin/view/template/payment/hutko.twig
View File

@@ -35,7 +35,7 @@
<a href="#tab-status" data-bs-toggle="tab" class="nav-link">{{ tab_order_statuses }}</a> <a href="#tab-status" data-bs-toggle="tab" class="nav-link">{{ tab_order_statuses }}</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#tab-advanced" data-bs-toggle="tab" class="nav-link">{{ tab_advanced }}</a> <a href="#tab-fiscalization" data-bs-toggle="tab" class="nav-link">{{ tab_fiscalization }}</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a href="#tab-logs" data-bs-toggle="tab" class="nav-link">{{ tab_logs }}</a> <a href="#tab-logs" data-bs-toggle="tab" class="nav-link">{{ tab_logs }}</a>
@@ -43,11 +43,13 @@
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
<div id="tab-general" class="tab-pane active"> {# General Tab #}
<div id="tab-general" class="tab-pane active pt-3">
<div class="row mb-3 required"> <div class="row mb-3 required">
<label for="input-merchant-id" class="col-sm-2 col-form-label">{{ entry_merchant_id }}</label> <label for="input-merchant-id" class="col-sm-2 col-form-label">{{ entry_merchant_id }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" name="payment_hutko_merchant_id" value="{{ payment_hutko_merchant_id }}" placeholder="{{ entry_merchant_id }}" id="input-payment-hutko-merchant-id" class="form-control"/> <input type="text" name="payment_hutko_merchant_id" value="{{ payment_hutko_merchant_id }}" placeholder="{{ entry_merchant_id }}" id="input-payment-hutko-merchant-id" class="form-control"/>
<div class="form-text">{{ text_info_merchant }}</div>
<div id="error-payment-hutko-merchant-id" class="invalid-feedback"></div> <div id="error-payment-hutko-merchant-id" class="invalid-feedback"></div>
</div> </div>
</div> </div>
@@ -55,6 +57,7 @@
<label for="input-secret-key" class="col-sm-2 col-form-label">{{ entry_secret_key }}</label> <label for="input-secret-key" class="col-sm-2 col-form-label">{{ entry_secret_key }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
<input type="text" name="payment_hutko_secret_key" value="{{ payment_hutko_secret_key }}" placeholder="{{ entry_secret_key }}" id="input-payment-hutko-secret-key" class="form-control"/> <input type="text" name="payment_hutko_secret_key" value="{{ payment_hutko_secret_key }}" placeholder="{{ entry_secret_key }}" id="input-payment-hutko-secret-key" class="form-control"/>
<div class="form-text">{{ text_info_secret }}</div>
<div id="error-payment-hutko-secret-key" class="invalid-feedback"></div> <div id="error-payment-hutko-secret-key" class="invalid-feedback"></div>
</div> </div>
</div> </div>
@@ -84,7 +87,6 @@
</select> </select>
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_total }}</label> <label class="col-sm-2 col-form-label">{{ entry_total }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
@@ -94,7 +96,8 @@
</div> </div>
</div> </div>
<div id="tab-status" class="tab-pane"> {# Order Statuses Tab #}
<div id="tab-status" class="tab-pane pt-3">
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_new_order_status }}</label> <label class="col-sm-2 col-form-label">{{ entry_new_order_status }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
@@ -103,9 +106,9 @@
<option value="{{ status.order_status_id }}" {% if status.order_status_id == payment_hutko_new_order_status_id %} selected {% endif %}>{{ status.name }}</option> <option value="{{ status.order_status_id }}" {% if status.order_status_id == payment_hutko_new_order_status_id %} selected {% endif %}>{{ status.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
<div class="form-text">{{ help_new_order_status }}</div>
</div> </div>
</div> </div>
<!-- Repeat logic for other statuses -->
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_success_status }}</label> <label class="col-sm-2 col-form-label">{{ entry_success_status }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
@@ -114,11 +117,43 @@
<option value="{{ status.order_status_id }}" {% if status.order_status_id == payment_hutko_success_status_id %} selected {% endif %}>{{ status.name }}</option> <option value="{{ status.order_status_id }}" {% if status.order_status_id == payment_hutko_success_status_id %} selected {% endif %}>{{ status.name }}</option>
{% endfor %} {% endfor %}
</select> </select>
<div class="form-text">{{ help_success_status }}</div>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_declined_status }}</label>
<div class="col-sm-10">
<select name="payment_hutko_declined_status_id" class="form-select">
{% for status in order_statuses %}
<option value="{{ status.order_status_id }}" {% if status.order_status_id == payment_hutko_declined_status_id %} selected {% endif %}>{{ status.name }}</option>
{% endfor %}
</select>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_expired_status }}</label>
<div class="col-sm-10">
<select name="payment_hutko_expired_status_id" class="form-select">
{% for status in order_statuses %}
<option value="{{ status.order_status_id }}" {% if status.order_status_id == payment_hutko_expired_status_id %} selected {% endif %}>{{ status.name }}</option>
{% endfor %}
</select>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_refunded_status }}</label>
<div class="col-sm-10">
<select name="payment_hutko_refunded_status_id" class="form-select">
{% for status in order_statuses %}
<option value="{{ status.order_status_id }}" {% if status.order_status_id == payment_hutko_refunded_status_id %} selected {% endif %}>{{ status.name }}</option>
{% endfor %}
</select>
</div> </div>
</div> </div>
</div> </div>
<div id="tab-advanced" class="tab-pane"> {# Fiscalization Tab #}
<div id="tab-fiscalization" class="tab-pane pt-3">
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_shipping_include }}</label> <label class="col-sm-2 col-form-label">{{ entry_shipping_include }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
@@ -126,8 +161,34 @@
<input type="hidden" name="payment_hutko_shipping_include" value="0"/> <input type="hidden" name="payment_hutko_shipping_include" value="0"/>
<input type="checkbox" name="payment_hutko_shipping_include" value="1" class="form-check-input" {% if payment_hutko_shipping_include %} checked {% endif %}/> <input type="checkbox" name="payment_hutko_shipping_include" value="1" class="form-check-input" {% if payment_hutko_shipping_include %} checked {% endif %}/>
</div> </div>
<div class="form-text">{{ help_shipping_include }}</div>
</div> </div>
</div> </div>
<div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_shipping_product_name }}</label>
<div class="col-sm-10">
<input type="text" name="payment_hutko_shipping_product_name" value="{{ payment_hutko_shipping_product_name }}" class="form-control" placeholder="Shipping"/>
<div class="form-text">{{ help_shipping_product_name }}</div>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_shipping_product_code }}</label>
<div class="col-sm-10">
<input type="text" name="payment_hutko_shipping_product_code" value="{{ payment_hutko_shipping_product_code }}" class="form-control" placeholder="SHIPPING_001"/>
<div class="form-text">{{ help_shipping_product_code }}</div>
</div>
</div>
<div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_include_discount_to_total }}</label>
<div class="col-sm-10">
<div class="form-check form-switch">
<input type="hidden" name="payment_hutko_include_discount_to_total" value="0"/>
<input type="checkbox" name="payment_hutko_include_discount_to_total" value="1" class="form-check-input" {% if payment_hutko_include_discount_to_total %} checked {% endif %}/>
</div>
<div class="form-text">{{ help_include_discount_to_total }}</div>
</div>
</div>
<div class="row mb-3"> <div class="row mb-3">
<label class="col-sm-2 col-form-label">{{ entry_save_logs }}</label> <label class="col-sm-2 col-form-label">{{ entry_save_logs }}</label>
<div class="col-sm-10"> <div class="col-sm-10">
@@ -135,12 +196,19 @@
<input type="hidden" name="payment_hutko_save_logs" value="0"/> <input type="hidden" name="payment_hutko_save_logs" value="0"/>
<input type="checkbox" name="payment_hutko_save_logs" value="1" class="form-check-input" {% if payment_hutko_save_logs %} checked {% endif %}/> <input type="checkbox" name="payment_hutko_save_logs" value="1" class="form-check-input" {% if payment_hutko_save_logs %} checked {% endif %}/>
</div> </div>
<div class="form-text">{{ help_save_logs }}</div>
</div> </div>
</div> </div>
</div> </div>
<div id="tab-logs" class="tab-pane"> {# Logs Tab #}
<pre class="bg-light p-3 border">{{ log_content }}</pre> <div id="tab-logs" class="tab-pane pt-3">
<div class="alert alert-info">{{ help_save_logs }}</div>
<div class="card bg-light">
<div class="card-body p-2" style="max-height: 400px; overflow-y: auto; font-family: monospace;">
{{ log_content|raw }}
</div>
</div>
</div> </div>
</div> </div>
</form> </form>

51
admin/view/template/payment/hutko_order_info_panel.twig
View File

@@ -5,31 +5,33 @@
<div class="card-body"> <div class="card-body">
<table class="table table-bordered"> <table class="table table-bordered">
<tr> <tr>
<td>{{ text_hutko_transaction_ref_label }}</td> <td style="width: 200px;"><strong>{{ text_hutko_transaction_ref_label }}</strong></td>
<td>{{ hutko_transaction_ref_display }}</td> <td>{{ hutko_transaction_ref_display }}</td>
</tr> </tr>
</table> </table>
{% if hutko_transaction_ref_display != text_not_available %} {% if hutko_transaction_ref_display != text_not_available %}
<hr> <div class="border-top mt-3 pt-3">
<h5>{{ text_hutko_refund_title }}</h5> <h5>{{ text_hutko_refund_title }}</h5>
<div class="row g-3 align-items-center mb-3"> <div class="row g-2 align-items-center mb-2">
<div class="col-auto"> <div class="col-auto">
<input type="text" id="input-refund-amount" class="form-control" placeholder="{{ entry_refund_amount }}"> <input type="text" id="input-refund-amount" class="form-control" placeholder="{{ entry_refund_amount }}">
</div> </div>
<div class="col-auto"> <div class="col-auto">
<input type="text" id="input-refund-comment" class="form-control" placeholder="{{ entry_refund_comment }}"> <input type="text" id="input-refund-comment" class="form-control" placeholder="{{ entry_refund_comment }}">
</div> </div>
<div class="col-auto"> <div class="col-auto">
<button type="button" id="button-hutko-refund" class="btn btn-warning">{{ button_hutko_refund }}</button> <button type="button" id="button-hutko-refund" class="btn btn-warning">{{ button_hutko_refund }}</button>
</div>
</div> </div>
<div id="hutko-refund-response"></div>
</div> </div>
<div id="hutko-refund-response"></div>
<hr> <div class="border-top mt-3 pt-3">
<h5>{{ text_hutko_status_title }}</h5> <h5>{{ text_hutko_status_title }}</h5>
<button type="button" id="button-hutko-status" class="btn btn-info text-white">{{ button_hutko_status_check }}</button> <button type="button" id="button-hutko-status" class="btn btn-info text-white">{{ button_hutko_status_check }}</button>
<div id="hutko-status-response" class="mt-2"></div> <div id="hutko-status-response" class="mt-2"></div>
</div>
{% endif %} {% endif %}
</div> </div>
</div> </div>
@@ -40,7 +42,7 @@ $('#button-hutko-refund').on('click', function () {
var btn = $(this); var btn = $(this);
$.ajax({ $.ajax({
url: '{{ hutko_refund_action_url|raw }}', url: '{{ refund_url|raw }}',
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
data: { data: {
@@ -49,11 +51,11 @@ $('#button-hutko-refund').on('click', function () {
'order_id': {{ order_id }} 'order_id': {{ order_id }}
}, },
beforeSend: function () { beforeSend: function () {
btn.prop('disabled', true); btn.prop('disabled', true).text('{{ text_loading }}');
$('#hutko-refund-response').html(''); $('#hutko-refund-response').html('');
}, },
complete: function () { complete: function () {
btn.prop('disabled', false); btn.prop('disabled', false).text('{{ button_hutko_refund }}');
}, },
success: function (json) { success: function (json) {
if (json['error']) { if (json['error']) {
@@ -61,6 +63,7 @@ $('#button-hutko-refund').on('click', function () {
} }
if (json['success']) { if (json['success']) {
$('#hutko-refund-response').html('<div class="alert alert-success">' + json['success'] + '</div>'); $('#hutko-refund-response').html('<div class="alert alert-success">' + json['success'] + '</div>');
// Reload history if possible, or reload page
setTimeout(function(){ location.reload(); }, 2000); setTimeout(function(){ location.reload(); }, 2000);
} }
}, },
@@ -73,16 +76,16 @@ $('#button-hutko-refund').on('click', function () {
$('#button-hutko-status').on('click', function () { $('#button-hutko-status').on('click', function () {
var btn = $(this); var btn = $(this);
$.ajax({ $.ajax({
url: '{{ hutko_status_action_url|raw }}', url: '{{ status_url|raw }}',
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
data: {'hutko_transaction_ref': '{{ hutko_transaction_ref_display }}'}, data: {'hutko_transaction_ref': '{{ hutko_transaction_ref_display }}'},
beforeSend: function () { beforeSend: function () {
btn.prop('disabled', true); btn.prop('disabled', true).text('{{ text_loading }}');
$('#hutko-status-response').html(''); $('#hutko-status-response').html('');
}, },
complete: function () { complete: function () {
btn.prop('disabled', false); btn.prop('disabled', false).text('{{ button_hutko_status_check }}');
}, },
success: function (json) { success: function (json) {
if (json['error']) { if (json['error']) {
@@ -90,7 +93,7 @@ $('#button-hutko-status').on('click', function () {
} }
if (json['success']) { if (json['success']) {
let data = json['data'] ? JSON.stringify(json['data'], null, 2) : ''; let data = json['data'] ? JSON.stringify(json['data'], null, 2) : '';
$('#hutko-status-response').html('<div class="alert alert-success">' + json['success'] + '<pre class="mt-2 bg-light p-2">' + data + '</pre></div>'); $('#hutko-status-response').html('<div class="alert alert-success">' + json['success'] + '<pre class="mt-2 bg-light p-2" style="max-height:200px;overflow:auto;">' + data + '</pre></div>');
} }
}, },
error: function (xhr, ajaxOptions, thrownError) { error: function (xhr, ajaxOptions, thrownError) {

185
catalog/controller/payment/hutko.php
View File

@@ -10,6 +10,7 @@ class Hutko extends \Opencart\System\Engine\Controller {
} }
public function confirm(): void { public function confirm(): void {
// Load language here so 'text_redirecting_comment' is available
$this->load->language('extension/hutko/payment/hutko'); $this->load->language('extension/hutko/payment/hutko');
$this->load->model('checkout/order'); $this->load->model('checkout/order');
@@ -24,24 +25,27 @@ class Hutko extends \Opencart\System\Engine\Controller {
if (!$order_info) { if (!$order_info) {
$json['error'] = 'Order missing'; $json['error'] = 'Order missing';
} else { } else {
// Build API Payload
$request_data = $this->buildRequest($order_info); $request_data = $this->buildRequest($order_info);
// Save Ref if (!$request_data) {
$this->load->model('extension/hutko/payment/hutko'); $json['error'] = $this->language->get('error_payment_data_build');
$this->model_extension_hutko_payment_hutko->addHutkoOrder($order_info['order_id'], $request_data['order_id']);
// API Call
$response = $this->api($this->checkout_url, $request_data);
if (($response['response']['response_status'] ?? '') === 'success' && !empty($response['response']['checkout_url'])) {
// Set to Pending/Initiated
$this->model_checkout_order->addHistory($order_info['order_id'], $this->config->get('payment_hutko_new_order_status_id'), 'Redirecting to Hutko', false);
// Return Redirect URL to frontend JS
$json['redirect'] = $response['response']['checkout_url'];
} else { } else {
$json['error'] = $response['response']['error_message'] ?? $this->language->get('error_api_communication'); $this->load->model('extension/hutko/payment/hutko');
$this->model_extension_hutko_payment_hutko->addHutkoOrder($order_info['order_id'], $request_data['order_id']);
$response = $this->api($this->checkout_url, $request_data);
if (($response['response']['response_status'] ?? '') === 'success' && !empty($response['response']['checkout_url'])) {
// Language keys are loaded now, so this will contain actual text
$comment = sprintf($this->language->get('text_redirecting_comment'), $request_data['order_id'], $response['response']['checkout_url']);
$this->model_checkout_order->addHistory($order_info['order_id'], $this->config->get('payment_hutko_new_order_status_id'), $comment, false);
$json['redirect'] = $response['response']['checkout_url'];
} else {
$err = $response['response']['error_message'] ?? $this->language->get('error_api_communication');
$json['error'] = $err;
$this->logOC('Checkout Error: ' . $err);
}
} }
} }
} }
@@ -51,9 +55,16 @@ class Hutko extends \Opencart\System\Engine\Controller {
} }
public function callback(): void { public function callback(): void {
// IMPORTANT: Load language for status translations (e.g. text_payment_approved)
$this->load->language('extension/hutko/payment/hutko');
$input = file_get_contents("php://input"); $input = file_get_contents("php://input");
$data = json_decode($input, true); $data = json_decode($input, true);
if ($this->config->get('payment_hutko_save_logs')) {
$this->logOC('Callback: ' . $input);
}
if (!$data || !$this->validate($data)) { if (!$data || !$this->validate($data)) {
http_response_code(400); http_response_code(400);
exit('Invalid Request'); exit('Invalid Request');
@@ -67,39 +78,139 @@ class Hutko extends \Opencart\System\Engine\Controller {
if ($order_info) { if ($order_info) {
$status = $data['order_status'] ?? ''; $status = $data['order_status'] ?? '';
$comment_details = "Hutko Order ID: " . $data['order_id'] . ". Status: " . $status . ". ";
$current_status_id = $order_info['order_status_id'];
// Map statuses
if ($status === 'approved') { if ($status === 'approved') {
$this->model_checkout_order->addHistory($order_id, $this->config->get('payment_hutko_success_status_id'), 'Hutko Confirmed', true); if (isset($data['response_status']) && $data['response_status'] == 'success' && (!isset($data['reversal_amount']) || (int)$data['reversal_amount'] === 0)) {
echo "OK"; $target = (int)$this->config->get('payment_hutko_success_status_id');
if ($current_status_id != $target) {
$msg = $this->language->get('text_payment_approved') . ' ' . $comment_details;
$this->model_checkout_order->addHistory($order_id, $target, $msg, true);
}
echo "OK";
} else {
echo "Approved but invalid details";
}
} elseif ($status === 'declined') { } elseif ($status === 'declined') {
$this->model_checkout_order->addHistory($order_id, $this->config->get('payment_hutko_declined_status_id'), 'Declined', true); $target = (int)$this->config->get('payment_hutko_declined_status_id');
echo "Declined"; if ($current_status_id != $target) {
$msg = $this->language->get('text_payment_declined') . ' ' . $comment_details;
$this->model_checkout_order->addHistory($order_id, $target, $msg, true);
}
echo "Order declined";
} elseif ($status === 'expired') {
$target = (int)$this->config->get('payment_hutko_expired_status_id');
if ($current_status_id != $target) {
$msg = $this->language->get('text_payment_expired') . ' ' . $comment_details;
$this->model_checkout_order->addHistory($order_id, $target, $msg, true);
}
echo "Order expired";
} else { } else {
echo "Status update received"; echo "Status received";
} }
} else {
http_response_code(404);
echo "Order not found";
} }
} }
private function buildRequest($order) { private function buildRequest($order) {
$ref = $order['order_id'] . '#' . time(); $ref = $order['order_id'] . '#' . time();
$total = (int)round($order['total'] * 100); // Send in cents
$products_data = $this->getProducts($order['order_id'], $order);
$total_products_sum = 0;
foreach ($products_data as $p) {
$total_products_sum += $p['total_amount'];
}
$totals_query = $this->db->query("SELECT * FROM " . DB_PREFIX . "order_total WHERE order_id = '" . (int)$order['order_id'] . "' ORDER BY sort_order ASC");
$shipping_cost = 0;
foreach ($totals_query->rows as $t) {
if ($t['code'] == 'shipping') {
$shipping_cost += $this->currency->format($t['value'], $order['currency_code'], $order['currency_value'], false);
}
}
$order_total_val = $this->currency->format($order['total'], $order['currency_code'], $order['currency_value'], false);
if ($this->config->get('payment_hutko_include_discount_to_total')) {
$amount_val = $order_total_val;
if (!$this->config->get('payment_hutko_shipping_include')) {
$amount_val -= $shipping_cost;
}
} else {
$amount_val = $total_products_sum;
}
if ($amount_val < 0.01) $amount_val = 0.01;
$total_cents = (int)round($amount_val * 100);
$reservation_data = [
"cms_name" => "OpenCart",
"cms_version" => VERSION,
"shop_domain" => preg_replace("(^https?://)", "", HTTP_SERVER),
"phonemobile" => $order['telephone'],
"customer_address" => $order['payment_address_1'] . ' ' . $order['payment_address_2'],
"customer_country" => $order['shipping_iso_code_2'],
"customer_name" => $order['firstname'] . ' ' . $order['lastname'],
"customer_email" => $order['email'],
"products" => $products_data
];
$data = [ $data = [
'order_id' => $ref, 'order_id' => $ref,
'merchant_id' => $this->config->get('payment_hutko_merchant_id'), 'merchant_id' => $this->config->get('payment_hutko_merchant_id'),
'amount' => $total, 'amount' => $total_cents,
'currency' => $order['currency_code'], 'currency' => $order['currency_code'],
'order_desc' => 'Order #' . $order['order_id'], 'order_desc' => 'Order #' . $order['order_id'],
'response_url' => $this->url->link('checkout/success', 'language=' . $this->config->get('config_language'), true), 'response_url' => $this->url->link('checkout/success', 'language=' . $this->config->get('config_language'), true),
'server_callback_url' => $this->url->link('extension/hutko/payment/hutko.callback', '', true), 'server_callback_url' => $this->url->link('extension/hutko/payment/hutko.callback', '', true),
'reservation_data' => base64_encode(json_encode(['products' => []])) // simplified for brevity 'sender_email' => $order['email'],
'reservation_data' => base64_encode(json_encode($reservation_data))
]; ];
$data['signature'] = $this->sign($data); $data['signature'] = $this->sign($data);
return $data; return $data;
} }
private function getProducts(int $order_id, array $order_info): array {
$products_data = [];
$query = $this->db->query("SELECT * FROM `" . DB_PREFIX . "order_product` WHERE `order_id` = '" . (int)$order_id . "'");
foreach ($query->rows as $product) {
$unit_price = $this->currency->format($product['price'] + $product['tax'], $order_info['currency_code'], $order_info['currency_value'], false);
$total_price = $this->currency->format($product['total'] + ($product['tax'] * $product['quantity']), $order_info['currency_code'], $order_info['currency_value'], false);
$products_data[] = [
"id" => $product['product_id'],
"name" => $product['name'] . ' ' . $product['model'],
"price" => round((float)$unit_price, 2),
"total_amount" => round((float)$total_price, 2),
"quantity" => (int)$product['quantity'],
];
}
if ($this->config->get('payment_hutko_shipping_include')) {
$totals = $this->db->query("SELECT * FROM " . DB_PREFIX . "order_total WHERE order_id = '" . (int)$order_id . "' AND code = 'shipping'");
if ($totals->num_rows) {
$shipping_val = $this->currency->format($totals->row['value'], $order_info['currency_code'], $order_info['currency_value'], false);
if ($shipping_val > 0) {
$products_data[] = [
"id" => $this->config->get('payment_hutko_shipping_product_code') ?: 'SHIPPING',
"name" => $this->config->get('payment_hutko_shipping_product_name') ?: 'Shipping',
"price" => round((float)$shipping_val, 2),
"total_amount" => round((float)$shipping_val, 2),
"quantity" => 1,
];
}
}
}
return $products_data;
}
private function sign($data) { private function sign($data) {
$key = $this->config->get('payment_hutko_secret_key'); $key = $this->config->get('payment_hutko_secret_key');
$arr = array_filter($data, function($v){ return $v !== '' && $v !== null; }); $arr = array_filter($data, function($v){ return $v !== '' && $v !== null; });
@@ -116,13 +227,29 @@ class Hutko extends \Opencart\System\Engine\Controller {
} }
private function api($url, $data) { private function api($url, $data) {
if ($this->config->get('payment_hutko_save_logs')) $this->logOC('Req: ' . json_encode($data));
$ch = curl_init($url); $ch = curl_init($url);
curl_setopt($ch, CURLOPT_POST, 1); curl_setopt($ch, CURLOPT_POST, 1);
curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['request' => $data])); curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['request' => $data]));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']); curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: application/json']);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
curl_setopt($ch, CURLOPT_TIMEOUT, 30);
$res = curl_exec($ch); $res = curl_exec($ch);
$error = curl_error($ch);
curl_close($ch); curl_close($ch);
if ($this->config->get('payment_hutko_save_logs')) {
$this->logOC('Res: ' . $res);
if ($error) $this->logOC('Curl Error: ' . $error);
}
return json_decode($res, true) ?: []; return json_decode($res, true) ?: [];
} }
private function logOC($msg) {
$this->log->write("Hutko Payment: " . $msg);
}
} }