From 11fadb7929e449dac637f74c24979347ffa0b5d6 Mon Sep 17 00:00:00 2001 From: Nabil SEMAOUNE Date: Tue, 21 May 2019 17:58:13 +0200 Subject: [PATCH] Version 1.9.4 to GitHub. --- CHANGELOG.md | 3 +++ .../Model/Api/Ws/AuthenticationRequestData.php | 2 +- .../Payzen/Model/Api/Ws/AuthenticationResultData.php | 2 +- .../Payzen/Model/Api/Ws/AuthorizationResponse.php | 2 +- .../Payzen/Model/Api/Ws/BillingDetailsRequest.php | 2 +- .../Payzen/Model/Api/Ws/BillingDetailsResponse.php | 2 +- .../Payzen/Model/Api/Ws/CancelCapturedPayment.php | 2 +- .../Model/Api/Ws/CancelCapturedPaymentResponse.php | 2 +- .../Model/Api/Ws/CancelCapturedPaymentResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CancelPayment.php | 2 +- .../Payzen/Model/Api/Ws/CancelPaymentResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CancelPaymentResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CancelRefund.php | 2 +- .../Payzen/Model/Api/Ws/CancelRefundResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CancelRefundResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CancelSubscription.php | 2 +- .../Model/Api/Ws/CancelSubscriptionResponse.php | 2 +- .../Payzen/Model/Api/Ws/CancelSubscriptionResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CancelToken.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CancelTokenResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CancelTokenResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CapturePayment.php | 2 +- .../Payzen/Model/Api/Ws/CapturePaymentResponse.php | 2 +- .../Payzen/Model/Api/Ws/CapturePaymentResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CaptureResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CardRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CardResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CartItemInfo.php | 2 +- .../Model/Api/Ws/CheckThreeDSAuthentication.php | 2 +- .../Api/Ws/CheckThreeDSAuthenticationResponse.php | 2 +- .../Api/Ws/CheckThreeDSAuthenticationResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CommonRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CommonResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CreatePayment.php | 2 +- .../Payzen/Model/Api/Ws/CreatePaymentResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CreatePaymentResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CreateSubscription.php | 2 +- .../Model/Api/Ws/CreateSubscriptionResponse.php | 2 +- .../Payzen/Model/Api/Ws/CreateSubscriptionResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CreateToken.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CreateTokenByIban.php | 2 +- .../Model/Api/Ws/CreateTokenByIbanResponse.php | 2 +- .../Payzen/Model/Api/Ws/CreateTokenByIbanResult.php | 2 +- .../Model/Api/Ws/CreateTokenFromTransaction.php | 2 +- .../Api/Ws/CreateTokenFromTransactionResponse.php | 2 +- .../Api/Ws/CreateTokenFromTransactionResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CreateTokenResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CreateTokenResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CustStatus.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CustomerRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/CustomerResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/DeliverySpeed.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/DeliveryType.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/DuplicatePayment.php | 2 +- .../Payzen/Model/Api/Ws/DuplicatePaymentResponse.php | 2 +- .../Payzen/Model/Api/Ws/DuplicatePaymentResult.php | 2 +- .../community/Lyra/Payzen/Model/Api/Ws/ExtInfo.php | 2 +- .../Payzen/Model/Api/Ws/ExtendedResponseRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/ExtraDetailsRequest.php | 2 +- .../Payzen/Model/Api/Ws/ExtraDetailsResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/ExtraResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/FindPayments.php | 2 +- .../Payzen/Model/Api/Ws/FindPaymentsResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/FindPaymentsResult.php | 2 +- .../Payzen/Model/Api/Ws/FraudManagementResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/GetPaymentDetails.php | 2 +- .../Model/Api/Ws/GetPaymentDetailsResponse.php | 2 +- .../Payzen/Model/Api/Ws/GetPaymentDetailsResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/GetPaymentUuid.php | 2 +- .../Payzen/Model/Api/Ws/GetPaymentUuidResponse.php | 2 +- .../Payzen/Model/Api/Ws/GetSubscriptionDetails.php | 2 +- .../Model/Api/Ws/GetSubscriptionDetailsResponse.php | 2 +- .../Model/Api/Ws/GetSubscriptionDetailsResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/GetTokenDetails.php | 2 +- .../Payzen/Model/Api/Ws/GetTokenDetailsResponse.php | 2 +- .../Payzen/Model/Api/Ws/GetTokenDetailsResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/IbanRequest.php | 2 +- .../Model/Api/Ws/LegacyTransactionKeyRequest.php | 2 +- .../Model/Api/Ws/LegacyTransactionKeyResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/MarkResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/MpiExtensionRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/OrderRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/OrderResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/PaymentRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/PaymentResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/PaymentType.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/ProductType.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/QueryRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/ReactivateToken.php | 2 +- .../Payzen/Model/Api/Ws/ReactivateTokenResponse.php | 2 +- .../Payzen/Model/Api/Ws/ReactivateTokenResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/RefundPayment.php | 2 +- .../Payzen/Model/Api/Ws/RefundPaymentResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/RefundPaymentResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/RiskAnalysis.php | 2 +- .../Model/Api/Ws/RiskAnalysisProcessingStatus.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/RiskAssessments.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/RiskControl.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/SettlementRequest.php | 2 +- .../Payzen/Model/Api/Ws/ShippingDetailsRequest.php | 2 +- .../Payzen/Model/Api/Ws/ShippingDetailsResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/ShoppingCartRequest.php | 2 +- .../Payzen/Model/Api/Ws/ShoppingCartResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/SubscriptionRequest.php | 2 +- .../Payzen/Model/Api/Ws/SubscriptionResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/TechRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/ThreeDSMode.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/ThreeDSRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/ThreeDSResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/TokenRequest.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/TokenResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/TransactionItem.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/UpdatePayment.php | 2 +- .../Payzen/Model/Api/Ws/UpdatePaymentDetails.php | 2 +- .../Model/Api/Ws/UpdatePaymentDetailsResponse.php | 2 +- .../Model/Api/Ws/UpdatePaymentDetailsResult.php | 2 +- .../Payzen/Model/Api/Ws/UpdatePaymentResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/UpdatePaymentResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/UpdateRefund.php | 2 +- .../Payzen/Model/Api/Ws/UpdateRefundResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/UpdateRefundResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/UpdateSubscription.php | 2 +- .../Model/Api/Ws/UpdateSubscriptionResponse.php | 2 +- .../Payzen/Model/Api/Ws/UpdateSubscriptionResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/UpdateToken.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/UpdateTokenResponse.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/UpdateTokenResult.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/ValidatePayment.php | 2 +- .../Payzen/Model/Api/Ws/ValidatePaymentResponse.php | 2 +- .../Payzen/Model/Api/Ws/ValidatePaymentResult.php | 2 +- .../Payzen/Model/Api/Ws/VerifyThreeDSEnrollment.php | 2 +- .../Model/Api/Ws/VerifyThreeDSEnrollmentResponse.php | 2 +- .../Model/Api/Ws/VerifyThreeDSEnrollmentResult.php | 2 +- .../community/Lyra/Payzen/Model/Api/Ws/WsApi.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/WsApiClassLoader.php | 2 +- .../Lyra/Payzen/Model/Api/Ws/WsResponse.php | 2 +- .../community/Lyra/Payzen/Model/Payment/Abstract.php | 12 ++++++------ .../community/Lyra/Payzen/Model/Payment/Multix.php | 4 ++-- app/code/community/Lyra/Payzen/etc/config.xml | 4 ++-- 139 files changed, 148 insertions(+), 145 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5dcfa997..a1114759 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +1.9.4, 2019-05-20: +- Bug fix: regression relative to currency check management. + 1.9.3, 2019-05-13: - Bug fix: fatal error on order view occurring when there is a format error in payment form. - Bug fix: translations broken and performance decrease. diff --git a/app/code/community/Lyra/Payzen/Model/Api/Ws/AuthenticationRequestData.php b/app/code/community/Lyra/Payzen/Model/Api/Ws/AuthenticationRequestData.php index d240853d..5af15d0f 100644 --- a/app/code/community/Lyra/Payzen/Model/Api/Ws/AuthenticationRequestData.php +++ b/app/code/community/Lyra/Payzen/Model/Api/Ws/AuthenticationRequestData.php @@ -1,6 +1,6 @@ currentCurrency) { + if ($this->currentCurrencyCode) { // If submodule support specific currencies, check quote currency over them. if (is_array($this->_currencies) && ! empty($this->_currencies)) { - return in_array($this->currencyCode, $this->_currencies); + return in_array($this->currentCurrencyCode, $this->_currencies); } - $currency = Lyra_Payzen_Model_Api_Api::findCurrencyByAlphaCode($this->currencyCode); + $currency = Lyra_Payzen_Model_Api_Api::findCurrencyByAlphaCode($this->currentCurrencyCode); if ($currency) { return true; } @@ -702,7 +702,7 @@ public function canUseForCurrency($baseCurrencyCode) return true; } - $this->_getHelper()->log("Could not find numeric codes for selected ($this->currencyCode) and base ($baseCurrencyCode) currencies."); + $this->_getHelper()->log("Could not find numeric codes for selected ($this->currentCurrencyCode) and base ($baseCurrencyCode) currencies."); return false; } @@ -717,7 +717,7 @@ public function isAvailable($quote = null) return false; } - $this->currentCurrency = $quote ? $quote->getQuoteCurrencyCode() : null; + $this->currentCurrencyCode = $quote ? $quote->getQuoteCurrencyCode() : null; $amount = $quote ? $quote->getBaseGrandTotal() : null; if (! $amount) { diff --git a/app/code/community/Lyra/Payzen/Model/Payment/Multix.php b/app/code/community/Lyra/Payzen/Model/Payment/Multix.php index 09437fe7..ef02680d 100644 --- a/app/code/community/Lyra/Payzen/Model/Payment/Multix.php +++ b/app/code/community/Lyra/Payzen/Model/Payment/Multix.php @@ -16,10 +16,10 @@ class Lyra_Payzen_Model_Payment_Multix extends Lyra_Payzen_Model_Payment_Multi /** * Check method for processing with base currency * - * @param string $currencyCode + * @param string $baseCurrencyCode * @return boolean */ - public function canUseForCurrency($currencyCode) + public function canUseForCurrency($baseCurrencyCode) { // This is a fictive payment method, allways return false to avoid method proposal. return false; diff --git a/app/code/community/Lyra/Payzen/etc/config.xml b/app/code/community/Lyra/Payzen/etc/config.xml index 9da7f373..68fa153c 100644 --- a/app/code/community/Lyra/Payzen/etc/config.xml +++ b/app/code/community/Lyra/Payzen/etc/config.xml @@ -14,7 +14,7 @@ - 1.9.3 + 1.9.4 @@ -470,7 +470,7 @@ Lyra Network support@payzen.eu - 1.9.3 + 1.9.4 V2 Magento_1.4-1.9 1