Skip to content

Commit 37a22a6

Browse files
fabiano-mallmannfabiano-mallmann
authored
Release 2.7.0 #388 
2 parents 0ba65f3 + 7214f33 commit 37a22a6

File tree

23 files changed

+96
-87
lines changed

23 files changed

+96
-87
lines changed

‎Block/Adminhtml/Form/Field/InstallmentsNumber.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Magento\Config\Block\System\Config\Form\Field;
77
use Magento\Config\Model\ResourceModel\Config\Data\CollectionFactory;
88
use Magento\Framework\Data\Form\Element\AbstractElement;
9+
use Pagarme\Core\Kernel\Services\InstallmentService;
910
use Pagarme\Pagarme\Model\Account;
1011
use Pagarme\Pagarme\Model\PagarmeConfigProvider;
1112

@@ -42,12 +43,16 @@ public function render(AbstractElement $element)
4243
$isGateway = $this->account->isGateway(PagarmeConfigProvider::CREDIT_CARD_PAYMENT_CONFIG);
4344
if ($isGateway) {
4445
$classes = $element->getClass();
45-
$classes = str_replace('number-range-1-12', '', $classes);
46-
$classes .= ' number-range-1-24';
46+
$classes = str_replace('number-range-1-' . InstallmentService::MAX_PSP_INSTALLMENTS_NUMBER, '', $classes);
47+
$classes .= ' number-range-1-' . InstallmentService::MAX_GATEWAY_INSTALLMENTS_NUMBER;
4748
$element->setClass($classes);
4849

4950
$comment = $element->getComment();
50-
$comment = str_replace('12', '24', $comment);
51+
$comment = str_replace(
52+
InstallmentService::MAX_PSP_INSTALLMENTS_NUMBER,
53+
InstallmentService::MAX_GATEWAY_INSTALLMENTS_NUMBER,
54+
$comment
55+
);
5156
$element->setComment($comment);
5257
}
5358
return parent::render($element);

‎Gateway/Transaction/Base/Command/InitializeCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ private function doCoreDetour($payment)
168168

