From 66a2839880b81741c19d21e920b9dcebe8e0d486 Mon Sep 17 00:00:00 2001
From: David Hayes <david@blackbricksoftware.com>
Date: Fri, 29 Jul 2016 15:37:50 -0500
Subject: [PATCH 1/4] add unnecessary configuration in plugin

---
 upload/bitpay.xml | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/upload/bitpay.xml b/upload/bitpay.xml
index 36ed878..4095d5b 100644
--- a/upload/bitpay.xml
+++ b/upload/bitpay.xml
@@ -50,29 +50,4 @@ THE SOFTWARE.
             <option value="high">VMPAYMENT_BITPAY_SPEED_LABEL_HIGH</option>
         </param>
     </params>
-    <config>
-        <fields name="params">
-            <fieldset name="basic">
-                    <field name="merchant_apikey" type="text" label="VMPAYMENT_BITPAY_API_KEY_LABEL" description="VMPAYMENT_BITPAY_API_KEY_LABEL"/>
-
-                    <field name="network" type="list" default="live" label="VMPAYMENT_BITPAY_NETWORK_LABEL"
-                       description="VMPAYMENT_BITPAY_NETWORK_LABEL">
-                        <option value="live">VMPAYMENT_BITPAY_NETWORK_LABEL_LIVE</option>
-                        <option value="test">VMPAYMENT_BITPAY_NETWORK_LABEL_TEST</option>
-                    </field>
-
-                    <field name="speed" type="list" default="low" label="VMPAYMENT_BITPAY_SPEED_LABEL"
-                       description="VMPAYMENT_BITPAY_SPEED_LABEL">
-                        <option value="low">VMPAYMENT_BITPAY_SPEED_LABEL_LOW</option>
-                        <option value="medium">VMPAYMENT_BITPAY_SPEED_LABEL_MEDIUM</option>
-                        <option value="high">VMPAYMENT_BITPAY_SPEED_LABEL_HIGH</option>
-                    </field>
-                    <field name="payment_logos" type="vmfiles"  multiple="true" label="VMPAYMENT_BITPAY_LOGO"
-                      description="VMPAYMENT_BITPAY_LOGO"
-                      directory="/images/stories/virtuemart/payment"
-                      default="default" hide_default="1" hide_none="1"
-                      stripext="0" exclude="^_"/>
-            </fieldset>
-        </fields>
-    </config>
 </extension>

From 9132579ed94aec0c46af5e2b2146158534894a81 Mon Sep 17 00:00:00 2001
From: David Hayes <david@blackbricksoftware.com>
Date: Fri, 29 Jul 2016 15:39:58 -0500
Subject: [PATCH 2/4] add in % total and total transactio nmodifiers; update
 version number

---
 upload/bitpay.xml                                    | 4 +++-
 upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/upload/bitpay.xml b/upload/bitpay.xml
index 4095d5b..fc07bc9 100644
--- a/upload/bitpay.xml
+++ b/upload/bitpay.xml
@@ -29,7 +29,7 @@ THE SOFTWARE.
     <authorUrl>http://www.bitpay.com</authorUrl>
     <copyright>Copyright</copyright>
     <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <description>BitPay payment plugin</description>
     <files>
         <filename plugin="bitpay">bitpay.php</filename>
@@ -38,6 +38,8 @@ THE SOFTWARE.
     <params addpath="/administrator/components/com_virtuemart/elements">
 
         <param name="merchant_apikey" type="text"  label="VMPAYMENT_BITPAY_API_KEY_LABEL" description="VMPAYMENT_BITPAY_API_KEY_LABEL" />
+        <param name="cost_per_transaction" type="text" label="VMPAYMENT_BITPAY_TXN_TOTAL" description="VMPAYMENT_BITPAY_TXN_TOTAL_EXPLAIN" />
+		<param name="cost_percent_total" type="text" label="VMPAYMENT_BITPAY_PERCENT_TOTAL" description="VMPAYMENT_BITPAY_PERCENT_TOTAL_EXPLAIN" />
         <param name="network" type="list" default="live" label="VMPAYMENT_BITPAY_NETWORK_LABEL"
            description="VMPAYMENT_BITPAY_NETWORK_LABEL">
             <option value="live">VMPAYMENT_BITPAY_NETWORK_LABEL_LIVE</option>
