Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #62

Merged
merged 3 commits into from
Sep 5, 2024
Merged

Dev #62

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lang/en/paygw_yookassa.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@
$string['recurrentperioderror'] = 'Specify the frequency';
$string['recurrentday'] = 'Day of payments';
$string['recurrentday_help'] = 'Sets the day of the month on which the next debits will occur. If not set, payments will be made according to a cyclic schedule';
$string['recurrentdesc'] = 'This payment will be recurring! The amount and date of the next payment may change.<br>
You can disable recurring payments in your Profile in the Reports section "Payment and recurring subscriptions".';

$string['recurrentcost'] = 'Recurring payment cost';
$string['recurrentcost_help'] = 'Specify what price to charge when making a recurring payment:<br>
Expand Down
2 changes: 2 additions & 0 deletions lang/ru/paygw_yookassa.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@
$string['recurrentperioderror'] = 'Укажите периодичность';
$string['recurrentday'] = 'День ежемесячного платежа';
$string['recurrentday_help'] = 'Указывает день месяца в который будут происходить очередные списания. Если не установлено, то платежи будут производится по цикличному расписанию';
$string['recurrentdesc'] = 'Этот платёж будет регулярным! Cумма и дата следующего платежа может измениться.<br>
Отключить регулярные платежи вы можете в своём Профиле в разделе Отчёты "Оплата и регулярные подписки".';

$string['recurrentcost'] = 'Стоимость регулярного платежа';
$string['recurrentcost_help'] = 'Указывает какую цену брать при проведении регулярного платежа:<br>
Expand Down
2 changes: 2 additions & 0 deletions method.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@
$templatedata->description = $description;
}

$templatedata->recurrent = $config->recurrent;

$templatedata->image = $OUTPUT->image_url('img', 'paygw_yookassa');

echo $OUTPUT->render_from_template('paygw_yookassa/method', $templatedata);
Expand Down
5 changes: 5 additions & 0 deletions templates/method.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"maxcost": "10",
"fixdesc": "1",
"fixcost": "0",
"recurrent": "1",
"localizedcost": "1 $"
}

Expand Down Expand Up @@ -66,6 +67,10 @@
<h4>{{# str }} enrolperiod, enrol {{/ str}} ({{enrolperiod_desc}}): {{enrolperiod}}</h4>
{{/enrolperiod}}

{{#recurrent}}
<h5>{{# str }} recurrentdesc, paygw_yookassa {{/ str}}</h5>
{{/recurrent}}

<br>
<img src="{{{image}}}" alt="yookassa" height="40">

Expand Down
4 changes: 2 additions & 2 deletions version.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@

defined('MOODLE_INTERNAL') || die();

$plugin->version = 2024090400;
$plugin->version = 2024090500;
$plugin->requires = 2023100900;
$plugin->component = 'paygw_yookassa';
$plugin->release = '2.3';
$plugin->release = '2.4';
$plugin->maturity = MATURITY_STABLE;