diff --git a/admin/controller/payment/hutko.php b/admin/controller/payment/hutko.php index 1033966..3412ce1 100644 --- a/admin/controller/payment/hutko.php +++ b/admin/controller/payment/hutko.php @@ -137,10 +137,8 @@ class Hutko extends \Opencart\System\Engine\Controller { $this->load->language('extension/hutko/payment/hutko'); $this->load->model('extension/hutko/payment/hutko'); - // NEW: Get all transactions $transactions = $this->model_extension_hutko_payment_hutko->getTransactions($order_id); - // Format transactions for view $data['transactions'] = []; foreach ($transactions as $t) { $payload_arr = json_decode($t['payload'], true); @@ -153,7 +151,6 @@ class Hutko extends \Opencart\System\Engine\Controller { 'status' => $t['status'], 'amount' => $t['amount'] . ' ' . $t['currency'], 'payload' => $pretty_payload, - // Only allow refund if it's a successful callback (approved payment) 'can_refund'=> ($t['type'] == 'callback' && $t['status'] == 'success') ]; } @@ -164,18 +161,21 @@ class Hutko extends \Opencart\System\Engine\Controller { // URLs $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']); + // NEW: Link creation URL + $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); // Translations $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_status_title'] = $this->language->get('text_hutko_status_title'); - $data['entry_refund_amount'] = $this->language->get('entry_refund_amount'); - $data['entry_refund_comment'] = $this->language->get('entry_refund_comment'); $data['button_hutko_refund'] = $this->language->get('button_hutko_refund'); $data['button_hutko_status_check'] = $this->language->get('button_hutko_status_check'); + $data['button_create_link'] = 'Create New Payment Link'; // Add to language file $data['text_confirm_refund'] = $this->language->get('text_confirm_refund'); $data['text_loading'] = $this->language->get('text_loading'); $data['text_no_transactions'] = 'No Hutko transactions recorded.'; + + // New Language keys for manual link + $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); @@ -333,7 +333,220 @@ class Hutko extends \Opencart\System\Engine\Controller { return empty($output) ? $this->language->get('text_no_logs_found') : implode('
', $output); } - private function logOC($message) { - $this->log->write('Hutko Payment: ' . $message); + + + public function create_payment_link(): void { + $this->load->language('extension/hutko/payment/hutko'); + $this->load->model('extension/hutko/payment/hutko'); + $this->load->model('sale/order'); + + $json = []; + $order_id = (int)($this->request->get['order_id'] ?? 0); + $order_info = $this->model_sale_order->getOrder($order_id); + + if ($order_info) { + // 1. Generate new Ref (Admin initiated) + $hutko_ref = $order_id . '#ADM' . time(); // Mark as ADM to distinguish + + // 2. Build Request (Uses shared logic) + $request_data = $this->buildRequest($order_info, $hutko_ref); + + if (!$request_data) { + $json['error'] = $this->language->get('error_payment_data_build'); + } else { + // 3. Call API + $response = $this->api($this->checkout_url, $request_data); + + if (($response['response']['response_status'] ?? '') === 'success' && !empty($response['response']['checkout_url'])) { + $url = $response['response']['checkout_url']; + + // 4. Log to DB + $this->model_extension_hutko_payment_hutko->logTransaction( + $order_id, + $hutko_ref, + 'payment_request_admin', // Distinct type + 'created', + $request_data['amount'] / 100, + $request_data['currency'], + [ + 'request_data' => $request_data, + 'checkout_url' => $url, + 'admin_user' => $this->user->getUserName() + ] + ); + + $json['success'] = 'Payment Link Created Successfully'; + $json['url'] = $url; + } else { + $err = $response['response']['error_message'] ?? 'API Error'; + $json['error'] = $err; + + // Log Failure + $this->model_extension_hutko_payment_hutko->logTransaction( + $order_id, + $hutko_ref, + 'payment_request_admin', + 'failed', + $request_data['amount'] / 100, + $request_data['currency'], + ['error' => $err, 'api_response' => $response] + ); + } + } + } else { + $json['error'] = 'Order not found'; + } + + $this->response->addHeader('Content-Type: application/json'); + $this->response->setOutput(json_encode($json)); } + + + // ========================================================================= + // SHARED LOGIC START + // MAINTENANCE WARNING: The following functions (buildRequest, getProducts, + // sign, api) must remain identical in Admin and Catalog controllers. + // ========================================================================= + + private function buildRequest($order, $hutko_ref) { + $products_data = $this->getProducts($order['order_id'], $order); + + $total_products_sum = 0; + foreach ($products_data as $p) { + $total_products_sum += $p['total_amount']; + } + + // Re-fetch totals to ensure accuracy + $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') { + // Format using order currency values + $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); + + // Use Catalog URL for response/callback, not Admin URL + $catalog_url = defined('HTTP_CATALOG') ? HTTP_CATALOG : HTTP_SERVER; + // Ensure no double trailing slash + $catalog_url = rtrim($catalog_url, '/') . '/'; + + $response_url = $catalog_url . 'index.php?route=checkout/success'; + $callback_url = $catalog_url . 'index.php?route=extension/hutko/payment/hutko.callback'; + + $reservation_data = [ + "cms_name" => "OpenCart", + "cms_version" => VERSION, + "shop_domain" => preg_replace("(^https?://)", "", $catalog_url), + "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 = [ + 'order_id' => $hutko_ref, + 'merchant_id' => $this->config->get('payment_hutko_merchant_id'), + 'amount' => $total_cents, + 'currency' => $order['currency_code'], + 'order_desc' => 'Order #' . $order['order_id'], + 'response_url' => $response_url, + 'server_callback_url' => $callback_url, + 'sender_email' => $order['email'], + 'reservation_data' => base64_encode(json_encode($reservation_data)) + ]; + + $data['signature'] = $this->sign($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) { + $key = $this->config->get('payment_hutko_secret_key'); + $arr = array_filter($data, function($v){ return $v !== '' && $v !== null; }); + ksort($arr); + $str = $key; + foreach($arr as $v) $str .= '|' . $v; + return sha1($str); + } + + private function api($url, $data) { + if ($this->config->get('payment_hutko_save_logs')) $this->logOC('Req: ' . json_encode($data)); + + $ch = curl_init($url); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode(['request' => $data])); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); + 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); + $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: ' . $error); + } + + return json_decode($res, true) ?: []; + } + + private function logOC($msg) { + $this->log->write("Hutko Payment: " . $msg); + } + // ========================================================================= + // SHARED LOGIC END + // ========================================================================= } \ No newline at end of file