make sure that by default, the plugin does not override transactionSpeed

btcpayserver · Jan 18, 2018 · 9def55f · 9def55f
1 parent bf68167
commit 9def55f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/class-wc-gateway-bitpay.php b/src/class-wc-gateway-bitpay.php
@@ -260,15 +260,16 @@ public function init_form_fields()
                     'type'        => 'api_token'
                ),
                 'transaction_speed' => array(
-                    'title'       => __('Risk/Speed', 'bitpay'),
+                    'title'       => __('Invoice pass to "confirmed" state after', 'bitpay'),
                     'type'        => 'select',
-                    'description' => 'Choose a transaction speed.  For details, see the API documentation at bitpay.com',
+                    'description' => 'An invoice becomes confirmed after the payment has...',
                     'options'     => array(
-                        'high'    => 'High',
-                        'medium'  => 'Medium',
-                        'low'     => 'Low',
+                        'default' => 'Keep store level configuration',
+                        'high'    => '0 confirmation on-chain',
+                        'medium'  => '1 confirmation on-chain',
+                        'low'     => '6 confirmations on-chain',
                     ),
-                    'default' => 'high',
+                    'default' => 'default',
                     'desc_tip'    => true,
                ),
                 'order_states' => array(
@@ -715,7 +716,10 @@ public function process_payment($order_id)
             // Add the Redirect and Notification URLs
             $invoice->setRedirectUrl($redirect_url);
             $invoice->setNotificationUrl($notification_url);
-            $invoice->setTransactionSpeed($this->transaction_speed);
+            if($this->transaction_speed !== 'default')
+            {
+                $invoice->setTransactionSpeed($this->transaction_speed);
+            }
 
             try {
                 $this->log('    [Info] Attempting to generate invoice for ' . $order->get_order_number() . '...');

diff --git a/woocommerce/docker-compose.yml b/woocommerce/docker-compose.yml
@@ -30,7 +30,7 @@ services:
       - "mariadb_datadir:/var/lib/mysql"
 
   btcpayserver:
-    image: nicolasdorier/btcpayserver:1.0.1.8
+    image: nicolasdorier/btcpayserver:1.0.1.11
     expose:
       - "80"
     ports: