Merge pull request #2 from Worldpay/release-v2.4.2-rc0821

Release v2.4.2 rc0821
Worldpay · Aug 2, 2021 · 07f017b · 07f017b
2 parents 52c283e + 97b1b0d
commit 07f017b
Show file tree

Hide file tree

Showing 34 changed files with 219 additions and 190 deletions.
diff --git a/Block/Adminhtml/Form/Field/AdminLabels.php b/Block/Adminhtml/Form/Field/AdminLabels.php
@@ -2,7 +2,6 @@
 
 namespace Sapient\AccessWorldpay\Block\Adminhtml\Form\Field;
 
-
 class AdminLabels extends \Sapient\AccessWorldpay\Block\Form\Field\FieldArray\CustomLabelsArray
 {
 
@@ -30,5 +29,5 @@ protected function _prepareToRender()
 
         $this->_addAfter = false;
         $this->_addButtonLabel = __('Add');
-    }  
+    }
 }
diff --git a/Block/Adminhtml/Form/Field/MyAccountLabels.php b/Block/Adminhtml/Form/Field/MyAccountLabels.php
@@ -3,7 +3,6 @@
 
 namespace Sapient\AccessWorldpay\Block\Adminhtml\Form\Field;
 
-
 class MyAccountLabels extends \Sapient\AccessWorldpay\Block\Form\Field\FieldArray\CustomLabelsArray
 {
     /**

diff --git a/Block/Edit.php b/Block/Edit.php
@@ -3,16 +3,18 @@
  * @copyright 2017 Sapient
  */
 namespace Sapient\AccessWorldpay\Block;
+
 use Magento\Framework\Serialize\SerializerInterface;
+
 class Edit extends \Magento\Framework\View\Element\Template
 {
     /**
      * @var \Sapient\AccessWorldpay\Model\SavedTokenFactory
      */
     protected $_savecard;
     /**
-      * @var SerializerInterface
-      */
+     * @var SerializerInterface
+     */
     private $serializer;
      /**
       * @var \Magento\Customer\Model\Session
@@ -41,7 +43,7 @@ public function __construct(
         \Sapient\AccessWorldpay\Model\SavedTokenFactory $savecard,
         \Magento\Customer\Model\Session $customerSession,
         \Sapient\AccessWorldpay\Helper\Data $worldpayHelper,
-	SerializerInterface $serializer,
+        SerializerInterface $serializer,
         array $data = []
     ) {
         $this->_savecard = $savecard;

diff --git a/Block/Form/Field/FieldArray/CustomLabelsFieldArray.php b/Block/Form/Field/FieldArray/CustomLabelsFieldArray.php
@@ -5,8 +5,8 @@
 class CustomLabelsFieldArray extends \Magento\Config\Block\System\Config\Form\Field\FieldArray\AbstractFieldArray
 {
     /**
-    * @var string
-    */
+     * @var string
+     */
     protected $_template = 'Sapient_AccessWorldpay::form/field/customlabelarray.phtml';
 
     /**

diff --git a/Controller/Adminhtml/Syncstatus/Index.php b/Controller/Adminhtml/Syncstatus/Index.php
@@ -118,6 +118,6 @@ private function _redirectBackToOrderView()
 
     private function _updateOrderStatus()
     {
-       $this->paymentoperations->updateOrderStatus($this->_order);
+        $this->paymentoperations->updateOrderStatus($this->_order);
     }
 }
diff --git a/Controller/Notification/Index.php b/Controller/Notification/Index.php
@@ -101,7 +101,7 @@ public function _getRawBody()
         }
         $this->wplogger->info("inside Notification-->getRawBody");
         $jsonData = json_decode($this->_rawBody, true);
-        $xml = $this->request->_array2xml($jsonData,false);
+        $xml = $this->request->_array2xml($jsonData, false);
 //        $response = $this->directResponse->setResponse($xml);
 //        $response->getXml();
        // $this->wplogger->info(print_r($response->getXml(),true));
@@ -186,6 +186,6 @@ private function updateNotification($xml)
 
     private function _updateOrderStatus()
     {
-       $this->paymentoperations->updateOrderStatus($this->_order);
+        $this->paymentoperations->updateOrderStatus($this->_order);
     }
 }
diff --git a/Controller/Savedcard/Edit.php b/Controller/Savedcard/Edit.php
@@ -31,7 +31,7 @@ class Edit extends \Magento\Framework\App\Action\Action
      * @param PageFactory $resultPageFactory
      * @param SavedTokenFactory $savecard
      * @param \Sapient\AccessWorldpay\Helper\Data $worldpayHelper
-     * @param Session $customerSession         
+     * @param Session $customerSession
      */
     public function __construct(
         Context $context,

diff --git a/Controller/Savedcard/Index.php b/Controller/Savedcard/Index.php
@@ -26,17 +26,17 @@ class Index extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Sapient\AccessWorldpay\Helper\Data $worldpayHelper
-     */	 
-	public function __construct(
-		Context $context,
-		\Magento\Framework\View\Result\PageFactory $resultPageFactory,
-		\Magento\Customer\Model\Session $customerSession,
-                \Sapient\AccessWorldpay\Helper\Data $worldpayHelper
-	) {
+     */
+    public function __construct(
+        Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Customer\Model\Session $customerSession,
+        \Sapient\AccessWorldpay\Helper\Data $worldpayHelper
+    ) {
         parent::__construct($context);
         $this->_resultPageFactory = $resultPageFactory;
         $this->customerSession = $customerSession;
-        $this->worldpayHelper = $worldpayHelper;        
+        $this->worldpayHelper = $worldpayHelper;
     }
 
     /**

diff --git a/Cron/OrderSyncStatus.php b/Cron/OrderSyncStatus.php
@@ -10,7 +10,8 @@
 /**
  * Model for order sync status based on configuration set by admin
  */
-class OrderSyncStatus {
+class OrderSyncStatus
+{
     /**
      *
      * @var \Sapient\AccessWorldpay\Logger\AccessWorldpayLogger
@@ -27,7 +28,7 @@ class OrderSyncStatus {
 
     /**
      * Constructor
-     * 
+     *
      * @param JsonFactory $resultJsonFactory
      * @param \Sapient\AccessWorldpay\Logger\AccessWorldpayLogger $wplogger
      * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
@@ -158,6 +159,6 @@ private function _applyPaymentUpdate()
 
     private function _updateOrderStatus()
     {
-       $this->paymentoperations->updateOrderStatus($this->_order);
+        $this->paymentoperations->updateOrderStatus($this->_order);
     }
 }
diff --git a/Helper/AdminLabels.php b/Helper/AdminLabels.php
@@ -6,7 +6,7 @@
 use Magento\Store\Model\Store;
 use Magento\Framework\Serialize\SerializerInterface;
 
-class AdminLabels 
+class AdminLabels
 {
     /**
      * Core store config
@@ -212,5 +212,4 @@ public function getConfigValue($wplabelcode, $store = null)
             }
         }
     }
-
 }
diff --git a/Helper/CheckoutLabels.php b/Helper/CheckoutLabels.php
@@ -5,7 +5,7 @@
 use Magento\Store\Model\Store;
 use Magento\Framework\Serialize\SerializerInterface;
 
-class CheckoutLabels 
+class CheckoutLabels
 {
 
     /**

diff --git a/Helper/Data.php b/Helper/Data.php
@@ -100,10 +100,10 @@ public function getXmlPassword()
     }
     public function getMerchantEntityReference()
     {
-       return  $this->_scopeConfig->getValue(
+        return  $this->_scopeConfig->getValue(
             'worldpay/general_config/merchant_entity',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ); 
+        );
     }
     public function isMacEnabled()
     {
@@ -540,7 +540,7 @@ public function getTokenFromVault($hash, $customerId)
     }
 
     public function getMyAccountLabels()
-    { 
+    {
                 return $this->_scopeConfig->getValue(
                     'worldpay_custom_labels/my_account_labels/my_account_label',
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -561,7 +561,7 @@ public function getAccountLabelbyCode($labelCode)
     }
 
     public function getCheckoutLabels()
-    { 
+    {
                 return $this->_scopeConfig->getValue(
                     'worldpay_custom_labels/checkout_labels/checkout_label',
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -582,7 +582,7 @@ public function getCheckoutLabelbyCode($labelCode)
     }
 
     public function getAdminLabels()
-    { 
+    {
                 return $this->_scopeConfig->getValue(
                     'worldpay_custom_labels/admin_labels/admin_label',
                     \Magento\Store\Model\ScopeInterface::SCOPE_STORE

diff --git a/Helper/MyAccountLabels.php b/Helper/MyAccountLabels.php
@@ -7,13 +7,13 @@
 use Magento\Store\Model\Store;
 use Magento\Framework\Serialize\SerializerInterface;
 
-class MyAccountLabels 
+class MyAccountLabels
 {
      /**
-     * Core store config
-     *
-     * @var \Magento\Framework\App\Config\ScopeConfigInterface
-     */
+      * Core store config
+      *
+      * @var \Magento\Framework\App\Config\ScopeConfigInterface
+      */
     protected $scopeConfig;
 
     /**

diff --git a/Model/Authorisation/DirectService.php b/Model/Authorisation/DirectService.php
@@ -46,7 +46,7 @@ public function authorizePayment(
         $paymentDetails,
         $payment
     ) {
-        if (isset($paymentDetails['additional_data']['is_graphql']) 
+        if (isset($paymentDetails['additional_data']['is_graphql'])
             && (empty($paymentDetails['additional_data']['tokenId'])
                 && empty($paymentDetails['token_url']))) {
             $orderParams = [];
@@ -99,7 +99,7 @@ public function authorizePayment(
         /*Added Condition : If token available need not to save the card details */
             if ($customerId && !(isset($paymentdetails['additional_data']['token'])
                 && !empty($paymentdetails['additional_data']['token']) )) {
-                $this->saveToken($customerId, $payment,$paymentDetails);
+                $this->saveToken($customerId, $payment, $paymentDetails);
             } elseif (!empty($this->customerSession->getVerifiedDetailedToken())
                     || (isset($paymentDetails['additional_data']['is_graphql'])
                         && !empty($paymentDetails['token_url']))) {
@@ -198,30 +198,30 @@ public function partialRefundPayment(
         $this->_applyPaymentUpdate($directResponse, $payment);
     }
 
-    public function saveToken($customerId, $payment,$paymentDetails)
+    public function saveToken($customerId, $payment, $paymentDetails)
     {
         if (isset($paymentDetails['additional_data']['is_graphql'])) {
             if ($paymentDetails['additional_data']['save_card'] !=='1' && !empty($paymentDetails['token_url'])) {
-            if (!isset($paymentDetails['additional_data']['use_savedcard'])
+                if (!isset($paymentDetails['additional_data']['use_savedcard'])
                     && $this->worldpayHelper->checkIfTokenExists($paymentDetails['token_url'])) {
-                $this->wplogger->info(" User already has this card saved....");
-            }else {
-               $this->wplogger->info(
-                " Inititating Delete Token for Registered customer with customerID="
-                .$customerId." ...."
-            );
-               $this->paymentservicerequest->getTokenDelete($paymentDetails['token_url']); 
-            }
-            }else if (($paymentDetails['additional_data']['save_card'] =='1' && !empty($paymentDetails['token_url']))
+                    $this->wplogger->info(" User already has this card saved....");
+                } else {
+                    $this->wplogger->info(
+                        " Inititating Delete Token for Registered customer with customerID="
+                        .$customerId." ...."
+                    );
+                    $this->paymentservicerequest->getTokenDelete($paymentDetails['token_url']);
+                }
+            } elseif (($paymentDetails['additional_data']['save_card'] =='1' && !empty($paymentDetails['token_url']))
                     || ($this->customerSession->getIsSavedCardRequested())) {
                 $tokenFromcard = !empty($this->customerSession->getDetailedToken())?$this->customerSession->getDetailedToken():'';
                 $token = !empty($paymentDetails['token_url'])?$paymentDetails['token_url'] :$tokenFromcard['_links']['tokens:token']['href'] ;
                 $this->customerSession->unsIsSavedCardRequested();
                 $this->customerSession->unsDetailedToken();
-                $this->saveTokenForGraphQl($token,$customerId,$payment);
+                $this->saveTokenForGraphQl($token, $customerId, $payment);
             }
 
-        }elseif ($this->customerSession->getIsSavedCardRequested()) {
+        } elseif ($this->customerSession->getIsSavedCardRequested()) {
             $tokenDetailResponseToArray = $this->customerSession->getDetailedToken();
             $this->updateWorldPayPayment->create()->
                     saveVerifiedToken($tokenDetailResponseToArray, $payment);
@@ -248,16 +248,20 @@ public function saveToken($customerId, $payment,$paymentDetails)
         }
     }
 
-    public function saveTokenForGraphQl ($token_url,$customerId,$payment)
+    public function saveTokenForGraphQl($token_url, $customerId, $payment)
     {
         $getTokenDetails = $this->paymentservicerequest->_getDetailedVerifiedToken(
-                $token_url, $this->worldpayHelper->getXmlUsername(), $this->worldpayHelper->getXmlPassword()
+            $token_url,
+            $this->worldpayHelper->getXmlUsername(),
+            $this->worldpayHelper->getXmlPassword()
         );
 
         $tokenDetailResponseToArray = json_decode($getTokenDetails, true);
         //make a call to getBrand Details,content-type is different
         $getTokenBrandDetails = $this->paymentservicerequest->getDetailedTokenForBrand(
-                $token_url, $this->worldpayHelper->getXmlUsername(), $this->worldpayHelper->getXmlPassword()
+            $token_url,
+            $this->worldpayHelper->getXmlUsername(),
+            $this->worldpayHelper->getXmlPassword()
         );
         $brandResponse = json_decode($getTokenBrandDetails, true);
         $tokenDetailResponseToArray['card_brand'] = $brandResponse['paymentInstrument']['brand'];

diff --git a/Model/Authorisation/WebSdkService.php b/Model/Authorisation/WebSdkService.php
@@ -186,21 +186,21 @@ public function saveToken($customerId, $payment, $paymentDetails)
     {
         if (isset($paymentDetails['additional_data']['is_graphql'])) {
             if ($paymentDetails['additional_data']['save_card'] !=='1' && !empty($paymentDetails['token_url'])) {
-            if (!isset($paymentDetails['additional_data']['use_savedcard'])
+                if (!isset($paymentDetails['additional_data']['use_savedcard'])
                     && $this->worldpayHelper->checkIfTokenExists($paymentDetails['token_url'])) {
-                $this->wplogger->info(" User already has this card saved....");
-            }else {
-               $this->wplogger->info(
-                " Inititating Delete Token for Registered customer with customerID="
-                .$customerId." ...."
-            );
-               $this->paymentservicerequest->getTokenDelete($paymentDetails['token_url']); 
-            }
-            }else if ($paymentDetails['additional_data']['save_card'] =='1' && !empty($paymentDetails['token_url'])) {
-                $this->saveTokenForGraphQl($paymentDetails['token_url'],$customerId,$payment);
+                    $this->wplogger->info(" User already has this card saved....");
+                } else {
+                    $this->wplogger->info(
+                        " Inititating Delete Token for Registered customer with customerID="
+                        .$customerId." ...."
+                    );
+                    $this->paymentservicerequest->getTokenDelete($paymentDetails['token_url']);
+                }
+            } elseif ($paymentDetails['additional_data']['save_card'] =='1' && !empty($paymentDetails['token_url'])) {
+                $this->saveTokenForGraphQl($paymentDetails['token_url'], $customerId, $payment);
             }
 
-        }elseif ($this->customerSession->getIsSavedCardRequested()
+        } elseif ($this->customerSession->getIsSavedCardRequested()
             && empty($paymentDetails['additional_data']['tokenId'])) {
             $tokenDetailResponseToArray = $this->customerSession->getDetailedToken();
             $this->updateWorldPayPayment->create()
@@ -228,16 +228,20 @@ public function saveToken($customerId, $payment, $paymentDetails)
         }
     }
 
-    public function saveTokenForGraphQl ($token_url,$customerId,$payment)
+    public function saveTokenForGraphQl($token_url, $customerId, $payment)
     {
         $getTokenDetails = $this->paymentservicerequest->_getDetailedVerifiedToken(
-                $token_url, $this->worldpayHelper->getXmlUsername(), $this->worldpayHelper->getXmlPassword()
+            $token_url,
+            $this->worldpayHelper->getXmlUsername(),
+            $this->worldpayHelper->getXmlPassword()
         );
 
         $tokenDetailResponseToArray = json_decode($getTokenDetails, true);
         //make a call to getBrand Details,content-type is different
         $getTokenBrandDetails = $this->paymentservicerequest->getDetailedTokenForBrand(
-                $token_url, $this->worldpayHelper->getXmlUsername(), $this->worldpayHelper->getXmlPassword()
+            $token_url,
+            $this->worldpayHelper->getXmlUsername(),
+            $this->worldpayHelper->getXmlPassword()
         );
         $brandResponse = json_decode($getTokenBrandDetails, true);
         $tokenDetailResponseToArray['card_brand'] = $brandResponse['paymentInstrument']['brand'];

diff --git a/Model/Mapping/Service.php b/Model/Mapping/Service.php
@@ -583,8 +583,8 @@ public function getRiskDataForAuthentication($quote)
          "email" => $quote->getCustomerEmail(),
          "createdAt" => substr($createdAt, 0, 10),
          "modifiedAt" =>substr($modifiedAt, 0, 10),
-         "firstName" => substr(preg_replace('/\s+/', '', $address['firstName']),0,22),
-         "lastName" => substr(preg_replace('/\s+/', '', $address['lastName']),0,22),
+         "firstName" => substr(preg_replace('/\s+/', '', $address['firstName']), 0, 22),
+         "lastName" => substr(preg_replace('/\s+/', '', $address['lastName']), 0, 22),
          "nameMatchesAccountName" => $address['firstName'] == $shippingAddress['firstName']?
                                     "true":"false"
         ]  ;
@@ -651,7 +651,7 @@ private function _getWebSdkPaymentDetails($paymentDetails)
                 );
             }
         }
-        if(isset($paymentDetails['additional_data']['is_graphql'])) {
+        if (isset($paymentDetails['additional_data']['is_graphql'])) {
             $details['is_graphql'] =1;
             $details['token_url'] = !empty($paymentDetails['additional_data']['tokenUrl'])?$paymentDetails['additional_data']['tokenUrl']:'';
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     namespace Sapient\AccessWorldpay\Block\Adminhtml\Form\Field;
     class MyAccountLabels extends \Sapient\AccessWorldpay\Block\Form\Field\FieldArray\CustomLabelsArray
     {
         /**
@@ Expand Down @@