1.10.0

composer.json

@@ -2,7 +2,7 @@
     "name": "buckaroo/sdk",
     "description": "Buckaroo payment SDK",
     "license": "MIT",
-    "version": "1.9.0",
+    "version": "1.9.1",
     "type": "library",
     "require": {
         "php": ">=7.4|^8.0",

example/additional_services/getActiveSubscriptions.php

@@ -0,0 +1,17 @@
+<?php
+
+require_once __DIR__ . '/../bootstrap.php';
+
+use Buckaroo\BuckarooClient;
+
+$buckaroo = new BuckarooClient($_ENV['BPE_WEBSITE_KEY'], $_ENV['BPE_SECRET_KEY']);
+
+try {
+    foreach ($buckaroo->getActiveSubscriptions() as $subscription) {
+        $availableCurrencies = implode(",", $subscription['currencies']);
+        echo "serviceCode: " . $subscription['serviceCode'] . "\n";
+        echo  "- available currencies: " . $availableCurrencies . "\n";
+    }
+} catch (\Throwable $th) {
+    var_dump($th);
+}

example/transactions/externalPayment.php

@@ -0,0 +1,19 @@
+<?php
+
+require_once __DIR__.'/../bootstrap.php';
+
+use Buckaroo\BuckarooClient;
+
+$buckaroo = new BuckarooClient($_ENV['BPE_WEBSITE_KEY'], $_ENV['BPE_SECRET_KEY']);
+
+$response = $buckaroo->method('externalPayment')->pay([
+    'invoice' => uniqid(),
+    'amountDebit' => 10.10,
+    'channel' => 'BackOffice'
+]);
+
+$buckaroo->method('externalPayment')->refund([
+    'amountCredit' => 10,
+    'invoice' => 'testinvoice 123',
+    'originalTransactionKey' => $response->getTransactionKey(),
+]);

src/BuckarooClient.php

@@ -27,6 +27,7 @@
 use Buckaroo\Handlers\Logging\Observer as LoggingObserver;
 use Buckaroo\PaymentMethods\BatchTransactions;
 use Buckaroo\PaymentMethods\PaymentFacade;
+use Buckaroo\Services\ActiveSubscriptions;
 use Buckaroo\Services\TransactionService;
 use Buckaroo\Transaction\Client;
 
@@ -73,6 +74,12 @@ public function method(string $method = null): PaymentFacade
         return new PaymentFacade($this->client, $method);
     }
 
+
+    public function getActiveSubscriptions(): array
+    {
+        return (new ActiveSubscriptions($this->client))->get();
+    }
+
     /**
      * @param array $transactions
      * @return BatchTransactions

src/PaymentMethods/ExternalPayment/ExternalPayment.php

@@ -0,0 +1,30 @@
+<?php
+/*
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the MIT License
+ * It is available through the world-wide-web at this URL:
+ * https://tldrlegal.com/license/mit-license
+ * If you are unable to obtain it through the world-wide-web, please send an email
+ * to support@buckaroo.nl so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please contact support@buckaroo.nl for more information.
+ *
+ * @copyright Copyright (c) Buckaroo B.V.
+ * @license   https://tldrlegal.com/license/mit-license
+ */
+
+declare(strict_types=1);
+
+namespace Buckaroo\PaymentMethods\ExternalPayment;
+
+use Buckaroo\PaymentMethods\PayablePaymentMethod;
+
+class ExternalPayment extends PayablePaymentMethod
+{
+    protected string $paymentName = 'ExternalPayment';
+}

src/PaymentMethods/PaymentMethodFactory.php

@@ -20,51 +20,52 @@
 
 namespace Buckaroo\PaymentMethods;
 
+use Buckaroo\Transaction\Client;
+use Buckaroo\PaymentMethods\EPS\EPS;
+use Buckaroo\PaymentMethods\In3\In3;
+use Buckaroo\PaymentMethods\KBC\KBC;
+use Buckaroo\PaymentMethods\iDin\iDin;
+use Buckaroo\PaymentMethods\SEPA\SEPA;
+use Buckaroo\PaymentMethods\iDeal\iDeal;
+use Buckaroo\PaymentMethods\MBWay\MBWay;
+use Buckaroo\PaymentMethods\Tinka\Tinka;
 use Buckaroo\Exceptions\BuckarooException;
-use Buckaroo\PaymentMethods\Afterpay\Afterpay;
-use Buckaroo\PaymentMethods\AfterpayDigiAccept\AfterpayDigiAccept;
 use Buckaroo\PaymentMethods\Alipay\Alipay;
