Ensure BTCPayServer 2.0 compatibility

btcpayserver · Nov 24, 2024 · f6cb310 · f6cb310
1 parent b2ebded
commit f6cb310
Show file tree

Hide file tree

Showing 7 changed files with 218 additions and 210 deletions.
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ Please ensure that you meet the following requirements before installing this pl
 ### Tested successfully
 - Prestashop v8.0, v8.0.1, v8.0.4, v8.1.0, v8.1.3 and v8.1.4
 - BTCPay server v1.7.0, v1.7.3.0, v1.12.5, v1.13.0 and v1.13.5
-  - BTCPay server v2 should be supported as of module version v6.2.0.
+  - BTCPay server v2 should be supported as of module version v6.3.0.
 
 ### Multistore
 

diff --git a/modules/btcpay/btcpay.php b/modules/btcpay/btcpay.php
@@ -52,7 +52,7 @@ public function __construct()
 	{
 		$this->name                   = 'btcpay';
 		$this->tab                    = 'payments_gateways';
-		$this->version                = '6.2.1';
+		$this->version                = '6.3.0';
 		$this->author                 = 'BTCPay Server';
 		$this->ps_versions_compliancy = ['min' => Constants::MINIMUM_PS_VERSION, 'max' => _PS_VERSION_];
 		$this->controllers            = ['payment', 'validation', 'webhook'];
@@ -411,12 +411,6 @@ public function hookPaymentOptions(): array
 				return [];
 			}
 
-			// Prepare smarty
-			$this->context->smarty->assign([
-				'onChain'  => $client->onChain()->getPaymentMethods($storeID),
-				'offChain' => $client->offChain()->getPaymentMethods($storeID),
-			]);
-
 			return [
 				(new PaymentOption())
 					->setModuleName($this->name)

diff --git a/modules/btcpay/composer.json b/modules/btcpay/composer.json
@@ -25,7 +25,7 @@
     "ext-intl": "*",
     "ext-json": "*",
     "ext-mbstring": "*",
-    "btcpayserver/btcpayserver-greenfield-php": "^2.6.0",
+    "btcpayserver/btcpayserver-greenfield-php": "^2.8.1",
     "composer/semver": "^3.4.2",
     "stechstudio/backoff": "^1.4"
   },

diff --git a/modules/btcpay/composer.lock b/modules/btcpay/composer.lock
diff --git a/modules/btcpay/src/Server/Client.php b/modules/btcpay/src/Server/Client.php
@@ -46,16 +46,6 @@ class Client extends AbstractClient
 	 */
 	private $payment;
 
-	/**
-	 * @var StorePaymentMethodOnChain
-	 */
-	private $onChain;
-
-	/**
-	 * @var StorePaymentMethodLightningNetwork
-	 */
-	private $offChain;
-
 	/**
 	 * @var Webhook
 	 */
@@ -77,8 +67,6 @@ public function __construct(string $baseUrl, string $apiKey)
 		$this->server   = new ServerClient($baseUrl, $apiKey, $httpClient);
 		$this->store    = new StoreClient($baseUrl, $apiKey, $httpClient);
 		$this->payment  = new StorePaymentMethod($baseUrl, $apiKey, $httpClient);
-		$this->onChain  = new StorePaymentMethodOnChain($baseUrl, $apiKey, $httpClient);
-		$this->offChain = new StorePaymentMethodLightningNetwork($baseUrl, $apiKey, $httpClient);
 		$this->webhook  = new Webhook($baseUrl, $apiKey, $httpClient);
 
 		$this->configuration = new Configuration();
@@ -127,16 +115,6 @@ public function payment(): StorePaymentMethod
 		return $this->payment;
 	}
 
-	public function onChain(): StorePaymentMethodOnChain
-	{
-		return $this->onChain;
-	}
-
-	public function offChain(): StorePaymentMethodLightningNetwork
-	{
-		return $this->offChain;
-	}
-
 	public function webhook(): Webhook
 	{
 		return $this->webhook;

diff --git a/modules/btcpay/views/templates/admin/configure.html.twig b/modules/btcpay/views/templates/admin/configure.html.twig
@@ -194,12 +194,9 @@
 
                 <dt><span class="text-muted mb-0"><strong>{{ 'Supported payment methods'|trans({}, 'Modules.Btcpay.Front') }}</strong></span></dt>
                 <dd>
-                  <ul class="list-unstyled px-1">
-                    {% for paymentMethod in client.offChain().getPaymentMethods(storeId) %}
-                      <li>{{ paymentMethod.cryptoCode }} Lightning ⚡</li>
-                    {% endfor %}
-                    {% for paymentMethod in client.onChain().getPaymentMethods(storeId) %}
-                      <li>{{ paymentMethod.cryptoCode }} On-Chain</li>
+                  <ul>
+                    {% for paymentMethod in client.payment().getPaymentMethods(storeId) %}
+                      <li>{{ paymentMethod.cryptoCode }} {% if 'LNURL' in paymentMethod.paymentMethod %}LNURL ⚡{% elseif 'LN' in paymentMethod.paymentMethod or 'Lightning' in paymentMethod.paymentMethod %}Lightning ⚡{% else %}(On-Chain){% endif %}</li>
                     {% endfor %}
                   </ul>
                 </dd>

diff --git a/modules/btcpay/views/templates/hooks/payment_option.tpl b/modules/btcpay/views/templates/hooks/payment_option.tpl
@@ -1,13 +1,3 @@
 <section class="mb-2">
   <p class="mb-1">{l s='Please pay the exact amount (including transaction fees when paying on-chain).' d='Modules.Btcpay.Front'}</p>
-  <hr class="mb-1"/>
-  <p class="mb-1"><strong>{l s='Supported payment methods' d='Modules.Btcpay.Front'}</strong>:</p>
-  <dl>
-      {foreach $offChain as $paymentMethod}
-        <dt>{$paymentMethod.cryptoCode|escape:'htmlall':'UTF-8'} Lightning ⚡</dt>
-      {/foreach}
-      {foreach $onChain as $paymentMethod}
-        <dt>{$paymentMethod.cryptoCode|escape:'htmlall':'UTF-8'} (On-Chain)</dt>
-      {/foreach}
-  </dl>
 </section>