Skip to content

Update to Drupal 10 #3

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.

Sign up for GitHub

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

Open
superromeo wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to Drupal 10 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion Drupal_8.3/Drupal 8.3 + Commerce 2/commerce_payment_interkassa/commerce_payment_ik.info.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ name: Commerce Payment Interkassa
type: module
description: 'Оплата с помощью Интеркассы'
package: Commerce
core: 8.x
core_version_requirement: ^8 || ^9|| ^10
dependencies:
- commerce:commerce_payment
2 changes: 1 addition & 1 deletion ...l_8.3/Drupal 8.3 + Commerce 2/commerce_payment_interkassa/src/Form/InterkassaAjaxForm.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $options
$form['payment_metod'] = array('#type' => 'hidden', '#value' => '');
foreach ($content as $name => $payway) {
$form['content'][$name]['image'] = [
'#url' => '/' . drupal_get_path('module', 'commerce_payment_ik') . '/images/' . $name . '.png',
'#url' => '/' . \Drupal::service('extension.list.module')->getPath('commerce_payment_ik') . '/images/' . $name . '.png',
];
foreach ($payway['currency'] as $currency => $currencyAlias) {
$form['content'][$name]['currency'][$currencyAlias] = [
Expand Down
2 changes: 1 addition & 1 deletion ...erce 2/commerce_payment_interkassa/src/Plugin/Commerce/PaymentGateway/OffsiteRedirect.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ public function onNotify(Request $request) {
$payment = $payment_storage->create([
'state' => 'completed',
'amount' => $order->getTotalPrice(),
'payment_gateway' => $this->entityId,
'payment_gateway' => $this->parentEntity->id(),
'order_id' => $order->id(),
'test' => $test,
'remote_id' => $post['ik_pm_no'],
Expand Down
54 changes: 29 additions & 25 deletions ..._8.3/Drupal 8.3 + Commerce 2/commerce_payment_interkassa/templates/payways-form.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,38 @@
3. Нажмите «Оплатить»
</h3>
<div class="row">
{% for key,value in form.content if key|first != '#' %}
<div class="col-sm-3 text-center payment_system">
<div class="panel panel-warning panel-pricing">
<div class="panel-heading">
<div class="panel-image">
<img src="{{ value.image['#url'] }}"
alt="{{ key }}">
</div>
</div>
<div class="form-group">
<div class="input-group">
<div class="radioBtn btn-group">
{% for currency ,currencyAlias in value.currency if currency|first != '#' %}
<a class="btn btn-primary btn-sm notActive"
data-toggle="fun"
data-payment ="{{ key }}"
data-title="{{ currency }}">{{ currencyAlias['#title'] }}</a>
{% endfor %}
{% for key,value in form.content %}
{% if key|first != '#' %}
<div class="col-sm-3 text-center payment_system">
<div class="panel panel-warning panel-pricing">
<div class="panel-heading">
<div class="panel-image">
<img src="{{ value.image['#url'] }}"
alt="{{ key }}">
</div>
</div>
<div class="form-group">
<div class="input-group">
<div class="radioBtn btn-group">
{% for currency ,currencyAlias in value.currency %}
{% if currency|first != '#' %}
<a class="btn btn-primary btn-sm notActive"
data-toggle="fun"
data-payment ="{{ key }}"
data-title="{{ currency }}">{{ currencyAlias['#title'] }}</a>
{% endif %}
{% endfor %}
</div>
</div>
</div>
<div class="clear"></div>
<div class="panel-footer">
<a class="btn, btn-lg, btn-block, btn-success, ik-payment-confirmation"
data-payment ="{{ key }}">{{ value.payment_confirmation['#title'] }}<br><strong>{{ value.payment_confirmation['#value'] }}</strong></a>
</div>
</div>
</div>
<div class="clear"></div>
<div class="panel-footer">
<a class="btn, btn-lg, btn-block, btn-success, ik-payment-confirmation"
data-payment ="{{ key }}">{{ value.payment_confirmation['#title'] }}<br><strong>{{ value.payment_confirmation['#value'] }}</strong></a>
</div>
</div>
</div>
{% endif %}
{% endfor %}
</div>
</div>