v3.2.4

- Minor fixes and improvements

Author: arianoangelo

README.md

@@ -24,7 +24,7 @@ The CryptAPI extension enables your OpenCart store to get receive payments in cr
 * (ETH) Ethereum
 * (BCH) Bitcoin Cash
 * (LTC) Litecoin
-* (XMR) Monero
+* (MATIC) Polygon
 * (TRX) Tron
 * (BNB) Binance Coin
 * (USDT) USDT
@@ -164,5 +164,8 @@ The easiest and fastest way is via our live chat on our [website](https://crypta
 #### 3.2.3
 * Minor fixes
 
+#### 3.2.4
+* Minor fixes and improvements
+
 ### Upgrade Notice
 * No breaking changes

catalog/controller/payment/cryptapi.php

@@ -84,9 +84,11 @@ public function sel_crypto()
     public function confirm()
     {
         // Library
+        $this->load->language('extension/cryptapi/payment/cryptapi');
         require(DIR_EXTENSION . 'cryptapi/system/library/cryptapi.php');
 
         $json = array();
+        $err_coin = '';
 
         if ($this->config->get('payment_cryptapi_status')) {
             $this->load->model('checkout/order');
@@ -95,13 +97,18 @@ public function confirm()
             $order_info = $this->model_checkout_order->getOrder($this->session->data['order_id']);
             $cryptoFee = empty($this->session->data['cryptapi_fee']) ? 0 : $this->session->data['cryptapi_fee'];
             $total = $this->currency->format($order_info['total'] + $cryptoFee, $order_info['currency_code'], 1.00000, false);
-
-            $selected = $this->request->post['cryptapi_coin'];
-            $address = $this->config->get('payment_cryptapi_cryptocurrencies_address_' . $selected);
-
             $apiKey = $this->config->get('payment_cryptapi_api_key');
+            if (empty($this->request->post['cryptapi_coin'])) {
+                $err_coin = $this->language->get('error_coin');
+            } else {
+                $selected = $this->request->post['cryptapi_coin'];
+                $address = $this->config->get('payment_cryptapi_cryptocurrencies_address_' . $selected);
+                if (empty($address) && empty($apiKey)) {
+                    $err_coin = $this->language->get('error_apikey');
+                }
+            }
 
-            if (!empty($address) || !empty($apiKey)) {
+            if (empty($err_coin) && (!empty($address) || !empty($apiKey))) {
                 $nonce = $this->model_extension_cryptapi_payment_cryptapi->generateNonce();
 
                 $disable_conversion = $this->config->get('payment_cryptapi_disable_conversion');
@@ -112,18 +119,20 @@ public function confirm()
 
                 $cryptoTotal = \Opencart\Extension\CryptAPI\System\Library\CryptAPIHelper::get_conversion($order_info['currency_code'], $selected, $total, $disable_conversion);
 
-                if ($cryptoTotal < $minTx) {
-                    $message = $this->module->l('Payment error: ', 'validation');
-                    $message .= $this->module->l('Value too low, minimum is', 'validation');
-                    $message .= ' ' . $minTx . ' ' . strtoupper($selected);
-                    $json['error'] = $message;
-                } else {
-                    $callbackUrl = $this->url->link('extension/cryptapi/payment/cryptapi|callback', 'order_id=' . $this->session->data['order_id'] . '&nonce=' . $nonce, true);
-                    $callbackUrl = str_replace('&amp;', '&', $callbackUrl);
+                $callbackUrl = $this->url->link('extension/cryptapi/payment/cryptapi|callback', 'order_id=' . $this->session->data['order_id'] . '&nonce=' . $nonce, true);
+                $callbackUrl = str_replace('&amp;', '&', $callbackUrl);
 
-                    $helper = new \Opencart\Extension\CryptAPI\System\Library\CryptAPIHelper($selected, $address, $apiKey, $callbackUrl, [], true);
-                    $addressIn = $helper->get_address();
+                $helper = new \Opencart\Extension\CryptAPI\System\Library\CryptAPIHelper($selected, $address, $apiKey, $callbackUrl, [], true);
+                $addressIn = $helper->get_address();
+                if (!isset($addressIn)) {
+                    $err_coin = $this->language->get('error_adress');
+                } else {
+                    if (($cryptoTotal < $minTx)) {
+                        $err_coin = $this->language->get('value_minim') . ' ' . $minTx . ' ' . strtoupper($selected);
+                    }
+                }
 
+                if (empty($err_coin)) {
                     $qrCodeDataValue = $helper->get_qrcode($cryptoTotal, $qr_code_size);
                     $qrCodeData = $helper->get_qrcode('', $qr_code_size);
                     $paymentURL = $this->url->link('extension/cryptapi/payment/cryptapi|pay', 'order_id=' . $this->session->data['order_id'] . 'nonce=' . $nonce, true);
@@ -150,7 +159,11 @@ public function confirm()
 
                     $this->model_checkout_order->addHistory($this->session->data['order_id'], $this->config->get('payment_cryptapi_order_status_id'), '', true);
                     $json['redirect'] = $this->url->link('checkout/success', 'order_id=' . $this->session->data['order_id'] . 'nonce=' . $nonce, true);
+                } else {
+                    $json['error']['warning'] = sprintf($this->language->get('error_payment'), $err_coin);
                 }
+            } else {
+                $json['error']['warning'] = sprintf($this->language->get('error_payment'), $err_coin);
             }
         }
 
@@ -542,7 +555,7 @@ public function callback()
 
         $metaData = json_decode($this->model_extension_cryptapi_payment_cryptapi->getPaymentData($order['order_id']), true);
 
-        $history = json_decode($metaData['cryptapi_history'], true);// <<-something's wrong
+        $history = json_decode($metaData['cryptapi_history'], true); // <<-something's wrong
 
         $calc = \Opencart\Extension\CryptAPI\System\Library\CryptAPIHelper::calc_order($history, $metaData['cryptapi_total'], $metaData['cryptapi_total_fiat']);
 
@@ -578,10 +591,10 @@ function order_pay_button(&$route, &$data, &$output)
 
         $orderFetch = $this->model_checkout_order->getOrder($order_id);
         $order = $this->model_extension_cryptapi_payment_cryptapi->getOrder($order_id);
-        
+
         $orderObj = isset($order['response']) ? json_decode($order['response']) : '';
 
-        if(!$orderObj) {
+        if (!$orderObj) {
             return;
         }
 
@@ -590,4 +603,4 @@ function order_pay_button(&$route, &$data, &$output)
             $data['continue'] = $orderObj->cryptapi_payment_url;
         }
     }
-}
+}

catalog/language/en-gb/payment/cryptapi.php

@@ -13,6 +13,11 @@
 $_['text_paywith'] = 'Pay with';
 $_['text_notice'] = 'Notice';
 $_['text_moment'] = 'a moment';
+$_['error_payment']  = 'Payment error: %s!';
+$_['value_minim']  = 'Value too low, minimum is';
+$_['error_coin']  = 'No cryptocurrency selected for payment';
+$_['error_apikey']  = 'Insufficient store owner details for payment';
+$_['error_adress']  = 'This cryptocurrency cannot be used for payment at this time';
 
 $_['button_pay'] = 'Pay now';
 
@@ -50,4 +55,4 @@
 
 $_['order_subject'] = 'New Order %1$s. Please send a %2$s payment';
 $_['order_greeting'] = 'Hello. Order %1$s was created successfully and a payment address was generated for the cryptocurrency %2$s.';
-$_['order_send_payment'] = 'To complete your order or check payment status, use the button provided bellow:';
+$_['order_send_payment'] = 'To complete your order or check payment status, use the button provided bellow:';

catalog/view/template/payment/cryptapi.twig

@@ -38,6 +38,7 @@
                 url: 'index.php?route=extension/cryptapi/payment/cryptapi|sel_crypto',
                 data: $(this).serialize(),
                 success: function (res) {
+                    $('.alert-dismissible').remove();
                     $('#button-payment-method').trigger('click');
                 }
             });
@@ -58,9 +59,17 @@
                     $('#button-confirm').button('reset');
                 },
                 success: function (json) {
+                    $('.alert-dismissible').remove();  
                     if (json['redirect']) {
                         location = json['redirect'];
+                          } else if (json['error']) {
+                       
+                        if (json['error']['warning']) {
+                             $('#alert').prepend('<div class="alert alert-danger alert-dismissible"><i class="fa-solid fa-circle-exclamation"></i> ' + json['error']['warning'] + ' <button type="button" class="btn-close" data-bs-dismiss="alert"></button></div>');
+
                     }
+                }
+
                 },
                 error: function (xhr, ajaxOptions, thrownError) {
                     alert(thrownError + "\r\n" + xhr.statusText + "\r\n" + xhr.responseText);

install.json

@@ -1,7 +1,7 @@
 {
   "name": "CryptAPI Payment Module",
   "code": "cryptapi",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "author": "CryptAPI",
   "link": "https://cryptapi.io"
 }