Merge branch 'hotfix/2.5.5'

Block/Payment/Form/Payzen.php

@@ -37,7 +37,7 @@ private function checkAndGetLogoUrl($fileName)
             return false;
         }
 
-        return $this->getCcTypeImageSrc($fileName, false);
+        return $this->dataHelper->getLogoImageSrc($fileName);
     }
 
     public function getConfigData($name)
@@ -69,9 +69,9 @@ protected function _toHtml()
         return parent::_toHtml();
     }
 
-    public function getCcTypeImageSrc($card, $cc = true)
+    public function getCcTypeImageSrc($card)
     {
-        return $this->dataHelper->getCcTypeImageSrc($card, $cc);
+        return $this->dataHelper->getCcTypeImageSrc($card);
     }
 
     public function getCurrentCustomer()

CHANGELOG.md

@@ -1,3 +1,7 @@
+2.5.5, 2021-03-09:
+- Use online payment means logos.
+- [franfinance] Send cart details for FranFinance payments.
+
 2.5.4, 2021-02-02:
 - Fix installment details errors introduced in 2.5.3 version.
 

Controller/Adminhtml/Payment/Redirect.php

@@ -111,7 +111,7 @@ private function back($msg)
     {
         // Clear all messages in session.
         $this->messageManager->getMessages(true);
-        $this->messageManager->addError($msg);
+        $this->messageManager->addErrorMessage($msg);
 
         $this->dataHelper->log($msg . ' Redirecting to backend create order page.');
 

Controller/Adminhtml/Payment/Response.php

@@ -67,7 +67,7 @@ private function redirectError($order = null)
     {
         // Clear all messages in session.
         $this->messageManager->getMessages(true);
-        $this->messageManager->addError(__('An error has occurred during the payment process.'));
+        $this->messageManager->addErrorMessage(__('An error has occurred during the payment process.'));
 
         $this->dataHelper->log('Redirecting to order creation page.' . ($order ? " Order #{$order->getIncrementId()}." : ''));
 
@@ -103,7 +103,7 @@ private function redirectResponse($order, $case, $checkUrlWarn = false)
             if ($features['prodfaq']) {
                 // Display going to production message.
                 $message = __('<u><p>GOING INTO PRODUCTION:</u></p> You want to know how to put your shop into production mode, please read chapters &laquo; Proceeding to test phase &raquo; and &laquo; Shifting the shop to production mode &raquo; in the documentation of the module.');
-                $this->messageManager->addNotice($message);
+                $this->messageManager->addNoticeMessage($message);
             }
 
             if ($checkUrlWarn) {
@@ -113,20 +113,20 @@ private function redirectResponse($order, $case, $checkUrlWarn = false)
                     $message = __('The shop is in maintenance mode.The automatic notification cannot work.');
                 } else {
                     $message = __('The automatic validation has not worked. Have you correctly set up the notification URL in your PayZen Back Office?');
-                    $message .= '<br /><br />';
+                    $message .= '&nbsp;<br /><br />';
                     $message .= __('For understanding the problem, please read the documentation of the module:<br />&nbsp;&nbsp;&nbsp;- Chapter &laquo; To read carefully before going further &raquo;<br />&nbsp;&nbsp;&nbsp;- Chapter &laquo; Notification URL settings &raquo;');
                 }
 
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
         }
 
         if ($case === Payment::SUCCESS) {
-            $this->messageManager->addSuccess(
+            $this->messageManager->addSuccessMessage(
                 __('The payment was successful. Your order was registered successfully.')
             );
         } elseif ($case === Payment::FAILURE) {
-            $this->messageManager->addWarning(__('Your payment was not accepted. Please, try to re-order.'));
+            $this->messageManager->addWarningMessage(__('Your payment was not accepted. Please, try to re-order.'));
         }
 
         $this->dataHelper->log("Redirecting to order view or order index page for order #{$order->getIncrementId()}.");

Controller/Adminhtml/Payment/Validate.php

@@ -68,7 +68,7 @@ public function execute()
             $id = $this->getRequest()->getParam('order_id');
             $order = $this->orderRepository->get($id);
             if (! $order->getId()) {
-                $this->messageManager->addError(__('This order no longer exists.'));
+                $this->messageManager->addErrorMessage(__('This order no longer exists.'));
                 $resultRedirect->setPath('sales/*/');
 
                 return $resultRedirect;
@@ -87,9 +87,9 @@ public function execute()
             $payment->getMethodInstance()->validatePayment($payment);
 
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->messageManager->addError($e->getMessage());
+            $this->messageManager->addErrorMessage($e->getMessage());
         } catch (\Exception $e) {
-            $this->messageManager->addError(__('An error has occurred during the validation process.'));
+            $this->messageManager->addErrorMessage(__('An error has occurred during the validation process.'));
         }
 
         $resultRedirect->setPath('sales/order/view',['order_id' => $order->getId()]);

Controller/Adminhtml/System/Config/Reset.php

@@ -58,7 +58,7 @@ public function execute()
         // Clear cache.
         $this->cache->clean();
 
-        $this->messageManager->addSuccess(
+        $this->messageManager->addSuccessMessage(
             __('The configuration of the PayZen module has been successfully reset.')
         );
 

Controller/Payment/Response.php

@@ -122,7 +122,7 @@ protected function redirectResponse($order, $case, $checkUrlWarn = false)
             if ($features['prodfaq']) {
                 // Display going to production message.
                 $message = __('<u><p>GOING INTO PRODUCTION:</u></p> You want to know how to put your shop into production mode, please read chapters &laquo; Proceeding to test phase &raquo; and &laquo; Shifting the shop to production mode &raquo; in the documentation of the module.');
-                $this->messageManager->addNotice($message);
+                $this->messageManager->addNoticeMessage($message);
             }
 
             if ($checkUrlWarn) {
@@ -132,11 +132,11 @@ protected function redirectResponse($order, $case, $checkUrlWarn = false)
                     $message = __('The shop is in maintenance mode.The automatic notification cannot work.');
                 } else {
                     $message = __('The automatic validation has not worked. Have you correctly set up the notification URL in your PayZen Back Office?');
-                    $message .= '<br /><br />';
+                    $message .= '&nbsp;<br /><br />';
                     $message .= __('For understanding the problem, please read the documentation of the module:<br />&nbsp;&nbsp;&nbsp;- Chapter &laquo; To read carefully before going further &raquo;<br />&nbsp;&nbsp;&nbsp;- Chapter &laquo; Notification URL settings &raquo;');
                 }
 
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
         }
 
@@ -151,7 +151,7 @@ protected function redirectResponse($order, $case, $checkUrlWarn = false)
             $resultRedirect = $this->createResult('checkout/onepage/success', ['_scope' => $storeId]);
         } else {
             if ($case === Payment::FAILURE) {
-                $this->messageManager->addWarning(__('Your payment was not accepted. Please, try to re-order.'));
+                $this->messageManager->addWarningMessage(__('Your payment was not accepted. Please, try to re-order.'));
             }
 
             $this->dataHelper->log("Restore cart for order #{$order->getIncrementId()} to allow re-order quicker.");

Helper/Data.php

@@ -12,6 +12,8 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Lyranetwork\Payzen\Block\Adminhtml\System\Config\Form\Field\Gift\AddedCards;
+use Lyranetwork\Payzen\Model\Method\Gift;
 
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -475,26 +477,40 @@ public function getCurrentCustomer($customerSession)
     }
 
     /**
-     * Return card logo source path if exists, else return false.
+     * Return card logo source path from upload directory or the online logo.
      * @param string $card
-     * @param boolean $cc
      *
      * @return string|boolean
      */
-    public function getCcTypeImageSrc($card, $cc = true)
+    public function getCcTypeImageSrc($card)
     {
-        if ($cc) {
-            $card = 'cc/' . strtolower($card) . '.png';
+        $name = strtolower($card) . '.png';
+
+        if ($this->isUploadFileImageExists('cc/' . $card)) {
+            return $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) .
+                'payzen/images/cc/' . $name;
+        } else {
+            return $this->getCommonConfigData('logo_url') . $name;
         }
+    }
 
-        if ($this->isUploadFileImageExists($card)) {
+    /**
+     * Return submodule logo source path if exists, return false elsewhere.
+     * @param string $card
+     *
+     * @return string|boolean
+     */
+    public function getLogoImageSrc($name)
+    {
+        if ($this->isUploadFileImageExists($name)) {
             return $this->storeManager->getStore()->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) .
-                'payzen/images/' . $card;
+                'payzen/images/' . $name;
         } else {
-            $asset = $this->assetRepo->createAsset('Lyranetwork_Payzen::images/' . $card);
+            // Default logo from the installed plugin.
+            $asset = $this->assetRepo->createAsset('Lyranetwork_Payzen::images/' . $name);
 
             if ($this->isPublishFileImageExists($asset->getRelativeSourceFilePath())) {
-                return $this->getViewFileUrl('Lyranetwork_Payzen::images/' . $card);
+                return $this->getViewFileUrl('Lyranetwork_Payzen::images/' . $name);
             }
         }
 

Model/Method/Franfinance.php

@@ -16,6 +16,7 @@ class Franfinance extends Payzen
 
     protected $_canUseInternal = false;
 
+    protected $needsCartData = true;
     protected $currencies = ['EUR'];
     protected $countries = ['FR', 'GP', 'MQ', 'GF', 'RE', 'YT'];
 

Model/Method/Payzen.php

@@ -544,7 +544,7 @@ public function acceptPayment(\Magento\Payment\Model\InfoInterface $payment)
             $this->paymentHelper->createInvoice($order);
 
             $order->save();
-            $this->messageManager->addSuccess(__('The payment has been accepted.'));
+            $this->messageManager->addSuccessMessage(__('The payment has been accepted.'));
 
             $redirectUrl = $this->urlBuilder->getUrl(
                 'sales/order/view',
@@ -583,7 +583,7 @@ public function acceptPayment(\Magento\Payment\Model\InfoInterface $payment)
                     $message .= $e->getMessage();
                 }
 
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
                 throw $e;
             }
         }
