Merge branch 'release/v3.0.1' into 'master'

release/v3.0.1 into master See merge request agence-dnd/marketplace/magento-2/external/module-checkout-magento2-plugin!21
checkout · Mar 17, 2022 · c9518e8 · c9518e8
2 parents 0e5d5b5 + 1bcaffb
commit c9518e8
Show file tree

Hide file tree

Showing 15 changed files with 148 additions and 71 deletions.
diff --git a/Controller/Payment/Verify.php b/Controller/Payment/Verify.php
@@ -167,7 +167,8 @@ public function execute(): ResponseInterface
                                 ]);
                             }
 
-                            if (isset($response->metadata['successUrl']) && !str_contains(
+                            if (isset($response->metadata['successUrl']) &&
+                                false === strpos(
                                     $response->metadata['successUrl'],
                                     'checkout_com/payment/verify'
                                 )) {

diff --git a/Gateway/Config/Config.php b/Gateway/Config/Config.php
@@ -243,7 +243,7 @@ public function getMethodsConfig(): array
          * @var string[] $method
          */
         foreach($paymentMethodsConfig as $key => $method) {
-            if (str_contains($key, 'checkoutcom')
+            if (false !== strpos($key, 'checkoutcom')
                && isset($method['active'])
                && (int)$method['active'] === 1
             ) {

diff --git a/Helper/Logger.php b/Helper/Logger.php
@@ -20,7 +20,7 @@
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Message\ManagerInterface;
 use Magento\Store\Model\ScopeInterface;
-use Zend\Log\Writer\Stream;
+use Psr\Log\LoggerInterface;
 
 /**
  * Class Logger
@@ -39,19 +39,28 @@ class Logger
      * @var ScopeConfigInterface $scopeConfig
      */
     private $scopeConfig;
+    /**
+     * $logger field
+     *
+     * @var LoggerInterface $logger
+     */
+    private $logger;
 
     /**
      * Logger constructor
      *
      * @param ManagerInterface     $messageManager
      * @param ScopeConfigInterface $scopeConfig
+     * @param LoggerInterface      $logger
      */
     public function __construct(
         ManagerInterface $messageManager,
-        ScopeConfigInterface $scopeConfig
+        ScopeConfigInterface $scopeConfig,
+        LoggerInterface $logger
     ) {
         $this->messageManager = $messageManager;
         $this->scopeConfig    = $scopeConfig;
+        $this->logger         = $logger;
     }
 
     /**
@@ -77,10 +86,7 @@ public function write($msg): void
 
         // Handle the file logging
         if ($debug && $fileLogging) {
-            $writer = new Stream(BP . '/var/log/checkoutcom_magento2.log');
-            $logger = new \Zend\Log\Logger();
-            $logger->addWriter($writer);
-            $logger->info($msg);
+            $this->logger->debug('Checkout Logging: ', $msg);
         }
     }
 

diff --git a/Model/Methods/AbstractMethod.php b/Model/Methods/AbstractMethod.php
@@ -227,9 +227,9 @@ abstract class AbstractMethod extends AbstractExtensibleModel implements MethodI
     /**
      * Core store config
      *
-     * @var ScopeConfigInterface $_scopeConfig
+     * @var ScopeConfigInterface $scopeConfig
      */
-    protected $_scopeConfig;
+    protected $scopeConfig;
     /**
      * $logger field
      *
@@ -256,8 +256,6 @@ abstract class AbstractMethod extends AbstractExtensibleModel implements MethodI
     private $config;
 
     /**
-     * AbstractMethod constructor
-     *
      * @param Config                     $config
      * @param Context                    $context
      * @param Registry                   $registry
@@ -266,10 +264,11 @@ abstract class AbstractMethod extends AbstractExtensibleModel implements MethodI
      * @param Data                       $paymentData
      * @param ScopeConfigInterface       $scopeConfig
      * @param Logger                     $logger
+     * @param DirectoryHelper            $directory
+     * @param DataObjectFactory          $dataObjectFactory
      * @param AbstractResource|null      $resource
      * @param AbstractDb|null            $resourceCollection
      * @param array                      $data
-     * @param DirectoryHelper|null       $directory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -281,11 +280,11 @@ public function __construct(
         Data $paymentData,
         ScopeConfigInterface $scopeConfig,
         Logger $logger,
+        DirectoryHelper $directory,
+        DataObjectFactory $dataObjectFactory,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
-        array $data = [],
-        DirectoryHelper $directory,
-        DataObjectFactory $dataObjectFactory
+        array $data = []
     ) {
         parent::__construct(
             $context,
@@ -298,7 +297,7 @@ public function __construct(
         );
         $this->config            = $config;
         $this->_paymentData      = $paymentData;
-        $this->_scopeConfig      = $scopeConfig;
+        $this->scopeConfig       = $scopeConfig;
         $this->logger            = $logger;
         $this->directory         = $directory;
         $this->data              = $data;
@@ -583,7 +582,7 @@ public function getConfigData($field, $storeId = null)
         }
         $path = 'payment/' . $this->getCode() . '/' . $field;
 
-        return $this->_scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE, $storeId);
+        return $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE, $storeId);
     }
 
     /**
@@ -1037,4 +1036,14 @@ protected function initializeData(array $data = []): void
             $this->_formBlockType = $data['formBlockType'];
         }
     }
+
+    /**
+     * Description isModuleActive function
+     *
+     * @return bool
+     */
+    public function isModuleActive(): bool
+    {
+        return (bool)$this->scopeConfig->getValue('settings/checkoutcom_configuration/active');
+    }
 }
diff --git a/Model/Methods/AlternativePaymentMethod.php b/Model/Methods/AlternativePaymentMethod.php
@@ -312,6 +312,7 @@ class AlternativePaymentMethod extends AbstractMethod
      * @param AbstractDb|null            $resourceCollection
      * @param array                      $data
      * @param DirectoryHelper            $directoryHelper
+     * @param DataObjectFactory          $dataObjectFactory
      */
     public function __construct(
         Context $context,
@@ -343,11 +344,11 @@ public function __construct(
         Display $display,
         StoreManagerInterface $storeManager,
         Curl $curl,
+        DirectoryHelper $directoryHelper,
+        DataObjectFactory $dataObjectFactory,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
-        array $data = [],
-        DirectoryHelper $directoryHelper,
-        DataObjectFactory $dataObjectFactory
+        array $data = []
     ) {
         parent::__construct(
             $config,
@@ -358,11 +359,11 @@ public function __construct(
             $paymentData,
             $scopeConfig,
             $logger,
+            $directoryHelper,
+            $dataObjectFactory,
             $resource,
             $resourceCollection,
-            $data,
-            $directoryHelper,
-            $dataObjectFactory
+            $data
         );
 
         $this->urlBuilder         = $urlBuilder;
@@ -1026,7 +1027,7 @@ public function isAvailable(CartInterface $quote = null): bool
                 }
             }
         }
-        if (parent::isAvailable($quote) && null !== $quote) {
+        if ($this->isModuleActive() && parent::isAvailable($quote) && null !== $quote) {
             return $this->config->getValue('active', $this->_code)
             && count($this->config->getApms()) > 0
             && !$this->backendAuthSession->isLoggedIn()

diff --git a/Model/Methods/ApplePayMethod.php b/Model/Methods/ApplePayMethod.php
@@ -174,10 +174,11 @@ class ApplePayMethod extends AbstractMethod
      * @param StoreManagerInterface      $storeManager
      * @param QuoteHandlerService        $quoteHandler
      * @param MagentoLoggerHelper        $ckoLogger
+     * @param DirectoryHelper            $directoryHelper
+     * @param DataObjectFactory          $dataObjectFactory
      * @param AbstractResource|null      $resource
      * @param AbstractDb|null            $resourceCollection
      * @param array                      $data
-     * @param DirectoryHelper            $directoryHelper
      */
     public function __construct(
         Context $context,
@@ -194,11 +195,11 @@ public function __construct(
         StoreManagerInterface $storeManager,
         QuoteHandlerService $quoteHandler,
         MagentoLoggerHelper $ckoLogger,
+        DirectoryHelper $directoryHelper,
+        DataObjectFactory $dataObjectFactory,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
-        array $data = [],
-        DirectoryHelper $directoryHelper,
-        DataObjectFactory $dataObjectFactory
+        array $data = []
     ) {
         parent::__construct(
             $config,
@@ -209,11 +210,11 @@ public function __construct(
             $paymentData,
             $scopeConfig,
             $logger,
+            $directoryHelper,
+            $dataObjectFactory,
             $resource,
             $resourceCollection,
-            $data,
-            $directoryHelper,
-            $dataObjectFactory
+            $data
         );
 
         $this->backendAuthSession = $backendAuthSession;
@@ -497,7 +498,7 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
      */
     public function isAvailable(CartInterface $quote = null): bool
     {
-        if (parent::isAvailable($quote) && null !== $quote) {
+        if ($this->isModuleActive() && parent::isAvailable($quote) && null !== $quote) {
             return $this->config->getValue('active', $this->_code) && $this->config->getValue(
                     'enabled_on_checkout',
                     $this->_code

diff --git a/Model/Methods/CardPaymentMethod.php b/Model/Methods/CardPaymentMethod.php
@@ -190,10 +190,11 @@ class CardPaymentMethod extends AbstractMethod
      * @param QuoteHandlerService        $quoteHandler
      * @param CardHandlerService         $cardHandler
      * @param LoggerHelper               $ckoLogger
+     * @param DirectoryHelper            $directoryHelper
+     * @param DataObjectFactory          $dataObjectFactory
      * @param AbstractResource|null      $resource
      * @param AbstractDb|null            $resourceCollection
      * @param array                      $data
-     * @param DirectoryHelper            $directoryHelper
      */
     public function __construct(
         Context $context,
@@ -212,11 +213,11 @@ public function __construct(
         QuoteHandlerService $quoteHandler,
         CardHandlerService $cardHandler,
         LoggerHelper $ckoLogger,
+        DirectoryHelper $directoryHelper,
+        DataObjectFactory $dataObjectFactory,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
-        array $data = [],
-        DirectoryHelper $directoryHelper,
-        DataObjectFactory $dataObjectFactory
+        array $data = []
     ) {
         parent::__construct(
             $config,
@@ -227,11 +228,11 @@ public function __construct(
             $paymentData,
             $scopeConfig,
             $logger,
+            $directoryHelper,
+            $dataObjectFactory,
             $resource,
             $resourceCollection,
-            $data,
-            $directoryHelper,
-            $dataObjectFactory
+            $data
         );
 
         $this->backendAuthSession = $backendAuthSession;
@@ -556,7 +557,7 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
      */
     public function isAvailable(CartInterface $quote = null): bool
     {
-        if (parent::isAvailable($quote) && null !== $quote) {
+        if ($this->isModuleActive() && parent::isAvailable($quote) && null !== $quote) {
             return $this->config->getValue('active', $this->_code) && !$this->backendAuthSession->isLoggedIn();
         }
 

diff --git a/Model/Methods/GooglePayMethod.php b/Model/Methods/GooglePayMethod.php
@@ -174,10 +174,11 @@ class GooglePayMethod extends AbstractMethod
      * @param QuoteHandlerService        $quoteHandler
      * @param LoggerHelper               $ckoLogger
      * @param Session                    $backendAuthSession
+     * @param DirectoryHelper            $directoryHelper
+     * @param DataObjectFactory          $dataObjectFactory
      * @param AbstractResource|null      $resource
      * @param AbstractDb|null            $resourceCollection
      * @param array                      $data
-     * @param DirectoryHelper            $directoryHelper
      */
     public function __construct(
         Context $context,
@@ -194,11 +195,11 @@ public function __construct(
         QuoteHandlerService $quoteHandler,
         LoggerHelper $ckoLogger,
         Session $backendAuthSession,
+        DirectoryHelper $directoryHelper,
+        DataObjectFactory $dataObjectFactory,
         AbstractResource $resource = null,
         AbstractDb $resourceCollection = null,
-        array $data = [],
-        DirectoryHelper $directoryHelper,
-        DataObjectFactory $dataObjectFactory
+        array $data = []
     ) {
         parent::__construct(
             $config,
@@ -209,11 +210,11 @@ public function __construct(
             $paymentData,
             $scopeConfig,
             $logger,
+            $directoryHelper,
+            $dataObjectFactory,
             $resource,
             $resourceCollection,
-            $data,
-            $directoryHelper,
-            $dataObjectFactory
+            $data
         );
 
         $this->config             = $config;
@@ -487,7 +488,7 @@ public function refund(InfoInterface $payment, $amount): AbstractMethod
      */
     public function isAvailable(CartInterface $quote = null): bool
     {
-        if (parent::isAvailable($quote) && null !== $quote) {
+        if ($this->isModuleActive() && parent::isAvailable($quote) && null !== $quote) {
             return $this->config->getValue('active', $this->_code) && !$this->backendAuthSession->isLoggedIn();
         }