From 84f47e619edee6b9bf57cf176a5a77f02237e239 Mon Sep 17 00:00:00 2001 From: Snickser Date: Sat, 14 Dec 2024 11:40:38 +0300 Subject: [PATCH 1/7] add --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7c1894d..a664959 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ https://robokassa.com ## Рекомендации + Moodle 4.3+ -+ Для записи в курс используйте мой пропатченный плагин "Зачисление за оплату" [enrol_fee](https://github.com/Snickser/moodle-enrol_fee/tree/dev). ++ Для записи в курс используйте мой пропатченный плагин "Зачисление за оплату" [enrol_yafee](https://github.com/Snickser/moodle-enrol_yafee). + Для контрольного задания используйте пропатченный мной плагин по ссылке [mod_gwpayments](https://github.com/Snickser/moodle-mod_gwpayments/tree/dev). + Для ограничения доступности используйте пропатченный мной плагин по ссылке [availability_gwpayments](https://github.com/Snickser/moodle-availability_gwpayments/tree/dev). + Плагин просмотра отчётов и отключения регулярных платежей [report_payments](https://github.com/Snickser/moodle-report_payments/tree/dev). From a2fc7e0557328c1858242c8aaf1ae75af0bdeb96 Mon Sep 17 00:00:00 2001 From: Snickser Date: Sat, 14 Dec 2024 11:42:16 +0300 Subject: [PATCH 2/7] add --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a664959..0ff7288 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ https://robokassa.com + Можно использовать пароль или кнопку для обхода платежа. + Сохраняет в базе номер курса и название группы студента. + Можно указать рекомендуемую цену, ограничить максимальную цену, или включить режим фиксированной цены. -+ Отображание продолжительности обучения (для enrol_fee и mod_gwpaymets), если она установлена. ++ Отображание продолжительности обучения (для enrol_yafee и mod_gwpaymets), если она установлена. + Конвертация валют на стороне банка (usd, eur, kzt). + Поддержка пароля из модуля курса (mod_gwpaymets). + Оповещение пользователя при успешном платеже. From 2f2b00cfc4cd173c8b35b6fa5ea6a250b40ab004 Mon Sep 17 00:00:00 2001 From: Snickser Date: Sun, 15 Dec 2024 08:37:04 +0300 Subject: [PATCH 3/7] fix --- pay.php | 6 ++++-- version.php | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pay.php b/pay.php index 2793e86..48645ee 100644 --- a/pay.php +++ b/pay.php @@ -104,6 +104,10 @@ // Build redirect. $url = helper::get_success_url($component, $paymentarea, $itemid); +// Set the context of the page. +$PAGE->set_url($CFG->wwwroot.$SCRIPT); +$PAGE->set_context(context_system::instance()); + // Check passwordmode or skipmode. if (!empty($password) || $skipmode) { $success = false; @@ -283,8 +287,6 @@ $url = 'https://auth.robokassa.ru/Merchant/Index/' . $response->invoiceID; -// Set the context of the page. -$PAGE->set_context(context_system::instance()); // Notify user. if ($config->sendlinkmsg || is_siteadmin()) { diff --git a/version.php b/version.php index 20f9d74..5f831e5 100644 --- a/version.php +++ b/version.php @@ -24,7 +24,7 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2024121301; +$plugin->version = 2024121500; $plugin->requires = 2023100900; $plugin->component = 'paygw_robokassa'; $plugin->release = '2.8'; From 5f4ce6134642ee716230d6303073e7b56ff45b4f Mon Sep 17 00:00:00 2001 From: Snickser Date: Sun, 15 Dec 2024 08:59:52 +0300 Subject: [PATCH 4/7] fix --- pay.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pay.php b/pay.php index 48645ee..74d084c 100644 --- a/pay.php +++ b/pay.php @@ -105,7 +105,7 @@ $url = helper::get_success_url($component, $paymentarea, $itemid); // Set the context of the page. -$PAGE->set_url($CFG->wwwroot.$SCRIPT); +$PAGE->set_url($SCRIPT); $PAGE->set_context(context_system::instance()); // Check passwordmode or skipmode. From c53f638b9509fda824c77b26b66b7350edbc5410 Mon Sep 17 00:00:00 2001 From: Snickser Date: Mon, 16 Dec 2024 08:40:12 +0300 Subject: [PATCH 5/7] fix --- lang/en/paygw_robokassa.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lang/en/paygw_robokassa.php b/lang/en/paygw_robokassa.php index 239780c..fefc553 100644 --- a/lang/en/paygw_robokassa.php +++ b/lang/en/paygw_robokassa.php @@ -66,7 +66,6 @@ $string['sbp'] = 'SBP'; $string['internalerror'] = 'An internal error has occurred. Please contact us.'; -$string['privacy:metadata'] = 'The Robokassa plugin does not store any personal data.'; $string['tax'] = 'VAT rate'; $string['tax_help'] = 'VAT rate according to YooKass documentation.'; @@ -78,7 +77,7 @@ 4 - Unified Agricultural Tax (UST)
5 - Patent taxation system'; -$string['privacy:metadata'] = 'The robokassa plugin store some personal data.'; +$string['privacy:metadata'] = 'The Robokassa plugin store some personal data.'; $string['privacy:metadata:paygw_robokassa:paygw_robokassa'] = 'Store some data'; $string['privacy:metadata:paygw_robokassa:shopid'] = 'Shopid'; $string['privacy:metadata:paygw_robokassa:paymentid'] = 'Paymentid'; From b6f734ab347c1ea082ea6675bc86bcfcf33e2257 Mon Sep 17 00:00:00 2001 From: Snickser Date: Mon, 16 Dec 2024 08:40:24 +0300 Subject: [PATCH 6/7] version --- version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.php b/version.php index 5f831e5..5a01fa8 100644 --- a/version.php +++ b/version.php @@ -24,7 +24,7 @@ defined('MOODLE_INTERNAL') || die(); -$plugin->version = 2024121500; +$plugin->version = 2024121600; $plugin->requires = 2023100900; $plugin->component = 'paygw_robokassa'; $plugin->release = '2.8'; From 918d1012f9b6a9b0585e63e6513afaa39d545e3e Mon Sep 17 00:00:00 2001 From: Snickser Date: Mon, 16 Dec 2024 08:45:07 +0300 Subject: [PATCH 7/7] fix --- lang/en/paygw_robokassa.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lang/en/paygw_robokassa.php b/lang/en/paygw_robokassa.php index fefc553..aab9fb1 100644 --- a/lang/en/paygw_robokassa.php +++ b/lang/en/paygw_robokassa.php @@ -95,10 +95,6 @@ You transaction of payment id {$a->orderid} with cost of {$a->localizedcost} is successfully completed. If the item is not accessable please contact the administrator.'; -$string['message_success_completed'] = 'Hello {$a->firstname}, -You transaction of payment id {$a->orderid} with cost of {$a->fee} {$a->currency} for "{$a->description}" is successfully completed. -If the item is not accessable please contact the administrator.'; - $string['message_recurrent_created'] = 'Hello, {$a->firstname}! Regular payment No. {$a->orderid} at {$a->localizedcost} is ready for payment. You can disable regular payments in the Reports (payment) section in your personal profile {$a->$url}/user/profile.php';