-use Buckaroo\PaymentMethods\ApplePay\ApplePay;
-use Buckaroo\PaymentMethods\Bancontact\Bancontact;
-use Buckaroo\PaymentMethods\BankTransfer\BankTransfer;
+use Buckaroo\PaymentMethods\In3Old\In3Old;
+use Buckaroo\PaymentMethods\Paypal\Paypal;
+use Buckaroo\PaymentMethods\Sofort\Sofort;
+use Buckaroo\PaymentMethods\Thunes\Thunes;
 use Buckaroo\PaymentMethods\Belfius\Belfius;
 use Buckaroo\PaymentMethods\Billink\Billink;
-use Buckaroo\PaymentMethods\BuckarooVoucher\BuckarooVoucher;
-use Buckaroo\PaymentMethods\BuckarooWallet\BuckarooWallet;
-use Buckaroo\PaymentMethods\CreditCard\CreditCard;
-use Buckaroo\PaymentMethods\CreditClick\CreditClick;
-use Buckaroo\PaymentMethods\CreditManagement\CreditManagement;
-use Buckaroo\PaymentMethods\Emandates\Emandates;
-use Buckaroo\PaymentMethods\EPS\EPS;
-use Buckaroo\PaymentMethods\MBWay\MBWay;
-use Buckaroo\PaymentMethods\GiftCard\GiftCard;
 use Buckaroo\PaymentMethods\Giropay\Giropay;
-use Buckaroo\PaymentMethods\iDeal\iDeal;
 use Buckaroo\PaymentMethods\iDealQR\iDealQR;
-use Buckaroo\PaymentMethods\iDin\iDin;
-use Buckaroo\PaymentMethods\In3\In3;
-use Buckaroo\PaymentMethods\In3Old\In3Old;
-use Buckaroo\PaymentMethods\KBC\KBC;
+use Buckaroo\PaymentMethods\Surepay\Surepay;
+use Buckaroo\PaymentMethods\Trustly\Trustly;
+use Buckaroo\PaymentMethods\Afterpay\Afterpay;
+use Buckaroo\PaymentMethods\ApplePay\ApplePay;
+use Buckaroo\PaymentMethods\GiftCard\GiftCard;
 use Buckaroo\PaymentMethods\KlarnaKP\KlarnaKP;
+use Buckaroo\PaymentMethods\Payconiq\Payconiq;
+use Buckaroo\PaymentMethods\Emandates\Emandates;
 use Buckaroo\PaymentMethods\KlarnaPay\KlarnaPay;
-use Buckaroo\PaymentMethods\Marketplaces\Marketplaces;
+use Buckaroo\PaymentMethods\WeChatPay\WeChatPay;
+use Buckaroo\PaymentMethods\Bancontact\Bancontact;
+use Buckaroo\PaymentMethods\CreditCard\CreditCard;
 use Buckaroo\PaymentMethods\Multibanco\Multibanco;
-use Buckaroo\PaymentMethods\NoServiceSpecifiedPayment\NoServiceSpecifiedPayment;
-use Buckaroo\PaymentMethods\Payconiq\Payconiq;
-use Buckaroo\PaymentMethods\PaymentInitiation\PaymentInitiation;
-use Buckaroo\PaymentMethods\Paypal\Paypal;
+use Buckaroo\PaymentMethods\Przelewy24\Przelewy24;
+use Buckaroo\PaymentMethods\CreditClick\CreditClick;
 use Buckaroo\PaymentMethods\PayPerEmail\PayPerEmail;
 use Buckaroo\PaymentMethods\PointOfSale\PointOfSale;
-use Buckaroo\PaymentMethods\Przelewy24\Przelewy24;
-use Buckaroo\PaymentMethods\SEPA\SEPA;
-use Buckaroo\PaymentMethods\Sofort\Sofort;
+use Buckaroo\PaymentMethods\BankTransfer\BankTransfer;
+use Buckaroo\PaymentMethods\Marketplaces\Marketplaces;
 use Buckaroo\PaymentMethods\Subscriptions\Subscriptions;
