Skip to content

A
Adyen Magento2

We will work on Apr 26th (Saturday) and will be off from Apr 30th (Wednesday) until May 2nd (Friday) for public holiday in our country

Commit 7696b9a3 authored by rikt's avatar rikt
Browse files
Options

[PW-1835] paymentMethods endpoint returns all payment methods. Filtering... 

[PW-1835] paymentMethods endpoint returns all payment methods. Filtering happens in front-end validation and removed unused helpers.
parent 960c7cd6
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 109 deletions
Helper/Data.php
View file @ 7696b9a3
...@@ -1098,43 +1098,6 @@ class Data extends AbstractHelper ...@@ -1098,43 +1098,6 @@ class Data extends AbstractHelper
return false; return false;
} }
/**
* @return mixed
*/
/**
* @param $paymentMethod
* @return bool
*/
public function isPaymentMethodBcmcMobileQRMethod($paymentMethod)
{
if (strpos($paymentMethod, 'bcmc_mobile_QR') !== false) {
return true;
}
return false;
}
/**
* The payment method for wechat should be only wechatweb until we support the others too.
*
* @param $paymentMethod
* @return bool
*/
public function isPaymentMethodWechatpayExceptWeb($paymentMethod)
{
if (strpos($paymentMethod, 'wechatpay') !== false) {
if (strpos($paymentMethod, 'wechatpayWeb') !== false) {
return false;
}
return true;
}
return false;
}
public function getRatePayId() public function getRatePayId()
{ {
return $this->getAdyenHppConfigData("ratepay_id"); return $this->getAdyenHppConfigData("ratepay_id");
...@@ -1156,18 +1119,6 @@ class Data extends AbstractHelper ...@@ -1156,18 +1119,6 @@ class Data extends AbstractHelper
return false; return false;
} }
/**
* @param $paymentMethod
* @return bool
*/
public function isPaymentMethodBoletoMethod($paymentMethod)
{
if (strpos($paymentMethod, 'boleto') !== false) {
return true;
}
return false;
}
/** /**
* @return bool * @return bool
*/ */
......
Helper/PaymentMethods.php
View file @ 7696b9a3
...@@ -135,41 +135,7 @@ class PaymentMethods extends AbstractHelper ...@@ -135,41 +135,7 @@ class PaymentMethods extends AbstractHelper
$quote = $this->quoteRepository->getActive($quoteId); $quote = $this->quoteRepository->getActive($quoteId);
$store = $quote->getStore(); $store = $quote->getStore();
$paymentMethods = $this->addHppMethodsToConfig($store, $country); $paymentMethods = $this->fetchAlternativeMethods($store, $country);
return $paymentMethods;
}
/**
* @param $store
* @return array
*/
protected function addHppMethodsToConfig($store, $country)
{
$paymentMethods = [];
$ccEnabled = $this->config->getValue(
'payment/' . \Adyen\Payment\Model\Ui\AdyenCcConfigProvider::CODE . '/active',
\Magento\Store\Model\ScopeInterface::SCOPE_STORES,
$store->getCode()
);
$ccTypes = array_keys($this->adyenHelper->getCcTypesAltData());
foreach ($this->fetchAlternativeMethods($store, $country) as $methodCode => $methodData) {
/*
* skip payment methods if it is a creditcard that is enabled in adyen_cc or a boleto method or wechat but
* not wechatpay
*/
if (($ccEnabled && in_array($methodCode, $ccTypes)) ||
$this->adyenHelper->isPaymentMethodBoletoMethod($methodCode) ||
$this->adyenHelper->isPaymentMethodBcmcMobileQRMethod($methodCode) ||
$this->adyenHelper->isPaymentMethodWechatpayExceptWeb($methodCode)
) {
continue;
}
$paymentMethods[$methodCode] = $methodData;
}
return $paymentMethods; return $paymentMethods;
} }
...@@ -215,10 +181,6 @@ class PaymentMethods extends AbstractHelper ...@@ -215,10 +181,6 @@ class PaymentMethods extends AbstractHelper
if (isset($responseData['paymentMethods'])) { if (isset($responseData['paymentMethods'])) {
foreach ($responseData['paymentMethods'] as $paymentMethod) { foreach ($responseData['paymentMethods'] as $paymentMethod) {
if ($paymentMethod['type'] == "scheme") {
continue;
}
$paymentMethodCode = $paymentMethod['type']; $paymentMethodCode = $paymentMethod['type'];
$paymentMethod = $this->fieldMapPaymentMethod($paymentMethod); $paymentMethod = $this->fieldMapPaymentMethod($paymentMethod);
......
view/frontend/web/js/view/payment/method-renderer/adyen-hpp-method.js
View file @ 7696b9a3
...@@ -43,6 +43,7 @@ define( ...@@ -43,6 +43,7 @@ define(
var paymentMethod = ko.observable(null); var paymentMethod = ko.observable(null);
var messageComponents; var messageComponents;
var shippingAddressCountryCode = quote.shippingAddress().countryId; var shippingAddressCountryCode = quote.shippingAddress().countryId;
var unsupportedPaymentMethods = ['scheme', 'boleto', 'bcmc_mobile_QR', 'wechatpay'];
/** /**
* Shareble adyen checkout component * Shareble adyen checkout component
* @type {AdyenCheckout} * @type {AdyenCheckout}
...@@ -70,7 +71,7 @@ define( ...@@ -70,7 +71,7 @@ define(
'bankLocationId' 'bankLocationId'
]); ]);
return this; return this;
},initialize: function () { }, initialize: function () {
var self = this; var self = this;
this._super(); this._super();
...@@ -87,9 +88,9 @@ define( ...@@ -87,9 +88,9 @@ define(
// reset variable: // reset variable:
adyenPaymentService.setPaymentMethods(); adyenPaymentService.setPaymentMethods();
adyenPaymentService.retrieveAvailablePaymentMethods(function() { adyenPaymentService.retrieveAvailablePaymentMethods(function () {
let paymentMethods = adyenPaymentService.getAvailablePaymentMethods(); var paymentMethods = adyenPaymentService.getAvailablePaymentMethods();
if (JSON.stringify(paymentMethods).indexOf("ratepay") > -1) { if (JSON.stringify(paymentMethods).indexOf("ratepay") > -1) {
var ratePayId = window.checkoutConfig.payment.adyenHpp.ratePayId; var ratePayId = window.checkoutConfig.payment.adyenHpp.ratePayId;
var dfValueRatePay = self.getRatePayDeviceIdentToken(); var dfValueRatePay = self.getRatePayDeviceIdentToken();
...@@ -133,7 +134,7 @@ define( ...@@ -133,7 +134,7 @@ define(
}, },
getAdyenHppPaymentMethods: function () { getAdyenHppPaymentMethods: function () {
var self = this; var self = this;
let currentShippingAddressCountryCode = quote.shippingAddress().countryId; var currentShippingAddressCountryCode = quote.shippingAddress().countryId;
// retrieve new payment methods if country code changed // retrieve new payment methods if country code changed
if (shippingAddressCountryCode != currentShippingAddressCountryCode) { if (shippingAddressCountryCode != currentShippingAddressCountryCode) {
...@@ -145,14 +146,19 @@ define( ...@@ -145,14 +146,19 @@ define(
var paymentMethods = adyenPaymentService.getAvailablePaymentMethods(); var paymentMethods = adyenPaymentService.getAvailablePaymentMethods();
var paymentList = _.map(paymentMethods, function (value) { var paymentList = _.reduce(paymentMethods, function (acc, value) {
if (!self.isPaymentMethodSupported(value.type)) {
return acc;
}
var result = {}; var result = {};
/** /**
* Returns the payment method's brand code (in checkout api it is the type) * Returns the payment method's brand code (in checkout api it is the type)
* @returns {*} * @returns {*}
*/ */
result.getBrandCode = function() { result.getBrandCode = function () {
return self.getBrandCodeFromPaymentMethod(value); return self.getBrandCodeFromPaymentMethod(value);
}; };
...@@ -180,7 +186,7 @@ define( ...@@ -180,7 +186,7 @@ define(
* @param bool * @param bool
* @returns {*} * @returns {*}
*/ */
result.isPlaceOrderAllowed = function(bool) { result.isPlaceOrderAllowed = function (bool) {
self.isPlaceOrderActionAllowed(bool); self.isPlaceOrderActionAllowed(bool);
return result.placeOrderAllowed(bool); return result.placeOrderAllowed(bool);
}; };
...@@ -191,11 +197,11 @@ define( ...@@ -191,11 +197,11 @@ define(
* @param bool * @param bool
* @returns {*} * @returns {*}
*/ */
result.isPlaceOrderAllowed = function(bool) { result.isPlaceOrderAllowed = function (bool) {
self.isPlaceOrderActionAllowed(bool); self.isPlaceOrderActionAllowed(bool);
return result.placeOrderAllowed(bool); return result.placeOrderAllowed(bool);
}; };
result.afterPlaceOrder = function() { result.afterPlaceOrder = function () {
return self.afterPlaceOrder(); return self.afterPlaceOrder();
}; };
/** /**
...@@ -282,7 +288,7 @@ define( ...@@ -282,7 +288,7 @@ define(
result.findIssuersProperty = function () { result.findIssuersProperty = function () {
var issuerKey = false; var issuerKey = false;
if (typeof value.details !== 'undefined') { if (typeof value.details !== 'undefined') {
$.each(value.details, function(key, detail) { $.each(value.details, function (key, detail) {
if (typeof detail.items !== 'undefined' && detail.key == 'issuer') { if (typeof detail.items !== 'undefined' && detail.key == 'issuer') {
issuerKey = key; issuerKey = key;
} }
...@@ -317,7 +323,7 @@ define( ...@@ -317,7 +323,7 @@ define(
* Returns the issuers for a payment method * Returns the issuers for a payment method
* @returns {*} * @returns {*}
*/ */
result.getIssuers = function() { result.getIssuers = function () {
if (result.hasIssuersAvailable()) { if (result.hasIssuersAvailable()) {
return value.details[result.findIssuersProperty()].items; return value.details[result.findIssuersProperty()].items;
} }
...@@ -502,11 +508,24 @@ define( ...@@ -502,11 +508,24 @@ define(
result.bankLocationId = ko.observable(null); result.bankLocationId = ko.observable(null);
} }
return result; acc.push(result);
}); return acc;
}, []);
return paymentList; return paymentList;
}, },
isPaymentMethodSupported: function (paymentMethod) {
if (paymentMethod == 'wechatpayWeb') {
return true;
}
for (var i = 0; i < unsupportedPaymentMethods.length; i++) {
var match = paymentMethod.match(unsupportedPaymentMethods[i]);
if(match) {
return false;
}
}
return true;
},
getGenderTypes: function () { getGenderTypes: function () {
return _.map(window.checkoutConfig.payment.adyenHpp.genderTypes, function (value, key) { return _.map(window.checkoutConfig.payment.adyenHpp.genderTypes, function (value, key) {
return { return {
...@@ -575,13 +594,13 @@ define( ...@@ -575,13 +594,13 @@ define(
return true; return true;
}, },
placeRedirectOrder: function(data) { placeRedirectOrder: function (data) {
// Place Order but use our own redirect url after // Place Order but use our own redirect url after
var self = this; var self = this;
fullScreenLoader.startLoader(); fullScreenLoader.startLoader();
var messageContainer = this.messageContainer; var messageContainer = this.messageContainer;
if(brandCode()) { if (brandCode()) {
messageContainer = self.messageComponents['messages-' + brandCode()]; messageContainer = self.messageComponents['messages-' + brandCode()];
} }
...@@ -599,7 +618,7 @@ define( ...@@ -599,7 +618,7 @@ define(
$("#messages-" + brandCode()).text(response['responseJSON'].message).slideDown(); $("#messages-" + brandCode()).text(response['responseJSON'].message).slideDown();
} }
setTimeout(function(){ setTimeout(function () {
$("#messages-" + brandCode()).slideUp(); $("#messages-" + brandCode()).slideUp();
}, 10000); }, 10000);
self.isPlaceOrderActionAllowed(true); self.isPlaceOrderActionAllowed(true);
...@@ -630,9 +649,9 @@ define( ...@@ -630,9 +649,9 @@ define(
}, },
validate: function (brandCode) { validate: function (brandCode) {
var form = '#payment_form_' + this.getCode() + '_' + brandCode; var form = '#payment_form_' + this.getCode() + '_' + brandCode;
var validate = $(form).validation() && $(form).validation('isValid'); var validate = $(form).validation() && $(form).validation('isValid');
if(!validate) { if (!validate) {
return false; return false;
} }
...@@ -691,8 +710,8 @@ define( ...@@ -691,8 +710,8 @@ define(
* @param arr * @param arr
* @returns {*} * @returns {*}
*/ */
filterUndefinedItemsInArray: function(arr) { filterUndefinedItemsInArray: function (arr) {
return arr.filter(function(item){ return arr.filter(function (item) {
return typeof item !== 'undefined'; return typeof item !== 'undefined';
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment