Changeset 3146437
- Timestamp:
- 09/04/2024 12:23:05 PM (19 months ago)
- Location:
- multisafepay
- Files:
-
- 16 edited
- 1 copied
-
tags/6.6.1 (copied) (copied from multisafepay/trunk)
-
tags/6.6.1/multisafepay.php (modified) (3 diffs)
-
tags/6.6.1/readme.txt (modified) (3 diffs)
-
tags/6.6.1/src/PaymentMethods/Base/BasePaymentMethod.php (modified) (5 diffs)
-
tags/6.6.1/src/Settings/SystemReport.php (modified) (3 diffs)
-
tags/6.6.1/vendor/autoload.php (modified) (1 diff)
-
tags/6.6.1/vendor/composer/autoload_real.php (modified) (2 diffs)
-
tags/6.6.1/vendor/composer/autoload_static.php (modified) (2 diffs)
-
tags/6.6.1/vendor/composer/installed.php (modified) (2 diffs)
-
trunk/multisafepay.php (modified) (3 diffs)
-
trunk/readme.txt (modified) (3 diffs)
-
trunk/src/PaymentMethods/Base/BasePaymentMethod.php (modified) (5 diffs)
-
trunk/src/Settings/SystemReport.php (modified) (3 diffs)
-
trunk/vendor/autoload.php (modified) (1 diff)
-
trunk/vendor/composer/autoload_real.php (modified) (2 diffs)
-
trunk/vendor/composer/autoload_static.php (modified) (2 diffs)
-
trunk/vendor/composer/installed.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
multisafepay/tags/6.6.1/multisafepay.php
r3114383 r3146437 5 5 * Plugin URI: https://docs.multisafepay.com/docs/woocommerce 6 6 * Description: MultiSafepay Payment Plugin 7 * Version: 6.6. 07 * Version: 6.6.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. 5.514 * Tested up to: 6.6.1 15 15 * WC requires at least: 6.0.0 16 * WC tested up to: 9. 0.216 * WC tested up to: 9.2.3 17 17 * Requires PHP: 7.3 18 18 * Text Domain: multisafepay … … 27 27 * Plugin version 28 28 */ 29 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.6. 0' );29 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.6.1' ); 30 30 31 31 /** -
multisafepay/tags/6.6.1/readme.txt
r3114383 r3146437 3 3 Tags: multisafepay, payment gateway, credit cards, ideal, bnpl 4 4 Requires at least: 6.0 5 Tested up to: 6. 5.55 Tested up to: 6.6.1 6 6 Requires PHP: 7.3 7 Stable tag: 6.6. 07 Stable tag: 6.6.1 8 8 License: MIT 9 9 … … 128 128 == Upgrade Notice == 129 129 130 = 6.6. 0=130 = 6.6.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.6.1 (Sep 4th, 2024) = 147 148 ### Fixed 149 + PLGWOOS-952: Fix System Report failing because WC_API not found 150 151 ### Removed 152 + PLGWOOS-950: Remove iDEAL issuers of the payment component 153 146 154 = Release Notes - WooCommerce 6.6.0 (Jul 8th, 2024) = 147 155 -
multisafepay/tags/6.6.1/src/PaymentMethods/Base/BasePaymentMethod.php
r3114383 r3146437 247 247 */ 248 248 public function get_payment_method_type(): string { 249 // Converting to direct the transaction type for iDEAL 250 if ( $this->is_ideal_2_0() ) { 251 return self::TRANSACTION_TYPE_DIRECT; 252 } 253 249 254 // Avoiding the warning when the admin is editing 250 255 // the checkout page to add the block-based checkout. … … 352 357 return false; 353 358 } 359 360 if ( $this->is_ideal_2_0() ) { 361 $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'tokenization' => 'yes' ) ); 362 if ( ! isset( $settings['tokenization'] ) ) { 363 return true; 364 } 365 return 'yes' === $settings['tokenization']; 366 } 367 354 368 $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'yes' ) ); 355 369 if ( ! isset( $settings['payment_component'] ) ) { … … 559 573 } 560 574 561 if ( $this->payment_method->supportsPaymentComponent() ) {575 if ( $this->payment_method->supportsPaymentComponent() && ! $this->is_ideal_2_0() ) { 562 576 $form_fields['payment_component'] = array( 563 577 'title' => __( 'Payment Type', 'multisafepay' ), … … 585 599 'value' => $this->get_option( 'tokenization', 'no' ), 586 600 ); 601 602 if ( $this->is_ideal_2_0() ) { 603 unset( $form_fields['tokenization']['description'] ); 604 } 587 605 } 588 606 … … 805 823 return $countries->get_allowed_countries(); 806 824 } 825 826 /** 827 * If the API starts returning that the payment component has no fields for IDEAL, 828 * it's because the payment component is disabled for this payment method. 829 * 830 * @return bool 831 */ 832 private function is_ideal_2_0(): bool { 833 if ( $this->payment_method->getId() !== 'IDEAL' ) { 834 return false; 835 } 836 837 $payment_method_apps = $this->payment_method->getApps(); 838 if ( false === $payment_method_apps[ PaymentMethod::PAYMENT_COMPONENT_KEY ][ PaymentMethod::PAYMENT_COMPONENT_HAS_FIELDS_KEY ] ) { 839 return true; 840 } 841 842 return false; 843 } 807 844 } -
multisafepay/tags/6.6.1/src/Settings/SystemReport.php
r2977382 r3146437 6 6 use MultiSafepay\WooCommerce\PaymentMethods\Base\BasePaymentMethod; 7 7 use MultiSafepay\WooCommerce\Services\PaymentMethodService; 8 use WC_API;9 8 use WC_Countries; 10 use MultiSafepay\WooCommerce\PaymentMethods\PaymentMethods;11 9 use WC_Tax; 12 10 use WP_Error; … … 41 39 */ 42 40 private function get_woocommerce_system_status_report() { 43 $wc_api = new WC_API(); 44 $report = $wc_api->get_endpoint_data( '/wc/v3/system_status' ); 45 return $report; 41 if ( class_exists( \Automattic\WooCommerce\Utilities\RestApiUtil::class ) ) { 42 return wc_get_container()->get( \Automattic\WooCommerce\Utilities\RestApiUtil::class )->get_endpoint_data( '/wc/v3/system_status' ); 43 } 44 45 if ( class_exists( \WC_API::class ) ) { 46 $wc_api = new \WC_API(); 47 $report = $wc_api->get_endpoint_data( '/wc/v3/system_status' ); 48 return $report; 49 } 50 51 return array(); 46 52 } 47 53 … … 52 58 */ 53 59 public function get_multisafepay_system_status_report() { 60 if ( empty( $this->report ) ) { 61 return array(); 62 } 63 54 64 $status_report = array( 55 65 'wordpress_environment' => $this->get_system_report_wordpress_environment(), -
multisafepay/tags/6.6.1/vendor/autoload.php
r3114383 r3146437 23 23 require_once __DIR__ . '/composer/autoload_real.php'; 24 24 25 return ComposerAutoloaderInit dbc0eb47ba0f8cbc67eba2344d97c2f8::getLoader();25 return ComposerAutoloaderInit68721a43f2665cbca96d07cf1de6e772::getLoader(); -
multisafepay/tags/6.6.1/vendor/composer/autoload_real.php
r3114383 r3146437 3 3 // autoload_real.php @generated by Composer 4 4 5 class ComposerAutoloaderInit dbc0eb47ba0f8cbc67eba2344d97c2f85 class ComposerAutoloaderInit68721a43f2665cbca96d07cf1de6e772 6 6 { 7 7 private static $loader; … … 25 25 require __DIR__ . '/platform_check.php'; 26 26 27 spl_autoload_register(array('ComposerAutoloaderInit dbc0eb47ba0f8cbc67eba2344d97c2f8', 'loadClassLoader'), true, true);27 spl_autoload_register(array('ComposerAutoloaderInit68721a43f2665cbca96d07cf1de6e772', 'loadClassLoader'), true, true); 28 28 self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); 29 spl_autoload_unregister(array('ComposerAutoloaderInit dbc0eb47ba0f8cbc67eba2344d97c2f8', 'loadClassLoader'));29 spl_autoload_unregister(array('ComposerAutoloaderInit68721a43f2665cbca96d07cf1de6e772', 'loadClassLoader')); 30 30 31 31 require __DIR__ . '/autoload_static.php'; 32 call_user_func(\Composer\Autoload\ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f8::getInitializer($loader));32 call_user_func(\Composer\Autoload\ComposerStaticInit68721a43f2665cbca96d07cf1de6e772::getInitializer($loader)); 33 33 34 34 $loader->register(true); -
multisafepay/tags/6.6.1/vendor/composer/autoload_static.php
r3114383 r3146437 5 5 namespace Composer\Autoload; 6 6 7 class ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f87 class ComposerStaticInit68721a43f2665cbca96d07cf1de6e772 8 8 { 9 9 public static $prefixLengthsPsr4 = array ( … … 63 63 { 64 64 return \Closure::bind(function () use ($loader) { 65 $loader->prefixLengthsPsr4 = ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f8::$prefixLengthsPsr4;66 $loader->prefixDirsPsr4 = ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f8::$prefixDirsPsr4;67 $loader->classMap = ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f8::$classMap;65 $loader->prefixLengthsPsr4 = ComposerStaticInit68721a43f2665cbca96d07cf1de6e772::$prefixLengthsPsr4; 66 $loader->prefixDirsPsr4 = ComposerStaticInit68721a43f2665cbca96d07cf1de6e772::$prefixDirsPsr4; 67 $loader->classMap = ComposerStaticInit68721a43f2665cbca96d07cf1de6e772::$classMap; 68 68 69 69 }, null, ClassLoader::class); -
multisafepay/tags/6.6.1/vendor/composer/installed.php
r3114383 r3146437 2 2 'root' => array( 3 3 'name' => 'multisafepay/woocommerce', 4 'pretty_version' => '6.6. 0',5 'version' => '6.6. 0.0',4 'pretty_version' => '6.6.1', 5 'version' => '6.6.1.0', 6 6 'reference' => null, 7 7 'type' => 'wordpress-plugin', … … 21 21 ), 22 22 'multisafepay/woocommerce' => array( 23 'pretty_version' => '6.6. 0',24 'version' => '6.6. 0.0',23 'pretty_version' => '6.6.1', 24 'version' => '6.6.1.0', 25 25 'reference' => null, 26 26 'type' => 'wordpress-plugin', -
multisafepay/trunk/multisafepay.php
r3114383 r3146437 5 5 * Plugin URI: https://docs.multisafepay.com/docs/woocommerce 6 6 * Description: MultiSafepay Payment Plugin 7 * Version: 6.6. 07 * Version: 6.6.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. 5.514 * Tested up to: 6.6.1 15 15 * WC requires at least: 6.0.0 16 * WC tested up to: 9. 0.216 * WC tested up to: 9.2.3 17 17 * Requires PHP: 7.3 18 18 * Text Domain: multisafepay … … 27 27 * Plugin version 28 28 */ 29 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.6. 0' );29 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.6.1' ); 30 30 31 31 /** -
multisafepay/trunk/readme.txt
r3114383 r3146437 3 3 Tags: multisafepay, payment gateway, credit cards, ideal, bnpl 4 4 Requires at least: 6.0 5 Tested up to: 6. 5.55 Tested up to: 6.6.1 6 6 Requires PHP: 7.3 7 Stable tag: 6.6. 07 Stable tag: 6.6.1 8 8 License: MIT 9 9 … … 128 128 == Upgrade Notice == 129 129 130 = 6.6. 0=130 = 6.6.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.6.1 (Sep 4th, 2024) = 147 148 ### Fixed 149 + PLGWOOS-952: Fix System Report failing because WC_API not found 150 151 ### Removed 152 + PLGWOOS-950: Remove iDEAL issuers of the payment component 153 146 154 = Release Notes - WooCommerce 6.6.0 (Jul 8th, 2024) = 147 155 -
multisafepay/trunk/src/PaymentMethods/Base/BasePaymentMethod.php
r3114383 r3146437 247 247 */ 248 248 public function get_payment_method_type(): string { 249 // Converting to direct the transaction type for iDEAL 250 if ( $this->is_ideal_2_0() ) { 251 return self::TRANSACTION_TYPE_DIRECT; 252 } 253 249 254 // Avoiding the warning when the admin is editing 250 255 // the checkout page to add the block-based checkout. … … 352 357 return false; 353 358 } 359 360 if ( $this->is_ideal_2_0() ) { 361 $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'tokenization' => 'yes' ) ); 362 if ( ! isset( $settings['tokenization'] ) ) { 363 return true; 364 } 365 return 'yes' === $settings['tokenization']; 366 } 367 354 368 $settings = get_option( 'woocommerce_' . $this->id . '_settings', array( 'payment_component' => 'yes' ) ); 355 369 if ( ! isset( $settings['payment_component'] ) ) { … … 559 573 } 560 574 561 if ( $this->payment_method->supportsPaymentComponent() ) {575 if ( $this->payment_method->supportsPaymentComponent() && ! $this->is_ideal_2_0() ) { 562 576 $form_fields['payment_component'] = array( 563 577 'title' => __( 'Payment Type', 'multisafepay' ), … … 585 599 'value' => $this->get_option( 'tokenization', 'no' ), 586 600 ); 601 602 if ( $this->is_ideal_2_0() ) { 603 unset( $form_fields['tokenization']['description'] ); 604 } 587 605 } 588 606 … … 805 823 return $countries->get_allowed_countries(); 806 824 } 825 826 /** 827 * If the API starts returning that the payment component has no fields for IDEAL, 828 * it's because the payment component is disabled for this payment method. 829 * 830 * @return bool 831 */ 832 private function is_ideal_2_0(): bool { 833 if ( $this->payment_method->getId() !== 'IDEAL' ) { 834 return false; 835 } 836 837 $payment_method_apps = $this->payment_method->getApps(); 838 if ( false === $payment_method_apps[ PaymentMethod::PAYMENT_COMPONENT_KEY ][ PaymentMethod::PAYMENT_COMPONENT_HAS_FIELDS_KEY ] ) { 839 return true; 840 } 841 842 return false; 843 } 807 844 } -
multisafepay/trunk/src/Settings/SystemReport.php
r2977382 r3146437 6 6 use MultiSafepay\WooCommerce\PaymentMethods\Base\BasePaymentMethod; 7 7 use MultiSafepay\WooCommerce\Services\PaymentMethodService; 8 use WC_API;9 8 use WC_Countries; 10 use MultiSafepay\WooCommerce\PaymentMethods\PaymentMethods;11 9 use WC_Tax; 12 10 use WP_Error; … … 41 39 */ 42 40 private function get_woocommerce_system_status_report() { 43 $wc_api = new WC_API(); 44 $report = $wc_api->get_endpoint_data( '/wc/v3/system_status' ); 45 return $report; 41 if ( class_exists( \Automattic\WooCommerce\Utilities\RestApiUtil::class ) ) { 42 return wc_get_container()->get( \Automattic\WooCommerce\Utilities\RestApiUtil::class )->get_endpoint_data( '/wc/v3/system_status' ); 43 } 44 45 if ( class_exists( \WC_API::class ) ) { 46 $wc_api = new \WC_API(); 47 $report = $wc_api->get_endpoint_data( '/wc/v3/system_status' ); 48 return $report; 49 } 50 51 return array(); 46 52 } 47 53 … … 52 58 */ 53 59 public function get_multisafepay_system_status_report() { 60 if ( empty( $this->report ) ) { 61 return array(); 62 } 63 54 64 $status_report = array( 55 65 'wordpress_environment' => $this->get_system_report_wordpress_environment(), -
multisafepay/trunk/vendor/autoload.php
r3114383 r3146437 23 23 require_once __DIR__ . '/composer/autoload_real.php'; 24 24 25 return ComposerAutoloaderInit dbc0eb47ba0f8cbc67eba2344d97c2f8::getLoader();25 return ComposerAutoloaderInit68721a43f2665cbca96d07cf1de6e772::getLoader(); -
multisafepay/trunk/vendor/composer/autoload_real.php
r3114383 r3146437 3 3 // autoload_real.php @generated by Composer 4 4 5 class ComposerAutoloaderInit dbc0eb47ba0f8cbc67eba2344d97c2f85 class ComposerAutoloaderInit68721a43f2665cbca96d07cf1de6e772 6 6 { 7 7 private static $loader; … … 25 25 require __DIR__ . '/platform_check.php'; 26 26 27 spl_autoload_register(array('ComposerAutoloaderInit dbc0eb47ba0f8cbc67eba2344d97c2f8', 'loadClassLoader'), true, true);27 spl_autoload_register(array('ComposerAutoloaderInit68721a43f2665cbca96d07cf1de6e772', 'loadClassLoader'), true, true); 28 28 self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); 29 spl_autoload_unregister(array('ComposerAutoloaderInit dbc0eb47ba0f8cbc67eba2344d97c2f8', 'loadClassLoader'));29 spl_autoload_unregister(array('ComposerAutoloaderInit68721a43f2665cbca96d07cf1de6e772', 'loadClassLoader')); 30 30 31 31 require __DIR__ . '/autoload_static.php'; 32 call_user_func(\Composer\Autoload\ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f8::getInitializer($loader));32 call_user_func(\Composer\Autoload\ComposerStaticInit68721a43f2665cbca96d07cf1de6e772::getInitializer($loader)); 33 33 34 34 $loader->register(true); -
multisafepay/trunk/vendor/composer/autoload_static.php
r3114383 r3146437 5 5 namespace Composer\Autoload; 6 6 7 class ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f87 class ComposerStaticInit68721a43f2665cbca96d07cf1de6e772 8 8 { 9 9 public static $prefixLengthsPsr4 = array ( … … 63 63 { 64 64 return \Closure::bind(function () use ($loader) { 65 $loader->prefixLengthsPsr4 = ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f8::$prefixLengthsPsr4;66 $loader->prefixDirsPsr4 = ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f8::$prefixDirsPsr4;67 $loader->classMap = ComposerStaticInit dbc0eb47ba0f8cbc67eba2344d97c2f8::$classMap;65 $loader->prefixLengthsPsr4 = ComposerStaticInit68721a43f2665cbca96d07cf1de6e772::$prefixLengthsPsr4; 66 $loader->prefixDirsPsr4 = ComposerStaticInit68721a43f2665cbca96d07cf1de6e772::$prefixDirsPsr4; 67 $loader->classMap = ComposerStaticInit68721a43f2665cbca96d07cf1de6e772::$classMap; 68 68 69 69 }, null, ClassLoader::class); -
multisafepay/trunk/vendor/composer/installed.php
r3114383 r3146437 2 2 'root' => array( 3 3 'name' => 'multisafepay/woocommerce', 4 'pretty_version' => '6.6. 0',5 'version' => '6.6. 0.0',4 'pretty_version' => '6.6.1', 5 'version' => '6.6.1.0', 6 6 'reference' => null, 7 7 'type' => 'wordpress-plugin', … … 21 21 ), 22 22 'multisafepay/woocommerce' => array( 23 'pretty_version' => '6.6. 0',24 'version' => '6.6. 0.0',23 'pretty_version' => '6.6.1', 24 'version' => '6.6.1.0', 25 25 'reference' => null, 26 26 'type' => 'wordpress-plugin',
Note: See TracChangeset
for help on using the changeset viewer.