From 0ac3bdb97647841a668e920f7b26eefa36035ea7 Mon Sep 17 00:00:00 2001 From: Halil Beycan <50718965+BeycanDeveloper@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:26:21 +0800 Subject: [PATCH] updated integrator --- composer.json | 2 +- composer.lock | 14 ++++---- .../cryptopay-integrator/composer.json | 2 +- .../cryptopay-integrator/src/Helpers.php | 34 +++++++++++++++---- .../cryptopay-integrator/views/pay.php | 4 +-- vendor/composer/installed.json | 14 ++++---- vendor/composer/installed.php | 10 +++--- 7 files changed, 51 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index accbc84..e43d850 100644 --- a/composer.json +++ b/composer.json @@ -10,6 +10,6 @@ } }, "require": { - "beycanpress/cryptopay-integrator": "^0.1.5" + "beycanpress/cryptopay-integrator": "^0.1.7" } } diff --git a/composer.lock b/composer.lock index 4034c88..8d7379b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1fe4f2337dedacb4e5c49da7935e6767", + "content-hash": "ea4fb6dbbc3bf32fb0381da9977d80f5", "packages": [ { "name": "beycanpress/cryptopay-integrator", - "version": "0.1.5", + "version": "0.1.7", "source": { "type": "git", "url": "https://github.com/BeycanPress/cryptopay-integrator.git", - "reference": "3e09b41450580cf9591b52f9e4f73bbce0970637" + "reference": "94c4b4a91b304bfbb8a2c430cc5f0c141143a30e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BeycanPress/cryptopay-integrator/zipball/3e09b41450580cf9591b52f9e4f73bbce0970637", - "reference": "3e09b41450580cf9591b52f9e4f73bbce0970637", + "url": "https://api.github.com/repos/BeycanPress/cryptopay-integrator/zipball/94c4b4a91b304bfbb8a2c430cc5f0c141143a30e", + "reference": "94c4b4a91b304bfbb8a2c430cc5f0c141143a30e", "shasum": "" }, "require": { @@ -37,9 +37,9 @@ "homepage": "https://github.com/BeycanPress/cryptopay-integrator", "support": { "issues": "https://github.com/BeycanPress/cryptopay-integrator/issues", - "source": "https://github.com/BeycanPress/cryptopay-integrator/tree/0.1.5" + "source": "https://github.com/BeycanPress/cryptopay-integrator/tree/0.1.7" }, - "time": "2024-03-06T14:42:16+00:00" + "time": "2024-03-08T03:17:38+00:00" } ], "packages-dev": [], diff --git a/vendor/beycanpress/cryptopay-integrator/composer.json b/vendor/beycanpress/cryptopay-integrator/composer.json index d47b670..39d9d7b 100644 --- a/vendor/beycanpress/cryptopay-integrator/composer.json +++ b/vendor/beycanpress/cryptopay-integrator/composer.json @@ -1,6 +1,6 @@ { "name": "beycanpress/cryptopay-integrator", - "version": "0.1.5", + "version": "0.1.7", "description": "CryptoPay and CryptoPay Lite integration wrapper", "type": "library", "license": "MIT", diff --git a/vendor/beycanpress/cryptopay-integrator/src/Helpers.php b/vendor/beycanpress/cryptopay-integrator/src/Helpers.php index 46137bd..5430a47 100644 --- a/vendor/beycanpress/cryptopay-integrator/src/Helpers.php +++ b/vendor/beycanpress/cryptopay-integrator/src/Helpers.php @@ -11,6 +11,7 @@ use BeycanPress\CryptoPay\Pages\TransactionPage; use BeycanPress\CryptoPay\Types\Order\OrderType; use BeycanPress\CryptoPay\PluginHero\Http\Response; +use BeycanPress\CryptoPay\Types\Transaction\ParamsType; // Lite use BeycanPress\CryptoPayLite\Loader as LiteLoader; use BeycanPress\CryptoPayLite\Payment as LitePayment; @@ -19,6 +20,7 @@ use BeycanPress\CryptoPayLite\Types\Order\OrderType as LiteOrderType; use BeycanPress\CryptoPayLite\PluginHero\Http\Response as LiteResponse; use BeycanPress\CryptoPayLite\Pages\TransactionPage as LiteTransactionPage; +use BeycanPress\CryptoPayLite\Types\Transaction\ParamsType as LiteParamsType; class Helpers { @@ -189,9 +191,13 @@ public static function listenSPP(): void if ($token && Session::has($token)) { extract(Session::get($token)); if (Type::PRO === $type) { - $cryptopay = self::createProPayment($addon, (array) $order); + $cryptopay = self::createProPayment($addon, (array) $order, [ + 'token' => $token + ]); } else { - $cryptopay = self::createLitePayment($addon, (array) $order); + $cryptopay = self::createLitePayment($addon, (array) $order, [ + 'token' => $token + ]); } require dirname(__DIR__) . '/views/pay.php'; exit; @@ -201,20 +207,36 @@ public static function listenSPP(): void /** * @param string $addon * @param array $order + * @param array $params * @return string */ - public static function createProPayment(string $addon, array $order): string + public static function createProPayment(string $addon, array $order, array $params = []): string { - return (new Payment($addon))->setOrder(OrderType::fromArray($order))->html(loading:true); + return (new Payment($addon)) + ->setOrder( + OrderType::fromArray($order) + ) + ->setParams( + ParamsType::fromArray($params) + ) + ->html(loading:true); } /** * @param string $addon * @param array $order + * @param array $params * @return string */ - public static function createLitePayment(string $addon, array $order): string + public static function createLitePayment(string $addon, array $order, array $params = []): string { - return (new LitePayment($addon))->setOrder(LiteOrderType::fromArray($order))->html(loading:true); + return (new LitePayment($addon)) + ->setOrder( + LiteOrderType::fromArray($order) + ) + ->setParams( + LiteParamsType::fromArray($params) + ) + ->html(loading:true); } } diff --git a/vendor/beycanpress/cryptopay-integrator/views/pay.php b/vendor/beycanpress/cryptopay-integrator/views/pay.php index 1da0dca..c29c948 100644 --- a/vendor/beycanpress/cryptopay-integrator/views/pay.php +++ b/vendor/beycanpress/cryptopay-integrator/views/pay.php @@ -73,8 +73,8 @@

