From bb81d8d86f0fb6ee94939b880e4435702373f866 Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Wed, 14 Aug 2019 08:46:30 +0200 Subject: [PATCH 1/4] Check the active flag on every upgrade --- Setup/UpgradeData.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Setup/UpgradeData.php b/Setup/UpgradeData.php index b33dcacefbe..16e42814f7d 100644 --- a/Setup/UpgradeData.php +++ b/Setup/UpgradeData.php @@ -91,14 +91,13 @@ public function upgrade( $this->removeBitcoinConfiguration(); } - if (version_compare($context->getVersion(), '1.6.1', '<')) { - $this->upgradeActiveState(); - } - if (version_compare($context->getVersion(), '1.6.2', '<')) { $this->addIndexes($setup); } + // This should run every time + $this->upgradeActiveState(); + $setup->endSetup(); } From fa143d75ca36d2286d0aad01b4fb7428c7f2fab4 Mon Sep 17 00:00:00 2001 From: Michiel Gerritsen Date: Wed, 14 Aug 2019 15:38:49 +0200 Subject: [PATCH 2/4] New feature: Implemented the expiresAt parameter. Now you can set a number of days before an order get marked as expired --- Block/Form/Paymentlink.php | 29 +++++- Model/Client/Orders.php | 18 +++- Model/Mollie.php | 2 +- Model/MollieConfigProvider.php | 17 ++-- Service/Mollie/Order/Transaction/Expires.php | 89 +++++++++++++++++++ .../Block/Form/PaymentlinkTest.php | 38 ++++++++ Test/Integration/Model/Client/OrdersTest.php | 36 ++++++++ .../Service/Order/Transaction/ExpiresTest.php | 83 +++++++++++++++++ .../App/Request/CsrfValidatorSkipTest.php | 8 ++ etc/adminhtml/methods/applepay.xml | 13 ++- etc/adminhtml/methods/bancontact.xml | 13 ++- etc/adminhtml/methods/banktransfer.xml | 13 ++- etc/adminhtml/methods/belfius.xml | 13 ++- etc/adminhtml/methods/creditcard.xml | 13 ++- etc/adminhtml/methods/eps.xml | 13 ++- etc/adminhtml/methods/giftcard.xml | 13 ++- etc/adminhtml/methods/giropay.xml | 13 ++- etc/adminhtml/methods/ideal.xml | 13 ++- etc/adminhtml/methods/inghomepay.xml | 13 ++- etc/adminhtml/methods/kbc.xml | 13 ++- etc/adminhtml/methods/klarnapaylater.xml | 13 ++- etc/adminhtml/methods/klarnasliceit.xml | 13 ++- etc/adminhtml/methods/mybank.xml | 11 +++ etc/adminhtml/methods/paymentlink.xml | 13 ++- etc/adminhtml/methods/paypal.xml | 13 ++- etc/adminhtml/methods/paysafecard.xml | 13 ++- etc/adminhtml/methods/przelewy24.xml | 13 ++- etc/adminhtml/methods/sofort.xml | 13 ++- .../templates/form/mollie_paymentlink.phtml | 39 ++++++-- view/adminhtml/web/css/styles.css | 6 +- 30 files changed, 573 insertions(+), 37 deletions(-) create mode 100644 Service/Mollie/Order/Transaction/Expires.php create mode 100644 Test/Integration/Block/Form/PaymentlinkTest.php create mode 100644 Test/Integration/Service/Order/Transaction/ExpiresTest.php diff --git a/Block/Form/Paymentlink.php b/Block/Form/Paymentlink.php index 342d153656e..988d5c2cbfc 100644 --- a/Block/Form/Paymentlink.php +++ b/Block/Form/Paymentlink.php @@ -6,6 +6,9 @@ namespace Mollie\Payment\Block\Form; +use Magento\Framework\View\Element\Template\Context; +use Mollie\Payment\Service\Mollie\Order\Transaction\Expires; + /** * Class Paymentlink * @@ -13,10 +16,34 @@ */ class Paymentlink extends \Magento\Payment\Block\Form { - /** * @var string */ protected $_template = 'Mollie_Payment::form/mollie_paymentlink.phtml'; + /** + * @var Expires + */ + private $expires; + + public function __construct( + Context $context, + Expires $expires, + array $data = [] + ) { + parent::__construct($context, $data); + $this->expires = $expires; + } + + public function getExpiresAt() + { + $storeId = $this->getRequest()->getParam('store_id'); + + $days = $this->expires->getExpiresAtForMethod('paymentlink', $storeId); + if (!$days) { + return $days; + } + + return $this->expires->atDateForMethod('paymentlink'); + } } diff --git a/Model/Client/Orders.php b/Model/Client/Orders.php index a60e62529c8..bcb8865e653 100644 --- a/Model/Client/Orders.php +++ b/Model/Client/Orders.php @@ -26,6 +26,7 @@ use Mollie\Payment\Model\Adminhtml\Source\InvoiceMoment; use Mollie\Payment\Model\OrderLines; use Mollie\Payment\Service\Mollie\Order\RefundUsingPayment; +use Mollie\Payment\Service\Mollie\Order\Transaction\Expires; use Mollie\Payment\Service\Order\Lines\StoreCredit; use Mollie\Payment\Service\Order\OrderCommentHistory; use Mollie\Payment\Service\Order\PartialInvoice; @@ -101,6 +102,10 @@ class Orders extends AbstractModel * @var PartialInvoice */ private $partialInvoice; + /** + * @var Expires + */ + private $expires; /** * Orders constructor. @@ -116,10 +121,11 @@ class Orders extends AbstractModel * @param Registry $registry * @param MollieHelper $mollieHelper * @param ProcessAdjustmentFee $adjustmentFee - * @param StoreCredit $storeCredit - * @param RefundUsingPayment $refundUsingPayment * @param OrderCommentHistory $orderCommentHistory * @param PartialInvoice $partialInvoice + * @param StoreCredit $storeCredit + * @param RefundUsingPayment $refundUsingPayment + * @param Expires $expires */ public function __construct( OrderLines $orderLines, @@ -136,7 +142,8 @@ public function __construct( OrderCommentHistory $orderCommentHistory, PartialInvoice $partialInvoice, StoreCredit $storeCredit, - RefundUsingPayment $refundUsingPayment + RefundUsingPayment $refundUsingPayment, + Expires $expires ) { $this->orderLines = $orderLines; $this->orderSender = $orderSender; @@ -153,6 +160,7 @@ public function __construct( $this->refundUsingPayment = $refundUsingPayment; $this->orderCommentHistory = $orderCommentHistory; $this->partialInvoice = $partialInvoice; + $this->expires = $expires; } /** @@ -210,6 +218,10 @@ public function startTransaction(Order $order, $mollieApi) $orderData['method'] = $additionalData['limited_methods']; } + if ($this->expires->availableForMethod($method, $storeId)) { + $orderData['expiresAt'] = $this->expires->atDateForMethod($method, $storeId); + } + $this->mollieHelper->addTolog('request', $orderData); $mollieOrder = $mollieApi->orders->create($orderData); $this->processResponse($order, $mollieOrder); diff --git a/Model/Mollie.php b/Model/Mollie.php index 9be60463c38..fdc05a09466 100644 --- a/Model/Mollie.php +++ b/Model/Mollie.php @@ -198,7 +198,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null) } $activeMethods = $this->mollieHelper->getAllActiveMethods($quote->getStoreId()); - if (!array_key_exists($this->_code, $activeMethods)) { + if ($this->_code != 'mollie_methods_paymentlink' && !array_key_exists($this->_code, $activeMethods)) { return false; } diff --git a/Model/MollieConfigProvider.php b/Model/MollieConfigProvider.php index c88f7f9ae79..7fb57d38032 100644 --- a/Model/MollieConfigProvider.php +++ b/Model/MollieConfigProvider.php @@ -79,6 +79,11 @@ class MollieConfigProvider implements ConfigProviderInterface */ private $checkoutSession; + /** + * @var array|null + */ + private $methodData; + /** * MollieConfigProvider constructor. * @@ -198,10 +203,8 @@ public function getConfig() */ public function getActiveMethods($mollieApi) { - static $methodData = null; - - if ($methodData !== null) { - return $methodData; + if ($this->methodData !== null) { + return $this->methodData; } try { @@ -217,16 +220,16 @@ public function getActiveMethods($mollieApi) foreach ($apiMethods as $method) { $methodId = 'mollie_methods_' . $method->id; - $methodData[$methodId] = [ + $this->methodData[$methodId] = [ 'image' => $method->image->size2x ]; } } catch (\Exception $e) { $this->mollieHelper->addTolog('error', 'Function: getActiveMethods: ' . $e->getMessage()); - $methodData = []; + $this->methodData = []; } - return $methodData; + return $this->methodData; } /** diff --git a/Service/Mollie/Order/Transaction/Expires.php b/Service/Mollie/Order/Transaction/Expires.php new file mode 100644 index 00000000000..1afd1723b63 --- /dev/null +++ b/Service/Mollie/Order/Transaction/Expires.php @@ -0,0 +1,89 @@ +config = $config; + $this->timezone = $timezone; + $this->request = $request; + } + + public function availableForMethod(string $method = null, $storeId = null) + { + $value = $this->getExpiresAtForMethod($method, $storeId); + return (bool)$value; + } + + public function atDateForMethod(string $method = null, $storeId = null) + { + $days = $this->getExpiresAtForMethod($method, $storeId); + + if (strtotime($days)) { + return $days; + } + + $date = $this->timezone->scopeDate($storeId); + $date->add(new \DateInterval('P' . $days . 'D')); + + return $date->format('Y-m-d'); + } + + /** + * @param string $method + * @param $storeId + * @return mixed + */ + public function getExpiresAtForMethod(string $method = null, $storeId = null) + { + if (!$method && $value = $this->getValueFromRequest()) { + return $value; + } + + $path = sprintf('payment/mollie_methods_%s/days_before_expire', $method); + + return $this->config->getValue($path, 'store', $storeId); + } + + /** + * @return mixed + */ + private function getValueFromRequest() + { + $payment = $this->request->getParam('payment'); + + if (!$payment || !isset($payment['days_before_expire'])) { + return false; + } + + return $payment['days_before_expire']; + } +} diff --git a/Test/Integration/Block/Form/PaymentlinkTest.php b/Test/Integration/Block/Form/PaymentlinkTest.php new file mode 100644 index 00000000000..3007c70200f --- /dev/null +++ b/Test/Integration/Block/Form/PaymentlinkTest.php @@ -0,0 +1,38 @@ +objectManager->create(Paymentlink::class); + + $now = new \DateTimeImmutable('now'); + $expected = $now->add(new \DateInterval('P10D')); + + $this->assertEquals($expected->format('Y-m-d'), $instance->getExpiresAt()); + } + + /** + * @magentoConfigFixture current_store payment/mollie_methods_paymentlink/days_before_expire + */ + public function testAnEmptyStringWhenNoConfigAvailable() + { + /** @var Paymentlink $instance */ + $instance = $this->objectManager->create(Paymentlink::class); + + $this->assertEmpty($instance->getExpiresAt()); + } +} diff --git a/Test/Integration/Model/Client/OrdersTest.php b/Test/Integration/Model/Client/OrdersTest.php index ead815da08c..8a9a2cf8734 100644 --- a/Test/Integration/Model/Client/OrdersTest.php +++ b/Test/Integration/Model/Client/OrdersTest.php @@ -223,4 +223,40 @@ protected function mollieOrderMock($status, $currency) return $mollieOrder; } + + /** + * @magentoDataFixture Magento/Sales/_files/order.php + * @magentoConfigFixture default_store payment/mollie_methods_ideal/days_before_expire 5 + * + * @throws \Magento\Framework\Exception\LocalizedException + * @throws \Mollie\Api\Exceptions\ApiException + */ + public function testStartTransactionIncludesTheExpiresAtParameter() + { + $order = $this->loadOrder('100000001'); + $order->getPayment()->setMethod('mollie_methods_ideal'); + + $mollieApiMock = $this->createMock(MollieApiClient::class); + $orderEndpointMock = $this->createMock(OrderEndpoint::class); + $orderEndpointMock->method('create')->with( $this->callback(function ($orderData) { + $this->assertArrayHasKey('expiresAt', $orderData); + $this->assertNotEmpty($orderData['expiresAt']); + + $now = new \DateTimeImmutable('now'); + $expected = $now->add(new \DateInterval('P5D')); + + $this->assertEquals($expected->format('Y-m-d'), $orderData['expiresAt']); + + return true; + }))->willReturn($this->createMock(\Mollie\Api\Resources\Order::class)); + + $mollieApiMock->orders = $orderEndpointMock; + + /** @var Orders $instance */ + $instance = $this->objectManager->create(Orders::class, [ + 'orderLines' => $this->createMock(\Mollie\Payment\Model\OrderLines::class), + ]); + + $instance->startTransaction($order, $mollieApiMock); + } } diff --git a/Test/Integration/Service/Order/Transaction/ExpiresTest.php b/Test/Integration/Service/Order/Transaction/ExpiresTest.php new file mode 100644 index 00000000000..95c99e2b823 --- /dev/null +++ b/Test/Integration/Service/Order/Transaction/ExpiresTest.php @@ -0,0 +1,83 @@ +objectManager->create(Expires::class); + + $this->assertFalse($instance->availableForMethod('ideal')); + } + + /** + * @magentoConfigFixture default_store payment/mollie_methods_ideal/days_before_expire 5 + */ + public function testReturnsTrueWhenNoExpireIsSet() + { + /** @var Expires $instance */ + $instance = $this->objectManager->create(Expires::class); + + $this->assertTrue($instance->availableForMethod('ideal')); + } + + /** + * @magentoConfigFixture default_store payment/mollie_methods_ideal/days_before_expire 5 + */ + public function testReturnsTheCorrectDate() + { + $now = new \DateTimeImmutable('now'); + $expected = $now->add(new \DateInterval('P5D')); + + /** @var Expires $instance */ + $instance = $this->objectManager->create(Expires::class); + + $this->assertEquals($expected->format('Y-m-d'), $instance->atDateForMethod('ideal')); + } + + public function testIsAvailableWhenSetInTheRequest() + { + /** @var RequestInterface $request */ + $request = $this->objectManager->get(RequestInterface::class); + + $request->setParams([ + 'payment' => ['days_before_expire' => 10], + ]); + + /** @var Expires $instance */ + $instance = $this->objectManager->create(Expires::class); + + $this->assertTrue($instance->availableForMethod()); + } + + public function testUsesTheValueInTheRequest() + { + /** @var RequestInterface $request */ + $request = $this->objectManager->get(RequestInterface::class); + + $now = new \DateTimeImmutable('now'); + $expected = $now->add(new \DateInterval('P10D')); + + $request->setParams([ + 'payment' => ['days_before_expire' => $expected->format('Y-m-d')], + ]); + + /** @var Expires $instance */ + $instance = $this->objectManager->create(Expires::class); + + $this->assertEquals($expected->format('Y-m-d'), $instance->atDateForMethod()); + } +} diff --git a/Test/Unit/Plugin/Framework/App/Request/CsrfValidatorSkipTest.php b/Test/Unit/Plugin/Framework/App/Request/CsrfValidatorSkipTest.php index 3ae26caf027..2fce28437a2 100644 --- a/Test/Unit/Plugin/Framework/App/Request/CsrfValidatorSkipTest.php +++ b/Test/Unit/Plugin/Framework/App/Request/CsrfValidatorSkipTest.php @@ -11,6 +11,10 @@ class CsrfValidatorSkipTest extends UnitTestCase { public function testCallsTheProcessWhenNotMollie() { + if (!class_exists(CsrfValidator::class)) { + $this->markTestSkipped('The class ' . CsrfValidator::class . ' is only available on Magento 2.3 and later'); + } + $csrfValidator = $this->objectManager->getObject(CsrfValidator::class); $actionMock = $this->createMock(ActionInterface::class); @@ -35,6 +39,10 @@ function () use (&$called) { public function testCallsTheProcessWhenMollie() { + if (!class_exists(CsrfValidator::class)) { + $this->markTestSkipped('The class ' . CsrfValidator::class . ' is only available on Magento 2.3 and later'); + } + $csrfValidator = $this->objectManager->getObject(CsrfValidator::class); $actionMock = $this->createMock(ActionInterface::class); diff --git a/etc/adminhtml/methods/applepay.xml b/etc/adminhtml/methods/applepay.xml index 375c83ba476..3121e9daef4 100644 --- a/etc/adminhtml/methods/applepay.xml +++ b/etc/adminhtml/methods/applepay.xml @@ -88,5 +88,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_ideal/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/bancontact.xml b/etc/adminhtml/methods/bancontact.xml index e9fefe34e6e..674c8d302fe 100644 --- a/etc/adminhtml/methods/bancontact.xml +++ b/etc/adminhtml/methods/bancontact.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_bancontact/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/banktransfer.xml b/etc/adminhtml/methods/banktransfer.xml index 6fd512cca25..8fae2ba5850 100644 --- a/etc/adminhtml/methods/banktransfer.xml +++ b/etc/adminhtml/methods/banktransfer.xml @@ -107,5 +107,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_banktransfer/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/belfius.xml b/etc/adminhtml/methods/belfius.xml index 8588756767f..e3f719a9380 100644 --- a/etc/adminhtml/methods/belfius.xml +++ b/etc/adminhtml/methods/belfius.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_belfius/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/creditcard.xml b/etc/adminhtml/methods/creditcard.xml index da2ec0a3561..9680c9ba72d 100644 --- a/etc/adminhtml/methods/creditcard.xml +++ b/etc/adminhtml/methods/creditcard.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_creditcard/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/eps.xml b/etc/adminhtml/methods/eps.xml index 60b01cb5532..7d50225cf49 100644 --- a/etc/adminhtml/methods/eps.xml +++ b/etc/adminhtml/methods/eps.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_eps/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/giftcard.xml b/etc/adminhtml/methods/giftcard.xml index aedcde0f956..8d48ff21de6 100644 --- a/etc/adminhtml/methods/giftcard.xml +++ b/etc/adminhtml/methods/giftcard.xml @@ -97,5 +97,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_giftcard/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/giropay.xml b/etc/adminhtml/methods/giropay.xml index 58e381b1320..24ce8cea0d2 100644 --- a/etc/adminhtml/methods/giropay.xml +++ b/etc/adminhtml/methods/giropay.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_giropay/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/ideal.xml b/etc/adminhtml/methods/ideal.xml index 38b5999f5b6..dc429442f8f 100644 --- a/etc/adminhtml/methods/ideal.xml +++ b/etc/adminhtml/methods/ideal.xml @@ -106,5 +106,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_ideal/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/inghomepay.xml b/etc/adminhtml/methods/inghomepay.xml index 9047deea55f..fd784d14123 100644 --- a/etc/adminhtml/methods/inghomepay.xml +++ b/etc/adminhtml/methods/inghomepay.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_inghomepay/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/kbc.xml b/etc/adminhtml/methods/kbc.xml index 744c7c09844..76c33851fda 100644 --- a/etc/adminhtml/methods/kbc.xml +++ b/etc/adminhtml/methods/kbc.xml @@ -97,5 +97,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_kbc/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/klarnapaylater.xml b/etc/adminhtml/methods/klarnapaylater.xml index badb2d53387..9c8941e2d66 100644 --- a/etc/adminhtml/methods/klarnapaylater.xml +++ b/etc/adminhtml/methods/klarnapaylater.xml @@ -62,5 +62,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_klarnapaylater/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/klarnasliceit.xml b/etc/adminhtml/methods/klarnasliceit.xml index a5e33cd5433..b3b688e8b14 100644 --- a/etc/adminhtml/methods/klarnasliceit.xml +++ b/etc/adminhtml/methods/klarnasliceit.xml @@ -62,5 +62,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_klarnasliceit/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/mybank.xml b/etc/adminhtml/methods/mybank.xml index 5dca95ab52e..1398e299906 100644 --- a/etc/adminhtml/methods/mybank.xml +++ b/etc/adminhtml/methods/mybank.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_mybank/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + diff --git a/etc/adminhtml/methods/paymentlink.xml b/etc/adminhtml/methods/paymentlink.xml index 9cbd6407ca7..fd5167c241e 100644 --- a/etc/adminhtml/methods/paymentlink.xml +++ b/etc/adminhtml/methods/paymentlink.xml @@ -82,5 +82,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_paymentlink/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/paypal.xml b/etc/adminhtml/methods/paypal.xml index 9a20ced31d9..69d7e5e77a3 100644 --- a/etc/adminhtml/methods/paypal.xml +++ b/etc/adminhtml/methods/paypal.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_paypal/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/paysafecard.xml b/etc/adminhtml/methods/paysafecard.xml index 04317a27a5b..98b7ea3a336 100644 --- a/etc/adminhtml/methods/paysafecard.xml +++ b/etc/adminhtml/methods/paysafecard.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_paysafecard/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/przelewy24.xml b/etc/adminhtml/methods/przelewy24.xml index 0344de2568c..3b8ef7fafd3 100644 --- a/etc/adminhtml/methods/przelewy24.xml +++ b/etc/adminhtml/methods/przelewy24.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_przelewy24/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/etc/adminhtml/methods/sofort.xml b/etc/adminhtml/methods/sofort.xml index 604d6b375ac..3dd4e9fce19 100644 --- a/etc/adminhtml/methods/sofort.xml +++ b/etc/adminhtml/methods/sofort.xml @@ -87,5 +87,16 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_sofort/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? + - \ No newline at end of file + diff --git a/view/adminhtml/templates/form/mollie_paymentlink.phtml b/view/adminhtml/templates/form/mollie_paymentlink.phtml index fcf09163c5a..ed5766185ea 100644 --- a/view/adminhtml/templates/form/mollie_paymentlink.phtml +++ b/view/adminhtml/templates/form/mollie_paymentlink.phtml @@ -5,11 +5,7 @@ */ /** - * @var \Mollie\Payment\Block\Form\Paymentlink $block - * @see \Mollie\Payment\Block\Form\Paymentlink - * - * /** - * @var \Magento\Payment\Block\Adminhtml\Transparent\Form $block + * @var \Mollie\Payment\Block\Form\Paymentlink $block */ $code = $block->escapeHtml($block->getMethodCode()); ?> @@ -40,5 +36,36 @@ $code; ?>" style="display:none">

