Skip to content

Commit

Permalink
Merge pull request #91 from pay-now/release/1.5.1
Browse files Browse the repository at this point in the history 
Release/1.5.1
  • Loading branch information
@mateusztwardowski
mateusztwardowski authored Jan 12, 2024
2 parents 6e24e25 + bd63053 commit fdb0065
Show file tree
Hide file tree
Showing 12 changed files with 61 additions and 29 deletions.
2 changes: 1 addition & 1 deletion Controller/Payment/Retry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function execute()

if ($this->checkIfPaymentStatusIsPending($currentPaymentStatus) && !empty($currentPaymentId)) {
$paymentStatusService = ObjectManager::getInstance()->create(PaymentStatusService::class);
$refreshedCurrentPaymentStatus = $paymentStatusService->getStatus($currentPaymentId) ?? '';
$refreshedCurrentPaymentStatus = $paymentStatusService->getStatus($currentPaymentId, $orderId) ?? '';
if ($this->checkIfPaymentStatusIsPending($refreshedCurrentPaymentStatus)
&& is_string($currentPaymentRedirectUrl)) {
$this->redirectResult->setUrl($currentPaymentRedirectUrl);
Expand Down
6 changes: 6 additions & 0 deletions Gateway/Request/Payment/AuthorizeRequest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ public function build(array $buildSubject)
->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_TOKEN);
}

if ($this->payment->hasAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_FINGERPRINT)
&& ! empty($this->payment->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_FINGERPRINT))) {
$request['body'][PaymentField::BUYER_FIELD_NAME][PaymentField::BUYER_DEVICE_FINGERPRINT] = $this->payment
->getAdditionalInformation(PaymentDataAssignObserver::PAYMENT_METHOD_FINGERPRINT);
}

