Merge pull request #2 from arianoangelo/master

cryptapi · web-flow · commit 7755dc3ce3f5 · 2022-08-08T12:26:40.000+01:00
v3.1
diff --git a/README.md b/README.md
@@ -141,5 +141,12 @@ The easiest and fastest way is via our live chat on our [website](https://crypta
 * Minor fixes
 * UI Improvements
 
-#### Upgrade Notice
+#### 3.1
+* Support CryptAPI Pro
+* Minor fixes
+
+#### 3.1.1
+* Minor fixes
+
+== Upgrade Notice ==
 * No breaking changes
diff --git a/upload/admin/controller/extension/payment/cryptapi.php b/upload/admin/controller/extension/payment/cryptapi.php
@@ -113,6 +113,12 @@ public function index()
             $data['payment_cryptapi_title'] = $this->config->get('payment_cryptapi_title');
         }
 
+        if (isset($this->request->post['payment_cryptapi_api_key'])) {
+            $data['payment_cryptapi_api_key'] = $this->request->post['payment_cryptapi_api_key'];
+        } else {
+            $data['payment_cryptapi_api_key'] = $this->config->get('payment_cryptapi_api_key');
+        }
+
         if (isset($this->request->post['payment_cryptapi_standard_geo_zone_id'])) {
             $data['payment_cryptapi_standard_geo_zone_id'] = $this->request->post['payment_cryptapi_standard_geo_zone_id'];
         } else {
@@ -176,6 +182,12 @@ public function index()
             $data['payment_cryptapi_qrcode'] = $this->config->get('payment_cryptapi_qrcode');
         }
 
+        if (isset($this->request->post['payment_cryptapi_qrcode_default'])) {
+            $data['payment_cryptapi_qrcode_default'] = $this->request->post['payment_cryptapi_qrcode_default'];
+        } else {
+            $data['payment_cryptapi_qrcode_default'] = $this->config->get('payment_cryptapi_qrcode_default');
+        }
+
         if (isset($this->request->post['payment_cryptapi_qrcode_size'])) {
             $data['payment_cryptapi_qrcode_size'] = $this->request->post['payment_cryptapi_qrcode_size'];
         } else {
diff --git a/upload/admin/language/en-gb/extension/payment/cryptapi.php b/upload/admin/language/en-gb/extension/payment/cryptapi.php
@@ -35,6 +35,7 @@
 
 $_['branding'] = 'Show CryptAPI logo and credits below the QR code';
 
+$_['qrcode_default'] = 'Show QR Code';
 $_['qrcode'] = 'QR Code to show';
 $_['qrcode_size'] = 'QR Code size';
 $_['qrcode_without_ammount'] = 'Default Without Ammount';
@@ -69,13 +70,17 @@
 $_['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
 $_['text_payment_info'] = 'Payment information';
 
 $_['disable_conversion'] = 'Disable Conversion';
 $_['disable_conversion_warn_bold'] = 'Attention: This option will disable the price conversion for ALL cryptocurrencies!';
-$_['disable_conversion_warn'] = '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';
+$_['disable_conversion_warn'] = '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';
+
+
+$_['api_key'] = 'API Key';
+$_['api_key_info'] = "Insert here your CryptAPI Pro API Key. You can get one with CryptAPI Pro. Notice: If API permission 'Address Override' is not enabled you must set the address in the dashboard otherwise payments may fail.";
diff --git a/upload/admin/view/template/extension/payment/cryptapi.twig b/upload/admin/view/template/extension/payment/cryptapi.twig
@@ -194,7 +194,7 @@
                                 >1.2%
                                 </option>
                                 <option value="0.01"
-                                        {% if payment_cryptapi_fees == "0.01" %}
+                                        {% if payment_cryptapi_fees == "0.01" or payment_cryptapi_fees is empty  %}
                                             selected="selected"
                                         {% endif %}
                                 >1%
@@ -287,6 +287,25 @@
                                    {% if payment_cryptapi_qrcode_size is empty %}value="300" {% else %}value="{{ payment_cryptapi_qrcode_size }}"{% endif %}>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="cryptapi_qrcode_default">
+                            {{ qrcode_default }}
+                        </label>
+                        <div class="col-sm-10">
+                            <select name="payment_cryptapi_qrcode_default" id="cryptapi_qrcode_default" class="form-control">
+                                {% if payment_cryptapi_qrcode_default is empty or payment_cryptapi_qrcode_default != '0' %}
+                                    <option value="1" selected="selected">{{ text_enabled }}</option>
+                                    <option value="0">{{ text_disabled }}</option>
+                                {% elseif payment_cryptapi_branding == 1 %}
+                                    <option value="1" selected="selected">{{ text_enabled }}</option>
+                                    <option value="0">{{ text_disabled }}</option>
+                                {% elseif payment_cryptapi_branding == 0 %}
+                                    <option value="1">{{ text_enabled }}</option>
+                                    <option value="0" selected="selected">{{ text_disabled }}</option>
+                                {% endif %}
+                            </select>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <label class="col-sm-2 control-label" for="cryptapi_qrcode">
                             <span data-toggle="tooltip" title="{{ text_qrcode }}">
@@ -398,7 +417,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label" for="cryptapi_order_cancelation_timeout">
                             <span data-toggle="tooltip" title="{{ text_order_cancelation_timeout }}">
-                               {{ order_cancelation_timeout  }}
+                               {{ order_cancelation_timeout }}
                             </span>
                         </label>
                         <div class="col-sm-10">
@@ -478,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() }}'>
diff --git a/upload/catalog/controller/extension/payment/cryptapi.php b/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,8 @@ public function confirm()
                     $callbackUrl = $this->url->link('extension/payment/cryptapi/callback', 'order_id=' . $this->session->data['order_id'] . '&nonce=' . $nonce, true);
                     $callbackUrl = str_replace('&amp;', '&', $callbackUrl);
 
