From e51e9fae7831c866bcb813310f7e53c7dae79126 Mon Sep 17 00:00:00 2001 From: RTechSn <119056784+RTechSn@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:06:04 +0300 Subject: [PATCH 1/8] =?UTF-8?q?=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8?= =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D1=85?= =?UTF-8?q?=D0=BE=D0=BB=D0=B4=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/language/ru-ru/extension/payment/robokassa.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/OpenCart 3.x/upload/admin/language/ru-ru/extension/payment/robokassa.php b/OpenCart 3.x/upload/admin/language/ru-ru/extension/payment/robokassa.php index 45daa86..7863db0 100644 --- a/OpenCart 3.x/upload/admin/language/ru-ru/extension/payment/robokassa.php +++ b/OpenCart 3.x/upload/admin/language/ru-ru/extension/payment/robokassa.php @@ -31,6 +31,9 @@ $_['entry_success_url'] = 'Success URL'; $_['entry_fail_url'] = 'Fail URL'; $_['entry_order_status'] = 'Статус заказа после оплаты'; +$_['entry_order_pending'] = 'Статус заказа в ожидании подтверждения'; +$_['entry_order_processing'] = 'Статус заказа для подтверждения оплаты'; +$_['entry_order_canceled'] = 'Статус заказа для отмены холдирования'; $_['entry_geo_zone'] = 'Географическая зона'; $_['entry_status'] = 'Статус'; $_['entry_sort_order'] = 'Порядок сортировки'; @@ -52,4 +55,4 @@ $_['error_merch_login'] = 'Требуется указать логин!'; $_['error_password1'] = 'Требуется ввести пароль 1!'; $_['error_password2'] = 'Требуется ввести пароль 2!'; -?> \ No newline at end of file +?> From 0c0bbed8f6287cca66762f7b3850309716f379b4 Mon Sep 17 00:00:00 2001 From: RTechSn <119056784+RTechSn@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:31:53 +0300 Subject: [PATCH 2/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=85=D0=BE=D0=BB=D0=B4=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/language/en-gb/extension/payment/robokassa.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OpenCart 3.x/upload/admin/language/en-gb/extension/payment/robokassa.php b/OpenCart 3.x/upload/admin/language/en-gb/extension/payment/robokassa.php index c1b877f..7863db0 100644 --- a/OpenCart 3.x/upload/admin/language/en-gb/extension/payment/robokassa.php +++ b/OpenCart 3.x/upload/admin/language/en-gb/extension/payment/robokassa.php @@ -31,21 +31,28 @@ $_['entry_success_url'] = 'Success URL'; $_['entry_fail_url'] = 'Fail URL'; $_['entry_order_status'] = 'Статус заказа после оплаты'; +$_['entry_order_pending'] = 'Статус заказа в ожидании подтверждения'; +$_['entry_order_processing'] = 'Статус заказа для подтверждения оплаты'; +$_['entry_order_canceled'] = 'Статус заказа для отмены холдирования'; $_['entry_geo_zone'] = 'Географическая зона'; $_['entry_status'] = 'Статус'; $_['entry_sort_order'] = 'Порядок сортировки'; $_['entry_country'] = 'Страна магазина'; $_['entry_iframe'] = 'Включить iframe'; $_['entry_languages_map'] = 'Язык интерфейса платёжной страницы'; +$_['entry_podeli'] = 'Оплата через Podeli'; +$_['entry_hold'] = 'Отложенные платежи'; // Help $_['help_iframe'] = 'При включённом iframe, способов оплаты меньше, чем в обычной платежной странице - только карты, Apple и Samsung pay, Qiwi. IncCurrLabel работает, но ограничено.'; $_['help_fiscal'] = 'Режим работы для решений - Облачное. Кассовое. Робочеки.'; $_['help_test'] = 'Режим для отладки модуля. Информацию можно посмотреть в файле storage/logs/robo.log'; +$_['help_podeli'] = 'Включает способ оплаты RobokassaXPodeli. Позволяет разбить сумму заказа на части и оплатить её частями. Доступно для заказов на сумму от 300 до 3000'; +$_['help_hold'] = 'Данная услуга доступна только по предварительному согласованию. Функционал доступен только при использовании банковских карт.'; // Error $_['error_permission'] = 'Внимание: У Вас недостаточно прав для управления модулем оплаты Робокасса!'; $_['error_merch_login'] = 'Требуется указать логин!'; $_['error_password1'] = 'Требуется ввести пароль 1!'; $_['error_password2'] = 'Требуется ввести пароль 2!'; -?> \ No newline at end of file +?> From de7f3950d07cc341c5cc5e61bf223bb119eefa01 Mon Sep 17 00:00:00 2001 From: RTechSn <119056784+RTechSn@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:32:16 +0300 Subject: [PATCH 3/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=85=D0=BE=D0=BB=D0=B4=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 03aec85b98ba49ff7bccb669609933219e179082 Mon Sep 17 00:00:00 2001 From: RTechSn <119056784+RTechSn@users.noreply.github.com> Date: Mon, 1 Jul 2024 16:33:03 +0300 Subject: [PATCH 4/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=85=D0=BE=D0=BB=D0=B4=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From f45c5db71da2bec0b89d6404e4b973e8a10f0db0 Mon Sep 17 00:00:00 2001 From: RTechSn <119056784+RTechSn@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:33:57 +0300 Subject: [PATCH 5/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=85=D0=BE=D0=BB=D0=B4=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenCart 3.x/install.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenCart 3.x/install.xml b/OpenCart 3.x/install.xml index 22c38f7..7e7a1dc 100644 --- a/OpenCart 3.x/install.xml +++ b/OpenCart 3.x/install.xml @@ -17,14 +17,14 @@ // Итоговый чек // Добавленное условие для вызова robokassa_hold_confirm - if ($order_info['order_status_id'] == 1 && $this->request->post['order_status_id'] == 2) { + if ($order_info['order_status_id'] == $this->config->get('payment_robokassa_order_status_id_pending') && $this->request->post['order_status_id'] == $this->config->get('payment_robokassa_order_status_id_processing')) { $this->load->model('extension/payment/robokassa'); $this->model_extension_payment_robokassa->robokassa_hold_confirm($order_id); } // Добавленное условие для вызова robokassa_hold_confirm // Добавленное условие для вызова robokassa_hold_cancel - if ($order_info['order_status_id'] == 1 && $this->request->post['order_status_id'] == 7) { + if ($order_info['order_status_id'] == $this->config->get('payment_robokassa_order_status_id_pending') && $this->request->post['order_status_id'] == $this->config->get('payment_robokassa_order_status_id_canceled')) { $this->load->model('extension/payment/robokassa'); $this->model_extension_payment_robokassa->robokassa_hold_cancel($order_id); } From e2ec848802ba283477587ecbc9d41ca76decaf90 Mon Sep 17 00:00:00 2001 From: RTechSn <119056784+RTechSn@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:35:08 +0300 Subject: [PATCH 6/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=85=D0=BE=D0=BB=D0=B4=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extension/payment/robokassa.php | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/OpenCart 3.x/upload/admin/controller/extension/payment/robokassa.php b/OpenCart 3.x/upload/admin/controller/extension/payment/robokassa.php index 6280bb5..fb442f8 100644 --- a/OpenCart 3.x/upload/admin/controller/extension/payment/robokassa.php +++ b/OpenCart 3.x/upload/admin/controller/extension/payment/robokassa.php @@ -86,6 +86,9 @@ public function index() $data['entry_fail_url'] = $this->language->get('entry_fail_url'); $data['entry_test'] = $this->language->get('entry_test'); $data['entry_order_status'] = $this->language->get('entry_order_status'); + $data['entry_order_pending'] = $this->language->get('entry_order_pending'); + $data['entry_order_processing'] = $this->language->get('entry_order_processing'); + $data['entry_order_canceled'] = $this->language->get('entry_order_canceled'); $data['entry_geo_zone'] = $this->language->get('entry_geo_zone'); $data['entry_status'] = $this->language->get('entry_status'); $data['entry_sort_order'] = $this->language->get('entry_sort_order'); @@ -251,6 +254,25 @@ public function index() } else { $data['payment_robokassa_order_status_id'] = $this->config->get('payment_robokassa_order_status_id'); } + + if (isset($this->request->post['payment_robokassa_order_status_id_pending'])) { + $data['payment_robokassa_order_status_id_pending'] = $this->request->post['payment_robokassa_order_status_id_pending']; + } else { + $data['payment_robokassa_order_status_id_pending'] = $this->config->get('payment_robokassa_order_status_id_pending'); + } + + if (isset($this->request->post['payment_robokassa_order_status_id_processing'])) { + $data['payment_robokassa_order_status_id_processing'] = $this->request->post['payment_robokassa_order_status_id_processing']; + } else { + $data['payment_robokassa_order_status_id_processing'] = $this->config->get('payment_robokassa_order_status_id_processing'); + } + + if (isset($this->request->post['payment_robokassa_order_status_id_canceled'])) { + $data['payment_robokassa_order_status_id_canceled'] = $this->request->post['payment_robokassa_order_status_id_canceled']; + } else { + $data['payment_robokassa_order_status_id_canceled'] = $this->config->get('payment_robokassa_order_status_id_canceled'); + } + if (isset($this->request->post['payment_robokassa_order_status_id_2check'])) { $data['payment_robokassa_order_status_id_2check'] = $this->request->post['payment_robokassa_order_status_id_2check']; @@ -331,4 +353,4 @@ private function validate() return !$this->error; } -} \ No newline at end of file +} From 9f3efdbf8f0840000980f7237dcba01f60bc4d85 Mon Sep 17 00:00:00 2001 From: RTechSn <119056784+RTechSn@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:35:54 +0300 Subject: [PATCH 7/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=85=D0=BE=D0=BB=D0=B4=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/extension/payment/robokassa.twig | 70 +++++++++++++++++-- 1 file changed, 66 insertions(+), 4 deletions(-) diff --git a/OpenCart 3.x/upload/admin/view/template/extension/payment/robokassa.twig b/OpenCart 3.x/upload/admin/view/template/extension/payment/robokassa.twig index 59210c8..343d8ba 100644 --- a/OpenCart 3.x/upload/admin/view/template/extension/payment/robokassa.twig +++ b/OpenCart 3.x/upload/admin/view/template/extension/payment/robokassa.twig @@ -250,9 +250,11 @@
- +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
@@ -407,4 +469,4 @@ } ); -{{ footer }} \ No newline at end of file +{{ footer }} From ec16ca5f13ecb31497e78c31e23e7944115f2d0d Mon Sep 17 00:00:00 2001 From: RTechSn <119056784+RTechSn@users.noreply.github.com> Date: Mon, 1 Jul 2024 17:42:23 +0300 Subject: [PATCH 8/8] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=BE=D0=B2=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=85=D0=BE=D0=BB=D0=B4=D0=B8=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/extension/payment/robokassa.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/OpenCart 3.x/upload/catalog/controller/extension/payment/robokassa.php b/OpenCart 3.x/upload/catalog/controller/extension/payment/robokassa.php index f5fba8a..1eea5e9 100644 --- a/OpenCart 3.x/upload/catalog/controller/extension/payment/robokassa.php +++ b/OpenCart 3.x/upload/catalog/controller/extension/payment/robokassa.php @@ -280,6 +280,7 @@ public function result() $order_info = $this->model_checkout_order->getOrder($order_id); $new_order_status_id = $this->config->get('payment_robokassa_order_status_id'); + $message = 'Статус заказа успешно изменен'; echo 'OK' . $this->request->post["InvId"]; @@ -288,10 +289,10 @@ public function result() } if ($order_info['order_status_id'] != $new_order_status_id) { - $this->model_checkout_order->addOrderHistory($order_id, $new_order_status_id); + $this->model_checkout_order->addOrderHistory($order_id, $new_order_status_id, $message); if ($this->config->get('payment_robokassa_test')) { - $this->log->write('ROBOKASSA в заказе: ' . $order_id . '. Статус заказа успешно изменен'); + $this->log->write('ROBOKASSA в заказе: ' . $order_id . '. ' . $message); } } @@ -332,7 +333,7 @@ public function result2() $order->update_status('on-hold');*/ $order_id = $json_data['data']['invId']; $order_info = $this->model_checkout_order->getOrder($order_id); - $new_order_status_id = 1; // Идентификатор статуса "Pending" + $new_order_status_id = $this->config->get('payment_robokassa_order_status_id_pending'); // Идентификатор статуса "Pending" $message = "Robokassa: Платеж захолдирован."; if ($order_info['order_status_id'] == 0) { @@ -350,7 +351,7 @@ public function result2() // Изменяем статус заказа $order_id = $json_data['data']['invId']; $order_info = $this->model_checkout_order->getOrder($order_id); - $new_order_status_id = 2; // Идентификатор статуса "Processing" + $new_order_status_id = $this->config->get('payment_robokassa_order_status_id_processing'); // Идентификатор статуса "Processing" $message = "Robokassa: Платеж успешно подтвержден."; if ($order_info['order_status_id'] == 0) { @@ -378,4 +379,4 @@ public function test() $this->model_extension_payment_robokassa->robokassa_hold_cancel(584); } -} \ No newline at end of file +}