Changeset 2196872

Timestamp:

11/19/2019 10:11:50 PM (6 years ago)

Author:

empatogen

Message:

Release v1.1.3

Location:

woo-xrp/trunk

Files:

• includes/class-wcxrp-gateway.php (modified) (2 diffs)
• includes/class-wcxrp-rates.php (modified) (1 diff)
• js/checkout.js (modified) (3 diffs)
• languages/woocommerce-xrp.pot (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• woocommerce-xrp.php (modified) (4 diffs)

woo-xrp/trunk/includes/class-wcxrp-gateway.php

@@ -7 +7 @@
  * @class       WC_Gateway_XRP
  * @extends     WC_Payment_Gateway
- * @version     1.1.2
+ * @version     1.1.3
  * @package     WooCommerce/Classes/Payment
  * @author      Jesper Wallin
@@ -49 +49 @@
         /* supported currencies */
         $this->currencies = [
-            'USD','JPY','BGN','CZK','DKK','GBP','HUF','PLN','RON','SEK','CHF',
-            'ISK','NOK','HRK','RUB','TRY','AUD','BRL','CAD','CNY','HKD','IDR',
-            'ILS','INR','KRW','MXN','MYR','NZD','PHP','SGD','THB','ZAR','EUR'
+            'USD','JPY','BGN','CZK','DKK','GBP','HUF','PLN','RON','SEK',
+            'CHF','ISK','NOK','HRK','RUB','TRY','AUD','BRL','CAD','CNY',
+            'HKD','IDR','ILS','INR','KRW','MXN','MYR','NZD','PHP','SGD',
+            'THB','ZAR','EUR','XRP'
         ];
 

woo-xrp/trunk/includes/class-wcxrp-rates.php

@@ -145 +145 @@
     public function get_rate($exchange, array $exchanges)
     {
+        /* don't bother if we're using XRP as base currency */
+        if ($this->base_currency === 'XRP') {
+            return 1;
+        }
+
         /* call the rate dynamically if it's in the exchanges list */
         if (isset($exchanges[$exchange]) &&

woo-xrp/trunk/js/checkout.js

@@ -1 @@
-jQuery(document).ready(function($) {
+jQuery(document).ready(function($)
+{
+    var use_x_account = 0;
 
-    function wc_gateway_xrp_qrcode(account, tag, amount) {
+    function wc_gateway_xrp_qrcode(account, tag, amount)
+    {
         $('#wc_xrp_qrcode').empty();
+        if (account.substring(0,1) == 'r') {
+            var qrdata = account + "?dt=" + tag + "&amount=" + amount;
+        } else {
+            var qrdata = account + "?amount=" + amount;
+        }
         var qrcode = new QRCode(document.getElementById("wc_xrp_qrcode"), {
-            text: "https://ripple.com/send?to=" + account + "&dt=" + tag + "&amount=" + amount,
+            text: qrdata,
             width: 256,
             height: 256,
@@ -13 +21 @@
     }
 
-    var pollTimer = setInterval(function(){
+    function update_balance()
+    {
         jQuery.ajax({
             "url": ajax_object.ajax_url,
-            "data": { "action": "xrp_checkout", "order_id": ajax_object.order_id },
+            "data": {
+                "action": "xrp_checkout",
+                "order_id": ajax_object.order_id
+            },
             "method": "POST",
             "dataType": "json",
             "success": function(data) {
                 var regenqr=false;
+                if (use_x_account) {
+                    data.xrp_account = data.xrp_x_account;
+                }
                 if ($('#xrp_account').text() != data.xrp_account) {
                     $('#xrp_account').text(data.xrp_account);
@@ -46 +61 @@
                     $('#wc_xrp_qrcode').empty();
                 } else if (regenqr) {
-                    wc_gateway_xrp_qrcode(data.xrp_account, data.tag, data.xrp_remaining);
+                    wc_gateway_xrp_qrcode(
+                        data.xrp_account,
+                        data.tag,
+                        data.xrp_remaining
+                    );
                 }
             }
         });
-    }, 4000);
+    }
+
+    $('#wc_xrp_qrcode, #xrp_account').on('click', function()
+    {
+        if (use_x_account) {
+            use_x_account = 0;
+        } else {
+            use_x_account = 1;
+        }
+
+        update_balance();
+    });
+
+    var pollTimer = setInterval(update_balance, 4000);
 
     wc_gateway_xrp_qrcode(

woo-xrp/trunk/languages/woocommerce-xrp.pot

@@ -20 +20 @@
 
 #. Plugin URI of the plugin
-msgid "http://github.com/empatogen/woocommerce-xrp"
+msgid "http://github.com/zelest/woocommerce-xrp"
 msgstr ""
 

woo-xrp/trunk/readme.txt

@@ -4 +4 @@
 Tags: woo, woocommerce, xrp, gateway, cryptocurrency
 Requires at least: 5.1
-Tested up to: 5.3
+Tested up to: 5.1.1
 Requires PHP: 7.0
 Stable tag: trunk
@@ -52 +52 @@
 == Changelog ==
 
+= 1.1.3 =
+* Add support for the new [X-addresses](https://xrpaddress.info/).
+* Change the XRP-address in the QR-code to support more wallets.
+
 = 1.1.2 =
 * Add the decentralized exchange. (DEX)
@@ -89 +93 @@
 == Upgrade notice ==
 
-= 1.1.2 =
-This version prevents certain themes from breaking the XRP address on the checkout page. It also adds the decentralized exchange that lives on the XRP Ledger.
+= 1.1.3 =
+* Add support for the new [X-addresses](https://xrpaddress.info/).
+* Change the XRP-address in the QR-code to support more wallets.
 
 == Acknowledgments ==

woo-xrp/trunk/woocommerce-xrp.php

@@ -2 +2 @@
 /**
  * Plugin Name: WooCommerce XRP
- * Plugin URI: http://github.com/empatogen/woocommerce-xrp
+ * Plugin URI: http://github.com/zelest/woocommerce-xrp
  * Description: A payment gateway for WooCommerce to accept <a href="https://ripple.com/xrp">XRP</a> payments.
- * Version: 1.1.2
+ * Version: 1.1.3
  * Author: Jesper Wallin
  * Author URI: https://ifconfig.se/
@@ -30 +30 @@
 
 /* define constants */
-define('WCXRP_VERSION', '1.1.2');
+define('WCXRP_VERSION', '1.1.3');
 define('WCXRP_TEXTDOMAIN', 'wc-gateway-xrp');
 define('WCXRP_NAME', 'Woocommerce XRP');
@@ -140 +140 @@
     }
 
+    $account = $x_account = trim(
+        get_option('woocommerce_xrp_settings')['xrp_account']
+    );
+
+    $url = sprintf(
+        'https://xrpaddress.info/api/encode/%s/%d',
+        $account,
+        (int)$order->get_meta('destination_tag', true)
+    );
+
+    if (($x_account = get_transient($url)) === false) {
+        $res = wp_remote_get($url);
+        if (!is_wp_error($res) && $res['response']['code'] === 200 &&
+        (($json = json_decode($res['body'])) !== null) &&
+        isset($json->address)) {
+            $x_account = $json->address;
+            set_transient($url, $x_account, 3600);
+        }
+    }
+
     $tag          = $order->get_meta('destination_tag', true);
     $xrp_total    = round($order->get_meta('total_amount', true), 6);
@@ -147 +167 @@
 
     $result = [
-        'xrp_account'   => get_option('woocommerce_xrp_settings')['xrp_account'],
+        'xrp_account'   => $account,
+        'xrp_x_account' => $x_account,
         'tag'           => $tag,
         'xrp_total'     => $xrp_total,