Changeset 3030100
- Timestamp:
- 02/01/2024 01:25:35 PM (2 years ago)
- Location:
- multisafepay
- Files:
-
- 12 added
- 30 edited
- 1 copied
-
tags/6.2.1 (copied) (copied from multisafepay/trunk)
-
tags/6.2.1/assets/public/js/multisafepay-blocks (added)
-
tags/6.2.1/assets/public/js/multisafepay-blocks/build (added)
-
tags/6.2.1/assets/public/js/multisafepay-blocks/build/index.asset.php (added)
-
tags/6.2.1/assets/public/js/multisafepay-blocks/build/index.js (added)
-
tags/6.2.1/assets/public/js/multisafepay-payment-component.js (modified) (1 diff)
-
tags/6.2.1/multisafepay.php (modified) (3 diffs)
-
tags/6.2.1/readme.txt (modified) (3 diffs)
-
tags/6.2.1/src/Main.php (modified) (3 diffs)
-
tags/6.2.1/src/PaymentMethods/Base/BasePaymentMethod.php (modified) (2 diffs)
-
tags/6.2.1/src/PaymentMethods/Base/BasePaymentMethodBlocks.php (added)
-
tags/6.2.1/src/Utils/Hpos.php (modified) (1 diff)
-
tags/6.2.1/vendor/composer/installed.json (modified) (6 diffs)
-
tags/6.2.1/vendor/composer/installed.php (modified) (4 diffs)
-
tags/6.2.1/vendor/multisafepay/php-sdk/CHANGELOG.md (modified) (1 diff)
-
tags/6.2.1/vendor/multisafepay/php-sdk/composer.json (modified) (1 diff)
-
tags/6.2.1/vendor/multisafepay/php-sdk/src/Api/Transactions/OrderRequest.php (modified) (4 diffs)
-
tags/6.2.1/vendor/multisafepay/php-sdk/src/Api/Transactions/OrderRequest/Arguments/CustomInfo.php (added)
-
tags/6.2.1/vendor/multisafepay/php-sdk/src/Util/Version.php (modified) (1 diff)
-
tags/6.2.1/vendor/php-http/discovery/CHANGELOG.md (modified) (1 diff)
-
tags/6.2.1/vendor/php-http/discovery/README.md (modified) (1 diff)
-
tags/6.2.1/vendor/php-http/discovery/src/Strategy/CommonClassesStrategy.php (modified) (2 diffs)
-
trunk/assets/public/js/multisafepay-blocks (added)
-
trunk/assets/public/js/multisafepay-blocks/build (added)
-
trunk/assets/public/js/multisafepay-blocks/build/index.asset.php (added)
-
trunk/assets/public/js/multisafepay-blocks/build/index.js (added)
-
trunk/assets/public/js/multisafepay-payment-component.js (modified) (1 diff)
-
trunk/multisafepay.php (modified) (3 diffs)
-
trunk/readme.txt (modified) (3 diffs)
-
trunk/src/Main.php (modified) (3 diffs)
-
trunk/src/PaymentMethods/Base/BasePaymentMethod.php (modified) (2 diffs)
-
trunk/src/PaymentMethods/Base/BasePaymentMethodBlocks.php (added)
-
trunk/src/Utils/Hpos.php (modified) (1 diff)
-
trunk/vendor/composer/installed.json (modified) (6 diffs)
-
trunk/vendor/composer/installed.php (modified) (4 diffs)
-
trunk/vendor/multisafepay/php-sdk/CHANGELOG.md (modified) (1 diff)
-
trunk/vendor/multisafepay/php-sdk/composer.json (modified) (1 diff)
-
trunk/vendor/multisafepay/php-sdk/src/Api/Transactions/OrderRequest.php (modified) (4 diffs)
-
trunk/vendor/multisafepay/php-sdk/src/Api/Transactions/OrderRequest/Arguments/CustomInfo.php (added)
-
trunk/vendor/multisafepay/php-sdk/src/Util/Version.php (modified) (1 diff)
-
trunk/vendor/php-http/discovery/CHANGELOG.md (modified) (1 diff)
-
trunk/vendor/php-http/discovery/README.md (modified) (1 diff)
-
trunk/vendor/php-http/discovery/src/Strategy/CommonClassesStrategy.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
multisafepay/tags/6.2.1/assets/public/js/multisafepay-payment-component.js
r2981071 r3030100 216 216 } 217 217 218 reinit_payment_component() {219 this.init_payment_component();220 }221 222 218 logger( argument ) { 223 219 if ( this.config && this.config.debug ) { -
multisafepay/tags/6.2.1/multisafepay.php
r2995309 r3030100 5 5 * Plugin URI: https://docs.multisafepay.com/docs/woocommerce 6 6 * Description: MultiSafepay Payment Plugin 7 * Version: 6.2. 07 * Version: 6.2.1 8 8 * Author: MultiSafepay 9 9 * Author URI: https://www.multisafepay.com … … 12 12 * License URI: http://www.gnu.org/licenses/gpl-3.0.html 13 13 * Requires at least: 6.0 14 * Tested up to: 6.4. 114 * Tested up to: 6.4.3 15 15 * WC requires at least: 6.0.0 16 * WC tested up to: 8. 2.216 * WC tested up to: 8.5.2 17 17 * Requires PHP: 7.3 18 18 * Text Domain: multisafepay … … 27 27 * Plugin version 28 28 */ 29 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.2. 0' );29 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.2.1' ); 30 30 31 31 /** -
multisafepay/tags/6.2.1/readme.txt
r2995309 r3030100 3 3 Tags: multisafepay, credit card, credit cards, gateway, payments, woocommerce, ideal, bancontact, klarna, sofort, giropay, sepa direct debit 4 4 Requires at least: 6.0 5 Tested up to: 6.4. 15 Tested up to: 6.4.3 6 6 Requires PHP: 7.3 7 Stable tag: 6.2. 07 Stable tag: 6.2.1 8 8 License: MIT 9 9 … … 128 128 == Upgrade Notice == 129 129 130 = 6.2. 0=130 = 6.2.1 = 131 131 6.x.x is a major upgrade in which the MultiSafepay payment methods are registered dynamically via an API request to MultiSafepay. If you are upgrading from 5.X.X version, after the upgrade, please navigate to the MultiSafepay settings page, and to each one of the payment methods enabled in your account, and confirm the settings in each section are set up according to your preferences. 132 132 … … 144 144 145 145 == Changelog == 146 = Release Notes - WooCommerce 6.2.1 (Feb 1st, 2024) = 147 148 ### Fixed 149 + PLGWOOS-902: Support for WooCommerce Checkout Blocks for redirect payment methods 150 + PLGWOOS-901: Remove duplicated method reinit_payment_component() 151 146 152 = Release Notes - WooCommerce 6.2.0 (Nov 13th, 2023) = 147 153 -
multisafepay/tags/6.2.1/src/Main.php
r2995309 r3030100 3 3 namespace MultiSafepay\WooCommerce; 4 4 5 use MultiSafepay\WooCommerce\PaymentMethods\Base\BasePaymentMethodBlocks; 5 6 use MultiSafepay\WooCommerce\PaymentMethods\PaymentMethods; 6 7 use MultiSafepay\WooCommerce\PaymentMethods\PaymentMethodsController; … … 39 40 $this->define_compatibilities(); 40 41 } 42 43 /** 44 * Register the MultiSafepay payment methods in WooCommerce Blocks. 45 * 46 * @return void 47 */ 48 public static function register_multisafepay_payment_methods_blocks(): void { 49 if ( class_exists( \Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry::class ) ) { 50 add_action( 51 'woocommerce_blocks_payment_method_type_registration', 52 function ( \Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) { 53 $payment_method_registry->register( new BasePaymentMethodBlocks() ); 54 } 55 ); 56 } 57 } 41 58 42 59 /** … … 146 163 $this->loader->add_action( 'wp_ajax_get_payment_component_arguments', $payment_component_service, 'ajax_get_payment_component_arguments' ); 147 164 $this->loader->add_action( 'wp_ajax_nopriv_get_payment_component_arguments', $payment_component_service, 'ajax_get_payment_component_arguments' ); 165 // Register the MultiSafepay payment methods in WooCommerce Blocks. 166 add_action( 'woocommerce_blocks_loaded', array( $this, 'register_multisafepay_payment_methods_blocks' ) ); 148 167 } 149 168 -
multisafepay/tags/6.2.1/src/PaymentMethods/Base/BasePaymentMethod.php
r2981071 r3030100 249 249 250 250 /** 251 * Check if woocommerce checkout block is active. 252 * 253 * @return bool 254 */ 255 private function is_woocommerce_checkout_block_active(): bool { 256 global $post; 257 258 if ( $post && has_blocks( $post->post_content ) ) { 259 $blocks = parse_blocks( $post->post_content ); 260 foreach ( $blocks as $block ) { 261 if ( 'woocommerce/checkout' === $block['blockName'] ) { 262 return true; 263 } 264 } 265 } 266 return false; 267 } 268 269 /** 251 270 * Enqueue Javascript related with a MultiSafepay Payment Method. 252 271 * … … 256 275 if ( is_checkout() || is_wc_endpoint_url( 'order-pay' ) ) { 257 276 258 if ( 'APPLEPAY' === $this->get_payment_method_gateway_code() ) {277 if ( 'APPLEPAY' === $this->get_payment_method_gateway_code() && ! $this->is_woocommerce_checkout_block_active() ) { 259 278 wp_enqueue_script( 'multisafepay-apple-pay-js', MULTISAFEPAY_PLUGIN_URL . '/assets/public/js/multisafepay-apple-pay.js', array( 'jquery' ), MULTISAFEPAY_PLUGIN_VERSION, true ); 260 279 } -
multisafepay/tags/6.2.1/src/Utils/Hpos.php
r2995309 r3030100 9 9 * 10 10 * @package MultiSafepay\WooCommerce\Utils 11 * @since 6.2.012 11 */ 13 12 class Hpos { -
multisafepay/tags/6.2.1/vendor/composer/installed.json
r2995309 r3030100 3 3 { 4 4 "name": "multisafepay/php-sdk", 5 "version": "5.1 1.2",6 "version_normalized": "5.1 1.2.0",5 "version": "5.12.0", 6 "version_normalized": "5.12.0.0", 7 7 "source": { 8 8 "type": "git", 9 9 "url": "https://github.com/MultiSafepay/php-sdk.git", 10 "reference": " 16a7cead65c0d34c7b8e8be4fd002bae5fa3a60f"11 }, 12 "dist": { 13 "type": "zip", 14 "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/ 16a7cead65c0d34c7b8e8be4fd002bae5fa3a60f",15 "reference": " 16a7cead65c0d34c7b8e8be4fd002bae5fa3a60f",10 "reference": "9891e4a29bb59ff3204a1091e6ba1da28ad025f2" 11 }, 12 "dist": { 13 "type": "zip", 14 "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/9891e4a29bb59ff3204a1091e6ba1da28ad025f2", 15 "reference": "9891e4a29bb59ff3204a1091e6ba1da28ad025f2", 16 16 "shasum": "" 17 17 }, … … 38 38 "jschaedl/iban-validation": "Adds additional IBAN validation for \\MultiSafepay\\ValueObject\\IbanNumber" 39 39 }, 40 "time": "2023-1 0-13T14:29:27+00:00",40 "time": "2023-12-01T09:55:42+00:00", 41 41 "type": "library", 42 42 "installation-source": "dist", … … 53 53 "support": { 54 54 "issues": "https://github.com/MultiSafepay/php-sdk/issues", 55 "source": "https://github.com/MultiSafepay/php-sdk/tree/5.1 1.2"55 "source": "https://github.com/MultiSafepay/php-sdk/tree/5.12.0" 56 56 }, 57 57 "install-path": "../multisafepay/php-sdk" … … 140 140 { 141 141 "name": "php-http/discovery", 142 "version": "1.19. 1",143 "version_normalized": "1.19. 1.0",142 "version": "1.19.2", 143 "version_normalized": "1.19.2.0", 144 144 "source": { 145 145 "type": "git", 146 146 "url": "https://github.com/php-http/discovery.git", 147 "reference": " 57f3de01d32085fea20865f9b16fb0e69347c39e"148 }, 149 "dist": { 150 "type": "zip", 151 "url": "https://api.github.com/repos/php-http/discovery/zipball/ 57f3de01d32085fea20865f9b16fb0e69347c39e",152 "reference": " 57f3de01d32085fea20865f9b16fb0e69347c39e",147 "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb" 148 }, 149 "dist": { 150 "type": "zip", 151 "url": "https://api.github.com/repos/php-http/discovery/zipball/61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb", 152 "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb", 153 153 "shasum": "" 154 154 }, … … 176 176 "symfony/phpunit-bridge": "^6.2" 177 177 }, 178 "time": "2023- 07-11T07:02:26+00:00",178 "time": "2023-11-30T16:49:05+00:00", 179 179 "type": "composer-plugin", 180 180 "extra": { … … 215 215 "support": { 216 216 "issues": "https://github.com/php-http/discovery/issues", 217 "source": "https://github.com/php-http/discovery/tree/1.19. 1"217 "source": "https://github.com/php-http/discovery/tree/1.19.2" 218 218 }, 219 219 "install-path": "../php-http/discovery" -
multisafepay/tags/6.2.1/vendor/composer/installed.php
r2995309 r3030100 2 2 'root' => array( 3 3 'name' => 'multisafepay/woocommerce', 4 'pretty_version' => '6.2. 0',5 'version' => '6.2. 0.0',6 'reference' => ' 0cd97a2041ea998b282fe44d7f7766c90634842f',4 'pretty_version' => '6.2.1', 5 'version' => '6.2.1.0', 6 'reference' => 'f5470613068b67f6b1a040e88f727d8d179b7bfe', 7 7 'type' => 'wordpress-plugin', 8 8 'install_path' => __DIR__ . '/../../', … … 12 12 'versions' => array( 13 13 'multisafepay/php-sdk' => array( 14 'pretty_version' => '5.1 1.2',15 'version' => '5.1 1.2.0',16 'reference' => ' 16a7cead65c0d34c7b8e8be4fd002bae5fa3a60f',14 'pretty_version' => '5.12.0', 15 'version' => '5.12.0.0', 16 'reference' => '9891e4a29bb59ff3204a1091e6ba1da28ad025f2', 17 17 'type' => 'library', 18 18 'install_path' => __DIR__ . '/../multisafepay/php-sdk', … … 21 21 ), 22 22 'multisafepay/woocommerce' => array( 23 'pretty_version' => '6.2. 0',24 'version' => '6.2. 0.0',25 'reference' => ' 0cd97a2041ea998b282fe44d7f7766c90634842f',23 'pretty_version' => '6.2.1', 24 'version' => '6.2.1.0', 25 'reference' => 'f5470613068b67f6b1a040e88f727d8d179b7bfe', 26 26 'type' => 'wordpress-plugin', 27 27 'install_path' => __DIR__ . '/../../', … … 51 51 ), 52 52 'php-http/discovery' => array( 53 'pretty_version' => '1.19. 1',54 'version' => '1.19. 1.0',55 'reference' => ' 57f3de01d32085fea20865f9b16fb0e69347c39e',53 'pretty_version' => '1.19.2', 54 'version' => '1.19.2.0', 55 'reference' => '61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb', 56 56 'type' => 'composer-plugin', 57 57 'install_path' => __DIR__ . '/../php-http/discovery', -
multisafepay/tags/6.2.1/vendor/multisafepay/php-sdk/CHANGELOG.md
r2979525 r3030100 6 6 7 7 ## [Unreleased] 8 9 ## [5.12.0] - 2023-12-01 10 ### Added 11 + PHPSDK-139: Add support to set var1, var2 and var3, within the OrderRequest object 12 + PHPSDK-140: Add support to set custom_info, within the OrderRequest object, thanks to @DaanDeSmedt 8 13 9 14 ## [5.11.2] - 2023-10-13 -
multisafepay/tags/6.2.1/vendor/multisafepay/php-sdk/composer.json
r2979525 r3030100 4 4 "type": "library", 5 5 "license": "MIT", 6 "version": "5.1 1.2",6 "version": "5.12.0", 7 7 "require": { 8 8 "php": "^7.2|^8.0", -
multisafepay/tags/6.2.1/vendor/multisafepay/php-sdk/src/Api/Transactions/OrderRequest.php
r2979525 r3030100 11 11 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\CheckoutOptions; 12 12 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\CustomerDetails; 13 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\CustomInfo; 13 14 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\Description; 14 15 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\GatewayInfoInterface; … … 132 133 133 134 /** 135 * @var CustomInfo 136 */ 137 private $customInfo; 138 139 /** 140 * @var string 141 */ 142 private $var1; 143 144 /** 145 * @var string 146 */ 147 private $var2; 148 149 /** 150 * @var string 151 */ 152 private $var3; 153 154 /** 134 155 * @param string $type 135 156 * @return OrderRequest … … 432 453 $this->daysActive = $days; 433 454 return $this; 455 } 456 457 /** 458 * @param CustomInfo $customInfo 459 * @return OrderRequest 460 */ 461 public function addCustomInfo(CustomInfo $customInfo): OrderRequest 462 { 463 $this->customInfo = $customInfo; 464 return $this; 465 } 466 467 /** 468 * @param string $var1 469 * @return OrderRequest 470 */ 471 public function addVar1(string $var1): OrderRequest 472 { 473 $this->var1 = $var1; 474 return $this; 475 } 476 477 /** 478 * @param string $var2 479 * @return OrderRequest 480 */ 481 public function addVar2(string $var2): OrderRequest 482 { 483 $this->var2 = $var2; 484 return $this; 485 } 486 487 /** 488 * @param string $var3 489 * @return OrderRequest 490 */ 491 public function addVar3(string $var3): OrderRequest 492 { 493 $this->var3 = $var3; 494 return $this; 495 } 496 497 /** 498 * @return string|null 499 */ 500 public function getVar1(): ?string 501 { 502 return $this->var1; 503 } 504 505 /** 506 * @return string|null 507 */ 508 public function getVar2(): ?string 509 { 510 return $this->var2; 511 } 512 513 /** 514 * @return string|null 515 */ 516 public function getVar3(): ?string 517 { 518 return $this->var3; 434 519 } 435 520 … … 460 545 'seconds_active' => $this->secondsActive, 461 546 'plugin' => $this->pluginDetails ? $this->pluginDetails->getData() : null, 547 'custom_info' => ($this->customInfo) ? $this->customInfo->getData() : null, 548 'var1' => $this->getVar1(), 549 'var2' => $this->getVar2(), 550 'var3' => $this->getVar3(), 462 551 ]; 463 552 -
multisafepay/tags/6.2.1/vendor/multisafepay/php-sdk/src/Util/Version.php
r2979525 r3030100 18 18 class Version 19 19 { 20 public const SDK_VERSION = '5.1 1.2';20 public const SDK_VERSION = '5.12.0'; 21 21 22 22 /** -
multisafepay/tags/6.2.1/vendor/php-http/discovery/CHANGELOG.md
r2951435 r3030100 1 1 # Change Log 2 3 ## 1.19.2 - 2023-11-30 4 5 - [#253](https://github.com/php-http/discovery/pull/253) - Symfony 7 dropped the deprecated PHP-HTTP `HttpClient` interface from their HTTP client, do not discover the version 7 client when lookig for the old interface. 2 6 3 7 ## 1.19.1 - 2023-07-11 -
multisafepay/tags/6.2.1/vendor/php-http/discovery/README.md
r2951435 r3030100 3 3 [](https://github.com/php-http/discovery/releases) 4 4 [](LICENSE) 5 [](https://github.com/php-http/discovery/actions/workflows/ci.yml?query=branch%3Amaster)5 [](https://github.com/php-http/discovery/actions/workflows/ci.yml?query=branch%3A1.x) 6 6 [](https://scrutinizer-ci.com/g/php-http/discovery) 7 7 [](https://scrutinizer-ci.com/g/php-http/discovery) -
multisafepay/tags/6.2.1/vendor/php-http/discovery/src/Strategy/CommonClassesStrategy.php
r2951435 r3030100 79 79 ], 80 80 HttpClient::class => [ 81 ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, [self::class, 'isPsr17FactoryInstalled'] ]],81 ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, [self::class, 'isPsr17FactoryInstalled'], [self::class, 'isSymfonyImplementingHttpClient']]], 82 82 ['class' => Guzzle7::class, 'condition' => Guzzle7::class], 83 83 ['class' => Guzzle6::class, 'condition' => Guzzle6::class], … … 159 159 } 160 160 161 public static function isSymfonyImplementingHttpClient() 162 { 163 return is_subclass_of(SymfonyHttplug::class, HttpClient::class); 164 } 165 161 166 /** 162 167 * Can be used as a condition. -
multisafepay/trunk/assets/public/js/multisafepay-payment-component.js
r2981071 r3030100 216 216 } 217 217 218 reinit_payment_component() {219 this.init_payment_component();220 }221 222 218 logger( argument ) { 223 219 if ( this.config && this.config.debug ) { -
multisafepay/trunk/multisafepay.php
r2995309 r3030100 5 5 * Plugin URI: https://docs.multisafepay.com/docs/woocommerce 6 6 * Description: MultiSafepay Payment Plugin 7 * Version: 6.2. 07 * Version: 6.2.1 8 8 * Author: MultiSafepay 9 9 * Author URI: https://www.multisafepay.com … … 12 12 * License URI: http://www.gnu.org/licenses/gpl-3.0.html 13 13 * Requires at least: 6.0 14 * Tested up to: 6.4. 114 * Tested up to: 6.4.3 15 15 * WC requires at least: 6.0.0 16 * WC tested up to: 8. 2.216 * WC tested up to: 8.5.2 17 17 * Requires PHP: 7.3 18 18 * Text Domain: multisafepay … … 27 27 * Plugin version 28 28 */ 29 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.2. 0' );29 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.2.1' ); 30 30 31 31 /** -
multisafepay/trunk/readme.txt
r2995309 r3030100 3 3 Tags: multisafepay, credit card, credit cards, gateway, payments, woocommerce, ideal, bancontact, klarna, sofort, giropay, sepa direct debit 4 4 Requires at least: 6.0 5 Tested up to: 6.4. 15 Tested up to: 6.4.3 6 6 Requires PHP: 7.3 7 Stable tag: 6.2. 07 Stable tag: 6.2.1 8 8 License: MIT 9 9 … … 128 128 == Upgrade Notice == 129 129 130 = 6.2. 0=130 = 6.2.1 = 131 131 6.x.x is a major upgrade in which the MultiSafepay payment methods are registered dynamically via an API request to MultiSafepay. If you are upgrading from 5.X.X version, after the upgrade, please navigate to the MultiSafepay settings page, and to each one of the payment methods enabled in your account, and confirm the settings in each section are set up according to your preferences. 132 132 … … 144 144 145 145 == Changelog == 146 = Release Notes - WooCommerce 6.2.1 (Feb 1st, 2024) = 147 148 ### Fixed 149 + PLGWOOS-902: Support for WooCommerce Checkout Blocks for redirect payment methods 150 + PLGWOOS-901: Remove duplicated method reinit_payment_component() 151 146 152 = Release Notes - WooCommerce 6.2.0 (Nov 13th, 2023) = 147 153 -
multisafepay/trunk/src/Main.php
r2995309 r3030100 3 3 namespace MultiSafepay\WooCommerce; 4 4 5 use MultiSafepay\WooCommerce\PaymentMethods\Base\BasePaymentMethodBlocks; 5 6 use MultiSafepay\WooCommerce\PaymentMethods\PaymentMethods; 6 7 use MultiSafepay\WooCommerce\PaymentMethods\PaymentMethodsController; … … 39 40 $this->define_compatibilities(); 40 41 } 42 43 /** 44 * Register the MultiSafepay payment methods in WooCommerce Blocks. 45 * 46 * @return void 47 */ 48 public static function register_multisafepay_payment_methods_blocks(): void { 49 if ( class_exists( \Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry::class ) ) { 50 add_action( 51 'woocommerce_blocks_payment_method_type_registration', 52 function ( \Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) { 53 $payment_method_registry->register( new BasePaymentMethodBlocks() ); 54 } 55 ); 56 } 57 } 41 58 42 59 /** … … 146 163 $this->loader->add_action( 'wp_ajax_get_payment_component_arguments', $payment_component_service, 'ajax_get_payment_component_arguments' ); 147 164 $this->loader->add_action( 'wp_ajax_nopriv_get_payment_component_arguments', $payment_component_service, 'ajax_get_payment_component_arguments' ); 165 // Register the MultiSafepay payment methods in WooCommerce Blocks. 166 add_action( 'woocommerce_blocks_loaded', array( $this, 'register_multisafepay_payment_methods_blocks' ) ); 148 167 } 149 168 -
multisafepay/trunk/src/PaymentMethods/Base/BasePaymentMethod.php
r2981071 r3030100 249 249 250 250 /** 251 * Check if woocommerce checkout block is active. 252 * 253 * @return bool 254 */ 255 private function is_woocommerce_checkout_block_active(): bool { 256 global $post; 257 258 if ( $post && has_blocks( $post->post_content ) ) { 259 $blocks = parse_blocks( $post->post_content ); 260 foreach ( $blocks as $block ) { 261 if ( 'woocommerce/checkout' === $block['blockName'] ) { 262 return true; 263 } 264 } 265 } 266 return false; 267 } 268 269 /** 251 270 * Enqueue Javascript related with a MultiSafepay Payment Method. 252 271 * … … 256 275 if ( is_checkout() || is_wc_endpoint_url( 'order-pay' ) ) { 257 276 258 if ( 'APPLEPAY' === $this->get_payment_method_gateway_code() ) {277 if ( 'APPLEPAY' === $this->get_payment_method_gateway_code() && ! $this->is_woocommerce_checkout_block_active() ) { 259 278 wp_enqueue_script( 'multisafepay-apple-pay-js', MULTISAFEPAY_PLUGIN_URL . '/assets/public/js/multisafepay-apple-pay.js', array( 'jquery' ), MULTISAFEPAY_PLUGIN_VERSION, true ); 260 279 } -
multisafepay/trunk/src/Utils/Hpos.php
r2995309 r3030100 9 9 * 10 10 * @package MultiSafepay\WooCommerce\Utils 11 * @since 6.2.012 11 */ 13 12 class Hpos { -
multisafepay/trunk/vendor/composer/installed.json
r2995309 r3030100 3 3 { 4 4 "name": "multisafepay/php-sdk", 5 "version": "5.1 1.2",6 "version_normalized": "5.1 1.2.0",5 "version": "5.12.0", 6 "version_normalized": "5.12.0.0", 7 7 "source": { 8 8 "type": "git", 9 9 "url": "https://github.com/MultiSafepay/php-sdk.git", 10 "reference": " 16a7cead65c0d34c7b8e8be4fd002bae5fa3a60f"11 }, 12 "dist": { 13 "type": "zip", 14 "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/ 16a7cead65c0d34c7b8e8be4fd002bae5fa3a60f",15 "reference": " 16a7cead65c0d34c7b8e8be4fd002bae5fa3a60f",10 "reference": "9891e4a29bb59ff3204a1091e6ba1da28ad025f2" 11 }, 12 "dist": { 13 "type": "zip", 14 "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/9891e4a29bb59ff3204a1091e6ba1da28ad025f2", 15 "reference": "9891e4a29bb59ff3204a1091e6ba1da28ad025f2", 16 16 "shasum": "" 17 17 }, … … 38 38 "jschaedl/iban-validation": "Adds additional IBAN validation for \\MultiSafepay\\ValueObject\\IbanNumber" 39 39 }, 40 "time": "2023-1 0-13T14:29:27+00:00",40 "time": "2023-12-01T09:55:42+00:00", 41 41 "type": "library", 42 42 "installation-source": "dist", … … 53 53 "support": { 54 54 "issues": "https://github.com/MultiSafepay/php-sdk/issues", 55 "source": "https://github.com/MultiSafepay/php-sdk/tree/5.1 1.2"55 "source": "https://github.com/MultiSafepay/php-sdk/tree/5.12.0" 56 56 }, 57 57 "install-path": "../multisafepay/php-sdk" … … 140 140 { 141 141 "name": "php-http/discovery", 142 "version": "1.19. 1",143 "version_normalized": "1.19. 1.0",142 "version": "1.19.2", 143 "version_normalized": "1.19.2.0", 144 144 "source": { 145 145 "type": "git", 146 146 "url": "https://github.com/php-http/discovery.git", 147 "reference": " 57f3de01d32085fea20865f9b16fb0e69347c39e"148 }, 149 "dist": { 150 "type": "zip", 151 "url": "https://api.github.com/repos/php-http/discovery/zipball/ 57f3de01d32085fea20865f9b16fb0e69347c39e",152 "reference": " 57f3de01d32085fea20865f9b16fb0e69347c39e",147 "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb" 148 }, 149 "dist": { 150 "type": "zip", 151 "url": "https://api.github.com/repos/php-http/discovery/zipball/61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb", 152 "reference": "61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb", 153 153 "shasum": "" 154 154 }, … … 176 176 "symfony/phpunit-bridge": "^6.2" 177 177 }, 178 "time": "2023- 07-11T07:02:26+00:00",178 "time": "2023-11-30T16:49:05+00:00", 179 179 "type": "composer-plugin", 180 180 "extra": { … … 215 215 "support": { 216 216 "issues": "https://github.com/php-http/discovery/issues", 217 "source": "https://github.com/php-http/discovery/tree/1.19. 1"217 "source": "https://github.com/php-http/discovery/tree/1.19.2" 218 218 }, 219 219 "install-path": "../php-http/discovery" -
multisafepay/trunk/vendor/composer/installed.php
r2995309 r3030100 2 2 'root' => array( 3 3 'name' => 'multisafepay/woocommerce', 4 'pretty_version' => '6.2. 0',5 'version' => '6.2. 0.0',6 'reference' => ' 0cd97a2041ea998b282fe44d7f7766c90634842f',4 'pretty_version' => '6.2.1', 5 'version' => '6.2.1.0', 6 'reference' => 'f5470613068b67f6b1a040e88f727d8d179b7bfe', 7 7 'type' => 'wordpress-plugin', 8 8 'install_path' => __DIR__ . '/../../', … … 12 12 'versions' => array( 13 13 'multisafepay/php-sdk' => array( 14 'pretty_version' => '5.1 1.2',15 'version' => '5.1 1.2.0',16 'reference' => ' 16a7cead65c0d34c7b8e8be4fd002bae5fa3a60f',14 'pretty_version' => '5.12.0', 15 'version' => '5.12.0.0', 16 'reference' => '9891e4a29bb59ff3204a1091e6ba1da28ad025f2', 17 17 'type' => 'library', 18 18 'install_path' => __DIR__ . '/../multisafepay/php-sdk', … … 21 21 ), 22 22 'multisafepay/woocommerce' => array( 23 'pretty_version' => '6.2. 0',24 'version' => '6.2. 0.0',25 'reference' => ' 0cd97a2041ea998b282fe44d7f7766c90634842f',23 'pretty_version' => '6.2.1', 24 'version' => '6.2.1.0', 25 'reference' => 'f5470613068b67f6b1a040e88f727d8d179b7bfe', 26 26 'type' => 'wordpress-plugin', 27 27 'install_path' => __DIR__ . '/../../', … … 51 51 ), 52 52 'php-http/discovery' => array( 53 'pretty_version' => '1.19. 1',54 'version' => '1.19. 1.0',55 'reference' => ' 57f3de01d32085fea20865f9b16fb0e69347c39e',53 'pretty_version' => '1.19.2', 54 'version' => '1.19.2.0', 55 'reference' => '61e1a1eb69c92741f5896d9e05fb8e9d7e8bb0cb', 56 56 'type' => 'composer-plugin', 57 57 'install_path' => __DIR__ . '/../php-http/discovery', -
multisafepay/trunk/vendor/multisafepay/php-sdk/CHANGELOG.md
r2979525 r3030100 6 6 7 7 ## [Unreleased] 8 9 ## [5.12.0] - 2023-12-01 10 ### Added 11 + PHPSDK-139: Add support to set var1, var2 and var3, within the OrderRequest object 12 + PHPSDK-140: Add support to set custom_info, within the OrderRequest object, thanks to @DaanDeSmedt 8 13 9 14 ## [5.11.2] - 2023-10-13 -
multisafepay/trunk/vendor/multisafepay/php-sdk/composer.json
r2979525 r3030100 4 4 "type": "library", 5 5 "license": "MIT", 6 "version": "5.1 1.2",6 "version": "5.12.0", 7 7 "require": { 8 8 "php": "^7.2|^8.0", -
multisafepay/trunk/vendor/multisafepay/php-sdk/src/Api/Transactions/OrderRequest.php
r2979525 r3030100 11 11 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\CheckoutOptions; 12 12 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\CustomerDetails; 13 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\CustomInfo; 13 14 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\Description; 14 15 use MultiSafepay\Api\Transactions\OrderRequest\Arguments\GatewayInfoInterface; … … 132 133 133 134 /** 135 * @var CustomInfo 136 */ 137 private $customInfo; 138 139 /** 140 * @var string 141 */ 142 private $var1; 143 144 /** 145 * @var string 146 */ 147 private $var2; 148 149 /** 150 * @var string 151 */ 152 private $var3; 153 154 /** 134 155 * @param string $type 135 156 * @return OrderRequest … … 432 453 $this->daysActive = $days; 433 454 return $this; 455 } 456 457 /** 458 * @param CustomInfo $customInfo 459 * @return OrderRequest 460 */ 461 public function addCustomInfo(CustomInfo $customInfo): OrderRequest 462 { 463 $this->customInfo = $customInfo; 464 return $this; 465 } 466 467 /** 468 * @param string $var1 469 * @return OrderRequest 470 */ 471 public function addVar1(string $var1): OrderRequest 472 { 473 $this->var1 = $var1; 474 return $this; 475 } 476 477 /** 478 * @param string $var2 479 * @return OrderRequest 480 */ 481 public function addVar2(string $var2): OrderRequest 482 { 483 $this->var2 = $var2; 484 return $this; 485 } 486 487 /** 488 * @param string $var3 489 * @return OrderRequest 490 */ 491 public function addVar3(string $var3): OrderRequest 492 { 493 $this->var3 = $var3; 494 return $this; 495 } 496 497 /** 498 * @return string|null 499 */ 500 public function getVar1(): ?string 501 { 502 return $this->var1; 503 } 504 505 /** 506 * @return string|null 507 */ 508 public function getVar2(): ?string 509 { 510 return $this->var2; 511 } 512 513 /** 514 * @return string|null 515 */ 516 public function getVar3(): ?string 517 { 518 return $this->var3; 434 519 } 435 520 … … 460 545 'seconds_active' => $this->secondsActive, 461 546 'plugin' => $this->pluginDetails ? $this->pluginDetails->getData() : null, 547 'custom_info' => ($this->customInfo) ? $this->customInfo->getData() : null, 548 'var1' => $this->getVar1(), 549 'var2' => $this->getVar2(), 550 'var3' => $this->getVar3(), 462 551 ]; 463 552 -
multisafepay/trunk/vendor/multisafepay/php-sdk/src/Util/Version.php
r2979525 r3030100 18 18 class Version 19 19 { 20 public const SDK_VERSION = '5.1 1.2';20 public const SDK_VERSION = '5.12.0'; 21 21 22 22 /** -
multisafepay/trunk/vendor/php-http/discovery/CHANGELOG.md
r2951435 r3030100 1 1 # Change Log 2 3 ## 1.19.2 - 2023-11-30 4 5 - [#253](https://github.com/php-http/discovery/pull/253) - Symfony 7 dropped the deprecated PHP-HTTP `HttpClient` interface from their HTTP client, do not discover the version 7 client when lookig for the old interface. 2 6 3 7 ## 1.19.1 - 2023-07-11 -
multisafepay/trunk/vendor/php-http/discovery/README.md
r2951435 r3030100 3 3 [](https://github.com/php-http/discovery/releases) 4 4 [](LICENSE) 5 [](https://github.com/php-http/discovery/actions/workflows/ci.yml?query=branch%3Amaster)5 [](https://github.com/php-http/discovery/actions/workflows/ci.yml?query=branch%3A1.x) 6 6 [](https://scrutinizer-ci.com/g/php-http/discovery) 7 7 [](https://scrutinizer-ci.com/g/php-http/discovery) -
multisafepay/trunk/vendor/php-http/discovery/src/Strategy/CommonClassesStrategy.php
r2951435 r3030100 79 79 ], 80 80 HttpClient::class => [ 81 ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, [self::class, 'isPsr17FactoryInstalled'] ]],81 ['class' => SymfonyHttplug::class, 'condition' => [SymfonyHttplug::class, [self::class, 'isPsr17FactoryInstalled'], [self::class, 'isSymfonyImplementingHttpClient']]], 82 82 ['class' => Guzzle7::class, 'condition' => Guzzle7::class], 83 83 ['class' => Guzzle6::class, 'condition' => Guzzle6::class], … … 159 159 } 160 160 161 public static function isSymfonyImplementingHttpClient() 162 { 163 return is_subclass_of(SymfonyHttplug::class, HttpClient::class); 164 } 165 161 166 /** 162 167 * Can be used as a condition.
Note: See TracChangeset
for help on using the changeset viewer.