@@ -609,7 +609,7 @@ public function denyPayment(\Magento\Payment\Model\InfoInterface $payment)
         if (! $this->restHelper->getPrivateKey($storeId)) {
             $this->dataHelper->log("Cannot cancel payment online for order #{$order->getIncrementId()}: private key is not configured, let Magento cancel the payment.");
 
-            $this->messageManager->addWarning(__('Payment is cancelled only in Magento. Please, consider cancelling the payment in PayZen Back Office.'));
+            $this->messageManager->addWarningMessage(__('Payment is cancelled only in Magento. Please, consider cancelling the payment in PayZen Back Office.'));
             return true;
         }
 
@@ -680,7 +680,7 @@ public function denyPayment(\Magento\Payment\Model\InfoInterface $payment)
                 // Merchant does not subscribe to REST WS option, deny payment offline.
                 $this->dataHelper->log("Cannot cancel payment online for order #{$order->getIncrementId()}: REST API not available for merchant, let Magento cancel the payment.");
 
-                $this->messageManager->addWarning(__('Payment is cancelled only in Magento. Please, consider cancelling the payment in PayZen Back Office.'));
+                $this->messageManager->addWarningMessage(__('Payment is cancelled only in Magento. Please, consider cancelling the payment in PayZen Back Office.'));
                 return true;
             } else {
                 $message = __('Cancellation error') . ': ';
@@ -692,7 +692,7 @@ public function denyPayment(\Magento\Payment\Model\InfoInterface $payment)
                     $message .= $e->getMessage();
                 }
 
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
                 throw $e;
             }
         }