-                    $helper = new CryptAPIHelper($selected, $address, $callbackUrl, [], true);
+
+                    $helper = new CryptAPIHelper($selected, $address, $apiKey, $callbackUrl, [], true);
                     $addressIn = $helper->get_address();
 
                     $qrCodeDataValue = $helper->get_qrcode($cryptoTotal, $qr_code_size);
@@ -396,7 +399,7 @@ public function cron()
 
                 $remaining = $calc['remaining'];
                 $remaining_pending = $calc['remaining_pending'];
-                $remaining_fiat = $calc['remaining_fiat'];
+                $already_paid = $calc['already_paid'];
 
                 if ($value_refresh !== 0 && $last_price_update + $value_refresh <= time() && !empty($last_price_update)) {
 
@@ -423,7 +426,7 @@ public function cron()
                     $this->model_extension_payment_cryptapi->updatePaymentData($order_id, 'cryptapi_last_price_update', time());
                 }
 
-                if ($order_timeout !== 0 && (strtotime($order['date_added']) + $order_timeout) <= time() && $remaining_fiat >= floatval($metaData['cryptapi_total_fiat']) && (int)$metaData['cryptapi_cancelled'] === 0) {
+                if ($order_timeout !== 0 && (strtotime($order['date_added']) + $order_timeout) <= time() && $already_paid <=0 && (int)$metaData['cryptapi_cancelled'] === 0) {
                     $processing_state = 7;
                     $this->model_checkout_order->addOrderHistory($order['order_id'], $processing_state);
                 }
@@ -465,7 +468,7 @@ public function callback()
 
             $history[$data['uuid']] = [
                 'timestamp' => time(),
-                'value_paid' => $paid,
+                'value_paid' => CryptAPIHelper::sig_fig($paid, 6),
                 'value_paid_fiat' => $fiat_conversion,
                 'pending' => $data['pending']
             ];
diff --git a/upload/catalog/model/extension/payment/cryptapi.php b/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;
+                    }
                 }
             }
         }
diff --git a/upload/catalog/view/theme/default/template/extension/payment/cryptapi_success.twig b/upload/catalog/view/theme/default/template/extension/payment/cryptapi_success.twig
@@ -14,38 +14,38 @@
     <div class="ca_payment_details">
         <div class="ca_payments_wrapper">
             <div class="ca_qrcode_wrapper"