escapeHtml(__('If one method is chosen, it will skip the selection screen and the customer is sent directly to the payment method.')); ?>

+ +
+ +
+ + + (i) + + + + +
+
- \ No newline at end of file + + + diff --git a/view/adminhtml/web/css/styles.css b/view/adminhtml/web/css/styles.css index 43715fdfd26..9f3cd8988e0 100644 --- a/view/adminhtml/web/css/styles.css +++ b/view/adminhtml/web/css/styles.css @@ -197,4 +197,8 @@ a.mollie-tooltip:hover span { background: url(../images/icons@x2.png) no-repeat scroll 0px -260px #F8F8F8; background-size: 130px; } -} \ No newline at end of file +} + +.mollie_methods_paymentlink_days_before_expire { + text-indent: 5px; +} From 7cb5213730c655e55a88aece4f041aaebcb0f168 Mon Sep 17 00:00:00 2001 From: Marvin-Magmodules Date: Thu, 22 Aug 2019 18:57:38 +0200 Subject: [PATCH 3/4] Improved textual explanation --- etc/adminhtml/methods/applepay.xml | 28 ++++++++++++------------ etc/adminhtml/methods/bancontact.xml | 28 ++++++++++++------------ etc/adminhtml/methods/banktransfer.xml | 28 ++++++++++++------------ etc/adminhtml/methods/belfius.xml | 28 ++++++++++++------------ etc/adminhtml/methods/creditcard.xml | 28 ++++++++++++------------ etc/adminhtml/methods/eps.xml | 28 ++++++++++++------------ etc/adminhtml/methods/giftcard.xml | 28 ++++++++++++------------ etc/adminhtml/methods/giropay.xml | 28 ++++++++++++------------ etc/adminhtml/methods/ideal.xml | 28 ++++++++++++------------ etc/adminhtml/methods/inghomepay.xml | 28 ++++++++++++------------ etc/adminhtml/methods/kbc.xml | 28 ++++++++++++------------ etc/adminhtml/methods/klarnapaylater.xml | 4 +++- etc/adminhtml/methods/klarnasliceit.xml | 4 +++- etc/adminhtml/methods/mybank.xml | 28 ++++++++++++------------ etc/adminhtml/methods/paymentlink.xml | 2 +- etc/adminhtml/methods/paypal.xml | 28 ++++++++++++------------ etc/adminhtml/methods/paysafecard.xml | 28 ++++++++++++------------ etc/adminhtml/methods/przelewy24.xml | 28 ++++++++++++------------ etc/adminhtml/methods/sofort.xml | 28 ++++++++++++------------ etc/config.xml | 16 ++++++++++++++ 20 files changed, 247 insertions(+), 227 deletions(-) diff --git a/etc/adminhtml/methods/applepay.xml b/etc/adminhtml/methods/applepay.xml index 3121e9daef4..b6d8c2ee34b 100644 --- a/etc/adminhtml/methods/applepay.xml +++ b/etc/adminhtml/methods/applepay.xml @@ -27,9 +27,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -44,6 +44,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_applepay/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -88,16 +99,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_ideal/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/bancontact.xml b/etc/adminhtml/methods/bancontact.xml index 674c8d302fe..31fa243d21c 100644 --- a/etc/adminhtml/methods/bancontact.xml +++ b/etc/adminhtml/methods/bancontact.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_bancontact/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_bancontact/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/banktransfer.xml b/etc/adminhtml/methods/banktransfer.xml index 8fae2ba5850..4c43088ef7a 100644 --- a/etc/adminhtml/methods/banktransfer.xml +++ b/etc/adminhtml/methods/banktransfer.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_banktransfer/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -107,16 +118,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_banktransfer/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/belfius.xml b/etc/adminhtml/methods/belfius.xml index e3f719a9380..133920cac56 100644 --- a/etc/adminhtml/methods/belfius.xml +++ b/etc/adminhtml/methods/belfius.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_belfius/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_belfius/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/creditcard.xml b/etc/adminhtml/methods/creditcard.xml index 9680c9ba72d..6dad69acee0 100644 --- a/etc/adminhtml/methods/creditcard.xml +++ b/etc/adminhtml/methods/creditcard.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_creditcard/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_creditcard/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/eps.xml b/etc/adminhtml/methods/eps.xml index 7d50225cf49..10090f1c471 100644 --- a/etc/adminhtml/methods/eps.xml +++ b/etc/adminhtml/methods/eps.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_eps/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_eps/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/giftcard.xml b/etc/adminhtml/methods/giftcard.xml index 8d48ff21de6..5771baee677 100644 --- a/etc/adminhtml/methods/giftcard.xml +++ b/etc/adminhtml/methods/giftcard.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_giftcard/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -97,16 +108,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_giftcard/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/giropay.xml b/etc/adminhtml/methods/giropay.xml index 24ce8cea0d2..e21f848b016 100644 --- a/etc/adminhtml/methods/giropay.xml +++ b/etc/adminhtml/methods/giropay.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_giropay/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_giropay/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/ideal.xml b/etc/adminhtml/methods/ideal.xml index dc429442f8f..b38eb0ddc20 100644 --- a/etc/adminhtml/methods/ideal.xml +++ b/etc/adminhtml/methods/ideal.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_ideal/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -106,16 +117,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_ideal/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/inghomepay.xml b/etc/adminhtml/methods/inghomepay.xml index fd784d14123..6397e716fd4 100644 --- a/etc/adminhtml/methods/inghomepay.xml +++ b/etc/adminhtml/methods/inghomepay.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_inghomepay/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_inghomepay/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/kbc.xml b/etc/adminhtml/methods/kbc.xml index 76c33851fda..f07e9bb4afa 100644 --- a/etc/adminhtml/methods/kbc.xml +++ b/etc/adminhtml/methods/kbc.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_kbc/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -97,16 +108,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_kbc/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/klarnapaylater.xml b/etc/adminhtml/methods/klarnapaylater.xml index 9c8941e2d66..f7433935288 100644 --- a/etc/adminhtml/methods/klarnapaylater.xml +++ b/etc/adminhtml/methods/klarnapaylater.xml @@ -71,7 +71,9 @@ 1 order - How many days before orders for this method becomes expired? +
Please note: It is not posible to use an expiry date more + than 28 days in the future, unless another maximum is agreed between the merchant and Klarna.]]> diff --git a/etc/adminhtml/methods/klarnasliceit.xml b/etc/adminhtml/methods/klarnasliceit.xml index b3b688e8b14..d5c2dbe7ae2 100644 --- a/etc/adminhtml/methods/klarnasliceit.xml +++ b/etc/adminhtml/methods/klarnasliceit.xml @@ -71,7 +71,9 @@ 1 order - How many days before orders for this method becomes expired? +
Please note: It is not posible to use an expiry date more + than 28 days in the future, unless another maximum is agreed between the merchant and Klarna.]]> diff --git a/etc/adminhtml/methods/mybank.xml b/etc/adminhtml/methods/mybank.xml index 1398e299906..ca60a382151 100644 --- a/etc/adminhtml/methods/mybank.xml +++ b/etc/adminhtml/methods/mybank.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_mybank/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_mybank/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/paymentlink.xml b/etc/adminhtml/methods/paymentlink.xml index fd5167c241e..5b673041ff1 100644 --- a/etc/adminhtml/methods/paymentlink.xml +++ b/etc/adminhtml/methods/paymentlink.xml @@ -91,7 +91,7 @@ 1 order - How many days before orders for this method becomes expired? + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) diff --git a/etc/adminhtml/methods/paypal.xml b/etc/adminhtml/methods/paypal.xml index 69d7e5e77a3..14aa868fe31 100644 --- a/etc/adminhtml/methods/paypal.xml +++ b/etc/adminhtml/methods/paypal.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_paypal/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_paypal/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/paysafecard.xml b/etc/adminhtml/methods/paysafecard.xml index 98b7ea3a336..0d5579014af 100644 --- a/etc/adminhtml/methods/paysafecard.xml +++ b/etc/adminhtml/methods/paysafecard.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_paysafecard/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_paysafecard/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/przelewy24.xml b/etc/adminhtml/methods/przelewy24.xml index 3b8ef7fafd3..d6d02682dce 100644 --- a/etc/adminhtml/methods/przelewy24.xml +++ b/etc/adminhtml/methods/przelewy24.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_przelewy24/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_przelewy24/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/adminhtml/methods/sofort.xml b/etc/adminhtml/methods/sofort.xml index 3dd4e9fce19..c2b84a38d05 100644 --- a/etc/adminhtml/methods/sofort.xml +++ b/etc/adminhtml/methods/sofort.xml @@ -26,9 +26,9 @@ 1 - Payment API
Use the Payment API Platform for the transactions.

