Changeset 2062352

Timestamp:

04/03/2019 03:28:56 PM (7 years ago)

Author:

empatogen

Message:

Release v1.1.2

Location:

woo-xrp/trunk

Files:

• includes/class-wcxrp-gateway.php (modified) (3 diffs)
• includes/class-wcxrp-ledger.php (modified) (1 diff)
• includes/class-wcxrp-rates.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)
• views/thank_you.php (modified) (1 diff)
• woocommerce-xrp.php (modified) (2 diffs)

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

@@ -7 +7 @@
  * @class       WC_Gateway_XRP
  * @extends     WC_Payment_Gateway
- * @version     1.1.1
+ * @version     1.1.2
  * @package     WooCommerce/Classes/Payment
  * @author      Jesper Wallin
@@ -42 +42 @@
             'cexio'    => 'CEX.IO',
             'coinbase' => 'Coinbase',
+            'dex'      => 'XRPL DEX',
             'kraken'   => 'Kraken',
             'uphold'   => 'Uphold'
@@ -293 +294 @@
         $order = wc_get_order($order_id);
 
+        $ledger = new WCXRP_Ledger(
+            $this->settings['xrp_node'],
+            $this->settings['xrp_bypass']
+        );
+
         /* specify where to obtain our rates from. */
-        $rates = new WCXRP_Rates($order->get_currency());
-        $rate  = $rates->get_rate(
+        $rates = new WCXRP_Rates(
+            $ledger,
+            $this->settings['xrp_account'],
+            $order->get_currency()
+        );
+        $rate = $rates->get_rate(
             $this->settings['exchange'],
             $this->exchanges

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

@@ -84 +84 @@
         return $data->result;
     }
+
+    public function book_offers($account, $currency)
+    {
+        $taker_pays['currency'] = $currency;
+        if ($currency === 'USD') {
+            $taker_pays['issuer'] = 'rvYAfWj5gh67oV6fW32ZzP3Aw4Eubs59B';
+        } elseif ($currency === 'EUR') {
+            $taker_pays['issuer'] = 'rhub8VRN55s94qWKDv6jmDy1pUykJzF3wq';
+        } else {
+            return false;
+        }
+
+        $payload = json_encode([
+            'method' => 'book_offers',
+            'params' => [[
+                'taker' => $account,
+                "taker_gets" => [
+                    "currency" => "XRP"
+                ],
+                "taker_pays" => $taker_pays,
+                "limit" => 50
+            ]]
+        ]);
+
+        $res = wp_remote_post($this->node, [
+            'body' => $payload,
+            'headers' => $this->headers
+        ]);
+        if (is_wp_error($res) || $res['response']['code'] !== 200) {
+            return false;
+        }
+        if (($data = json_decode($res['body'])) === null) {
+            return false;
+        }
+
+        foreach ($data->result->offers as $offer) {
+            if (!isset($offer->owner_funds)) {
+                continue;
+            }
+
+            $rate = $offer;
+            break;
+        }
+
+        return $rate->TakerPays->value / ($rate->TakerGets / 1000000);
+    }
 }

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

@@ -4 +4 @@
 {
     private $ecb_cache = 'woo_ecb_rates.xml';
+    private $ledger = false;
+    private $account = false;
+    private $base_currency = false;
 
     /**
      * Rates constructor.
+     * @param $ledger
+     * @param $account
      * @param $base_currency
      */
-    public function __construct($base_currency)
-    {
+    public function __construct($ledger, $account, $base_currency)
+    {
+        $this->ledger = $ledger;
+        $this->account = trim($account);
         $this->base_currency = strtoupper($base_currency);
     }
@@ -476 +483 @@
         }
     }
+
+    /**
+     * Get Exchange rate from dex
+     * @return bool|float|int
+     */
+    private function dex()
+    {
+        $src = 'EUR';
+
+        if ($this->base_currency === 'USD') {
+            $src = 'USD';
+        }
+        $rate = $this->ledger->book_offers(
+            $this->account,
+            $src
+        );
+
+        if ($rate === false) {
+            return false;
+        }
+
+        return $this->to_base($rate, $src);
+    }
 }

