v4.7.3

- Minor fixes

Author: arianoangelo

CryptAPI.php

@@ -3,11 +3,11 @@
 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.7.2
+Version: 4.7.3
 Requires at least: 5
 Tested up to: 6.1.1
 WC requires at least: 5.8
-WC tested up to: 7.2.2
+WC tested up to: 7.4
 Requires PHP: 7.2
 Author: cryptapi
 Author URI: https://cryptapi.io/

README.md

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

controllers/CryptAPI.php

@@ -602,7 +602,10 @@ function order_status() {
 
 			$history = json_decode( $order->get_meta( 'cryptapi_history' ), true );
 
-			$calc = $this->calc_order( $history, $order->get_meta( 'cryptapi_total' ), $order->get_meta( 'cryptapi_total_fiat' ) );
+            $cryptapi_total = $order->get_meta( 'cryptapi_total' );
+            $order_total = $order->get_total( 'edit' );
+
+            $calc = $this->calc_order( $history, $cryptapi_total, $order_total );
 
 			$already_paid      = $calc['already_paid'];
 			$already_paid_fiat = $calc['already_paid_fiat'];
@@ -1143,7 +1146,10 @@ function ca_cronjob($force = false, $order_id = '') {
 
 			$min_tx = (float) $order->get_meta( 'cryptapi_min' );
 
-			$calc = $this->calc_order( $history, $order->get_meta( 'cryptapi_total' ), $order->get_meta( 'cryptapi_total_fiat' ) );
+            $cryptapi_total = $order->get_meta( 'cryptapi_total' );
+            $order_total = $order->get_total( 'edit' );
+
+			$calc = $this->calc_order( $history, $cryptapi_total,  $order_total);
 
 			$remaining         = $calc['remaining'];
 			$remaining_pending = $calc['remaining_pending'];
@@ -1155,10 +1161,11 @@ function ca_cronjob($force = false, $order_id = '') {
                 if ( ($remaining === $remaining_pending && $remaining_pending > 0) || ((int)$order_id === $order->get_id() && $force && $remaining === $remaining_pending && $remaining_pending > 0)) {
 					$cryptapi_coin = $order->get_meta( 'cryptapi_currency' );
 
-					$crypto_total = CryptAPI\Helper::sig_fig( CryptAPI\Helper::get_conversion( $woocommerce_currency, $cryptapi_coin, $order->get_total( 'edit' ), $this->disable_conversion ), 6 );
+                    $crypto_conversion = (float) CryptAPI\Helper::get_conversion( $woocommerce_currency, $cryptapi_coin, $order_total, $this->disable_conversion );
+					$crypto_total = CryptAPI\Helper::sig_fig($crypto_conversion, 6 );
 					$order->update_meta_data( 'cryptapi_total', $crypto_total );
 
-					$calc_cron              = $this->calc_order( $history, $order->get_meta( 'cryptapi_total' ), $order->get_meta( 'cryptapi_total_fiat' ) );
+					$calc_cron              = $this->calc_order( $history, $crypto_total, $order_total );
 					$crypto_remaining_total = $calc_cron['remaining_pending'];
 
 					if ( $remaining_pending <= $min_tx && ! $remaining_pending <= 0 ) {
@@ -1171,7 +1178,7 @@ function ca_cronjob($force = false, $order_id = '') {
 				}
 
 				$order->update_meta_data( 'cryptapi_last_price_update', time() );
-				$order->save();
+				$order->save_meta_data();
 			}
 
             if ( $order_timeout !== 0 && ( $order_timestamp + $order_timeout ) <= time() && $already_paid <= 0 && (int) $order->get_meta( 'cryptapi_cancelled' ) === 0 ) {

define.php

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

readme.txt

@@ -3,10 +3,10 @@ Contributors: cryptapi
 Tags: crypto payments, woocommerce, payment gateway, crypto, payment, pay with crypto, payment request, bitcoin, bnb, usdt, ethereum, monero, litecoin, bitcoin cash, shib, doge
 Requires at least: 5
 Tested up to: 6.1.1
-Stable tag: 4.7.2
+Stable tag: 4.7.3
 Requires PHP: 7.2
 WC requires at least: 5.8
-WC tested up to: 7.2.2
+WC tested up to: 7.4
 License: MIT
 
 Accept cryptocurrency payments on your WooCommerce website
@@ -321,6 +321,9 @@ The easiest and fastest way is via our live chat on our [website](https://crypta
 = 4.7.2 =
 * Minor fixes
 
+= 4.7.3 =
+* Minor fixes
+
 == Upgrade Notice ==
 
 = 4.3 =

utils/helper.php

@@ -214,7 +214,6 @@ public static function get_estimate($coin)
         $response = Helper::_request($coin, 'estimate', $params);
 
         if ($response->status == 'success') {
-
             return $response->estimated_cost_currency;
         }
 
@@ -267,7 +266,6 @@ public static function sig_fig($value, $digits)
     private static function _request($coin, $endpoint, $params = [], $assoc = false)
     {
         $base_url = Helper::$base_url;
-
         if (!empty($params['apikey']) && $endpoint !== 'info') {
             $base_url = Helper::$pro_url;
         }
@@ -287,14 +285,18 @@ private static function _request($coin, $endpoint, $params = [], $assoc = false)
             $url .= "?{$data}";
         }
 
-        $response = wp_remote_retrieve_body(wp_remote_get($url));
+        for ($y = 0; $y < 5; $y++) {
+            try {
+                $response = json_decode(wp_remote_retrieve_body(wp_remote_get($url)), $assoc);
 
-//        $ch = curl_init();
-//        curl_setopt($ch, CURLOPT_URL, $url);
-//        curl_setopt($ch, CURLOPT_RETURNTRANSFER, TRUE);
-//        $response = curl_exec($ch);
-//        curl_close($ch);
+                if ($response->status == 'success') {
+                    return $response;
+                }
+            } catch (Exception $e) {
+                //
+            }
+        }
 
-        return json_decode($response, $assoc);
+        return json_decode('{"status": "error"}', $assoc);
     }
 }