@@ -807,7 +807,7 @@ public function validatePayment(\Magento\Payment\Model\InfoInterface $payment)
             $order->save();
 
             $this->dataHelper->log("Payment information updated for validated order #{$order->getIncrementId()}.");
-            $this->messageManager->addSuccess(__('Payment validated successfully.'));
+            $this->messageManager->addSuccessMessage(__('Payment validated successfully.'));
         } catch(\UnexpectedValueException $e) {
             $this->dataHelper->log(
                 "Validate payment error: {$e->getMessage()}.",
@@ -837,14 +837,14 @@ public function validatePayment(\Magento\Payment\Model\InfoInterface $payment)
                     $message .= $e->getMessage();
                 }
 
-                $this->messageManager->addError($message);
+                $this->messageManager->addErrorMessage($message);
             }
         }
     }
 
     protected function validatePaymentOffline($order)
     {
-        $this->messageManager->addWarning(__('Payment is validated only in Magento. Please, consider validating the payment in PayZen Back Office.'));
+        $this->messageManager->addWarningMessage(__('Payment is validated only in Magento. Please, consider validating the payment in PayZen Back Office.'));
 
         // Wrap payment result to use traditional order creation tunnel.
         $data = ['vads_trans_status' => 'AUTHORISED'];
@@ -1145,7 +1145,7 @@ public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
             } elseif ($e->getCode() === 'PSP_100') {
                 // Merchant does not subscribe to REST WS option, refund payment offline.
                 $notice = __('You are not authorized to do this action online. Please, do not forget to update payment in PayZen Back Office.');
-                $this->messageManager->addWarning($notice);
+                $this->messageManager->addWarningMessage($notice);
                 // Magento will do an offline refund.
             } else {
                 $message = __('Refund error') . ': ';

Model/PayzenConfigProvider.php

@@ -86,7 +86,7 @@ protected function getModuleLogoUrl()
     {
         $fileName = $this->method->getConfigData('module_logo');
 
-        return $this->getCcTypeImageSrc($fileName, false);
+        return $this->dataHelper->getLogoImageSrc($fileName);
     }
 
     protected function getAvailableCcTypes()
@@ -118,9 +118,9 @@ protected function getEntryMode()
         return $this->method->getEntryMode();
     }
 