-use Buckaroo\PaymentMethods\Surepay\Surepay;
-use Buckaroo\PaymentMethods\Thunes\Thunes;
-use Buckaroo\PaymentMethods\Tinka\Tinka;
-use Buckaroo\PaymentMethods\Trustly\Trustly;
-use Buckaroo\PaymentMethods\WeChatPay\WeChatPay;
-use Buckaroo\Transaction\Client;
+use Buckaroo\PaymentMethods\BuckarooWallet\BuckarooWallet;
+use Buckaroo\PaymentMethods\BuckarooVoucher\BuckarooVoucher;
+use Buckaroo\PaymentMethods\ExternalPayment\ExternalPayment;
+use Buckaroo\PaymentMethods\CreditManagement\CreditManagement;
+use Buckaroo\PaymentMethods\PaymentInitiation\PaymentInitiation;
+use Buckaroo\PaymentMethods\AfterpayDigiAccept\AfterpayDigiAccept;
+use Buckaroo\PaymentMethods\NoServiceSpecifiedPayment\NoServiceSpecifiedPayment;
 
 class PaymentMethodFactory
 {
@@ -107,6 +108,7 @@ class PaymentMethodFactory
         PayPerEmail::class => ['payperemail'],
         PaymentInitiation::class => ['paymentinitiation','paybybank'],
         EPS::class => ['eps'],
+        ExternalPayment::class => ['externalpayment'],
         Emandates::class => ['emandates'],
         Sofort::class => ['sofort', 'sofortueberweisung'],
         Tinka::class => ['tinka'],

src/Services/ActiveSubscriptions.php

@@ -0,0 +1,120 @@
+<?php
+/*
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the MIT License
+ * It is available through the world-wide-web at this URL:
+ * https://tldrlegal.com/license/mit-license
+ * If you are unable to obtain it through the world-wide-web, please send an email
+ * to support@buckaroo.nl so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade this module to newer
+ * versions in the future. If you wish to customize this module for your
+ * needs please contact support@buckaroo.nl for more information.
+ *
+ * @copyright Copyright (c) Buckaroo B.V.
+ * @license   https://tldrlegal.com/license/mit-license
+ */
+
+namespace Buckaroo\Services;
+
+use Exception;
+use SimpleXMLElement;
+use Buckaroo\Models\ServiceList;
+use Buckaroo\Transaction\Client;
+use Buckaroo\Transaction\Request\TransactionRequest;
+
+class ActiveSubscriptions
+{
+
+    private const SERVICE_CODE_AND_ACTION = 'GetActiveSubscriptions';
+
+    private const VERSION_ZERO = 0;
+
+    private const SERVICE_PARAM_KEY = 'activesubscriptions';
+
+    private Client $client;
+
+    public function __construct(Client $client)
+    {
+        $this->client = $client;
+    }
+
+    public function get(): array
+    {
+        try {
+            $xmlString = $this->client
+                ->dataRequest($this->buildTransaction())
+                ->getServiceParameters()[self::SERVICE_PARAM_KEY] ?? null;
+
+            if (!is_string($xmlString)) {
+                return [];
+            }
+
+            $xml = new SimpleXMLElement($xmlString, LIBXML_NOCDATA);
+
+            return $this->format(
+                $xml->xpath('/ArrayOfServiceCurrencies/ServiceCurrencies')
+            );
+        } catch (Exception $e) {
+            return [];
+        }
+    }
+
+    private function buildTransaction(): TransactionRequest
+    {
+        $transaction = new TransactionRequest();
+
+        $transaction
+            ->getServices()
+            ->pushServiceList(
+                new ServiceList(
+                    self::SERVICE_CODE_AND_ACTION,
+                    self::VERSION_ZERO,
+                    self::SERVICE_CODE_AND_ACTION
+                )
+            );
+        return $transaction;
+    }
+
+    private function format($data): array
+    {
+        $decoded =  json_decode(json_encode($data), true);
+        if (!is_array($decoded)) {
+            return [];
+        }
+
+        $formated = [];
+        foreach ($decoded as $subscription) {
+            $formatedSubscription = [];
+            foreach ($subscription as $key => $subscriptionData) {
+                $camelKey = lcfirst($key);
+                $formatedSubscription[$camelKey] = $this->formatValue($camelKey, $subscriptionData);
+            }
+            $formated[] = $formatedSubscription;
+        }
+        return $formated;
+    }
+
+    /**
+     * Format value for currency
+     *
+     * @param string $key
+     * @param string|array $value
+     *
+     * @return string|array
+     */
+    private function formatValue($key, $value)
+    {
+        if ($key === 'currencies') {
+            $value = $value["string"];
+            if (is_string($value)) {
+                $value = [$value];
+            }
+        }
+
+        return $value;
+    }
+}

src/Transaction/Client.php

@@ -31,7 +31,7 @@
 use Buckaroo\Services\TransactionHeaders\DefaultHeader;
 use Buckaroo\Services\TransactionHeaders\HmacHeader;
 use Buckaroo\Services\TransactionHeaders\SoftwareHeader;
-use Buckaroo\Transaction\Request\HttpClient\HttpClientGuzzle;
+use Buckaroo\Transaction\Request\HttpClient\HttpClientFactory;
 use Buckaroo\Transaction\Request\HttpClient\HttpClientInterface;
 use Buckaroo\Transaction\Request\Request;
 use Buckaroo\Transaction\Response\Response;
@@ -43,7 +43,7 @@ class Client
     private const METHOD_POST = 'POST';
 
     /**
-     * @var HttpClientInterface|HttpClientGuzzle
+     * @var HttpClientInterface
      */
     protected HttpClientInterface $httpClient;
     /**
@@ -61,7 +61,7 @@ class Client
     public function __construct(?Config $config)
     {
         $this->config = $config;
-        $this->httpClient = new HttpClientGuzzle($config->getLogger());
+        $this->httpClient = HttpClientFactory::createClient($config->getLogger());
     }
 
     /**