bump

Wordpress-README.md

@@ -16,22 +16,22 @@ BTCPay Server is a free and open-source cryptocurrency payment processor which a
 
 BTCPay is a non-custodial invoicing system which eliminates the involvement of a third-party. Payments with BTCPay go directly to your wallet, which increases the privacy and security. Your private keys are never uploaded to the server. There is no address re-use since each invoice generates a new address deriving from your xpubkey.
 
-The software is built in C# and conforms to the invoice API of BitPay. It allows for your website to be easily migrated from BitPay and configured as a self-hosted payment processor.
-
 You can run BTCPay as a self-hosted solution on your own server, or use a third-party host.
 
 The self-hosted solution allows you not only to attach an unlimited number of stores and use the Lightning Network but also become the payment processor for others.
 
+If you previosly used BitPay's plugin, you can very easily migrate and use BTCPay.
+
 This plugin is a fork of https://github.com/bitpay/woocommerce-plugin which in turn is a fork of https://github.com/jaafit/bitpayWoocommerce. We have modified the plugin in order to support alternative bitpay compliant servers and enhance usability and functionality. This plugin should be able to run alongside the original bitpay plugin. 
 
 == Installation ==
 This plugin requires Woocommerce. Please make sure you have Woocommerce installed.
 
-![Infographic](img/BTCPayWooCommerceInfoggraphic.png)
+<img src="https://github.com/btcpayserver/btcpayserver-doc/blob/master/img/BTCPayWooCommerceInfoggraphic.png" alt="Infographic" />
 
 To integrate BTCPay Server into an existing WooCommerce store, follow the steps below.
 
-## 1. Install BTCPay Plugin
+## 1. Install BTCPay WooCommerce Plugin
 
 ## 2. Deploy BTCPay Server
 