169169
if (!$isSubscription) {
170170
$orderService = new OrderService();
171-
$pagarmeOrder = current($orderService->createOrderAtPagarme($orderDecorator));
171+
$pagarmeOrder = $orderService->createOrderAtPagarme($orderDecorator);
172172
$transaction = $pagarmeOrder->getPixOrBilletTransaction();
173173
if (!is_null($transaction)) {
174174
$this->checkoutSession->setPixOrBilletTransaction($transaction);

‎Model/PagarmeConfigProvider.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Magento\Framework\Exception\NoSuchEntityException;
99
use Magento\Store\Model\ScopeInterface;
1010
use Magento\Store\Model\StoreManagerInterface;
11+
use Pagarme\Core\Kernel\Services\InstallmentService;
1112
use Pagarme\Core\Middle\Model\Account\PaymentEnum;
1213
use Pagarme\Pagarme\Gateway\Transaction\Base\Config\ConfigInterface as PagarmeConfigInterface;
1314

@@ -64,7 +65,7 @@ class PagarmeConfigProvider implements ConfigProviderInterface
6465
const DEBIT_PAYMENT_CONFIG = 'pagarme_debit';
6566

6667
const PIX_PAYMENT_CONFIG = 'pagarme_pix';
67-
68+
6869
const GOOGLEPAY_PAYMENT_CONFIG = 'pagarme_googlepay';
6970

7071
const VOUCHER_PAYMENT_CONFIG = 'pagarme_voucher';
@@ -198,15 +199,14 @@ public function validateMaxInstallment()
198199
{
199200
$isGatewayIntegrationType = $this->isGatewayIntegrationType();
200201
$maxInstallment = $this->getMaxInstallment();
201-
$maxInstallmentForPSP = 12;
202202

203203
if (
204204
!$isGatewayIntegrationType
205-
&& $maxInstallment > $maxInstallmentForPSP
205+
&& $maxInstallment > InstallmentService::MAX_PSP_INSTALLMENTS_NUMBER
206206
) {
207207
$this->config->saveConfig(
208208
self::XML_PATH_MAX_INSTALLMENT,
209-
$maxInstallmentForPSP,
209+
InstallmentService::MAX_PSP_INSTALLMENTS_NUMBER,
210210
'default',
211211
0
212212
);

‎composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"name": "pagarme/pagarme-magento2-module",
33
"license": "MIT",
4-
"version": "2.6.2",
4+
"version": "2.7.0",
55
"type": "magento2-module",
66
"description": "Magento 2 Module Pagar.me",
77
"require": {
88
"php": ">=7.1",
9-
"pagarme/ecommerce-module-core": "2.7.1"
9+
"pagarme/ecommerce-module-core": "~2.8.0"
1010
},
1111
"require-dev": {
1212
"phpunit/phpunit": "^5 | ^6 | ^7 | ^8 | ^9",

‎etc/adminhtml/system.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<![CDATA[Pagar.me&nbsp;&nbsp;<i>Payment Solutions.</i>]]>
1111
</label>
1212
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\System\Config\Form\Fieldset\Group</frontend_model>
13-
<attribute type="displayIn">recommended_solutions</attribute>
1413
<fieldset_css>complex</fieldset_css>
1514
<include path="Pagarme_Pagarme::system/global.xml"/>
1615
<include path="Pagarme_Pagarme::system/customer-address.xml"/>

‎etc/adminhtml/system/transaction/creditcard/installments.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<field id="installments_number" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="30" translate="label comment" type="text">
2626
<label>Max number of installments</label>
2727
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
28-
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size'>12</span>.</p>]]></comment>
28+
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size'>18</span>.</p>]]></comment>
2929
<config_path>payment/pagarme_creditcard/installments_number</config_path>
30-
<validate>required-entry validate-number-range number-range-1-12</validate>
30+
<validate>required-entry validate-number-range number-range-1-18</validate>
3131
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
3232
<depends>
3333
<field id="installments_active">1</field>
@@ -84,7 +84,7 @@
8484
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
8585
<comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
8686
<config_path>payment/pagarme_creditcard/installments_max_without_interest</config_path>
87-
<validate>required-entry validate-number-range number-range-1-12</validate>
87+
<validate>required-entry validate-number-range number-range-1-18</validate>
8888
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
8989
<depends>
9090
<field id="installments_active">1</field>

‎etc/adminhtml/system/transaction/creditcard/installments/amex.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<field id="installments_number_amex" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
1616
<label>Max number of installments</label>
1717
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
18-
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_amex'>12</span>.</p>]]></comment>
18+
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_amex'>18</span>.</p>]]></comment>
1919
<config_path>payment/pagarme_creditcard/installments_number_amex</config_path>
20-
<validate>required-entry validate-number-range number-range-1-12</validate>
20+
<validate>required-entry validate-number-range number-range-1-18</validate>
2121
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
2222
</field>
2323
<field id="installment_min_amount_amex" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
5858
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
5959
<comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
6060
<config_path>payment/pagarme_creditcard/installments_max_without_interest_amex</config_path>
61-
<validate>required-entry validate-number-range number-range-1-12</validate>
61+
<validate>required-entry validate-number-range number-range-1-18</validate>
6262
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
6363
<depends>
6464
<field id="installments_interest_by_issuer_amex">1</field>

‎etc/adminhtml/system/transaction/creditcard/installments/aura.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<field id="installments_number_aura" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
1616
<label>Max number of installments</label>
1717
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
18-
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_aura'>12</span>.</p>]]></comment>
18+
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_aura'>18</span>.</p>]]></comment>
1919
<config_path>payment/pagarme_creditcard/installments_number_aura</config_path>
20-
<validate>required-entry validate-number-range number-range-1-12</validate>
20+
<validate>required-entry validate-number-range number-range-1-18</validate>
2121
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
2222
</field>
2323
<field id="installment_min_amount_aura" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
5858
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
5959
<comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
6060
<config_path>payment/pagarme_creditcard/installments_max_without_interest_aura</config_path>
61-
<validate>required-entry validate-number-range number-range-1-12</validate>
61+
<validate>required-entry validate-number-range number-range-1-18</validate>
6262
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
6363
<depends>
6464
<field id="installments_interest_by_issuer_aura">1</field>

‎etc/adminhtml/system/transaction/creditcard/installments/banese.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
<field id="installments_number_banese" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
1717
<label>Max number of installments</label>
1818
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
19-
<comment><![CDATA[<p>Insert a number between 1 and 24.</p>]]></comment>
19+
<comment><![CDATA[<p>Insert a number between 1 and 18.</p>]]></comment>
2020
<config_path>payment/pagarme_creditcard/installments_number_banese</config_path>
21-
<validate>required-entry validate-number-range number-range-1-12</validate>
21+
<validate>required-entry validate-number-range number-range-1-18</validate>
2222
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
2323
</field>
2424
<field id="installment_min_amount_banese" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -59,7 +59,7 @@
5959
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
6060
<comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
6161
<config_path>payment/pagarme_creditcard/installments_max_without_interest_banese</config_path>
62-
<validate>required-entry validate-number-range number-range-1-12</validate>
62+
<validate>required-entry validate-number-range number-range-1-18</validate>
6363
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
6464
<depends>
6565
<field id="installments_interest_by_issuer_banese">1</field>

‎etc/adminhtml/system/transaction/creditcard/installments/cabal.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
<field id="installments_number_cabal" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
1717
<label>Max number of installments</label>
1818
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
19-
<comment><![CDATA[<p>Insert a number between 1 and 24.</p>]]></comment>
19+
<comment><![CDATA[<p>Insert a number between 1 and 18.</p>]]></comment>
2020
<config_path>payment/pagarme_creditcard/installments_number_cabal</config_path>
21-
<validate>required-entry validate-number-range number-range-1-12</validate>
21+
<validate>required-entry validate-number-range number-range-1-18</validate>
2222
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
2323
</field>
2424
<field id="installment_min_amount_cabal" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -59,7 +59,7 @@
5959
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
6060
<comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
6161
<config_path>payment/pagarme_creditcard/installments_max_without_interest_cabal</config_path>
62-
<validate>required-entry validate-number-range number-range-1-12</validate>
62+
<validate>required-entry validate-number-range number-range-1-18</validate>
6363
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
6464
<depends>
6565
<field id="installments_interest_by_issuer_cabal">1</field>

‎etc/adminhtml/system/transaction/creditcard/installments/credz.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
<field id="installments_number_credz" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
1717
<label>Max number of installments</label>
1818
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
19-
<comment><![CDATA[<p>Insert a number between 1 and 24.</p>]]></comment>
19+
<comment><![CDATA[<p>Insert a number between 1 and 18.</p>]]></comment>
2020
<config_path>payment/pagarme_creditcard/installments_number_credz</config_path>
21-
<validate>required-entry validate-number-range number-range-1-12</validate>
21+
<validate>required-entry validate-number-range number-range-1-18</validate>
2222
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
2323
</field>
2424
<field id="installment_min_amount_credz" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -59,7 +59,7 @@
5959
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
6060
<comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
6161
<config_path>payment/pagarme_creditcard/installments_max_without_interest_credz</config_path>
62-
<validate>required-entry validate-number-range number-range-1-12</validate>
62+
<validate>required-entry validate-number-range number-range-1-18</validate>
6363
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
6464
<depends>
6565
<field id="installments_interest_by_issuer_credz">1</field>

‎etc/adminhtml/system/transaction/creditcard/installments/diners.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<field id="installments_number_diners" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
1616
<label>Max number of installments</label>
1717
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
18-
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_diners'>12</span>.</p>]]></comment>
18+
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_diners'>18</span>.</p>]]></comment>
1919
<config_path>payment/pagarme_creditcard/installments_number_diners</config_path>
20-
<validate>required-entry validate-number-range number-range-1-12</validate>
20+
<validate>required-entry validate-number-range number-range-1-18</validate>
2121
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
2222
</field>
2323
<field id="installment_min_amount_diners" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
5858
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
5959
<comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
6060
<config_path>payment/pagarme_creditcard/installments_max_without_interest_diners</config_path>
61-
<validate>required-entry validate-number-range number-range-1-12</validate>
61+
<validate>required-entry validate-number-range number-range-1-18</validate>
6262
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
6363
<depends>
6464
<field id="installments_interest_by_issuer_diners">1</field>

‎etc/adminhtml/system/transaction/creditcard/installments/discover.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<field id="installments_number_discover" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label comment" type="text">
1616
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
1717
<label>Max number of installments</label>
18-
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_discover'>12</span>.</p>]]></comment>
18+
<comment><![CDATA[<p>Insert a number between 1 and <span id='installments_max_size_discover'>18</span>.</p>]]></comment>
1919
<config_path>payment/pagarme_creditcard/installments_number_discover</config_path>
20-
<validate>required-entry validate-number-range number-range-1-12</validate>
20+
<validate>required-entry validate-number-range number-range-1-18</validate>
2121
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
2222
</field>
2323
<field id="installment_min_amount_discover" showInDefault="1" showInStore="1" showInWebsite="1" sortOrder="20" translate="label" type="text">
@@ -58,7 +58,7 @@
5858
<backend_model>Pagarme\Pagarme\Model\Validation\GenericValidation</backend_model>
5959
<comment><![CDATA[<p>Insert a number between 1 and the <b>Max number of installments</b>.</p>]]></comment>
6060
<config_path>payment/pagarme_creditcard/installments_max_without_interest_discover</config_path>
61-
<validate>required-entry validate-number-range number-range-1-12</validate>
61+
<validate>required-entry validate-number-range number-range-1-18</validate>
6262
<frontend_model>Pagarme\Pagarme\Block\Adminhtml\Form\Field\InstallmentsNumber</frontend_model>
6363
<depends>
6464
<field id="installments_interest_by_issuer_discover">1</field>

0 commit comments

Comments
 (0)