New release 2.1.6

Block/.LCKChallenge.php~

@@ -0,0 +1 @@
+C:\xampp\htdocs\worldpay\vendor\sapient\module-worldpay\Block\Challenge.php

Block/Challenge.php

@@ -0,0 +1,70 @@
+<?php
+namespace Sapient\Worldpay\Block;
+
+use Sapient\Worldpay\Helper\Data;
+
+class Challenge extends \Magento\Framework\View\Element\Template
+{
+    /**
+    * @var Sapient\Worldpay\Helper\Data;
+    */
+
+    protected $helper;
+
+    /**
+     * @var \Magento\Checkout\Model\Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * Jwt constructor.
+     * @param \Magento\Backend\Block\Template\Context $context
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param Data $helper
+     * @param array $data
+     */
+
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        Data $helper,
+        array $data = []
+    ) {
+        $this->checkoutSession = $checkoutSession;
+        $this->_helper = $helper;
+        parent::__construct($context, $data);
+    }
+
+    public function getJwtIssuer()
+    {
+        return $this->_helper->isJwtIssuer();
+    }
+
+    public function getOrganisationalUnitId()
+    {
+        return $this->_helper->isOrganisationalUnitId();
+    }
+
+    public function getDdcUrl()
+    {
+        $ddcurl = '';
+        $mode = $this->_helper->getEnvironmentMode();
+        if($mode == 'Test Mode'){
+            $ddcurl =  $this->_helper->isTestDdcUrl();
+        } else {
+            $ddcurl =  $this->_helper->isProductionDdcUrl();
+        }
+        return $ddcurl;
+    }
+
+    public function challengeConfigs(){
+        $data['threeDSecureChallengeConfig'] = $this->checkoutSession->get3DS2Config();
+        $data['threeDSecureChallengeParams'] =  $this->checkoutSession->get3Ds2Params();
+        $data['orderId'] = $this->checkoutSession->getAuthOrderId();
+        $data['redirectUrl'] = $this->getUrl('worldpay/threedsecure/challengeredirectresponse', ['_secure' => true]);
+        //$data['redirectUrl'] = $this->getUrl('worldpay/threedsecure/challengeauthresponse', ['_secure' => true]);
+        return $data;
+    }
+
+
+}

Block/Checkout/Hpp/ChallengeIframe.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * @copyright 2017 Sapient
+ */
+namespace Sapient\Worldpay\Block\Checkout\Hpp;
+
+class ChallengeIframe extends \Magento\Framework\View\Element\Template
+{
+    /**
+     * Constructor
+     *
+     * @param \Magento\Backend\Block\Template\Context $context     
+     * @param array $data
+     */ 	
+    public function __construct(
+            \Magento\Backend\Block\Template\Context $context,
+            \Sapient\Worldpay\Model\Checkout\Hpp\Json\Config\Factory $configfactory,
+        array $data = []               
+    ) {
+        $this->configfactory = $configfactory;
+       	parent::__construct($context, $data);
+
+    }
+
+    /**
+     * 
+     * @return string
+     */
+    public function getRedirectUrl(){
+        return $this->getUrl('worldpay/threedsecure/challengeauthresponse', ['_secure' => true]);
+    }
+}

Block/Form/Card.php

@@ -54,6 +54,16 @@ public function saveCardEnabled()
     {
         return $this->configProvider->getIsSaveCardAllowed();
     }
+
+    public function tokenizationEnabled()
+    {
+        return $this->worldpayhelper->getTokenization();
+    }
+
+    public function storedCredentialsEnabled()
+    {
+        return $this->worldpayhelper->getStoredCredentials();
+    }
 
     public function requireCvcEnabled()
     {

Block/Savedcard.php

@@ -44,8 +44,10 @@ public function getSavedCard()
             return false;
         }
    		return $savedCardCollection = $this->_savecard->create()->getCollection()
-   	 							      ->addFieldToSelect(array('card_brand','card_number','cardholder_name','card_expiry_month','card_expiry_year'))
-   	 						  	      ->addFieldToFilter('customer_id', array('eq' => $customerId)); ;
+   	 				    ->addFieldToSelect(array('card_brand','card_number',
+                                                'cardholder_name','card_expiry_month','card_expiry_year',
+                                                'transaction_identifier', 'token_code'))
+   	 				    ->addFieldToFilter('customer_id', array('eq' => $customerId)); ;
    }
 
    /**

Controller/Hostedpaymentpage/.LCKChallenge.php~

@@ -0,0 +1 @@
+C:\xampp\htdocs\worldpay\vendor\sapient\module-worldpay\Controller\Hostedpaymentpage\Challenge.php

Controller/Hostedpaymentpage/Challenge.php

@@ -0,0 +1,19 @@
+<?php
+namespace Sapient\Worldpay\Controller\Hostedpaymentpage;
+
+class Challenge extends \Magento\Framework\App\Action\Action
+{
+    protected $_pageFactory;
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $pageFactory)
+    {
+        $this->_pageFactory = $pageFactory;
+        return parent::__construct($context);
+    }
+
+    public function execute()
+    {
+        return $this->_pageFactory->create();
+    }
+}

Controller/Savedcard/Delete.php

@@ -78,27 +78,30 @@ public function getStoreId()
 	public function execute()
 	{
         $id = $this->getRequest()->getParam('id');
-	 	if ($id) {
-			try {
+	if ($id) {
+            try {
                 $model = $this->savecard->create();
-	            $model->load($id);
-	            if ($this->customerSession->getId()==$model->getCustomerId()) {
-                    $tokenDeleteResponse = $this->_tokenService->getTokenDelete(
-                    $model,
-                    $this->customerSession->getCustomer(),
-                    $this->getStoreId());
-
-                    if ($tokenDeleteResponse->isSuccess()) {
-                        // Delete Worldpay Token.
-                        $this->_applyTokenDelete($model, $this->customerSession->getCustomer());
-                        // Delete Vault Token.
-                        $this->_applyVaultTokenDelete($model, $this->customerSession->getCustomer());
+                $model->load($id);
+                if ($this->customerSession->getId() == $model->getCustomerId()) {
+                    if($model->getTokenCode()){
+                        $tokenDeleteResponse = $this->_tokenService->getTokenDelete(
+                        $model,
+                        $this->customerSession->getCustomer(),
+                        $this->getStoreId());
+                        if ($tokenDeleteResponse->isSuccess()) {
+                            // Delete Worldpay Token.
+                            $this->_applyTokenDelete($model, $this->customerSession->getCustomer());
+                            // Delete Vault Token.
+                            $this->_applyVaultTokenDelete($model, $this->customerSession->getCustomer());
+                        }
+                    } else{
+                        $model->delete($id);
                     }
-	            	$this->messageManager->addSuccess(__('Item is deleted successfully'));
-	        	} else {
-	        		$this->messageManager->addErrorMessage(__('Please try after some time'));
-	        	}
-	        } catch (\Exception $e) {
+                    $this->messageManager->addSuccess(__('Item is deleted successfully'));
+                } else {
+                    $this->messageManager->addErrorMessage(__('Please try after some time'));
+                }
+            } catch (\Exception $e) {
                 $this->wplogger->error($e->getMessage());
                 if ($this->_tokenNotExistOnWorldpay($e->getMessage())) {
                     $this->_applyTokenDelete($model, $this->customerSession->getCustomer());
@@ -111,7 +114,7 @@ public function execute()
             }
     	}
         $this->_redirect('worldpay/savedcard/index');
-	}
+    }
 
     /**
      * @return bool