v3.1.1

Minor fixes

Author: Ariano Fonseca Ângelo

README.md

@@ -145,5 +145,8 @@ The easiest and fastest way is via our live chat on our [website](https://crypta
 * Support CryptAPI Pro
 * Minor fixes
 
+#### 3.1.1
+* Minor fixes
+
 == Upgrade Notice ==
 * No breaking changes

upload/admin/language/en-gb/extension/payment/cryptapi.php

@@ -70,8 +70,8 @@
 $_['error_permission'] = 'Warning: You do not have permission to modify the CryptAPI payment module';
 
 // Help hints
-$_['help_cryptocurrencies'] = 'Select which coins do you wish to accept (Don\'t forget to paste your address in the respective field).';
-$_['help_cryptocurrency'] = 'Click the checkbox to enable ';
+$_['help_cryptocurrencies'] = 'If you are using CryptAPI Pro you can choose if setting the receiving addresses here bellow or in your CryptAPI Pro settings page.<br/>- In order to set the addresses on plugin settings, you need to select “Address Override” while creating the API key.<br/>- In order to set the addresses on CryptAPI Pro settings, you need to NOT select “Address Override” while creating the API key.';
+$_['help_cryptocurrency'] = 'Click the checkbox to enable the cryptocurrency';
 
 
 // Order page - payment tab

upload/admin/view/template/extension/payment/cryptapi.twig

@@ -54,17 +54,6 @@
                                    {% if payment_cryptapi_title is empty %}value="Cryptocurrency" {% else %}value="{{ payment_cryptapi_title }}"{% endif %}>
                         </div>
                     </div>
-                    <div class="form-group">
-                        <label class="col-sm-2 control-label" for="cryptapi_cryptapi_api_key">
-                            <span data-toggle="tooltip" title="{{ api_key_info }}">
-                                {{ api_key }}
-                            </span>
-                        </label>
-                        <div class="col-sm-10">
-                            <input class="form-control" type="text" id="cryptapi_cryptapi_api_key" name='payment_cryptapi_api_key'
-                                   {% if payment_cryptapi_api_key is empty %}value="" {% else %}value="{{ payment_cryptapi_api_key }}"{% endif %}>
-                        </div>
-                    </div>
                     <div class="form-group">
                         <label class="col-sm-2 control-label" for="cryptapi_branding">{{ branding }}</label>
                         <div class="col-sm-10">
@@ -508,13 +497,26 @@
                                    class="form-control"/>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="cryptapi_cryptapi_api_key">
+                            {{ api_key }}
+                        </label>
+                        <div class="col-sm-10">
+                            <input class="form-control" type="text" id="cryptapi_cryptapi_api_key" name='payment_cryptapi_api_key'
+                                   {% if payment_cryptapi_api_key is empty %}value="" {% else %}value="{{ payment_cryptapi_api_key }}"{% endif %}>
+                            <p class="mt-2">
+                                {{ api_key_info }}
+                            </p>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <div class="col-12 text-center" style="margin-bottom: 20px">
                             <label class="control-label text-center" style="float: none !important;">
-                            <span data-toggle="tooltip" title="{{ help_cryptocurrencies }}">
                                 {{ entry_cryptocurrencies }}
-                            </span>
                             </label>
+                            <p>
+                                {{ help_cryptocurrencies }}
+                            </p>
                         </div>
                         <input type="hidden" id="cryptapi_cryptocurrencies_array_cache" name="payment_cryptapi_cryptocurrencies_array_cache"
                                value='{{ payment_cryptapi_cryptocurrencies_array|json_encode() }}'>

upload/catalog/controller/extension/payment/cryptapi.php

@@ -81,7 +81,9 @@ public function confirm()
             $selected = $this->request->post['cryptapi_coin'];
             $address = $this->config->get('payment_cryptapi_cryptocurrencies_address_' . $selected);
 
-            if (!empty($address)) {
+            $apiKey = $this->config->get('payment_cryptapi_api_key');
+
+            if (!empty($address) || !empty($apiKey)) {
                 $nonce = $this->model_extension_payment_cryptapi->generateNonce();
 
                 require_once(DIR_SYSTEM . 'library/cryptapi.php');
@@ -103,7 +105,6 @@ public function confirm()
                     $callbackUrl = $this->url->link('extension/payment/cryptapi/callback', 'order_id=' . $this->session->data['order_id'] . '&nonce=' . $nonce, true);
                     $callbackUrl = str_replace('&', '&', $callbackUrl);
 
-                    $apiKey = $this->config->get('payment_cryptapi_api_key');
 
                     $helper = new CryptAPIHelper($selected, $address, $apiKey, $callbackUrl, [], true);
                     $addressIn = $helper->get_address();

upload/catalog/model/extension/payment/cryptapi.php

@@ -55,9 +55,11 @@ public function validateCurrencies()
 
         if (count($cryptocurrencies) > 0) {
             foreach ($cryptocurrencies as $token => $coin) {
-                if ($coin && !empty($this->config->get('payment_cryptapi_cryptocurrencies_address_' . $token))) {
-                    $status = true;
-                    break;
+                if ($coin) {
+                    if(!empty($this->config->get('payment_cryptapi_cryptocurrencies_address_' . $token) || !empty($this->config->get('payment_cryptapi_api_key')))) {
+                        $status = true;
+                        break;
+                    }
                 }
             }
         }

upload/system/library/cryptapi.php

@@ -33,23 +33,35 @@ public function __construct($coin, $own_address, $api_key, $callback_url, $param
     public function get_address()
     {
 
-        if (empty($this->own_address) || empty($this->coin) || empty($this->callback_url)) return null;
+        if (empty($this->coin) || empty($this->callback_url)) {
+            return null;
+        }
 
         $api_key = $this->api_key;
 
+        if (empty($api_key) && empty($this->own_address)) {
+            return null;
+        }
+
         $callback_url = $this->callback_url;
         if (!empty($this->parameters)) {
             $req_parameters = http_build_query($this->parameters);
             $callback_url = "{$this->callback_url}?{$req_parameters}";
         }
 
-        if (empty($api_key)) {
+        if (!empty($api_key) && empty($this->own_address)) {
+            $ca_params = [
+                'apikey' => $api_key,
+                'callback' => $callback_url,
+                'pending' => $this->pending,
+            ];
+        } elseif (empty($api_key) && !empty($this->own_address)) {
             $ca_params = [
                 'callback' => $callback_url,
                 'address' => $this->own_address,
                 'pending' => $this->pending,
             ];
-        } else {
+        } elseif(!empty($api_key) && !empty($this->own_address)) {
             $ca_params = [
                 'apikey' => $api_key,
                 'callback' => $callback_url,