woo-xrp/trunk/readme.txt

@@ -34 +34 @@
 = Which exchanges is supported? =
 
-You can specify between [Binance](https://www.binance.com/), [Bitbank](https://bitbank.cc/), [Bitfinex](https://www.bitfinex.com/), [Bitlish](https://bitlish.com/), [BitMEX](https://www.bitmex.com/), [Bitrue](https://www.bitrue.com/), [Bitsane](https://bitsane.com/), [Bitstamp](https://www.bitstamp.net/), [Bittrex](https://www.bittrex.com), [Bitcoin Exchange Thailand](https://bx.in.th/), [CEX.IO](https://cex.io/), [Coinbase](https://www.coinbase.com/), [Kraken](https://www.kraken.com/) or [Uphold](https://uphold.com/) as the exchange to use when fetching the XRP rate when the customer is checking out.
+You can use the [decentralized exchange (DEX)](https://developers.ripple.com/decentralized-exchange.html) on the XRP Ledger, [Binance](https://www.binance.com/), [Bitbank](https://bitbank.cc/), [Bitfinex](https://www.bitfinex.com/), [Bitlish](https://bitlish.com/), [BitMEX](https://www.bitmex.com/), [Bitrue](https://www.bitrue.com/), [Bitsane](https://bitsane.com/), [Bitstamp](https://www.bitstamp.net/), [Bittrex](https://www.bittrex.com), [Bitcoin Exchange Thailand](https://bx.in.th/), [CEX.IO](https://cex.io/), [Coinbase](https://www.coinbase.com/), [Kraken](https://www.kraken.com/) or [Uphold](https://uphold.com/) as the exchange to get the XRP rate when your customer is checking out.
 
 = Which base currencies are supported? =
@@ -52 +52 @@
 == Changelog ==
 
+= 1.1.2 =
+* Add the decentralized exchange. (DEX)
+* Fix the text style on the checkout page.
+
 = 1.1.1 =
 * Add new exchanges. (Bitsane, CEX.IO, Coinbase, Uphold)
 * Add missing sanitation checks for user input.
-* Add new order status (Overpaid) for when a customer pays too much.
+* Add new order status (Overpaid) for when a customer pays too much.
 * Fix potential rounding error when processing payments.
 * Fix a bug where the payment gateway was loaded twice.
@@ -85 +89 @@
 == 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.1 =
 This version improves the overall payment processing and making it more robust. It fixes a potential rounding error when handling payments and it makes then webhook service retry multiple times if we're unable to talk to the XRP network. This version also make it easier to see when a customer pays too much, as the order will get the status "Overpaid".

woo-xrp/trunk/views/thank_you.php

@@ -5 +5 @@
     <tr>
         <th><?php _e('XRP Account', 'wc-gateway-xrp'); ?></th>
-        <td id="xrp_account"><?php echo esc_html(get_option('woocommerce_xrp_settings')['xrp_account']) ?></td>
+        <td id="xrp_account" style="text-transform: none !important"><?php echo esc_html(get_option('woocommerce_xrp_settings')['xrp_account']) ?></td>
     </tr>
     <tr>

woo-xrp/trunk/woocommerce-xrp.php

@@ -4 +4 @@
  * Plugin URI: http://github.com/empatogen/woocommerce-xrp
  * Description: A payment gateway for WooCommerce to accept <a href="https://ripple.com/xrp">XRP</a> payments.
- * Version: 1.1.1
+ * Version: 1.1.2
  * Author: Jesper Wallin
  * Author URI: https://ifconfig.se/
@@ -30 +30 @@
 
 /* define constants */
-define('WCXRP_VERSION', '1.1.1');
+define('WCXRP_VERSION', '1.1.2');
 define('WCXRP_TEXTDOMAIN', 'wc-gateway-xrp');
 define('WCXRP_NAME', 'Woocommerce XRP');