@@ -41,17 +41,17 @@ To launch your BTCPay server, you can self-host it, or use a third party host.
 
 There are various ways to [launch a self-hosted BTCPay](https://github.com/btcpayserver/btcpayserver-doc#deployment). If you do not have technical knowledge, use the [web-wizard method](https://launchbtcpay.lunanode.com) and follow the video below.
 
-[![WebBTCPay](https://img.youtube.com/vi/NjslXYvp8bk/mqdefault.jpg)](https://www.youtube.com/watch?v=NjslXYvp8bk \"BTCPay - LunaNode\")
+https://www.youtube.com/watch?v=NjslXYvp8bk
 
 For the self-hosted solutions, you\'ll have to wait for your node to sync fully before proceeding to step 3.
 
 ### 2.2 Third-party host
 
-For those who want to test BTCPay out, or are okay with the limitations of a third-party hosting (dependency and privacy, as well as lack of some features) can use a one of many [third-party hosts](ThirdPartyHosting.md).
+Those who want to test BTCPay out, or are okay with the limitations of a third-party hosting (dependency and privacy, as well as lack of some features) can use a one of many [third-party hosts](ThirdPartyHosting.md).
 
 The video below shows you how to connect your store to such host.
 
-[![BTCPayHost](https://img.youtube.com/vi/IT2K8It3S3o/mqdefault.jpg)](https://www.youtube.com/watch?v=IT2K8It3S3o \"BTCPay - Third Party Host\")
+https://www.youtube.com/watch?v=IT2K8It3S3o
 
 ## 3. Pairing the store
 
@@ -70,28 +70,42 @@ Go to your store dashboard. WooCommerce > Settings > Payments. Click BTCPay.
 
 The process of pairing a store with BTCPay is explained in a video below, starting at 1:59
 
-[![Store Pairing](https://img.youtube.com/vi/IT2K8It3S3o/mqdefault.jpg)](https://youtu.be/IT2K8It3S3o?t=119 \"BTCPay - Pairing your Store\")
+https://youtu.be/IT2K8It3S3o?t=119
 
 ## 4. Connecting your wallet
 
-No matter if you\'re using self-hosted or server hosted by a third-party, the process of configuring your wallet is the same. 
+No matter if you're using self-hosted or server hosted by a third-party, the process of configuring your wallet is the same. 
 
-[![BTCPayWallet](https://img.youtube.com/vi/xX6LyQej0NQ/mqdefault.jpg)](https://www.youtube.com/watch?v=xX6LyQej0NQ \"BTCPay - Wallet\")
+https://www.youtube.com/watch?v=xX6LyQej0NQ
 
 ## 5. Testing the checkout
 
 Making a small test-purchase from your own store, will give you a piece of mind. Always make sure that everything is set up correctly before going live. The final video, guides you through the steps of setting a gap limit in your Electrum wallet and testing the checkout process.
 
-[![CheckoutBTCPay](https://img.youtube.com/vi/Fi3pYpzGmmo/mqdefault.jpg)](https://www.youtube.com/watch?v=Fi3pYpzGmmo \"BTCPay - Wallet\")
+https://www.youtube.com/watch?v=Fi3pYpzGmmo
 
 Depending on your business model and store settings, you may want to [configure your order statuses](https://nbitstack.com/t/how-to-set-up-order-statuses-in-woocommerce-and-btcpay/67).
 
+== Frequently Asked Questions ==
+
+You'll find extensive documentation and answers to many of your questions on [docs.btcpayserver.org](https://docs.btcpayserver.org/).
+
+== Screenshots ==
+
+1. The BTCPay Server invoice. Your customers will see this at the checkout. They can pay from their wallet by scanning a QR or copy/pasting it manually into the wallet.
+2. Customizable plugin interface allows store owners to adjust store statuses according to their needs.
+3. Customer will see the pay with Bitcoin button at the checkout.Text can be customized.
+4. Example of sucessfuly paid invoice.
+5. Example of an easy-embeddable HTML donation payment button.
+6. Example of the PoS app you can launch.
+
 == Changelog ==
+
 ## 3.0.1
-### Fixed
-- Grab old settings from 2.x if present and if the 3.x version has not yet been set. 
+### Changed
+-  When upgrading from any version smaller than 3.1 and settings are not set, attempt to load older version. Also display a warning prompt in plugins page after it has been activated to double check settings.
 
-## 3.0.0
+## 3.0
 ### Changed
 - Rebrand to be properly BTCPay labelled
 - Revert to using original Bitpay php lib and used Customnet for btcpay host urls
@@ -243,4 +257,4 @@ Depending on your business model and store settings, you may want to [configure
 
 ## 2.0.0 - 2014-11-18
 ### Changed
-- Implements BitPay\'s new cryptographically secure authentication.
+- Implements BitPay\'s new cryptographically secure authentication.

src/class-wc-gateway-btcpay.php

@@ -20,7 +20,7 @@
     exit;
 }
 
-define("BTCPAY_VERSION", "3.0.0");
+define("BTCPAY_VERSION", "3.0.1");
 $autoloader_param = __DIR__ . '/lib/Bitpay/Autoloader.php';
 
 // Load up the BitPay library
@@ -1576,6 +1576,8 @@ function woocommerce_btcpay_activate()
             if ('BTCPay for WooCommerce' === $plugin['Name']
              && (0 > version_compare( $plugin['Version'], '3.1' ))) { 
 
+
+
                 update_option('woocommerce_btcpay_key',  
                     get_option( 'woocommerce_btcpay_key', get_option('woocommerce_bitpay_key', null) ) );
                 update_option('woocommerce_btcpay_pub', 
@@ -1590,6 +1592,16 @@ function woocommerce_btcpay_activate()
                 get_option( 'woocommerce_btcpay_network', get_option('woocommerce_bitpay_network', null) ) );
                 update_option('woocommerce_btcpay_settings', 
                 get_option( 'woocommerce_btcpay_settings', get_option('woocommerce_bitpay_settings', null) ) );
+                update_option('woocommerce_btcpay_url', 
+                get_option( 'woocommerce_btcpay_url', get_option('woocommerce_bitpay_url', null) ) );
+                update_option('woocommerce_btcpay_notification_url', 
+                get_option( 'woocommerce_btcpay_notification_url', get_option('woocommerce_bitpay_notification_url', null) ) );
+                update_option('woocommerce_btcpay_redirect_url', 
+                get_option( 'woocommerce_btcpay_redirect_url', get_option('woocommerce_bitpay_redirect_url', null) ) );
+                update_option('woocommerce_btcpay_transaction_speed', 
+                get_option( 'woocommerce_btcpay_transaction_speed', get_option('woocommerce_bitpay_transaction_speed', null) ) );
+                update_option('woocommerce_btcpay_order_states', 
+                get_option( 'woocommerce_btcpay_order_states', get_option('woocommerce_bitpay_order_states', null) ) );
 
                 set_transient( 'fx_admin_notice_show_migration_message', true, 5 );
             }
@@ -1611,7 +1623,7 @@ function fx_admin_notice_show_migration_message(){
             <p>The BTCPay Plugin for Woocoomerce has been updated from a 2.x version! 
             <strong>We have attempted to migrate your settings. Please double check them 
             <?php echo '<a href="' . get_bloginfo('wpurl') . '/wp-admin/admin.php?page=wc-settings&tab=checkout&section=wc_gateway_btcpay">here</a>'?>.
-            </strong></p>
+            If you don't see pairing data in your setting, make sure to pair your store again. </strong></p>
         </div>
         <?php
         /* Delete transient, only display this notice once. */