5.2.2

* Minor improvements

Author: arianoangelo

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: 5.2.1
+Version: 5.2.2
 Requires at least: 5.8
 Tested up to: 6.9.4
 WC requires at least: 5.8
@@ -19,7 +19,7 @@
     exit; // Exit if accessed directly.
 }
 
-define('CRYPTAPI_PLUGIN_VERSION', '5.2.1');
+define('CRYPTAPI_PLUGIN_VERSION', '5.2.2');
 define('CRYPTAPI_PLUGIN_PATH', plugin_dir_path(__FILE__));
 define('CRYPTAPI_PLUGIN_URL', plugin_dir_url(__FILE__));
 

README.md

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

controllers/CryptAPI.php

@@ -929,7 +929,7 @@ function order_status()
                 'coin' => strtoupper($order->get_meta('cryptapi_currency')),
                 'show_min_fee' => $showMinFee,
                 'order_history' => json_decode($order->get_meta('cryptapi_history'), true),
-                'counter' => (string)$counter_calc,
+                'counter' => (string) max(0, $counter_calc),
                 'crypto_total' => (float)$order->get_meta('cryptapi_total'),
                 'already_paid' => $already_paid,
                 'remaining' => (float)$remaining_pending <= 0 ? 0 : $remaining_pending,
@@ -1189,7 +1189,7 @@ function thankyou_page($order_id)
 
         $crypto_allowed_value = false;
 
-        $conversion_timer = ((int)$order->get_meta('cryptapi_last_price_update') + (int)$this->refresh_value_interval) - time();
+        $conversion_timer = max(0, ((int)$order->get_meta('cryptapi_last_price_update') + (int)$this->refresh_value_interval) - time());
         $cancel_timer = $order->get_date_created()->getTimestamp() + (int)$this->order_cancelation_timeout - time();
 
         if (in_array($crypto_coin, $allowed_to_value, true)) {
@@ -1333,7 +1333,7 @@ function thankyou_page($order_id)
                                     ); ?>
                                     <span class="ca_time_seconds_count"
                                           data-soon="<?php echo esc_attr(__('a moment', 'cryptapi')); ?>"
-                                          data-seconds="<?php echo esc_attr($conversion_timer); ?>"><?php echo esc_attr(date('i:s', $conversion_timer)); ?></span>
+                                          data-seconds="<?php echo esc_attr($conversion_timer); ?>"><?php echo esc_html($conversion_timer >= 3600 ? sprintf('%02d:%02d:%02d', intdiv($conversion_timer, 3600), intdiv($conversion_timer % 3600, 60), $conversion_timer % 60) : sprintf('%02d:%02d', intdiv($conversion_timer, 60), $conversion_timer % 60)); ?></span>
                                 </div>
                                 <?php
                             }
@@ -1948,11 +1948,21 @@ function refresh_value($order)
         $cryptapi_total = $order->get_meta('cryptapi_total');
         $order_total = $order->get_total('edit');
 
+        // Nothing to do until a full refresh interval has actually elapsed.
+        if (empty($last_price_update) || (int)$last_price_update + $value_refresh >= time()) {
+            return false;
+        }
+
         $calc = $this->calc_order($history, $cryptapi_total, $order_total);
         $remaining = $calc['remaining'];
         $remaining_pending = $calc['remaining_pending'];
 
-        if ((int)$last_price_update + $value_refresh < time() && !empty($last_price_update) && $remaining === $remaining_pending && $remaining_pending > 0) {
+        // Re-quote the conversion rate only when it is safe to change the amount
+        // owed — i.e. no unconfirmed/partial payment is in flight. $remaining
+        // counts confirmed txs only; $remaining_pending counts pending ones too,
+        // so they differ exactly while a payment is unconfirmed. Re-quoting then
+        // would move the total a customer is part-way through paying.
+        if ($remaining === $remaining_pending && $remaining_pending > 0) {
             $cryptapi_coin = $order->get_meta('cryptapi_currency');
 
             $crypto_conversion = (float)\CryptAPI\Utils\Api::get_conversion($woocommerce_currency, $cryptapi_coin, $order_total, $this->disable_conversion);
@@ -1969,13 +1979,16 @@ function refresh_value($order)
             }
 
             $order->update_meta_data('cryptapi_qr_code_value', $qr_code_data_value['qr_code']);
-
-            $order->update_meta_data('cryptapi_last_price_update', time());
-            $order->save_meta_data();
-
-            return true;
         }
 
