Skip to content

Commit 3ad4a9f

Browse files
ivan-pugach-monduivan-pugach-mondu
authored
PT-2738: Magento: Support Hyvä theme. (#116)
1 parent 2c8c44b commit 3ad4a9f

File tree

10 files changed

+42
-21
lines changed

10 files changed

+42
-21
lines changed

‎Controller/Adminhtml/Log/Save.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
use Magento\Backend\App\Action\Context;
77
use Magento\Framework\App\Request\DataPersistorInterface;
88
use Magento\Framework\Exception\LocalizedException;
9-
109
use Magento\Sales\Api\OrderRepositoryInterface;
1110
use Magento\Sales\Model\Order;
1211
use Mondu\Mondu\Helpers\Log;
1312
use Mondu\Mondu\Model\Request\Factory as RequestFactory;
13+
use Mondu\Mondu\Helpers\OrderHelper;
1414

1515
class Save extends Action
1616
{
@@ -81,10 +81,10 @@ public function execute()
8181
$this->monduLogger->syncOrder($data['reference_id']);
8282
return $resultRedirect->setPath('*/*/adjust', ['entity_id' => $this->getRequest()->getParam('entity_id')]);
8383
}
84-
if (isset($response['order']['state']) && $response['order']['state'] === 'canceled') {
84+
if (isset($response['order']['state']) && $response['order']['state'] === OrderHelper::CANCELED) {
8585
$order = $this->orderRepository->get($data['order_id']);
8686
$order->setStatus(Order::STATE_CANCELED)->save();
87-
} elseif (isset($response['order']['state']) && $response['order']['state'] === 'shipped') {
87+
} elseif (isset($response['order']['state']) && $response['order']['state'] === OrderHelper::SHIPPED) {
8888
$order = $this->orderRepository->get($data['order_id']);
8989
$order->setStatus(Order::STATE_COMPLETE)->save();
9090
}

‎Controller/Payment/Checkout/Token.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace Mondu\Mondu\Controller\Payment\Checkout;
44

55
use Magento\Framework\Webapi\Response;
6-
use Mondu\Mondu\Helpers\ABTesting\ABTesting;
6+
use Mondu\Mondu\Helpers\OrderHelper;
77
use Mondu\Mondu\Model\Request\Factory as RequestFactory;
88

99
class Token extends AbstractPaymentController
@@ -49,7 +49,7 @@ public function execute()
4949
*/
5050
public function handleOrderDecline($monduOrder, &$response)
5151
{
52-
if ($monduOrder['state'] === 'declined') {
52+
if ($monduOrder['state'] === OrderHelper::DECLINED) {
5353
$response['error'] = 1;
5454
$response['message'] = __('Order has been declined');
5555
}

‎Controller/Webhooks/Index.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use Magento\Sales\Model\OrderFactory;
1414
use Mondu\Mondu\Helpers\Log;
1515
use Mondu\Mondu\Model\Ui\ConfigProvider;
16+
use Mondu\Mondu\Helpers\OrderHelper;
1617

1718
class Index extends Action implements ActionInterface
1819
{
@@ -204,9 +205,9 @@ public function handleDeclinedOrCanceled($params): array
204205
__('Mondu: Order has been declined')
205206
);
206207

207-
if ($orderState === 'canceled') {
208+
if ($orderState === OrderHelper::CANCELED) {
208209
$order->setStatus(Order::STATE_CANCELED)->save();
209-
} elseif ($orderState === 'declined') {
210+
} elseif ($orderState === OrderHelper::DECLINED) {
210211
if (isset($params['reason']) && $params['reason'] === 'buyer_fraud') {
211212
$order->setStatus(Order::STATUS_FRAUD)->save();
212213
} else {

‎Helpers/OrderHelper.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@
1414

1515
class OrderHelper
1616
{
17+
public const DECLINED = 'declined';
18+
public const CANCELED = 'canceled';
19+
public const SHIPPED = 'shipped';
20+
public const AUTHORIZED = 'authorized';
21+
1722
/**
1823
* @var QuoteFactory
1924
*/

‎Helpers/PaymentMethod.php‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
class PaymentMethod
88
{
9+
public const DIRECT_DEBIT = 'direct_debit';
10+
public const INSTALLMENT = 'installment';
11+
public const INSTALLMENT_BY_INVOICE = 'installment_by_invoice';
12+
913
public const PAYMENTS = ['mondu', 'mondusepa', 'monduinstallment', 'monduinstallmentbyinvoice'];
1014

1115
public const LABELS = [
@@ -16,11 +20,12 @@ class PaymentMethod
1620
];
1721

1822
public const MAPPING = [
19-
'invoice' => 'mondu',
20-
'direct_debit' => 'mondusepa',
21-
'installment' => 'monduinstallment',
22-
'installment_by_invoice' => 'monduinstallmentbyinvoice'
23+
'invoice' => 'mondu',
24+
self::DIRECT_DEBIT => 'mondusepa',
25+
self::INSTALLMENT => 'monduinstallment',
26+
self::INSTALLMENT_BY_INVOICE => 'monduinstallmentbyinvoice'
2327
];
28+
2429
/**
2530
* @var Factory
2631
*/

‎Model/Request/Transactions.php‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?php
22
namespace Mondu\Mondu\Model\Request;
33

4-
use \Magento\Framework\HTTP\Client\Curl;
5-
use \Magento\Quote\Model\Cart\CartTotalRepository;
6-
use \Magento\Checkout\Model\Session as CheckoutSession;
7-
use \Magento\Quote\Model\Quote;
4+
use Magento\Framework\HTTP\Client\Curl;
5+
use Magento\Quote\Model\Cart\CartTotalRepository;
6+
use Magento\Checkout\Model\Session as CheckoutSession;
7+
use Magento\Quote\Model\Quote;
88
use Mondu\Mondu\Helpers\BuyerParams\BuyerParamsInterface;
99
use Mondu\Mondu\Helpers\OrderHelper;
10+
use Mondu\Mondu\Helpers\PaymentMethod;
1011
use Mondu\Mondu\Model\Ui\ConfigProvider;
1112
use Magento\Framework\UrlInterface;
1213
use Magento\Framework\Locale\Resolver;
@@ -109,7 +110,10 @@ public function request($_params = []): array
109110
}
110111
$params = $this->getRequestParams();
111112

112-
if (in_array( $_params['payment_method'], array('direct_debit', 'installment', 'installment_by_invoice'))) {
113+
if (in_array(
114+
$_params['payment_method'],
115+
[PaymentMethod::DIRECT_DEBIT, PaymentMethod::INSTALLMENT, PaymentMethod::INSTALLMENT_BY_INVOICE])
116+
) {
113117
$params['payment_method'] = $_params['payment_method'];
114118
}
115119

‎Observer/CreateOrder.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
namespace Mondu\Mondu\Observer;
33

44
use Exception;
5-
use \Magento\Checkout\Model\Session as CheckoutSession;
5+
use Magento\Checkout\Model\Session as CheckoutSession;
66
use Magento\Framework\Event\Observer;
77
use Magento\Framework\Exception\LocalizedException;
88
use Magento\Quote\Model\QuoteFactory;
@@ -171,12 +171,13 @@ public function _execute(Observer $observer)
171171
/**
172172
* Confirm Authorized Order
173173
*
174-
* @param array $orderData
174+
* @param array $orderData
175175
* @param string $orderNumber
176+
* @throws Exception
176177
*/
177178
protected function confirmAuthorizedOrder($orderData, $orderNumber)
178179
{
179-
if ($orderData['state'] === 'authorized') {
180+
if ($orderData['state'] === OrderHelper::AUTHORIZED) {
180181
$authorizationData = $this->_requestFactory->create(RequestFactory::CONFIRM_ORDER)
181182
->process(['orderUid' => $orderData['uuid'], 'referenceId' => $orderNumber]);
182183
return $authorizationData['order'];

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "mondu_gmbh/magento2-payment",
33
"description": "Mondu payment method for magento 2",
44
"type": "magento2-module",
5-
"version": "2.4.1",
5+
"version": "2.4.2",
66
"license": [
77
"MIT"
88
],

‎etc/csp_whitelist.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,10 @@
1515
<value id="mondu_io_wildcard_localhost" type="host">localhost:*/</value>
1616
</values>
1717
</policy>
18+
<policy id="img-src">
19+
<values>
20+
<value id="mondu_io_wildcard" type="host">*.mondu.ai/</value>
21+
</values>
22+
</policy>
1823
</policies>
1924
</csp_whitelist>

‎etc/module.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0"?>
22
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
3-
<module name="Mondu_Mondu" setup_version="2.4.1">
3+
<module name="Mondu_Mondu" setup_version="2.4.2">
44
<sequence>
55
<module name="Magento_Sales"/>
66
<module name="Magento_Payment"/>

0 commit comments

Comments
 (0)