-    protected function getCcTypeImageSrc($card, $cc = true)
+    protected function getCcTypeImageSrc($card)
     {
-        return $this->dataHelper->getCcTypeImageSrc($card, $cc);
+        return $this->dataHelper->getCcTypeImageSrc($card);
     }
 
     protected function renderMaskedPan($maskedPan)

composer.json

@@ -5,7 +5,7 @@
 		"php" : "~5.5.0|~5.6.0|~7"
 	},
 	"type" : "magento2-module",
-	"version" : "2.5.4",
+	"version" : "2.5.5",
 	"license" : "OSL-3.0",
 	"autoload" : {
 		"files" : [

etc/config.xml

@@ -15,7 +15,7 @@
         <payzen>
             <general>
                 <support_email>[email protected]</support_email>
-                <plugin_version>2.5.4</plugin_version>
+                <plugin_version>2.5.5</plugin_version>
                 <gateway_version>V2</gateway_version>
                 <cms_identifier>Magento_2.x</cms_identifier>
                 <enable_logs>1</enable_logs>
@@ -35,6 +35,7 @@
                 <rest_notify_url>payzen/payment_rest/check</rest_notify_url>
                 <rest_url>https://api.payzen.eu/api-payment/</rest_url>
                 <static_url>https://static.payzen.eu/static/</static_url>
+                <logo_url>https://secure.payzen.eu/static/latest/images/type-carte/</logo_url>
 
                 <language>fr</language>
                 <validation_mode></validation_mode>

view/frontend/web/template/payment/cc-type.html

@@ -36,7 +36,7 @@
 
                 <label data-bind="attr: {for: $parent.getCode() + '_cc_type_' + card.value}">
                     <!--ko if: card.icon -->
-                    <img data-bind="attr: {src: card.icon, title: card.label}" style="max-height: 35px; max-width: 90px; vertical-align: middle;">
+                    <img data-bind="attr: {src: card.icon, title: card.label, alt: option.key}" style="max-height: 35px; max-width: 90px; vertical-align: middle;">
                     <!--/ko-->
 
                     <!--ko ifnot: card.icon -->

view/frontend/web/template/payment/payzen-choozeo.html

@@ -20,7 +20,6 @@
             <!-- ko if: getModuleLogoUrl() -->
                 <img data-bind="attr: {src: getModuleLogoUrl()}"
                      class="payment-icon"
-                     alt="PayZen"
                      style="width: 76px;"
                 />
             <!--/ko-->
@@ -65,7 +64,7 @@
 
                             <label data-bind="attr: {for: $parent.getCode() + '_option' + option.key}">
                             <!--ko if: option.icon -->
-                                <img data-bind="attr: {src: option.icon, title: option.label}" style="height: 32px; vertical-align: middle;">
+                                <img data-bind="attr: {src: option.icon, alt: option.key}" style="height: 32px; vertical-align: middle;">
                             <!--/ko-->
 
                             <!--ko ifnot: option.icon -->

view/frontend/web/template/payment/payzen-franfinance.html

@@ -20,7 +20,6 @@
             <!-- ko if: getModuleLogoUrl() -->
                 <img data-bind="attr: {src: getModuleLogoUrl()}"
                      class="payment-icon"
-                     alt="PayZen"
                      style="width: 76px;"
                 />
             <!--/ko-->

view/frontend/web/template/payment/payzen-fullcb.html

@@ -20,7 +20,6 @@
             <!-- ko if: getModuleLogoUrl() -->
                 <img data-bind="attr: {src: getModuleLogoUrl()}"
                      class="payment-icon"
-                     alt="PayZen"
                      style="width: 76px;"
                 />
             <!--/ko-->

view/frontend/web/template/payment/payzen-gift.html

@@ -20,7 +20,6 @@
             <!-- ko if: getModuleLogoUrl() -->
                 <img data-bind="attr: {src: getModuleLogoUrl()}"
                      class="payment-icon"
-                     alt="PayZen"
                      style="width: 76px;"
                 />
             <!--/ko-->

view/frontend/web/template/payment/payzen-multi.html

@@ -20,7 +20,6 @@
             <!-- ko if: getModuleLogoUrl() -->
                 <img data-bind="attr: {src: getModuleLogoUrl()}"
                      class="payment-icon"
-                     alt="PayZen"
                      style="width: 76px;"
                 />
             <!--/ko-->