Merge pull request #9 from bayonetio/fixes-for-technical-review

Fixes for technical review

Author: imran-arshad

Block/Adminhtml/OrderEdit/Tab/View.php

@@ -65,42 +65,58 @@ public function getTabLabel()
 
     /**
      * Gets the Bayonet Tracking ID of an order
-     * 
+     *
      * @return string
      */
     public function getTrackingId()
     {
-        return $this->directQuery->getTrackingId($this->getOrderId());
+        return $this->directQuery->customQuery(
+            'bayonet_antifraud_orders',
+            'bayonet_tracking_id',
+            ['order_id' => $this->getOrderId()]
+        );
     }
 
     /**
      * Gets the Bayonet API response of an order
-     * 
+     *
      * @return string
      */
     public function getApiResponse()
     {
-        return $this->directQuery->getApiResponse($this->getOrderId());
+        return $this->directQuery->customQuery(
+            'bayonet_antifraud_orders',
+            'consulting_api_response',
+            ['order_id' => $this->getOrderId()]
+        );
     }
 
     /**
      * Gets the Decision from the Bayonet API of an order
-     * 
+     *
      * @return string
      */
     public function getDecision()
     {
-        return $this->directQuery->getDecision($this->getOrderId());
+        return $this->directQuery->customQuery(
+            'bayonet_antifraud_orders',
+            'decision',
+            ['order_id' => $this->getOrderId()]
+        );
     }
 
     /**
      * Gets the Bayonet API triggered rules (if exist) of an order
-     * 
+     *
      * @return string
      */
     public function getRules()
     {
-        return $this->directQuery->getRules($this->getOrderId());
+        return $this->directQuery->customQuery(
+            'bayonet_antifraud_orders',
+            'triggered_rules',
+            ['order_id' => $this->getOrderId()]
+        );
     }
 
     /**

Block/Fingerprint.php

@@ -28,7 +28,7 @@ public function __construct(
 
     /**
      * Gets the controller URL
-     * 
+     *
      * @return string
      */
     public function getAjaxUrl()
@@ -38,46 +38,62 @@ public function getAjaxUrl()
 
     /**
      * Gets the current value of the 'enable' configuration field
-     * 
+     *
      * @return int
      */
     public function getEnabled()
     {
-        return intval($this->directQuery->getEnabled());
+        return (int)$this->directQuery->customQuery(
+            'core_config_data',
+            'value',
+            ['path' => 'bayonetantifraud_general/general/enable']
+        );
     }
 
     /**
      * Gets the API key in order to generate the fingerprint token
      * It checks whether the the API mode is in live or sandbox in order
      * to return the corresponding key
-     * 
+     *
      * @return string
      */
     public function getApiKey()
     {
-        $apiMode = intval($this->directQuery->getApiMode());
-        $apiKey = $apiMode === 1 ? $this->directQuery->getApiKey('js_live_key') : $this->directQuery->getApiKey('js_sandbox_key');
+        $apiMode = (int)$this->directQuery->customQuery(
+            'core_config_data',
+            'value',
+            ['path' => 'bayonetantifraud_general/general/api_mode']
+        );
+        $apiKey = $apiMode === 1 ? $this->directQuery->customQuery(
+            'core_config_data',
+            'value',
+            ['path' => 'bayonetantifraud_general/general/js_live_key']
+        ) : $this->directQuery->customQuery(
+            'core_config_data',
+            'value',
+            ['path' => 'bayonetantifraud_general/general/js_sandbox_key']
+        );
 
         return $apiKey;
     }
 
     /**
      * Gets a bool that indicates whether a customer is logged in or not
-     * 
+     *
      * @return bool
      */
     public function getCustomerIsLoggedIn()
     {
-    	return (bool)$this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_AUTH);
+        return (bool)$this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_AUTH);
     }
 
     /**
      * Gets the ID of the logged in customer
-     * 
+     *
      * @return string
      */
     public function getCustomerId()
     {
-    	return $this->httpContext->getValue('customer_id');
+        return $this->httpContext->getValue('customer_id');
     }
 }