diff --git a/upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini b/upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini
index af5fff2..bf0fd9c 100644
--- a/upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini
+++ b/upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini
@@ -39,7 +39,8 @@ VMPAYMENT_BITPAY_PAYMENT_NAME="Payment Name"
 VMPAYMENT_BITPAY_PAYMENT_TOTAL_CURRENCY="Total in Payment Currency"
 VMPAYMENT_BITPAY_PERCENT_TOTAL="Percent of the total amount"
 VMPAYMENT_BITPAY_PERCENT_TOTAL_EXPLAIN="Percent to apply to the total amount"
-VMPAYMENT_BITPAY_API_KEY_LABEL = "Merchant API Key"
+VMPAYMENT_BITPAY_TXN_TOTAL="Cost Per transaction"
+VMPAYMENT_BITPAY_TXN_TOTAL_EXPLAIN="Total amount to apply to the total amount"VMPAYMENT_BITPAY_API_KEY_LABEL = "Merchant API Key"
 VMPAYMENT_BITPAY_NETWORK_LABEL = "Network"
 VMPAYMENT_BITPAY_NETWORK_LABEL_LIVE = "livenet (www.bitpay.com)"
 VMPAYMENT_BITPAY_NETWORK_LABEL_TEST = "testnet (test.bitpay.com)"

From f205a52199f7b8cce6df793c4f75aa8fbbb7a308 Mon Sep 17 00:00:00 2001
From: David Hayes <david@blackbricksoftware.com>
Date: Fri, 29 Jul 2016 15:40:37 -0500
Subject: [PATCH 3/4] add missing images folder reference in manifest

---
 upload/bitpay.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/upload/bitpay.xml b/upload/bitpay.xml
index fc07bc9..b46729e 100644
--- a/upload/bitpay.xml
+++ b/upload/bitpay.xml
@@ -34,6 +34,7 @@ THE SOFTWARE.
     <files>
         <filename plugin="bitpay">bitpay.php</filename>
         <folder>language</folder>
+        <folder>images</folder>
     </files>
     <params addpath="/administrator/components/com_virtuemart/elements">
 

From 127edb9720ff972f71706a61e795cead6c89b242 Mon Sep 17 00:00:00 2001
From: David Hayes <david@blackbricksoftware.com>
Date: Fri, 29 Jul 2016 15:42:15 -0500
Subject: [PATCH 4/4] fix language file

---
 upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini b/upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini
index bf0fd9c..80c7282 100644
--- a/upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini
+++ b/upload/language/en-GB/en-GB.plg_vmpayment_bitpay.ini
@@ -40,7 +40,8 @@ VMPAYMENT_BITPAY_PAYMENT_TOTAL_CURRENCY="Total in Payment Currency"
 VMPAYMENT_BITPAY_PERCENT_TOTAL="Percent of the total amount"
 VMPAYMENT_BITPAY_PERCENT_TOTAL_EXPLAIN="Percent to apply to the total amount"
 VMPAYMENT_BITPAY_TXN_TOTAL="Cost Per transaction"
-VMPAYMENT_BITPAY_TXN_TOTAL_EXPLAIN="Total amount to apply to the total amount"VMPAYMENT_BITPAY_API_KEY_LABEL = "Merchant API Key"
+VMPAYMENT_BITPAY_TXN_TOTAL_EXPLAIN="Total amount to apply to the total amount"
+VMPAYMENT_BITPAY_API_KEY_LABEL = "Merchant API Key"
 VMPAYMENT_BITPAY_NETWORK_LABEL = "Network"
 VMPAYMENT_BITPAY_NETWORK_LABEL_LIVE = "livenet (www.bitpay.com)"
 VMPAYMENT_BITPAY_NETWORK_LABEL_TEST = "testnet (test.bitpay.com)"