:

- -

:

+ +

:

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 930c055..f3fc175 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,23 +2,23 @@ "packages": [ { "name": "beycanpress/cryptopay-integrator", - "version": "0.1.5", - "version_normalized": "0.1.5.0", + "version": "0.1.7", + "version_normalized": "0.1.7.0", "source": { "type": "git", "url": "https://github.com/BeycanPress/cryptopay-integrator.git", - "reference": "3e09b41450580cf9591b52f9e4f73bbce0970637" + "reference": "94c4b4a91b304bfbb8a2c430cc5f0c141143a30e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/BeycanPress/cryptopay-integrator/zipball/3e09b41450580cf9591b52f9e4f73bbce0970637", - "reference": "3e09b41450580cf9591b52f9e4f73bbce0970637", + "url": "https://api.github.com/repos/BeycanPress/cryptopay-integrator/zipball/94c4b4a91b304bfbb8a2c430cc5f0c141143a30e", + "reference": "94c4b4a91b304bfbb8a2c430cc5f0c141143a30e", "shasum": "" }, "require": { "php": ">=8.1" }, - "time": "2024-03-06T14:42:16+00:00", + "time": "2024-03-08T03:17:38+00:00", "type": "library", "installation-source": "dist", "autoload": { @@ -34,7 +34,7 @@ "homepage": "https://github.com/BeycanPress/cryptopay-integrator", "support": { "issues": "https://github.com/BeycanPress/cryptopay-integrator/issues", - "source": "https://github.com/BeycanPress/cryptopay-integrator/tree/0.1.5" + "source": "https://github.com/BeycanPress/cryptopay-integrator/tree/0.1.7" }, "install-path": "../beycanpress/cryptopay-integrator" } diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index f7301dc..d4a67e6 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => '__root__', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '4804bfaa6426a47e57cde9778e6a88f72b962b34', + 'reference' => '1dd7d699ec94d4b01a7bd684436952960da2c20c', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,16 +13,16 @@ '__root__' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => '4804bfaa6426a47e57cde9778e6a88f72b962b34', + 'reference' => '1dd7d699ec94d4b01a7bd684436952960da2c20c', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev_requirement' => false, ), 'beycanpress/cryptopay-integrator' => array( - 'pretty_version' => '0.1.5', - 'version' => '0.1.5.0', - 'reference' => '3e09b41450580cf9591b52f9e4f73bbce0970637', + 'pretty_version' => '0.1.7', + 'version' => '0.1.7.0', + 'reference' => '94c4b4a91b304bfbb8a2c430cc5f0c141143a30e', 'type' => 'library', 'install_path' => __DIR__ . '/../beycanpress/cryptopay-integrator', 'aliases' => array(),