4.4.3

- Minor fixes

Author: Ariano Fonseca Ângelo

CryptAPI.php

@@ -3,7 +3,7 @@
 Plugin Name: CryptAPI Payment Gateway for WooCommerce
 Plugin URI: https://github.com/cryptapi/woocommerce-cryptapi
 Description: Accept cryptocurrency payments on your WooCommerce website
-Version: 4.4.2
+Version: 4.4.3
 Requires at least: 5
 Tested up to: 5.9.3
 WC requires at least: 5.8

README.md

@@ -249,6 +249,9 @@ The easiest and fastest way is via our live chat on our [website](https://crypta
 #### 4.4.2
 * Minor fixes
 
+#### 4.4.3
+* Minor fixes
+
 ### Upgrade Notice
 #### 4.3
 * Please be sure to enable the PHP extension BCMath before upgrading to this version.

controllers/CryptAPI.php

@@ -219,12 +219,6 @@ function init_form_fields()
                     'default' => '',
                     'description' => __('Payment method description that the customer will see on your checkout', 'cryptapi')
                 ),
-                'api_key' => array(
-                    'title' => __('API Key', 'cryptapi'),
-                    'type' => 'text',
-                    'default' => '',
-                    'description' => __('<strong>NEW: </strong>Insert here your CryptAPI Pro API Key. You can get one here: <a href="https://pro.cryptapi.io/" target="_blank">https://pro.cryptapi.io/</a>. <strong>This field is optional.</strong><br/><strong style="color: #f44336;">Notice: </strong> The API Key permission "address_override" needs to be enabled and addresses must be configured down bellow.', 'cryptapi')
-                ),
                 'show_branding' => array(
                     'title' => __('Show CryptAPI branding', 'cryptapi'),
                     'type' => 'checkbox',
@@ -351,6 +345,12 @@ function init_form_fields()
                     'label' => __("<b>Attention: This option will disable the price conversion for ALL cryptocurrencies!</b><br/>If you check this, pricing will not be converted from the currency of your shop to the cryptocurrency selected by the user, and users will be requested to pay the same value as shown on your shop, regardless of the cryptocurrency selected", 'cryptapi'),
                     'default' => 'no'
                 ),
+                'api_key' => array(
+                    'title' => __('API Key', 'cryptapi'),
+                    'type' => 'text',
+                    'default' => '',
+                    'description' => __('<strong>NEW: </strong>Insert here your CryptAPI Pro API Key. You can get one here: <a href="https://pro.cryptapi.io/" target="_blank">https://pro.cryptapi.io/</a>. <strong>This field is optional.</strong>', 'cryptapi')
+                ),
             );
 
             $coin_description = __('Insert your %s address here. Leave the checkbox unselected if you want to skip this cryptocurrency', 'cryptapi');
@@ -391,19 +391,20 @@ function payment_fields()
     { ?>
         <div class="form-row form-row-wide">
             <p><?php echo $this->description; ?></p>
+            <div><img src="" </div>
             <ul style="list-style: none outside;">
                 <?php
                 if (!empty($this->coins) && is_array($this->coins)) {
                     $selected = WC()->session->get('cryptapi_coin');
-
                     ?>
                     <li>
                         <select name="cryptapi_coin" id="payment_cryptapi_coin" class="input-control" style="display:block; margin-top: 10px">
                             <option value="none"><?php echo __('Please select a Cryptocurrency', 'cryptapi') ?></option>
                             <?php
                             foreach ($this->coins as $val) {
                                 $addr = $this->{$val . '_address'};
-                                if (!empty($addr)) { ?>
+                                $apikey = $this->api_key;
+                                if (!empty($addr) || !empty($apikey)) { ?>
                                     <option value="<?php echo $val; ?>" <?php
                                     if (!empty($selected) && $selected === $val) {
                                         echo " selected='true'";
@@ -434,14 +435,15 @@ function process_payment($order_id)
         $selected = sanitize_text_field($_POST['cryptapi_coin']);
 
         if ($selected === 'none') {
-            wc_add_notice(__('Payment error:', 'woocommerce') . ' ' . __('Please choose a cryptocurrency', 'cryptapi'), 'error');
+            wc_add_notice(__('Payment error: ', 'woocommerce') . ' ' . __('Please choose a cryptocurrency', 'cryptapi'), 'error');
 
             return null;
         }
 
+        $api_key = $this->api_key;
         $addr = $this->{$selected . '_address'};
 
-        if (!empty($addr)) {
+        if (!empty($addr) || !empty($api_key)) {
 
             $nonce = $this->generate_nonce();
 
@@ -493,7 +495,6 @@ function process_payment($order_id)
                     return null;
                 }
 
-                $api_key = $this->api_key;
 
                 $ca = new CryptAPI\Helper($selected, $addr, $api_key, $callback_url, [], true);
 
@@ -1166,12 +1167,9 @@ public function generate_cryptocurrency_html($key, $data)
                 <td class="forminp forminp-<?php echo esc_attr($data['type']) ?>">
                     <p>
                         <strong>
-                            <?php echo sprintf(__('Addresses optional if using %1s', 'cryptapi'),
-                                '<a href="https://pro.cryptapi.io" target="_blank">CryptAPI Pro</a></strong>'
-                            );
-                            ?>
+                            <?php echo __('Addresses', 'cryptapi');?>
                         </strong><br/>
-                        <?php echo __('You can setup the addresses in your API Key screen.', 'cryptapi'); ?>
+                        <?php echo __("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.", 'cryptapi'); ?>
                     </p>
                 </td>
             </tr>

define.php

@@ -1,5 +1,5 @@
 <?php
 
-define('CRYPTAPI_PLUGIN_VERSION', '4.4.2');
+define('CRYPTAPI_PLUGIN_VERSION', '4.4.3');
 define('CRYPTAPI_PLUGIN_PATH', plugin_dir_path(__FILE__));
 define('CRYPTAPI_PLUGIN_URL', plugin_dir_url(__FILE__));