Merge pull request #13 from getkevin/feature/configure-domain-optionaly-by-env

Add domain option based on env variables

Author: KubaJM

Api/Kevin.php

@@ -54,6 +54,10 @@ public function getConnection($clientId = null, $clientSecret = null)
             'version' => '0.3',
         ];
 
+        if (getenv('API_KEVIN_DOMAIN')) {
+            $options['domain'] = getenv('API_KEVIN_DOMAIN');
+        }
+
         $options = array_merge($options, $this->config->getSystemData());
 
         return new \Kevin\Client($clientId, $clientSecret, $options);

Model/Adapter.php

@@ -80,8 +80,8 @@ public function initPayment($order)
         $companyBankAccount = $this->config->getCompanyBankAccount();
 
         $params = [
-            'Redirect-URL' => $this->url->getUrl('kevin/payment/callback'),
-            'Webhook-URL' => $this->url->getUrl('kevin/payment/notify'),
+            'Redirect-URL' => $this->getRedirectContextUrl('kevin/payment/callback'),
+            'Webhook-URL' => $this->getWebHookContextUrl('kevin/payment/notify'),
             'description' => sprintf('Order %s', $order->getIncrementId()),
             'currencyCode' => $order->getOrderCurrency()->ToString(),
             'amount' => number_format($order->getGrandTotal(), 2, '.', ''),
@@ -208,4 +208,32 @@ public function getTransaction($transactionId)
 
         return $transaction;
     }
+
+    /**
+     * @param $uri
+     *
+     * @return string
+     */
+    private function getWebHookContextUrl($uri)
+    {
+        if (getenv('CUSTOM_WEBHOOK_URL')) {
+            return getenv('CUSTOM_WEBHOOK_URL').$uri;
+        }
+
+        return $this->url->getUrl($uri);
+    }
+
+    /**
+     * @param $uri
+     *
+     * @return string
+     */
+    private function getRedirectContextUrl($uri)
+    {
+        if (getenv('CUSTOM_REDIRECT_URL')) {
+            return getenv('CUSTOM_REDIRECT_URL').$uri;
+        }
+
+        return $this->url->getUrl($uri);
+    }
 }

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "getkevin/kevin-magento2",
   "description": "Implements integration with the Kevin payment service provider.",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "authors": [
     {
       "name": "kevin.",