Merge pull request #14 from Kukks/master

WP Plugin Directory Refactor

.gitignore

@@ -16,4 +16,9 @@ npm_debug.log
 /wordpress/
 wp-cli.yml
 wp-tests-config.php
-woocommerce/html
+woocommerce/html
+\.idea/\.idea\.woocommerce-plugin/\.idea/
+
+\.idea/\.idea\.woocommerce-plugin/
+
+dist2/

CHANGELOG.md

@@ -2,6 +2,13 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 3.0
+### Changed
+- Rebrand to be properly BTCPay labelled
+- Revert to using original Bitpay php lib and used Customnet for btcpay host urls
+- Update default order states to more reasonable values
+- Prepare plugin for Wordpress Plugin Repository
+
 ## 2.2.24
 ### Fixed
 - Bug: In some circumstances the auto update might crash the wordpress dashboard

Dockerfile

@@ -1,8 +1,13 @@
 FROM php:5.6-cli
 
+RUN apt-get update && apt-get install -my wget gnupg
+
+RUN curl -sL https://deb.nodesource.com/setup_10.x | bash -
+
 RUN apt-get update \
     && apt-get install -y \
         nodejs \
+		build-essential \
         npm \
         git \
         libmcrypt-dev \
@@ -19,7 +24,7 @@ RUN apt-get update \
 ENV DEBIAN_FRONTEND noninteractive
 ENV COMPOSER_NO_INTERACTION 1
 
-RUN ln -s "$(which nodejs)" /usr/bin/node
+# RUN ln -s "$(which nodejs)" /usr/bin/node
 # Show versions
 RUN php -v && node -v && npm -v
 

GUIDE.md

@@ -40,18 +40,18 @@ Visit the [Releases](https://github.com/bitpay/woocommerce-plugin/releases) page
 ## Configuration
 
 Configuration can be done using the Administrator section of Wordpress.
-Once Logged in, you will find the configuration settings under **WooCommerce > Settings > Checkout > BitPay**.
+Once Logged in, you will find the configuration settings under **WooCommerce > Settings > Checkout > BtcPay**.
 Alternatively, you can also get to the configuration settings via Plugins and clicking the Settings link for this plugin.
 
-![BitPay Settings](https://raw.githubusercontent.com/bitpay/woocommerce-plugin/master/docs/img/admin.png "BitPay Settings")
+![BitPay Settings](https://raw.githubusercontent.com/btcpayserver/woocommerce-plugin/master/docs/img/admin.png "BtcPay Settings")
 
 Here your will need to create a [pairing code](https://bitpay.com/api-tokens) using
-your BitPay merchant account. Once you have a Pairing Code, put the code in the
+your BtcPay store ^ account. Once you have a Pairing Code, put the code in the
 Pairing Code field:
-![Pairing Code field](https://raw.githubusercontent.com/bitpay/woocommerce-plugin/master/docs/img/pairingcode.png "Pairing Code field")
+![Pairing Code field](https://raw.githubusercontent.com/btcpayserver/woocommerce-plugin/master/docs/img/pairingcode.png "Pairing Code field")
 
 On success, you'll receive a token:
-![BitPay Token](https://raw.githubusercontent.com/bitpay/woocommerce-plugin/master/docs/img/token.png "Bitpay Token")
+![BitPay Token](https://raw.githubusercontent.com/btcpayserver/woocommerce-plugin/master/docs/img/token.png "Bitpay Token")
 
 **NOTE:** Pairing Codes are only valid for a short period of time. If it expires
 before you get to use it, you can always create a new one and pair with it.

Gruntfile.js

@@ -13,7 +13,7 @@ module.exports = function(grunt) {
     clean: {
       build: ['dist'],
       dev: {
-        src: ['/var/www/html/woocommerce/wp-content/plugins/btcpay-for-woocommerce/'],
+        src: ['/var/www/html/woocommerce/wp-content/plugins/btcpay-woocommerce/'],
         options: {
           force: true
         }
@@ -22,7 +22,7 @@ module.exports = function(grunt) {
     compress: {
       build: {
         options: {
-          archive: 'dist/btcpay-for-woocommerce.zip'
+          archive: 'dist/btcpay-woocommerce.zip'
         },
         files: [{
           expand: true,
@@ -38,40 +38,40 @@ module.exports = function(grunt) {
             expand: true,
             cwd: 'src/',
             src: ['**/**.php', 'assets/js/**/**.*', 'assets/img/**/**.*', 'templates/**/**.*'],
-            dest: 'dist/btcpay-for-woocommerce'
+            dest: 'dist/btcpay-woocommerce'
           },
           {
             expand: true,
             cwd: 'vendor/bitpay/php-client/src/',
             src: ['**/**.*'],
-            dest: 'dist/btcpay-for-woocommerce/lib'
+            dest: 'dist/btcpay-woocommerce/lib'
           },
           {
-            src: 'readme.txt',
-            dest: 'dist/btcpay-for-woocommerce/readme.txt'
+            src: 'Wordpress-README.md',
+            dest: 'dist/btcpay-woocommerce/readme.txt'
           },
           {
             src: 'LICENSE',
-            dest: 'dist/btcpay-for-woocommerce/license.txt'
+            dest: 'dist/btcpay-woocommerce/license.txt'
           }
         ]
       },
       dev: {
         files: [{
           expand: true,
-          cwd: 'dist/btcpay-for-woocommerce',
+          cwd: 'dist/btcpay-woocommerce',
           src: ['**/**'],
-          dest: '/var/www/html/woocommerce/wp-content/plugins/btcpay-for-woocommerce/'
+          dest: '/var/www/html/woocommerce/wp-content/plugins/btcpay-woocommerce/'
         }]
       }
     },
     cssmin: {
       build: {
         options: {
-          banner: '/**\n * @license Copyright 2011-2014 BitPay Inc., MIT License\n * see https://github.com/bitpay/woocommerce-plugin/blob/master/LICENSE\n */'
+          banner: '/**\n * @license Copyright 2011-2018 BitPay Inc. & BtcPay Inc., MIT License\n * see https://github.com/btcpayserver/woocommerce-plugin/blob/master/LICENSE\n */'
         },
         files: {
-          'dist/btcpay-for-woocommerce/assets/css/style.css': ['src/assets/css/**.css']
+          'dist/btcpay-woocommerce/assets/css/style.css': ['src/assets/css/**.css']
         }
       }
     },

LICENSE

@@ -1,6 +1,8 @@
+Copyright for portions of BTCPayService are held by BitPay Inc 2011-2017.
+
 The MIT License (MIT)
 
-Copyright (c) 2017-2017 BTCPay, Inc.
+Copyright (c) 2017-2018 BTCPay, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -102,7 +102,7 @@ Linux:
 rm -rf dist/
 docker build -t woocommerce_bitpay . 
 docker run -ti -v "`pwd`/dist:/app/dist" --rm woocommerce_bitpay
-echo "Output available in `pwd`/dist/btcpay-for-woocommerce.zip"
+echo "Output available in `pwd`/dist/btcpay-woocommerce.zip"
 ```
 
 ## Common errors