Merge pull request #98 from RichardCardGate/master

Fix: Instructions cannot be null.

Author: cardgate

Block/Adminhtml/Config/FetchPM.php

@@ -45,7 +45,7 @@ public function __construct(
      */
     protected function _getElementHtml(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
-        if (! empty($this->cardgateConfig->getGlobal( 'api_username' ))
+        if (!empty($this->cardgateConfig->getGlobal('api_username'))
              && ! empty($this->cardgateConfig->getGlobal('api_password'))
              && ! empty($this->cardgateConfig->getGlobal('site_id'))
              && ! empty($this->cardgateConfig->getGlobal('site_key'))

Block/Adminhtml/Config/GroupInfo.php

@@ -117,4 +117,4 @@ protected function _isCollapseState($element)
 
         return false;
     }
-}
+}

Block/Info/DefaultInfo.php

@@ -5,6 +5,7 @@
  * See LICENSE for license details.
  */
 namespace Cardgate\Payment\Block\Info;
+
 /**
  * Default Checkout template
  *
@@ -30,14 +31,14 @@ class DefaultInfo extends \Magento\Payment\Block\Info
     /**
      * Get instructions text from config
      *
-     * @return null|string
+     * @return string
      */
     public function getInstructions()
     {
         if ( $this->_instructions === null ) {
             $this->_instructions = $this->getInfo()->getAdditionalInformation(
                 'instructions'
-            ) ?: trim( $this->getMethod()->getConfigData( 'instructions' ) );
+            ).' ' ?: trim( $this->getMethod()->getConfigData( 'instructions' ) ).' ';
         }
         return $this->_instructions;
     }

Controller/Payment/Callback.php

@@ -95,7 +95,6 @@ public function __construct(
         \Cardgate\Payment\Model\Config $config,
         \Magento\Framework\Encryption\Encryptor $encryptor,
         StockRegistryProviderInterface $stockRegistry
-
     ) {
         $this->resultFactory = $context->getResultFactory();
         $this->_request = $context->getRequest();

Controller/Payment/Start.php

@@ -128,6 +128,8 @@ public function __construct(
     }
 
     /**
+     * Initiate CardGate transaction
+     *
      * @return \Magento\Framework\App\ResponseInterface|Redirect|\Magento\Framework\Controller\ResultInterface|void
      * @throws \Magento\Framework\Exception\AlreadyExistsException
      * @throws \Magento\Framework\Exception\InputException
@@ -317,7 +319,7 @@ public function execute()
             // issuer is stored as additional data in the assignData method from Model/PaymentMethod.php.
             $payment = $order->getPayment();
             $instructions = $this->_cardgateConfig->getValue('instructions', $payment->getOrder()->getStoreId());
-            $payment->setAdditionalInformation('instructions',$instructions);
+            $payment->setAdditionalInformation('instructions', $instructions);
             $data = $payment->getAdditionalInformation();
             if (! empty($data['issuer_id'])) {
                 $transaction->setIssuer($data['issuer_id']);
@@ -360,7 +362,7 @@ public function execute()
      *
      * @param Address $oAddress_
      * @param \cardgate\api\Consumer $oConsumer_
-     * @param $sMethod_
+     * @param string $sMethod_
      *
      * @return void
      */
@@ -381,7 +383,6 @@ private function _convertAddress(Address &$oAddress_, \cardgate\api\Consumer &$o
     }
 
     /**
-     *  /**
      * Return checkout quote object
      *
      * @return \Magento\Quote\Api\Data\CartInterface|\Magento\Quote\Model\Quote

Helper/TaxData.php

@@ -61,7 +61,7 @@ public function aroundGetCalculatedTaxes(\Magento\Tax\Helper\Data $taxData, \Clo
 
                     // Aggregate taxable items associated with shipping
                     if ($itemTaxDetail->getType() == \Cardgate\Payment\Model\Total\Fee::TYPE_FEE) {
-                        $taxClassAmount = $this->__aggregateTaxes($taxClassAmount, $itemTaxDetail, $cardgatefeeRatio);
+                        $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $cardgatefeeRatio);
                     }
                 }
             }
@@ -95,7 +95,7 @@ public function aroundGetCalculatedTaxes(\Magento\Tax\Helper\Data $taxData, \Clo
      * @param float $ratio
      * @return array
      */
-    private function __aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
+    private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
     {
         $itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
         foreach ($itemAppliedTaxes as $itemAppliedTax) {

Model/Config.php

@@ -65,15 +65,13 @@ class Config implements ConfigInterface
      */
     private static $activePMIDs = [];
 
-
-
     /**
      * @param MutableScopeConfigInterface $scopeConfig
      * @param ConfigResource $configResource
      * @param Master $master
      * @param SerializerInterface $serializer
-     * @param $pathPattern
-     * @param $methodCode
+     * @param string $pathPattern
+     * @param string $methodCode
      */
     public function __construct(
         MutableScopeConfigInterface $scopeConfig,

Model/Config/Master.php

@@ -188,7 +188,7 @@ private function updatePaymentMethods()
     }
 
     /**
-     * get the CardGate Payment methods
+     * Get the CardGate Payment methods
      *
      * @return array
      */
@@ -200,7 +200,7 @@ public function getCardgateMethods()
     /**
      *  Get the payment methods
      *
-     * @param $bIncludingNames
+     * @param bool $bIncludingNames
      *
      * @return array|int[]|string[]
      */

Model/GatewayClient.php

@@ -82,15 +82,15 @@ public function __construct(
                 \cardgate\api\Client::CLIENT_VERSION
             );
         } catch (\Exception $e) {
-/* ignore */
+            /* ignore */
         }
     }
 
     /**
      * Magic function proxying all calls to the client lib instance.
      *
-     * @param $sMethod_
-     * @param $aArgs_
+     * @param string $sMethod_
+     * @param array|string $aArgs_
      *
      * @return false|mixed
      * @throws GatewayClientException
@@ -126,6 +126,7 @@ public function getSiteKey()
 
     /**
      * Get the ip address of the client.
+     *
      * @return string
      */
     private function _determineIp()

Model/PaymentMethods.php

@@ -124,7 +124,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
         $groupId         = $quote->getCustomer()->getGroupId();
         $loggedInIsGroup = $this->config->loggedInIsGroup($quote->getStoreId());
         $isLoggedIn      = ($quote->getCustomer()->getId() < 1 ? false : true);
-        if ( $isLoggedIn ) {
+        if ($isLoggedIn) {
             if ($groupId > 0 && count($aCustomerGroups) > 0 && ! in_array($groupId, $aCustomerGroups)){
                 return false;
             }
@@ -188,6 +188,8 @@ public function getMailingAddress()
      * Get fee for quote
      *
      * @param Quote $quote
+     * @param Total $total
+     *
      * @return FeeData
      */
     public function getFeeForQuote(Quote $quote, Total $total = null)
@@ -296,7 +298,7 @@ public function getInstructions()
     /**
      * Get Value handler pool
      *
-     * @param $methodCode
+     * @param mixed $methodCode
      *
      * @return mixed
      */