Merge pull request #44 from Snickser/dev

Dev
Snickser · Sep 5, 2024 · 1937f68 · 1937f68
2 parents 3b31e32 + 388e5e0
commit 1937f68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,16 +1,11 @@
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/snickser) support me with a donation.
-
 ## CryptoCloud payment gateway plugin for Moodle.
 
-v0.12
-
-https://cryptocloud.plus/
+[![](https://img.shields.io/github/v/release/Snickser/moodle-paygw_cryptocloud.svg)](https://github.com/Snickser/moodle-paygw_cryptocloud/releases)
+[![Build Status](https://github.com/Snickser/moodle-paygw_cryptocloud/actions/workflows/moodle-ci.yml/badge.svg)](https://github.com/Snickser/moodle-paygw_cryptocloud/actions/workflows/moodle-ci.yml)
 
 ![img](https://raw.githubusercontent.com/Snickser/moodle-paygw_cryptocloud/d48eb290dee4d843ba8e0c07911b64ead7db8bb7/pix/img.svg)
 
-## Status
-
-[![Build Status](https://github.com/Snickser/moodle-paygw_cryptocloud/actions/workflows/moodle-ci.yml/badge.svg)](https://github.com/Snickser/moodle-paygw_cryptocloud/actions/workflows/moodle-ci.yml)
+https://cryptocloud.plus/
 
 ## Recommendations
 

diff --git a/classes/gateway.php b/classes/gateway.php
@@ -55,11 +55,11 @@ public static function add_configuration_to_gateway_form(\core_payment\form\acco
         $mform->setType('shopid', PARAM_TEXT);
         $mform->addRule('shopid', get_string('required'), 'required', null, 'client');
 
-        $mform->addElement('text', 'apikey', get_string('apikey', 'paygw_cryptocloud'), ['size' => 50]);
+        $mform->addElement('text', 'apikey', get_string('apikey', 'paygw_cryptocloud'), ['size' => 30]);
         $mform->setType('apikey', PARAM_TEXT);
         $mform->addRule('apikey', get_string('required'), 'required', null, 'client');
 
-        $mform->addElement('text', 'secretkey', get_string('secretkey', 'paygw_cryptocloud'), ['size' => 50]);
+        $mform->addElement('text', 'secretkey', get_string('secretkey', 'paygw_cryptocloud'), ['size' => 30]);
         $mform->setType('secretkey', PARAM_TEXT);
         $mform->addRule('secretkey', get_string('required'), 'required', null, 'client');
 
@@ -89,7 +89,6 @@ public static function add_configuration_to_gateway_form(\core_payment\form\acco
         $mform->addElement(
             'advcheckbox',
             'skipmode',
-            get_string('skipmode', 'paygw_cryptocloud'),
             get_string('skipmode', 'paygw_cryptocloud')
         );
         $mform->setType('skipmode', PARAM_INT);
@@ -98,7 +97,6 @@ public static function add_configuration_to_gateway_form(\core_payment\form\acco
         $mform->addElement(
             'advcheckbox',
             'passwordmode',
-            get_string('passwordmode', 'paygw_cryptocloud'),
             get_string('passwordmode', 'paygw_cryptocloud')
         );
         $mform->setType('passwordmode', PARAM_INT);
@@ -113,7 +111,6 @@ public static function add_configuration_to_gateway_form(\core_payment\form\acco
         $mform->addElement(
             'advcheckbox',
             'usedetails',
-            get_string('usedetails', 'paygw_cryptocloud'),
             get_string('usedetails', 'paygw_cryptocloud')
         );
         $mform->setType('usedetails', PARAM_INT);
@@ -122,15 +119,13 @@ public static function add_configuration_to_gateway_form(\core_payment\form\acco
         $mform->addElement(
             'advcheckbox',
             'showduration',
-            get_string('showduration', 'paygw_cryptocloud'),
             get_string('showduration', 'paygw_cryptocloud')
         );
         $mform->setType('showduration', PARAM_INT);
 
         $mform->addElement(
             'advcheckbox',
             'fixcost',
-            get_string('fixcost', 'paygw_cryptocloud'),
             get_string('fixcost', 'paygw_cryptocloud')
         );
         $mform->setType('fixcost', PARAM_INT);
@@ -152,8 +147,10 @@ public static function add_configuration_to_gateway_form(\core_payment\form\acco
         $mform->addElement('html', $CFG->wwwroot . '/payment/gateway/cryptocloud/return.php<br>');
         $mform->addElement('html', get_string('callback_help', 'paygw_cryptocloud') . '</div><br>');
 
-        $header = '<div>Новые версии плагина вы можете найти на
- <a href=https://github.com/Snickser/moodle-paygw_cryptocloud>GitHub.com</a><br>
+        $plugininfo = \core_plugin_manager::instance()->get_plugin_info('paygw_cryptocloud');
+        $header = "<div>Версия плагина: $plugininfo->release ($plugininfo->versiondisk)<br>" .
+        'Новые версии плагина вы можете найти на <a href=https://github.com/Snickser/moodle-paygw_cryptocloud>GitHub.com</a>
+ <img src="https://img.shields.io/github/v/release/Snickser/moodle-paygw_cryptocloud.svg"><br>
  Пожалуйста, отправьте мне немножко <a href="https://yoomoney.ru/fundraise/143H2JO3LLE.240720">доната</a>😊</div>
  <iframe src="https://yoomoney.ru/quickpay/fundraise/button?billNumber=143H2JO3LLE.240720"
  width="330" height="50" frameborder="0" allowtransparency="true" scrolling="no"></iframe>';

diff --git a/version.php b/version.php
@@ -24,8 +24,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2024072101;
+$plugin->version   = 2024090500;
 $plugin->requires  = 2023100900;
 $plugin->component = 'paygw_cryptocloud';
-$plugin->release   = '0.12';
+$plugin->release   = '0.13';
 $plugin->maturity  = MATURITY_STABLE;