if ($this->config->isSendOrderItemsActive()) {
$orderItems = $this->helper->getOrderItems($this->order);
if (! empty($orderItems)) {
Expand Down
1 change: 1 addition & 0 deletions Helper/PaymentField.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
class PaymentField
{
const AMOUNT_FIELD_NAME = 'amount';
const BUYER_DEVICE_FINGERPRINT = 'deviceFingerprint';
const BUYER_EMAIL_FIELD_NAME = 'email';
const BUYER_EXTERNAL_ID = 'externalId';
const BUYER_FIELD_NAME = 'buyer';
Expand Down
3 changes: 3 additions & 0 deletions Observer/PaymentDataAssignObserver.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ class PaymentDataAssignObserver extends AbstractDataAssignObserver
{
const PAYMENT_METHOD_ID = 'payment_method_id';

const PAYMENT_METHOD_FINGERPRINT = 'payment_method_fingerprint';

const PAYMENT_METHOD_TOKEN = 'payment_method_token';

const BLIK_CODE = 'blik_code';
Expand All @@ -24,6 +26,7 @@ class PaymentDataAssignObserver extends AbstractDataAssignObserver
*/
protected $additionalInformationList = [
self::PAYMENT_METHOD_ID,
self::PAYMENT_METHOD_FINGERPRINT,
self::PAYMENT_METHOD_TOKEN,
self::BLIK_CODE
];
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "pay-now/paynow-magento2",
"description": "Module for Paynow payments",
"type": "magento2-module",
"version": "1.5.0",
"version": "1.5.1",
"license": "MIT",
"config": {
"allow-plugins": {
Expand Down
24 changes: 12 additions & 12 deletions etc/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,45 +41,45 @@
<title>Blik with paynow.pl</title>
<group>paynow_group</group>
</paynow_blik_gateway>
<paynow_card_gateway>
<paynow_pbl_gateway>
<active>1</active>
<debug>1</debug>
<extra_logs>1</extra_logs>
<order_status_change>1</order_status_change>
<currency>PLN</currency>
<is_gateway>1</is_gateway>
<model>PaynowCardPaymentGatewayFacade</model>
<model>PblPaymentGatewayFacade</model>
<payment_action>authorize</payment_action>
<sort_order>1</sort_order>
<title>Card with paynow.pl</title>
<title>Pbl with paynow.pl</title>
<group>paynow_group</group>
</paynow_card_gateway>
<paynow_digital_wallet_gateway>
</paynow_pbl_gateway>
<paynow_card_gateway>
<active>1</active>
<debug>1</debug>
<extra_logs>1</extra_logs>
<order_status_change>1</order_status_change>
<currency>PLN</currency>
<is_gateway>1</is_gateway>
<model>DigitalWalletPaymentGatewayFacade</model>
<model>PaynowCardPaymentGatewayFacade</model>
<payment_action>authorize</payment_action>
<sort_order>1</sort_order>
<title>Digital wallets with paynow.pl</title>
<title>Card with paynow.pl</title>
<group>paynow_group</group>
</paynow_digital_wallet_gateway>
<paynow_pbl_gateway>
</paynow_card_gateway>
<paynow_digital_wallet_gateway>
<active>1</active>
<debug>1</debug>
<extra_logs>1</extra_logs>
<order_status_change>1</order_status_change>
<currency>PLN</currency>
<is_gateway>1</is_gateway>
<model>PblPaymentGatewayFacade</model>
<model>DigitalWalletPaymentGatewayFacade</model>
<payment_action>authorize</payment_action>
<sort_order>1</sort_order>
<title>Pbl with paynow.pl</title>
<title>Digital wallets with paynow.pl</title>
<group>paynow_group</group>
</paynow_pbl_gateway>
</paynow_digital_wallet_gateway>
</payment>
</default>
</config>
12 changes: 6 additions & 6 deletions etc/di.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,29 @@
</arguments>
</virtualType>

<virtualType name="PaynowCardPaymentGatewayFacade" type="Magento\Payment\Model\Method\Adapter">
<virtualType name="PblPaymentGatewayFacade" type="Magento\Payment\Model\Method\Adapter">
<arguments>
<argument name="code" xsi:type="const">Paynow\PaymentGateway\Model\Ui\CardConfigProvider::CODE</argument>
<argument name="code" xsi:type="const">Paynow\PaymentGateway\Model\Ui\PblConfigProvider::CODE</argument>
<argument name="valueHandlerPool" xsi:type="object">PaynowPaymentGatewayValueHandlerPool</argument>
<argument name="commandPool" xsi:type="object">PaynowPaymentGatewayCommandPool</argument>
<argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
<argument name="infoBlockType" xsi:type="string">Paynow\PaymentGateway\Block\Info</argument>
</arguments>
</virtualType>

<virtualType name="DigitalWalletPaymentGatewayFacade" type="Magento\Payment\Model\Method\Adapter">
<virtualType name="PaynowCardPaymentGatewayFacade" type="Magento\Payment\Model\Method\Adapter">
<arguments>
<argument name="code" xsi:type="const">Paynow\PaymentGateway\Model\Ui\DigitalWalletConfigProvider::CODE</argument>
<argument name="code" xsi:type="const">Paynow\PaymentGateway\Model\Ui\CardConfigProvider::CODE</argument>
<argument name="valueHandlerPool" xsi:type="object">PaynowPaymentGatewayValueHandlerPool</argument>
<argument name="commandPool" xsi:type="object">PaynowPaymentGatewayCommandPool</argument>
<argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
<argument name="infoBlockType" xsi:type="string">Paynow\PaymentGateway\Block\Info</argument>
</arguments>
</virtualType>

<virtualType name="PblPaymentGatewayFacade" type="Magento\Payment\Model\Method\Adapter">
<virtualType name="DigitalWalletPaymentGatewayFacade" type="Magento\Payment\Model\Method\Adapter">
<arguments>
<argument name="code" xsi:type="const">Paynow\PaymentGateway\Model\Ui\PblConfigProvider::CODE</argument>
<argument name="code" xsi:type="const">Paynow\PaymentGateway\Model\Ui\DigitalWalletConfigProvider::CODE</argument>
<argument name="valueHandlerPool" xsi:type="object">PaynowPaymentGatewayValueHandlerPool</argument>
<argument name="commandPool" xsi:type="object">PaynowPaymentGatewayCommandPool</argument>
<argument name="formBlockType" xsi:type="string">Magento\Payment\Block\Form</argument>
Expand Down
6 changes: 3 additions & 3 deletions etc/frontend/di.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<item name="paynow_blik_gateway_config_provider" xsi:type="object">
Paynow\PaymentGateway\Model\Ui\BlikConfigProvider
</item>
<item name="paynow_pbl_gateway_config_provider" xsi:type="object">
Paynow\PaymentGateway\Model\Ui\PblConfigProvider
</item>
<item name="paynow_card_gateway_config_provider" xsi:type="object">
Paynow\PaymentGateway\Model\Ui\CardConfigProvider
</item>
<item name="paynow_digital_wallet_gateway" xsi:type="object">
Paynow\PaymentGateway\Model\Ui\DigitalWalletConfigProvider
</item>
<item name="paynow_pbl_gateway_config_provider" xsi:type="object">
Paynow\PaymentGateway\Model\Ui\PblConfigProvider
</item>
</argument>
</arguments>
</type>
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Paynow_PaymentGateway" setup_version="1.5.0">
<module name="Paynow_PaymentGateway" setup_version="1.5.1">
<sequence>
<module name="Magento_Sales"/>
<module name="Magento_Payment"/>
Expand Down
6 changes: 3 additions & 3 deletions etc/payment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<method name="paynow_blik_gateway">
<allow_multiple_address>1</allow_multiple_address>
</method>
<method name="paynow_card_gateway">
<method name="paynow_pbl_gateway">
<allow_multiple_address>1</allow_multiple_address>
</method>
<method name="paynow_digital_wallet_gateway">
<method name="paynow_card_gateway">
<allow_multiple_address>1</allow_multiple_address>
</method>
<method name="paynow_pbl_gateway">
<method name="paynow_digital_wallet_gateway">
<allow_multiple_address>1</allow_multiple_address>
</method>
</methods>
Expand Down
8 changes: 6 additions & 2 deletions view/frontend/web/css/checkout.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@
max-height: 100% !important;
}

.paynow-payment-option:not(.disabled):hover div,
.paynow-payment-option:not(.disabled).active div {
.paynow-payment-option:not(.disabled):hover div {
border: 1px solid #d2d2d2;
background: #f3f3f3;
}

.paynow-payment-option:not(.disabled).active div {
border: 2px solid #16A035;
background: #f3f3f3;
}

.paynow-payment-option.disabled div {
background: #fdfdfd;
}
Expand Down
18 changes: 18 additions & 0 deletions view/frontend/web/js/view/payment/paynow_card_gateway.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ define(
template: 'Paynow_PaymentGateway/payment/paynow_card_gateway',
instruments: window.checkoutConfig.payment.paynow_card_gateway.instruments,
paymentMethodToken: null,
paymentMethodFingerprint: null,
},
initialize: function (config) {
this._super();
Expand All @@ -40,6 +41,8 @@ define(
$('.paynow-payment-card-remove').addClass('--hidden')
}
});

this.fetchDeviceFingerprint();
},
getCode: function () {
return 'paynow_card_gateway';
Expand Down Expand Up @@ -131,6 +134,20 @@ define(
}
});
},
fetchDeviceFingerprint: function () {
try {
const fpPromise = import('https://static.paynow.pl/scripts/PyG5QjFDUI.min.js')
.then(FingerprintJS => FingerprintJS.load())

fpPromise
.then(fp => fp.get())
.then(result => {
this.paymentMethodFingerprint = result.visitorId;
})
} catch (e) {
console.error('Cannot get fingerprint');
}
},
showRemoveSavedInstrumentErrorMessage: function (instrumentToken) {
const errorMessageWrapper = $('#wrapper-' + instrumentToken + ' .paynow-payment-card-error');

Expand All @@ -150,6 +167,7 @@ define(
'additional_data': {
'payment_method_id': paymentMethodId,
'payment_method_token': this.paymentMethodToken,
'payment_method_fingerprint': this.paymentMethodFingerprint,
}
};
}
Expand Down

0 comments on commit fdb0065

Please sign in to comment.