Skip to content

Commit

Permalink
0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
dmitrii-fediuk committed Sep 19, 2017
1 parent fa2e3fc commit b80e6a6
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 9 deletions.
4 changes: 1 addition & 3 deletions ConfigProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@ function options() {return $this->s()->options()->o(true);}
* @used-by \Df\Payment\ConfigProvider::getConfig()
* @return array(string => mixed)
*/
protected function config() {return self::configOptions($this) + parent::config() + [
'needShowOptions' => $this->s()->options()->needShow()
];}
protected function config() {return self::configOptions($this) + parent::config();}
}
2 changes: 1 addition & 1 deletion Settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
final class Settings extends \Df\Payment\Settings {
/**
* 2017-09-17
* @used-by \Dfe\YandexKassa\ConfigProvider::config()
* @used-by \Dfe\YandexKassa\ConfigProvider::options()
* @return O
*/
function options() {return $this->_options(OptionSource::class);}
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "mage2pro/yandex-kassa"
,"version": "0.1.2"
,"version": "0.1.3"
,"description": "The «Yandex.Kassa» (Яндекс.Касса, Yandex.Checkout) payment extension for Magento 2."
,"type": "magento2-module"
,"homepage": "https://mage2.pro/c/extensions/yandex-kassa"
Expand All @@ -11,7 +11,7 @@
"homepage": "https://mage2.pro/users/dmitry_fedyuk",
"role": "Developer"
}]
,"require": {"mage2pro/core": ">=2.12.6"}
,"require": {"mage2pro/core": ">=2.12.7"}
,"autoload": {"files": ["registration.php"], "psr-4": {"Dfe\\YandexKassa\\": ""}}
,"keywords": [
"API"
Expand Down
27 changes: 24 additions & 3 deletions etc/adminhtml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,17 +169,38 @@
type='textarea'
>
<label>Options Prompt</label>
<comment><![CDATA[A text above the Yandex.Kassa payment options on the Magento checkout page.<br/>You can use the HTML tags. Also you set the desciption empty to hide it.]]></comment>
<comment><![CDATA[A text above the Yandex.Kassa payment options on the Magento checkout page.<br/>You can use the HTML tags. Also you set the prompt empty to hide it.]]></comment>
<depends>
<field id='enable'>1</field>
<field id='optionsLocation'>magento</field>
</depends>
</field>
<field
id='optionsLimit'
dfRows='3'
id='optionsDescription'
showInDefault='1' showInStore='1' showInWebsite='1'
sortOrder='12'
translate='label'
type='Df\Framework\Form\Element\Textarea'
>
<label>Options Description</label>
<comment><![CDATA[A text to be shown on the Magento checkout page instead of the payment options dialog (as you have chosen to show the payment options on the Yandex.Kassa side, the options dialog will not be shown on the Magento checkout screen).
<br/>You can:
<ul class='df-note'>
<li>Use the HTML tags.</li>
<li>Use the <code>{options}</code> variable. It will be substituted with the available payment options.</li>
<li>Set the description empty to hide it.</li>
</ul>]]></comment>
<depends>
<field id='enable'>1</field>
<field id='optionsLocation'>psp</field>
</depends>
</field>
<field
id='optionsLimit'
showInDefault='1' showInStore='1' showInWebsite='1'
sortOrder='13'
translate='label'
type='Df\Framework\Form\Element\Checkbox'
>
<label>Limit the payment options availability?</label>
Expand All @@ -193,7 +214,7 @@
<field
id='optionsAllowed'
showInDefault='1' showInStore='1' showInWebsite='1'
sortOrder='13'
sortOrder='14'
translate='label'
type='Df\Framework\Form\Element\Multiselect'
>
Expand Down
1 change: 1 addition & 0 deletions etc/config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ https://tech.yandex.com/money/doc/payment-solution/payment-form/payment-form-htt
<max_length>64</max_length>
</identification_rules>
<optionsAllowed>AB,AC,EP,GP,KV,MA,MC,MP,PB,PC,QW,SB,WM</optionsAllowed>
<optionsDescription><![CDATA[После нажатия кнопки «<b>Оплатить</b>» Вы будете перенаправлены на платёжную страницу Яндекс.Кассы, где Вам будут доступны следующие способы оплаты: {options}.]]></optionsDescription>
<optionsLocation>magento</optionsLocation>
<optionsPrompt><![CDATA[Пожалуйста, выберите способ оплаты и нажмите внизу кнопку «<b>Оплатить</b>»]]></optionsPrompt>
<requireBillingAddress>1</requireBillingAddress>
Expand Down

0 comments on commit b80e6a6

Please sign in to comment.