-                 style="{% if qr_code_setting == 'hide_ammount' or qr_code_setting =='hide_without_ammount' %}display: none;{% endif %}; width: {{ qr_code_size + 20 }}px;">
+                 style="{% if qrcode_default == '0' %}display: none;{% endif %}; width: {{ qr_code_size + 20 }}px;">
                 {% if crypto_allowed_value == true %}
                     <div class="inner-wrapper">
                         <figure>
-                            {% if qr_code_setting != 'hide_ammount' %}
+                            {% if qr_code_setting != 'hide_without_ammount' %}
                                 <img class="ca_qrcode no_value"
                                         {% if qr_code_setting == 'ammount' %}
                                             style="display:none;"
                                         {% endif %}
                                      src="data:image/png;base64,{{ qr_code }}" alt="{{ qrcode_alt_text }}"/>
                             {% endif %}
-                            {% if qr_code_setting != 'hide_without_ammount' %}
+                            {% if qr_code_setting != 'hide_ammount' %}
                                 <img class="ca_qrcode value"
                                         {% if qr_code_setting == 'without_ammount' %}
                                             style="display:none;"
                                         {% endif %} src="data:image/png;base64,{{ qr_code_value }}"
                                      alt="{{ qrcode_alt_value_text }}"/>
                             {% endif %}
                         </figure>
-                        {% if qr_code_setting != 'hide_ammount' and  qr_code_setting != 'hide_without_ammount' %}
+                        {% if qr_code_setting != 'hide_without_ammount' %}
                             <div class="ca_qrcode_buttons">
                                 {% if qr_code_setting != 'hide_without_ammount' %}
                                     <button class="ca_qrcode_btn no_value
-                        {% if qr_code_setting == 'without_ammount' %}
+                        {% if qr_code_setting == 'without_ammount' or qr_code_setting == 'hide_ammount' %}
                          active
                          {% endif %}" aria-label="{{ qrcode_alt_show_value }}">
                                         {{ qrcode_button_noamount_text }}
                                     </button>
                                 {% endif %}
                                 {% if qr_code_setting != 'hide_ammount' %}
                                     <button class="ca_qrcode_btn value
-                        {% if qr_code_setting == 'ammount' %}
+                        {% if qr_code_setting == 'ammount' or qr_code_setting == 'hide_without_ammount' %}
                          active
                          {% endif %}" aria-label="{{ qrcode_alt_show_value }}">
                                         {{ qrcode_button_amount_text }}
@@ -85,7 +85,7 @@
                 <div class="ca_payment_notification ca_notification_remaining" style="display: none">
                     <strong>{{ text_notice }}</strong>: {{ notification_remaining|format(min_tx_notice) }}
                 </div>
-                {% if refresh_value_interval != 'none' %}
+                {% if refresh_value_interval != '0' %}
                     <div class="ca_time_refresh">
                         {{ order_value_refresh|format(crypto_coin|upper) }}
                         <span class="ca_time_seconds_count" data-soon="{{ text_moment }}" data-seconds="{{ conversion_timer }}">{{ conversion_timer|date('i:s') }}</span>
@@ -100,7 +100,7 @@
                     <div class="ca_loader"></div>
                 </div>
             </div>
-            {% if order_cancelation_timeout != 'none' %}
+            {% if order_cancelation_timeout != '0' %}
                 <span class="ca_notification_cancel" data-text="{{ order_cancelled_minute }}">
                 {{ order_valid_time|format(cancel_timer, cancel_timer|date('H:i')) }}
                 </span>
diff --git a/upload/system/library/cryptapi.php b/upload/system/library/cryptapi.php

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,11 @@ public function validateCurrencies()`
`55`	`55`
`56`	`56`	`if (count($cryptocurrencies) > 0) {`
`57`	`57`	`foreach ($cryptocurrencies as $token => $coin) {`
`58`		`- if ($coin && !empty($this->config->get('payment_cryptapi_cryptocurrencies_address_' . $token))) {`
`59`		`- $status = true;`
`60`		`- break;`
	`58`	`+ if ($coin) {`
	`59`	`+ if(!empty($this->config->get('payment_cryptapi_cryptocurrencies_address_' . $token) \|\| !empty($this->config->get('payment_cryptapi_api_key')))) {`
	`60`	`+ $status = true;`
	`61`	`+ break;`
	`62`	`+ }`
`61`	`63`	`}`
`62`	`64`	`}`
`63`	`65`	`}`