-        return false;
+        // Always advance the price-update timestamp once the interval has
+        // elapsed, so the on-page countdown resets to a fresh interval instead
+        // of running past zero into negative territory (which the UI otherwise
+        // renders as a stuck 00:00 / bogus 59:xx). The rate itself only changes
+        // inside the guard above.
+        $order->update_meta_data('cryptapi_last_price_update', time());
+        $order->save_meta_data();
+
+        return true;
     }
 }

readme.txt

@@ -3,7 +3,7 @@ Contributors: cryptapi
 Tags: crypto payments, woocommerce, payment gateway, crypto, payment, pay with crypto, payment request, bitcoin, bnb, usdt, ethereum, litecoin, bitcoin cash, shib, doge, solana
 Requires at least: 5.8
 Tested up to: 6.9.4
-Stable tag: 5.2.1
+Stable tag: 5.2.2
 Requires PHP: 7.2
 WC requires at least: 5.8
 WC tested up to: 10.7.0
@@ -434,6 +434,9 @@ The easiest and fastest way is via our live chat on our [website](https://crypta
 = 5.2.1 =
 * Version bump
 
+= 5.2.2 =
+* Minor improvements
+
 == Upgrade Notice ==
 
 = 4.3 =

static/payment.js

@@ -97,11 +97,12 @@ function check_status(ajax_url) {
             }
 
             if (jQuery('.ca_time_refresh')[0]) {
-                var timer = jQuery('.ca_time_seconds_count');
-
-                if (timer.attr('data-seconds') <= 0) {
-                    timer.attr('data-seconds', data.counter);
-                }
+                // Re-sync against the server's authoritative remaining seconds on
+                // every poll by storing an absolute deadline; the 1s tick derives
+                // the display from it, so drift / background-tab throttling and a
+                // stale local value can never desync the countdown.
+                var counter = Math.max(0, parseInt(data.counter, 10) || 0);
+                jQuery('.ca_time_seconds_count').attr('data-deadline', Math.floor(Date.now() / 1000) + counter);
             }
         });
 
@@ -139,20 +140,29 @@ jQuery(function ($) {
 
             if ($('.ca_time_refresh')[0]) {
                 var refresh_time_span = $('.ca_time_seconds_count'),
-                    refresh_time = refresh_time_span.attr('data-seconds') - 1;
+                    now = Math.floor(Date.now() / 1000),
+                    deadline = parseInt(refresh_time_span.attr('data-deadline'), 10);
+
+                if (isNaN(deadline)) {
+                    // Seed the absolute deadline from the server-rendered remaining
+                    // seconds on first run; polls keep it re-synced afterwards.
+                    deadline = now + Math.max(0, parseInt(refresh_time_span.attr('data-seconds'), 10) || 0);
+                    refresh_time_span.attr('data-deadline', deadline);
+                }
+
+                var refresh_time = Math.max(0, deadline - now);
 
                 if (refresh_time <= 0) {
                     refresh_time_span.html('00:00');
-                    refresh_time_span.attr('data-seconds', 0);
-                    return;
                 } else if (refresh_time <= 30) {
                     refresh_time_span.html(refresh_time_span.attr('data-soon'));
-                }
-
-                var refresh_minutes = Math.floor(refresh_time % 3600 / 60).toString().padStart(2, '0'),
-                    refresh_seconds = Math.floor(refresh_time % 60).toString().padStart(2, '0');
+                } else {
+                    var refresh_hours = Math.floor(refresh_time / 3600),
+                        refresh_minutes = Math.floor(refresh_time % 3600 / 60).toString().padStart(2, '0'),
+                        refresh_seconds = Math.floor(refresh_time % 60).toString().padStart(2, '0');
 
-                refresh_time_span.html(refresh_minutes + ':' + refresh_seconds);
+                    refresh_time_span.html((refresh_hours > 0 ? refresh_hours.toString().padStart(2, '0') + ':' : '') + refresh_minutes + ':' + refresh_seconds);
+                }
 
                 refresh_time_span.attr('data-seconds', refresh_time);
             }