- Order API
Use the new Order API Platform and get additional insights in the orders. - Read more.]]> + here + to read more about the differences between the Payment and Orders API.]]> @@ -43,6 +43,17 @@ 1 + + + validate-digits-range digits-range-1-100 + payment/mollie_methods_sofort/days_before_expire + + 1 + order + + How many days before orders for this method becomes expired? Leave empty to use default expiration (28 days) + @@ -87,16 +98,5 @@ 1 - - - validate-digits-range digits-range-1-100 - payment/mollie_methods_sofort/days_before_expire - - 1 - order - - How many days before orders for this method becomes expired? - diff --git a/etc/config.xml b/etc/config.xml index e1f883dd17c..54afbf0e8f7 100644 --- a/etc/config.xml +++ b/etc/config.xml @@ -22,6 +22,7 @@ Mollie\Payment\Model\Methods\Bancontact Bancontact {ordernumber} + payment order 0 @@ -31,6 +32,7 @@ Mollie\Payment\Model\Methods\Banktransfer Banktransfer {ordernumber} + payment pending_payment 14 order @@ -42,6 +44,7 @@ Mollie\Payment\Model\Methods\Belfius Belfius {ordernumber} + payment order 0 @@ -51,6 +54,7 @@ Mollie\Payment\Model\Methods\Creditcard Credit Cards {ordernumber} + payment order 0 @@ -60,6 +64,7 @@ Mollie\Payment\Model\Methods\Ideal iDeal {ordernumber} + payment dropdown order 0 @@ -70,6 +75,7 @@ Mollie\Payment\Model\Methods\Kbc KBC/CBC {ordernumber} + payment order none 0 @@ -80,6 +86,7 @@ Mollie\Payment\Model\Methods\Paypal Paypal {ordernumber} + payment order 0 @@ -89,6 +96,7 @@ Mollie\Payment\Model\Methods\Paysafecard Paysafecard {ordernumber} + payment order 0 @@ -98,6 +106,7 @@ Mollie\Payment\Model\Methods\Sofort Sofort {ordernumber} + payment order 0 @@ -107,6 +116,7 @@ Mollie\Payment\Model\Methods\Inghomepay ING Homepay {ordernumber} + payment order 0 @@ -116,6 +126,7 @@ Mollie\Payment\Model\Methods\Giropay Giropay {ordernumber} + payment order 0 @@ -125,6 +136,7 @@ Mollie\Payment\Model\Methods\Eps EPS {ordernumber} + payment order 0 @@ -165,6 +177,7 @@ Mollie\Payment\Model\Methods\Giftcard Giftcard {ordernumber} + payment dropdown order 0 @@ -175,6 +188,7 @@ Mollie\Payment\Model\Methods\Przelewy24 Przelewy24 {ordernumber} + payment order 0 @@ -184,6 +198,7 @@ Mollie\Payment\Model\Methods\ApplePay Apple Pay {ordernumber} + payment order 0 @@ -193,6 +208,7 @@ Mollie\Payment\Model\Methods\MyBank MyBank {ordernumber} + payment order 0 From bea381bc9bae12385d65ffb80817f6222a4e256e Mon Sep 17 00:00:00 2001 From: Marvin-Magmodules Date: Thu, 22 Aug 2019 19:00:09 +0200 Subject: [PATCH 4/4] Version bump --- composer.json | 2 +- etc/module.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index abfa887685d..941f5891073 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "mollie/magento2", "description": "Mollie Payment Module for Magento 2", - "version": "1.7.0", + "version": "1.7.1", "keywords": [ "mollie", "payment", diff --git a/etc/module.xml b/etc/module.xml index 3c7546749fc..cf88b7c73c6 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -1,4 +1,4 @@ - +